Skip to contentSkip to conversation

vdpa: support set mac address from vdpa tool

PATCH Superseded Cindy Lu 2 participants 11 messages Jul 25, 2024 – Jul 26, 2024

Subsystems (4)

v6 of 8 Superseded Latest is v8 →

lore
Share & tools
lore

Cindy Lu

author
#0 lore raw

v6 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
Changelog v5
- Address the comments
Changelog v6
- Replace all the memcpy of mac address with ether_addr_copy()
- Remove the check for VIRTIO_NET_F_MAC in vdpa_dev_net_device_attr_set
- Remove unnecessary check
- Enhance the error log

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    | 28 ++++++++++
 drivers/vdpa/vdpa.c                  | 80 ++++++++++++++++++++++++++++
 drivers/vdpa/vdpa_sim/vdpa_sim_net.c | 22 +++++++-
 include/linux/vdpa.h                 |  9 ++++
 include/uapi/linux/vdpa.h            |  1 +
 5 files changed, 139 insertions(+), 1 deletion(-)
Signature · 1 line
2.45.0
author
#1 lore raw

PATCH v6 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       | 80 +++++++++++++++++++++++++++++++++++++++
 include/linux/vdpa.h      |  9 +++++
 include/uapi/linux/vdpa.h |  1 +
 3 files changed, 90 insertions(+)
drivers/vdpa/vdpa.c +80 -0
index 8d391947eb8d..532cf3b52b26 100644
@@ -1361,6 +1361,81 @@ 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;
+
+	down_write(&vdev->cf_lock);
+	if (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)) {
+			ether_addr_copy(set_config.net.mac, 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 does not support changing the MAC address");
+			}
+		} 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, "unmanaged vdpa 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 +1572,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..2e7a30fe6b92 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
#2 lore raw

On Thu, Jul 25, 2024 at 09:31:02AM +0800, Cindy Lu wrote:
[...]

Quoted 6 lines
drivers/vdpa/vdpa.c +0 -0
index 8d391947eb8d..532cf3b52b26 100644
@@ -1361,6 +1361,81 @@ static int vdpa_nl_cmd_dev_config_get_doit(struct sk_buff *skb, struct genl_info
 	return err;

drivers/vdpa/vdpa.c static int vdpa_nl_cmd_dev_config_get_doit(struct sk_buff *skb, struct genl_info · line 1371

Quoted 10 lines
drivers/vdpa/vdpa.c +8 -0
 }
 
+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;

Nit: IIRC networking code prefers reverse-xmas tree style and macaddr above needs to be moved.

Quoted 14 lines
drivers/vdpa/vdpa.c +14 -0
+	down_write(&vdev->cf_lock);
+	if (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)) {
+			ether_addr_copy(set_config.net.mac, 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,

drivers/vdpa/vdpa.c static int vdpa_nl_cmd_dev_config_get_doit(struct sk_buff *skb, struct genl_info · line 1396

Quoted 10 lines
drivers/vdpa/vdpa.c +10 -0
+					"device does not support changing the MAC address");
+			}
+		} else {
+			NL_SET_ERR_MSG_FMT_MOD(info->extack,
+					       "Invalid MAC address");
+		}
+	}
+	up_write(&vdev->cf_lock);
+	return err;
+}

Nit: other code in this file has line breaks separating functions. Probably good to add one here?

drivers/vdpa/vdpa.c static int vdpa_nl_cmd_dev_config_get_doit(struct sk_buff *skb, struct genl_info · line 1398

Quoted 2 lines
drivers/vdpa/vdpa.c +2 -0
+static int vdpa_nl_cmd_dev_attr_set_doit(struct sk_buff *skb,
+					 struct genl_info *info)

Nit: Does the above pass ./scripts/checkpatch.pl --strict ? I am asking because it seems like the alignment might be off?

drivers/vdpa/vdpa.c static int vdpa_nl_cmd_dev_config_get_doit(struct sk_buff *skb, struct genl_info · line 1404

Quoted 6 lines
drivers/vdpa/vdpa.c +6 -0
+{
+	const char *name;
+	int err = 0;
+	struct device *dev;
+	struct vdpa_device *vdev;
+	u64 classes;

Nit: Same as above; I believe networking code is supposed to follow reverse xmas tree order so these variables should be rearranged.

Quoted 32 lines
drivers/vdpa/vdpa.c +32 -0
+	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, "unmanaged vdpa 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;
+}

[...]

author
#3 lore raw
Quoted 11 lines · Joe Damato

On Thu, Jul 25, 2024 at 09:31:02AM +0800, Cindy Lu wrote:
[...]

Quoted 8 lines
drivers/vdpa/vdpa.c +0 -0
index 8d391947eb8d..532cf3b52b26 100644
@@ -1361,6 +1361,81 @@ static int vdpa_nl_cmd_dev_config_get_doit(struct sk_buff *skb, struct genl_info
      return err;
 }
 
Quoted 12 lines

drivers/vdpa/vdpa.c static int vdpa_nl_cmd_dev_config_get_doit(struct sk_buff *skb, struct genl_info · line 1371

Quoted 8 lines
drivers/vdpa/vdpa.c +8 -0
+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;

Nit: IIRC networking code prefers reverse-xmas tree style and macaddr above needs to be moved.

will fix this
thanks
Cindy

Cindy

Quoted 80 lines
Quoted 14 lines
drivers/vdpa/vdpa.c +14 -0
+     down_write(&vdev->cf_lock);
+     if (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)) {
+                     ether_addr_copy(set_config.net.mac, 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,

drivers/vdpa/vdpa.c static int vdpa_nl_cmd_dev_config_get_doit(struct sk_buff *skb, struct genl_info · line 1396

Quoted 10 lines
drivers/vdpa/vdpa.c +10 -0
+                                     "device does not support changing the MAC address");
+                     }
+             } else {
+                     NL_SET_ERR_MSG_FMT_MOD(info->extack,
+                                            "Invalid MAC address");
+             }
+     }
+     up_write(&vdev->cf_lock);
+     return err;
+}

Nit: other code in this file has line breaks separating functions. Probably good to add one here?

drivers/vdpa/vdpa.c static int vdpa_nl_cmd_dev_config_get_doit(struct sk_buff *skb, struct genl_info · line 1398

Quoted 2 lines
drivers/vdpa/vdpa.c +2 -0
+static int vdpa_nl_cmd_dev_attr_set_doit(struct sk_buff *skb,
+                                      struct genl_info *info)

Nit: Does the above pass ./scripts/checkpatch.pl --strict ? I am asking because it seems like the alignment might be off?

drivers/vdpa/vdpa.c static int vdpa_nl_cmd_dev_config_get_doit(struct sk_buff *skb, struct genl_info · line 1404

Quoted 6 lines
drivers/vdpa/vdpa.c +6 -0
+{
+     const char *name;
+     int err = 0;
+     struct device *dev;
+     struct vdpa_device *vdev;
+     u64 classes;

Nit: Same as above; I believe networking code is supposed to follow reverse xmas tree order so these variables should be rearranged.

Quoted 32 lines
drivers/vdpa/vdpa.c +32 -0
+     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, "unmanaged vdpa 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;
+}

[...]

author
#4 lore raw
In reply to Joe Damato
Quoted 11 lines · Joe Damato

On Thu, Jul 25, 2024 at 09:31:02AM +0800, Cindy Lu wrote:
[...]

Quoted 8 lines
drivers/vdpa/vdpa.c +0 -0
index 8d391947eb8d..532cf3b52b26 100644
@@ -1361,6 +1361,81 @@ static int vdpa_nl_cmd_dev_config_get_doit(struct sk_buff *skb, struct genl_info
      return err;
 }
 
Quoted 12 lines

drivers/vdpa/vdpa.c static int vdpa_nl_cmd_dev_config_get_doit(struct sk_buff *skb, struct genl_info · line 1371

Quoted 8 lines
drivers/vdpa/vdpa.c +8 -0
+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;

Nit: IIRC networking code prefers reverse-xmas tree style and macaddr above needs to be moved.

will fix this
thanks
cindy

Quoted 19 lines
Quoted 19 lines
drivers/vdpa/vdpa.c +19 -0
+     down_write(&vdev->cf_lock);
+     if (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)) {
+                     ether_addr_copy(set_config.net.mac, 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 does not support changing the MAC address");
+                     }
+             } else {
+                     NL_SET_ERR_MSG_FMT_MOD(info->extack,
+                                            "Invalid MAC address");
Quoted 9 lines

drivers/vdpa/vdpa.c static int vdpa_nl_cmd_dev_config_get_doit(struct sk_buff *skb, struct genl_info · line 1396

Quoted 5 lines
drivers/vdpa/vdpa.c +5 -0
+             }
+     }
+     up_write(&vdev->cf_lock);
+     return err;
+}

Nit: other code in this file has line breaks separating functions. Probably good to add one here?

sure will change this
thanks
Cindy

Quoted 7 lines

drivers/vdpa/vdpa.c static int vdpa_nl_cmd_dev_config_get_doit(struct sk_buff *skb, struct genl_info · line 1398

Quoted 3 lines
drivers/vdpa/vdpa.c +2 -0
+static int vdpa_nl_cmd_dev_attr_set_doit(struct sk_buff *skb,
+                                      struct genl_info *info)

Nit: Does the above pass ./scripts/checkpatch.pl --strict ? I am asking because it seems like the alignment might be off?

I tried this, but there doesn't seem to have warning. I'll double-check this. Thanks
cindy

Quoted 10 lines

drivers/vdpa/vdpa.c static int vdpa_nl_cmd_dev_config_get_doit(struct sk_buff *skb, struct genl_info · line 1404

Quoted 6 lines
drivers/vdpa/vdpa.c +6 -0
+{
+     const char *name;
+     int err = 0;
+     struct device *dev;
+     struct vdpa_device *vdev;
+     u64 classes;

Nit: Same as above; I believe networking code is supposed to follow reverse xmas tree order so these variables should be rearranged.

will fix this

Quoted 35 lines
Quoted 32 lines
drivers/vdpa/vdpa.c +32 -0
+     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, "unmanaged vdpa 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;
+}

[...]

author
#5 lore raw

PATCH v6 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..cd404a896414 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)) {
+		ether_addr_copy(vio_config->mac, config->net.mac);
+		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
author
#6 lore raw

PATCH v6 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 | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
drivers/vdpa/mlx5/net/mlx5_vnet.c +28 -0
index ecfc16151d61..d7e5e30e9ef4 100644
@@ -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 (!err)
+			ether_addr_copy(config->mac, add_config->net.mac);
+	}
+
+	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[] = {
Signature · 1 line
2.45.0
#7 lore raw

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

Quoted 16 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 | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
drivers/vdpa/mlx5/net/mlx5_vnet.c +0 -0
index ecfc16151d61..d7e5e30e9ef4 100644

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

Quoted 3 lines
drivers/vdpa/mlx5/net/mlx5_vnet.c +0 -0
@@ -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;
 }

Nit: Other code in this file separates functions with newlines, perhaps one is needed here?

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

Quoted 3 lines
drivers/vdpa/mlx5/net/mlx5_vnet.c +3 -0
+static int mlx5_vdpa_set_attr(struct vdpa_mgmt_dev *v_mdev,
+			      struct vdpa_device *dev,
+			      const struct vdpa_dev_set_config *add_config)

Nit: it appears that the alignment is off on these parameters. Did checkpatch.pl --strict pass on this?

Quoted 5 lines
drivers/vdpa/mlx5/net/mlx5_vnet.c +5 -0
+{
+	struct virtio_net_config *config;
+	struct mlx5_core_dev *pfmdev;
+	struct mlx5_vdpa_dev *mvdev;
+	struct mlx5_vdpa_net *ndev;

[...]

author
#8 lore raw

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

Quoted 25 lines · Joe Damato
Quoted 16 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 | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
drivers/vdpa/mlx5/net/mlx5_vnet.c +0 -0
index ecfc16151d61..d7e5e30e9ef4 100644

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

Quoted 3 lines
drivers/vdpa/mlx5/net/mlx5_vnet.c +0 -0
@@ -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;
 }

Nit: Other code in this file separates functions with newlines, perhaps one is needed here?

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 3790

Quoted 3 lines
drivers/vdpa/mlx5/net/mlx5_vnet.c +3 -0
+static int mlx5_vdpa_set_attr(struct vdpa_mgmt_dev *v_mdev,
+                           struct vdpa_device *dev,
+                           const struct vdpa_dev_set_config *add_config)

Nit: it appears that the alignment is off on these parameters. Did checkpatch.pl --strict pass on this?

sure, will check this
thanks

Quoted 8 lines
Quoted 5 lines
drivers/vdpa/mlx5/net/mlx5_vnet.c +5 -0
+{
+     struct virtio_net_config *config;
+     struct mlx5_core_dev *pfmdev;
+     struct mlx5_vdpa_dev *mvdev;
+     struct mlx5_vdpa_net *ndev;

[...]

#9 lore raw
In reply to Cindy Lu
Quoted 5 lines · Cindy Lu

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.

[...]

Nit: the subject line has misspelled PATCH as PATH

I believe net-next is still closed so this code needs to be resent when net-next is open again in a few days.

author
#10 lore raw
Quoted 8 lines · Joe Damato
Quoted 5 lines · Cindy Lu

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.

Quoted 7 lines

[...]

Nit: the subject line has misspelled PATCH as PATH

I believe net-next is still closed so this code needs to be resent when net-next is open again in a few days.

sure,will fix this
thanks
cindy