Revert "bytedance: vdpa: Add deletion timeout support"

This reverts commit 346ba4e.

Signed-off-by: Andrea Righi <[email protected]>

Author: arighi

drivers/vdpa/vdpa.c

@@ -353,7 +353,7 @@ static int vdpa_match_remove(struct device *dev, void *data)
 	struct vdpa_mgmt_dev *mdev = vdev->mdev;
 
 	if (mdev == data)
-		mdev->ops->dev_del(mdev, vdev, -1);
+		mdev->ops->dev_del(mdev, vdev);
 	return 0;
 }
 
@@ -708,15 +708,11 @@ static int vdpa_nl_cmd_dev_del_set_doit(struct sk_buff *skb, struct genl_info *i
 	struct device *dev;
 	const char *name;
 	int err = 0;
-	int timeout = -1;
 
 	if (!info->attrs[VDPA_ATTR_DEV_NAME])
 		return -EINVAL;
 	name = nla_data(info->attrs[VDPA_ATTR_DEV_NAME]);
 
-	if (info->attrs[VDPA_ATTR_DEV_DEL_TIMEOUT])
-		timeout = nla_get_u16(info->attrs[VDPA_ATTR_DEV_DEL_TIMEOUT]);
-
 	down_write(&vdpa_dev_lock);
 	dev = bus_find_device(&vdpa_bus, NULL, name, vdpa_name_match);
 	if (!dev) {
@@ -731,7 +727,7 @@ static int vdpa_nl_cmd_dev_del_set_doit(struct sk_buff *skb, struct genl_info *i
 		goto mdev_err;
 	}
 	mdev = vdev->mdev;
-	mdev->ops->dev_del(mdev, vdev, timeout);
+	mdev->ops->dev_del(mdev, vdev);
 mdev_err:
 	put_device(dev);
 dev_err:
@@ -1256,7 +1252,6 @@ static const struct nla_policy vdpa_nl_policy[VDPA_ATTR_MAX + 1] = {
 	[VDPA_ATTR_DEV_NET_CFG_MTU] = NLA_POLICY_MIN(NLA_U16, 68),
 	[VDPA_ATTR_DEV_QUEUE_INDEX] = { .type = NLA_U32 },
 	[VDPA_ATTR_DEV_FEATURES] = { .type = NLA_U64 },
-	[VDPA_ATTR_DEV_DEL_TIMEOUT] = { .type = NLA_U16 },
 };
 
 static const struct genl_ops vdpa_nl_ops[] = {

drivers/vdpa/vdpa_sim/vdpa_sim_blk.c

@@ -457,7 +457,7 @@ static int vdpasim_blk_dev_add(struct vdpa_mgmt_dev *mdev, const char *name,
 }
 
 static void vdpasim_blk_dev_del(struct vdpa_mgmt_dev *mdev,
-				struct vdpa_device *dev, int timeout)
+				struct vdpa_device *dev)
 {
 	struct vdpasim *simdev = container_of(dev, struct vdpasim, vdpa);
 

drivers/vdpa/vdpa_sim/vdpa_sim_net.c

@@ -501,7 +501,7 @@ static int vdpasim_net_dev_add(struct vdpa_mgmt_dev *mdev, const char *name,
 }
 
 static void vdpasim_net_dev_del(struct vdpa_mgmt_dev *mdev,
-				struct vdpa_device *dev, int timeout)
+				struct vdpa_device *dev)
 {
 	struct vdpasim *simdev = container_of(dev, struct vdpasim, vdpa);
 

drivers/vdpa/vdpa_user/vduse_dev.c

@@ -2020,8 +2020,7 @@ static int vdpa_dev_add(struct vdpa_mgmt_dev *mdev, const char *name,
 	return 0;
 }
 
-static void vdpa_dev_del(struct vdpa_mgmt_dev *mdev,
-			 struct vdpa_device *dev, int timeout)
+static void vdpa_dev_del(struct vdpa_mgmt_dev *mdev, struct vdpa_device *dev)
 {
 	_vdpa_unregister_device(dev);
 }

include/linux/vdpa.h

@@ -537,15 +537,13 @@ void vdpa_set_status(struct vdpa_device *vdev, u8 status);
  * @dev_del: Remove a vdpa device using unregister
  *	     @mdev: parent device to use for device removal
  *	     @dev: vdpa device to remove
- *	     @timetou: delete timeout
  *	     Driver need to remove the specified device by calling
  *	     _vdpa_unregister_device().
  */
 struct vdpa_mgmtdev_ops {
 	int (*dev_add)(struct vdpa_mgmt_dev *mdev, const char *name,
 		       const struct vdpa_dev_set_config *config);
-	void (*dev_del)(struct vdpa_mgmt_dev *mdev,
-			struct vdpa_device *dev, int timeout);
+	void (*dev_del)(struct vdpa_mgmt_dev *mdev, struct vdpa_device *dev);
 };
 
 /**

include/uapi/linux/vdpa.h

@@ -56,8 +56,6 @@ enum vdpa_attr {
 	/* virtio features that are provisioned to the vDPA device */
 	VDPA_ATTR_DEV_FEATURES,                 /* u64 */
 
-	VDPA_ATTR_DEV_DEL_TIMEOUT = 128,	/* u16 */
-
 	/* new attributes must be added above here */
 	VDPA_ATTR_MAX,
 };