[PATCH] vdpa/mlx5: Add the support of set mac address

[PATCH] vdpa/mlx5: Add the support of set mac address

[Cindy Lu]

Add the function to support setting the MAC address.
For vdpa/mlx5, the function will use mlx5_mpfs_add_mac
to set the mac address

Tested in ConnectX-6 Dx device

Signed-off-by: Cindy Lu <lulu@redhat.com>
---
 drivers/vdpa/mlx5/net/mlx5_vnet.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c
index 26ba7da6b410..f78701386690 100644
--- a/drivers/vdpa/mlx5/net/mlx5_vnet.c
+++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c
@@ -3616,10 +3616,33 @@ static void mlx5_vdpa_dev_del(struct vdpa_mgmt_dev *v_mdev, struct vdpa_device *
 	destroy_workqueue(wq);
 	mgtdev->ndev = NULL;
 }
+static int mlx5_vdpa_set_attr_mac(struct vdpa_mgmt_dev *v_mdev,
+				  struct vdpa_device *dev,
+				  const struct vdpa_dev_set_config *add_config)
+{
+	struct mlx5_vdpa_dev *mvdev = to_mvdev(dev);
+	struct mlx5_vdpa_net *ndev = to_mlx5_vdpa_ndev(mvdev);
+	struct mlx5_core_dev *mdev = mvdev->mdev;
+	struct virtio_net_config *config = &ndev->config;
+	int err;
+	struct mlx5_core_dev *pfmdev;
+
+	if (add_config->mask & (1 << VDPA_ATTR_DEV_NET_CFG_MACADDR)) {
+		if (!is_zero_ether_addr(add_config->net.mac)) {
+			memcpy(config->mac, add_config->net.mac, ETH_ALEN);
+			pfmdev = pci_get_drvdata(pci_physfn(mdev->pdev));
+			err = mlx5_mpfs_add_mac(pfmdev, config->mac);
+			if (err)
+				return -1;
+		}
+	}
+	return 0;
+}
 
 static const struct vdpa_mgmtdev_ops mdev_ops = {
 	.dev_add = mlx5_vdpa_dev_add,
 	.dev_del = mlx5_vdpa_dev_del,
+	.dev_set_attr = mlx5_vdpa_set_attr_mac,
 };
 
 static struct virtio_device_id id_table[] = {
-- 
2.45.0

Re: [PATCH] vdpa/mlx5: Add the support of set mac address

[Jason Wang]

On Mon, Jul 8, 2024 at 2:56 PM Cindy Lu <lulu@redhat.com> wrote:
>
> Add the function to support setting the MAC address.
> For vdpa/mlx5, the function will use mlx5_mpfs_add_mac
> to set the mac address
>
> Tested in ConnectX-6 Dx device

Great.

>
> Signed-off-by: Cindy Lu <lulu@redhat.com>

I guess this should be part of the series "vdpa: support set mac
address from vdpa tool" ?

> ---
>  drivers/vdpa/mlx5/net/mlx5_vnet.c | 23 +++++++++++++++++++++++
>  1 file changed, 23 insertions(+)
>
> diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c
> index 26ba7da6b410..f78701386690 100644
> --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c
> +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c
> @@ -3616,10 +3616,33 @@ static void mlx5_vdpa_dev_del(struct vdpa_mgmt_dev *v_mdev, struct vdpa_device *
>         destroy_workqueue(wq);
>         mgtdev->ndev = NULL;
>  }
> +static int mlx5_vdpa_set_attr_mac(struct vdpa_mgmt_dev *v_mdev,
> +                                 struct vdpa_device *dev,
> +                                 const struct vdpa_dev_set_config *add_config)
> +{
> +       struct mlx5_vdpa_dev *mvdev = to_mvdev(dev);
> +       struct mlx5_vdpa_net *ndev = to_mlx5_vdpa_ndev(mvdev);
> +       struct mlx5_core_dev *mdev = mvdev->mdev;
> +       struct virtio_net_config *config = &ndev->config;
> +       int err;
> +       struct mlx5_core_dev *pfmdev;
> +
> +       if (add_config->mask & (1 << VDPA_ATTR_DEV_NET_CFG_MACADDR)) {
> +               if (!is_zero_ether_addr(add_config->net.mac)) {
> +                       memcpy(config->mac, add_config->net.mac, ETH_ALEN);
> +                       pfmdev = pci_get_drvdata(pci_physfn(mdev->pdev));
> +                       err = mlx5_mpfs_add_mac(pfmdev, config->mac);
> +                       if (err)
> +                               return -1;
> +               }
> +       }
> +       return 0;
> +}
>
>  static const struct vdpa_mgmtdev_ops mdev_ops = {
>         .dev_add = mlx5_vdpa_dev_add,
>         .dev_del = mlx5_vdpa_dev_del,
> +       .dev_set_attr = mlx5_vdpa_set_attr_mac,

Let's rename this as we will add the support for mtu as well or not?

Thanks

>  };
>
>  static struct virtio_device_id id_table[] = {
> --
> 2.45.0
>

Re: [PATCH] vdpa/mlx5: Add the support of set mac address

[Dragos Tatulea]

On Mon, 2024-07-08 at 14:55 +0800, Cindy Lu wrote:
> Add the function to support setting the MAC address.
> For vdpa/mlx5, the function will use mlx5_mpfs_add_mac
> to set the mac address
> 
> Tested in ConnectX-6 Dx device
> 
> Signed-off-by: Cindy Lu <lulu@redhat.com>
> ---
>  drivers/vdpa/mlx5/net/mlx5_vnet.c | 23 +++++++++++++++++++++++
>  1 file changed, 23 insertions(+)
> 
> diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c
> index 26ba7da6b410..f78701386690 100644
> --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c
> +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c
> @@ -3616,10 +3616,33 @@ static void mlx5_vdpa_dev_del(struct vdpa_mgmt_dev *v_mdev, struct vdpa_device *
>  	destroy_workqueue(wq);
>  	mgtdev->ndev = NULL;
>  }
> +static int mlx5_vdpa_set_attr_mac(struct vdpa_mgmt_dev *v_mdev,
> +				  struct vdpa_device *dev,
> +				  const struct vdpa_dev_set_config *add_config)
> +{
> +	struct mlx5_vdpa_dev *mvdev = to_mvdev(dev);
> +	struct mlx5_vdpa_net *ndev = to_mlx5_vdpa_ndev(mvdev);
> +	struct mlx5_core_dev *mdev = mvdev->mdev;
> +	struct virtio_net_config *config = &ndev->config;
> +	int err;
> +	struct mlx5_core_dev *pfmdev;
> +
You need to take the ndev->reslock.

> +	if (add_config->mask & (1 << VDPA_ATTR_DEV_NET_CFG_MACADDR)) {
> +		if (!is_zero_ether_addr(add_config->net.mac)) {
> +			memcpy(config->mac, add_config->net.mac, ETH_ALEN);
I would do the memcpy after mlx5_mpfs_add_mac() was called successfully. This
way the config gets changed only on success.

> +			pfmdev = pci_get_drvdata(pci_physfn(mdev->pdev));
> +			err = mlx5_mpfs_add_mac(pfmdev, config->mac);
> +			if (err)
> +				return -1;
> +		}
> +	}
> +	return 0;
> +}
>  
>  static const struct vdpa_mgmtdev_ops mdev_ops = {
>  	.dev_add = mlx5_vdpa_dev_add,
>  	.dev_del = mlx5_vdpa_dev_del,
> +	.dev_set_attr = mlx5_vdpa_set_attr_mac,
>  };
>  
>  static struct virtio_device_id id_table[] = {

Thanks,
Dragos

Re: [PATCH] vdpa/mlx5: Add the support of set mac address

[Michael S. Tsirkin]

On Mon, Jul 08, 2024 at 02:55:49PM +0800, Cindy Lu wrote:
> Add the function to support setting the MAC address.
> For vdpa/mlx5, the function will use mlx5_mpfs_add_mac
> to set the mac address
> 
> Tested in ConnectX-6 Dx device
> 
> Signed-off-by: Cindy Lu <lulu@redhat.com>

Is this on top of your other patchset?

> ---
>  drivers/vdpa/mlx5/net/mlx5_vnet.c | 23 +++++++++++++++++++++++
>  1 file changed, 23 insertions(+)
> 
> diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c
> index 26ba7da6b410..f78701386690 100644
> --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c
> +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c
> @@ -3616,10 +3616,33 @@ static void mlx5_vdpa_dev_del(struct vdpa_mgmt_dev *v_mdev, struct vdpa_device *
>  	destroy_workqueue(wq);
>  	mgtdev->ndev = NULL;
>  }
> +static int mlx5_vdpa_set_attr_mac(struct vdpa_mgmt_dev *v_mdev,
> +				  struct vdpa_device *dev,
> +				  const struct vdpa_dev_set_config *add_config)
> +{
> +	struct mlx5_vdpa_dev *mvdev = to_mvdev(dev);
> +	struct mlx5_vdpa_net *ndev = to_mlx5_vdpa_ndev(mvdev);
> +	struct mlx5_core_dev *mdev = mvdev->mdev;
> +	struct virtio_net_config *config = &ndev->config;
> +	int err;
> +	struct mlx5_core_dev *pfmdev;
> +
> +	if (add_config->mask & (1 << VDPA_ATTR_DEV_NET_CFG_MACADDR)) {
> +		if (!is_zero_ether_addr(add_config->net.mac)) {
> +			memcpy(config->mac, add_config->net.mac, ETH_ALEN);
> +			pfmdev = pci_get_drvdata(pci_physfn(mdev->pdev));
> +			err = mlx5_mpfs_add_mac(pfmdev, config->mac);
> +			if (err)
> +				return -1;
> +		}
> +	}
> +	return 0;
> +}
>  
>  static const struct vdpa_mgmtdev_ops mdev_ops = {
>  	.dev_add = mlx5_vdpa_dev_add,
>  	.dev_del = mlx5_vdpa_dev_del,
> +	.dev_set_attr = mlx5_vdpa_set_attr_mac,
>  };
>  
>  static struct virtio_device_id id_table[] = {
> -- 
> 2.45.0

Re: [PATCH] vdpa/mlx5: Add the support of set mac address

[Andrew Lunn]

On Mon, Jul 08, 2024 at 02:55:49PM +0800, Cindy Lu wrote:
> Add the function to support setting the MAC address.
> For vdpa/mlx5, the function will use mlx5_mpfs_add_mac
> to set the mac address
> 
> Tested in ConnectX-6 Dx device
> 
> Signed-off-by: Cindy Lu <lulu@redhat.com>
> ---
>  drivers/vdpa/mlx5/net/mlx5_vnet.c | 23 +++++++++++++++++++++++
>  1 file changed, 23 insertions(+)
> 
> diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c
> index 26ba7da6b410..f78701386690 100644
> --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c
> +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c
> @@ -3616,10 +3616,33 @@ static void mlx5_vdpa_dev_del(struct vdpa_mgmt_dev *v_mdev, struct vdpa_device *
>  	destroy_workqueue(wq);
>  	mgtdev->ndev = NULL;
>  }
> +static int mlx5_vdpa_set_attr_mac(struct vdpa_mgmt_dev *v_mdev,
> +				  struct vdpa_device *dev,
> +				  const struct vdpa_dev_set_config *add_config)
> +{
> +	struct mlx5_vdpa_dev *mvdev = to_mvdev(dev);
> +	struct mlx5_vdpa_net *ndev = to_mlx5_vdpa_ndev(mvdev);
> +	struct mlx5_core_dev *mdev = mvdev->mdev;
> +	struct virtio_net_config *config = &ndev->config;
> +	int err;
> +	struct mlx5_core_dev *pfmdev;
> +
> +	if (add_config->mask & (1 << VDPA_ATTR_DEV_NET_CFG_MACADDR)) {
> +		if (!is_zero_ether_addr(add_config->net.mac)) {

Is the core happy to call into the driver without validating the MAC
address? Will the core pass the broadcast address? That is not
zero. Or a multicast address? Should every driver repeat the same
validation, and probably get it just as wrong?

    Andrew

---
pw-bot: cr

RE: [PATCH] vdpa/mlx5: Add the support of set mac address

[Parav Pandit]

Hi Andrew,

> From: Andrew Lunn <andrew@lunn.ch>
> Sent: Tuesday, July 9, 2024 12:31 AM
> To: Cindy Lu <lulu@redhat.com>
> Cc: Dragos Tatulea <dtatulea@nvidia.com>; mst@redhat.com;
> jasowang@redhat.com; Parav Pandit <parav@nvidia.com>;
> sgarzare@redhat.com; netdev@vger.kernel.org; virtualization@lists.linux-
> foundation.org; linux-kernel@vger.kernel.org; kvm@vger.kernel.org
> Subject: Re: [PATCH] vdpa/mlx5: Add the support of set mac address
> 
> On Mon, Jul 08, 2024 at 02:55:49PM +0800, Cindy Lu wrote:
> > Add the function to support setting the MAC address.
> > For vdpa/mlx5, the function will use mlx5_mpfs_add_mac to set the mac
> > address
> >
> > Tested in ConnectX-6 Dx device
> >
> > Signed-off-by: Cindy Lu <lulu@redhat.com>
> > ---
> >  drivers/vdpa/mlx5/net/mlx5_vnet.c | 23 +++++++++++++++++++++++
> >  1 file changed, 23 insertions(+)
> >
> > diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c
> > b/drivers/vdpa/mlx5/net/mlx5_vnet.c
> > index 26ba7da6b410..f78701386690 100644
> > --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c
> > +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c
> > @@ -3616,10 +3616,33 @@ static void mlx5_vdpa_dev_del(struct
> vdpa_mgmt_dev *v_mdev, struct vdpa_device *
> >  	destroy_workqueue(wq);
> >  	mgtdev->ndev = NULL;
> >  }
> > +static int mlx5_vdpa_set_attr_mac(struct vdpa_mgmt_dev *v_mdev,
> > +				  struct vdpa_device *dev,
> > +				  const struct vdpa_dev_set_config
> *add_config) {
> > +	struct mlx5_vdpa_dev *mvdev = to_mvdev(dev);
> > +	struct mlx5_vdpa_net *ndev = to_mlx5_vdpa_ndev(mvdev);
> > +	struct mlx5_core_dev *mdev = mvdev->mdev;
> > +	struct virtio_net_config *config = &ndev->config;
> > +	int err;
> > +	struct mlx5_core_dev *pfmdev;
> > +
> > +	if (add_config->mask & (1 <<
> VDPA_ATTR_DEV_NET_CFG_MACADDR)) {
> > +		if (!is_zero_ether_addr(add_config->net.mac)) {
> 
> Is the core happy to call into the driver without validating the MAC address?
> Will the core pass the broadcast address? That is not zero. Or a multicast
> address? Should every driver repeat the same validation, and probably get it
> just as wrong?
> 
>     Andrew
> 
I will submit the patch to add the check in the vdpa core for mac address validation.

> ---
> pw-bot: cr

Re: [PATCH] vdpa/mlx5: Add the support of set mac address

[Ratheesh Kannoth]

On 2024-07-08 at 12:25:49, Cindy Lu (lulu@redhat.com) wrote:
> +static int mlx5_vdpa_set_attr_mac(struct vdpa_mgmt_dev *v_mdev,
> +				  struct vdpa_device *dev,
> +				  const struct vdpa_dev_set_config *add_config)
> +{
> +	struct mlx5_vdpa_dev *mvdev = to_mvdev(dev);
> +	struct mlx5_vdpa_net *ndev = to_mlx5_vdpa_ndev(mvdev);
> +	struct mlx5_core_dev *mdev = mvdev->mdev;
> +	struct virtio_net_config *config = &ndev->config;
> +	int err;
> +	struct mlx5_core_dev *pfmdev;
nit: reverse xmas tree; may be, split assigment and definition.

>

Re: [PATCH] vdpa/mlx5: Add the support of set mac address

[Cindy Lu]

On Mon, 8 Jul 2024 at 15:03, Jason Wang <jasowang@redhat.com> wrote:
>
> On Mon, Jul 8, 2024 at 2:56 PM Cindy Lu <lulu@redhat.com> wrote:
> >
> > Add the function to support setting the MAC address.
> > For vdpa/mlx5, the function will use mlx5_mpfs_add_mac
> > to set the mac address
> >
> > Tested in ConnectX-6 Dx device
>
> Great.
>
> >
> > Signed-off-by: Cindy Lu <lulu@redhat.com>
>
> I guess this should be part of the series "vdpa: support set mac
> address from vdpa tool" ?
>
yes, Will add this in next version
Thanks
cindy
> > ---
> >  drivers/vdpa/mlx5/net/mlx5_vnet.c | 23 +++++++++++++++++++++++
> >  1 file changed, 23 insertions(+)
> >
> > diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c
> > index 26ba7da6b410..f78701386690 100644
> > --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c
> > +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c
> > @@ -3616,10 +3616,33 @@ static void mlx5_vdpa_dev_del(struct vdpa_mgmt_dev *v_mdev, struct vdpa_device *
> >         destroy_workqueue(wq);
> >         mgtdev->ndev = NULL;
> >  }
> > +static int mlx5_vdpa_set_attr_mac(struct vdpa_mgmt_dev *v_mdev,
> > +                                 struct vdpa_device *dev,
> > +                                 const struct vdpa_dev_set_config *add_config)
> > +{
> > +       struct mlx5_vdpa_dev *mvdev = to_mvdev(dev);
> > +       struct mlx5_vdpa_net *ndev = to_mlx5_vdpa_ndev(mvdev);
> > +       struct mlx5_core_dev *mdev = mvdev->mdev;
> > +       struct virtio_net_config *config = &ndev->config;
> > +       int err;
> > +       struct mlx5_core_dev *pfmdev;
> > +
> > +       if (add_config->mask & (1 << VDPA_ATTR_DEV_NET_CFG_MACADDR)) {
> > +               if (!is_zero_ether_addr(add_config->net.mac)) {
> > +                       memcpy(config->mac, add_config->net.mac, ETH_ALEN);
> > +                       pfmdev = pci_get_drvdata(pci_physfn(mdev->pdev));
> > +                       err = mlx5_mpfs_add_mac(pfmdev, config->mac);
> > +                       if (err)
> > +                               return -1;
> > +               }
> > +       }
> > +       return 0;
> > +}
> >
> >  static const struct vdpa_mgmtdev_ops mdev_ops = {
> >         .dev_add = mlx5_vdpa_dev_add,
> >         .dev_del = mlx5_vdpa_dev_del,
> > +       .dev_set_attr = mlx5_vdpa_set_attr_mac,
>
> Let's rename this as we will add the support for mtu as well or not?
>
sure ,will change this
Thanks
cindy
> Thanks
>
> >  };
> >
> >  static struct virtio_device_id id_table[] = {
> > --
> > 2.45.0
> >
>

Re: [PATCH] vdpa/mlx5: Add the support of set mac address

[Cindy Lu]

On Mon, 8 Jul 2024 at 19:26, Michael S. Tsirkin <mst@redhat.com> wrote:
>
> On Mon, Jul 08, 2024 at 02:55:49PM +0800, Cindy Lu wrote:
> > Add the function to support setting the MAC address.
> > For vdpa/mlx5, the function will use mlx5_mpfs_add_mac
> > to set the mac address
> >
> > Tested in ConnectX-6 Dx device
> >
> > Signed-off-by: Cindy Lu <lulu@redhat.com>
>
> Is this on top of your other patchset?
>
yes, Will send a new version of these patch
Thanks
cindy
> > ---
> >  drivers/vdpa/mlx5/net/mlx5_vnet.c | 23 +++++++++++++++++++++++
> >  1 file changed, 23 insertions(+)
> >
> > diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c
> > index 26ba7da6b410..f78701386690 100644
> > --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c
> > +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c
> > @@ -3616,10 +3616,33 @@ static void mlx5_vdpa_dev_del(struct vdpa_mgmt_dev *v_mdev, struct vdpa_device *
> >       destroy_workqueue(wq);
> >       mgtdev->ndev = NULL;
> >  }
> > +static int mlx5_vdpa_set_attr_mac(struct vdpa_mgmt_dev *v_mdev,
> > +                               struct vdpa_device *dev,
> > +                               const struct vdpa_dev_set_config *add_config)
> > +{
> > +     struct mlx5_vdpa_dev *mvdev = to_mvdev(dev);
> > +     struct mlx5_vdpa_net *ndev = to_mlx5_vdpa_ndev(mvdev);
> > +     struct mlx5_core_dev *mdev = mvdev->mdev;
> > +     struct virtio_net_config *config = &ndev->config;
> > +     int err;
> > +     struct mlx5_core_dev *pfmdev;
> > +
> > +     if (add_config->mask & (1 << VDPA_ATTR_DEV_NET_CFG_MACADDR)) {
> > +             if (!is_zero_ether_addr(add_config->net.mac)) {
> > +                     memcpy(config->mac, add_config->net.mac, ETH_ALEN);
> > +                     pfmdev = pci_get_drvdata(pci_physfn(mdev->pdev));
> > +                     err = mlx5_mpfs_add_mac(pfmdev, config->mac);
> > +                     if (err)
> > +                             return -1;
> > +             }
> > +     }
> > +     return 0;
> > +}
> >
> >  static const struct vdpa_mgmtdev_ops mdev_ops = {
> >       .dev_add = mlx5_vdpa_dev_add,
> >       .dev_del = mlx5_vdpa_dev_del,
> > +     .dev_set_attr = mlx5_vdpa_set_attr_mac,
> >  };
> >
> >  static struct virtio_device_id id_table[] = {
> > --
> > 2.45.0
>

Re: [PATCH] vdpa/mlx5: Add the support of set mac address

[Cindy Lu]

On Tue, 9 Jul 2024 at 12:56, Ratheesh Kannoth <rkannoth@marvell.com> wrote:
>
> On 2024-07-08 at 12:25:49, Cindy Lu (lulu@redhat.com) wrote:
> > +static int mlx5_vdpa_set_attr_mac(struct vdpa_mgmt_dev *v_mdev,
> > +                               struct vdpa_device *dev,
> > +                               const struct vdpa_dev_set_config *add_config)
> > +{
> > +     struct mlx5_vdpa_dev *mvdev = to_mvdev(dev);
> > +     struct mlx5_vdpa_net *ndev = to_mlx5_vdpa_ndev(mvdev);
> > +     struct mlx5_core_dev *mdev = mvdev->mdev;
> > +     struct virtio_net_config *config = &ndev->config;
> > +     int err;
> > +     struct mlx5_core_dev *pfmdev;
> nit: reverse xmas tree; may be, split assigment and definition.
>
Thanks, Will change this
Thanks
cindy
> >
>

Re: [PATCH] vdpa/mlx5: Add the support of set mac address

[Cindy Lu]

On Mon, 8 Jul 2024 at 15:27, Dragos Tatulea <dtatulea@nvidia.com> wrote:
>
> On Mon, 2024-07-08 at 14:55 +0800, Cindy Lu wrote:
> > Add the function to support setting the MAC address.
> > For vdpa/mlx5, the function will use mlx5_mpfs_add_mac
> > to set the mac address
> >
> > Tested in ConnectX-6 Dx device
> >
> > Signed-off-by: Cindy Lu <lulu@redhat.com>
> > ---
> >  drivers/vdpa/mlx5/net/mlx5_vnet.c | 23 +++++++++++++++++++++++
> >  1 file changed, 23 insertions(+)
> >
> > diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c
> > index 26ba7da6b410..f78701386690 100644
> > --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c
> > +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c
> > @@ -3616,10 +3616,33 @@ static void mlx5_vdpa_dev_del(struct vdpa_mgmt_dev *v_mdev, struct vdpa_device *
> >       destroy_workqueue(wq);
> >       mgtdev->ndev = NULL;
> >  }
> > +static int mlx5_vdpa_set_attr_mac(struct vdpa_mgmt_dev *v_mdev,
> > +                               struct vdpa_device *dev,
> > +                               const struct vdpa_dev_set_config *add_config)
> > +{
> > +     struct mlx5_vdpa_dev *mvdev = to_mvdev(dev);
> > +     struct mlx5_vdpa_net *ndev = to_mlx5_vdpa_ndev(mvdev);
> > +     struct mlx5_core_dev *mdev = mvdev->mdev;
> > +     struct virtio_net_config *config = &ndev->config;
> > +     int err;
> > +     struct mlx5_core_dev *pfmdev;
> > +
> You need to take the ndev->reslock.
>
thanks will change this
> > +     if (add_config->mask & (1 << VDPA_ATTR_DEV_NET_CFG_MACADDR)) {
> > +             if (!is_zero_ether_addr(add_config->net.mac)) {
> > +                     memcpy(config->mac, add_config->net.mac, ETH_ALEN);
> I would do the memcpy after mlx5_mpfs_add_mac() was called successfully. This
> way the config gets changed only on success.
>
thanks Dragos， Will fix this
thanks
cindy
> > +                     pfmdev = pci_get_drvdata(pci_physfn(mdev->pdev));
> > +                     err = mlx5_mpfs_add_mac(pfmdev, config->mac);
> > +                     if (err)
> > +                             return -1;
> > +             }
> > +     }
> > +     return 0;
> > +}
> >
> >  static const struct vdpa_mgmtdev_ops mdev_ops = {
> >       .dev_add = mlx5_vdpa_dev_add,
> >       .dev_del = mlx5_vdpa_dev_del,
> > +     .dev_set_attr = mlx5_vdpa_set_attr_mac,
> >  };
> >
> >  static struct virtio_device_id id_table[] = {
>
> Thanks,
> Dragos
>