| Message ID | 20240725013217.1124704-2-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 Thu, Jul 25, 2024 at 09:31:02AM +0800, Cindy Lu wrote: [...] > diff --git a/drivers/vdpa/vdpa.c b/drivers/vdpa/vdpa.c > index 8d391947eb8d..532cf3b52b26 100644 > --- a/drivers/vdpa/vdpa.c > +++ b/drivers/vdpa/vdpa.c > @@ -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; Nit: IIRC networking code prefers reverse-xmas tree style and macaddr above needs to be moved. > + 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; > +} Nit: other code in this file has line breaks separating functions. Probably good to add one here? > +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? > +{ > + 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. > + 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; > +} [...]
On Fri, 26 Jul 2024 at 01:29, Joe Damato <jdamato@fastly.com> wrote: > > On Thu, Jul 25, 2024 at 09:31:02AM +0800, Cindy Lu wrote: > [...] > > diff --git a/drivers/vdpa/vdpa.c b/drivers/vdpa/vdpa.c > > index 8d391947eb8d..532cf3b52b26 100644 > > --- a/drivers/vdpa/vdpa.c > > +++ b/drivers/vdpa/vdpa.c > > @@ -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; > > Nit: IIRC networking code prefers reverse-xmas tree style and > macaddr above needs to be moved. > will fix this thanks Cindy Cindy > > + 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; > > +} > > Nit: other code in this file has line breaks separating functions. > Probably good to add one here? > > > > +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? > > > +{ > > + 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. > > > + 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; > > +} > > [...] >
On Fri, 26 Jul 2024 at 01:29, Joe Damato <jdamato@fastly.com> wrote: > > On Thu, Jul 25, 2024 at 09:31:02AM +0800, Cindy Lu wrote: > [...] > > diff --git a/drivers/vdpa/vdpa.c b/drivers/vdpa/vdpa.c > > index 8d391947eb8d..532cf3b52b26 100644 > > --- a/drivers/vdpa/vdpa.c > > +++ b/drivers/vdpa/vdpa.c > > @@ -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; > > Nit: IIRC networking code prefers reverse-xmas tree style and > macaddr above needs to be moved. > will fix this thanks cindy > > + 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; > > +} > > Nit: other code in this file has line breaks separating functions. > Probably good to add one here? > sure will change this thanks Cindy > > > +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 > > +{ > > + 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 > > + 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; > > +} > > [...] >
diff --git a/drivers/vdpa/vdpa.c b/drivers/vdpa/vdpa.c index 8d391947eb8d..532cf3b52b26 100644 --- a/drivers/vdpa/vdpa.c +++ b/drivers/vdpa/vdpa.c @@ -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 = { diff --git a/include/linux/vdpa.h b/include/linux/vdpa.h index 7977ca03ac7a..2e7a30fe6b92 100644 --- a/include/linux/vdpa.h +++ b/include/linux/vdpa.h @@ -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); }; /** diff --git a/include/uapi/linux/vdpa.h b/include/uapi/linux/vdpa.h index 842bf1201ac4..71edf2c70cc3 100644 --- a/include/uapi/linux/vdpa.h +++ b/include/uapi/linux/vdpa.h @@ -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 {
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 } } } Signed-off-by: Cindy Lu <lulu@redhat.com> --- drivers/vdpa/vdpa.c | 80 +++++++++++++++++++++++++++++++++++++++ include/linux/vdpa.h | 9 +++++ include/uapi/linux/vdpa.h | 1 + 3 files changed, 90 insertions(+)