Commit d8ca2fa5 authored by Parav Pandit's avatar Parav Pandit Committed by Michael S. Tsirkin
Browse files

vdpa: Enable user to set mac and mtu of vdpa device 



$ vdpa dev add name bar mgmtdev vdpasim_net mac 00:11:22:33:44:55 mtu 9000

$ vdpa dev config show
bar: mac 00:11:22:33:44:55 link up link_announce false mtu 9000

$ vdpa dev config show -jp
{
    "config": {
        "bar": {
            "mac": "00:11:22:33:44:55",
            "link ": "up",
            "link_announce ": false,
            "mtu": 9000,
        }
    }
}

Signed-off-by: default avatarParav Pandit <parav@nvidia.com>
Reviewed-by: default avatarEli Cohen <elic@nvidia.com>
Acked-by: default avatarJason Wang <jasowang@redhat.com>

Link: https://lore.kernel.org/r/20211026175519.87795-5-parav@nvidia.com


Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarStefano Garzarella <sgarzare@redhat.com>
parent 960deb33

drivers/vdpa/ifcvf/ifcvf_main.c

+2 −1
Original line number Diff line number Diff line
@@ -499,7 +499,8 @@ static u32 get_dev_type(struct pci_dev *pdev) 
	return dev_type;

}



static int ifcvf_vdpa_dev_add(struct vdpa_mgmt_dev *mdev, const char *name)

static int ifcvf_vdpa_dev_add(struct vdpa_mgmt_dev *mdev, const char *name,

			      const struct vdpa_dev_set_config *config)

{

	struct ifcvf_vdpa_mgmt_dev *ifcvf_mgmt_dev;

	struct ifcvf_adapter *adapter;

drivers/vdpa/mlx5/net/mlx5_vnet.c

+2 −1
Original line number Diff line number Diff line
@@ -2482,7 +2482,8 @@ static int event_handler(struct notifier_block *nb, unsigned long event, void *p 
	return ret;

}



static int mlx5_vdpa_dev_add(struct vdpa_mgmt_dev *v_mdev, const char *name)

static int mlx5_vdpa_dev_add(struct vdpa_mgmt_dev *v_mdev, const char *name,

			     const struct vdpa_dev_set_config *add_config)

{

	struct mlx5_vdpa_mgmtdev *mgtdev = container_of(v_mdev, struct mlx5_vdpa_mgmtdev, mgtdev);

	struct virtio_net_config *config;

drivers/vdpa/vdpa.c

+36 −2
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ 
#include <uapi/linux/vdpa.h>

#include <net/genetlink.h>

#include <linux/mod_devicetable.h>

#include <linux/virtio_net.h>

#include <linux/virtio_ids.h>



static LIST_HEAD(mdev_head);
@@ -480,9 +479,15 @@ vdpa_nl_cmd_mgmtdev_get_dumpit(struct sk_buff *msg, struct netlink_callback *cb) 
	return msg->len;

}



#define VDPA_DEV_NET_ATTRS_MASK ((1 << VDPA_ATTR_DEV_NET_CFG_MACADDR) | \

				 (1 << VDPA_ATTR_DEV_NET_CFG_MTU))



static int vdpa_nl_cmd_dev_add_set_doit(struct sk_buff *skb, struct genl_info *info)

{

	struct vdpa_dev_set_config config = {};

	struct nlattr **nl_attrs = info->attrs;

	struct vdpa_mgmt_dev *mdev;

	const u8 *macaddr;

	const char *name;

	int err = 0;
@@ -491,6 +496,26 @@ static int vdpa_nl_cmd_dev_add_set_doit(struct sk_buff *skb, struct genl_info *i 


	name = nla_data(info->attrs[VDPA_ATTR_DEV_NAME]);



	if (nl_attrs[VDPA_ATTR_DEV_NET_CFG_MACADDR]) {

		macaddr = nla_data(nl_attrs[VDPA_ATTR_DEV_NET_CFG_MACADDR]);

		memcpy(config.net.mac, macaddr, sizeof(config.net.mac));

		config.mask |= (1 << VDPA_ATTR_DEV_NET_CFG_MACADDR);

	}

	if (nl_attrs[VDPA_ATTR_DEV_NET_CFG_MTU]) {

		config.net.mtu =

			nla_get_u16(nl_attrs[VDPA_ATTR_DEV_NET_CFG_MTU]);

		config.mask |= (1 << VDPA_ATTR_DEV_NET_CFG_MTU);

	}



	/* Skip checking capability if user didn't prefer to configure any

	 * device networking attributes. It is likely that user might have used

	 * a device specific method to configure such attributes or using device

	 * default attributes.

	 */

	if ((config.mask & VDPA_DEV_NET_ATTRS_MASK) &&

	    !netlink_capable(skb, CAP_NET_ADMIN))

		return -EPERM;



	mutex_lock(&vdpa_dev_mutex);

	mdev = vdpa_mgmtdev_get_from_attr(info->attrs);

	if (IS_ERR(mdev)) {
@@ -498,8 +523,14 @@ static int vdpa_nl_cmd_dev_add_set_doit(struct sk_buff *skb, struct genl_info *i 
		err = PTR_ERR(mdev);

		goto err;

	}

	if ((config.mask & mdev->config_attr_mask) != config.mask) {

		NL_SET_ERR_MSG_MOD(info->extack,

				   "All provided attributes are not supported");

		err = -EOPNOTSUPP;

		goto err;

	}



	err = mdev->ops->dev_add(mdev, name);

	err = mdev->ops->dev_add(mdev, name, &config);

err:

	mutex_unlock(&vdpa_dev_mutex);

	return err;
@@ -835,6 +866,9 @@ static const struct nla_policy vdpa_nl_policy[VDPA_ATTR_MAX + 1] = { 
	[VDPA_ATTR_MGMTDEV_BUS_NAME] = { .type = NLA_NUL_STRING },

	[VDPA_ATTR_MGMTDEV_DEV_NAME] = { .type = NLA_STRING },

	[VDPA_ATTR_DEV_NAME] = { .type = NLA_STRING },

	[VDPA_ATTR_DEV_NET_CFG_MACADDR] = NLA_POLICY_ETH_ADDR,

	/* virtio spec 1.1 section 5.1.4.1 for valid MTU range */

	[VDPA_ATTR_DEV_NET_CFG_MTU] = NLA_POLICY_MIN(NLA_U16, 68),

};



static const struct genl_ops vdpa_nl_ops[] = {

drivers/vdpa/vdpa_sim/vdpa_sim_blk.c

+2 −1
Original line number Diff line number Diff line
@@ -248,7 +248,8 @@ static struct device vdpasim_blk_mgmtdev = { 
	.release = vdpasim_blk_mgmtdev_release,

};



static int vdpasim_blk_dev_add(struct vdpa_mgmt_dev *mdev, const char *name)

static int vdpasim_blk_dev_add(struct vdpa_mgmt_dev *mdev, const char *name,

			       const struct vdpa_dev_set_config *config)

{

	struct vdpasim_dev_attr dev_attr = {};

	struct vdpasim *simdev;

drivers/vdpa/vdpa_sim/vdpa_sim_net.c

+2 −1
Original line number Diff line number Diff line
@@ -126,7 +126,8 @@ static struct device vdpasim_net_mgmtdev = { 
	.release = vdpasim_net_mgmtdev_release,

};



static int vdpasim_net_dev_add(struct vdpa_mgmt_dev *mdev, const char *name)

static int vdpasim_net_dev_add(struct vdpa_mgmt_dev *mdev, const char *name,

			       const struct vdpa_dev_set_config *config)

{

	struct vdpasim_dev_attr dev_attr = {};

	struct vdpasim *simdev;