Skip to contentSkip to conversation

vdpa: support set mac address from vdpa tool

PATCH Superseded Cindy Lu 3 participants 15 messages Jul 22, 2024 – Jul 23, 2024

Subsystems (4)

v4 of 8 Superseded Latest is v8 →

lore
Share & tools
lore

Cindy Lu

author
#0 lore raw

v4 cover vdpa: support set mac address from vdpa tool

Add support for setting the MAC address using the VDPA tool. This feature will allow setting the MAC address using the VDPA tool. For example, in vdpa_sim_net, the implementation sets the MAC address to the config space. However, for other drivers, they can implement their own function, not limited to the config space.

Changelog v2
- Changed the function name to prevent misunderstanding
- Added check for blk device
- Addressed the comments
Changelog v3
- Split the function of the net device from vdpa_nl_cmd_dev_attr_set_doit
- Add a lock for the network device's dev_set_attr operation
- Address the comments
Changelog v4
- Address the comments
- Add a lock for the vdap_sim_net device's dev_set_attr operation

Cindy Lu (3):
vdpa: support set mac address from vdpa tool
vdpa_sim_net: Add the support of set mac address vdpa/mlx5: Add the support of set mac address

 drivers/vdpa/mlx5/net/mlx5_vnet.c    | 25 +++++++++
 drivers/vdpa/vdpa.c                  | 84 ++++++++++++++++++++++++++++
 drivers/vdpa/vdpa_sim/vdpa_sim_net.c | 22 +++++++-
 include/linux/vdpa.h                 |  9 +++
 include/uapi/linux/vdpa.h            |  1 +
 5 files changed, 140 insertions(+), 1 deletion(-)
Signature · 1 line
2.45.0
author
#1 lore raw

PATCH v4 1/3 vdpa: support set mac address from vdpa tool

Add new UAPI to support the mac address from vdpa tool Function vdpa_nl_cmd_dev_attr_set_doit() will get the new MAC address from the vdpa tool and then set it to the device.

The usage is: vdpa dev set name vdpa_name mac **:**:**:**:**:**

Here is example:

root@L1# vdpa -jp dev config show vdpa0
{
    "config": {
        "vdpa0": {
            "mac": "82:4d:e9:5d:d7:e6",
            "link ": "up",
            "link_announce ": false,
            "mtu": 1500
        }
    }
}
root@L1# vdpa dev set name vdpa0 mac 00:11:22:33:44:55
root@L1# vdpa -jp dev config show vdpa0
{
    "config": {
        "vdpa0": {
            "mac": "00:11:22:33:44:55",
            "link ": "up",
            "link_announce ": false,
            "mtu": 1500
        }
    }
}
---
 drivers/vdpa/vdpa.c       | 84 +++++++++++++++++++++++++++++++++++++++
 include/linux/vdpa.h      |  9 +++++
 include/uapi/linux/vdpa.h |  1 +
 3 files changed, 94 insertions(+)
drivers/vdpa/vdpa.c +84 -0
index 8d391947eb8d..07d61ee62839 100644
@@ -1361,6 +1361,85 @@ static int vdpa_nl_cmd_dev_config_get_doit(struct sk_buff *skb, struct genl_info
 	return err;
 }
 
+static int vdpa_dev_net_device_attr_set(struct vdpa_device *vdev,
+					struct genl_info *info)
+{
+	struct vdpa_dev_set_config set_config = {};
+	const u8 *macaddr;
+	struct vdpa_mgmt_dev *mdev = vdev->mdev;
+	struct nlattr **nl_attrs = info->attrs;
+	int err = -EINVAL;
+
+	if (!vdev->mdev)
+		return -EINVAL;
+
+	down_write(&vdev->cf_lock);
+	if ((mdev->supported_features & BIT_ULL(VIRTIO_NET_F_MAC)) &&
+	    nl_attrs[VDPA_ATTR_DEV_NET_CFG_MACADDR]) {
+		set_config.mask |= BIT_ULL(VDPA_ATTR_DEV_NET_CFG_MACADDR);
+		macaddr = nla_data(nl_attrs[VDPA_ATTR_DEV_NET_CFG_MACADDR]);
+
+		if (is_valid_ether_addr(macaddr)) {
+			memcpy(set_config.net.mac, macaddr, ETH_ALEN);
+			if (mdev->ops->dev_set_attr) {
+				err = mdev->ops->dev_set_attr(mdev, vdev,
+							      &set_config);
+			} else {
+				NL_SET_ERR_MSG_FMT_MOD(info->extack,
+						       "device not supported");
+			}
+		} else {
+			NL_SET_ERR_MSG_FMT_MOD(info->extack,
+					       "Invalid MAC address");
+		}
+	}
+	up_write(&vdev->cf_lock);
+	return err;
+}
+static int vdpa_nl_cmd_dev_attr_set_doit(struct sk_buff *skb,
+					 struct genl_info *info)
+{
+	const char *name;
+	int err = 0;
+	struct device *dev;
+	struct vdpa_device *vdev;
+	u64 classes;
+
+	if (!info->attrs[VDPA_ATTR_DEV_NAME])
+		return -EINVAL;
+
+	name = nla_data(info->attrs[VDPA_ATTR_DEV_NAME]);
+
+	down_write(&vdpa_dev_lock);
+	dev = bus_find_device(&vdpa_bus, NULL, name, vdpa_name_match);
+	if (!dev) {
+		NL_SET_ERR_MSG_MOD(info->extack, "device not found");
+		err = -ENODEV;
+		goto dev_err;
+	}
+	vdev = container_of(dev, struct vdpa_device, dev);
+	if (!vdev->mdev) {
+		NL_SET_ERR_MSG_MOD(
+			info->extack,
+			"Fail to find the specified management device");
+		err = -EINVAL;
+		goto mdev_err;
+	}
+	classes = vdpa_mgmtdev_get_classes(vdev->mdev, NULL);
+	if (classes & BIT_ULL(VIRTIO_ID_NET)) {
+		err = vdpa_dev_net_device_attr_set(vdev, info);
+	} else {
+		NL_SET_ERR_MSG_FMT_MOD(info->extack, "%s device not supported",
+				       name);
+	}
+
+mdev_err:
+	put_device(dev);
+dev_err:
+	up_write(&vdpa_dev_lock);
+	return err;
+}
+
 static int vdpa_dev_config_dump(struct device *dev, void *data)
 {
 	struct vdpa_device *vdev = container_of(dev, struct vdpa_device, dev);
@@ -1497,6 +1576,11 @@ static const struct genl_ops vdpa_nl_ops[] = {
 		.doit = vdpa_nl_cmd_dev_stats_get_doit,
 		.flags = GENL_ADMIN_PERM,
 	},
+	{
+		.cmd = VDPA_CMD_DEV_ATTR_SET,
+		.doit = vdpa_nl_cmd_dev_attr_set_doit,
+		.flags = GENL_ADMIN_PERM,
+	},
 };
 
 static struct genl_family vdpa_nl_family __ro_after_init = {
include/linux/vdpa.h +9 -0
index 7977ca03ac7a..3511156c10db 100644
@@ -582,11 +582,20 @@ void vdpa_set_status(struct vdpa_device *vdev, u8 status);
  *	     @dev: vdpa device to remove
  *	     Driver need to remove the specified device by calling
  *	     _vdpa_unregister_device().
+  * @dev_set_attr: change a vdpa device's attr after it was create
+ *	     @mdev: parent device to use for device
+ *	     @dev: vdpa device structure
+ *	     @config:Attributes to be set for the device.
+ *	     The driver needs to check the mask of the structure and then set
+ *	     the related information to the vdpa device. The driver must return 0
+ *	     if set successfully.
  */
 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 (*dev_set_attr)(struct vdpa_mgmt_dev *mdev, struct vdpa_device *dev,
+			    const struct vdpa_dev_set_config *config);
 };
 
 /**
include/uapi/linux/vdpa.h +1 -0
index 842bf1201ac4..71edf2c70cc3 100644
@@ -19,6 +19,7 @@ enum vdpa_command {
 	VDPA_CMD_DEV_GET,		/* can dump */
 	VDPA_CMD_DEV_CONFIG_GET,	/* can dump */
 	VDPA_CMD_DEV_VSTATS_GET,
+	VDPA_CMD_DEV_ATTR_SET,
 };
 
 enum vdpa_attr {
Signature · 1 line
2.45.0
author
#2 lore raw

PATCH v4 2/3 vdpa_sim_net: Add the support of set mac address

In reply to Cindy Lu

Add the function to support setting the MAC address. For vdpa_sim_net, the driver will write the MAC address to the config space, and other devices can implement their own functions to support this.

---
 drivers/vdpa/vdpa_sim/vdpa_sim_net.c | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)
drivers/vdpa/vdpa_sim/vdpa_sim_net.c +21 -1
index cfe962911804..936e33e5021a 100644
@@ -414,6 +414,25 @@ static void vdpasim_net_get_config(struct vdpasim *vdpasim, void *config)
 	net_config->status = cpu_to_vdpasim16(vdpasim, VIRTIO_NET_S_LINK_UP);
 }
 
+static int vdpasim_net_set_attr(struct vdpa_mgmt_dev *mdev,
+				struct vdpa_device *dev,
+				const struct vdpa_dev_set_config *config)
+{
+	struct vdpasim *vdpasim = container_of(dev, struct vdpasim, vdpa);
+	struct virtio_net_config *vio_config = vdpasim->config;
+
+	mutex_lock(&vdpasim->mutex);
+
+	if (config->mask & (1 << VDPA_ATTR_DEV_NET_CFG_MACADDR)) {
+		memcpy(vio_config->mac, config->net.mac, ETH_ALEN);
+		mutex_unlock(&vdpasim->mutex);
+		return 0;
+	}
+
+	mutex_unlock(&vdpasim->mutex);
+	return -EINVAL;
+}
+
 static void vdpasim_net_setup_config(struct vdpasim *vdpasim,
 				     const struct vdpa_dev_set_config *config)
 {
@@ -510,7 +529,8 @@ static void vdpasim_net_dev_del(struct vdpa_mgmt_dev *mdev,
 
 static const struct vdpa_mgmtdev_ops vdpasim_net_mgmtdev_ops = {
 	.dev_add = vdpasim_net_dev_add,
-	.dev_del = vdpasim_net_dev_del
+	.dev_del = vdpasim_net_dev_del,
+	.dev_set_attr = vdpasim_net_set_attr
 };
 
 static struct virtio_device_id id_table[] = {
Signature · 1 line
2.45.0
#3 lore raw

Re: [PATH v4 2/3] vdpa_sim_net: Add the support of set mac address

Quoted 25 lines · Cindy Lu

Add the function to support setting the MAC address. For vdpa_sim_net, the driver will write the MAC address to the config space, and other devices can implement their own functions to support this.

---
 drivers/vdpa/vdpa_sim/vdpa_sim_net.c | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)
drivers/vdpa/vdpa_sim/vdpa_sim_net.c +6 -0
index cfe962911804..936e33e5021a 100644
@@ -414,6 +414,25 @@ static void vdpasim_net_get_config(struct vdpasim *vdpasim, void *config)
        net_config->status = cpu_to_vdpasim16(vdpasim, VIRTIO_NET_S_LINK_UP);
 }
 
+static int vdpasim_net_set_attr(struct vdpa_mgmt_dev *mdev,
+                               struct vdpa_device *dev,
+                               const struct vdpa_dev_set_config *config)
+{
+       struct vdpasim *vdpasim = container_of(dev, struct vdpasim, vdpa);
+       struct virtio_net_config *vio_config = vdpasim->config;

drivers/vdpa/vdpa_sim/vdpa_sim_net.c static void vdpasim_net_get_config(struct vdpasim *vdpasim, void *config) · line 432

Quoted 10 lines
drivers/vdpa/vdpa_sim/vdpa_sim_net.c +10 -0
+
+       mutex_lock(&vdpasim->mutex);
+
+       if (config->mask & (1 << VDPA_ATTR_DEV_NET_CFG_MACADDR)) {
+               memcpy(vio_config->mac, config->net.mac, ETH_ALEN);
+               mutex_unlock(&vdpasim->mutex);
+               return 0;
+       }
+
+       mutex_unlock(&vdpasim->mutex);

Do we need to protect:

case VIRTIO_NET_CTRL_MAC_ADDR_SET:
read = vringh_iov_pull_iotlb(&cvq->vring, &cvq->in_iov,

                                             vio_config->mac, ETH_ALEN);
                if (read == ETH_ALEN)
                        status = VIRTIO_NET_OK;
                break;

As both are modifying vio_config?

Thanks

Quoted 19 lines
drivers/vdpa/vdpa_sim/vdpa_sim_net.c +5 -2
+       return -EINVAL;
+}
+
 static void vdpasim_net_setup_config(struct vdpasim *vdpasim,
                                     const struct vdpa_dev_set_config *config)
 {
@@ -510,7 +529,8 @@ static void vdpasim_net_dev_del(struct vdpa_mgmt_dev *mdev,
 
 static const struct vdpa_mgmtdev_ops vdpasim_net_mgmtdev_ops = {
        .dev_add = vdpasim_net_dev_add,
-       .dev_del = vdpasim_net_dev_del
+       .dev_del = vdpasim_net_dev_del,
+       .dev_set_attr = vdpasim_net_set_attr
 };
 
 static struct virtio_device_id id_table[] = {
--

2.45.0

author
#4 lore raw

Re: [PATH v4 2/3] vdpa_sim_net: Add the support of set mac address

Quoted 42 lines · Jason Wang
Quoted 25 lines · Cindy Lu

Add the function to support setting the MAC address. For vdpa_sim_net, the driver will write the MAC address to the config space, and other devices can implement their own functions to support this.

---
 drivers/vdpa/vdpa_sim/vdpa_sim_net.c | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)
drivers/vdpa/vdpa_sim/vdpa_sim_net.c +6 -0
index cfe962911804..936e33e5021a 100644
@@ -414,6 +414,25 @@ static void vdpasim_net_get_config(struct vdpasim *vdpasim, void *config)
        net_config->status = cpu_to_vdpasim16(vdpasim, VIRTIO_NET_S_LINK_UP);
 }
 
+static int vdpasim_net_set_attr(struct vdpa_mgmt_dev *mdev,
+                               struct vdpa_device *dev,
+                               const struct vdpa_dev_set_config *config)
+{
+       struct vdpasim *vdpasim = container_of(dev, struct vdpasim, vdpa);
+       struct virtio_net_config *vio_config = vdpasim->config;

drivers/vdpa/vdpa_sim/vdpa_sim_net.c static void vdpasim_net_get_config(struct vdpasim *vdpasim, void *config) · line 432

Quoted 10 lines
drivers/vdpa/vdpa_sim/vdpa_sim_net.c +10 -0
+
+       mutex_lock(&vdpasim->mutex);
+
+       if (config->mask & (1 << VDPA_ATTR_DEV_NET_CFG_MACADDR)) {
+               memcpy(vio_config->mac, config->net.mac, ETH_ALEN);
+               mutex_unlock(&vdpasim->mutex);
+               return 0;
+       }
+
+       mutex_unlock(&vdpasim->mutex);

Do we need to protect:

case VIRTIO_NET_CTRL_MAC_ADDR_SET:
read = vringh_iov_pull_iotlb(&cvq->vring, &cvq->in_iov,

Quoted 9 lines
                                             vio_config->mac, ETH_ALEN);
                if (read == ETH_ALEN)
                        status = VIRTIO_NET_OK;
                break;

As both are modifying vio_config?

Thanks

i have added a lock for this; CVQ also needs to take this lock to change the MAC address.I thinks maybe this can protect? Do you mean I need to compare the mac address from the vdpa_tool and mac address in vio_config?
this vdpa tool should not be used after the guest load, if this is different this is also acceptable
thanks
Cindy

Quoted 20 lines
Quoted 19 lines
drivers/vdpa/vdpa_sim/vdpa_sim_net.c +5 -2
+       return -EINVAL;
+}
+
 static void vdpasim_net_setup_config(struct vdpasim *vdpasim,
                                     const struct vdpa_dev_set_config *config)
 {
@@ -510,7 +529,8 @@ static void vdpasim_net_dev_del(struct vdpa_mgmt_dev *mdev,
 
 static const struct vdpa_mgmtdev_ops vdpasim_net_mgmtdev_ops = {
        .dev_add = vdpasim_net_dev_add,
-       .dev_del = vdpasim_net_dev_del
+       .dev_del = vdpasim_net_dev_del,
+       .dev_set_attr = vdpasim_net_set_attr
 };
 
 static struct virtio_device_id id_table[] = {
--

2.45.0

Acked-by
#5 lore raw

Re: [PATH v4 2/3] vdpa_sim_net: Add the support of set mac address

Quoted 49 lines · Cindy Lu
Quoted 47 lines · Jason Wang
Quoted 25 lines · Cindy Lu

Add the function to support setting the MAC address. For vdpa_sim_net, the driver will write the MAC address to the config space, and other devices can implement their own functions to support this.

---
 drivers/vdpa/vdpa_sim/vdpa_sim_net.c | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)
drivers/vdpa/vdpa_sim/vdpa_sim_net.c +6 -0
index cfe962911804..936e33e5021a 100644
@@ -414,6 +414,25 @@ static void vdpasim_net_get_config(struct vdpasim *vdpasim, void *config)
        net_config->status = cpu_to_vdpasim16(vdpasim, VIRTIO_NET_S_LINK_UP);
 }
 
+static int vdpasim_net_set_attr(struct vdpa_mgmt_dev *mdev,
+                               struct vdpa_device *dev,
+                               const struct vdpa_dev_set_config *config)
+{
+       struct vdpasim *vdpasim = container_of(dev, struct vdpasim, vdpa);
+       struct virtio_net_config *vio_config = vdpasim->config;

drivers/vdpa/vdpa_sim/vdpa_sim_net.c static void vdpasim_net_get_config(struct vdpasim *vdpasim, void *config) · line 432

Quoted 10 lines
drivers/vdpa/vdpa_sim/vdpa_sim_net.c +10 -0
+
+       mutex_lock(&vdpasim->mutex);
+
+       if (config->mask & (1 << VDPA_ATTR_DEV_NET_CFG_MACADDR)) {
+               memcpy(vio_config->mac, config->net.mac, ETH_ALEN);
+               mutex_unlock(&vdpasim->mutex);
+               return 0;
+       }
+
+       mutex_unlock(&vdpasim->mutex);

Do we need to protect:

case VIRTIO_NET_CTRL_MAC_ADDR_SET:
read = vringh_iov_pull_iotlb(&cvq->vring, &cvq->in_iov,

                                             vio_config->mac, ETH_ALEN);
                if (read == ETH_ALEN)
                        status = VIRTIO_NET_OK;
                break;
Quoted 6 lines
Quoted 4 lines

As both are modifying vio_config?

Thanks

i have added a lock for this; CVQ also needs to take this lock to change the MAC address.I thinks maybe this can protect?

Right, I miss that it is done in the vdpasim_net_work().

Quoted 5 lines

Do you mean I need to compare the mac address from the vdpa_tool and mac address in vio_config?
this vdpa tool should not be used after the guest load, if this is different this is also acceptable
thanks

The patch looks good then.

Thanks

Quoted 23 lines

Cindy

Quoted 20 lines
Quoted 19 lines
drivers/vdpa/vdpa_sim/vdpa_sim_net.c +5 -2
+       return -EINVAL;
+}
+
 static void vdpasim_net_setup_config(struct vdpasim *vdpasim,
                                     const struct vdpa_dev_set_config *config)
 {
@@ -510,7 +529,8 @@ static void vdpasim_net_dev_del(struct vdpa_mgmt_dev *mdev,
 
 static const struct vdpa_mgmtdev_ops vdpasim_net_mgmtdev_ops = {
        .dev_add = vdpasim_net_dev_add,
-       .dev_del = vdpasim_net_dev_del
+       .dev_del = vdpasim_net_dev_del,
+       .dev_set_attr = vdpasim_net_set_attr
 };
 
 static struct virtio_device_id id_table[] = {
--

2.45.0

author
#6 lore raw

PATCH v4 3/3 vdpa/mlx5: Add the support of set mac address

In reply to 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

---
 drivers/vdpa/mlx5/net/mlx5_vnet.c | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
drivers/vdpa/mlx5/net/mlx5_vnet.c +25 -0
index ecfc16151d61..415b527a9c72 100644
@@ -3785,10 +3785,35 @@ 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 mlx5_vdpa_dev *mvdev;
+	struct mlx5_vdpa_net *ndev;
+	struct mlx5_core_dev *mdev;
+	struct virtio_net_config *config;
+	struct mlx5_core_dev *pfmdev;
+	int err = -EOPNOTSUPP;
+
+	mvdev = to_mvdev(dev);
+	ndev = to_mlx5_vdpa_ndev(mvdev);
+	mdev = mvdev->mdev;
+	config = &ndev->config;
+
+	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 (!err)
+			memcpy(config->mac, add_config->net.mac, ETH_ALEN);
+	}
+	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[] = {
Signature · 1 line
2.45.0
#7 lore raw

Re: [PATH v4 3/3] vdpa/mlx5: Add the support of set mac address

Quoted 33 lines · 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

---
 drivers/vdpa/mlx5/net/mlx5_vnet.c | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
drivers/vdpa/mlx5/net/mlx5_vnet.c +13 -0
index ecfc16151d61..415b527a9c72 100644
@@ -3785,10 +3785,35 @@ 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 mlx5_vdpa_dev *mvdev;
+       struct mlx5_vdpa_net *ndev;
+       struct mlx5_core_dev *mdev;
+       struct virtio_net_config *config;
+       struct mlx5_core_dev *pfmdev;
+       int err = -EOPNOTSUPP;
+
+       mvdev = to_mvdev(dev);
+       ndev = to_mlx5_vdpa_ndev(mvdev);

drivers/vdpa/mlx5/net/mlx5_vnet.c static void mlx5_vdpa_dev_del(struct vdpa_mgmt_dev *v_mdev, struct vdpa_device * · line 3810

Quoted 10 lines
drivers/vdpa/mlx5/net/mlx5_vnet.c +10 -0
+       mdev = mvdev->mdev;
+       config = &ndev->config;
+
+       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 (!err)
+                       memcpy(config->mac, add_config->net.mac, ETH_ALEN);
+       }
+       return err;

Similar to net simulator, how could be serialize the modification to mac address:

1) from vdpa tool
2) via control virtqueue

Thanks

Quoted 12 lines
drivers/vdpa/mlx5/net/mlx5_vnet.c +2 -1
+}
 
 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[] = {
--

2.45.0

maintainer
#8 lore raw

Re: [PATH v4 3/3] vdpa/mlx5: Add the support of set mac address

Quoted 22 lines · Jason Wang
Quoted 21 lines · 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

---
 drivers/vdpa/mlx5/net/mlx5_vnet.c | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
drivers/vdpa/mlx5/net/mlx5_vnet.c +1 -0
index ecfc16151d61..415b527a9c72 100644
@@ -3785,10 +3785,35 @@ 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,
Quoted 8 lines

drivers/vdpa/mlx5/net/mlx5_vnet.c static void mlx5_vdpa_dev_del(struct vdpa_mgmt_dev *v_mdev, struct vdpa_device * · line 3796

Quoted 8 lines
drivers/vdpa/mlx5/net/mlx5_vnet.c +8 -0
+                             struct vdpa_device *dev,
+                             const struct vdpa_dev_set_config *add_config)
+{
+       struct mlx5_vdpa_dev *mvdev;
+       struct mlx5_vdpa_net *ndev;
+       struct mlx5_core_dev *mdev;
+       struct virtio_net_config *config;
+       struct mlx5_core_dev *pfmdev;

Reverse xmas tree?

Quoted 7 lines

drivers/vdpa/mlx5/net/mlx5_vnet.c static void mlx5_vdpa_dev_del(struct vdpa_mgmt_dev *v_mdev, struct vdpa_device * · line 3803

Quoted 7 lines
drivers/vdpa/mlx5/net/mlx5_vnet.c +7 -0
+       int err = -EOPNOTSUPP;
+
+       mvdev = to_mvdev(dev);
+       ndev = to_mlx5_vdpa_ndev(mvdev);
+       mdev = mvdev->mdev;
+       config = &ndev->config;
+

You still need to take the ndev->reslock.

Quoted 5 lines

drivers/vdpa/mlx5/net/mlx5_vnet.c static void mlx5_vdpa_dev_del(struct vdpa_mgmt_dev *v_mdev, struct vdpa_device * · line 3808

Quoted 5 lines
drivers/vdpa/mlx5/net/mlx5_vnet.c +5 -0
+       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 (!err)
+                       memcpy(config->mac, add_config->net.mac, ETH_ALEN);

What is the expected behaviour when the device is in use?

Quoted 24 lines

drivers/vdpa/mlx5/net/mlx5_vnet.c static void mlx5_vdpa_dev_del(struct vdpa_mgmt_dev *v_mdev, struct vdpa_device * · line 3810

Quoted 2 lines
drivers/vdpa/mlx5/net/mlx5_vnet.c +2 -0
+       }
+       return err;

Similar to net simulator, how could be serialize the modification to mac address:

1) from vdpa tool
2) via control virtqueue

Thanks

Quoted 12 lines
drivers/vdpa/mlx5/net/mlx5_vnet.c +2 -1
+}
 
 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[] = {
--

2.45.0

Thanks,
Dragos

author
#9 lore raw

Re: [PATH v4 3/3] vdpa/mlx5: Add the support of set mac address

Quoted 25 lines · Dragos Tatulea
Quoted 23 lines · Jason Wang
Quoted 22 lines · 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

---
 drivers/vdpa/mlx5/net/mlx5_vnet.c | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
drivers/vdpa/mlx5/net/mlx5_vnet.c +2 -0
index ecfc16151d61..415b527a9c72 100644
@@ -3785,10 +3785,35 @@ 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,
Quoted 9 lines
Quoted 7 lines

drivers/vdpa/mlx5/net/mlx5_vnet.c static void mlx5_vdpa_dev_del(struct vdpa_mgmt_dev *v_mdev, struct vdpa_device * · line 3796

Quoted 7 lines
drivers/vdpa/mlx5/net/mlx5_vnet.c +7 -0
+                             const struct vdpa_dev_set_config *add_config)
+{
+       struct mlx5_vdpa_dev *mvdev;
+       struct mlx5_vdpa_net *ndev;
+       struct mlx5_core_dev *mdev;
+       struct virtio_net_config *config;
+       struct mlx5_core_dev *pfmdev;

Reverse xmas tree?

will fix this

Quoted 9 lines
Quoted 7 lines

drivers/vdpa/mlx5/net/mlx5_vnet.c static void mlx5_vdpa_dev_del(struct vdpa_mgmt_dev *v_mdev, struct vdpa_device * · line 3803

Quoted 7 lines
drivers/vdpa/mlx5/net/mlx5_vnet.c +7 -0
+       int err = -EOPNOTSUPP;
+
+       mvdev = to_mvdev(dev);
+       ndev = to_mlx5_vdpa_ndev(mvdev);
+       mdev = mvdev->mdev;
+       config = &ndev->config;
+

You still need to take the ndev->reslock.

sure, will do

Quoted 7 lines
Quoted 5 lines

drivers/vdpa/mlx5/net/mlx5_vnet.c static void mlx5_vdpa_dev_del(struct vdpa_mgmt_dev *v_mdev, struct vdpa_device * · line 3808

Quoted 5 lines
drivers/vdpa/mlx5/net/mlx5_vnet.c +5 -0
+       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 (!err)
+                       memcpy(config->mac, add_config->net.mac, ETH_ALEN);

What is the expected behaviour when the device is in use?

if the err is 0 then copy the Mac address to config will change this code to make it more clear Thanks
Cindy

Quoted 26 lines
Quoted 24 lines

drivers/vdpa/mlx5/net/mlx5_vnet.c static void mlx5_vdpa_dev_del(struct vdpa_mgmt_dev *v_mdev, struct vdpa_device * · line 3810

Quoted 2 lines
drivers/vdpa/mlx5/net/mlx5_vnet.c +2 -0
+       }
+       return err;

Similar to net simulator, how could be serialize the modification to mac address:

1) from vdpa tool
2) via control virtqueue

Thanks

Quoted 12 lines
drivers/vdpa/mlx5/net/mlx5_vnet.c +2 -1
+}
 
 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[] = {
--

2.45.0

Thanks,
Dragos

author
#10 lore raw

Re: [PATH v4 3/3] vdpa/mlx5: Add the support of set mac address

Quoted 52 lines · Cindy Lu
Quoted 25 lines · Dragos Tatulea
Quoted 23 lines · Jason Wang
Quoted 22 lines · 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

---
 drivers/vdpa/mlx5/net/mlx5_vnet.c | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
drivers/vdpa/mlx5/net/mlx5_vnet.c +2 -0
index ecfc16151d61..415b527a9c72 100644
@@ -3785,10 +3785,35 @@ 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,
Quoted 9 lines
Quoted 7 lines

drivers/vdpa/mlx5/net/mlx5_vnet.c static void mlx5_vdpa_dev_del(struct vdpa_mgmt_dev *v_mdev, struct vdpa_device * · line 3796

Quoted 7 lines
drivers/vdpa/mlx5/net/mlx5_vnet.c +7 -0
+                             const struct vdpa_dev_set_config *add_config)
+{
+       struct mlx5_vdpa_dev *mvdev;
+       struct mlx5_vdpa_net *ndev;
+       struct mlx5_core_dev *mdev;
+       struct virtio_net_config *config;
+       struct mlx5_core_dev *pfmdev;

Reverse xmas tree?

will fix this

Quoted 9 lines
Quoted 7 lines

drivers/vdpa/mlx5/net/mlx5_vnet.c static void mlx5_vdpa_dev_del(struct vdpa_mgmt_dev *v_mdev, struct vdpa_device * · line 3803

Quoted 7 lines
drivers/vdpa/mlx5/net/mlx5_vnet.c +7 -0
+       int err = -EOPNOTSUPP;
+
+       mvdev = to_mvdev(dev);
+       ndev = to_mlx5_vdpa_ndev(mvdev);
+       mdev = mvdev->mdev;
+       config = &ndev->config;
+

You still need to take the ndev->reslock.

sure, will do

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
drivers/vdpa/mlx5/net/mlx5_vnet.c +5 -0
+       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 (!err)
+                       memcpy(config->mac, add_config->net.mac, ETH_ALEN);
Quoted 6 lines
Quoted 2 lines

What is the expected behaviour when the device is in use?

if the err is 0 then copy the Mac address to config will change this code to make it more clear Thanks
Cindy

sorry for the misunderstanding. The VDPA tool does not support changing the MAC address after the guest is loaded. I think I can add a check for VIRTIO_CONFIG_S_DRIVER_OK here?
Thanks
cindy

Quoted 26 lines
Quoted 26 lines
Quoted 24 lines

drivers/vdpa/mlx5/net/mlx5_vnet.c static void mlx5_vdpa_dev_del(struct vdpa_mgmt_dev *v_mdev, struct vdpa_device * · line 3810

Quoted 2 lines
drivers/vdpa/mlx5/net/mlx5_vnet.c +2 -0
+       }
+       return err;

Similar to net simulator, how could be serialize the modification to mac address:

1) from vdpa tool
2) via control virtqueue

Thanks

Quoted 12 lines
drivers/vdpa/mlx5/net/mlx5_vnet.c +2 -1
+}
 
 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[] = {
--

2.45.0

Thanks,
Dragos

#11 lore raw

Re: [PATH v4 3/3] vdpa/mlx5: Add the support of set mac address

Quoted 56 lines · Cindy Lu
Quoted 54 lines · Cindy Lu
Quoted 25 lines · Dragos Tatulea
Quoted 23 lines · Jason Wang
Quoted 22 lines · 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

---
 drivers/vdpa/mlx5/net/mlx5_vnet.c | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
drivers/vdpa/mlx5/net/mlx5_vnet.c +2 -0
index ecfc16151d61..415b527a9c72 100644
@@ -3785,10 +3785,35 @@ 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,
Quoted 9 lines
Quoted 7 lines

drivers/vdpa/mlx5/net/mlx5_vnet.c static void mlx5_vdpa_dev_del(struct vdpa_mgmt_dev *v_mdev, struct vdpa_device * · line 3796

Quoted 7 lines
drivers/vdpa/mlx5/net/mlx5_vnet.c +7 -0
+                             const struct vdpa_dev_set_config *add_config)
+{
+       struct mlx5_vdpa_dev *mvdev;
+       struct mlx5_vdpa_net *ndev;
+       struct mlx5_core_dev *mdev;
+       struct virtio_net_config *config;
+       struct mlx5_core_dev *pfmdev;

Reverse xmas tree?

will fix this

Quoted 9 lines
Quoted 7 lines

drivers/vdpa/mlx5/net/mlx5_vnet.c static void mlx5_vdpa_dev_del(struct vdpa_mgmt_dev *v_mdev, struct vdpa_device * · line 3803

Quoted 7 lines
drivers/vdpa/mlx5/net/mlx5_vnet.c +7 -0
+       int err = -EOPNOTSUPP;
+
+       mvdev = to_mvdev(dev);
+       ndev = to_mlx5_vdpa_ndev(mvdev);
+       mdev = mvdev->mdev;
+       config = &ndev->config;
+

You still need to take the ndev->reslock.

sure, will do

Quoted 7 lines
Quoted 5 lines

drivers/vdpa/mlx5/net/mlx5_vnet.c static void mlx5_vdpa_dev_del(struct vdpa_mgmt_dev *v_mdev, struct vdpa_device * · line 3808

Quoted 5 lines
drivers/vdpa/mlx5/net/mlx5_vnet.c +5 -0
+       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 (!err)
+                       memcpy(config->mac, add_config->net.mac, ETH_ALEN);

What is the expected behaviour when the device is in use?

Quoted 7 lines
Quoted 4 lines

if the err is 0 then copy the Mac address to config will change this code to make it more clear Thanks
Cindy

sorry for the misunderstanding. The VDPA tool does not support changing the MAC address after the guest is loaded. I think I can add a check for VIRTIO_CONFIG_S_DRIVER_OK here?

Still racy, and I think we probably don't worry about that case. It's the fault of the mgmt layer not us.

Thanks

Quoted 29 lines

Thanks
cindy

Quoted 26 lines
Quoted 26 lines
Quoted 24 lines

drivers/vdpa/mlx5/net/mlx5_vnet.c static void mlx5_vdpa_dev_del(struct vdpa_mgmt_dev *v_mdev, struct vdpa_device * · line 3810

Quoted 2 lines
drivers/vdpa/mlx5/net/mlx5_vnet.c +2 -0
+       }
+       return err;

Similar to net simulator, how could be serialize the modification to mac address:

1) from vdpa tool
2) via control virtqueue

Thanks

Quoted 12 lines
drivers/vdpa/mlx5/net/mlx5_vnet.c +2 -1
+}
 
 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[] = {
--

2.45.0

Thanks,
Dragos

author
#12 lore raw

Re: [PATH v4 3/3] vdpa/mlx5: Add the support of set mac address

Quoted 62 lines · Jason Wang
Quoted 60 lines · Cindy Lu
Quoted 58 lines · Cindy Lu
Quoted 25 lines · Dragos Tatulea
Quoted 23 lines · Jason Wang
Quoted 22 lines · 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

---
 drivers/vdpa/mlx5/net/mlx5_vnet.c | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
drivers/vdpa/mlx5/net/mlx5_vnet.c +2 -0
index ecfc16151d61..415b527a9c72 100644
@@ -3785,10 +3785,35 @@ 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,
Quoted 9 lines
Quoted 7 lines

drivers/vdpa/mlx5/net/mlx5_vnet.c static void mlx5_vdpa_dev_del(struct vdpa_mgmt_dev *v_mdev, struct vdpa_device * · line 3796

Quoted 7 lines
drivers/vdpa/mlx5/net/mlx5_vnet.c +7 -0
+                             const struct vdpa_dev_set_config *add_config)
+{
+       struct mlx5_vdpa_dev *mvdev;
+       struct mlx5_vdpa_net *ndev;
+       struct mlx5_core_dev *mdev;
+       struct virtio_net_config *config;
+       struct mlx5_core_dev *pfmdev;

Reverse xmas tree?

will fix this

Quoted 9 lines
Quoted 7 lines

drivers/vdpa/mlx5/net/mlx5_vnet.c static void mlx5_vdpa_dev_del(struct vdpa_mgmt_dev *v_mdev, struct vdpa_device * · line 3803

Quoted 7 lines
drivers/vdpa/mlx5/net/mlx5_vnet.c +7 -0
+       int err = -EOPNOTSUPP;
+
+       mvdev = to_mvdev(dev);
+       ndev = to_mlx5_vdpa_ndev(mvdev);
+       mdev = mvdev->mdev;
+       config = &ndev->config;
+

You still need to take the ndev->reslock.

sure, will do

Quoted 7 lines
Quoted 5 lines

drivers/vdpa/mlx5/net/mlx5_vnet.c static void mlx5_vdpa_dev_del(struct vdpa_mgmt_dev *v_mdev, struct vdpa_device * · line 3808

Quoted 5 lines
drivers/vdpa/mlx5/net/mlx5_vnet.c +5 -0
+       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 (!err)
+                       memcpy(config->mac, add_config->net.mac, ETH_ALEN);

What is the expected behaviour when the device is in use?

if the err is 0 then copy the Mac address to config will change this code to make it more clear Thanks
Cindy

Quoted 9 lines
Quoted 3 lines

sorry for the misunderstanding. The VDPA tool does not support changing the MAC address after the guest is loaded. I think I can add a check for VIRTIO_CONFIG_S_DRIVER_OK here?

Still racy, and I think we probably don't worry about that case. It's the fault of the mgmt layer not us.

Thanks

Sure, Thanks Jason. will send a new version soon
Thanks
cindy

Quoted 30 lines
Quoted 29 lines

Thanks
cindy

Quoted 26 lines
Quoted 26 lines
Quoted 24 lines

drivers/vdpa/mlx5/net/mlx5_vnet.c static void mlx5_vdpa_dev_del(struct vdpa_mgmt_dev *v_mdev, struct vdpa_device * · line 3810

Quoted 2 lines
drivers/vdpa/mlx5/net/mlx5_vnet.c +2 -0
+       }
+       return err;

Similar to net simulator, how could be serialize the modification to mac address:

1) from vdpa tool
2) via control virtqueue

Thanks

Quoted 12 lines
drivers/vdpa/mlx5/net/mlx5_vnet.c +2 -1
+}
 
 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[] = {
--

2.45.0

Thanks,
Dragos

#13 lore raw

Re: [PATH v4 3/3] vdpa/mlx5: Add the support of set mac address

In reply to Dragos Tatulea
Quoted 43 lines · Dragos Tatulea
Quoted 22 lines · Jason Wang
Quoted 21 lines · 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

---
 drivers/vdpa/mlx5/net/mlx5_vnet.c | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
drivers/vdpa/mlx5/net/mlx5_vnet.c +1 -0
index ecfc16151d61..415b527a9c72 100644
@@ -3785,10 +3785,35 @@ 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,
Quoted 8 lines

drivers/vdpa/mlx5/net/mlx5_vnet.c static void mlx5_vdpa_dev_del(struct vdpa_mgmt_dev *v_mdev, struct vdpa_device * · line 3796

Quoted 8 lines
drivers/vdpa/mlx5/net/mlx5_vnet.c +8 -0
+                             struct vdpa_device *dev,
+                             const struct vdpa_dev_set_config *add_config)
+{
+       struct mlx5_vdpa_dev *mvdev;
+       struct mlx5_vdpa_net *ndev;
+       struct mlx5_core_dev *mdev;
+       struct virtio_net_config *config;
+       struct mlx5_core_dev *pfmdev;

Reverse xmas tree?

Quoted 7 lines

drivers/vdpa/mlx5/net/mlx5_vnet.c static void mlx5_vdpa_dev_del(struct vdpa_mgmt_dev *v_mdev, struct vdpa_device * · line 3803

Quoted 7 lines
drivers/vdpa/mlx5/net/mlx5_vnet.c +7 -0
+       int err = -EOPNOTSUPP;
+
+       mvdev = to_mvdev(dev);
+       ndev = to_mlx5_vdpa_ndev(mvdev);
+       mdev = mvdev->mdev;
+       config = &ndev->config;
+

You still need to take the ndev->reslock.

Quoted 6 lines
Quoted 5 lines

drivers/vdpa/mlx5/net/mlx5_vnet.c static void mlx5_vdpa_dev_del(struct vdpa_mgmt_dev *v_mdev, struct vdpa_device * · line 3808

Quoted 5 lines
drivers/vdpa/mlx5/net/mlx5_vnet.c +5 -0
+       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 (!err)
+                       memcpy(config->mac, add_config->net.mac, ETH_ALEN);

What is the expected behaviour when the device is in use?

Should be a fault of the mgmt layer, so I think we probably don't need to worry about that.

Thanks

Quoted 27 lines
Quoted 4 lines

drivers/vdpa/mlx5/net/mlx5_vnet.c static void mlx5_vdpa_dev_del(struct vdpa_mgmt_dev *v_mdev, struct vdpa_device * · line 3810

Quoted 3 lines
drivers/vdpa/mlx5/net/mlx5_vnet.c +2 -0
+       }
+       return err;
Quoted 21 lines

Similar to net simulator, how could be serialize the modification to mac address:

1) from vdpa tool
2) via control virtqueue

Thanks

Quoted 12 lines
drivers/vdpa/mlx5/net/mlx5_vnet.c +2 -1
+}
 
 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[] = {
--

2.45.0

Thanks,
Dragos

author
#14 lore raw

Re: [PATH v4 3/3] vdpa/mlx5: Add the support of set mac address

In reply to Jason Wang
Quoted 49 lines · Jason Wang
Quoted 33 lines · 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

---
 drivers/vdpa/mlx5/net/mlx5_vnet.c | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
drivers/vdpa/mlx5/net/mlx5_vnet.c +13 -0
index ecfc16151d61..415b527a9c72 100644
@@ -3785,10 +3785,35 @@ 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 mlx5_vdpa_dev *mvdev;
+       struct mlx5_vdpa_net *ndev;
+       struct mlx5_core_dev *mdev;
+       struct virtio_net_config *config;
+       struct mlx5_core_dev *pfmdev;
+       int err = -EOPNOTSUPP;
+
+       mvdev = to_mvdev(dev);
+       ndev = to_mlx5_vdpa_ndev(mvdev);

drivers/vdpa/mlx5/net/mlx5_vnet.c static void mlx5_vdpa_dev_del(struct vdpa_mgmt_dev *v_mdev, struct vdpa_device * · line 3810

Quoted 10 lines
drivers/vdpa/mlx5/net/mlx5_vnet.c +10 -0
+       mdev = mvdev->mdev;
+       config = &ndev->config;
+
+       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 (!err)
+                       memcpy(config->mac, add_config->net.mac, ETH_ALEN);
+       }
+       return err;

Similar to net simulator, how could be serialize the modification to mac address:

Quoted 5 lines

1) from vdpa tool
2) via control virtqueue

Thanks

sure. Wiil do
thanks
cindy

Quoted 13 lines
Quoted 12 lines
drivers/vdpa/mlx5/net/mlx5_vnet.c +2 -1
+}
 
 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[] = {
--

2.45.0