| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1551418672-12822-7-git-send-email-parav@mellanox.com>
Date: Thu, 28 Feb 2019 23:37:50 -0600
From: Parav Pandit <parav@...lanox.com>
To: netdev@...r.kernel.org, linux-kernel@...r.kernel.org,
michal.lkml@...kovi.net, davem@...emloft.net,
gregkh@...uxfoundation.org, jiri@...lanox.com
Cc: parav@...lanox.com
Subject: [RFC net-next 6/8] devlink: Add support for devlink subdev lifecycle
Add support for creating and deleting devlink subdevices.
For every subdev created on subdev bus, has corresponding devlink device.
This devlink device serves the control point for any internal device
configuration which is usually required before setting up the protocol
specific devices such as netdev, block or infiniband devices.
devlink subdev are created using iproute2 devlink tool command such as:
(a) create devlink subdev
$devlink dev add DEV
output: subdev/subdev0
(b) delete a devlink subdev
$devlink dev del DEV
$devlink dev del subdev/subdev0
Signed-off-by: Parav Pandit <parav@...lanox.com>
---
include/net/devlink.h | 6 ++-
include/uapi/linux/devlink.h | 3 ++
net/core/devlink.c | 97 ++++++++++++++++++++++++++++++++++++++++++--
3 files changed, 102 insertions(+), 4 deletions(-)
diff --git a/include/net/devlink.h b/include/net/devlink.h
index 9a067b1..3265508 100644
--- a/include/net/devlink.h
+++ b/include/net/devlink.h
@@ -36,6 +36,7 @@ struct devlink {
struct device *dev;
possible_net_t _net;
struct mutex lock;
+ struct devlink *parent; /* optional if this is child devlink device */
char priv[0] __aligned(NETDEV_ALIGN);
};
@@ -524,6 +525,8 @@ struct devlink_ops {
int (*flash_update)(struct devlink *devlink, const char *file_name,
const char *component,
struct netlink_ext_ack *extack);
+ struct devlink* (*dev_add)(struct devlink *devlink);
+ void (*dev_del)(struct devlink *del_dev);
};
static inline void *devlink_priv(struct devlink *devlink)
@@ -545,7 +548,8 @@ static inline struct devlink *priv_to_devlink(void *priv)
void devlink_init(struct devlink *devlink, const struct devlink_ops *ops);
void devlink_cleanup(struct devlink *devlink);
struct devlink *devlink_alloc(const struct devlink_ops *ops, size_t priv_size);
-void __devlink_register(struct devlink *devlink, struct device *dev);
+int __devlink_register(struct devlink *devlink, struct device *dev,
+ struct devlink *parent);
int devlink_register(struct devlink *devlink, struct device *dev);
void __devlink_unregister(struct devlink *devlink);
void devlink_unregister(struct devlink *devlink);
diff --git a/include/uapi/linux/devlink.h b/include/uapi/linux/devlink.h
index 53de880..233f5bc 100644
--- a/include/uapi/linux/devlink.h
+++ b/include/uapi/linux/devlink.h
@@ -105,6 +105,9 @@ enum devlink_command {
DEVLINK_CMD_FLASH_UPDATE,
+ DEVLINK_CMD_DEV_ADD,
+ DEVLINK_CMD_DEV_DEL,
+
/* add new commands above here */
__DEVLINK_CMD_MAX,
DEVLINK_CMD_MAX = __DEVLINK_CMD_MAX - 1
diff --git a/net/core/devlink.c b/net/core/devlink.c
index cfbad2c..3b5c961 100644
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -3759,6 +3759,57 @@ static int devlink_nl_cmd_region_read_dumpit(struct sk_buff *skb,
return err;
}
+static int
+devlink_nl_cmd_dev_add_doit(struct sk_buff *skb, struct genl_info *info)
+{
+ struct devlink *devlink = info->user_ptr[0];
+ struct devlink *new_devlink;
+ struct sk_buff *msg;
+ int err;
+
+ if (!devlink->ops->dev_add || !devlink->ops->dev_del)
+ return -EOPNOTSUPP;
+
+ msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
+ if (!msg)
+ return -ENOMEM;
+
+ new_devlink = devlink->ops->dev_add(devlink);
+ if (IS_ERR(new_devlink)) {
+ err = PTR_ERR(new_devlink);
+ goto dev_err;
+ }
+
+ err = devlink_nl_put_handle(msg, new_devlink);
+ if (err)
+ goto put_err;
+
+ return genlmsg_reply(msg, info);
+
+put_err:
+ devlink->ops->dev_del(new_devlink);
+dev_err:
+ nlmsg_free(msg);
+ return err;
+}
+
+static int
+devlink_nl_cmd_dev_del_doit(struct sk_buff *skb, struct genl_info *info)
+{
+ struct devlink *devlink;
+ struct devlink *parent;
+
+ devlink = devlink_get_from_info(info);
+ if (!devlink)
+ return -ENODEV;
+ parent = devlink->parent;
+ if (!parent)
+ return -EOPNOTSUPP;
+
+ parent->ops->dev_del(devlink);
+ return 0;
+}
+
struct devlink_info_req {
struct sk_buff *msg;
};
@@ -5201,6 +5252,20 @@ static int devlink_nl_cmd_health_reporter_dump_get_doit(struct sk_buff *skb,
.flags = GENL_ADMIN_PERM,
.internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,
},
+ {
+ .cmd = DEVLINK_CMD_DEV_ADD,
+ .doit = devlink_nl_cmd_dev_add_doit,
+ .policy = devlink_nl_policy,
+ .flags = GENL_ADMIN_PERM,
+ .internal_flags = DEVLINK_NL_FLAG_NEED_DEVLINK,
+ },
+ {
+ .cmd = DEVLINK_CMD_DEV_DEL,
+ .doit = devlink_nl_cmd_dev_del_doit,
+ .policy = devlink_nl_policy,
+ .flags = GENL_ADMIN_PERM,
+ .internal_flags = DEVLINK_NL_FLAG_NO_LOCK,
+ },
};
static struct genl_family devlink_nl_family __ro_after_init = {
@@ -5266,13 +5331,24 @@ struct devlink *devlink_alloc(const struct devlink_ops *ops, size_t priv_size)
* Caller must hold devlink_mutex.
*
* @devlink: devlink
+ * @parent: pointer to parent devlink instance for which child devlink
+ * device is created. It must be set when child devlink
+ * device is created. It is optional otherwise.
*/
-void __devlink_register(struct devlink *devlink, struct device *dev)
+int __devlink_register(struct devlink *devlink, struct device *dev,
+ struct devlink *parent)
{
lockdep_assert_held(&devlink_mutex);
+
+ if (parent && (!parent->ops || !parent->ops->dev_add ||
+ !parent->ops->dev_del))
+ return -EINVAL;
+
devlink->dev = dev;
+ devlink->parent = parent;
list_add_tail(&devlink->list, &devlink_list);
devlink_notify(devlink, DEVLINK_CMD_NEW);
+ return 0;
}
EXPORT_SYMBOL_GPL(__devlink_register);
@@ -5283,13 +5359,27 @@ void __devlink_register(struct devlink *devlink, struct device *dev)
*/
int devlink_register(struct devlink *devlink, struct device *dev)
{
+ int ret;
+
mutex_lock(&devlink_mutex);
- __devlink_register(devlink, dev);
+ ret = __devlink_register(devlink, dev, NULL);
mutex_unlock(&devlink_mutex);
- return 0;
+ return ret;
}
EXPORT_SYMBOL_GPL(devlink_register);
+static void devlink_child_devices_delete(struct devlink *devlink)
+{
+ struct devlink *cur, *tmp;
+
+ list_for_each_entry_safe(cur, tmp, &devlink_list, list) {
+ struct devlink *parent = cur->parent;
+
+ if (devlink == parent)
+ parent->ops->dev_del(cur);
+ }
+}
+
/**
* __devlink_unregister - Unregister devlink instance
* Caller must hold the devlink_mutex while invoking this API.
@@ -5299,6 +5389,7 @@ int devlink_register(struct devlink *devlink, struct device *dev)
void __devlink_unregister(struct devlink *devlink)
{
lockdep_assert_held(&devlink_mutex);
+ devlink_child_devices_delete(devlink);
devlink_notify(devlink, DEVLINK_CMD_DEL);
list_del(&devlink->list);
}
--
1.8.3.1
Powered by blists - more mailing lists