Parav Pandit
2021-Oct-25 12:53 UTC
[PATCH linux-next v5 7/8] vdpa/mlx5: Support configuration of MAC
From: Eli Cohen <elic at nvidia.com> Add code to accept MAC configuration through vdpa tool. The MAC is written into the config struct and later can be retrieved through get_config(). Examples: 1. Configure MAC while adding a device: $ vdpa dev add mgmtdev pci/0000:06:00.2 name vdpa0 mac 00:11:22:33:44:55 2. Show configured params: $ vdpa dev config show vdpa0: mac 00:11:22:33:44:55 link down link_announce false max_vq_pairs 8 mtu 1500 Signed-off-by: Eli Cohen <elic at nvidia.com> Reviewed-by: Parav Pandit <parav at nvidia.com> Acked-by: Jason Wang <jasowang at redhat.com> --- drivers/vdpa/mlx5/net/mlx5_vnet.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c b/drivers/vdpa/mlx5/net/mlx5_vnet.c index 8d1539728a59..860d80efa5d1 100644 --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c @@ -6,6 +6,7 @@ #include <linux/vringh.h> #include <uapi/linux/virtio_net.h> #include <uapi/linux/virtio_ids.h> +#include <uapi/linux/vdpa.h> #include <linux/virtio_config.h> #include <linux/auxiliary_bus.h> #include <linux/mlx5/cq.h> @@ -2523,18 +2524,19 @@ static int mlx5_vdpa_dev_add(struct vdpa_mgmt_dev *v_mdev, const char *name, if (err) goto err_mtu; - ndev->config.mtu = cpu_to_mlx5vdpa16(mvdev, mtu); - ndev->config.status |= cpu_to_mlx5vdpa16(mvdev, VIRTIO_NET_S_LINK_UP); - - err = mlx5_query_nic_vport_mac_address(mdev, 0, 0, config->mac); - if (err) - goto err_mtu; - if (get_link_state(mvdev)) ndev->config.status |= cpu_to_mlx5vdpa16(mvdev, VIRTIO_NET_S_LINK_UP); else ndev->config.status &= cpu_to_mlx5vdpa16(mvdev, ~VIRTIO_NET_S_LINK_UP); + if (add_config->mask & (1 << VDPA_ATTR_DEV_NET_CFG_MACADDR)) { + memcpy(ndev->config.mac, add_config->net.mac, ETH_ALEN); + } else { + err = mlx5_query_nic_vport_mac_address(mdev, 0, 0, config->mac); + if (err) + goto err_mtu; + } + if (!is_zero_ether_addr(config->mac)) { pfmdev = pci_get_drvdata(pci_physfn(mdev->pdev)); err = mlx5_mpfs_add_mac(pfmdev, config->mac); @@ -2632,6 +2634,7 @@ static int mlx5v_probe(struct auxiliary_device *adev, mgtdev->mgtdev.ops = &mdev_ops; mgtdev->mgtdev.device = mdev->device; mgtdev->mgtdev.id_table = id_table; + mgtdev->mgtdev.config_attr_mask = (1 << VDPA_ATTR_DEV_NET_CFG_MACADDR); mgtdev->madev = madev; err = vdpa_mgmtdev_register(&mgtdev->mgtdev); -- 2.25.4
Parav Pandit
2021-Oct-25 18:35 UTC
[PATCH linux-next v5 7/8] vdpa/mlx5: Support configuration of MAC
> From: Parav Pandit <parav at nvidia.com> > Sent: Monday, October 25, 2021 6:23 PM > > From: Eli Cohen <elic at nvidia.com> > > Add code to accept MAC configuration through vdpa tool. The MAC is written > into the config struct and later can be retrieved through get_config(). > > Examples: > 1. Configure MAC while adding a device: > $ vdpa dev add mgmtdev pci/0000:06:00.2 name vdpa0 mac 00:11:22:33:44:55 > > 2. Show configured params: > $ vdpa dev config show > vdpa0: mac 00:11:22:33:44:55 link down link_announce false max_vq_pairs 8 > mtu 1500 > > Signed-off-by: Eli Cohen <elic at nvidia.com> > Reviewed-by: Parav Pandit <parav at nvidia.com> > Acked-by: Jason Wang <jasowang at redhat.com> > --- > drivers/vdpa/mlx5/net/mlx5_vnet.c | 17 ++++++++++------- > 1 file changed, 10 insertions(+), 7 deletions(-) > > diff --git a/drivers/vdpa/mlx5/net/mlx5_vnet.c > b/drivers/vdpa/mlx5/net/mlx5_vnet.c > index 8d1539728a59..860d80efa5d1 100644 > --- a/drivers/vdpa/mlx5/net/mlx5_vnet.c > +++ b/drivers/vdpa/mlx5/net/mlx5_vnet.c > @@ -6,6 +6,7 @@ > #include <linux/vringh.h> > #include <uapi/linux/virtio_net.h> > #include <uapi/linux/virtio_ids.h> > +#include <uapi/linux/vdpa.h> > #include <linux/virtio_config.h> > #include <linux/auxiliary_bus.h> > #include <linux/mlx5/cq.h> > @@ -2523,18 +2524,19 @@ static int mlx5_vdpa_dev_add(struct > vdpa_mgmt_dev *v_mdev, const char *name, > if (err) > goto err_mtu; > > - ndev->config.mtu = cpu_to_mlx5vdpa16(mvdev, mtu);I messed up above line in the rebase conflict. Let me resend the series.> - ndev->config.status |= cpu_to_mlx5vdpa16(mvdev, > VIRTIO_NET_S_LINK_UP); > - > - err = mlx5_query_nic_vport_mac_address(mdev, 0, 0, config->mac); > - if (err) > - goto err_mtu; > - > if (get_link_state(mvdev)) > ndev->config.status |= cpu_to_mlx5vdpa16(mvdev, > VIRTIO_NET_S_LINK_UP); > else > ndev->config.status &= cpu_to_mlx5vdpa16(mvdev, > ~VIRTIO_NET_S_LINK_UP); > > + if (add_config->mask & (1 << VDPA_ATTR_DEV_NET_CFG_MACADDR)) > { > + memcpy(ndev->config.mac, add_config->net.mac, ETH_ALEN); > + } else { > + err = mlx5_query_nic_vport_mac_address(mdev, 0, 0, config- > >mac); > + if (err) > + goto err_mtu; > + } > + > if (!is_zero_ether_addr(config->mac)) { > pfmdev = pci_get_drvdata(pci_physfn(mdev->pdev)); > err = mlx5_mpfs_add_mac(pfmdev, config->mac); @@ -2632,6 > +2634,7 @@ static int mlx5v_probe(struct auxiliary_device *adev, > mgtdev->mgtdev.ops = &mdev_ops; > mgtdev->mgtdev.device = mdev->device; > mgtdev->mgtdev.id_table = id_table; > + mgtdev->mgtdev.config_attr_mask = (1 << > +VDPA_ATTR_DEV_NET_CFG_MACADDR); > mgtdev->madev = madev; > > err = vdpa_mgmtdev_register(&mgtdev->mgtdev); > -- > 2.25.4