Vdev is a device that exists on the ASIC which is not necessarily visible
to the kernel.
Just like devlink port, the driver should set index and attributes to
the vdev.
Example:
A VF represented by vdev pci/0000:03:00.0/1, before it is enabled.
The PF vdev is represented by pci/0000:03:00.0/0.
$ devlink dev show
pci/0000:03:00.0
$ devlink vdev show
pci/0000:03:00.0/0
pci/0000:03:00.0/1
Signed-off-by: Yuval Avnery <yuva...@mellanox.com>
Suggested-by: Parav Pandit <pa...@mellanox.com>
Acked-by: Jiri Pirko <j...@mellanox.com>
---
include/net/devlink.h | 17 +++
include/uapi/linux/devlink.h | 7 +
net/core/devlink.c | 255 +++++++++++++++++++++++++++++++++++
3 files changed, 279 insertions(+)
diff --git a/include/net/devlink.h b/include/net/devlink.h
index 6bf3b9e0595a..58fe8c339368 100644
--- a/include/net/devlink.h
+++ b/include/net/devlink.h
@@ -23,6 +23,7 @@ struct devlink_ops;
struct devlink {
struct list_head list;
struct list_head port_list;
+ struct list_head vdev_list;
struct list_head sb_list;
struct list_head dpipe_table_list;
struct list_head resource_list;
@@ -73,6 +74,8 @@ struct devlink_port_attrs {
};
};
+struct devlink_vdev;
+
struct devlink_port {
struct list_head list;
struct list_head param_list;
@@ -89,6 +92,9 @@ struct devlink_port {
struct delayed_work type_warn_dw;
};
+struct devlink_vdev_attrs {
+};
+
struct devlink_sb_pool_info {
enum devlink_sb_pool_type pool_type;
u32 size;
@@ -743,6 +749,9 @@ struct devlink_ops {
const struct devlink_trap_group *group);
};
+struct devlink_vdev_ops {
+};
+
static inline void *devlink_priv(struct devlink *devlink)
{
BUG_ON(!devlink);
@@ -802,6 +811,14 @@ void devlink_port_attrs_pci_vf_set(struct devlink_port
*devlink_port,
const unsigned char *switch_id,
unsigned char switch_id_len,
u16 pf, u16 vf);
+struct devlink_vdev *devlink_vdev_create(struct devlink *devlink,
+ unsigned int vdev_index,
+ const struct devlink_vdev_ops *ops,
+ const struct devlink_vdev_attrs *attrs,
+ void *priv);
+void devlink_vdev_destroy(struct devlink_vdev *devlink_vdev);
+struct devlink *devlink_vdev_devlink(struct devlink_vdev *devlink_vdev);
+void *devlink_vdev_priv(struct devlink_vdev *devlink_vdev);
int devlink_sb_register(struct devlink *devlink, unsigned int sb_index,
u32 size, u16 ingress_pools_count,
u16 egress_pools_count, u16 ingress_tc_count,
diff --git a/include/uapi/linux/devlink.h b/include/uapi/linux/devlink.h
index b558ea88b766..70e2816331c5 100644
--- a/include/uapi/linux/devlink.h
+++ b/include/uapi/linux/devlink.h
@@ -117,6 +117,11 @@ enum devlink_command {
DEVLINK_CMD_TRAP_GROUP_NEW,
DEVLINK_CMD_TRAP_GROUP_DEL,
+ DEVLINK_CMD_VDEV_GET, /* can dump */
+ DEVLINK_CMD_VDEV_SET,
+ DEVLINK_CMD_VDEV_NEW,
+ DEVLINK_CMD_VDEV_DEL,
+
/* add new commands above here */
__DEVLINK_CMD_MAX,
DEVLINK_CMD_MAX = __DEVLINK_CMD_MAX - 1
@@ -425,6 +430,8 @@ enum devlink_attr {
DEVLINK_ATTR_NETNS_PID, /* u32 */
DEVLINK_ATTR_NETNS_ID, /* u32 */
+ DEVLINK_ATTR_VDEV_INDEX, /* u32 */
+
/* add new attributes above here, update the policy in devlink.c */
__DEVLINK_ATTR_MAX,
diff --git a/net/core/devlink.c b/net/core/devlink.c
index 97e9a2246929..3d6099ec139e 100644
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -31,6 +31,15 @@
#define CREATE_TRACE_POINTS
#include <trace/events/devlink.h>
+struct devlink_vdev {
+ struct list_head list;
+ struct devlink *devlink;
+ unsigned int index;
+ const struct devlink_vdev_ops *ops;
+ struct devlink_vdev_attrs attrs;
+ void *priv;
+};
+
static struct devlink_dpipe_field devlink_dpipe_fields_ethernet[] = {
{
.name = "destination mac",
@@ -183,6 +192,46 @@ static struct devlink_port
*devlink_port_get_from_info(struct devlink *devlink,
return devlink_port_get_from_attrs(devlink, info->attrs);
}
+static struct devlink_vdev *devlink_vdev_get_by_index(struct devlink *devlink,
+ unsigned int vdev_index)
+{
+ struct devlink_vdev *devlink_vdev;
+
+ list_for_each_entry(devlink_vdev, &devlink->vdev_list, list) {
+ if (devlink_vdev->index == vdev_index)
+ return devlink_vdev;
+ }
+ return NULL;
+}
+
+static bool devlink_vdev_index_exists(struct devlink *devlink,
+ unsigned int vdev_index)
+{
+ return devlink_vdev_get_by_index(devlink, vdev_index);
+}
+
+static struct devlink_vdev *devlink_vdev_get_from_attrs(struct devlink
*devlink,
+ struct nlattr **attrs)
+{
+ struct devlink_vdev *devlink_vdev;
+ u32 vdev_index;
+
+ if (!attrs[DEVLINK_ATTR_VDEV_INDEX])
+ return ERR_PTR(-EINVAL);
+
+ vdev_index = nla_get_u32(attrs[DEVLINK_ATTR_VDEV_INDEX]);
+ devlink_vdev = devlink_vdev_get_by_index(devlink, vdev_index);
+ if (!devlink_vdev)
+ return ERR_PTR(-ENODEV);
+ return devlink_vdev;
+}
+
+static struct devlink_vdev *devlink_vdev_get_from_info(struct devlink *devlink,
+ struct genl_info *info)
+{
+ return devlink_vdev_get_from_attrs(devlink, info->attrs);
+}
+
struct devlink_sb {
struct list_head list;
unsigned int index;
@@ -386,6 +435,7 @@ devlink_region_snapshot_get_by_id(struct devlink_region
*region, u32 id)
#define DEVLINK_NL_FLAG_NEED_DEVLINK BIT(0)
#define DEVLINK_NL_FLAG_NEED_PORT BIT(1)
#define DEVLINK_NL_FLAG_NEED_SB BIT(2)
+#define DEVLINK_NL_FLAG_NEED_VDEV BIT(3)
/* The per devlink instance lock is taken by default in the pre-doit
* operation, yet several commands do not require this. The global
@@ -418,6 +468,15 @@ static int devlink_nl_pre_doit(const struct genl_ops *ops,
goto unlock;
}
info->user_ptr[0] = devlink_port;
+ } else if (ops->internal_flags & DEVLINK_NL_FLAG_NEED_VDEV) {
+ struct devlink_vdev *devlink_vdev;
+
+ devlink_vdev = devlink_vdev_get_from_info(devlink, info);
+ if (IS_ERR(devlink_vdev)) {
+ err = PTR_ERR(devlink_vdev);
+ goto unlock;
+ }
+ info->user_ptr[0] = devlink_vdev;
}
if (ops->internal_flags & DEVLINK_NL_FLAG_NEED_SB) {
struct devlink_sb *devlink_sb;
@@ -644,6 +703,53 @@ static void devlink_port_notify(struct devlink_port
*devlink_port,
msg, 0, DEVLINK_MCGRP_CONFIG, GFP_KERNEL);
}
+static int devlink_nl_vdev_fill(struct sk_buff *msg, struct devlink *devlink,
+ struct devlink_vdev *devlink_vdev,
+ enum devlink_command cmd, u32 vdevid,
+ u32 seq, int flags)
+{
+ void *hdr;
+
+ hdr = genlmsg_put(msg, vdevid, seq, &devlink_nl_family, flags, cmd);
+ if (!hdr)
+ return -EMSGSIZE;
+
+ if (devlink_nl_put_handle(msg, devlink))
+ goto nla_put_failure;
+ if (nla_put_u32(msg, DEVLINK_ATTR_VDEV_INDEX, devlink_vdev->index))
+ goto nla_put_failure;
+
+ genlmsg_end(msg, hdr);
+ return 0;
+
+nla_put_failure:
+ genlmsg_cancel(msg, hdr);
+ return -EMSGSIZE;
+}
+
+static void devlink_vdev_notify(struct devlink_vdev *devlink_vdev,
+ enum devlink_command cmd)
+{
+ struct devlink *devlink = devlink_vdev->devlink;
+ struct sk_buff *msg;
+ int err;
+
+ WARN_ON(cmd != DEVLINK_CMD_VDEV_NEW && cmd != DEVLINK_CMD_VDEV_DEL);
+
+ msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
+ if (!msg)
+ return;
+
+ err = devlink_nl_vdev_fill(msg, devlink, devlink_vdev, cmd, 0, 0, 0);
+ if (err) {
+ nlmsg_free(msg);
+ return;
+ }
+
+ genlmsg_multicast_netns(&devlink_nl_family, devlink_net(devlink),
+ msg, 0, DEVLINK_MCGRP_CONFIG, GFP_KERNEL);
+}
+
static int devlink_nl_cmd_get_doit(struct sk_buff *skb, struct genl_info *info)
{
struct devlink *devlink = info->user_ptr[0];
@@ -844,6 +950,74 @@ static int devlink_nl_cmd_port_unsplit_doit(struct sk_buff
*skb,
return devlink_port_unsplit(devlink, port_index, info->extack);
}
+static int devlink_nl_cmd_vdev_get_doit(struct sk_buff *skb,
+ struct genl_info *info)
+{
+ struct devlink_vdev *devlink_vdev = info->user_ptr[0];
+ struct devlink *devlink = devlink_vdev->devlink;
+ struct sk_buff *msg;
+ int err;
+
+ msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
+ if (!msg)
+ return -ENOMEM;
+
+ err = devlink_nl_vdev_fill(msg, devlink, devlink_vdev,
+ DEVLINK_CMD_VDEV_NEW,
+ info->snd_portid, info->snd_seq, 0);
+ if (err) {
+ nlmsg_free(msg);
+ return err;
+ }
+
+ return genlmsg_reply(msg, info);
+}
+
+static int devlink_nl_cmd_vdev_get_dumpit(struct sk_buff *msg,
+ struct netlink_callback *cb)
+{
+ struct devlink_vdev *devlink_vdev;
+ struct devlink *devlink;
+ int start = cb->args[0];
+ int idx = 0;
+ int err;
+
+ mutex_lock(&devlink_mutex);
+ list_for_each_entry(devlink, &devlink_list, list) {
+ if (!net_eq(devlink_net(devlink), sock_net(msg->sk)))
+ continue;
+ mutex_lock(&devlink->lock);
+ list_for_each_entry(devlink_vdev, &devlink->vdev_list, list) {
+ if (idx < start) {
+ idx++;
+ continue;
+ }
+ err = devlink_nl_vdev_fill(msg, devlink, devlink_vdev,
+ DEVLINK_CMD_NEW,
+ NETLINK_CB(cb->skb).portid,
+ cb->nlh->nlmsg_seq,
+ NLM_F_MULTI);
+ if (err) {
+ mutex_unlock(&devlink->lock);
+ goto out;
+ }
+ idx++;
+ }
+ mutex_unlock(&devlink->lock);
+ }
+out:
+ mutex_unlock(&devlink_mutex);
+
+ cb->args[0] = idx;
+ return msg->len;
+}
+
+static int devlink_nl_cmd_vdev_set_doit(struct sk_buff *skb,
+ struct genl_info *info)
+{
+ return 0;
+}
+
static int devlink_nl_sb_fill(struct sk_buff *msg, struct devlink *devlink,
struct devlink_sb *devlink_sb,
enum devlink_command cmd, u32 portid,
@@ -5902,6 +6076,7 @@ static const struct nla_policy
devlink_nl_policy[DEVLINK_ATTR_MAX + 1] = {
[DEVLINK_ATTR_NETNS_PID] = { .type = NLA_U32 },
[DEVLINK_ATTR_NETNS_FD] = { .type = NLA_U32 },
[DEVLINK_ATTR_NETNS_ID] = { .type = NLA_U32 },
+ [DEVLINK_ATTR_VDEV_INDEX] = { .type = NLA_U32 },
};
static const struct genl_ops devlink_nl_ops[] = {
@@ -5928,6 +6103,19 @@ static const struct genl_ops devlink_nl_ops[] = {
.flags = GENL_ADMIN_PERM,
.internal_flags = DEVLINK_NL_FLAG_NEED_PORT,
},
+ {
+ .cmd = DEVLINK_CMD_VDEV_GET,
+ .doit = devlink_nl_cmd_vdev_get_doit,
+ .dumpit = devlink_nl_cmd_vdev_get_dumpit,
+ .internal_flags = DEVLINK_NL_FLAG_NEED_VDEV,
+ /* can be retrieved by unprivileged users */
+ },
+ {
+ .cmd = DEVLINK_CMD_VDEV_SET,
+ .doit = devlink_nl_cmd_vdev_set_doit,
+ .flags = GENL_ADMIN_PERM,
+ .internal_flags = DEVLINK_NL_FLAG_NEED_VDEV,
+ },
{
.cmd = DEVLINK_CMD_PORT_SPLIT,
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
@@ -6268,6 +6456,7 @@ struct devlink *devlink_alloc(const struct devlink_ops
*ops, size_t priv_size)
devlink->ops = ops;
__devlink_net_set(devlink, &init_net);
INIT_LIST_HEAD(&devlink->port_list);
+ INIT_LIST_HEAD(&devlink->vdev_list);
INIT_LIST_HEAD(&devlink->sb_list);
INIT_LIST_HEAD_RCU(&devlink->dpipe_table_list);
INIT_LIST_HEAD(&devlink->resource_list);
@@ -6332,6 +6521,7 @@ void devlink_free(struct devlink *devlink)
WARN_ON(!list_empty(&devlink->dpipe_table_list));
WARN_ON(!list_empty(&devlink->sb_list));
WARN_ON(!list_empty(&devlink->port_list));
+ WARN_ON(!list_empty(&devlink->vdev_list));
kfree(devlink);
}
@@ -6657,6 +6847,71 @@ static int __devlink_port_phys_port_name_get(struct
devlink_port *devlink_port,
return 0;
}
+void *devlink_vdev_priv(struct devlink_vdev *devlink_vdev)
+{
+ return devlink_vdev->priv;
+}
+EXPORT_SYMBOL_GPL(devlink_vdev_priv);
+
+/**
+ * devlink_vdev_create - create devlink vdev
+ *
+ * @devlink: devlink
+ * @vdev_index: driver-specific numerical identifier of the vdev
+ * @ops: vdev specific ops
+ * @attrs: vdev specific attributes
+ * @priv: driver private data
+ *
+ * Create devlink vdev with provided vdev index. User can use
+ * any indexing, even hw-related one.
+ */
+struct devlink_vdev *devlink_vdev_create(struct devlink *devlink,
+ unsigned int vdev_index,
+ const struct devlink_vdev_ops *ops,
+ const struct devlink_vdev_attrs *attrs,
+ void *priv)
+{
+ struct devlink_vdev *devlink_vdev;
+
+ devlink_vdev = kzalloc(sizeof(*devlink_vdev), GFP_KERNEL);
+ if (!devlink_vdev)
+ return ERR_PTR(-ENOMEM);
+
+ mutex_lock(&devlink->lock);
+ if (devlink_vdev_index_exists(devlink, vdev_index)) {
+ mutex_unlock(&devlink->lock);
+ kfree(devlink_vdev);
+ return ERR_PTR(-EEXIST);
+ }
+ devlink_vdev->devlink = devlink;
+ devlink_vdev->priv = priv;
+ devlink_vdev->index = vdev_index;
+ devlink_vdev->ops = ops;
+ devlink_vdev->attrs = *attrs;
+ list_add_tail(&devlink_vdev->list, &devlink->vdev_list);
+ mutex_unlock(&devlink->lock);
+ devlink_vdev_notify(devlink_vdev, DEVLINK_CMD_VDEV_NEW);
+ return devlink_vdev;
+}
+EXPORT_SYMBOL_GPL(devlink_vdev_create);
+
+/**
+ * devlink_vdev_destroy - destroy devlink vdev
+ *
+ * @devlink_vdev: devlink vdev
+ */
+void devlink_vdev_destroy(struct devlink_vdev *devlink_vdev)
+{
+ struct devlink *devlink = devlink_vdev->devlink;
+
+ devlink_vdev_notify(devlink_vdev, DEVLINK_CMD_VDEV_DEL);
+ mutex_lock(&devlink->lock);
+ list_del(&devlink_vdev->list);
+ mutex_unlock(&devlink->lock);
+ kfree(devlink_vdev);
+}
+EXPORT_SYMBOL_GPL(devlink_vdev_destroy);
+
int devlink_sb_register(struct devlink *devlink, unsigned int sb_index,
u32 size, u16 ingress_pools_count,
u16 egress_pools_count, u16 ingress_tc_count,
--
2.17.1
