| Message ID | 20240723054047.1059994-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 Tue, Jul 23, 2024 at 1:41 PM Cindy Lu <lulu@redhat.com> wrote: > > 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 | 84 +++++++++++++++++++++++++++++++++++++++ > include/linux/vdpa.h | 9 +++++ > include/uapi/linux/vdpa.h | 1 + > 3 files changed, 94 insertions(+) > > diff --git a/drivers/vdpa/vdpa.c b/drivers/vdpa/vdpa.c > index 8d391947eb8d..07d61ee62839 100644 > --- a/drivers/vdpa/vdpa.c > +++ b/drivers/vdpa/vdpa.c > @@ -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; It looks like the caller has already done this check? > + > + down_write(&vdev->cf_lock); > + if ((mdev->supported_features & BIT_ULL(VIRTIO_NET_F_MAC)) && This is not a virtio feature, so I don't get why we need to check 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"); "Device does not support setting 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, > + "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 = { > diff --git a/include/linux/vdpa.h b/include/linux/vdpa.h > index 7977ca03ac7a..3511156c10db 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 { > -- > 2.45.0 > Thanks
On Tue, 23 Jul 2024 at 14:01, Jason Wang <jasowang@redhat.com> wrote: > > On Tue, Jul 23, 2024 at 1:41 PM Cindy Lu <lulu@redhat.com> wrote: > > > > 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 | 84 +++++++++++++++++++++++++++++++++++++++ > > include/linux/vdpa.h | 9 +++++ > > include/uapi/linux/vdpa.h | 1 + > > 3 files changed, 94 insertions(+) > > > > diff --git a/drivers/vdpa/vdpa.c b/drivers/vdpa/vdpa.c > > index 8d391947eb8d..07d61ee62839 100644 > > --- a/drivers/vdpa/vdpa.c > > +++ b/drivers/vdpa/vdpa.c > > @@ -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; > > It looks like the caller has already done this check? > sure, will remove this > > + > > + down_write(&vdev->cf_lock); > > + if ((mdev->supported_features & BIT_ULL(VIRTIO_NET_F_MAC)) && > > This is not a virtio feature, so I don't get why we need to check > VIRTIO_NET_F_MAC. > will remove this > > + 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"); > > "Device does not support setting mac address" ? > sure, will change this Thanks cindy > > + } > > + } 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 = { > > diff --git a/include/linux/vdpa.h b/include/linux/vdpa.h > > index 7977ca03ac7a..3511156c10db 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 { > > -- > > 2.45.0 > > > > Thanks >
On Tue, Jul 23, 2024 at 01:39:20PM +0800, Cindy Lu wrote: > 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 | 84 +++++++++++++++++++++++++++++++++++++++ > include/linux/vdpa.h | 9 +++++ > include/uapi/linux/vdpa.h | 1 + > 3 files changed, 94 insertions(+) > > diff --git a/drivers/vdpa/vdpa.c b/drivers/vdpa/vdpa.c > index 8d391947eb8d..07d61ee62839 100644 > --- a/drivers/vdpa/vdpa.c > +++ b/drivers/vdpa/vdpa.c > @@ -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 = { > diff --git a/include/linux/vdpa.h b/include/linux/vdpa.h > index 7977ca03ac7a..3511156c10db 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 The indentation looks a bit odd here. Andrew --- pw-bot: cr
On Wed, 24 Jul 2024 at 02:48, Andrew Lunn <andrew@lunn.ch> wrote: > > On Tue, Jul 23, 2024 at 01:39:20PM +0800, Cindy Lu wrote: > > 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 | 84 +++++++++++++++++++++++++++++++++++++++ > > include/linux/vdpa.h | 9 +++++ > > include/uapi/linux/vdpa.h | 1 + > > 3 files changed, 94 insertions(+) > > > > diff --git a/drivers/vdpa/vdpa.c b/drivers/vdpa/vdpa.c > > index 8d391947eb8d..07d61ee62839 100644 > > --- a/drivers/vdpa/vdpa.c > > +++ b/drivers/vdpa/vdpa.c > > @@ -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 = { > > diff --git a/include/linux/vdpa.h b/include/linux/vdpa.h > > index 7977ca03ac7a..3511156c10db 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 > > The indentation looks a bit odd here. > > Andrew > sure, Will fix this thanks cindy > --- > pw-bot: cr >
diff --git a/drivers/vdpa/vdpa.c b/drivers/vdpa/vdpa.c index 8d391947eb8d..07d61ee62839 100644 --- a/drivers/vdpa/vdpa.c +++ b/drivers/vdpa/vdpa.c @@ -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 = { diff --git a/include/linux/vdpa.h b/include/linux/vdpa.h index 7977ca03ac7a..3511156c10db 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 | 84 +++++++++++++++++++++++++++++++++++++++ include/linux/vdpa.h | 9 +++++ include/uapi/linux/vdpa.h | 1 + 3 files changed, 94 insertions(+)