Netdev Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH v2] vdpa/mlx5: Enable user to add/delete vdpa device
@ 2021-02-18  7:41 Eli Cohen
  2021-02-23 12:29 ` Michael S. Tsirkin
  0 siblings, 1 reply; 8+ messages in thread
From: Eli Cohen @ 2021-02-18  7:41 UTC (permalink / raw)
  To: mst, jasowang, si-wei.liu, linux-kernel, virtualization, netdev
  Cc: elic, Parav Pandit

Allow to control vdpa device creation and destruction using the vdpa
management tool.

Examples:
1. List the management devices
$ vdpa mgmtdev show
pci/0000:3b:00.1:
  supported_classes net

2. Create vdpa instance
$ vdpa dev add mgmtdev pci/0000:3b:00.1 name vdpa0

3. Show vdpa devices
$ vdpa dev show
vdpa0: type network mgmtdev pci/0000:3b:00.1 vendor_id 5555 max_vqs 16 \
max_vq_size 256

Signed-off-by: Eli Cohen <elic@nvidia.com>
Reviewed-by: Parav Pandit <parav@nvidia.com>
---
v0->v1:
set mgtdev->ndev NULL on dev delete
v1->v2: Resend

 drivers/vdpa/mlx5/net/mlx5_vnet.c | 79 +++++++++++++++++++++++++++----
 1 file changed, 70 insertions(+), 9 deletions(-)

diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c
index a51b0f86afe2..08fb481ddc4f 100644
--- a/drivers/vdpa/mlx5/net/mlx5_vnet.c
+++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c
@@ -1974,23 +1974,32 @@ static void init_mvqs(struct mlx5_vdpa_net *ndev)
 	}
 }
 
-static int mlx5v_probe(struct auxiliary_device *adev,
-		       const struct auxiliary_device_id *id)
+struct mlx5_vdpa_mgmtdev {
+	struct vdpa_mgmt_dev mgtdev;
+	struct mlx5_adev *madev;
+	struct mlx5_vdpa_net *ndev;
+};
+
+static int mlx5_vdpa_dev_add(struct vdpa_mgmt_dev *v_mdev, const char *name)
 {
-	struct mlx5_adev *madev = container_of(adev, struct mlx5_adev, adev);
-	struct mlx5_core_dev *mdev = madev->mdev;
+	struct mlx5_vdpa_mgmtdev *mgtdev = container_of(v_mdev, struct mlx5_vdpa_mgmtdev, mgtdev);
 	struct virtio_net_config *config;
 	struct mlx5_vdpa_dev *mvdev;
 	struct mlx5_vdpa_net *ndev;
+	struct mlx5_core_dev *mdev;
 	u32 max_vqs;
 	int err;
 
+	if (mgtdev->ndev)
+		return -ENOSPC;
+
+	mdev = mgtdev->madev->mdev;
 	/* we save one virtqueue for control virtqueue should we require it */
 	max_vqs = MLX5_CAP_DEV_VDPA_EMULATION(mdev, max_num_virtio_queues);
 	max_vqs = min_t(u32, max_vqs, MLX5_MAX_SUPPORTED_VQS);
 
 	ndev = vdpa_alloc_device(struct mlx5_vdpa_net, mvdev.vdev, mdev->device, &mlx5_vdpa_ops,
-				 2 * mlx5_vdpa_max_qps(max_vqs), NULL);
+				 2 * mlx5_vdpa_max_qps(max_vqs), name);
 	if (IS_ERR(ndev))
 		return PTR_ERR(ndev);
 
@@ -2018,11 +2027,12 @@ static int mlx5v_probe(struct auxiliary_device *adev,
 	if (err)
 		goto err_res;
 
-	err = vdpa_register_device(&mvdev->vdev);
+	mvdev->vdev.mdev = &mgtdev->mgtdev;
+	err = _vdpa_register_device(&mvdev->vdev);
 	if (err)
 		goto err_reg;
 
-	dev_set_drvdata(&adev->dev, ndev);
+	mgtdev->ndev = ndev;
 	return 0;
 
 err_reg:
@@ -2035,11 +2045,62 @@ static int mlx5v_probe(struct auxiliary_device *adev,
 	return err;
 }
 
+static void mlx5_vdpa_dev_del(struct vdpa_mgmt_dev *v_mdev, struct vdpa_device *dev)
+{
+	struct mlx5_vdpa_mgmtdev *mgtdev = container_of(v_mdev, struct mlx5_vdpa_mgmtdev, mgtdev);
+
+	_vdpa_unregister_device(dev);
+	mgtdev->ndev = NULL;
+}
+
+static const struct vdpa_mgmtdev_ops mdev_ops = {
+	.dev_add = mlx5_vdpa_dev_add,
+	.dev_del = mlx5_vdpa_dev_del,
+};
+
+static struct virtio_device_id id_table[] = {
+	{ VIRTIO_ID_NET, VIRTIO_DEV_ANY_ID },
+	{ 0 },
+};
+
+static int mlx5v_probe(struct auxiliary_device *adev,
+		       const struct auxiliary_device_id *id)
+
+{
+	struct mlx5_adev *madev = container_of(adev, struct mlx5_adev, adev);
+	struct mlx5_core_dev *mdev = madev->mdev;
+	struct mlx5_vdpa_mgmtdev *mgtdev;
+	int err;
+
+	mgtdev = kzalloc(sizeof(*mgtdev), GFP_KERNEL);
+	if (!mgtdev)
+		return -ENOMEM;
+
+	mgtdev->mgtdev.ops = &mdev_ops;
+	mgtdev->mgtdev.device = mdev->device;
+	mgtdev->mgtdev.id_table = id_table;
+	mgtdev->madev = madev;
+
+	err = vdpa_mgmtdev_register(&mgtdev->mgtdev);
+	if (err)
+		goto reg_err;
+
+	dev_set_drvdata(&adev->dev, mgtdev);
+
+	return 0;
+
+reg_err:
+	kfree(mdev);
+	return err;
+}
+
 static void mlx5v_remove(struct auxiliary_device *adev)
 {
-	struct mlx5_vdpa_dev *mvdev = dev_get_drvdata(&adev->dev);
+	struct mlx5_vdpa_mgmtdev *mgtdev;
 
-	vdpa_unregister_device(&mvdev->vdev);
+	mgtdev = dev_get_drvdata(&adev->dev);
+	vdpa_mgmtdev_unregister(&mgtdev->mgtdev);
+	kfree(mgtdev);
 }
 
 static const struct auxiliary_device_id mlx5v_id_table[] = {
-- 
2.29.2


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH v2] vdpa/mlx5: Enable user to add/delete vdpa device
  2021-02-18  7:41 [PATCH v2] vdpa/mlx5: Enable user to add/delete vdpa device Eli Cohen
@ 2021-02-23 12:29 ` Michael S. Tsirkin
  2021-02-23 12:33   ` Eli Cohen
  0 siblings, 1 reply; 8+ messages in thread
From: Michael S. Tsirkin @ 2021-02-23 12:29 UTC (permalink / raw)
  To: Eli Cohen
  Cc: jasowang, si-wei.liu, linux-kernel, virtualization, netdev, Parav Pandit

On Thu, Feb 18, 2021 at 09:41:57AM +0200, Eli Cohen wrote:
> Allow to control vdpa device creation and destruction using the vdpa
> management tool.
> 
> Examples:
> 1. List the management devices
> $ vdpa mgmtdev show
> pci/0000:3b:00.1:
>   supported_classes net
> 
> 2. Create vdpa instance
> $ vdpa dev add mgmtdev pci/0000:3b:00.1 name vdpa0
> 
> 3. Show vdpa devices
> $ vdpa dev show
> vdpa0: type network mgmtdev pci/0000:3b:00.1 vendor_id 5555 max_vqs 16 \
> max_vq_size 256
> 
> Signed-off-by: Eli Cohen <elic@nvidia.com>
> Reviewed-by: Parav Pandit <parav@nvidia.com>

Not sure which tree this is for, I could not apply this.

> ---
> v0->v1:
> set mgtdev->ndev NULL on dev delete
> v1->v2: Resend
> 
>  drivers/vdpa/mlx5/net/mlx5_vnet.c | 79 +++++++++++++++++++++++++++----
>  1 file changed, 70 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c
> index a51b0f86afe2..08fb481ddc4f 100644
> --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c
> +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c
> @@ -1974,23 +1974,32 @@ static void init_mvqs(struct mlx5_vdpa_net *ndev)
>  	}
>  }
>  
> -static int mlx5v_probe(struct auxiliary_device *adev,
> -		       const struct auxiliary_device_id *id)
> +struct mlx5_vdpa_mgmtdev {
> +	struct vdpa_mgmt_dev mgtdev;
> +	struct mlx5_adev *madev;
> +	struct mlx5_vdpa_net *ndev;
> +};
> +
> +static int mlx5_vdpa_dev_add(struct vdpa_mgmt_dev *v_mdev, const char *name)
>  {
> -	struct mlx5_adev *madev = container_of(adev, struct mlx5_adev, adev);
> -	struct mlx5_core_dev *mdev = madev->mdev;
> +	struct mlx5_vdpa_mgmtdev *mgtdev = container_of(v_mdev, struct mlx5_vdpa_mgmtdev, mgtdev);
>  	struct virtio_net_config *config;
>  	struct mlx5_vdpa_dev *mvdev;
>  	struct mlx5_vdpa_net *ndev;
> +	struct mlx5_core_dev *mdev;
>  	u32 max_vqs;
>  	int err;
>  
> +	if (mgtdev->ndev)
> +		return -ENOSPC;
> +
> +	mdev = mgtdev->madev->mdev;
>  	/* we save one virtqueue for control virtqueue should we require it */
>  	max_vqs = MLX5_CAP_DEV_VDPA_EMULATION(mdev, max_num_virtio_queues);
>  	max_vqs = min_t(u32, max_vqs, MLX5_MAX_SUPPORTED_VQS);
>  
>  	ndev = vdpa_alloc_device(struct mlx5_vdpa_net, mvdev.vdev, mdev->device, &mlx5_vdpa_ops,
> -				 2 * mlx5_vdpa_max_qps(max_vqs), NULL);
> +				 2 * mlx5_vdpa_max_qps(max_vqs), name);
>  	if (IS_ERR(ndev))
>  		return PTR_ERR(ndev);
>  
> @@ -2018,11 +2027,12 @@ static int mlx5v_probe(struct auxiliary_device *adev,
>  	if (err)
>  		goto err_res;
>  
> -	err = vdpa_register_device(&mvdev->vdev);
> +	mvdev->vdev.mdev = &mgtdev->mgtdev;
> +	err = _vdpa_register_device(&mvdev->vdev);
>  	if (err)
>  		goto err_reg;
>  
> -	dev_set_drvdata(&adev->dev, ndev);
> +	mgtdev->ndev = ndev;
>  	return 0;
>  
>  err_reg:
> @@ -2035,11 +2045,62 @@ static int mlx5v_probe(struct auxiliary_device *adev,
>  	return err;
>  }
>  
> +static void mlx5_vdpa_dev_del(struct vdpa_mgmt_dev *v_mdev, struct vdpa_device *dev)
> +{
> +	struct mlx5_vdpa_mgmtdev *mgtdev = container_of(v_mdev, struct mlx5_vdpa_mgmtdev, mgtdev);
> +
> +	_vdpa_unregister_device(dev);
> +	mgtdev->ndev = NULL;
> +}
> +
> +static const struct vdpa_mgmtdev_ops mdev_ops = {
> +	.dev_add = mlx5_vdpa_dev_add,
> +	.dev_del = mlx5_vdpa_dev_del,
> +};
> +
> +static struct virtio_device_id id_table[] = {
> +	{ VIRTIO_ID_NET, VIRTIO_DEV_ANY_ID },
> +	{ 0 },
> +};
> +
> +static int mlx5v_probe(struct auxiliary_device *adev,
> +		       const struct auxiliary_device_id *id)
> +
> +{
> +	struct mlx5_adev *madev = container_of(adev, struct mlx5_adev, adev);
> +	struct mlx5_core_dev *mdev = madev->mdev;
> +	struct mlx5_vdpa_mgmtdev *mgtdev;
> +	int err;
> +
> +	mgtdev = kzalloc(sizeof(*mgtdev), GFP_KERNEL);
> +	if (!mgtdev)
> +		return -ENOMEM;
> +
> +	mgtdev->mgtdev.ops = &mdev_ops;
> +	mgtdev->mgtdev.device = mdev->device;
> +	mgtdev->mgtdev.id_table = id_table;
> +	mgtdev->madev = madev;
> +
> +	err = vdpa_mgmtdev_register(&mgtdev->mgtdev);
> +	if (err)
> +		goto reg_err;
> +
> +	dev_set_drvdata(&adev->dev, mgtdev);
> +
> +	return 0;
> +
> +reg_err:
> +	kfree(mdev);
> +	return err;
> +}
> +
>  static void mlx5v_remove(struct auxiliary_device *adev)
>  {
> -	struct mlx5_vdpa_dev *mvdev = dev_get_drvdata(&adev->dev);
> +	struct mlx5_vdpa_mgmtdev *mgtdev;
>  
> -	vdpa_unregister_device(&mvdev->vdev);
> +	mgtdev = dev_get_drvdata(&adev->dev);
> +	vdpa_mgmtdev_unregister(&mgtdev->mgtdev);
> +	kfree(mgtdev);
>  }
>  
>  static const struct auxiliary_device_id mlx5v_id_table[] = {
> -- 
> 2.29.2


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH v2] vdpa/mlx5: Enable user to add/delete vdpa device
  2021-02-23 12:29 ` Michael S. Tsirkin
@ 2021-02-23 12:33   ` Eli Cohen
  2021-02-23 12:52     ` Michael S. Tsirkin
  0 siblings, 1 reply; 8+ messages in thread
From: Eli Cohen @ 2021-02-23 12:33 UTC (permalink / raw)
  To: Michael S. Tsirkin
  Cc: jasowang, si-wei.liu, linux-kernel, virtualization, netdev, Parav Pandit

On Tue, Feb 23, 2021 at 07:29:32AM -0500, Michael S. Tsirkin wrote:
> On Thu, Feb 18, 2021 at 09:41:57AM +0200, Eli Cohen wrote:
> > Allow to control vdpa device creation and destruction using the vdpa
> > management tool.
> > 
> > Examples:
> > 1. List the management devices
> > $ vdpa mgmtdev show
> > pci/0000:3b:00.1:
> >   supported_classes net
> > 
> > 2. Create vdpa instance
> > $ vdpa dev add mgmtdev pci/0000:3b:00.1 name vdpa0
> > 
> > 3. Show vdpa devices
> > $ vdpa dev show
> > vdpa0: type network mgmtdev pci/0000:3b:00.1 vendor_id 5555 max_vqs 16 \
> > max_vq_size 256
> > 
> > Signed-off-by: Eli Cohen <elic@nvidia.com>
> > Reviewed-by: Parav Pandit <parav@nvidia.com>
> 
> Not sure which tree this is for, I could not apply this.
> 

Depends on Parav's vdpa tool patches. We'll send the entire series again
- Parav's and my patches.

> > ---
> > v0->v1:
> > set mgtdev->ndev NULL on dev delete
> > v1->v2: Resend
> > 
> >  drivers/vdpa/mlx5/net/mlx5_vnet.c | 79 +++++++++++++++++++++++++++----
> >  1 file changed, 70 insertions(+), 9 deletions(-)
> > 
> > diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c
> > index a51b0f86afe2..08fb481ddc4f 100644
> > --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c
> > +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c
> > @@ -1974,23 +1974,32 @@ static void init_mvqs(struct mlx5_vdpa_net *ndev)
> >  	}
> >  }
> >  
> > -static int mlx5v_probe(struct auxiliary_device *adev,
> > -		       const struct auxiliary_device_id *id)
> > +struct mlx5_vdpa_mgmtdev {
> > +	struct vdpa_mgmt_dev mgtdev;
> > +	struct mlx5_adev *madev;
> > +	struct mlx5_vdpa_net *ndev;
> > +};
> > +
> > +static int mlx5_vdpa_dev_add(struct vdpa_mgmt_dev *v_mdev, const char *name)
> >  {
> > -	struct mlx5_adev *madev = container_of(adev, struct mlx5_adev, adev);
> > -	struct mlx5_core_dev *mdev = madev->mdev;
> > +	struct mlx5_vdpa_mgmtdev *mgtdev = container_of(v_mdev, struct mlx5_vdpa_mgmtdev, mgtdev);
> >  	struct virtio_net_config *config;
> >  	struct mlx5_vdpa_dev *mvdev;
> >  	struct mlx5_vdpa_net *ndev;
> > +	struct mlx5_core_dev *mdev;
> >  	u32 max_vqs;
> >  	int err;
> >  
> > +	if (mgtdev->ndev)
> > +		return -ENOSPC;
> > +
> > +	mdev = mgtdev->madev->mdev;
> >  	/* we save one virtqueue for control virtqueue should we require it */
> >  	max_vqs = MLX5_CAP_DEV_VDPA_EMULATION(mdev, max_num_virtio_queues);
> >  	max_vqs = min_t(u32, max_vqs, MLX5_MAX_SUPPORTED_VQS);
> >  
> >  	ndev = vdpa_alloc_device(struct mlx5_vdpa_net, mvdev.vdev, mdev->device, &mlx5_vdpa_ops,
> > -				 2 * mlx5_vdpa_max_qps(max_vqs), NULL);
> > +				 2 * mlx5_vdpa_max_qps(max_vqs), name);
> >  	if (IS_ERR(ndev))
> >  		return PTR_ERR(ndev);
> >  
> > @@ -2018,11 +2027,12 @@ static int mlx5v_probe(struct auxiliary_device *adev,
> >  	if (err)
> >  		goto err_res;
> >  
> > -	err = vdpa_register_device(&mvdev->vdev);
> > +	mvdev->vdev.mdev = &mgtdev->mgtdev;
> > +	err = _vdpa_register_device(&mvdev->vdev);
> >  	if (err)
> >  		goto err_reg;
> >  
> > -	dev_set_drvdata(&adev->dev, ndev);
> > +	mgtdev->ndev = ndev;
> >  	return 0;
> >  
> >  err_reg:
> > @@ -2035,11 +2045,62 @@ static int mlx5v_probe(struct auxiliary_device *adev,
> >  	return err;
> >  }
> >  
> > +static void mlx5_vdpa_dev_del(struct vdpa_mgmt_dev *v_mdev, struct vdpa_device *dev)
> > +{
> > +	struct mlx5_vdpa_mgmtdev *mgtdev = container_of(v_mdev, struct mlx5_vdpa_mgmtdev, mgtdev);
> > +
> > +	_vdpa_unregister_device(dev);
> > +	mgtdev->ndev = NULL;
> > +}
> > +
> > +static const struct vdpa_mgmtdev_ops mdev_ops = {
> > +	.dev_add = mlx5_vdpa_dev_add,
> > +	.dev_del = mlx5_vdpa_dev_del,
> > +};
> > +
> > +static struct virtio_device_id id_table[] = {
> > +	{ VIRTIO_ID_NET, VIRTIO_DEV_ANY_ID },
> > +	{ 0 },
> > +};
> > +
> > +static int mlx5v_probe(struct auxiliary_device *adev,
> > +		       const struct auxiliary_device_id *id)
> > +
> > +{
> > +	struct mlx5_adev *madev = container_of(adev, struct mlx5_adev, adev);
> > +	struct mlx5_core_dev *mdev = madev->mdev;
> > +	struct mlx5_vdpa_mgmtdev *mgtdev;
> > +	int err;
> > +
> > +	mgtdev = kzalloc(sizeof(*mgtdev), GFP_KERNEL);
> > +	if (!mgtdev)
> > +		return -ENOMEM;
> > +
> > +	mgtdev->mgtdev.ops = &mdev_ops;
> > +	mgtdev->mgtdev.device = mdev->device;
> > +	mgtdev->mgtdev.id_table = id_table;
> > +	mgtdev->madev = madev;
> > +
> > +	err = vdpa_mgmtdev_register(&mgtdev->mgtdev);
> > +	if (err)
> > +		goto reg_err;
> > +
> > +	dev_set_drvdata(&adev->dev, mgtdev);
> > +
> > +	return 0;
> > +
> > +reg_err:
> > +	kfree(mdev);
> > +	return err;
> > +}
> > +
> >  static void mlx5v_remove(struct auxiliary_device *adev)
> >  {
> > -	struct mlx5_vdpa_dev *mvdev = dev_get_drvdata(&adev->dev);
> > +	struct mlx5_vdpa_mgmtdev *mgtdev;
> >  
> > -	vdpa_unregister_device(&mvdev->vdev);
> > +	mgtdev = dev_get_drvdata(&adev->dev);
> > +	vdpa_mgmtdev_unregister(&mgtdev->mgtdev);
> > +	kfree(mgtdev);
> >  }
> >  
> >  static const struct auxiliary_device_id mlx5v_id_table[] = {
> > -- 
> > 2.29.2
> 

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH v2] vdpa/mlx5: Enable user to add/delete vdpa device
  2021-02-23 12:33   ` Eli Cohen
@ 2021-02-23 12:52     ` Michael S. Tsirkin
  2021-02-23 12:54       ` Eli Cohen
  0 siblings, 1 reply; 8+ messages in thread
From: Michael S. Tsirkin @ 2021-02-23 12:52 UTC (permalink / raw)
  To: Eli Cohen
  Cc: jasowang, si-wei.liu, linux-kernel, virtualization, netdev, Parav Pandit

On Tue, Feb 23, 2021 at 02:33:04PM +0200, Eli Cohen wrote:
> On Tue, Feb 23, 2021 at 07:29:32AM -0500, Michael S. Tsirkin wrote:
> > On Thu, Feb 18, 2021 at 09:41:57AM +0200, Eli Cohen wrote:
> > > Allow to control vdpa device creation and destruction using the vdpa
> > > management tool.
> > > 
> > > Examples:
> > > 1. List the management devices
> > > $ vdpa mgmtdev show
> > > pci/0000:3b:00.1:
> > >   supported_classes net
> > > 
> > > 2. Create vdpa instance
> > > $ vdpa dev add mgmtdev pci/0000:3b:00.1 name vdpa0
> > > 
> > > 3. Show vdpa devices
> > > $ vdpa dev show
> > > vdpa0: type network mgmtdev pci/0000:3b:00.1 vendor_id 5555 max_vqs 16 \
> > > max_vq_size 256
> > > 
> > > Signed-off-by: Eli Cohen <elic@nvidia.com>
> > > Reviewed-by: Parav Pandit <parav@nvidia.com>
> > 
> > Not sure which tree this is for, I could not apply this.
> > 
> 
> Depends on Parav's vdpa tool patches. We'll send the entire series again
> - Parav's and my patches.


I think I have them in the linux next branch, no?


> > > ---
> > > v0->v1:
> > > set mgtdev->ndev NULL on dev delete
> > > v1->v2: Resend
> > > 
> > >  drivers/vdpa/mlx5/net/mlx5_vnet.c | 79 +++++++++++++++++++++++++++----
> > >  1 file changed, 70 insertions(+), 9 deletions(-)
> > > 
> > > diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c
> > > index a51b0f86afe2..08fb481ddc4f 100644
> > > --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c
> > > +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c
> > > @@ -1974,23 +1974,32 @@ static void init_mvqs(struct mlx5_vdpa_net *ndev)
> > >  	}
> > >  }
> > >  
> > > -static int mlx5v_probe(struct auxiliary_device *adev,
> > > -		       const struct auxiliary_device_id *id)
> > > +struct mlx5_vdpa_mgmtdev {
> > > +	struct vdpa_mgmt_dev mgtdev;
> > > +	struct mlx5_adev *madev;
> > > +	struct mlx5_vdpa_net *ndev;
> > > +};
> > > +
> > > +static int mlx5_vdpa_dev_add(struct vdpa_mgmt_dev *v_mdev, const char *name)
> > >  {
> > > -	struct mlx5_adev *madev = container_of(adev, struct mlx5_adev, adev);
> > > -	struct mlx5_core_dev *mdev = madev->mdev;
> > > +	struct mlx5_vdpa_mgmtdev *mgtdev = container_of(v_mdev, struct mlx5_vdpa_mgmtdev, mgtdev);
> > >  	struct virtio_net_config *config;
> > >  	struct mlx5_vdpa_dev *mvdev;
> > >  	struct mlx5_vdpa_net *ndev;
> > > +	struct mlx5_core_dev *mdev;
> > >  	u32 max_vqs;
> > >  	int err;
> > >  
> > > +	if (mgtdev->ndev)
> > > +		return -ENOSPC;
> > > +
> > > +	mdev = mgtdev->madev->mdev;
> > >  	/* we save one virtqueue for control virtqueue should we require it */
> > >  	max_vqs = MLX5_CAP_DEV_VDPA_EMULATION(mdev, max_num_virtio_queues);
> > >  	max_vqs = min_t(u32, max_vqs, MLX5_MAX_SUPPORTED_VQS);
> > >  
> > >  	ndev = vdpa_alloc_device(struct mlx5_vdpa_net, mvdev.vdev, mdev->device, &mlx5_vdpa_ops,
> > > -				 2 * mlx5_vdpa_max_qps(max_vqs), NULL);
> > > +				 2 * mlx5_vdpa_max_qps(max_vqs), name);
> > >  	if (IS_ERR(ndev))
> > >  		return PTR_ERR(ndev);
> > >  
> > > @@ -2018,11 +2027,12 @@ static int mlx5v_probe(struct auxiliary_device *adev,
> > >  	if (err)
> > >  		goto err_res;
> > >  
> > > -	err = vdpa_register_device(&mvdev->vdev);
> > > +	mvdev->vdev.mdev = &mgtdev->mgtdev;
> > > +	err = _vdpa_register_device(&mvdev->vdev);
> > >  	if (err)
> > >  		goto err_reg;
> > >  
> > > -	dev_set_drvdata(&adev->dev, ndev);
> > > +	mgtdev->ndev = ndev;
> > >  	return 0;
> > >  
> > >  err_reg:
> > > @@ -2035,11 +2045,62 @@ static int mlx5v_probe(struct auxiliary_device *adev,
> > >  	return err;
> > >  }
> > >  
> > > +static void mlx5_vdpa_dev_del(struct vdpa_mgmt_dev *v_mdev, struct vdpa_device *dev)
> > > +{
> > > +	struct mlx5_vdpa_mgmtdev *mgtdev = container_of(v_mdev, struct mlx5_vdpa_mgmtdev, mgtdev);
> > > +
> > > +	_vdpa_unregister_device(dev);
> > > +	mgtdev->ndev = NULL;
> > > +}
> > > +
> > > +static const struct vdpa_mgmtdev_ops mdev_ops = {
> > > +	.dev_add = mlx5_vdpa_dev_add,
> > > +	.dev_del = mlx5_vdpa_dev_del,
> > > +};
> > > +
> > > +static struct virtio_device_id id_table[] = {
> > > +	{ VIRTIO_ID_NET, VIRTIO_DEV_ANY_ID },
> > > +	{ 0 },
> > > +};
> > > +
> > > +static int mlx5v_probe(struct auxiliary_device *adev,
> > > +		       const struct auxiliary_device_id *id)
> > > +
> > > +{
> > > +	struct mlx5_adev *madev = container_of(adev, struct mlx5_adev, adev);
> > > +	struct mlx5_core_dev *mdev = madev->mdev;
> > > +	struct mlx5_vdpa_mgmtdev *mgtdev;
> > > +	int err;
> > > +
> > > +	mgtdev = kzalloc(sizeof(*mgtdev), GFP_KERNEL);
> > > +	if (!mgtdev)
> > > +		return -ENOMEM;
> > > +
> > > +	mgtdev->mgtdev.ops = &mdev_ops;
> > > +	mgtdev->mgtdev.device = mdev->device;
> > > +	mgtdev->mgtdev.id_table = id_table;
> > > +	mgtdev->madev = madev;
> > > +
> > > +	err = vdpa_mgmtdev_register(&mgtdev->mgtdev);
> > > +	if (err)
> > > +		goto reg_err;
> > > +
> > > +	dev_set_drvdata(&adev->dev, mgtdev);
> > > +
> > > +	return 0;
> > > +
> > > +reg_err:
> > > +	kfree(mdev);
> > > +	return err;
> > > +}
> > > +
> > >  static void mlx5v_remove(struct auxiliary_device *adev)
> > >  {
> > > -	struct mlx5_vdpa_dev *mvdev = dev_get_drvdata(&adev->dev);
> > > +	struct mlx5_vdpa_mgmtdev *mgtdev;
> > >  
> > > -	vdpa_unregister_device(&mvdev->vdev);
> > > +	mgtdev = dev_get_drvdata(&adev->dev);
> > > +	vdpa_mgmtdev_unregister(&mgtdev->mgtdev);
> > > +	kfree(mgtdev);
> > >  }
> > >  
> > >  static const struct auxiliary_device_id mlx5v_id_table[] = {
> > > -- 
> > > 2.29.2
> > 


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH v2] vdpa/mlx5: Enable user to add/delete vdpa device
  2021-02-23 12:52     ` Michael S. Tsirkin
@ 2021-02-23 12:54       ` Eli Cohen
  2021-02-23 12:56         ` Michael S. Tsirkin
  0 siblings, 1 reply; 8+ messages in thread
From: Eli Cohen @ 2021-02-23 12:54 UTC (permalink / raw)
  To: Michael S. Tsirkin
  Cc: jasowang, si-wei.liu, linux-kernel, virtualization, netdev, Parav Pandit

On Tue, Feb 23, 2021 at 07:52:34AM -0500, Michael S. Tsirkin wrote:
> 
> I think I have them in the linux next branch, no?
> 

You do.

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH v2] vdpa/mlx5: Enable user to add/delete vdpa device
  2021-02-23 12:54       ` Eli Cohen
@ 2021-02-23 12:56         ` Michael S. Tsirkin
  2021-02-23 12:59           ` Eli Cohen
  0 siblings, 1 reply; 8+ messages in thread
From: Michael S. Tsirkin @ 2021-02-23 12:56 UTC (permalink / raw)
  To: Eli Cohen
  Cc: jasowang, si-wei.liu, linux-kernel, virtualization, netdev, Parav Pandit

On Tue, Feb 23, 2021 at 02:54:42PM +0200, Eli Cohen wrote:
> On Tue, Feb 23, 2021 at 07:52:34AM -0500, Michael S. Tsirkin wrote:
> > 
> > I think I have them in the linux next branch, no?
> > 
> 
> You do.

I guest there's a conflict with some other patch in that tree then.
Can you rebase please?

-- 
MST


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH v2] vdpa/mlx5: Enable user to add/delete vdpa device
  2021-02-23 12:56         ` Michael S. Tsirkin
@ 2021-02-23 12:59           ` Eli Cohen
  2021-02-23 13:01             ` Michael S. Tsirkin
  0 siblings, 1 reply; 8+ messages in thread
From: Eli Cohen @ 2021-02-23 12:59 UTC (permalink / raw)
  To: Michael S. Tsirkin
  Cc: jasowang, si-wei.liu, linux-kernel, virtualization, netdev, Parav Pandit

On Tue, Feb 23, 2021 at 07:56:16AM -0500, Michael S. Tsirkin wrote:
> On Tue, Feb 23, 2021 at 02:54:42PM +0200, Eli Cohen wrote:
> > On Tue, Feb 23, 2021 at 07:52:34AM -0500, Michael S. Tsirkin wrote:
> > > 
> > > I think I have them in the linux next branch, no?
> > > 
> > 
> > You do.
> 
> I guest there's a conflict with some other patch in that tree then.
> Can you rebase please?
> 

Parav, will send later today.

> -- 
> MST
> 

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH v2] vdpa/mlx5: Enable user to add/delete vdpa device
  2021-02-23 12:59           ` Eli Cohen
@ 2021-02-23 13:01             ` Michael S. Tsirkin
  0 siblings, 0 replies; 8+ messages in thread
From: Michael S. Tsirkin @ 2021-02-23 13:01 UTC (permalink / raw)
  To: Eli Cohen
  Cc: jasowang, si-wei.liu, linux-kernel, virtualization, netdev, Parav Pandit

On Tue, Feb 23, 2021 at 02:59:49PM +0200, Eli Cohen wrote:
> On Tue, Feb 23, 2021 at 07:56:16AM -0500, Michael S. Tsirkin wrote:
> > On Tue, Feb 23, 2021 at 02:54:42PM +0200, Eli Cohen wrote:
> > > On Tue, Feb 23, 2021 at 07:52:34AM -0500, Michael S. Tsirkin wrote:
> > > > 
> > > > I think I have them in the linux next branch, no?
> > > > 
> > > 
> > > You do.
> > 
> > I guest there's a conflict with some other patch in that tree then.
> > Can you rebase please?
> > 
> 
> Parav, will send later today.

Sorry, no need to resend Parav's patches in linux-next.
Just this one ...

> > -- 
> > MST
> > 


^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, back to index

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-18  7:41 [PATCH v2] vdpa/mlx5: Enable user to add/delete vdpa device Eli Cohen
2021-02-23 12:29 ` Michael S. Tsirkin
2021-02-23 12:33   ` Eli Cohen
2021-02-23 12:52     ` Michael S. Tsirkin
2021-02-23 12:54       ` Eli Cohen
2021-02-23 12:56         ` Michael S. Tsirkin
2021-02-23 12:59           ` Eli Cohen
2021-02-23 13:01             ` Michael S. Tsirkin

Netdev Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/netdev/0 netdev/git/0.git
	git clone --mirror https://lore.kernel.org/netdev/1 netdev/git/1.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 netdev netdev/ https://lore.kernel.org/netdev \
		netdev@vger.kernel.org
	public-inbox-index netdev

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.netdev


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git