2023-09-06 03:32:08 -05:00
|
|
|
From 37d223fa389636092d519ca903f186d608eed3c8 Mon Sep 17 00:00:00 2001
|
2023-04-10 11:48:27 -05:00
|
|
|
From: Jiri Pirko <jiri@nvidia.com>
|
|
|
|
Date: Thu, 31 Dec 2020 17:35:08 +0100
|
2023-09-06 03:32:08 -05:00
|
|
|
Subject: [PATCH backport 5.10 126/182] devlink: implement line card
|
|
|
|
provisioning
|
2023-04-10 11:48:27 -05:00
|
|
|
|
|
|
|
In order to be able to configure all needed stuff on a port/netdevice
|
|
|
|
of a line card without the line card being present, introduce line card
|
|
|
|
provisioning. Basically by setting a type, provisioning process will
|
|
|
|
start and driver is supposed to create a placeholder for instances
|
|
|
|
(ports/netdevices) for a line card type.
|
|
|
|
|
|
|
|
Allow the user to query the supported line card types over line card
|
|
|
|
get command. Then implement two netlink command SET to allow user to
|
|
|
|
set/unset the card type.
|
|
|
|
|
|
|
|
On the driver API side, add provision/unprovision ops and supported
|
|
|
|
types array to be advertised. Upon provision op call, the driver should
|
|
|
|
take care of creating the instances for the particular line card type.
|
|
|
|
Introduce provision_set/clear() functions to be called by the driver
|
|
|
|
once the provisioning/unprovisioning is done on its side. These helpers
|
|
|
|
are not to be called directly due to the async nature of provisioning.
|
|
|
|
|
|
|
|
Signed-off-by: Jiri Pirko <jiri@nvidia.com>
|
|
|
|
---
|
|
|
|
include/net/devlink.h | 41 ++++-
|
|
|
|
include/uapi/linux/devlink.h | 15 ++
|
|
|
|
net/core/devlink.c | 311 ++++++++++++++++++++++++++++++++---
|
|
|
|
3 files changed, 346 insertions(+), 21 deletions(-)
|
|
|
|
|
|
|
|
diff --git a/include/net/devlink.h b/include/net/devlink.h
|
2023-09-06 03:32:08 -05:00
|
|
|
index e8f046590579..44b60085ec16 100644
|
2023-04-10 11:48:27 -05:00
|
|
|
--- a/include/net/devlink.h
|
|
|
|
+++ b/include/net/devlink.h
|
|
|
|
@@ -142,11 +142,43 @@ struct devlink_port {
|
|
|
|
struct mutex reporters_lock; /* Protects reporter_list */
|
|
|
|
};
|
|
|
|
|
|
|
|
+struct devlink_linecard_ops;
|
|
|
|
+struct devlink_linecard_type;
|
|
|
|
+
|
|
|
|
struct devlink_linecard {
|
|
|
|
struct list_head list;
|
|
|
|
struct devlink *devlink;
|
|
|
|
unsigned int index;
|
|
|
|
refcount_t refcount;
|
|
|
|
+ const struct devlink_linecard_ops *ops;
|
|
|
|
+ void *priv;
|
|
|
|
+ enum devlink_linecard_state state;
|
|
|
|
+ struct mutex state_lock; /* Protects state */
|
|
|
|
+ const char *type;
|
|
|
|
+ struct devlink_linecard_type *types;
|
|
|
|
+ unsigned int types_count;
|
|
|
|
+};
|
|
|
|
+
|
|
|
|
+/**
|
|
|
|
+ * struct devlink_linecard_ops - Linecard operations
|
|
|
|
+ * @provision: callback to provision the linecard slot with certain
|
|
|
|
+ * type of linecard
|
|
|
|
+ * @unprovision: callback to unprovision the linecard slot
|
|
|
|
+ * @types_init: callback to initialize types list
|
|
|
|
+ * @types_fini: callback to finalize types list
|
|
|
|
+ * @types_get: callback to get next type in list
|
|
|
|
+ */
|
|
|
|
+struct devlink_linecard_ops {
|
|
|
|
+ int (*provision)(struct devlink_linecard *linecard, void *priv,
|
|
|
|
+ const char *type, const void *type_priv,
|
|
|
|
+ struct netlink_ext_ack *extack);
|
|
|
|
+ int (*unprovision)(struct devlink_linecard *linecard, void *priv,
|
|
|
|
+ struct netlink_ext_ack *extack);
|
|
|
|
+ unsigned int (*types_count)(struct devlink_linecard *linecard,
|
|
|
|
+ void *priv);
|
|
|
|
+ void (*types_get)(struct devlink_linecard *linecard,
|
|
|
|
+ void *priv, unsigned int index, const char **type,
|
|
|
|
+ const void **type_priv);
|
|
|
|
};
|
|
|
|
|
|
|
|
struct devlink_sb_pool_info {
|
|
|
|
@@ -1413,9 +1445,14 @@ void devlink_port_attrs_pci_pf_set(struct devlink_port *devlink_port, u32 contro
|
|
|
|
u16 pf, bool external);
|
|
|
|
void devlink_port_attrs_pci_vf_set(struct devlink_port *devlink_port, u32 controller,
|
|
|
|
u16 pf, u16 vf, bool external);
|
|
|
|
-struct devlink_linecard *devlink_linecard_create(struct devlink *devlink,
|
|
|
|
- unsigned int linecard_index);
|
|
|
|
+struct devlink_linecard *
|
|
|
|
+devlink_linecard_create(struct devlink *devlink, unsigned int linecard_index,
|
|
|
|
+ const struct devlink_linecard_ops *ops, void *priv);
|
|
|
|
void devlink_linecard_destroy(struct devlink_linecard *linecard);
|
|
|
|
+void devlink_linecard_provision_set(struct devlink_linecard *linecard,
|
|
|
|
+ const char *type);
|
|
|
|
+void devlink_linecard_provision_clear(struct devlink_linecard *linecard);
|
|
|
|
+void devlink_linecard_provision_fail(struct devlink_linecard *linecard);
|
|
|
|
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
|
2023-09-06 03:32:08 -05:00
|
|
|
index ff07ad596035..d8833664522f 100644
|
2023-04-10 11:48:27 -05:00
|
|
|
--- a/include/uapi/linux/devlink.h
|
|
|
|
+++ b/include/uapi/linux/devlink.h
|
|
|
|
@@ -334,6 +334,18 @@ enum devlink_reload_limit {
|
|
|
|
|
|
|
|
#define DEVLINK_RELOAD_LIMITS_VALID_MASK (_BITUL(__DEVLINK_RELOAD_LIMIT_MAX) - 1)
|
|
|
|
|
|
|
|
+enum devlink_linecard_state {
|
|
|
|
+ DEVLINK_LINECARD_STATE_UNSPEC,
|
|
|
|
+ DEVLINK_LINECARD_STATE_UNPROVISIONED,
|
|
|
|
+ DEVLINK_LINECARD_STATE_UNPROVISIONING,
|
|
|
|
+ DEVLINK_LINECARD_STATE_PROVISIONING,
|
|
|
|
+ DEVLINK_LINECARD_STATE_PROVISIONING_FAILED,
|
|
|
|
+ DEVLINK_LINECARD_STATE_PROVISIONED,
|
|
|
|
+
|
|
|
|
+ __DEVLINK_LINECARD_STATE_MAX,
|
|
|
|
+ DEVLINK_LINECARD_STATE_MAX = __DEVLINK_LINECARD_STATE_MAX - 1
|
|
|
|
+};
|
|
|
|
+
|
|
|
|
enum devlink_attr {
|
|
|
|
/* don't change the order or add anything between, this is ABI! */
|
|
|
|
DEVLINK_ATTR_UNSPEC,
|
|
|
|
@@ -550,6 +562,9 @@ enum devlink_attr {
|
|
|
|
DEVLINK_ATTR_REGION_MAX_SNAPSHOTS, /* u32 */
|
|
|
|
|
|
|
|
DEVLINK_ATTR_LINECARD_INDEX, /* u32 */
|
|
|
|
+ DEVLINK_ATTR_LINECARD_STATE, /* u8 */
|
|
|
|
+ DEVLINK_ATTR_LINECARD_TYPE, /* string */
|
|
|
|
+ DEVLINK_ATTR_LINECARD_SUPPORTED_TYPES, /* nested */
|
|
|
|
|
|
|
|
/* add new attributes above here, update the policy in devlink.c */
|
|
|
|
|
|
|
|
diff --git a/net/core/devlink.c b/net/core/devlink.c
|
2023-09-06 03:32:08 -05:00
|
|
|
index 645fe0612b53..943973ffc450 100644
|
2023-04-10 11:48:27 -05:00
|
|
|
--- a/net/core/devlink.c
|
|
|
|
+++ b/net/core/devlink.c
|
|
|
|
@@ -265,8 +265,10 @@ devlink_linecard_get_from_info(struct devlink *devlink, struct genl_info *info)
|
|
|
|
|
|
|
|
static void devlink_linecard_put(struct devlink_linecard *linecard)
|
|
|
|
{
|
|
|
|
- if (refcount_dec_and_test(&linecard->refcount))
|
|
|
|
+ if (refcount_dec_and_test(&linecard->refcount)) {
|
|
|
|
+ mutex_destroy(&linecard->state_lock);
|
|
|
|
kfree(linecard);
|
|
|
|
+ }
|
|
|
|
}
|
|
|
|
|
|
|
|
struct devlink_sb {
|
|
|
|
@@ -1233,6 +1235,12 @@ static int devlink_nl_cmd_port_unsplit_doit(struct sk_buff *skb,
|
|
|
|
return devlink_port_unsplit(devlink, port_index, info->extack);
|
|
|
|
}
|
|
|
|
|
|
|
|
+struct devlink_linecard_type {
|
|
|
|
+ struct list_head list;
|
|
|
|
+ const char *type;
|
|
|
|
+ const void *priv;
|
|
|
|
+};
|
|
|
|
+
|
|
|
|
static int devlink_nl_linecard_fill(struct sk_buff *msg,
|
|
|
|
struct devlink *devlink,
|
|
|
|
struct devlink_linecard *linecard,
|
|
|
|
@@ -1240,7 +1248,10 @@ static int devlink_nl_linecard_fill(struct sk_buff *msg,
|
|
|
|
u32 seq, int flags,
|
|
|
|
struct netlink_ext_ack *extack)
|
|
|
|
{
|
|
|
|
+ struct devlink_linecard_type *linecard_type;
|
|
|
|
+ struct nlattr *attr;
|
|
|
|
void *hdr;
|
|
|
|
+ int i;
|
|
|
|
|
|
|
|
hdr = genlmsg_put(msg, portid, seq, &devlink_nl_family, flags, cmd);
|
|
|
|
if (!hdr)
|
|
|
|
@@ -1250,6 +1261,25 @@ static int devlink_nl_linecard_fill(struct sk_buff *msg,
|
|
|
|
goto nla_put_failure;
|
|
|
|
if (nla_put_u32(msg, DEVLINK_ATTR_LINECARD_INDEX, linecard->index))
|
|
|
|
goto nla_put_failure;
|
|
|
|
+ if (nla_put_u8(msg, DEVLINK_ATTR_LINECARD_STATE, linecard->state))
|
|
|
|
+ goto nla_put_failure;
|
|
|
|
+ if (linecard->state >= DEVLINK_LINECARD_STATE_PROVISIONED &&
|
|
|
|
+ nla_put_string(msg, DEVLINK_ATTR_LINECARD_TYPE, linecard->type))
|
|
|
|
+ goto nla_put_failure;
|
|
|
|
+
|
|
|
|
+ if (linecard->types_count) {
|
|
|
|
+ attr = nla_nest_start(msg,
|
|
|
|
+ DEVLINK_ATTR_LINECARD_SUPPORTED_TYPES);
|
|
|
|
+ if (!attr)
|
|
|
|
+ goto nla_put_failure;
|
|
|
|
+ for (i = 0; i < linecard->types_count; i++) {
|
|
|
|
+ linecard_type = &linecard->types[i];
|
|
|
|
+ if (nla_put_string(msg, DEVLINK_ATTR_LINECARD_TYPE,
|
|
|
|
+ linecard_type->type))
|
|
|
|
+ goto nla_put_failure;
|
|
|
|
+ }
|
|
|
|
+ nla_nest_end(msg, attr);
|
|
|
|
+ }
|
|
|
|
|
|
|
|
genlmsg_end(msg, hdr);
|
|
|
|
return 0;
|
|
|
|
@@ -1335,12 +1365,14 @@ static int devlink_nl_cmd_linecard_get_dumpit(struct sk_buff *msg,
|
|
|
|
idx++;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
+ mutex_lock(&linecard->state_lock);
|
|
|
|
err = devlink_nl_linecard_fill(msg, devlink, linecard,
|
|
|
|
DEVLINK_CMD_LINECARD_NEW,
|
|
|
|
NETLINK_CB(cb->skb).portid,
|
|
|
|
cb->nlh->nlmsg_seq,
|
|
|
|
NLM_F_MULTI,
|
|
|
|
cb->extack);
|
|
|
|
+ mutex_unlock(&linecard->state_lock);
|
|
|
|
if (err) {
|
|
|
|
mutex_unlock(&devlink->linecards_lock);
|
|
|
|
devlink_put(devlink);
|
|
|
|
@@ -1359,6 +1391,153 @@ static int devlink_nl_cmd_linecard_get_dumpit(struct sk_buff *msg,
|
|
|
|
return msg->len;
|
|
|
|
}
|
|
|
|
|
|
|
|
+static struct devlink_linecard_type *
|
|
|
|
+devlink_linecard_type_lookup(struct devlink_linecard *linecard,
|
|
|
|
+ const char *type)
|
|
|
|
+{
|
|
|
|
+ struct devlink_linecard_type *linecard_type;
|
|
|
|
+ int i;
|
|
|
|
+
|
|
|
|
+ for (i = 0; i < linecard->types_count; i++) {
|
|
|
|
+ linecard_type = &linecard->types[i];
|
|
|
|
+ if (!strcmp(type, linecard_type->type))
|
|
|
|
+ return linecard_type;
|
|
|
|
+ }
|
|
|
|
+ return NULL;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+static int devlink_linecard_type_set(struct devlink_linecard *linecard,
|
|
|
|
+ const char *type,
|
|
|
|
+ struct netlink_ext_ack *extack)
|
|
|
|
+{
|
|
|
|
+ struct devlink_linecard_type *linecard_type;
|
|
|
|
+ int err;
|
|
|
|
+
|
|
|
|
+ mutex_lock(&linecard->state_lock);
|
|
|
|
+ if (linecard->state == DEVLINK_LINECARD_STATE_PROVISIONING) {
|
|
|
|
+ NL_SET_ERR_MSG_MOD(extack, "Linecard is currently being provisioned");
|
|
|
|
+ err = -EBUSY;
|
|
|
|
+ goto out;
|
|
|
|
+ }
|
|
|
|
+ if (linecard->state == DEVLINK_LINECARD_STATE_UNPROVISIONING) {
|
|
|
|
+ NL_SET_ERR_MSG_MOD(extack, "Linecard is currently being unprovisioned");
|
|
|
|
+ err = -EBUSY;
|
|
|
|
+ goto out;
|
|
|
|
+ }
|
|
|
|
+ if (linecard->state != DEVLINK_LINECARD_STATE_UNPROVISIONED &&
|
|
|
|
+ linecard->state != DEVLINK_LINECARD_STATE_PROVISIONING_FAILED) {
|
|
|
|
+ NL_SET_ERR_MSG_MOD(extack, "Linecard already provisioned");
|
|
|
|
+ err = -EBUSY;
|
|
|
|
+ goto out;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ linecard_type = devlink_linecard_type_lookup(linecard, type);
|
|
|
|
+ if (!linecard_type) {
|
|
|
|
+ NL_SET_ERR_MSG_MOD(extack, "Unsupported provision type provided");
|
|
|
|
+ err = -EINVAL;
|
|
|
|
+ goto out;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ linecard->state = DEVLINK_LINECARD_STATE_PROVISIONING;
|
|
|
|
+ linecard->type = linecard_type->type;
|
|
|
|
+ devlink_linecard_notify(linecard,
|
|
|
|
+ DEVLINK_CMD_LINECARD_NEW);
|
|
|
|
+ mutex_unlock(&linecard->state_lock);
|
|
|
|
+ err = linecard->ops->provision(linecard, linecard->priv,
|
|
|
|
+ linecard_type->type, linecard_type->priv,
|
|
|
|
+ extack);
|
|
|
|
+ if (err) {
|
|
|
|
+ /* Provisioning failed. Assume the linecard is unprovisioned
|
|
|
|
+ * for future operations.
|
|
|
|
+ */
|
|
|
|
+ mutex_lock(&linecard->state_lock);
|
|
|
|
+ linecard->state = DEVLINK_LINECARD_STATE_UNPROVISIONED;
|
|
|
|
+ devlink_linecard_notify(linecard, DEVLINK_CMD_LINECARD_NEW);
|
|
|
|
+ mutex_unlock(&linecard->state_lock);
|
|
|
|
+ }
|
|
|
|
+ return err;
|
|
|
|
+
|
|
|
|
+out:
|
|
|
|
+ mutex_unlock(&linecard->state_lock);
|
|
|
|
+ return err;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+static int devlink_linecard_type_unset(struct devlink_linecard *linecard,
|
|
|
|
+ struct netlink_ext_ack *extack)
|
|
|
|
+{
|
|
|
|
+ int err;
|
|
|
|
+
|
|
|
|
+ mutex_lock(&linecard->state_lock);
|
|
|
|
+ if (linecard->state == DEVLINK_LINECARD_STATE_PROVISIONING) {
|
|
|
|
+ NL_SET_ERR_MSG_MOD(extack, "Linecard is currently being provisioned");
|
|
|
|
+ err = -EBUSY;
|
|
|
|
+ goto out;
|
|
|
|
+ }
|
|
|
|
+ if (linecard->state == DEVLINK_LINECARD_STATE_UNPROVISIONING) {
|
|
|
|
+ NL_SET_ERR_MSG_MOD(extack, "Linecard is currently being unprovisioned");
|
|
|
|
+ err = -EBUSY;
|
|
|
|
+ goto out;
|
|
|
|
+ }
|
|
|
|
+ if (linecard->state == DEVLINK_LINECARD_STATE_PROVISIONING_FAILED) {
|
|
|
|
+ linecard->state = DEVLINK_LINECARD_STATE_UNPROVISIONED;
|
|
|
|
+ linecard->type = NULL;
|
|
|
|
+ devlink_linecard_notify(linecard, DEVLINK_CMD_LINECARD_NEW);
|
|
|
|
+ err = 0;
|
|
|
|
+ goto out;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if (linecard->state == DEVLINK_LINECARD_STATE_UNPROVISIONED ||
|
|
|
|
+ linecard->state == DEVLINK_LINECARD_STATE_UNSPEC) {
|
|
|
|
+ NL_SET_ERR_MSG_MOD(extack, "Linecard is not provisioned");
|
|
|
|
+ err = -EOPNOTSUPP;
|
|
|
|
+ goto out;
|
|
|
|
+ }
|
|
|
|
+ linecard->state = DEVLINK_LINECARD_STATE_UNPROVISIONING;
|
|
|
|
+ devlink_linecard_notify(linecard, DEVLINK_CMD_LINECARD_NEW);
|
|
|
|
+ mutex_unlock(&linecard->state_lock);
|
|
|
|
+ err = linecard->ops->unprovision(linecard, linecard->priv,
|
|
|
|
+ extack);
|
|
|
|
+ if (err) {
|
|
|
|
+ /* Unprovisioning failed. Assume the linecard is unprovisioned
|
|
|
|
+ * for future operations.
|
|
|
|
+ */
|
|
|
|
+ mutex_lock(&linecard->state_lock);
|
|
|
|
+ linecard->state = DEVLINK_LINECARD_STATE_UNPROVISIONED;
|
|
|
|
+ devlink_linecard_notify(linecard, DEVLINK_CMD_LINECARD_NEW);
|
|
|
|
+ mutex_unlock(&linecard->state_lock);
|
|
|
|
+ }
|
|
|
|
+ return err;
|
|
|
|
+
|
|
|
|
+out:
|
|
|
|
+ mutex_unlock(&linecard->state_lock);
|
|
|
|
+ return err;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+static int devlink_nl_cmd_linecard_set_doit(struct sk_buff *skb,
|
|
|
|
+ struct genl_info *info)
|
|
|
|
+{
|
|
|
|
+ struct devlink_linecard *linecard = info->user_ptr[1];
|
|
|
|
+ struct netlink_ext_ack *extack = info->extack;
|
|
|
|
+ int err;
|
|
|
|
+
|
|
|
|
+ if (info->attrs[DEVLINK_ATTR_LINECARD_TYPE]) {
|
|
|
|
+ const char *type;
|
|
|
|
+
|
|
|
|
+ type = nla_data(info->attrs[DEVLINK_ATTR_LINECARD_TYPE]);
|
|
|
|
+ if (strcmp(type, "")) {
|
|
|
|
+ err = devlink_linecard_type_set(linecard, type, extack);
|
|
|
|
+ if (err)
|
|
|
|
+ return err;
|
|
|
|
+ } else {
|
|
|
|
+ err = devlink_linecard_type_unset(linecard, extack);
|
|
|
|
+ if (err)
|
|
|
|
+ return err;
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ 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,
|
|
|
|
@@ -7818,19 +7997,8 @@ static const struct nla_policy devlink_nl_policy[DEVLINK_ATTR_MAX + 1] = {
|
|
|
|
[DEVLINK_ATTR_RELOAD_ACTION] = NLA_POLICY_RANGE(NLA_U8, DEVLINK_RELOAD_ACTION_DRIVER_REINIT,
|
|
|
|
DEVLINK_RELOAD_ACTION_MAX),
|
|
|
|
[DEVLINK_ATTR_RELOAD_LIMITS] = NLA_POLICY_BITFIELD32(DEVLINK_RELOAD_LIMITS_VALID_MASK),
|
|
|
|
-//<<<<<<< HEAD
|
|
|
|
-//=======
|
|
|
|
- [DEVLINK_ATTR_PORT_FLAVOUR] = { .type = NLA_U16 },
|
|
|
|
- [DEVLINK_ATTR_PORT_PCI_PF_NUMBER] = { .type = NLA_U16 },
|
|
|
|
- [DEVLINK_ATTR_PORT_PCI_SF_NUMBER] = { .type = NLA_U32 },
|
|
|
|
- [DEVLINK_ATTR_PORT_CONTROLLER_NUMBER] = { .type = NLA_U32 },
|
|
|
|
- [DEVLINK_ATTR_RATE_TYPE] = { .type = NLA_U16 },
|
|
|
|
- [DEVLINK_ATTR_RATE_TX_SHARE] = { .type = NLA_U64 },
|
|
|
|
- [DEVLINK_ATTR_RATE_TX_MAX] = { .type = NLA_U64 },
|
|
|
|
- [DEVLINK_ATTR_RATE_NODE_NAME] = { .type = NLA_NUL_STRING },
|
|
|
|
- [DEVLINK_ATTR_RATE_PARENT_NODE_NAME] = { .type = NLA_NUL_STRING },
|
|
|
|
[DEVLINK_ATTR_LINECARD_INDEX] = { .type = NLA_U32 },
|
|
|
|
-//>>>>>>> 1180815a3831... devlink: add support to create line card and expose to user
|
|
|
|
+ [DEVLINK_ATTR_LINECARD_TYPE] = { .type = NLA_NUL_STRING },
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct genl_small_ops devlink_nl_ops[] = {
|
|
|
|
@@ -7878,6 +8046,13 @@ static const struct genl_small_ops devlink_nl_ops[] = {
|
|
|
|
DEVLINK_NL_FLAG_NO_LOCK,
|
|
|
|
/* can be retrieved by unprivileged users */
|
|
|
|
},
|
|
|
|
+ {
|
|
|
|
+ .cmd = DEVLINK_CMD_LINECARD_SET,
|
|
|
|
+ .doit = devlink_nl_cmd_linecard_set_doit,
|
|
|
|
+ .flags = GENL_ADMIN_PERM,
|
|
|
|
+ .internal_flags = DEVLINK_NL_FLAG_NEED_LINECARD |
|
|
|
|
+ DEVLINK_NL_FLAG_NO_LOCK,
|
|
|
|
+ },
|
|
|
|
{
|
|
|
|
.cmd = DEVLINK_CMD_SB_GET,
|
|
|
|
.validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
|
|
|
|
@@ -8677,35 +8852,85 @@ static int __devlink_port_phys_port_name_get(struct devlink_port *devlink_port,
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
+static int devlink_linecard_types_init(struct devlink_linecard *linecard)
|
|
|
|
+{
|
|
|
|
+ struct devlink_linecard_type *linecard_type;
|
|
|
|
+ unsigned int count;
|
|
|
|
+ int i;
|
|
|
|
+
|
|
|
|
+ count = linecard->ops->types_count(linecard, linecard->priv);
|
|
|
|
+ linecard->types = kmalloc_array(count, sizeof(*linecard_type),
|
|
|
|
+ GFP_KERNEL);
|
|
|
|
+ if (!linecard->types)
|
|
|
|
+ return -ENOMEM;
|
|
|
|
+ linecard->types_count = count;
|
|
|
|
+
|
|
|
|
+ for (i = 0; i < count; i++) {
|
|
|
|
+ linecard_type = &linecard->types[i];
|
|
|
|
+ linecard->ops->types_get(linecard, linecard->priv, i,
|
|
|
|
+ &linecard_type->type,
|
|
|
|
+ &linecard_type->priv);
|
|
|
|
+ }
|
|
|
|
+ return 0;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+static void devlink_linecard_types_fini(struct devlink_linecard *linecard)
|
|
|
|
+{
|
|
|
|
+ kfree(linecard->types);
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
/**
|
|
|
|
* devlink_linecard_create - Create devlink linecard
|
|
|
|
*
|
|
|
|
* @devlink: devlink
|
|
|
|
* @linecard_index: driver-specific numerical identifier of the linecard
|
|
|
|
+ * @ops: linecards ops
|
|
|
|
+ * @priv: user priv pointer
|
|
|
|
*
|
|
|
|
* Create devlink linecard instance with provided linecard index.
|
|
|
|
* Caller can use any indexing, even hw-related one.
|
|
|
|
*/
|
|
|
|
-struct devlink_linecard *devlink_linecard_create(struct devlink *devlink,
|
|
|
|
- unsigned int linecard_index)
|
|
|
|
+struct devlink_linecard *
|
|
|
|
+devlink_linecard_create(struct devlink *devlink, unsigned int linecard_index,
|
|
|
|
+ const struct devlink_linecard_ops *ops, void *priv)
|
|
|
|
{
|
|
|
|
struct devlink_linecard *linecard;
|
|
|
|
+ int err;
|
|
|
|
+
|
|
|
|
+ if (WARN_ON(!ops || !ops->provision || !ops->unprovision ||
|
|
|
|
+ !ops->types_count || !ops->types_get))
|
|
|
|
+ return ERR_PTR(-EINVAL);
|
|
|
|
|
|
|
|
mutex_lock(&devlink->linecards_lock);
|
|
|
|
if (devlink_linecard_index_exists(devlink, linecard_index)) {
|
|
|
|
- mutex_unlock(&devlink->linecards_lock);
|
|
|
|
- return ERR_PTR(-EEXIST);
|
|
|
|
+ linecard = ERR_PTR(-EEXIST);
|
|
|
|
+ goto unlock;
|
|
|
|
}
|
|
|
|
|
|
|
|
linecard = kzalloc(sizeof(*linecard), GFP_KERNEL);
|
|
|
|
- if (!linecard)
|
|
|
|
- return ERR_PTR(-ENOMEM);
|
|
|
|
+ if (!linecard) {
|
|
|
|
+ linecard = ERR_PTR(-ENOMEM);
|
|
|
|
+ goto unlock;
|
|
|
|
+ }
|
|
|
|
|
|
|
|
linecard->devlink = devlink;
|
|
|
|
linecard->index = linecard_index;
|
|
|
|
+ linecard->ops = ops;
|
|
|
|
+ linecard->priv = priv;
|
|
|
|
+ linecard->state = DEVLINK_LINECARD_STATE_UNPROVISIONED;
|
|
|
|
+ mutex_init(&linecard->state_lock);
|
|
|
|
+
|
|
|
|
+ err = devlink_linecard_types_init(linecard);
|
|
|
|
+ if (err) {
|
|
|
|
+ kfree(linecard);
|
|
|
|
+ linecard = ERR_PTR(err);
|
|
|
|
+ goto unlock;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
list_add_tail(&linecard->list, &devlink->linecard_list);
|
|
|
|
refcount_set(&linecard->refcount, 1);
|
|
|
|
devlink_linecard_notify(linecard, DEVLINK_CMD_LINECARD_NEW);
|
|
|
|
+unlock:
|
|
|
|
mutex_unlock(&devlink->linecards_lock);
|
|
|
|
return linecard;
|
|
|
|
}
|
|
|
|
@@ -8721,6 +8946,7 @@ void devlink_linecard_destroy(struct devlink_linecard *linecard)
|
|
|
|
struct devlink *devlink = linecard->devlink;
|
|
|
|
|
|
|
|
devlink_linecard_notify(linecard, DEVLINK_CMD_LINECARD_DEL);
|
|
|
|
+ devlink_linecard_types_fini(linecard);
|
|
|
|
mutex_lock(&devlink->linecards_lock);
|
|
|
|
list_del(&linecard->list);
|
|
|
|
mutex_unlock(&devlink->linecards_lock);
|
|
|
|
@@ -8728,6 +8954,53 @@ void devlink_linecard_destroy(struct devlink_linecard *linecard)
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(devlink_linecard_destroy);
|
|
|
|
|
|
|
|
+/**
|
|
|
|
+ * devlink_linecard_provision_set - Set provisioning on linecard
|
|
|
|
+ *
|
|
|
|
+ * @linecard: devlink linecard
|
|
|
|
+ * @type: linecard type
|
|
|
|
+ */
|
|
|
|
+void devlink_linecard_provision_set(struct devlink_linecard *linecard,
|
|
|
|
+ const char *type)
|
|
|
|
+{
|
|
|
|
+ mutex_lock(&linecard->state_lock);
|
|
|
|
+ WARN_ON(linecard->type && linecard->type != type);
|
|
|
|
+ linecard->state = DEVLINK_LINECARD_STATE_PROVISIONED;
|
|
|
|
+ linecard->type = type;
|
|
|
|
+ devlink_linecard_notify(linecard, DEVLINK_CMD_LINECARD_NEW);
|
|
|
|
+ mutex_unlock(&linecard->state_lock);
|
|
|
|
+}
|
|
|
|
+EXPORT_SYMBOL_GPL(devlink_linecard_provision_set);
|
|
|
|
+
|
|
|
|
+/**
|
|
|
|
+ * devlink_linecard_provision_clear - Clear provisioning on linecard
|
|
|
|
+ *
|
|
|
|
+ * @linecard: devlink linecard
|
|
|
|
+ */
|
|
|
|
+void devlink_linecard_provision_clear(struct devlink_linecard *linecard)
|
|
|
|
+{
|
|
|
|
+ mutex_lock(&linecard->state_lock);
|
|
|
|
+ linecard->state = DEVLINK_LINECARD_STATE_UNPROVISIONED;
|
|
|
|
+ linecard->type = NULL;
|
|
|
|
+ devlink_linecard_notify(linecard, DEVLINK_CMD_LINECARD_NEW);
|
|
|
|
+ mutex_unlock(&linecard->state_lock);
|
|
|
|
+}
|
|
|
|
+EXPORT_SYMBOL_GPL(devlink_linecard_provision_clear);
|
|
|
|
+
|
|
|
|
+/**
|
|
|
|
+ * devlink_linecard_provision_fail - Fail provisioning on linecard
|
|
|
|
+ *
|
|
|
|
+ * @linecard: devlink linecard
|
|
|
|
+ */
|
|
|
|
+void devlink_linecard_provision_fail(struct devlink_linecard *linecard)
|
|
|
|
+{
|
|
|
|
+ mutex_lock(&linecard->state_lock);
|
|
|
|
+ linecard->state = DEVLINK_LINECARD_STATE_PROVISIONING_FAILED;
|
|
|
|
+ devlink_linecard_notify(linecard, DEVLINK_CMD_LINECARD_NEW);
|
|
|
|
+ mutex_unlock(&linecard->state_lock);
|
|
|
|
+}
|
|
|
|
+EXPORT_SYMBOL_GPL(devlink_linecard_provision_fail);
|
|
|
|
+
|
|
|
|
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,
|
|
|
|
--
|
2023-09-06 03:32:08 -05:00
|
|
|
2.20.1
|
2023-04-10 11:48:27 -05:00
|
|
|
|