| Message ID | 20240723054047.1059994-4-lulu@redhat.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | vdpa: support set mac address from vdpa tool | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
On Tue, Jul 23, 2024 at 1:41 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 > > Signed-off-by: Cindy Lu <lulu@redhat.com> Acked-by: Jason Wang <jasowang@redhat.com> Thanks
On Tue, 2024-07-23 at 13:39 +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 | 28 ++++++++++++++++++++++++++++ > 1 file changed, 28 insertions(+) > > diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c > index ecfc16151d61..7fce952d650f 100644 > --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c > +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c > @@ -3785,10 +3785,38 @@ 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(struct vdpa_mgmt_dev *v_mdev, > + struct vdpa_device *dev, > + const struct vdpa_dev_set_config *add_config) > +{ > + struct virtio_net_config *config; > + struct mlx5_core_dev *pfmdev; > + struct mlx5_vdpa_dev *mvdev; > + struct mlx5_vdpa_net *ndev; > + struct mlx5_core_dev *mdev; > + int err = -EINVAL; > + > + mvdev = to_mvdev(dev); > + ndev = to_mlx5_vdpa_ndev(mvdev); > + mdev = mvdev->mdev; > + config = &ndev->config; > + > + down_write(&ndev->reslock); > + if (add_config->mask & (1 << VDPA_ATTR_DEV_NET_CFG_MACADDR)) { > + pfmdev = pci_get_drvdata(pci_physfn(mdev->pdev)); > + err = mlx5_mpfs_add_mac(pfmdev, config->mac); > + if (0 == err) if (!err) would be nicer. Not a deal breaker though. Reviewed-by: Dragos Tatulea <dtatulea@nvidia.com> > + memcpy(config->mac, add_config->net.mac, ETH_ALEN); > + } > + > + up_write(&ndev->reslock); > + return err; > +} > > 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, > }; > > static struct virtio_device_id id_table[] = {
On Tue, Jul 23, 2024 at 07:49:44AM +0000, Dragos Tatulea wrote: > On Tue, 2024-07-23 at 13:39 +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 | 28 ++++++++++++++++++++++++++++ > > 1 file changed, 28 insertions(+) > > > > diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c > > index ecfc16151d61..7fce952d650f 100644 > > --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c > > +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c > > @@ -3785,10 +3785,38 @@ 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(struct vdpa_mgmt_dev *v_mdev, > > + struct vdpa_device *dev, > > + const struct vdpa_dev_set_config *add_config) > > +{ > > + struct virtio_net_config *config; > > + struct mlx5_core_dev *pfmdev; > > + struct mlx5_vdpa_dev *mvdev; > > + struct mlx5_vdpa_net *ndev; > > + struct mlx5_core_dev *mdev; > > + int err = -EINVAL; > > + > > + mvdev = to_mvdev(dev); > > + ndev = to_mlx5_vdpa_ndev(mvdev); > > + mdev = mvdev->mdev; > > + config = &ndev->config; > > + > > + down_write(&ndev->reslock); > > + if (add_config->mask & (1 << VDPA_ATTR_DEV_NET_CFG_MACADDR)) { > > + pfmdev = pci_get_drvdata(pci_physfn(mdev->pdev)); > > + err = mlx5_mpfs_add_mac(pfmdev, config->mac); > > + if (0 == err) > if (!err) would be nicer. Not a deal breaker though. yes, no yodda style please. It, I can not stand. > Reviewed-by: Dragos Tatulea <dtatulea@nvidia.com> > > > + memcpy(config->mac, add_config->net.mac, ETH_ALEN); > > + } > > + > > + up_write(&ndev->reslock); > > + return err; > > +} > > > > 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, > > }; > > > > static struct virtio_device_id id_table[] = { >
On Tue, 23 Jul 2024 at 19:29, Michael S. Tsirkin <mst@redhat.com> wrote: > > On Tue, Jul 23, 2024 at 07:49:44AM +0000, Dragos Tatulea wrote: > > On Tue, 2024-07-23 at 13:39 +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 | 28 ++++++++++++++++++++++++++++ > > > 1 file changed, 28 insertions(+) > > > > > > diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c > > > index ecfc16151d61..7fce952d650f 100644 > > > --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c > > > +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c > > > @@ -3785,10 +3785,38 @@ 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(struct vdpa_mgmt_dev *v_mdev, > > > + struct vdpa_device *dev, > > > + const struct vdpa_dev_set_config *add_config) > > > +{ > > > + struct virtio_net_config *config; > > > + struct mlx5_core_dev *pfmdev; > > > + struct mlx5_vdpa_dev *mvdev; > > > + struct mlx5_vdpa_net *ndev; > > > + struct mlx5_core_dev *mdev; > > > + int err = -EINVAL; > > > + > > > + mvdev = to_mvdev(dev); > > > + ndev = to_mlx5_vdpa_ndev(mvdev); > > > + mdev = mvdev->mdev; > > > + config = &ndev->config; > > > + > > > + down_write(&ndev->reslock); > > > + if (add_config->mask & (1 << VDPA_ATTR_DEV_NET_CFG_MACADDR)) { > > > + pfmdev = pci_get_drvdata(pci_physfn(mdev->pdev)); > > > + err = mlx5_mpfs_add_mac(pfmdev, config->mac); > > > + if (0 == err) > > if (!err) would be nicer. Not a deal breaker though. > > yes, no yodda style please. It, I can not stand. > sure， Will fix this Thanks cindy > > > Reviewed-by: Dragos Tatulea <dtatulea@nvidia.com> > > > > > + memcpy(config->mac, add_config->net.mac, ETH_ALEN); > > > + } > > > + > > > + up_write(&ndev->reslock); > > > + return err; > > > +} > > > > > > 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, > > > }; > > > > > > static struct virtio_device_id id_table[] = { > > >
diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c index ecfc16151d61..7fce952d650f 100644 --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c @@ -3785,10 +3785,38 @@ 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(struct vdpa_mgmt_dev *v_mdev, + struct vdpa_device *dev, + const struct vdpa_dev_set_config *add_config) +{ + struct virtio_net_config *config; + struct mlx5_core_dev *pfmdev; + struct mlx5_vdpa_dev *mvdev; + struct mlx5_vdpa_net *ndev; + struct mlx5_core_dev *mdev; + int err = -EINVAL; + + mvdev = to_mvdev(dev); + ndev = to_mlx5_vdpa_ndev(mvdev); + mdev = mvdev->mdev; + config = &ndev->config; + + down_write(&ndev->reslock); + if (add_config->mask & (1 << VDPA_ATTR_DEV_NET_CFG_MACADDR)) { + pfmdev = pci_get_drvdata(pci_physfn(mdev->pdev)); + err = mlx5_mpfs_add_mac(pfmdev, config->mac); + if (0 == err) + memcpy(config->mac, add_config->net.mac, ETH_ALEN); + } + + up_write(&ndev->reslock); + return err; +} 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, }; static struct virtio_device_id id_table[] = {
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 | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+)