Re: [PATCH net-next v8 1/9] devlink: Introduce new parameter 'tx_priority' to devlink-rate

[Jiri Pirko <jiri@resnulli.us>]

Fri, Oct 28, 2022 at 12:51:35PM CEST, michal.wilczynski@intel.com wrote:
>To fully utilize offload capabilities of Intel 100G card QoS capabilities
>new parameter 'tx_priority' needs to be introduced. This parameter allows

It is highly confusing to call this "parameter". Devlink parameters are
totally different thing. This is just another netlink attribute for
devlink rate object.


>for usage of strict priority arbiter among siblings. This arbitration
>scheme attempts to schedule nodes based on their priority as long as the
>nodes remain within their bandwidth limit.
>
>Introduce new parameter in devlink-rate that will allow for
>configuration of strict priority.
>
>Signed-off-by: Michal Wilczynski <michal.wilczynski@intel.com>
>---
> include/net/devlink.h        |  6 ++++++
> include/uapi/linux/devlink.h |  1 +
> net/core/devlink.c           | 29 +++++++++++++++++++++++++++++
> 3 files changed, 36 insertions(+)
>
>diff --git a/include/net/devlink.h b/include/net/devlink.h
>index ba6b8b094943..9d2b0c3c4ad3 100644
>--- a/include/net/devlink.h
>+++ b/include/net/devlink.h
>@@ -114,6 +114,8 @@ struct devlink_rate {
> 			refcount_t refcnt;
> 		};
> 	};
>+
>+	u16 tx_priority;
> };
> 
> struct devlink_port {
>@@ -1493,10 +1495,14 @@ struct devlink_ops {
> 				      u64 tx_share, struct netlink_ext_ack *extack);
> 	int (*rate_leaf_tx_max_set)(struct devlink_rate *devlink_rate, void *priv,
> 				    u64 tx_max, struct netlink_ext_ack *extack);
>+	int (*rate_leaf_tx_priority_set)(struct devlink_rate *devlink_rate, void *priv,
>+					 u64 tx_priority, struct netlink_ext_ack *extack);
> 	int (*rate_node_tx_share_set)(struct devlink_rate *devlink_rate, void *priv,
> 				      u64 tx_share, struct netlink_ext_ack *extack);
> 	int (*rate_node_tx_max_set)(struct devlink_rate *devlink_rate, void *priv,
> 				    u64 tx_max, struct netlink_ext_ack *extack);
>+	int (*rate_node_tx_priority_set)(struct devlink_rate *devlink_rate, void *priv,
>+					 u64 tx_priority, struct netlink_ext_ack *extack);
> 	int (*rate_node_new)(struct devlink_rate *rate_node, void **priv,
> 			     struct netlink_ext_ack *extack);
> 	int (*rate_node_del)(struct devlink_rate *rate_node, void *priv,
>diff --git a/include/uapi/linux/devlink.h b/include/uapi/linux/devlink.h
>index 2f24b53a87a5..b3df5bc45ba5 100644
>--- a/include/uapi/linux/devlink.h
>+++ b/include/uapi/linux/devlink.h
>@@ -607,6 +607,7 @@ enum devlink_attr {
> 
> 	DEVLINK_ATTR_SELFTESTS,			/* nested */
> 
>+	DEVLINK_ATTR_RATE_TX_PRIORITY,		/* u16 */
> 	/* 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 89baa7c0938b..2586b1307cb4 100644
>--- a/net/core/devlink.c
>+++ b/net/core/devlink.c
>@@ -1184,6 +1184,9 @@ static int devlink_nl_rate_fill(struct sk_buff *msg,
> 			      devlink_rate->tx_max, DEVLINK_ATTR_PAD))
> 		goto nla_put_failure;
> 
>+	if (nla_put_u16(msg, DEVLINK_ATTR_RATE_TX_PRIORITY,
>+			devlink_rate->tx_priority))
>+		goto nla_put_failure;
> 	if (devlink_rate->parent)
> 		if (nla_put_string(msg, DEVLINK_ATTR_RATE_PARENT_NODE_NAME,
> 				   devlink_rate->parent->name))
>@@ -1924,6 +1927,7 @@ static int devlink_nl_rate_set(struct devlink_rate *devlink_rate,
> {
> 	struct nlattr *nla_parent, **attrs = info->attrs;
> 	int err = -EOPNOTSUPP;
>+	u16 priority;
> 	u64 rate;
> 
> 	if (attrs[DEVLINK_ATTR_RATE_TX_SHARE]) {
>@@ -1952,6 +1956,20 @@ static int devlink_nl_rate_set(struct devlink_rate *devlink_rate,
> 		devlink_rate->tx_max = rate;
> 	}
> 
>+	if (attrs[DEVLINK_ATTR_RATE_TX_PRIORITY]) {
>+		priority = nla_get_u16(attrs[DEVLINK_ATTR_RATE_TX_PRIORITY]);
>+		if (devlink_rate_is_leaf(devlink_rate))
>+			err = ops->rate_leaf_tx_priority_set(devlink_rate, devlink_rate->priv,
>+							priority, info->extack);
>+		else if (devlink_rate_is_node(devlink_rate))
>+			err = ops->rate_node_tx_priority_set(devlink_rate, devlink_rate->priv,
>+							priority, info->extack);
>+
>+		if (err)
>+			return err;
>+		devlink_rate->tx_priority = priority;
>+	}
>+
> 	nla_parent = attrs[DEVLINK_ATTR_RATE_PARENT_NODE_NAME];
> 	if (nla_parent) {
> 		err = devlink_nl_rate_parent_node_set(devlink_rate, info,
>@@ -1983,6 +2001,11 @@ static bool devlink_rate_set_ops_supported(const struct devlink_ops *ops,
> 			NL_SET_ERR_MSG_MOD(info->extack, "Parent set isn't supported for the leafs");
> 			return false;
> 		}
>+		if (attrs[DEVLINK_ATTR_RATE_TX_PRIORITY] && !ops->rate_leaf_tx_priority_set) {
>+			NL_SET_ERR_MSG_MOD(info->extack,
>+					   "TX priority set isn't supported for the leafs");
>+			return false;
>+		}
> 	} else if (type == DEVLINK_RATE_TYPE_NODE) {
> 		if (attrs[DEVLINK_ATTR_RATE_TX_SHARE] && !ops->rate_node_tx_share_set) {
> 			NL_SET_ERR_MSG_MOD(info->extack, "TX share set isn't supported for the nodes");
>@@ -1997,6 +2020,11 @@ static bool devlink_rate_set_ops_supported(const struct devlink_ops *ops,
> 			NL_SET_ERR_MSG_MOD(info->extack, "Parent set isn't supported for the nodes");
> 			return false;
> 		}
>+		if (attrs[DEVLINK_ATTR_RATE_TX_PRIORITY] && !ops->rate_node_tx_priority_set) {
>+			NL_SET_ERR_MSG_MOD(info->extack,
>+					   "TX priority set isn't supported for the nodes");
>+			return false;
>+		}
> 	} else {
> 		WARN(1, "Unknown type of rate object");
> 		return false;
>@@ -9172,6 +9200,7 @@ static const struct nla_policy devlink_nl_policy[DEVLINK_ATTR_MAX + 1] = {
> 	[DEVLINK_ATTR_LINECARD_INDEX] = { .type = NLA_U32 },
> 	[DEVLINK_ATTR_LINECARD_TYPE] = { .type = NLA_NUL_STRING },
> 	[DEVLINK_ATTR_SELFTESTS] = { .type = NLA_NESTED },
>+	[DEVLINK_ATTR_RATE_TX_PRIORITY] = { .type = NLA_U16 },

Why not u32?


> };
> 
> static const struct genl_small_ops devlink_nl_ops[] = {
>-- 
>2.37.2
>