* [PATCH v5 net-next 01/12] netlink: spec: add shaper YAML spec
2024-08-29 15:16 [PATCH v5 net-next 00/12] net: introduce TX H/W shaping API Paolo Abeni
@ 2024-08-29 15:16 ` Paolo Abeni
2024-08-29 15:16 ` [PATCH v5 net-next 02/12] net-shapers: implement NL get operation Paolo Abeni
` (10 subsequent siblings)
11 siblings, 0 replies; 29+ messages in thread
From: Paolo Abeni @ 2024-08-29 15:16 UTC (permalink / raw)
To: netdev
Cc: Jakub Kicinski, Jiri Pirko, Madhu Chittim, Sridhar Samudrala,
Simon Horman, John Fastabend, Sunil Kovvuri Goutham,
Jamal Hadi Salim, Donald Hunter, anthony.l.nguyen,
przemyslaw.kitszel, intel-wired-lan, edumazet
Define the user-space visible interface to query, configure and delete
network shapers via yaml definition.
Add dummy implementations for the relevant NL callbacks.
set() and delete() operations touch a single shaper creating/updating or
deleting it.
The group() operation creates a shaper's group, nesting multiple input
shapers under the specified output shaper.
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
v4 -> v5:
- moved ifindex under the binding attr
- moved id, scope to new attr set
- rename 'root' as 'node'
- deleted unused 'info' subset
- a lot of doc update and fixup
- removed empty black line at MAKEFILE eof
v3 -> v4:
- spec file rename
- always use '@' for references
- detached scope -> node scope
- inputs/output -> leaves/root
- deduplicate leaves/root policy
- get/dump/group return ifindex, too
- added some general introduction to the doc
RFC v1 -> RFC v2:
- u64 -> uint
- net_shapers -> net-shapers
- documented all the attributes
- dropped [ admin-perm ] for get() op
- group op
- set/delete touch a single shaper
---
Documentation/netlink/specs/net_shaper.yaml | 303 ++++++++++++++++++++
MAINTAINERS | 1 +
include/uapi/linux/net_shaper.h | 80 ++++++
net/Kconfig | 3 +
net/Makefile | 1 +
net/shaper/Makefile | 8 +
net/shaper/shaper.c | 55 ++++
net/shaper/shaper_nl_gen.c | 127 ++++++++
net/shaper/shaper_nl_gen.h | 35 +++
9 files changed, 613 insertions(+)
create mode 100644 Documentation/netlink/specs/net_shaper.yaml
create mode 100644 include/uapi/linux/net_shaper.h
create mode 100644 net/shaper/Makefile
create mode 100644 net/shaper/shaper.c
create mode 100644 net/shaper/shaper_nl_gen.c
create mode 100644 net/shaper/shaper_nl_gen.h
diff --git a/Documentation/netlink/specs/net_shaper.yaml b/Documentation/netlink/specs/net_shaper.yaml
new file mode 100644
index 000000000000..ae40bd17c39c
--- /dev/null
+++ b/Documentation/netlink/specs/net_shaper.yaml
@@ -0,0 +1,303 @@
+# SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)
+
+name: net-shaper
+
+doc: |
+ Networking HW rate limiting configuration.
+
+ This API allows configuring HW shapers available on the network
+ devices at different levels (queues, network device) and allows
+ arbitrary manipulation of the scheduling tree of the involved
+ shapers.
+
+ Each @shaper is identified within the given device, by an @handle,
+ comprising both a @scope and an @id.
+
+ Depending on the @scope value, the shapers are attached to specific
+ HW objects (queues, devices) or, for @node scope, represent a
+ scheduling group, that can be placed in an arbitrary location of
+ the scheduling tree.
+
+ Shapers can be created with two different operations: the @set
+ operation, to create and update a single "attached" shaper, and
+ the @group operation, to create and update a scheduling
+ group. Only the @group operation can create @node scope shapers
+
+ Existing shapers can be deleted /reset via the @delete operation.
+
+ The user can query the running configuration via the @get operation.
+
+definitions:
+ -
+ type: enum
+ name: scope
+ doc: Defines the shaper @id interpretation.
+ render-max: true
+ entries:
+ - name: unspec
+ doc: The scope is not specified.
+ -
+ name: netdev
+ doc: The main shaper for the given network device.
+ -
+ name: queue
+ doc: |
+ The shaper is attached to the given device queue,
+ the @id represents the queue number.
+ -
+ name: node
+ doc: |
+ The shaper allows grouping of queues or other
+ node shapers; can be nested in either @netdev
+ shapers or other @node shapers, allowing placement
+ in any location of the scheduling tree, except
+ leaves and root.
+ -
+ type: enum
+ name: metric
+ doc: Different metric supported by the shaper.
+ entries:
+ -
+ name: bps
+ doc: Shaper operates on a bits per second basis.
+ -
+ name: pps
+ doc: Shaper operates on a packets per second basis.
+
+attribute-sets:
+ -
+ name: net-shaper
+ attributes:
+ -
+ name: handle
+ type: nest
+ nested-attributes: handle
+ doc: Unique identifier for the given shaper inside the owning device.
+ -
+ name: metric
+ type: u32
+ enum: metric
+ doc: Metric used by the given shaper for bw-min, bw-max and burst.
+ -
+ name: bw-min
+ type: uint
+ doc: Minimum Guaranteed bandwidth for the given shaper.
+ -
+ name: bw-max
+ type: uint
+ doc: Maximum bandwidth for the given shaper or 0 when unlimited.
+ -
+ name: burst
+ type: uint
+ doc: |
+ Maximum burst-size for shaping. Should not be interpreted
+ as a quantum.
+ -
+ name: priority
+ type: u32
+ doc: |
+ Scheduling priority for the given shaper. The priority
+ scheduling is applied to sibling shapers.
+ -
+ name: weight
+ type: u32
+ doc: |
+ Relative weight for round robin scheduling of the
+ given shaper.
+ The scheduling is applied to all sibling shapers
+ with the same priority.
+ -
+ name: ifindex
+ type: u32
+ doc: Interface index owning the specified shaper.
+ -
+ name: parent
+ type: nest
+ nested-attributes: handle
+ doc: |
+ Identifier for the parent of the affected shaper.
+ Only needed for @group operation.
+ -
+ name: leaves
+ type: nest
+ multi-attr: true
+ nested-attributes: info
+ doc: |
+ Describes a set of leaves shapers for a @group operation.
+ -
+ name: node
+ type: nest
+ nested-attributes: node-info
+ doc: |
+ Describes the node shaper for a @group operation.
+ Differently from @leaves and @shaper allow specifying
+ the shaper parent handle, too.
+ -
+ name: shaper
+ type: nest
+ nested-attributes: info
+ doc: |
+ Describes a single shaper for a @set operation.
+ -
+ name: handle
+ attributes:
+ -
+ name: scope
+ type: u32
+ enum: scope
+ doc: Defines the shaper @id interpretation.
+ -
+ name: id
+ type: u32
+ doc: |
+ Numeric identifier of a shaper. The id semantic depends on
+ the scope. For @queue scope it's the queue id and for @node
+ scope it's the node identifier.
+ -
+ name: info
+ subset-of: net-shaper
+ attributes:
+ -
+ name: handle
+ -
+ name: metric
+ -
+ name: bw-min
+ -
+ name: bw-max
+ -
+ name: burst
+ -
+ name: priority
+ -
+ name: weight
+ -
+ name: node-info
+ subset-of: net-shaper
+ attributes:
+ -
+ name: parent
+ -
+ name: handle
+ -
+ name: metric
+ -
+ name: bw-min
+ -
+ name: bw-max
+ -
+ name: burst
+ -
+ name: priority
+ -
+ name: weight
+
+operations:
+ list:
+ -
+ name: get
+ doc: |
+ Get information about a shaper for a given device.
+ attribute-set: net-shaper
+
+ do:
+ pre: net-shaper-nl-pre-doit
+ post: net-shaper-nl-post-doit
+ request:
+ attributes: &ns-binding
+ - ifindex
+ - handle
+ reply:
+ attributes: &ns-attrs
+ - ifindex
+ - parent
+ - handle
+ - metric
+ - bw-min
+ - bw-max
+ - burst
+ - priority
+ - weight
+
+ dump:
+ pre: net-shaper-nl-pre-dumpit
+ post: net-shaper-nl-post-dumpit
+ request:
+ attributes:
+ - ifindex
+ reply:
+ attributes: *ns-attrs
+ -
+ name: set
+ doc: |
+ Create or update the specified shaper.
+ The set operation can't be used to create a @node scope shaper,
+ use the @group operation instead.
+ attribute-set: net-shaper
+ flags: [ admin-perm ]
+
+ do:
+ pre: net-shaper-nl-pre-doit
+ post: net-shaper-nl-post-doit
+ request:
+ attributes:
+ - ifindex
+ - shaper
+
+ -
+ name: delete
+ doc: |
+ Clear (remove) the specified shaper. When deleting
+ a @node shaper, reattach all the node's leaves to the
+ deleted node's parent.
+ If, after the removal, the parent shaper has no more
+ leaves and the parent shaper scope is @node,the parent
+ node is deleted, recursively.
+ When deleting a @queue shaper or a @netdev shaper,
+ the shaper disappears from the hierarchy, but the
+ queue/device can still send traffic: it has an implicit
+ node with infinite bandwidth. Queue's implicit node
+ feeds an implicit RR node at the root of the hierarchy.
+ attribute-set: net-shaper
+ flags: [ admin-perm ]
+
+ do:
+ pre: net-shaper-nl-pre-doit
+ post: net-shaper-nl-post-doit
+ request:
+ attributes: *ns-binding
+
+ -
+ name: group
+ doc: |
+ Create or update a scheduling group, attaching the specified
+ @leaves shapers under the specified @node, creating the latter,
+ if needed.
+ The @leaves shapers scope must be @queue and the @node shaper
+ scope must be either @node or @netdev.
+ When the @node shaper has @node scope, if the @handle @id is not
+ specified, a new shaper of such scope is created, otherwise the
+ specified @node must already exist.
+ The @parent handle for the @node shaper is optional in most cases.
+ For newly created @node scope shaper, the @parent is set by
+ default to the parent linked to the @leaves before the @group
+ operation. If, prior to the grouping operation, the @leaves
+ have different parents, the @node shaper parent must be explicitly
+ set.
+ The operation is atomic, on failure no change is applied to
+ the device shaping configuration, otherwise the @node shaper
+ full identifier, comprising @binding and @handle, is provided
+ as the reply.
+ attribute-set: net-shaper
+ flags: [ admin-perm ]
+
+ do:
+ pre: net-shaper-nl-pre-doit
+ post: net-shaper-nl-post-doit
+ request:
+ attributes:
+ - ifindex
+ - leaves
+ - node
+ reply:
+ attributes: *ns-binding
diff --git a/MAINTAINERS b/MAINTAINERS
index 30a9b9450e11..2673b9c63439 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -15892,6 +15892,7 @@ F: include/linux/platform_data/wiznet.h
F: include/uapi/linux/cn_proc.h
F: include/uapi/linux/ethtool_netlink.h
F: include/uapi/linux/if_*
+F: include/uapi/linux/net_shaper.h
F: include/uapi/linux/netdev*
F: tools/testing/selftests/drivers/net/
X: drivers/net/wireless/
diff --git a/include/uapi/linux/net_shaper.h b/include/uapi/linux/net_shaper.h
new file mode 100644
index 000000000000..03c774a2bec1
--- /dev/null
+++ b/include/uapi/linux/net_shaper.h
@@ -0,0 +1,80 @@
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
+/* Do not edit directly, auto-generated from: */
+/* Documentation/netlink/specs/net_shaper.yaml */
+/* YNL-GEN uapi header */
+
+#ifndef _UAPI_LINUX_NET_SHAPER_H
+#define _UAPI_LINUX_NET_SHAPER_H
+
+#define NET_SHAPER_FAMILY_NAME "net-shaper"
+#define NET_SHAPER_FAMILY_VERSION 1
+
+/**
+ * enum net_shaper_scope - Defines the shaper @id interpretation.
+ * @NET_SHAPER_SCOPE_UNSPEC: The scope is not specified.
+ * @NET_SHAPER_SCOPE_NETDEV: The main shaper for the given network device.
+ * @NET_SHAPER_SCOPE_QUEUE: The shaper is attached to the given device queue,
+ * the @id represents the queue number.
+ * @NET_SHAPER_SCOPE_NODE: The shaper allows grouping of queues or other node
+ * shapers; can be nested in either @netdev shapers or other @node shapers,
+ * allowing placement in any location of the scheduling tree, except leaves
+ * and root.
+ */
+enum net_shaper_scope {
+ NET_SHAPER_SCOPE_UNSPEC,
+ NET_SHAPER_SCOPE_NETDEV,
+ NET_SHAPER_SCOPE_QUEUE,
+ NET_SHAPER_SCOPE_NODE,
+
+ /* private: */
+ __NET_SHAPER_SCOPE_MAX,
+ NET_SHAPER_SCOPE_MAX = (__NET_SHAPER_SCOPE_MAX - 1)
+};
+
+/**
+ * enum net_shaper_metric - Different metric supported by the shaper.
+ * @NET_SHAPER_METRIC_BPS: Shaper operates on a bits per second basis.
+ * @NET_SHAPER_METRIC_PPS: Shaper operates on a packets per second basis.
+ */
+enum net_shaper_metric {
+ NET_SHAPER_METRIC_BPS,
+ NET_SHAPER_METRIC_PPS,
+};
+
+enum {
+ NET_SHAPER_A_HANDLE = 1,
+ NET_SHAPER_A_METRIC,
+ NET_SHAPER_A_BW_MIN,
+ NET_SHAPER_A_BW_MAX,
+ NET_SHAPER_A_BURST,
+ NET_SHAPER_A_PRIORITY,
+ NET_SHAPER_A_WEIGHT,
+ NET_SHAPER_A_IFINDEX,
+ NET_SHAPER_A_PARENT,
+ NET_SHAPER_A_LEAVES,
+ NET_SHAPER_A_NODE,
+ NET_SHAPER_A_SHAPER,
+
+ __NET_SHAPER_A_MAX,
+ NET_SHAPER_A_MAX = (__NET_SHAPER_A_MAX - 1)
+};
+
+enum {
+ NET_SHAPER_A_HANDLE_SCOPE = 1,
+ NET_SHAPER_A_HANDLE_ID,
+
+ __NET_SHAPER_A_HANDLE_MAX,
+ NET_SHAPER_A_HANDLE_MAX = (__NET_SHAPER_A_HANDLE_MAX - 1)
+};
+
+enum {
+ NET_SHAPER_CMD_GET = 1,
+ NET_SHAPER_CMD_SET,
+ NET_SHAPER_CMD_DELETE,
+ NET_SHAPER_CMD_GROUP,
+
+ __NET_SHAPER_CMD_MAX,
+ NET_SHAPER_CMD_MAX = (__NET_SHAPER_CMD_MAX - 1)
+};
+
+#endif /* _UAPI_LINUX_NET_SHAPER_H */
diff --git a/net/Kconfig b/net/Kconfig
index d27d0deac0bf..31fccfed04f7 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -66,6 +66,9 @@ config SKB_DECRYPTED
config SKB_EXTENSIONS
bool
+config NET_SHAPER
+ bool
+
menu "Networking options"
source "net/packet/Kconfig"
diff --git a/net/Makefile b/net/Makefile
index 65bb8c72a35e..60ed5190eda8 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -79,3 +79,4 @@ obj-$(CONFIG_XDP_SOCKETS) += xdp/
obj-$(CONFIG_MPTCP) += mptcp/
obj-$(CONFIG_MCTP) += mctp/
obj-$(CONFIG_NET_HANDSHAKE) += handshake/
+obj-$(CONFIG_NET_SHAPER) += shaper/
diff --git a/net/shaper/Makefile b/net/shaper/Makefile
new file mode 100644
index 000000000000..54af7169a331
--- /dev/null
+++ b/net/shaper/Makefile
@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: GPL-2.0-only
+#
+# Makefile for the net shaper infrastructure.
+#
+# Copyright (c) 2024, Red Hat, Inc.
+#
+
+obj-y += shaper.o shaper_nl_gen.o
diff --git a/net/shaper/shaper.c b/net/shaper/shaper.c
new file mode 100644
index 000000000000..a1b20888f502
--- /dev/null
+++ b/net/shaper/shaper.c
@@ -0,0 +1,55 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include <linux/kernel.h>
+#include <linux/skbuff.h>
+
+#include "shaper_nl_gen.h"
+
+int net_shaper_nl_pre_doit(const struct genl_split_ops *ops,
+ struct sk_buff *skb, struct genl_info *info)
+{
+ return -EOPNOTSUPP;
+}
+
+void net_shaper_nl_post_doit(const struct genl_split_ops *ops,
+ struct sk_buff *skb, struct genl_info *info)
+{
+}
+
+int net_shaper_nl_get_doit(struct sk_buff *skb, struct genl_info *info)
+{
+ return -EOPNOTSUPP;
+}
+
+int net_shaper_nl_get_dumpit(struct sk_buff *skb,
+ struct netlink_callback *cb)
+{
+ return -EOPNOTSUPP;
+}
+
+int net_shaper_nl_set_doit(struct sk_buff *skb, struct genl_info *info)
+{
+ return -EOPNOTSUPP;
+}
+
+int net_shaper_nl_delete_doit(struct sk_buff *skb, struct genl_info *info)
+{
+ return -EOPNOTSUPP;
+}
+
+int net_shaper_nl_pre_dumpit(struct netlink_callback *cb)
+{
+ return -EOPNOTSUPP;
+}
+
+int net_shaper_nl_post_dumpit(struct netlink_callback *cb)
+{
+ return -EOPNOTSUPP;
+}
+
+static int __init shaper_init(void)
+{
+ return genl_register_family(&net_shaper_nl_family);
+}
+
+subsys_initcall(shaper_init);
diff --git a/net/shaper/shaper_nl_gen.c b/net/shaper/shaper_nl_gen.c
new file mode 100644
index 000000000000..06641811bfc1
--- /dev/null
+++ b/net/shaper/shaper_nl_gen.c
@@ -0,0 +1,127 @@
+// SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)
+/* Do not edit directly, auto-generated from: */
+/* Documentation/netlink/specs/net_shaper.yaml */
+/* YNL-GEN kernel source */
+
+#include <net/netlink.h>
+#include <net/genetlink.h>
+
+#include "shaper_nl_gen.h"
+
+#include <uapi/linux/net_shaper.h>
+
+/* Common nested types */
+const struct nla_policy net_shaper_handle_nl_policy[NET_SHAPER_A_HANDLE_ID + 1] = {
+ [NET_SHAPER_A_HANDLE_SCOPE] = NLA_POLICY_MAX(NLA_U32, 3),
+ [NET_SHAPER_A_HANDLE_ID] = { .type = NLA_U32, },
+};
+
+const struct nla_policy net_shaper_info_nl_policy[NET_SHAPER_A_WEIGHT + 1] = {
+ [NET_SHAPER_A_HANDLE] = NLA_POLICY_NESTED(net_shaper_handle_nl_policy),
+ [NET_SHAPER_A_METRIC] = NLA_POLICY_MAX(NLA_U32, 1),
+ [NET_SHAPER_A_BW_MIN] = { .type = NLA_UINT, },
+ [NET_SHAPER_A_BW_MAX] = { .type = NLA_UINT, },
+ [NET_SHAPER_A_BURST] = { .type = NLA_UINT, },
+ [NET_SHAPER_A_PRIORITY] = { .type = NLA_U32, },
+ [NET_SHAPER_A_WEIGHT] = { .type = NLA_U32, },
+};
+
+const struct nla_policy net_shaper_node_info_nl_policy[NET_SHAPER_A_PARENT + 1] = {
+ [NET_SHAPER_A_PARENT] = NLA_POLICY_NESTED(net_shaper_handle_nl_policy),
+ [NET_SHAPER_A_HANDLE] = NLA_POLICY_NESTED(net_shaper_handle_nl_policy),
+ [NET_SHAPER_A_METRIC] = NLA_POLICY_MAX(NLA_U32, 1),
+ [NET_SHAPER_A_BW_MIN] = { .type = NLA_UINT, },
+ [NET_SHAPER_A_BW_MAX] = { .type = NLA_UINT, },
+ [NET_SHAPER_A_BURST] = { .type = NLA_UINT, },
+ [NET_SHAPER_A_PRIORITY] = { .type = NLA_U32, },
+ [NET_SHAPER_A_WEIGHT] = { .type = NLA_U32, },
+};
+
+/* NET_SHAPER_CMD_GET - do */
+static const struct nla_policy net_shaper_get_do_nl_policy[NET_SHAPER_A_IFINDEX + 1] = {
+ [NET_SHAPER_A_IFINDEX] = { .type = NLA_U32, },
+ [NET_SHAPER_A_HANDLE] = NLA_POLICY_NESTED(net_shaper_handle_nl_policy),
+};
+
+/* NET_SHAPER_CMD_GET - dump */
+static const struct nla_policy net_shaper_get_dump_nl_policy[NET_SHAPER_A_IFINDEX + 1] = {
+ [NET_SHAPER_A_IFINDEX] = { .type = NLA_U32, },
+};
+
+/* NET_SHAPER_CMD_SET - do */
+static const struct nla_policy net_shaper_set_nl_policy[NET_SHAPER_A_SHAPER + 1] = {
+ [NET_SHAPER_A_IFINDEX] = { .type = NLA_U32, },
+ [NET_SHAPER_A_SHAPER] = NLA_POLICY_NESTED(net_shaper_info_nl_policy),
+};
+
+/* NET_SHAPER_CMD_DELETE - do */
+static const struct nla_policy net_shaper_delete_nl_policy[NET_SHAPER_A_IFINDEX + 1] = {
+ [NET_SHAPER_A_IFINDEX] = { .type = NLA_U32, },
+ [NET_SHAPER_A_HANDLE] = NLA_POLICY_NESTED(net_shaper_handle_nl_policy),
+};
+
+/* NET_SHAPER_CMD_GROUP - do */
+static const struct nla_policy net_shaper_group_nl_policy[NET_SHAPER_A_NODE + 1] = {
+ [NET_SHAPER_A_IFINDEX] = { .type = NLA_U32, },
+ [NET_SHAPER_A_LEAVES] = NLA_POLICY_NESTED(net_shaper_info_nl_policy),
+ [NET_SHAPER_A_NODE] = NLA_POLICY_NESTED(net_shaper_node_info_nl_policy),
+};
+
+/* Ops table for net_shaper */
+static const struct genl_split_ops net_shaper_nl_ops[] = {
+ {
+ .cmd = NET_SHAPER_CMD_GET,
+ .pre_doit = net_shaper_nl_pre_doit,
+ .doit = net_shaper_nl_get_doit,
+ .post_doit = net_shaper_nl_post_doit,
+ .policy = net_shaper_get_do_nl_policy,
+ .maxattr = NET_SHAPER_A_IFINDEX,
+ .flags = GENL_CMD_CAP_DO,
+ },
+ {
+ .cmd = NET_SHAPER_CMD_GET,
+ .start = net_shaper_nl_pre_dumpit,
+ .dumpit = net_shaper_nl_get_dumpit,
+ .done = net_shaper_nl_post_dumpit,
+ .policy = net_shaper_get_dump_nl_policy,
+ .maxattr = NET_SHAPER_A_IFINDEX,
+ .flags = GENL_CMD_CAP_DUMP,
+ },
+ {
+ .cmd = NET_SHAPER_CMD_SET,
+ .pre_doit = net_shaper_nl_pre_doit,
+ .doit = net_shaper_nl_set_doit,
+ .post_doit = net_shaper_nl_post_doit,
+ .policy = net_shaper_set_nl_policy,
+ .maxattr = NET_SHAPER_A_SHAPER,
+ .flags = GENL_ADMIN_PERM | GENL_CMD_CAP_DO,
+ },
+ {
+ .cmd = NET_SHAPER_CMD_DELETE,
+ .pre_doit = net_shaper_nl_pre_doit,
+ .doit = net_shaper_nl_delete_doit,
+ .post_doit = net_shaper_nl_post_doit,
+ .policy = net_shaper_delete_nl_policy,
+ .maxattr = NET_SHAPER_A_IFINDEX,
+ .flags = GENL_ADMIN_PERM | GENL_CMD_CAP_DO,
+ },
+ {
+ .cmd = NET_SHAPER_CMD_GROUP,
+ .pre_doit = net_shaper_nl_pre_doit,
+ .doit = net_shaper_nl_group_doit,
+ .post_doit = net_shaper_nl_post_doit,
+ .policy = net_shaper_group_nl_policy,
+ .maxattr = NET_SHAPER_A_NODE,
+ .flags = GENL_ADMIN_PERM | GENL_CMD_CAP_DO,
+ },
+};
+
+struct genl_family net_shaper_nl_family __ro_after_init = {
+ .name = NET_SHAPER_FAMILY_NAME,
+ .version = NET_SHAPER_FAMILY_VERSION,
+ .netnsok = true,
+ .parallel_ops = true,
+ .module = THIS_MODULE,
+ .split_ops = net_shaper_nl_ops,
+ .n_split_ops = ARRAY_SIZE(net_shaper_nl_ops),
+};
diff --git a/net/shaper/shaper_nl_gen.h b/net/shaper/shaper_nl_gen.h
new file mode 100644
index 000000000000..0fe95a03f1b5
--- /dev/null
+++ b/net/shaper/shaper_nl_gen.h
@@ -0,0 +1,35 @@
+/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
+/* Do not edit directly, auto-generated from: */
+/* Documentation/netlink/specs/net_shaper.yaml */
+/* YNL-GEN kernel header */
+
+#ifndef _LINUX_NET_SHAPER_GEN_H
+#define _LINUX_NET_SHAPER_GEN_H
+
+#include <net/netlink.h>
+#include <net/genetlink.h>
+
+#include <uapi/linux/net_shaper.h>
+
+/* Common nested types */
+extern const struct nla_policy net_shaper_handle_nl_policy[NET_SHAPER_A_HANDLE_ID + 1];
+extern const struct nla_policy net_shaper_info_nl_policy[NET_SHAPER_A_WEIGHT + 1];
+extern const struct nla_policy net_shaper_node_info_nl_policy[NET_SHAPER_A_PARENT + 1];
+
+int net_shaper_nl_pre_doit(const struct genl_split_ops *ops,
+ struct sk_buff *skb, struct genl_info *info);
+void
+net_shaper_nl_post_doit(const struct genl_split_ops *ops, struct sk_buff *skb,
+ struct genl_info *info);
+int net_shaper_nl_pre_dumpit(struct netlink_callback *cb);
+int net_shaper_nl_post_dumpit(struct netlink_callback *cb);
+
+int net_shaper_nl_get_doit(struct sk_buff *skb, struct genl_info *info);
+int net_shaper_nl_get_dumpit(struct sk_buff *skb, struct netlink_callback *cb);
+int net_shaper_nl_set_doit(struct sk_buff *skb, struct genl_info *info);
+int net_shaper_nl_delete_doit(struct sk_buff *skb, struct genl_info *info);
+int net_shaper_nl_group_doit(struct sk_buff *skb, struct genl_info *info);
+
+extern struct genl_family net_shaper_nl_family;
+
+#endif /* _LINUX_NET_SHAPER_GEN_H */
--
2.45.2
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH v5 net-next 02/12] net-shapers: implement NL get operation
2024-08-29 15:16 [PATCH v5 net-next 00/12] net: introduce TX H/W shaping API Paolo Abeni
2024-08-29 15:16 ` [PATCH v5 net-next 01/12] netlink: spec: add shaper YAML spec Paolo Abeni
@ 2024-08-29 15:16 ` Paolo Abeni
2024-08-29 23:28 ` Jakub Kicinski
2024-08-30 1:20 ` Jakub Kicinski
2024-08-29 15:16 ` [PATCH v5 net-next 03/12] net-shapers: implement NL set and delete operations Paolo Abeni
` (9 subsequent siblings)
11 siblings, 2 replies; 29+ messages in thread
From: Paolo Abeni @ 2024-08-29 15:16 UTC (permalink / raw)
To: netdev
Cc: Jakub Kicinski, Jiri Pirko, Madhu Chittim, Sridhar Samudrala,
Simon Horman, John Fastabend, Sunil Kovvuri Goutham,
Jamal Hadi Salim, Donald Hunter, anthony.l.nguyen,
przemyslaw.kitszel, intel-wired-lan, edumazet
Introduce the basic infrastructure to implement the net-shaper
core functionality. Each network devices carries a net-shaper cache,
the NL get() operation fetches the data from such cache.
The cache is initially empty, will be fill by the set()/group()
operation implemented later and is destroyed at device cleanup time.
The net_shaper_ctx_init() and net_shaper_generic_pre() implementations
handle generic index type attributes, despite the current caller always
pass a constant value to avoid more noise in later patches using them.
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
v4 -> v5:
- ops operate on struct binding
- replace net_device * with binding* in most helpers
- include 'ifindex' in get/dump output
- use dev_tracker for real
- user pre/post for dump op, too
- use NL_SET_BAD_ATTR where applicable
- drop redundant/useless kdoc documentation
- add type arg to net_shaper_ctx_init() (moved from later patch)
- factor out generic pre/post helper for later usage in the series
- remove unneeded forward declaration from netdevice.h
- dropped 'inline' modifier in .c file
- dropped black line at net_shaper.h EoF
v3 -> v4:
- add scope prefix
- use forward declaration in the include
- move the handle out of shaper_info
RFC v2 -> RFC v3:
- dev_put() -> netdev_put()
---
Documentation/networking/kapi.rst | 3 +
include/linux/netdevice.h | 15 ++
include/net/net_shaper.h | 121 ++++++++++
net/core/dev.c | 2 +
net/core/dev.h | 6 +
net/shaper/shaper.c | 363 +++++++++++++++++++++++++++++-
6 files changed, 503 insertions(+), 7 deletions(-)
create mode 100644 include/net/net_shaper.h
diff --git a/Documentation/networking/kapi.rst b/Documentation/networking/kapi.rst
index ea55f462cefa..98682b9a13ee 100644
--- a/Documentation/networking/kapi.rst
+++ b/Documentation/networking/kapi.rst
@@ -104,6 +104,9 @@ Driver Support
.. kernel-doc:: include/linux/netdevice.h
:internal:
+.. kernel-doc:: include/net/net_shaper.h
+ :internal:
+
PHY Support
-----------
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index fce70990b209..71bd011fde7b 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1603,6 +1603,14 @@ struct net_device_ops {
int (*ndo_hwtstamp_set)(struct net_device *dev,
struct kernel_hwtstamp_config *kernel_config,
struct netlink_ext_ack *extack);
+
+#if IS_ENABLED(CONFIG_NET_SHAPER)
+ /**
+ * @net_shaper_ops: Device shaping offload operations
+ * see include/net/net_shapers.h
+ */
+ const struct net_shaper_ops *net_shaper_ops;
+#endif
};
/**
@@ -2383,6 +2391,13 @@ struct net_device {
/** @irq_moder: dim parameters used if IS_ENABLED(CONFIG_DIMLIB). */
struct dim_irq_moder *irq_moder;
+#if IS_ENABLED(CONFIG_NET_SHAPER)
+ /**
+ * @net_shaper_data: data tracking the current shaper status
+ * see include/net/net_shapers.h
+ */
+ struct net_shaper_data *net_shaper_data;
+#endif
u8 priv[] ____cacheline_aligned
__counted_by(priv_len);
} ____cacheline_aligned;
diff --git a/include/net/net_shaper.h b/include/net/net_shaper.h
new file mode 100644
index 000000000000..52bad5a2f63b
--- /dev/null
+++ b/include/net/net_shaper.h
@@ -0,0 +1,121 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#ifndef _NET_SHAPER_H_
+#define _NET_SHAPER_H_
+
+#include <linux/types.h>
+
+#include <uapi/linux/net_shaper.h>
+
+struct net_device;
+struct devlink;
+struct netlink_ext_ack;
+
+enum net_shaper_binding_type {
+ NET_SHAPER_BINDING_TYPE_NETDEV,
+ NET_SHAPER_BINDING_TYPE_DEVLINK_PORT,
+};
+
+struct net_shaper_binding {
+ enum net_shaper_binding_type type;
+ union {
+ struct net_device *netdev;
+ struct devlink *devlink;
+ };
+};
+
+struct net_shaper_handle {
+ enum net_shaper_scope scope;
+ int id;
+};
+
+/**
+ * struct net_shaper_info - represents a shaping node on the NIC H/W
+ * zeroed field are considered not set.
+ * @parent: Unique identifier for the shaper parent, usually implied
+ * @metric: Specify if the rate limits refers to PPS or BPS
+ * @bw_min: Minimum guaranteed rate for this shaper
+ * @bw_max: Maximum peak rate allowed for this shaper
+ * @burst: Maximum burst for the peek rate of this shaper
+ * @priority: Scheduling priority for this shaper
+ * @weight: Scheduling weight for this shaper
+ */
+struct net_shaper_info {
+ struct net_shaper_handle parent;
+ enum net_shaper_metric metric;
+ u64 bw_min;
+ u64 bw_max;
+ u64 burst;
+ u32 priority;
+ u32 weight;
+
+ /* private: */
+ u32 leaves; /* accounted only for NODE scope */
+};
+
+/**
+ * struct net_shaper_ops - Operations on device H/W shapers
+ *
+ * The operations applies to either net_device and devlink objects.
+ * The initial shaping configuration at device initialization is empty:
+ * does not constraint the rate in any way.
+ * The network core keeps track of the applied user-configuration in
+ * the net_device or devlink structure.
+ * The operations are serialized via a per device lock.
+ *
+ * Each shaper is uniquely identified within the device with a 'handle'
+ * comprising the shaper scope and a scope-specific id.
+ */
+struct net_shaper_ops {
+ /**
+ * @group: create the specified shapers scheduling group
+ *
+ * Nest the @leaves shapers identified by @leaves_handles under the
+ * @root shaper identified by @root_handle. All the shapers belong
+ * to the network device @dev. The @leaves and @leaves_handles shaper
+ * arrays size is specified by @leaves_count.
+ * Create either the @leaves and the @root shaper; or if they already
+ * exists, links them together in the desired way.
+ * @leaves scope must be NET_SHAPER_SCOPE_QUEUE.
+ */
+ int (*group)(struct net_shaper_binding *binding, int leaves_count,
+ const struct net_shaper_handle *leaves_handles,
+ const struct net_shaper_info *leaves,
+ const struct net_shaper_handle *root_handle,
+ const struct net_shaper_info *root,
+ struct netlink_ext_ack *extack);
+
+ /**
+ * @set: Updates the specified shaper
+ *
+ * Updates or creates the @shaper identified by the provided @handle
+ * on the given device @dev.
+ */
+ int (*set)(struct net_shaper_binding *binding,
+ const struct net_shaper_handle *handle,
+ const struct net_shaper_info *shaper,
+ struct netlink_ext_ack *extack);
+
+ /**
+ * @delete: Removes the specified shaper
+ *
+ * Removes the shaper configuration as identified by the given @handle
+ * on the specified device @dev, restoring the default behavior.
+ */
+ int (*delete)(struct net_shaper_binding *binding,
+ const struct net_shaper_handle *handle,
+ struct netlink_ext_ack *extack);
+
+ /**
+ * @capabilities: get the shaper features supported by the device
+ *
+ * Fills the bitmask @cap with the supported capabilities for the
+ * specified @scope and device @dev.
+ *
+ * Returns 0 on success or a negative error value otherwise.
+ */
+ int (*capabilities)(struct net_shaper_binding *binding,
+ enum net_shaper_scope scope, unsigned long *cap);
+};
+
+#endif
diff --git a/net/core/dev.c b/net/core/dev.c
index 63987b8b7c85..23629abd3ef7 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -11201,6 +11201,8 @@ void free_netdev(struct net_device *dev)
/* Flush device addresses */
dev_addr_flush(dev);
+ net_shaper_flush_netdev(dev);
+
list_for_each_entry_safe(p, n, &dev->napi_list, dev_list)
netif_napi_del(p);
diff --git a/net/core/dev.h b/net/core/dev.h
index 5654325c5b71..13c558874af3 100644
--- a/net/core/dev.h
+++ b/net/core/dev.h
@@ -35,6 +35,12 @@ void dev_addr_flush(struct net_device *dev);
int dev_addr_init(struct net_device *dev);
void dev_addr_check(struct net_device *dev);
+#if IS_ENABLED(CONFIG_NET_SHAPER)
+void net_shaper_flush_netdev(struct net_device *dev);
+#else
+static inline void net_shaper_flush_netdev(struct net_device *dev) {}
+#endif
+
/* sysctls not referred to from outside net/core/ */
extern int netdev_unregister_timeout_secs;
extern int weight_p;
diff --git a/net/shaper/shaper.c b/net/shaper/shaper.c
index a1b20888f502..2ed80df25765 100644
--- a/net/shaper/shaper.c
+++ b/net/shaper/shaper.c
@@ -1,30 +1,361 @@
// SPDX-License-Identifier: GPL-2.0-or-later
+#include <linux/bits.h>
+#include <linux/bitfield.h>
+#include <linux/idr.h>
#include <linux/kernel.h>
+#include <linux/netdevice.h>
+#include <linux/netlink.h>
#include <linux/skbuff.h>
+#include <linux/xarray.h>
+#include <net/devlink.h>
+#include <net/net_shaper.h>
#include "shaper_nl_gen.h"
+#include "../core/dev.h"
+
+#define NET_SHAPER_SCOPE_SHIFT 26
+#define NET_SHAPER_ID_MASK GENMASK(NET_SHAPER_SCOPE_SHIFT - 1, 0)
+#define NET_SHAPER_SCOPE_MASK GENMASK(31, NET_SHAPER_SCOPE_SHIFT)
+
+#define NET_SHAPER_ID_UNSPEC NET_SHAPER_ID_MASK
+
+struct net_shaper_data {
+ struct xarray shapers;
+};
+
+struct net_shaper_nl_ctx {
+ struct net_shaper_binding binding;
+ netdevice_tracker dev_tracker;
+ u32 start_index;
+};
+
+static struct net_shaper_binding *net_shaper_binding_from_ctx(void *ctx)
+{
+ return &((struct net_shaper_nl_ctx *)ctx)->binding;
+}
+
+static struct net_shaper_data *
+net_shaper_binding_data(struct net_shaper_binding *binding)
+{
+ /* The barrier pairs with cmpxchg on init. */
+ if (binding->type == NET_SHAPER_BINDING_TYPE_NETDEV)
+ return READ_ONCE(binding->netdev->net_shaper_data);
+
+ /* No other type supported yet.*/
+ return NULL;
+}
+
+static int net_shaper_fill_binding(struct sk_buff *msg,
+ const struct net_shaper_binding *binding,
+ u32 type)
+{
+ /* Should never happen, as currently only NETDEV is supported */
+ if (WARN_ON_ONCE(binding->type != NET_SHAPER_BINDING_TYPE_NETDEV))
+ return -EINVAL;
+
+ if (nla_put_u32(msg, type, binding->netdev->ifindex))
+ return -EMSGSIZE;
+
+ return 0;
+}
+
+static int net_shaper_fill_handle(struct sk_buff *msg,
+ const struct net_shaper_handle *handle,
+ u32 type)
+{
+ struct nlattr *handle_attr;
+
+ if (handle->scope == NET_SHAPER_SCOPE_UNSPEC)
+ return 0;
+
+ handle_attr = nla_nest_start_noflag(msg, type);
+ if (!handle_attr)
+ return -EMSGSIZE;
+
+ if (nla_put_u32(msg, NET_SHAPER_A_HANDLE_SCOPE, handle->scope) ||
+ (handle->scope >= NET_SHAPER_SCOPE_QUEUE &&
+ nla_put_u32(msg, NET_SHAPER_A_HANDLE_ID, handle->id)))
+ goto handle_nest_cancel;
+
+ nla_nest_end(msg, handle_attr);
+ return 0;
+
+handle_nest_cancel:
+ nla_nest_cancel(msg, handle_attr);
+ return -EMSGSIZE;
+}
+
+static int
+net_shaper_fill_one(struct sk_buff *msg,
+ const struct net_shaper_binding *binding,
+ const struct net_shaper_handle *handle,
+ const struct net_shaper_info *shaper,
+ const struct genl_info *info)
+{
+ void *hdr;
+
+ hdr = genlmsg_iput(msg, info);
+ if (!hdr)
+ return -EMSGSIZE;
+
+ if (net_shaper_fill_binding(msg, binding, NET_SHAPER_A_IFINDEX) ||
+ net_shaper_fill_handle(msg, &shaper->parent,
+ NET_SHAPER_A_PARENT) ||
+ net_shaper_fill_handle(msg, handle, NET_SHAPER_A_HANDLE) ||
+ ((shaper->bw_min || shaper->bw_max || shaper->burst) &&
+ nla_put_u32(msg, NET_SHAPER_A_METRIC, shaper->metric)) ||
+ (shaper->bw_min &&
+ nla_put_uint(msg, NET_SHAPER_A_BW_MIN, shaper->bw_min)) ||
+ (shaper->bw_max &&
+ nla_put_uint(msg, NET_SHAPER_A_BW_MAX, shaper->bw_max)) ||
+ (shaper->burst &&
+ nla_put_uint(msg, NET_SHAPER_A_BURST, shaper->burst)) ||
+ (shaper->priority &&
+ nla_put_u32(msg, NET_SHAPER_A_PRIORITY, shaper->priority)) ||
+ (shaper->weight &&
+ nla_put_u32(msg, NET_SHAPER_A_WEIGHT, shaper->weight)))
+ goto nla_put_failure;
+
+ genlmsg_end(msg, hdr);
+
+ return 0;
+
+nla_put_failure:
+ genlmsg_cancel(msg, hdr);
+ return -EMSGSIZE;
+}
+
+/* Initialize the context fetching the relevant device and
+ * acquiring a reference to it.
+ */
+static int net_shaper_ctx_init(const struct genl_info *info, int type,
+ struct net_shaper_nl_ctx *ctx)
+{
+ struct net *ns = genl_info_net(info);
+ struct net_device *dev;
+ int ifindex;
+
+ memset(ctx, 0, sizeof(*ctx));
+ if (GENL_REQ_ATTR_CHECK(info, type))
+ return -EINVAL;
+
+ ifindex = nla_get_u32(info->attrs[type]);
+ dev = netdev_get_by_index(ns, ifindex, &ctx->dev_tracker, GFP_KERNEL);
+ if (!dev) {
+ NL_SET_BAD_ATTR(info->extack, info->attrs[type]);
+ return -ENOENT;
+ }
+
+ if (!dev->netdev_ops->net_shaper_ops) {
+ NL_SET_BAD_ATTR(info->extack, info->attrs[type]);
+ netdev_put(dev, &ctx->dev_tracker);
+ return -EOPNOTSUPP;
+ }
+
+ ctx->binding.type = NET_SHAPER_BINDING_TYPE_NETDEV;
+ ctx->binding.netdev = dev;
+ return 0;
+}
+
+static void net_shaper_ctx_cleanup(struct net_shaper_nl_ctx *ctx)
+{
+ if (ctx->binding.type == NET_SHAPER_BINDING_TYPE_NETDEV)
+ netdev_put(ctx->binding.netdev, &ctx->dev_tracker);
+}
+
+static u32 net_shaper_handle_to_index(const struct net_shaper_handle *handle)
+{
+ return FIELD_PREP(NET_SHAPER_SCOPE_MASK, handle->scope) |
+ FIELD_PREP(NET_SHAPER_ID_MASK, handle->id);
+}
+
+static void net_shaper_index_to_handle(u32 index,
+ struct net_shaper_handle *handle)
+{
+ handle->scope = FIELD_GET(NET_SHAPER_SCOPE_MASK, index);
+ handle->id = FIELD_GET(NET_SHAPER_ID_MASK, index);
+}
+
+/* Lookup the given shaper inside the cache. */
+static struct net_shaper_info *
+net_shaper_cache_lookup(struct net_shaper_binding *binding,
+ const struct net_shaper_handle *handle)
+{
+ struct net_shaper_data *data = net_shaper_binding_data(binding);
+ u32 index = net_shaper_handle_to_index(handle);
+
+ return data ? xa_load(&data->shapers, index) : NULL;
+}
+
+static int net_shaper_parse_handle(const struct nlattr *attr,
+ const struct genl_info *info,
+ struct net_shaper_handle *handle)
+{
+ struct nlattr *tb[NET_SHAPER_A_HANDLE_MAX + 1];
+ struct nlattr *scope_attr, *id_attr;
+ u32 id = 0;
+ int ret;
+
+ ret = nla_parse_nested(tb, NET_SHAPER_A_HANDLE_MAX, attr,
+ net_shaper_handle_nl_policy, info->extack);
+ if (ret < 0)
+ return ret;
+
+ scope_attr = tb[NET_SHAPER_A_HANDLE_SCOPE];
+ if (!scope_attr) {
+ NL_SET_BAD_ATTR(info->extack,
+ tb[NET_SHAPER_A_HANDLE_SCOPE]);
+ return -EINVAL;
+ }
+
+ handle->scope = nla_get_u32(scope_attr);
+
+ /* The default id for NODE scope shapers is an invalid one
+ * to help the 'group' operation discriminate between new
+ * NODE shaper creation (ID_UNSPEC) and reuse of existing
+ * shaper (any other value).
+ */
+ id_attr = tb[NET_SHAPER_A_HANDLE_ID];
+ if (id_attr)
+ id = nla_get_u32(id_attr);
+ else if (handle->scope == NET_SHAPER_SCOPE_NODE)
+ id = NET_SHAPER_ID_UNSPEC;
+
+ handle->id = id;
+ return 0;
+}
+
+static int net_shaper_generic_pre(struct genl_info *info, int type)
+{
+ struct net_shaper_nl_ctx *ctx;
+ int ret;
+
+ ctx = kmalloc(sizeof(*ctx), GFP_KERNEL);
+ if (!ctx)
+ return -ENOMEM;
+
+ ret = net_shaper_ctx_init(info, type, ctx);
+ if (ret) {
+ kfree(ctx);
+ return ret;
+ }
+
+ info->user_ptr[0] = ctx;
+ return 0;
+}
+
int net_shaper_nl_pre_doit(const struct genl_split_ops *ops,
struct sk_buff *skb, struct genl_info *info)
{
- return -EOPNOTSUPP;
+ return net_shaper_generic_pre(info, NET_SHAPER_A_IFINDEX);
+}
+
+static void net_shaper_generic_post(struct genl_info *info)
+{
+ struct net_shaper_nl_ctx *ctx = info->user_ptr[0];
+
+ net_shaper_ctx_cleanup(ctx);
+ kfree(ctx);
}
void net_shaper_nl_post_doit(const struct genl_split_ops *ops,
struct sk_buff *skb, struct genl_info *info)
{
+ net_shaper_generic_post(info);
+}
+
+int net_shaper_nl_pre_dumpit(struct netlink_callback *cb)
+{
+ struct net_shaper_nl_ctx *ctx = (struct net_shaper_nl_ctx *)cb->ctx;
+ const struct genl_info *info = genl_info_dump(cb);
+
+ BUILD_BUG_ON(sizeof(*ctx) > sizeof(cb->ctx));
+
+ return net_shaper_ctx_init(info, NET_SHAPER_A_IFINDEX, ctx);
+}
+
+int net_shaper_nl_post_dumpit(struct netlink_callback *cb)
+{
+ struct net_shaper_nl_ctx *ctx = (struct net_shaper_nl_ctx *)cb->ctx;
+
+ net_shaper_ctx_cleanup(ctx);
+ return 0;
}
int net_shaper_nl_get_doit(struct sk_buff *skb, struct genl_info *info)
{
- return -EOPNOTSUPP;
+ struct net_shaper_binding *binding;
+ struct net_shaper_handle handle;
+ struct net_shaper_info *shaper;
+ struct sk_buff *msg;
+ int ret;
+
+ if (GENL_REQ_ATTR_CHECK(info, NET_SHAPER_A_HANDLE))
+ return -EINVAL;
+
+ binding = net_shaper_binding_from_ctx(info->user_ptr[0]);
+ ret = net_shaper_parse_handle(info->attrs[NET_SHAPER_A_HANDLE], info,
+ &handle);
+ if (ret < 0)
+ return ret;
+
+ shaper = net_shaper_cache_lookup(binding, &handle);
+ if (!shaper) {
+ NL_SET_BAD_ATTR(info->extack,
+ info->attrs[NET_SHAPER_A_HANDLE]);
+ return -ENOENT;
+ }
+
+ msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
+ if (!msg)
+ return -ENOMEM;
+
+ ret = net_shaper_fill_one(msg, binding, &handle, shaper, info);
+ if (ret)
+ goto free_msg;
+
+ ret = genlmsg_reply(msg, info);
+ if (ret)
+ goto free_msg;
+
+ return 0;
+
+free_msg:
+ nlmsg_free(msg);
+ return ret;
}
int net_shaper_nl_get_dumpit(struct sk_buff *skb,
struct netlink_callback *cb)
{
- return -EOPNOTSUPP;
+ struct net_shaper_nl_ctx *ctx = (struct net_shaper_nl_ctx *)cb->ctx;
+ const struct genl_info *info = genl_info_dump(cb);
+ struct net_shaper_binding *binding;
+ struct net_shaper_handle handle;
+ struct net_shaper_info *shaper;
+ struct net_shaper_data *data;
+ unsigned long index;
+ int ret;
+
+ /* Don't error out dumps performed before any set operation. */
+ binding = net_shaper_binding_from_ctx(ctx);
+ data = net_shaper_binding_data(binding);
+ if (!data)
+ return 0;
+
+ xa_for_each_range(&data->shapers, index, shaper, ctx->start_index,
+ U32_MAX) {
+ net_shaper_index_to_handle(index, &handle);
+ ret = net_shaper_fill_one(skb, binding, &handle, shaper, info);
+ if (ret)
+ return ret;
+
+ ctx->start_index = index;
+ }
+
+ return 0;
}
int net_shaper_nl_set_doit(struct sk_buff *skb, struct genl_info *info)
@@ -37,14 +368,32 @@ int net_shaper_nl_delete_doit(struct sk_buff *skb, struct genl_info *info)
return -EOPNOTSUPP;
}
-int net_shaper_nl_pre_dumpit(struct netlink_callback *cb)
+static void net_shaper_flush(struct net_shaper_binding *binding)
{
- return -EOPNOTSUPP;
+ struct net_shaper_data *data = net_shaper_binding_data(binding);
+ struct net_shaper_info *cur;
+ unsigned long index;
+
+ if (!data)
+ return;
+
+ xa_lock(&data->shapers);
+ xa_for_each(&data->shapers, index, cur) {
+ __xa_erase(&data->shapers, index);
+ kfree(cur);
+ }
+ xa_unlock(&data->shapers);
+ kfree(data);
}
-int net_shaper_nl_post_dumpit(struct netlink_callback *cb)
+void net_shaper_flush_netdev(struct net_device *dev)
{
- return -EOPNOTSUPP;
+ struct net_shaper_binding binding = {
+ .type = NET_SHAPER_BINDING_TYPE_NETDEV,
+ .netdev = dev,
+ };
+
+ net_shaper_flush(&binding);
}
static int __init shaper_init(void)
--
2.45.2
^ permalink raw reply related [flat|nested] 29+ messages in thread* Re: [PATCH v5 net-next 02/12] net-shapers: implement NL get operation
2024-08-29 15:16 ` [PATCH v5 net-next 02/12] net-shapers: implement NL get operation Paolo Abeni
@ 2024-08-29 23:28 ` Jakub Kicinski
2024-08-30 1:20 ` Jakub Kicinski
1 sibling, 0 replies; 29+ messages in thread
From: Jakub Kicinski @ 2024-08-29 23:28 UTC (permalink / raw)
To: Paolo Abeni
Cc: netdev, Jiri Pirko, Madhu Chittim, Sridhar Samudrala,
Simon Horman, John Fastabend, Sunil Kovvuri Goutham,
Jamal Hadi Salim, Donald Hunter, anthony.l.nguyen,
przemyslaw.kitszel, intel-wired-lan, edumazet
On Thu, 29 Aug 2024 17:16:55 +0200 Paolo Abeni wrote:
> + xa_for_each_range(&data->shapers, index, shaper, ctx->start_index,
> + U32_MAX) {
> + net_shaper_index_to_handle(index, &handle);
> + ret = net_shaper_fill_one(skb, binding, &handle, shaper, info);
> + if (ret)
> + return ret;
> +
> + ctx->start_index = index;
75% sure this should say index + 1, or the xa_for_each.. should use
start_index + 1. start position is inclusive.
XA iterators are hard to get right in netlink, I'd suggest using the
same form of iteration as for_each_netdev_dump()..
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [PATCH v5 net-next 02/12] net-shapers: implement NL get operation
2024-08-29 15:16 ` [PATCH v5 net-next 02/12] net-shapers: implement NL get operation Paolo Abeni
2024-08-29 23:28 ` Jakub Kicinski
@ 2024-08-30 1:20 ` Jakub Kicinski
2024-08-30 10:55 ` Paolo Abeni
2024-08-30 15:43 ` Paolo Abeni
1 sibling, 2 replies; 29+ messages in thread
From: Jakub Kicinski @ 2024-08-30 1:20 UTC (permalink / raw)
To: Paolo Abeni
Cc: netdev, Jiri Pirko, Madhu Chittim, Sridhar Samudrala,
Simon Horman, John Fastabend, Sunil Kovvuri Goutham,
Jamal Hadi Salim, Donald Hunter, anthony.l.nguyen,
przemyslaw.kitszel, intel-wired-lan, edumazet
On Thu, 29 Aug 2024 17:16:55 +0200 Paolo Abeni wrote:
> +static int net_shaper_fill_handle(struct sk_buff *msg,
> + const struct net_shaper_handle *handle,
> + u32 type)
> +{
> + struct nlattr *handle_attr;
> +
> + if (handle->scope == NET_SHAPER_SCOPE_UNSPEC)
> + return 0;
> +
> + handle_attr = nla_nest_start_noflag(msg, type);
_noflag() is deprecated
> + if (!handle_attr)
> + return -EMSGSIZE;
> +
> + if (nla_put_u32(msg, NET_SHAPER_A_HANDLE_SCOPE, handle->scope) ||
> + (handle->scope >= NET_SHAPER_SCOPE_QUEUE &&
> + nla_put_u32(msg, NET_SHAPER_A_HANDLE_ID, handle->id)))
> + goto handle_nest_cancel;
> +
> + nla_nest_end(msg, handle_attr);
> + return 0;
> +
> +handle_nest_cancel:
> + nla_nest_cancel(msg, handle_attr);
> + return -EMSGSIZE;
> +}
> +/* Initialize the context fetching the relevant device and
> + * acquiring a reference to it.
> + */
> +static int net_shaper_ctx_init(const struct genl_info *info, int type,
> + struct net_shaper_nl_ctx *ctx)
> +{
> + struct net *ns = genl_info_net(info);
> + struct net_device *dev;
> + int ifindex;
> +
> + memset(ctx, 0, sizeof(*ctx));
> + if (GENL_REQ_ATTR_CHECK(info, type))
> + return -EINVAL;
> +
> + ifindex = nla_get_u32(info->attrs[type]);
Let's limit the 'binding' thing to just driver call sites, we can
redo the rest easily later. This line and next pretends to take
"arbitrary" type but clearly wants a ifindex/netdev, right?
> + dev = netdev_get_by_index(ns, ifindex, &ctx->dev_tracker, GFP_KERNEL);
> + if (!dev) {
> + NL_SET_BAD_ATTR(info->extack, info->attrs[type]);
> + return -ENOENT;
> + }
> +static int net_shaper_parse_handle(const struct nlattr *attr,
> + const struct genl_info *info,
> + struct net_shaper_handle *handle)
> +{
> + struct nlattr *tb[NET_SHAPER_A_HANDLE_MAX + 1];
> + struct nlattr *scope_attr, *id_attr;
> + u32 id = 0;
> + int ret;
> +
> + ret = nla_parse_nested(tb, NET_SHAPER_A_HANDLE_MAX, attr,
> + net_shaper_handle_nl_policy, info->extack);
> + if (ret < 0)
> + return ret;
> +
> + scope_attr = tb[NET_SHAPER_A_HANDLE_SCOPE];
> + if (!scope_attr) {
NL_REQ_ATTR_CHECK()
> + NL_SET_BAD_ATTR(info->extack,
> + tb[NET_SHAPER_A_HANDLE_SCOPE]);
> + return -EINVAL;
> + }
> +
> + handle->scope = nla_get_u32(scope_attr);
> +
> + /* The default id for NODE scope shapers is an invalid one
> + * to help the 'group' operation discriminate between new
> + * NODE shaper creation (ID_UNSPEC) and reuse of existing
> + * shaper (any other value).
> + */
> + id_attr = tb[NET_SHAPER_A_HANDLE_ID];
> + if (id_attr)
> + id = nla_get_u32(id_attr);
> + else if (handle->scope == NET_SHAPER_SCOPE_NODE)
> + id = NET_SHAPER_ID_UNSPEC;
> +
> + handle->id = id;
> + return 0;
> +}
> +
> +static int net_shaper_generic_pre(struct genl_info *info, int type)
> +{
> + struct net_shaper_nl_ctx *ctx;
> + int ret;
> +
> + ctx = kmalloc(sizeof(*ctx), GFP_KERNEL);
Maybe send a patch like this, to avoid having to allocate this space,
and special casing dump vs doit:
diff --git a/include/net/genetlink.h b/include/net/genetlink.h
index 9ab49bfeae78..7658f0885178 100644
--- a/include/net/genetlink.h
+++ b/include/net/genetlink.h
@@ -124,7 +124,8 @@ struct genl_family {
* @genlhdr: generic netlink message header
* @attrs: netlink attributes
* @_net: network namespace
- * @user_ptr: user pointers
+ * @ctx: storage space for the use by the family
+ * @user_ptr: user pointers (deprecated, use ctx instead)
* @extack: extended ACK report struct
*/
struct genl_info {
@@ -135,7 +136,10 @@ struct genl_info {
struct genlmsghdr * genlhdr;
struct nlattr ** attrs;
possible_net_t _net;
- void * user_ptr[2];
+ union {
+ u8 ctx[48];
+ void * user_ptr[2];
+ };
struct netlink_ext_ack *extack;
};
diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
index feb54c63a116..29387b605f3e 100644
--- a/net/netlink/genetlink.c
+++ b/net/netlink/genetlink.c
@@ -997,7 +997,7 @@ static int genl_start(struct netlink_callback *cb)
info->info.attrs = attrs;
genl_info_net_set(&info->info, sock_net(cb->skb->sk));
info->info.extack = cb->extack;
- memset(&info->info.user_ptr, 0, sizeof(info->info.user_ptr));
+ memset(&info->info.ctx, 0, sizeof(info->info.ctx));
cb->data = info;
if (ops->start) {
@@ -1104,7 +1104,7 @@ static int genl_family_rcv_msg_doit(const struct genl_family *family,
info.attrs = attrbuf;
info.extack = extack;
genl_info_net_set(&info, net);
- memset(&info.user_ptr, 0, sizeof(info.user_ptr));
+ memset(&info.ctx, 0, sizeof(info.ctx));
if (ops->pre_doit) {
err = ops->pre_doit(ops, skb, &info);
> + if (!ctx)
> + return -ENOMEM;
> +
> + ret = net_shaper_ctx_init(info, type, ctx);
> + if (ret) {
> + kfree(ctx);
> + return ret;
> + }
> +
> + info->user_ptr[0] = ctx;
> + return 0;
> +}
> +
> int net_shaper_nl_get_doit(struct sk_buff *skb, struct genl_info *info)
> {
> - return -EOPNOTSUPP;
> + struct net_shaper_binding *binding;
> + struct net_shaper_handle handle;
> + struct net_shaper_info *shaper;
> + struct sk_buff *msg;
> + int ret;
> +
> + if (GENL_REQ_ATTR_CHECK(info, NET_SHAPER_A_HANDLE))
> + return -EINVAL;
> +
> + binding = net_shaper_binding_from_ctx(info->user_ptr[0]);
This 'binding' has the same meaning as 'binding' in TCP ZC? :(
> + shaper = net_shaper_cache_lookup(binding, &handle);
Why call the stored info "cache"? It's the authoritative version of
user configuration, isn't it?
> + if (!shaper) {
> + NL_SET_BAD_ATTR(info->extack,
> + info->attrs[NET_SHAPER_A_HANDLE]);
> + return -ENOENT;
> + }
> +
> + msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
> + if (!msg)
> + return -ENOMEM;
> +
> + ret = net_shaper_fill_one(msg, binding, &handle, shaper, info);
> + if (ret)
> + goto free_msg;
> +
> + ret = genlmsg_reply(msg, info);
double space
^ permalink raw reply related [flat|nested] 29+ messages in thread* Re: [PATCH v5 net-next 02/12] net-shapers: implement NL get operation
2024-08-30 1:20 ` Jakub Kicinski
@ 2024-08-30 10:55 ` Paolo Abeni
2024-08-30 18:39 ` Jakub Kicinski
2024-08-30 15:43 ` Paolo Abeni
1 sibling, 1 reply; 29+ messages in thread
From: Paolo Abeni @ 2024-08-30 10:55 UTC (permalink / raw)
To: Jakub Kicinski
Cc: netdev, Jiri Pirko, Madhu Chittim, Sridhar Samudrala,
Simon Horman, John Fastabend, Sunil Kovvuri Goutham,
Jamal Hadi Salim, Donald Hunter, anthony.l.nguyen,
przemyslaw.kitszel, intel-wired-lan, edumazet
On 8/30/24 03:20, Jakub Kicinski wrote:>> +/* Initialize the context
fetching the relevant device and
>> + * acquiring a reference to it.
>> + */
>> +static int net_shaper_ctx_init(const struct genl_info *info, int type,
>> + struct net_shaper_nl_ctx *ctx)
>> +{
>> + struct net *ns = genl_info_net(info);
>> + struct net_device *dev;
>> + int ifindex;
>> +
>> + memset(ctx, 0, sizeof(*ctx));
>> + if (GENL_REQ_ATTR_CHECK(info, type))
>> + return -EINVAL;
>> +
>> + ifindex = nla_get_u32(info->attrs[type]);
>
> Let's limit the 'binding' thing to just driver call sites, we can
> redo the rest easily later. This line and next pretends to take
> "arbitrary" type but clearly wants a ifindex/netdev, right?
There is a misunderstanding. This helper will be used in a following
patch (7/12) with a different 'type' argument:
NET_SHAPER_A_BINDING_IFINDEX. I've put a note in the commit message, but
was unintentionally dropped in one of the recent refactors. I'll add
that note back.
I hope you are ok with the struct net_shaper_binding * argument to most
helpers? does not add complexity, will help to support devlink objects
and swapping back and forth from/to struct net_device* can't be automated.
[...]
> Maybe send a patch like this, to avoid having to allocate this space,
> and special casing dump vs doit:
>
> diff --git a/include/net/genetlink.h b/include/net/genetlink.h
> index 9ab49bfeae78..7658f0885178 100644
> --- a/include/net/genetlink.h
> +++ b/include/net/genetlink.h
> @@ -124,7 +124,8 @@ struct genl_family {
> * @genlhdr: generic netlink message header
> * @attrs: netlink attributes
> * @_net: network namespace
> - * @user_ptr: user pointers
> + * @ctx: storage space for the use by the family
> + * @user_ptr: user pointers (deprecated, use ctx instead)
> * @extack: extended ACK report struct
> */
> struct genl_info {
> @@ -135,7 +136,10 @@ struct genl_info {
> struct genlmsghdr * genlhdr;
> struct nlattr ** attrs;
> possible_net_t _net;
> - void * user_ptr[2];
> + union {
> + u8 ctx[48];
> + void * user_ptr[2];
> + };
> struct netlink_ext_ack *extack;
> };
Makes sense. Plus likely:
#define NETLINK_CTX_SIZE 48
and use such define above and in linux/netlink.h
Thanks,
Paolo
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [PATCH v5 net-next 02/12] net-shapers: implement NL get operation
2024-08-30 10:55 ` Paolo Abeni
@ 2024-08-30 18:39 ` Jakub Kicinski
2024-08-30 23:42 ` Jakub Kicinski
2024-09-02 13:00 ` Paolo Abeni
0 siblings, 2 replies; 29+ messages in thread
From: Jakub Kicinski @ 2024-08-30 18:39 UTC (permalink / raw)
To: Paolo Abeni
Cc: netdev, Jiri Pirko, Madhu Chittim, Sridhar Samudrala,
Simon Horman, John Fastabend, Sunil Kovvuri Goutham,
Jamal Hadi Salim, Donald Hunter, anthony.l.nguyen,
przemyslaw.kitszel, intel-wired-lan, edumazet
On Fri, 30 Aug 2024 12:55:05 +0200 Paolo Abeni wrote:
> On 8/30/24 03:20, Jakub Kicinski wrote:>> +/* Initialize the context
> fetching the relevant device and
> >> + * acquiring a reference to it.
> >> + */
> >> +static int net_shaper_ctx_init(const struct genl_info *info, int type,
> >> + struct net_shaper_nl_ctx *ctx)
> >> +{
> >> + struct net *ns = genl_info_net(info);
> >> + struct net_device *dev;
> >> + int ifindex;
> >> +
> >> + memset(ctx, 0, sizeof(*ctx));
> >> + if (GENL_REQ_ATTR_CHECK(info, type))
> >> + return -EINVAL;
> >> +
> >> + ifindex = nla_get_u32(info->attrs[type]);
> >
> > Let's limit the 'binding' thing to just driver call sites, we can
> > redo the rest easily later. This line and next pretends to take
> > "arbitrary" type but clearly wants a ifindex/netdev, right?
>
> There is a misunderstanding. This helper will be used in a following
> patch (7/12) with a different 'type' argument:
> NET_SHAPER_A_BINDING_IFINDEX. I've put a note in the commit message, but
> was unintentionally dropped in one of the recent refactors. I'll add
> that note back.
What I'm saying is that if you want to prep the ground for more
"binding" types you should also add:
if (type != ...IFINDEX) {
/* other binding types are TBD */
return -EINVAL;
}
> I hope you are ok with the struct net_shaper_binding * argument to most
> helpers? does not add complexity, will help to support devlink objects
> and swapping back and forth from/to struct net_device* can't be automated.
I am "okay" in the American sense of the word which AFAIU is "unhappy
but won't complain unless asked".
> > Maybe send a patch like this, to avoid having to allocate this space,
> > and special casing dump vs doit:
> >
> > diff --git a/include/net/genetlink.h b/include/net/genetlink.h
> > index 9ab49bfeae78..7658f0885178 100644
> > --- a/include/net/genetlink.h
> > +++ b/include/net/genetlink.h
> > @@ -124,7 +124,8 @@ struct genl_family {
> > * @genlhdr: generic netlink message header
> > * @attrs: netlink attributes
> > * @_net: network namespace
> > - * @user_ptr: user pointers
> > + * @ctx: storage space for the use by the family
> > + * @user_ptr: user pointers (deprecated, use ctx instead)
> > * @extack: extended ACK report struct
> > */
> > struct genl_info {
> > @@ -135,7 +136,10 @@ struct genl_info {
> > struct genlmsghdr * genlhdr;
> > struct nlattr ** attrs;
> > possible_net_t _net;
> > - void * user_ptr[2];
> > + union {
> > + u8 ctx[48];
> > + void * user_ptr[2];
> > + };
> > struct netlink_ext_ack *extack;
> > };
>
> Makes sense. Plus likely:
>
> #define NETLINK_CTX_SIZE 48
>
> and use such define above and in linux/netlink.h
Aha, would be good to also have a checking macro. Maybe rename
NL_ASSERT_DUMP_CTX_FITS()
to apply more broadly? or add a new one? Weak preference for former.
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [PATCH v5 net-next 02/12] net-shapers: implement NL get operation
2024-08-30 18:39 ` Jakub Kicinski
@ 2024-08-30 23:42 ` Jakub Kicinski
2024-09-02 13:00 ` Paolo Abeni
1 sibling, 0 replies; 29+ messages in thread
From: Jakub Kicinski @ 2024-08-30 23:42 UTC (permalink / raw)
To: Paolo Abeni
Cc: netdev, Jiri Pirko, Madhu Chittim, Sridhar Samudrala,
Simon Horman, John Fastabend, Sunil Kovvuri Goutham,
Jamal Hadi Salim, Donald Hunter, anthony.l.nguyen,
przemyslaw.kitszel, intel-wired-lan, edumazet
On Fri, 30 Aug 2024 11:39:00 -0700 Jakub Kicinski wrote:
> > There is a misunderstanding. This helper will be used in a following
> > patch (7/12) with a different 'type' argument:
> > NET_SHAPER_A_BINDING_IFINDEX. I've put a note in the commit message, but
> > was unintentionally dropped in one of the recent refactors. I'll add
> > that note back.
>
> What I'm saying is that if you want to prep the ground for more
> "binding" types you should also add:
>
> if (type != ...IFINDEX) {
> /* other binding types are TBD */
> return -EINVAL;
> }
Ah, the part I missed is that there are two different types for ifindex:
NET_SHAPER_A_IFINDEX
NET_SHAPER_A_CAPABILITIES_IFINDEX
Got it now.
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [PATCH v5 net-next 02/12] net-shapers: implement NL get operation
2024-08-30 18:39 ` Jakub Kicinski
2024-08-30 23:42 ` Jakub Kicinski
@ 2024-09-02 13:00 ` Paolo Abeni
1 sibling, 0 replies; 29+ messages in thread
From: Paolo Abeni @ 2024-09-02 13:00 UTC (permalink / raw)
To: Jakub Kicinski
Cc: netdev, Jiri Pirko, Madhu Chittim, Sridhar Samudrala,
Simon Horman, John Fastabend, Sunil Kovvuri Goutham,
Jamal Hadi Salim, Donald Hunter, anthony.l.nguyen,
przemyslaw.kitszel, intel-wired-lan, edumazet
On 8/30/24 20:39, Jakub Kicinski wrote:
> On Fri, 30 Aug 2024 12:55:05 +0200 Paolo Abeni wrote:
>> #define NETLINK_CTX_SIZE 48
>>
>> and use such define above and in linux/netlink.h
>
> Aha, would be good to also have a checking macro. Maybe rename
>
> NL_ASSERT_DUMP_CTX_FITS()
>
> to apply more broadly? or add a new one? Weak preference for former.
I will rename it to NL_ASSERT_CTX_FITS(), in the same patch.
/P
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH v5 net-next 02/12] net-shapers: implement NL get operation
2024-08-30 1:20 ` Jakub Kicinski
2024-08-30 10:55 ` Paolo Abeni
@ 2024-08-30 15:43 ` Paolo Abeni
2024-08-30 19:14 ` Jakub Kicinski
1 sibling, 1 reply; 29+ messages in thread
From: Paolo Abeni @ 2024-08-30 15:43 UTC (permalink / raw)
To: Jakub Kicinski, Jiri Pirko
Cc: netdev, Madhu Chittim, Sridhar Samudrala, Simon Horman,
John Fastabend, Sunil Kovvuri Goutham, Jamal Hadi Salim,
Donald Hunter, anthony.l.nguyen, przemyslaw.kitszel,
intel-wired-lan, edumazet
Hi,
Please allow me to put a few high level questions together, to both
underline them as most critical, and keep the thread focused.
On 8/30/24 03:20, Jakub Kicinski wrote:
> This 'binding' has the same meaning as 'binding' in TCP ZC? :(
I hope we can agree that good naming is difficult. I thought we agreed
on such naming in the past week’s discussion. The term 'binding' is
already used in the networking stack in many places to identify
different things (i.e. device tree, socket, netfilter.. ). The name
prefix avoids any ambiguity and I think this a good name, but if you
have any better suggestions, this change should be trivial.
[about per device shaper lock]
> I've been wondering if we shouldn't move this lock
> directly into net_device and combine it with the RSS lock.
> Create a "per-netdev" lock, instead of having multiple disparate
> mutexes which are hard to allocate?
The above looks like a quite unrelated refactor and one I think it will
not be worthy. The complexity of locking code in this series is very
limited, and self-encapsulated. Different locks for different things
increases scalability. Possibly we will not see much contention on the
same device, but some years ago we did not think there would be much
contention on RTNL...
Additionally, if we use a per _network device_ lock, future expansion of
the core to support devlink objects will be more difficult.
[about separate handle from shaper_info arguments]
> Wouldn't it be convenient to store the handle in the "info"
> object? AFAIU the handle is forever for an info, so no risk of it
> being out of sync…
Was that way a couple of iterations ago. Jiri explicitly asked for the
separation, I asked for confirmation and nobody objected.
Which if the 2 options is acceptable from both of you?
[about queue limit and channel reconf]
> we probably want to trim the queue shapers on channel reconfig,
> then, too? :(
what about exposing to the drivers an helper alike:
net_shaper_notify_delete(binding, handle);
that tells the core the shaper at the given handle just went away in the
H/W? The driver will call it in the queue deletion helper, and such
helper could be later on used more generically, i.e. for vf/devlink port
deletion.
[about capabilities support]
> It's not just for introspection, it's also for the core to do
> error checking.
Actually, in the previous discussions it was never mentioned to use
capabilities to fully centralize the error checking.
This really looks like another feature, and can easily be added in a
second time (say, a follow-up series), with no functionality loss.
I (or anybody else) can’t keep adding new features at every iteration.
At some point we need to draw a line, and we should agree that the scope
of this activity has already expanded a lot in the past year. I would
like to draw such a line here.
Thanks,
Paolo
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH v5 net-next 02/12] net-shapers: implement NL get operation
2024-08-30 15:43 ` Paolo Abeni
@ 2024-08-30 19:14 ` Jakub Kicinski
2024-09-02 10:10 ` Paolo Abeni
0 siblings, 1 reply; 29+ messages in thread
From: Jakub Kicinski @ 2024-08-30 19:14 UTC (permalink / raw)
To: Paolo Abeni
Cc: Jiri Pirko, netdev, Madhu Chittim, Sridhar Samudrala,
Simon Horman, John Fastabend, Sunil Kovvuri Goutham,
Jamal Hadi Salim, Donald Hunter, anthony.l.nguyen,
przemyslaw.kitszel, intel-wired-lan, edumazet
On Fri, 30 Aug 2024 17:43:08 +0200 Paolo Abeni wrote:
> Please allow me to put a few high level questions together, to both
> underline them as most critical, and keep the thread focused.
>
> On 8/30/24 03:20, Jakub Kicinski wrote:
> > This 'binding' has the same meaning as 'binding' in TCP ZC? :(
>
> I hope we can agree that good naming is difficult. I thought we agreed
> on such naming in the past week’s discussion. The term 'binding' is
> already used in the networking stack in many places to identify
> different things (i.e. device tree, socket, netfilter.. ). The name
> prefix avoids any ambiguity and I think this a good name, but if you
> have any better suggestions, this change should be trivial.
Ack. Maybe we can cut down the number of ambiguous nouns elsewhere:
maybe call net_shaper_info -> net_shaper ?
maybe net_shaper_data -> net_shaper_hierarchy ?
> > I've been wondering if we shouldn't move this lock
> > directly into net_device and combine it with the RSS lock.
> > Create a "per-netdev" lock, instead of having multiple disparate
> > mutexes which are hard to allocate?
>
> The above looks like a quite unrelated refactor and one I think it will
> not be worthy. The complexity of locking code in this series is very
> limited, and self-encapsulated. Different locks for different things
> increases scalability. Possibly we will not see much contention on the
> same device, but some years ago we did not think there would be much
> contention on RTNL...
We need to do this, anyway. Let me do it myself, then.
> Additionally, if we use a per _network device_ lock, future expansion of
> the core to support devlink objects will be more difficult.
You parse out the binding you can store a pointer to the right mutex.
> [about separate handle from shaper_info arguments]
> > Wouldn't it be convenient to store the handle in the "info"
> > object? AFAIU the handle is forever for an info, so no risk of it
> > being out of sync…
>
> Was that way a couple of iterations ago. Jiri explicitly asked for the
> separation, I asked for confirmation and nobody objected.
Could you link to that? I must have not read it.
You can keep it wrapped in a struct *_handle, that's fine.
But it can live inside the shaper object.
> Which if the 2 options is acceptable from both of you?
>
> [about queue limit and channel reconf]
> > we probably want to trim the queue shapers on channel reconfig,
> > then, too? :(
>
> what about exposing to the drivers an helper alike:
>
> net_shaper_notify_delete(binding, handle);
>
> that tells the core the shaper at the given handle just went away in the
> H/W? The driver will call it in the queue deletion helper, and such
> helper could be later on used more generically, i.e. for vf/devlink port
> deletion.
We can either prevent disabling queues which have shapers attached,
or auto-removing the shapers. No preference on that. But put the
callback in the core, please, netif_set_real_num_rx_queues() ?
Why not?
> > It's not just for introspection, it's also for the core to do
> > error checking.
>
> Actually, in the previous discussions it was never mentioned to use
> capabilities to fully centralize the error checking.
>
> This really looks like another feature, and can easily be added in a
> second time (say, a follow-up series), with no functionality loss.
>
> I (or anybody else) can’t keep adding new features at every iteration.
> At some point we need to draw a line, and we should agree that the scope
> of this activity has already expanded a lot in the past year. I would
> like to draw such a line here.
I can help you. Just tell me which parts you want me to take care of.
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH v5 net-next 02/12] net-shapers: implement NL get operation
2024-08-30 19:14 ` Jakub Kicinski
@ 2024-09-02 10:10 ` Paolo Abeni
2024-09-03 0:37 ` Jakub Kicinski
0 siblings, 1 reply; 29+ messages in thread
From: Paolo Abeni @ 2024-09-02 10:10 UTC (permalink / raw)
To: Jakub Kicinski, Jiri Pirko
Cc: netdev, Madhu Chittim, Sridhar Samudrala, Simon Horman,
John Fastabend, Sunil Kovvuri Goutham, Jamal Hadi Salim,
Donald Hunter, anthony.l.nguyen, przemyslaw.kitszel,
intel-wired-lan, edumazet
On 8/30/24 21:14, Jakub Kicinski wrote:
> On Fri, 30 Aug 2024 17:43:08 +0200 Paolo Abeni wrote:
>> Please allow me to put a few high level questions together, to both
>> underline them as most critical, and keep the thread focused.
>>
>> On 8/30/24 03:20, Jakub Kicinski wrote:
>> > This 'binding' has the same meaning as 'binding' in TCP ZC? :(
>>
>> I hope we can agree that good naming is difficult. I thought we agreed
>> on such naming in the past week’s discussion. The term 'binding' is
>> already used in the networking stack in many places to identify
>> different things (i.e. device tree, socket, netfilter.. ). The name
>> prefix avoids any ambiguity and I think this a good name, but if you
>> have any better suggestions, this change should be trivial.
>
> Ack. Maybe we can cut down the number of ambiguous nouns elsewhere:
>
> maybe call net_shaper_info -> net_shaper ?
>
> maybe net_shaper_data -> net_shaper_hierarchy ?
Is everybody fine with the above?
>> [about separate handle from shaper_info arguments]
>> > Wouldn't it be convenient to store the handle in the "info"
>> > object? AFAIU the handle is forever for an info, so no risk of it
>> > being out of sync…
>>
>> Was that way a couple of iterations ago. Jiri explicitly asked for the
>> separation, I asked for confirmation and nobody objected.
>
> Could you link to that? I must have not read it.
https://lore.kernel.org/netdev/ZqzIoZaGVb3jIW43@nanopsycho.orion/
search for "I wonder if the handle should be part of this structure"
I must admit by wannabe reply on such point never left my outbox.
> You can keep it wrapped in a struct *_handle, that's fine.
> But it can live inside the shaper object.
That is basically the opposite of what Jiri asked. @Jiri would you be ok
reverting to such layout?
>> Which if the 2 options is acceptable from both of you?
>>
>> [about queue limit and channel reconf]
>> > we probably want to trim the queue shapers on channel reconfig,
>> > then, too? :(
>>
>> what about exposing to the drivers an helper alike:
>>
>> net_shaper_notify_delete(binding, handle);
>>
>> that tells the core the shaper at the given handle just went away in the
>> H/W? The driver will call it in the queue deletion helper, and such
>> helper could be later on used more generically, i.e. for vf/devlink port
>> deletion.
>
> We can either prevent disabling queues which have shapers attached,
> or auto-removing the shapers.
I think/fear that prevent disabling queues would lead to
weird/unexpected results and more difficult administration, I prefer the
callback option.
> No preference on that. But put the
> callback in the core, please, netif_set_real_num_rx_queues() ?
> Why not?
It makes sense. I'll add a net_shaper_set_real_num_rx_queues() callback
there.
/P
^ permalink raw reply [flat|nested] 29+ messages in thread
* Re: [PATCH v5 net-next 02/12] net-shapers: implement NL get operation
2024-09-02 10:10 ` Paolo Abeni
@ 2024-09-03 0:37 ` Jakub Kicinski
0 siblings, 0 replies; 29+ messages in thread
From: Jakub Kicinski @ 2024-09-03 0:37 UTC (permalink / raw)
To: Paolo Abeni
Cc: Jiri Pirko, netdev, Madhu Chittim, Sridhar Samudrala,
Simon Horman, John Fastabend, Sunil Kovvuri Goutham,
Jamal Hadi Salim, Donald Hunter, anthony.l.nguyen,
przemyslaw.kitszel, intel-wired-lan, edumazet
On Mon, 2 Sep 2024 12:10:50 +0200 Paolo Abeni wrote:
> >> Was that way a couple of iterations ago. Jiri explicitly asked for the
> >> separation, I asked for confirmation and nobody objected.
> >
> > Could you link to that? I must have not read it.
>
> https://lore.kernel.org/netdev/ZqzIoZaGVb3jIW43@nanopsycho.orion/
>
> search for "I wonder if the handle should be part of this structure"
>
> I must admit by wannabe reply on such point never left my outbox.
"I wonder if .." does not sound like a strong preference.
And the parent ID remained in the struct, so it still partially records
its position in the hierarchy. Since there is no "move" op it's really
not worth multiplying arguments to most functions 2x.
^ permalink raw reply [flat|nested] 29+ messages in thread
* [PATCH v5 net-next 03/12] net-shapers: implement NL set and delete operations
2024-08-29 15:16 [PATCH v5 net-next 00/12] net: introduce TX H/W shaping API Paolo Abeni
2024-08-29 15:16 ` [PATCH v5 net-next 01/12] netlink: spec: add shaper YAML spec Paolo Abeni
2024-08-29 15:16 ` [PATCH v5 net-next 02/12] net-shapers: implement NL get operation Paolo Abeni
@ 2024-08-29 15:16 ` Paolo Abeni
2024-08-30 1:43 ` Jakub Kicinski
2024-08-29 15:16 ` [PATCH v5 net-next 04/12] net-shapers: implement NL group operation Paolo Abeni
` (8 subsequent siblings)
11 siblings, 1 reply; 29+ messages in thread
From: Paolo Abeni @ 2024-08-29 15:16 UTC (permalink / raw)
To: netdev
Cc: Jakub Kicinski, Jiri Pirko, Madhu Chittim, Sridhar Samudrala,
Simon Horman, John Fastabend, Sunil Kovvuri Goutham,
Jamal Hadi Salim, Donald Hunter, anthony.l.nguyen,
przemyslaw.kitszel, intel-wired-lan, edumazet
Both NL operations directly map on the homonymous device shaper
callbacks, update accordingly the shapers cache and are serialized
via a per device lock.
Implement the cache modification helpers to additionally deal with
NODE scope shaper. That will be needed by the group() operation
implemented in the next patch.
The delete implementation is partial: does not handle NODE scope
shaper yet. Such support will require infrastructure from
ithe next patch and will be implemented later in the series.
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
v4 -> v5:
- replace net_device * with binding* in most helpers
- move check for scope NONE handle at parse time and leverage
NL_SET_BAD_ATTR()
- move the default parent initialization to net_shaper_parse_info_nest()
v3 -> v4:
- add locking
- helper rename
RFC v2 -> RFC v3:
- dev_put() -> netdev_put()
---
net/shaper/shaper.c | 398 +++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 395 insertions(+), 3 deletions(-)
diff --git a/net/shaper/shaper.c b/net/shaper/shaper.c
index 2ed80df25765..a58bdd2ec013 100644
--- a/net/shaper/shaper.c
+++ b/net/shaper/shaper.c
@@ -23,6 +23,10 @@
struct net_shaper_data {
struct xarray shapers;
+
+ /* Serialize write ops and protects node_ids updates. */
+ struct mutex lock;
+ struct idr node_ids;
};
struct net_shaper_nl_ctx {
@@ -47,6 +51,27 @@ net_shaper_binding_data(struct net_shaper_binding *binding)
return NULL;
}
+static struct net_shaper_data *
+net_shaper_binding_set_data(struct net_shaper_binding *binding,
+ struct net_shaper_data *data)
+{
+ if (binding->type == NET_SHAPER_BINDING_TYPE_NETDEV)
+ return cmpxchg(&binding->netdev->net_shaper_data, NULL, data);
+
+ /* No devlink implementation yet.*/
+ return NULL;
+}
+
+static const struct net_shaper_ops *
+net_shaper_binding_ops(struct net_shaper_binding *binding)
+{
+ if (binding->type == NET_SHAPER_BINDING_TYPE_NETDEV)
+ return binding->netdev->netdev_ops->net_shaper_ops;
+
+ /* No devlink implementation yet.*/
+ return NULL;
+}
+
static int net_shaper_fill_binding(struct sk_buff *msg,
const struct net_shaper_binding *binding,
u32 type)
@@ -178,6 +203,26 @@ static void net_shaper_index_to_handle(u32 index,
handle->id = FIELD_GET(NET_SHAPER_ID_MASK, index);
}
+static void net_shaper_default_parent(const struct net_shaper_handle *handle,
+ struct net_shaper_handle *parent)
+{
+ switch (handle->scope) {
+ case NET_SHAPER_SCOPE_UNSPEC:
+ case NET_SHAPER_SCOPE_NETDEV:
+ case __NET_SHAPER_SCOPE_MAX:
+ parent->scope = NET_SHAPER_SCOPE_UNSPEC;
+ break;
+
+ case NET_SHAPER_SCOPE_QUEUE:
+ case NET_SHAPER_SCOPE_NODE:
+ parent->scope = NET_SHAPER_SCOPE_NETDEV;
+ break;
+ }
+ parent->id = 0;
+}
+
+#define NET_SHAPER_CACHE_NOT_VALID XA_MARK_0
+
/* Lookup the given shaper inside the cache. */
static struct net_shaper_info *
net_shaper_cache_lookup(struct net_shaper_binding *binding,
@@ -186,7 +231,132 @@ net_shaper_cache_lookup(struct net_shaper_binding *binding,
struct net_shaper_data *data = net_shaper_binding_data(binding);
u32 index = net_shaper_handle_to_index(handle);
- return data ? xa_load(&data->shapers, index) : NULL;
+ if (!data || xa_get_mark(&data->shapers, index,
+ NET_SHAPER_CACHE_NOT_VALID))
+ return NULL;
+
+ return xa_load(&data->shapers, index);
+}
+
+/* Allocate on demand the per device shaper's cache. */
+static struct net_shaper_data *
+net_shaper_cache_init(struct net_shaper_binding *binding,
+ struct netlink_ext_ack *extack)
+{
+ struct net_shaper_data *new, *data = net_shaper_binding_data(binding);
+
+ if (!data) {
+ new = kmalloc(sizeof(*data), GFP_KERNEL);
+ if (!new) {
+ NL_SET_ERR_MSG(extack, "Can't allocate memory for shaper data");
+ return NULL;
+ }
+
+ mutex_init(&new->lock);
+ xa_init(&new->shapers);
+ idr_init(&new->node_ids);
+
+ /* No lock acquired yet, we can race with other operations. */
+ data = net_shaper_binding_set_data(binding, new);
+ if (!data)
+ data = new;
+ else
+ kfree(new);
+ }
+ return data;
+}
+
+/* Prepare the cache to actually insert the given shaper, doing
+ * in advance the needed allocations.
+ */
+static int net_shaper_cache_pre_insert(struct net_shaper_binding *binding,
+ struct net_shaper_handle *handle,
+ struct netlink_ext_ack *extack)
+{
+ struct net_shaper_data *data = net_shaper_binding_data(binding);
+ struct net_shaper_info *prev, *cur;
+ bool id_allocated = false;
+ int ret, id, index;
+
+ if (!data)
+ return -ENOMEM;
+
+ index = net_shaper_handle_to_index(handle);
+ cur = xa_load(&data->shapers, index);
+ if (cur)
+ return 0;
+
+ /* Allocated a new id, if needed. */
+ if (handle->scope == NET_SHAPER_SCOPE_NODE &&
+ handle->id == NET_SHAPER_ID_UNSPEC) {
+ id = idr_alloc(&data->node_ids, NULL,
+ 0, NET_SHAPER_ID_UNSPEC, GFP_ATOMIC);
+
+ if (id < 0) {
+ NL_SET_ERR_MSG(extack, "Can't allocate new id for NODE shaper");
+ return id;
+ }
+
+ handle->id = id;
+ index = net_shaper_handle_to_index(handle);
+ id_allocated = true;
+ }
+
+ cur = kmalloc(sizeof(*cur), GFP_KERNEL | __GFP_ZERO);
+ if (!cur) {
+ NL_SET_ERR_MSG(extack, "Can't allocate memory for cached shaper");
+ ret = -ENOMEM;
+ goto free_id;
+ }
+
+ /* Mark 'tentative' shaper inside the cache. */
+ xa_lock(&data->shapers);
+ prev = __xa_store(&data->shapers, index, cur, GFP_KERNEL);
+ __xa_set_mark(&data->shapers, index, NET_SHAPER_CACHE_NOT_VALID);
+ xa_unlock(&data->shapers);
+ if (xa_err(prev)) {
+ NL_SET_ERR_MSG(extack, "Can't insert shaper into cache");
+ kfree(cur);
+ ret = xa_err(prev);
+ goto free_id;
+ }
+ return 0;
+
+free_id:
+ if (id_allocated)
+ idr_remove(&data->node_ids, handle->id);
+ return ret;
+}
+
+/* Commit the tentative insert with the actual values.
+ * Must be called only after a successful net_shaper_pre_insert().
+ */
+static void net_shaper_cache_commit(struct net_shaper_binding *binding,
+ int nr_shapers,
+ const struct net_shaper_handle *handle,
+ const struct net_shaper_info *shapers)
+{
+ struct net_shaper_data *data = net_shaper_binding_data(binding);
+ struct net_shaper_info *cur;
+ int index;
+ int i;
+
+ xa_lock(&data->shapers);
+ for (i = 0; i < nr_shapers; ++i) {
+ index = net_shaper_handle_to_index(&handle[i]);
+
+ cur = xa_load(&data->shapers, index);
+ if (WARN_ON_ONCE(!cur))
+ continue;
+
+ /* Successful update: drop the tentative mark
+ * and update the cache.
+ */
+ __xa_clear_mark(&data->shapers, index,
+ NET_SHAPER_CACHE_NOT_VALID);
+ *cur = shapers[i];
+ }
+ xa_unlock(&data->shapers);
}
static int net_shaper_parse_handle(const struct nlattr *attr,
@@ -227,6 +397,85 @@ static int net_shaper_parse_handle(const struct nlattr *attr,
return 0;
}
+static int net_shaper_parse_info(struct net_shaper_binding *binding,
+ struct nlattr **tb,
+ const struct genl_info *info,
+ struct net_shaper_handle *handle,
+ struct net_shaper_info *shaper,
+ bool *cached)
+{
+ struct net_shaper_info *old;
+ int ret;
+
+ /* The shaper handle is the only mandatory attribute. */
+ if (NL_REQ_ATTR_CHECK(info->extack, NULL, tb, NET_SHAPER_A_HANDLE))
+ return -EINVAL;
+
+ ret = net_shaper_parse_handle(tb[NET_SHAPER_A_HANDLE], info, handle);
+ if (ret)
+ return ret;
+
+ if (handle->scope == NET_SHAPER_SCOPE_UNSPEC) {
+ NL_SET_BAD_ATTR(info->extack,
+ info->attrs[NET_SHAPER_A_HANDLE]);
+ return -EINVAL;
+ }
+
+ /* Fetch existing data, if any, so that user provide info will
+ * incrementally update the existing shaper configuration.
+ */
+ old = net_shaper_cache_lookup(binding, handle);
+ if (old)
+ *shaper = *old;
+ *cached = !!old;
+
+ if (tb[NET_SHAPER_A_METRIC])
+ shaper->metric = nla_get_u32(tb[NET_SHAPER_A_METRIC]);
+
+ if (tb[NET_SHAPER_A_BW_MIN])
+ shaper->bw_min = nla_get_uint(tb[NET_SHAPER_A_BW_MIN]);
+
+ if (tb[NET_SHAPER_A_BW_MAX])
+ shaper->bw_max = nla_get_uint(tb[NET_SHAPER_A_BW_MAX]);
+
+ if (tb[NET_SHAPER_A_BURST])
+ shaper->burst = nla_get_uint(tb[NET_SHAPER_A_BURST]);
+
+ if (tb[NET_SHAPER_A_PRIORITY])
+ shaper->priority = nla_get_u32(tb[NET_SHAPER_A_PRIORITY]);
+
+ if (tb[NET_SHAPER_A_WEIGHT])
+ shaper->weight = nla_get_u32(tb[NET_SHAPER_A_WEIGHT]);
+ return 0;
+}
+
+/* Fetch the cached shaper info and update them with the user-provided
+ * attributes.
+ */
+static int net_shaper_parse_info_nest(struct net_shaper_binding *binding,
+ const struct nlattr *attr,
+ const struct genl_info *info,
+ struct net_shaper_handle *handle,
+ struct net_shaper_info *shaper)
+{
+ struct nlattr *tb[NET_SHAPER_A_WEIGHT + 1];
+ bool cached;
+ int ret;
+
+ ret = nla_parse_nested(tb, NET_SHAPER_A_WEIGHT, attr,
+ net_shaper_info_nl_policy, info->extack);
+ if (ret < 0)
+ return ret;
+
+ ret = net_shaper_parse_info(binding, tb, info, handle, shaper, &cached);
+ if (ret < 0)
+ return ret;
+
+ if (!cached)
+ net_shaper_default_parent(handle, &shaper->parent);
+ return 0;
+}
+
static int net_shaper_generic_pre(struct genl_info *info, int type)
{
struct net_shaper_nl_ctx *ctx;
@@ -358,14 +607,153 @@ int net_shaper_nl_get_dumpit(struct sk_buff *skb,
return 0;
}
+/* Update the H/W and on success update the local cache, too. */
+static int net_shaper_set(struct net_shaper_binding *binding,
+ const struct net_shaper_handle *h,
+ const struct net_shaper_info *shaper,
+ struct netlink_ext_ack *extack)
+{
+ struct net_shaper_data *data = net_shaper_cache_init(binding, extack);
+ const struct net_shaper_ops *ops = net_shaper_binding_ops(binding);
+ struct net_shaper_handle handle = *h;
+ int ret;
+
+ if (!data)
+ return -ENOMEM;
+
+ /* Should never happen: binding lookup validates the ops presence */
+ if (WARN_ON_ONCE(!ops))
+ return -EOPNOTSUPP;
+
+ mutex_lock(&data->lock);
+ if (handle.scope == NET_SHAPER_SCOPE_NODE &&
+ net_shaper_cache_lookup(binding, &handle)) {
+ ret = -ENOENT;
+ goto unlock;
+ }
+
+ ret = net_shaper_cache_pre_insert(binding, &handle, extack);
+ if (ret)
+ goto unlock;
+
+ ret = ops->set(binding, &handle, shaper, extack);
+ net_shaper_cache_commit(binding, 1, &handle, shaper);
+
+unlock:
+ mutex_unlock(&data->lock);
+ return ret;
+}
+
int net_shaper_nl_set_doit(struct sk_buff *skb, struct genl_info *info)
{
- return -EOPNOTSUPP;
+ struct net_shaper_binding *binding;
+ struct net_shaper_handle handle;
+ struct net_shaper_info shaper;
+ struct nlattr *attr;
+ int ret;
+
+ if (GENL_REQ_ATTR_CHECK(info, NET_SHAPER_A_SHAPER))
+ return -EINVAL;
+
+ binding = net_shaper_binding_from_ctx(info->user_ptr[0]);
+ attr = info->attrs[NET_SHAPER_A_SHAPER];
+ ret = net_shaper_parse_info_nest(binding, attr, info, &handle,
+ &shaper);
+ if (ret)
+ return ret;
+
+ return net_shaper_set(binding, &handle, &shaper, info->extack);
+}
+
+static int __net_shaper_delete(struct net_shaper_binding *binding,
+ const struct net_shaper_handle *h,
+ struct net_shaper_info *shaper,
+ struct netlink_ext_ack *extack)
+{
+ const struct net_shaper_ops *ops = net_shaper_binding_ops(binding);
+ struct net_shaper_data *data = net_shaper_binding_data(binding);
+ struct net_shaper_handle parent_handle, handle = *h;
+ int ret;
+
+ /* Should never happen: we are under the cache lock, the cache
+ * is already initialized.
+ */
+ if (WARN_ON_ONCE(!data || !ops))
+ return -EINVAL;
+
+again:
+ parent_handle = shaper->parent;
+
+ ret = ops->delete(binding, &handle, extack);
+ if (ret < 0)
+ return ret;
+
+ xa_erase(&data->shapers, net_shaper_handle_to_index(&handle));
+ if (handle.scope == NET_SHAPER_SCOPE_NODE)
+ idr_remove(&data->node_ids, handle.id);
+ kfree(shaper);
+
+ /* Eventually delete the parent, if it is left over with no leaves. */
+ if (parent_handle.scope == NET_SHAPER_SCOPE_NODE) {
+ shaper = net_shaper_cache_lookup(binding, &parent_handle);
+ if (shaper && !--shaper->leaves) {
+ handle = parent_handle;
+ goto again;
+ }
+ }
+ return 0;
+}
+
+static int net_shaper_delete(struct net_shaper_binding *binding,
+ const struct net_shaper_handle *handle,
+ struct netlink_ext_ack *extack)
+{
+ struct net_shaper_data *data = net_shaper_binding_data(binding);
+ struct net_shaper_info *shaper;
+ int ret;
+
+ /* The lock is null when the cache is not initialized, and thus
+ * no shaper has been created yet.
+ */
+ if (!data)
+ return -ENOENT;
+
+ mutex_lock(&data->lock);
+ shaper = net_shaper_cache_lookup(binding, handle);
+ if (!shaper) {
+ ret = -ENOENT;
+ goto unlock;
+ }
+
+ if (handle->scope == NET_SHAPER_SCOPE_NODE) {
+ /* TODO: implement support for scope NODE delete. */
+ ret = -EINVAL;
+ goto unlock;
+ }
+
+ ret = __net_shaper_delete(binding, handle, shaper, extack);
+
+unlock:
+ mutex_unlock(&data->lock);
+ return ret;
}
int net_shaper_nl_delete_doit(struct sk_buff *skb, struct genl_info *info)
{
- return -EOPNOTSUPP;
+ struct net_shaper_binding *binding;
+ struct net_shaper_handle handle;
+ int ret;
+
+ if (GENL_REQ_ATTR_CHECK(info, NET_SHAPER_A_HANDLE))
+ return -EINVAL;
+
+ binding = net_shaper_binding_from_ctx(info->user_ptr[0]);
+ ret = net_shaper_parse_handle(info->attrs[NET_SHAPER_A_HANDLE], info,
+ &handle);
+ if (ret)
+ return ret;
+
+ return net_shaper_delete(binding, &handle, info->extack);
}
static void net_shaper_flush(struct net_shaper_binding *binding)
@@ -377,12 +765,16 @@ static void net_shaper_flush(struct net_shaper_binding *binding)
if (!data)
return;
+ mutex_lock(&data->lock);
xa_lock(&data->shapers);
xa_for_each(&data->shapers, index, cur) {
__xa_erase(&data->shapers, index);
kfree(cur);
}
xa_unlock(&data->shapers);
+ idr_destroy(&data->node_ids);
+ mutex_unlock(&data->lock);
+
kfree(data);
}
--
2.45.2
^ permalink raw reply related [flat|nested] 29+ messages in thread* Re: [PATCH v5 net-next 03/12] net-shapers: implement NL set and delete operations
2024-08-29 15:16 ` [PATCH v5 net-next 03/12] net-shapers: implement NL set and delete operations Paolo Abeni
@ 2024-08-30 1:43 ` Jakub Kicinski
0 siblings, 0 replies; 29+ messages in thread
From: Jakub Kicinski @ 2024-08-30 1:43 UTC (permalink / raw)
To: Paolo Abeni
Cc: netdev, Jiri Pirko, Madhu Chittim, Sridhar Samudrala,
Simon Horman, John Fastabend, Sunil Kovvuri Goutham,
Jamal Hadi Salim, Donald Hunter, anthony.l.nguyen,
przemyslaw.kitszel, intel-wired-lan, edumazet
On Thu, 29 Aug 2024 17:16:56 +0200 Paolo Abeni wrote:
> ithe next patch and will be implemented later in the series.
s/ithe/the/
> diff --git a/net/shaper/shaper.c b/net/shaper/shaper.c
> index 2ed80df25765..a58bdd2ec013 100644
> --- a/net/shaper/shaper.c
> +++ b/net/shaper/shaper.c
> @@ -23,6 +23,10 @@
>
> struct net_shaper_data {
> struct xarray shapers;
> +
> + /* Serialize write ops and protects node_ids updates. */
By write ops you mean all driver ops but @capabilities?
Maybe let's say all driver ops and avoid confusion?
> + struct mutex lock;
> + struct idr node_ids;
Do we need an IDR? can we not allocate the IDs using the xarray,
starting at the offset of first NODE? Since type is on top bits?
> };
>
> struct net_shaper_nl_ctx {
> @@ -47,6 +51,27 @@ net_shaper_binding_data(struct net_shaper_binding *binding)
> return NULL;
> }
>
> +static struct net_shaper_data *
> +net_shaper_binding_set_data(struct net_shaper_binding *binding,
> + struct net_shaper_data *data)
> +{
> + if (binding->type == NET_SHAPER_BINDING_TYPE_NETDEV)
> + return cmpxchg(&binding->netdev->net_shaper_data, NULL, data);
Hmm. Do we need this because the lock is inside the struct we're
allocating? I've been wondering if we shouldn't move this lock
directly into net_device and combine it with the RSS lock.
Create a "per-netdev" lock, instead of having multiple disparate
mutexes which are hard to allocate?
> + /* No devlink implementation yet.*/
> + return NULL;
> +}
> +
> +static const struct net_shaper_ops *
> +net_shaper_binding_ops(struct net_shaper_binding *binding)
> +{
> + if (binding->type == NET_SHAPER_BINDING_TYPE_NETDEV)
> + return binding->netdev->netdev_ops->net_shaper_ops;
> +
> + /* No devlink implementation yet.*/
> + return NULL;
> +}
> +
> static int net_shaper_fill_binding(struct sk_buff *msg,
> const struct net_shaper_binding *binding,
> u32 type)
> @@ -178,6 +203,26 @@ static void net_shaper_index_to_handle(u32 index,
> handle->id = FIELD_GET(NET_SHAPER_ID_MASK, index);
> }
>
> +static void net_shaper_default_parent(const struct net_shaper_handle *handle,
> + struct net_shaper_handle *parent)
> +{
> + switch (handle->scope) {
> + case NET_SHAPER_SCOPE_UNSPEC:
> + case NET_SHAPER_SCOPE_NETDEV:
> + case __NET_SHAPER_SCOPE_MAX:
> + parent->scope = NET_SHAPER_SCOPE_UNSPEC;
> + break;
> +
> + case NET_SHAPER_SCOPE_QUEUE:
> + case NET_SHAPER_SCOPE_NODE:
> + parent->scope = NET_SHAPER_SCOPE_NETDEV;
> + break;
> + }
> + parent->id = 0;
> +}
> +
> +#define NET_SHAPER_CACHE_NOT_VALID XA_MARK_0
> +
> /* Lookup the given shaper inside the cache. */
> static struct net_shaper_info *
> net_shaper_cache_lookup(struct net_shaper_binding *binding,
> @@ -186,7 +231,132 @@ net_shaper_cache_lookup(struct net_shaper_binding *binding,
> struct net_shaper_data *data = net_shaper_binding_data(binding);
> u32 index = net_shaper_handle_to_index(handle);
>
> - return data ? xa_load(&data->shapers, index) : NULL;
> + if (!data || xa_get_mark(&data->shapers, index,
> + NET_SHAPER_CACHE_NOT_VALID))
> + return NULL;
> +
> + return xa_load(&data->shapers, index);
> +}
> +
> +/* Allocate on demand the per device shaper's cache. */
> +static struct net_shaper_data *
> +net_shaper_cache_init(struct net_shaper_binding *binding,
> + struct netlink_ext_ack *extack)
> +{
> + struct net_shaper_data *new, *data = net_shaper_binding_data(binding);
> +
Please don't call functions in variable init if you have to check
what they returned later.
> + if (!data) {
invert the condition and return early?
> + new = kmalloc(sizeof(*data), GFP_KERNEL);
> + if (!new) {
> + NL_SET_ERR_MSG(extack, "Can't allocate memory for shaper data");
no error messages needed for GFP_KERNEL OOM (pls fix everywhere)
> + return NULL;
> + }
> +
> + mutex_init(&new->lock);
> + xa_init(&new->shapers);
> + idr_init(&new->node_ids);
> +
> + /* No lock acquired yet, we can race with other operations. */
> + data = net_shaper_binding_set_data(binding, new);
> + if (!data)
> + data = new;
> + else
> + kfree(new);
> + }
> + return data;
> +}
> +
> +/* Prepare the cache to actually insert the given shaper, doing
> + * in advance the needed allocations.
> + */
> +static int net_shaper_cache_pre_insert(struct net_shaper_binding *binding,
> + struct net_shaper_handle *handle,
> + struct netlink_ext_ack *extack)
> +{
> + struct net_shaper_data *data = net_shaper_binding_data(binding);
> + struct net_shaper_info *prev, *cur;
> + bool id_allocated = false;
> + int ret, id, index;
> +
> + if (!data)
> + return -ENOMEM;
> +
> + index = net_shaper_handle_to_index(handle);
> + cur = xa_load(&data->shapers, index);
> + if (cur)
> + return 0;
> +
> + /* Allocated a new id, if needed. */
> + if (handle->scope == NET_SHAPER_SCOPE_NODE &&
> + handle->id == NET_SHAPER_ID_UNSPEC) {
> + id = idr_alloc(&data->node_ids, NULL,
> + 0, NET_SHAPER_ID_UNSPEC, GFP_ATOMIC);
How did we enter ATOMIC context?
> +
> + if (id < 0) {
> + NL_SET_ERR_MSG(extack, "Can't allocate new id for NODE shaper");
> + return id;
> + }
> +
> + handle->id = id;
> + index = net_shaper_handle_to_index(handle);
> + id_allocated = true;
> + }
> +
> + cur = kmalloc(sizeof(*cur), GFP_KERNEL | __GFP_ZERO);
kzalloc() ?
> + if (!cur) {
> + NL_SET_ERR_MSG(extack, "Can't allocate memory for cached shaper");
> + ret = -ENOMEM;
> + goto free_id;
> + }
> +
> + /* Mark 'tentative' shaper inside the cache. */
> + xa_lock(&data->shapers);
> + prev = __xa_store(&data->shapers, index, cur, GFP_KERNEL);
> + __xa_set_mark(&data->shapers, index, NET_SHAPER_CACHE_NOT_VALID);
Maybe worth calling out if it's level to xa_set_mark on a non-inserted
handle?
> + xa_unlock(&data->shapers);
> + if (xa_err(prev)) {
> + NL_SET_ERR_MSG(extack, "Can't insert shaper into cache");
> + kfree(cur);
> + ret = xa_err(prev);
> + goto free_id;
> + }
> + return 0;
> +
> +free_id:
> + if (id_allocated)
> + idr_remove(&data->node_ids, handle->id);
> + return ret;
> +}
> +
> +/* Commit the tentative insert with the actual values.
> + * Must be called only after a successful net_shaper_pre_insert().
> + */
> +static void net_shaper_cache_commit(struct net_shaper_binding *binding,
> + int nr_shapers,
> + const struct net_shaper_handle *handle,
> + const struct net_shaper_info *shapers)
> +{
> + struct net_shaper_data *data = net_shaper_binding_data(binding);
> + struct net_shaper_info *cur;
> + int index;
> + int i;
> +
> + xa_lock(&data->shapers);
> + for (i = 0; i < nr_shapers; ++i) {
> + index = net_shaper_handle_to_index(&handle[i]);
> +
> + cur = xa_load(&data->shapers, index);
> + if (WARN_ON_ONCE(!cur))
> + continue;
> +
> + /* Successful update: drop the tentative mark
> + * and update the cache.
> + */
> + __xa_clear_mark(&data->shapers, index,
> + NET_SHAPER_CACHE_NOT_VALID);
> + *cur = shapers[i];
> + }
> + xa_unlock(&data->shapers);
> }
>
> static int net_shaper_parse_handle(const struct nlattr *attr,
> @@ -227,6 +397,85 @@ static int net_shaper_parse_handle(const struct nlattr *attr,
> return 0;
> }
>
> +static int net_shaper_parse_info(struct net_shaper_binding *binding,
> + struct nlattr **tb,
> + const struct genl_info *info,
> + struct net_shaper_handle *handle,
> + struct net_shaper_info *shaper,
> + bool *cached)
> +{
> + struct net_shaper_info *old;
> + int ret;
> +
> + /* The shaper handle is the only mandatory attribute. */
> + if (NL_REQ_ATTR_CHECK(info->extack, NULL, tb, NET_SHAPER_A_HANDLE))
> + return -EINVAL;
> +
> + ret = net_shaper_parse_handle(tb[NET_SHAPER_A_HANDLE], info, handle);
> + if (ret)
> + return ret;
> +
> + if (handle->scope == NET_SHAPER_SCOPE_UNSPEC) {
> + NL_SET_BAD_ATTR(info->extack,
> + info->attrs[NET_SHAPER_A_HANDLE]);
> + return -EINVAL;
> + }
> +
> + /* Fetch existing data, if any, so that user provide info will
> + * incrementally update the existing shaper configuration.
> + */
> + old = net_shaper_cache_lookup(binding, handle);
> + if (old)
> + *shaper = *old;
> + *cached = !!old;
> +
> + if (tb[NET_SHAPER_A_METRIC])
> + shaper->metric = nla_get_u32(tb[NET_SHAPER_A_METRIC]);
> +
> + if (tb[NET_SHAPER_A_BW_MIN])
> + shaper->bw_min = nla_get_uint(tb[NET_SHAPER_A_BW_MIN]);
> +
> + if (tb[NET_SHAPER_A_BW_MAX])
> + shaper->bw_max = nla_get_uint(tb[NET_SHAPER_A_BW_MAX]);
> +
> + if (tb[NET_SHAPER_A_BURST])
> + shaper->burst = nla_get_uint(tb[NET_SHAPER_A_BURST]);
> +
> + if (tb[NET_SHAPER_A_PRIORITY])
> + shaper->priority = nla_get_u32(tb[NET_SHAPER_A_PRIORITY]);
> +
> + if (tb[NET_SHAPER_A_WEIGHT])
> + shaper->weight = nla_get_u32(tb[NET_SHAPER_A_WEIGHT]);
> + return 0;
> +}
> +
> +/* Fetch the cached shaper info and update them with the user-provided
> + * attributes.
> + */
> +static int net_shaper_parse_info_nest(struct net_shaper_binding *binding,
> + const struct nlattr *attr,
> + const struct genl_info *info,
> + struct net_shaper_handle *handle,
> + struct net_shaper_info *shaper)
> +{
> + struct nlattr *tb[NET_SHAPER_A_WEIGHT + 1];
> + bool cached;
> + int ret;
> +
> + ret = nla_parse_nested(tb, NET_SHAPER_A_WEIGHT, attr,
> + net_shaper_info_nl_policy, info->extack);
> + if (ret < 0)
> + return ret;
> +
> + ret = net_shaper_parse_info(binding, tb, info, handle, shaper, &cached);
> + if (ret < 0)
> + return ret;
> +
> + if (!cached)
> + net_shaper_default_parent(handle, &shaper->parent);
> + return 0;
> +}
> +
> static int net_shaper_generic_pre(struct genl_info *info, int type)
> {
> struct net_shaper_nl_ctx *ctx;
> @@ -358,14 +607,153 @@ int net_shaper_nl_get_dumpit(struct sk_buff *skb,
> return 0;
> }
>
> +/* Update the H/W and on success update the local cache, too. */
> +static int net_shaper_set(struct net_shaper_binding *binding,
> + const struct net_shaper_handle *h,
> + const struct net_shaper_info *shaper,
> + struct netlink_ext_ack *extack)
> +{
> + struct net_shaper_data *data = net_shaper_cache_init(binding, extack);
> + const struct net_shaper_ops *ops = net_shaper_binding_ops(binding);
> + struct net_shaper_handle handle = *h;
> + int ret;
> +
> + if (!data)
> + return -ENOMEM;
> +
> + /* Should never happen: binding lookup validates the ops presence */
> + if (WARN_ON_ONCE(!ops))
> + return -EOPNOTSUPP;
> +
> + mutex_lock(&data->lock);
> + if (handle.scope == NET_SHAPER_SCOPE_NODE &&
> + net_shaper_cache_lookup(binding, &handle)) {
> + ret = -ENOENT;
EEXIST ? Presumably this is temporary as described in the commit
message?
^ permalink raw reply [flat|nested] 29+ messages in thread
* [PATCH v5 net-next 04/12] net-shapers: implement NL group operation
2024-08-29 15:16 [PATCH v5 net-next 00/12] net: introduce TX H/W shaping API Paolo Abeni
` (2 preceding siblings ...)
2024-08-29 15:16 ` [PATCH v5 net-next 03/12] net-shapers: implement NL set and delete operations Paolo Abeni
@ 2024-08-29 15:16 ` Paolo Abeni
2024-08-30 2:04 ` Jakub Kicinski
2024-08-29 15:16 ` [PATCH v5 net-next 05/12] net-shapers: implement delete support for NODE scope shaper Paolo Abeni
` (7 subsequent siblings)
11 siblings, 1 reply; 29+ messages in thread
From: Paolo Abeni @ 2024-08-29 15:16 UTC (permalink / raw)
To: netdev
Cc: Jakub Kicinski, Jiri Pirko, Madhu Chittim, Sridhar Samudrala,
Simon Horman, John Fastabend, Sunil Kovvuri Goutham,
Jamal Hadi Salim, Donald Hunter, anthony.l.nguyen,
przemyslaw.kitszel, intel-wired-lan, edumazet
Allow grouping multiple leaves shaper under the given root.
The root and the leaves shapers are created, if needed, otherwise
the existing shapers are re-linked as requested.
Try hard to pre-allocated the needed resources, to avoid non
trivial H/W configuration rollbacks in case of any failure.
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
v4 -> v5:
- replace net_device* with binding* in most helpers
- factor out net_shaper_fill_binding() helper for re-use in later patch
- move most sanity check at parse time and use NL_SET_BAD_ATTR
- reused net_shaper_fill_handle() in net_shaper_group_send_reply()
instead of open-coding it.
v3 -> v4:
- cleanup left-over scope node shaper after re-link, as needed
- add locking
- separate arguments for shaper handle
RFC v2 -> RFC v3:
- dev_put() -> netdev_put()
---
net/shaper/shaper.c | 348 +++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 346 insertions(+), 2 deletions(-)
diff --git a/net/shaper/shaper.c b/net/shaper/shaper.c
index a58bdd2ec013..f5e8464b8408 100644
--- a/net/shaper/shaper.c
+++ b/net/shaper/shaper.c
@@ -72,6 +72,24 @@ net_shaper_binding_ops(struct net_shaper_binding *binding)
return NULL;
}
+/* Count the number of [multi] attributes of the given type. */
+static int net_shaper_list_len(struct genl_info *info, int type)
+{
+ struct nlattr *attr;
+ int rem, cnt = 0;
+
+ nla_for_each_attr_type(attr, type, genlmsg_data(info->genlhdr),
+ genlmsg_len(info->genlhdr), rem)
+ cnt++;
+ return cnt;
+}
+
+static int net_shaper_handle_size(void)
+{
+ return nla_total_size(nla_total_size(sizeof(u32)) +
+ nla_total_size(sizeof(u32)));
+}
+
static int net_shaper_fill_binding(struct sk_buff *msg,
const struct net_shaper_binding *binding,
u32 type)
@@ -359,6 +377,29 @@ static void net_shaper_cache_commit(struct net_shaper_binding *binding,
xa_unlock(&data->shapers);
}
+/* Rollback all the tentative inserts from the shaper cache. */
+static void net_shaper_cache_rollback(struct net_shaper_binding *binding)
+{
+ struct net_shaper_data *data = net_shaper_binding_data(binding);
+ struct net_shaper_handle handle;
+ struct net_shaper_info *cur;
+ unsigned long index;
+
+ if (!data)
+ return;
+
+ xa_lock(&data->shapers);
+ xa_for_each_marked(&data->shapers, index, cur,
+ NET_SHAPER_CACHE_NOT_VALID) {
+ net_shaper_index_to_handle(index, &handle);
+ if (handle.scope == NET_SHAPER_SCOPE_NODE)
+ idr_remove(&data->node_ids, handle.id);
+ __xa_erase(&data->shapers, index);
+ kfree(cur);
+ }
+ xa_unlock(&data->shapers);
+}
+
static int net_shaper_parse_handle(const struct nlattr *attr,
const struct genl_info *info,
struct net_shaper_handle *handle)
@@ -455,6 +496,7 @@ static int net_shaper_parse_info(struct net_shaper_binding *binding,
static int net_shaper_parse_info_nest(struct net_shaper_binding *binding,
const struct nlattr *attr,
const struct genl_info *info,
+ enum net_shaper_scope expected_scope,
struct net_shaper_handle *handle,
struct net_shaper_info *shaper)
{
@@ -471,11 +513,62 @@ static int net_shaper_parse_info_nest(struct net_shaper_binding *binding,
if (ret < 0)
return ret;
+ if (expected_scope != NET_SHAPER_SCOPE_UNSPEC &&
+ handle->scope != expected_scope) {
+ NL_SET_BAD_ATTR(info->extack, tb[NET_SHAPER_A_HANDLE]);
+ return -EINVAL;
+ }
+
if (!cached)
net_shaper_default_parent(handle, &shaper->parent);
return 0;
}
+/* Alike net_parse_shaper_info(), but additionally allow the user specifying
+ * the shaper's parent handle.
+ */
+static int net_shaper_parse_node(struct net_shaper_binding *binding,
+ const struct nlattr *attr,
+ const struct genl_info *info,
+ struct net_shaper_handle *handle,
+ struct net_shaper_info *shaper)
+{
+ struct nlattr *tb[NET_SHAPER_A_PARENT + 1];
+ bool cached;
+ int ret;
+
+ ret = nla_parse_nested(tb, NET_SHAPER_A_PARENT, attr,
+ net_shaper_node_info_nl_policy,
+ info->extack);
+ if (ret < 0)
+ return ret;
+
+ ret = net_shaper_parse_info(binding, tb, info, handle, shaper,
+ &cached);
+ if (ret)
+ return ret;
+
+ if (handle->scope != NET_SHAPER_SCOPE_NODE &&
+ handle->scope != NET_SHAPER_SCOPE_NETDEV) {
+ NL_SET_BAD_ATTR(info->extack, tb[NET_SHAPER_A_HANDLE]);
+ return -EINVAL;
+ }
+
+ if (tb[NET_SHAPER_A_PARENT]) {
+ ret = net_shaper_parse_handle(tb[NET_SHAPER_A_PARENT], info,
+ &shaper->parent);
+ if (ret)
+ return ret;
+
+ if (shaper->parent.scope != NET_SHAPER_SCOPE_NODE &&
+ shaper->parent.scope != NET_SHAPER_SCOPE_NETDEV) {
+ NL_SET_BAD_ATTR(info->extack, tb[NET_SHAPER_A_PARENT]);
+ return -EINVAL;
+ }
+ }
+ return 0;
+}
+
static int net_shaper_generic_pre(struct genl_info *info, int type)
{
struct net_shaper_nl_ctx *ctx;
@@ -657,8 +750,9 @@ int net_shaper_nl_set_doit(struct sk_buff *skb, struct genl_info *info)
binding = net_shaper_binding_from_ctx(info->user_ptr[0]);
attr = info->attrs[NET_SHAPER_A_SHAPER];
- ret = net_shaper_parse_info_nest(binding, attr, info, &handle,
- &shaper);
+ ret = net_shaper_parse_info_nest(binding, attr, info,
+ NET_SHAPER_SCOPE_UNSPEC,
+ &handle, &shaper);
if (ret)
return ret;
@@ -704,6 +798,100 @@ static int __net_shaper_delete(struct net_shaper_binding *binding,
return 0;
}
+static int __net_shaper_group(struct net_shaper_binding *binding,
+ int leaves_count,
+ const struct net_shaper_handle *leaves_handles,
+ struct net_shaper_info *leaves,
+ struct net_shaper_handle *node_handle,
+ struct net_shaper_info *node,
+ struct netlink_ext_ack *extack)
+{
+ const struct net_shaper_ops *ops = net_shaper_binding_ops(binding);
+ struct net_shaper_info *parent = NULL;
+ struct net_shaper_handle leaf_handle;
+ int i, ret;
+
+ if (node_handle->scope == NET_SHAPER_SCOPE_NODE) {
+ if (node_handle->id != NET_SHAPER_ID_UNSPEC &&
+ !net_shaper_cache_lookup(binding, node_handle)) {
+ NL_SET_ERR_MSG_FMT(extack, "Node shaper %d:%d does not exists",
+ node_handle->scope, node_handle->id);
+ return -ENOENT;
+ }
+
+ /* When unspecified, the node parent scope is inherited from
+ * the leaves.
+ */
+ if (node->parent.scope == NET_SHAPER_SCOPE_UNSPEC) {
+ for (i = 1; i < leaves_count; ++i) {
+ if (leaves[i].parent.scope !=
+ leaves[0].parent.scope ||
+ leaves[i].parent.id !=
+ leaves[0].parent.id) {
+ NL_SET_ERR_MSG_FMT(extack, "All the leaves shapers must have the same old parent");
+ return -EINVAL;
+ }
+ }
+
+ if (leaves_count > 0)
+ node->parent = leaves[0].parent;
+ }
+
+ } else {
+ net_shaper_default_parent(node_handle, &node->parent);
+ }
+
+ if (node->parent.scope == NET_SHAPER_SCOPE_NODE) {
+ parent = net_shaper_cache_lookup(binding, &node->parent);
+ if (!parent) {
+ NL_SET_ERR_MSG_FMT(extack, "Node parent shaper %d:%d does not exists",
+ node->parent.scope, node->parent.id);
+ return -ENOENT;
+ }
+ }
+
+ /* For newly created node scope shaper, the following will update
+ * the handle, due to id allocation.
+ */
+ ret = net_shaper_cache_pre_insert(binding, node_handle, extack);
+ if (ret)
+ return ret;
+
+ for (i = 0; i < leaves_count; ++i) {
+ leaf_handle = leaves_handles[i];
+
+ ret = net_shaper_cache_pre_insert(binding, &leaf_handle,
+ extack);
+ if (ret)
+ goto rollback;
+
+ if (leaves[i].parent.scope == node_handle->scope &&
+ leaves[i].parent.id == node_handle->id)
+ continue;
+
+ /* The leaves shapers will be nested to the node, update the
+ * linking accordingly.
+ */
+ leaves[i].parent = *node_handle;
+ node->leaves++;
+ }
+
+ ret = ops->group(binding, leaves_count, leaves_handles, leaves,
+ node_handle, node, extack);
+ if (ret < 0)
+ goto rollback;
+
+ if (parent)
+ parent->leaves++;
+ net_shaper_cache_commit(binding, 1, node_handle, node);
+ net_shaper_cache_commit(binding, leaves_count, leaves_handles, leaves);
+ return 0;
+
+rollback:
+ net_shaper_cache_rollback(binding);
+ return ret;
+}
+
static int net_shaper_delete(struct net_shaper_binding *binding,
const struct net_shaper_handle *handle,
struct netlink_ext_ack *extack)
@@ -756,6 +944,162 @@ int net_shaper_nl_delete_doit(struct sk_buff *skb, struct genl_info *info)
return net_shaper_delete(binding, &handle, info->extack);
}
+/* Update the H/W and on success update the local cache, too */
+static int net_shaper_group(struct net_shaper_binding *binding,
+ int leaves_count,
+ const struct net_shaper_handle *leaves_handles,
+ struct net_shaper_info *leaves,
+ struct net_shaper_handle *node_handle,
+ struct net_shaper_info *node,
+ struct netlink_ext_ack *extack)
+{
+ struct net_shaper_data *data = net_shaper_cache_init(binding, extack);
+ struct net_shaper_handle *old_nodes;
+ int i, ret, old_nodes_count = 0;
+
+ if (!data)
+ return -ENOMEM;
+
+ old_nodes = kcalloc(leaves_count, sizeof(struct net_shaper_handle),
+ GFP_KERNEL);
+ if (!old_nodes)
+ return -ENOMEM;
+
+ for (i = 0; i < leaves_count; i++)
+ if (leaves[i].parent.scope == NET_SHAPER_SCOPE_NODE &&
+ (leaves[i].parent.scope != node_handle->scope ||
+ leaves[i].parent.id != node_handle->id))
+ old_nodes[old_nodes_count++] = leaves[i].parent;
+
+ mutex_lock(&data->lock);
+ ret = __net_shaper_group(binding, leaves_count, leaves_handles,
+ leaves, node_handle, node, extack);
+
+ /* Check if we need to delete any NODE left alone by the new leaves
+ * linkage.
+ */
+ for (i = 0; i < old_nodes_count; ++i) {
+ node = net_shaper_cache_lookup(binding, &old_nodes[i]);
+ if (!node)
+ continue;
+
+ if (--node->leaves > 0)
+ continue;
+
+ /* Errors here are not fatal: the grouping operation is
+ * completed, and user-space can still explicitly clean-up
+ * left-over nodes.
+ */
+ __net_shaper_delete(binding, &old_nodes[i], node, extack);
+ }
+
+ mutex_unlock(&data->lock);
+
+ kfree(old_nodes);
+ return ret;
+}
+
+static int net_shaper_group_send_reply(struct genl_info *info,
+ struct net_shaper_handle *handle)
+{
+ struct net_shaper_binding *binding = info->user_ptr[0];
+ struct sk_buff *msg;
+ int ret = -EMSGSIZE;
+ void *hdr;
+
+ /* Prepare the msg reply in advance, to avoid device operation
+ * rollback.
+ */
+ msg = genlmsg_new(net_shaper_handle_size(), GFP_KERNEL);
+ if (!msg)
+ return ret;
+
+ hdr = genlmsg_iput(msg, info);
+ if (!hdr)
+ goto free_msg;
+
+ if (net_shaper_fill_binding(msg, binding, NET_SHAPER_A_IFINDEX))
+ goto free_msg;
+
+ if (net_shaper_fill_handle(msg, handle, NET_SHAPER_A_HANDLE))
+ goto free_msg;
+
+ genlmsg_end(msg, hdr);
+
+ ret = genlmsg_reply(msg, info);
+ if (ret)
+ goto free_msg;
+
+ return ret;
+
+free_msg:
+ nlmsg_free(msg);
+ return ret;
+}
+
+int net_shaper_nl_group_doit(struct sk_buff *skb, struct genl_info *info)
+{
+ struct net_shaper_handle *leaves_handles, node_handle;
+ struct net_shaper_info *leaves, node;
+ struct net_shaper_binding *binding;
+ int i, ret, rem, leaves_count;
+ struct nlattr *attr;
+
+ if (GENL_REQ_ATTR_CHECK(info, NET_SHAPER_A_LEAVES) ||
+ GENL_REQ_ATTR_CHECK(info, NET_SHAPER_A_NODE))
+ return -EINVAL;
+
+ binding = net_shaper_binding_from_ctx(info->user_ptr[0]);
+ leaves_count = net_shaper_list_len(info, NET_SHAPER_A_LEAVES);
+ leaves = kcalloc(leaves_count, sizeof(struct net_shaper_info) +
+ sizeof(struct net_shaper_handle), GFP_KERNEL);
+ if (!leaves) {
+ GENL_SET_ERR_MSG_FMT(info, "Can't allocate memory for %d leaves shapers",
+ leaves_count);
+ return -ENOMEM;
+ }
+ leaves_handles = (struct net_shaper_handle *)&leaves[leaves_count];
+
+ ret = net_shaper_parse_node(binding, info->attrs[NET_SHAPER_A_NODE],
+ info, &node_handle, &node);
+ if (ret)
+ goto free_shapers;
+
+ i = 0;
+ nla_for_each_attr_type(attr, NET_SHAPER_A_LEAVES,
+ genlmsg_data(info->genlhdr),
+ genlmsg_len(info->genlhdr), rem) {
+ if (WARN_ON_ONCE(i >= leaves_count))
+ goto free_shapers;
+
+ ret = net_shaper_parse_info_nest(binding, attr, info,
+ NET_SHAPER_SCOPE_QUEUE,
+ &leaves_handles[i],
+ &leaves[i]);
+ if (ret)
+ goto free_shapers;
+ i++;
+ }
+
+ ret = net_shaper_group(binding, leaves_count, leaves_handles, leaves,
+ &node_handle, &node, info->extack);
+ if (ret < 0)
+ goto free_shapers;
+
+ ret = net_shaper_group_send_reply(info, &node_handle);
+ if (ret) {
+ /* Error on reply is not fatal to avoid rollback a successful
+ * configuration.
+ */
+ GENL_SET_ERR_MSG_FMT(info, "Can't send reply %d", ret);
+ ret = 0;
+ }
+
+free_shapers:
+ kfree(leaves);
+ return ret;
+}
+
static void net_shaper_flush(struct net_shaper_binding *binding)
{
struct net_shaper_data *data = net_shaper_binding_data(binding);
--
2.45.2
^ permalink raw reply related [flat|nested] 29+ messages in thread* Re: [PATCH v5 net-next 04/12] net-shapers: implement NL group operation
2024-08-29 15:16 ` [PATCH v5 net-next 04/12] net-shapers: implement NL group operation Paolo Abeni
@ 2024-08-30 2:04 ` Jakub Kicinski
2024-08-30 16:48 ` Paolo Abeni
0 siblings, 1 reply; 29+ messages in thread
From: Jakub Kicinski @ 2024-08-30 2:04 UTC (permalink / raw)
To: Paolo Abeni
Cc: netdev, Jiri Pirko, Madhu Chittim, Sridhar Samudrala,
Simon Horman, John Fastabend, Sunil Kovvuri Goutham,
Jamal Hadi Salim, Donald Hunter, anthony.l.nguyen,
przemyslaw.kitszel, intel-wired-lan, edumazet
On Thu, 29 Aug 2024 17:16:57 +0200 Paolo Abeni wrote:
> Allow grouping multiple leaves shaper under the given root.
> The root and the leaves shapers are created, if needed, otherwise
> the existing shapers are re-linked as requested.
>
> Try hard to pre-allocated the needed resources, to avoid non
> trivial H/W configuration rollbacks in case of any failure.
Need to s/root/parent/ the commit message?
> +static int __net_shaper_group(struct net_shaper_binding *binding,
> + int leaves_count,
> + const struct net_shaper_handle *leaves_handles,
> + struct net_shaper_info *leaves,
> + struct net_shaper_handle *node_handle,
> + struct net_shaper_info *node,
> + struct netlink_ext_ack *extack)
> +{
> + const struct net_shaper_ops *ops = net_shaper_binding_ops(binding);
> + struct net_shaper_info *parent = NULL;
> + struct net_shaper_handle leaf_handle;
> + int i, ret;
> +
> + if (node_handle->scope == NET_SHAPER_SCOPE_NODE) {
> + if (node_handle->id != NET_SHAPER_ID_UNSPEC &&
> + !net_shaper_cache_lookup(binding, node_handle)) {
> + NL_SET_ERR_MSG_FMT(extack, "Node shaper %d:%d does not exists",
> + node_handle->scope, node_handle->id);
BAD_ATTR would do?
> + return -ENOENT;
> + }
> +
> + /* When unspecified, the node parent scope is inherited from
> + * the leaves.
> + */
> + if (node->parent.scope == NET_SHAPER_SCOPE_UNSPEC) {
> + for (i = 1; i < leaves_count; ++i) {
> + if (leaves[i].parent.scope !=
> + leaves[0].parent.scope ||
> + leaves[i].parent.id !=
> + leaves[0].parent.id) {
memcmp() ? put a BUILD_BUG_ON(sizeof() != 8) to make sure we double
check it if the struct grows?
> + NL_SET_ERR_MSG_FMT(extack, "All the leaves shapers must have the same old parent");
> + return -EINVAL;
5 indents is too many indents :( maybe make the for loop a helper?
> + }
> + }
> +
> + if (leaves_count > 0)
how can we get here and not have leaves? :o
> + node->parent = leaves[0].parent;
> + }
> +
> + } else {
> + net_shaper_default_parent(node_handle, &node->parent);
> + }
> +static int net_shaper_group_send_reply(struct genl_info *info,
> + struct net_shaper_handle *handle)
> +{
> + struct net_shaper_binding *binding = info->user_ptr[0];
> + struct sk_buff *msg;
> + int ret = -EMSGSIZE;
> + void *hdr;
> +
> + /* Prepare the msg reply in advance, to avoid device operation
> + * rollback.
> + */
> + msg = genlmsg_new(net_shaper_handle_size(), GFP_KERNEL);
> + if (!msg)
> + return ret;
return -ENOMEM;
> +
> + hdr = genlmsg_iput(msg, info);
> + if (!hdr)
> + goto free_msg;
> +
> + if (net_shaper_fill_binding(msg, binding, NET_SHAPER_A_IFINDEX))
> + goto free_msg;
> +
> + if (net_shaper_fill_handle(msg, handle, NET_SHAPER_A_HANDLE))
you can combine the two fill ifs into one with ||
> + goto free_msg;
> +
> + genlmsg_end(msg, hdr);
> +
> + ret = genlmsg_reply(msg, info);
> + if (ret)
> + goto free_msg;
reply always eats the skb, just:
return genlmsg_reply(msg, info);
> +
> + return ret;
> +
> +free_msg:
> + nlmsg_free(msg);
> + return ret;
return -EMSGSIZE;
> +}
> +
> +int net_shaper_nl_group_doit(struct sk_buff *skb, struct genl_info *info)
> +{
> + struct net_shaper_handle *leaves_handles, node_handle;
> + struct net_shaper_info *leaves, node;
> + struct net_shaper_binding *binding;
> + int i, ret, rem, leaves_count;
> + struct nlattr *attr;
> +
> + if (GENL_REQ_ATTR_CHECK(info, NET_SHAPER_A_LEAVES) ||
> + GENL_REQ_ATTR_CHECK(info, NET_SHAPER_A_NODE))
> + return -EINVAL;
> +
> + binding = net_shaper_binding_from_ctx(info->user_ptr[0]);
> + leaves_count = net_shaper_list_len(info, NET_SHAPER_A_LEAVES);
> + leaves = kcalloc(leaves_count, sizeof(struct net_shaper_info) +
> + sizeof(struct net_shaper_handle), GFP_KERNEL);
> + if (!leaves) {
> + GENL_SET_ERR_MSG_FMT(info, "Can't allocate memory for %d leaves shapers",
> + leaves_count);
> + return -ENOMEM;
> + }
> + leaves_handles = (struct net_shaper_handle *)&leaves[leaves_count];
> +
> + ret = net_shaper_parse_node(binding, info->attrs[NET_SHAPER_A_NODE],
> + info, &node_handle, &node);
> + if (ret)
> + goto free_shapers;
> +
> + i = 0;
> + nla_for_each_attr_type(attr, NET_SHAPER_A_LEAVES,
> + genlmsg_data(info->genlhdr),
> + genlmsg_len(info->genlhdr), rem) {
> + if (WARN_ON_ONCE(i >= leaves_count))
> + goto free_shapers;
> +
> + ret = net_shaper_parse_info_nest(binding, attr, info,
> + NET_SHAPER_SCOPE_QUEUE,
> + &leaves_handles[i],
Wouldn't it be convenient to store the handle in the "info" object?
AFAIU the handle is forever for an info, so no risk of it being out
of sync...
> + &leaves[i]);
> + if (ret)
> + goto free_shapers;
> + i++;
> + }
> +
> + ret = net_shaper_group(binding, leaves_count, leaves_handles, leaves,
> + &node_handle, &node, info->extack);
...and it'd be nice if group had 5 rather than 7 params
> + if (ret < 0)
> + goto free_shapers;
> +
> + ret = net_shaper_group_send_reply(info, &node_handle);
> + if (ret) {
> + /* Error on reply is not fatal to avoid rollback a successful
> + * configuration.
Slight issues with the grammar here, but I think it should be fatal.
The sender will most likely block until they get a response.
Not to mention that the caller will not know what the handle
we allocated is.
> + */
> + GENL_SET_ERR_MSG_FMT(info, "Can't send reply %d", ret);
> + ret = 0;
> + }
> +
> +free_shapers:
> + kfree(leaves);
> + return ret;
> +}
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [PATCH v5 net-next 04/12] net-shapers: implement NL group operation
2024-08-30 2:04 ` Jakub Kicinski
@ 2024-08-30 16:48 ` Paolo Abeni
2024-08-30 18:48 ` Jakub Kicinski
0 siblings, 1 reply; 29+ messages in thread
From: Paolo Abeni @ 2024-08-30 16:48 UTC (permalink / raw)
To: Jakub Kicinski
Cc: netdev, Jiri Pirko, Madhu Chittim, Sridhar Samudrala,
Simon Horman, John Fastabend, Sunil Kovvuri Goutham,
Jamal Hadi Salim, Donald Hunter, anthony.l.nguyen,
przemyslaw.kitszel, intel-wired-lan, edumazet
On 8/30/24 04:04, Jakub Kicinski wrote:
>> +static int __net_shaper_group(struct net_shaper_binding *binding,
>> + int leaves_count,
>> + const struct net_shaper_handle *leaves_handles,
>> + struct net_shaper_info *leaves,
>> + struct net_shaper_handle *node_handle,
>> + struct net_shaper_info *node,
>> + struct netlink_ext_ack *extack)
>> +{
>> + const struct net_shaper_ops *ops = net_shaper_binding_ops(binding);
>> + struct net_shaper_info *parent = NULL;
>> + struct net_shaper_handle leaf_handle;
>> + int i, ret;
>> +
>> + if (node_handle->scope == NET_SHAPER_SCOPE_NODE) {
>> + if (node_handle->id != NET_SHAPER_ID_UNSPEC &&
>> + !net_shaper_cache_lookup(binding, node_handle)) {
>> + NL_SET_ERR_MSG_FMT(extack, "Node shaper %d:%d does not exists",
>> + node_handle->scope, node_handle->id);
>
> BAD_ATTR would do?
We can reach here from the delete() op (next patch), there will be no
paired attribute is such case. Even for the group() operation it will
need to push here towards several callers additional context to identify
the attribute, it should be quite ugly, can we keep with ERR_MSG_FMT here?
>> + if (ret < 0)
>> + goto free_shapers;
>> +
>> + ret = net_shaper_group_send_reply(info, &node_handle);
>> + if (ret) {
>> + /* Error on reply is not fatal to avoid rollback a successful
>> + * configuration.
>
> Slight issues with the grammar here, but I think it should be fatal.
> The sender will most likely block until they get a response.
> Not to mention that the caller will not know what the handle
> we allocated is.
You mean we should return a negative error code, and _not_ that we
should additionally attempt a rollback, right? The rollback will be very
difficult at best: at this point destructive action have taken place.
Thanks,
Paolo
^ permalink raw reply [flat|nested] 29+ messages in thread* Re: [PATCH v5 net-next 04/12] net-shapers: implement NL group operation
2024-08-30 16:48 ` Paolo Abeni
@ 2024-08-30 18:48 ` Jakub Kicinski
0 siblings, 0 replies; 29+ messages in thread
From: Jakub Kicinski @ 2024-08-30 18:48 UTC (permalink / raw)
To: Paolo Abeni
Cc: netdev, Jiri Pirko, Madhu Chittim, Sridhar Samudrala,
Simon Horman, John Fastabend, Sunil Kovvuri Goutham,
Jamal Hadi Salim, Donald Hunter, anthony.l.nguyen,
przemyslaw.kitszel, intel-wired-lan, edumazet
On Fri, 30 Aug 2024 18:48:41 +0200 Paolo Abeni wrote:
> >> + const struct net_shaper_ops *ops = net_shaper_binding_ops(binding);
> >> + struct net_shaper_info *parent = NULL;
> >> + struct net_shaper_handle leaf_handle;
> >> + int i, ret;
> >> +
> >> + if (node_handle->scope == NET_SHAPER_SCOPE_NODE) {
> >> + if (node_handle->id != NET_SHAPER_ID_UNSPEC &&
> >> + !net_shaper_cache_lookup(binding, node_handle)) {
> >> + NL_SET_ERR_MSG_FMT(extack, "Node shaper %d:%d does not exists",
> >> + node_handle->scope, node_handle->id);
> >
> > BAD_ATTR would do?
>
> We can reach here from the delete() op (next patch), there will be no
> paired attribute is such case. Even for the group() operation it will
> need to push here towards several callers additional context to identify
> the attribute, it should be quite ugly, can we keep with ERR_MSG_FMT here?
Alright. But TBH I haven't grasped the semantics of how you use UNSPEC.
So I reserve the right to complain again in v6 if I think of a better
way ;)
> >> + if (ret < 0)
> >> + goto free_shapers;
> >> +
> >> + ret = net_shaper_group_send_reply(info, &node_handle);
> >> + if (ret) {
> >> + /* Error on reply is not fatal to avoid rollback a successful
> >> + * configuration.
> >
> > Slight issues with the grammar here, but I think it should be fatal.
> > The sender will most likely block until they get a response.
> > Not to mention that the caller will not know what the handle
> > we allocated is.
>
> You mean we should return a negative error code, and _not_ that we
> should additionally attempt a rollback, right? The rollback will be very
> difficult at best: at this point destructive action have taken place.
net_shaper_group_send_reply() does a bit too much, TBH.
Given the rollback complexity propagating the failure just
from genlmsg_reply() is fine. I think the only case it fails
is if the socket is congested, which is in senders control.
But genlmsg_new() can be done before we start. And we should
size the skb so that nla_puts sever fail (just pop a WARN_ON()
on their error path, to make sure we catch it if they grow,
I don't think they can fail with your current code).
^ permalink raw reply [flat|nested] 29+ messages in thread
* [PATCH v5 net-next 05/12] net-shapers: implement delete support for NODE scope shaper
2024-08-29 15:16 [PATCH v5 net-next 00/12] net: introduce TX H/W shaping API Paolo Abeni
` (3 preceding siblings ...)
2024-08-29 15:16 ` [PATCH v5 net-next 04/12] net-shapers: implement NL group operation Paolo Abeni
@ 2024-08-29 15:16 ` Paolo Abeni
2024-08-29 15:16 ` [PATCH v5 net-next 06/12] netlink: spec: add shaper introspection support Paolo Abeni
` (6 subsequent siblings)
11 siblings, 0 replies; 29+ messages in thread
From: Paolo Abeni @ 2024-08-29 15:16 UTC (permalink / raw)
To: netdev
Cc: Jakub Kicinski, Jiri Pirko, Madhu Chittim, Sridhar Samudrala,
Simon Horman, John Fastabend, Sunil Kovvuri Goutham,
Jamal Hadi Salim, Donald Hunter, anthony.l.nguyen,
przemyslaw.kitszel, intel-wired-lan, edumazet
Leverage the previously introduced group operation to implement
the removal of NODE scope shaper, re-linking its leaves under the
the parent node before actually deleting the specified NODE scope
shaper.
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
v4 -> v5:
- replace net_device* with binding* in most helpers
---
net/shaper/shaper.c | 99 +++++++++++++++++++++++++++++++++++++++------
1 file changed, 87 insertions(+), 12 deletions(-)
diff --git a/net/shaper/shaper.c b/net/shaper/shaper.c
index f5e8464b8408..f0d594a34588 100644
--- a/net/shaper/shaper.c
+++ b/net/shaper/shaper.c
@@ -799,7 +799,7 @@ static int __net_shaper_delete(struct net_shaper_binding *binding,
}
static int __net_shaper_group(struct net_shaper_binding *binding,
- int leaves_count,
+ bool cache_node, int leaves_count,
const struct net_shaper_handle *leaves_handles,
struct net_shaper_info *leaves,
struct net_shaper_handle *node_handle,
@@ -850,12 +850,15 @@ static int __net_shaper_group(struct net_shaper_binding *binding,
}
}
- /* For newly created node scope shaper, the following will update
- * the handle, due to id allocation.
- */
- ret = net_shaper_cache_pre_insert(binding, node_handle, extack);
- if (ret)
- return ret;
+ if (cache_node) {
+ /* For newly created node scope shaper, the following will
+ * update the handle, due to id allocation.
+ */
+ ret = net_shaper_cache_pre_insert(binding, node_handle,
+ extack);
+ if (ret)
+ return ret;
+ }
for (i = 0; i < leaves_count; ++i) {
leaf_handle = leaves_handles[i];
@@ -883,7 +886,8 @@ static int __net_shaper_group(struct net_shaper_binding *binding,
if (parent)
parent->leaves++;
- net_shaper_cache_commit(binding, 1, node_handle, node);
+ if (cache_node)
+ net_shaper_cache_commit(binding, 1, node_handle, node);
net_shaper_cache_commit(binding, leaves_count, leaves_handles, leaves);
return 0;
@@ -892,6 +896,76 @@ static int __net_shaper_group(struct net_shaper_binding *binding,
return ret;
}
+static int __net_shaper_pre_del_node(struct net_shaper_binding *binding,
+ const struct net_shaper_handle *handle,
+ const struct net_shaper_info *shaper,
+ struct netlink_ext_ack *extack)
+{
+ struct net_shaper_data *data = net_shaper_binding_data(binding);
+ struct net_shaper_handle *leaves_handles, node_handle;
+ struct net_shaper_info *cur, *leaves, node = {};
+ int ret, leaves_count = 0;
+ unsigned long index;
+ bool cache_node;
+
+ if (!shaper->leaves)
+ return 0;
+
+ if (WARN_ON_ONCE(!data))
+ return -EINVAL;
+
+ /* Fetch the new node information. */
+ node_handle = shaper->parent;
+ cur = net_shaper_cache_lookup(binding, &node_handle);
+ if (cur) {
+ node = *cur;
+ } else {
+ /* A scope NODE shaper can be nested only to the NETDEV scope
+ * shaper without creating the latter, this check may fail only
+ * if the cache is in inconsistent status.
+ */
+ if (WARN_ON_ONCE(node_handle.scope != NET_SHAPER_SCOPE_NETDEV))
+ return -EINVAL;
+ }
+
+ leaves = kcalloc(shaper->leaves,
+ sizeof(struct net_shaper_info) +
+ sizeof(struct net_shaper_handle), GFP_KERNEL);
+ if (!leaves)
+ return -ENOMEM;
+
+ leaves_handles = (struct net_shaper_handle *)&leaves[shaper->leaves];
+
+ /* Build the leaves arrays. */
+ xa_for_each(&data->shapers, index, cur) {
+ if (cur->parent.scope != handle->scope ||
+ cur->parent.id != handle->id)
+ continue;
+
+ if (WARN_ON_ONCE(leaves_count == shaper->leaves)) {
+ ret = -EINVAL;
+ goto free;
+ }
+
+ net_shaper_index_to_handle(index,
+ &leaves_handles[leaves_count]);
+ leaves[leaves_count++] = *cur;
+ }
+
+ /* When re-linking to the netdev shaper, avoid the eventual, implicit,
+ * creation of the new node, would be surprising since the user is
+ * doing a delete operation.
+ */
+ cache_node = node_handle.scope != NET_SHAPER_SCOPE_NETDEV;
+ ret = __net_shaper_group(binding, cache_node, leaves_count,
+ leaves_handles, leaves, &node_handle, &node,
+ extack);
+
+free:
+ kfree(leaves);
+ return ret;
+}
+
static int net_shaper_delete(struct net_shaper_binding *binding,
const struct net_shaper_handle *handle,
struct netlink_ext_ack *extack)
@@ -914,9 +988,10 @@ static int net_shaper_delete(struct net_shaper_binding *binding,
}
if (handle->scope == NET_SHAPER_SCOPE_NODE) {
- /* TODO: implement support for scope NODE delete. */
- ret = -EINVAL;
- goto unlock;
+ ret = __net_shaper_pre_del_node(binding, handle, shaper,
+ extack);
+ if (ret)
+ goto unlock;
}
ret = __net_shaper_delete(binding, handle, shaper, extack);
@@ -972,7 +1047,7 @@ static int net_shaper_group(struct net_shaper_binding *binding,
old_nodes[old_nodes_count++] = leaves[i].parent;
mutex_lock(&data->lock);
- ret = __net_shaper_group(binding, leaves_count, leaves_handles,
+ ret = __net_shaper_group(binding, true, leaves_count, leaves_handles,
leaves, node_handle, node, extack);
/* Check if we need to delete any NODE left alone by the new leaves
--
2.45.2
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH v5 net-next 06/12] netlink: spec: add shaper introspection support
2024-08-29 15:16 [PATCH v5 net-next 00/12] net: introduce TX H/W shaping API Paolo Abeni
` (4 preceding siblings ...)
2024-08-29 15:16 ` [PATCH v5 net-next 05/12] net-shapers: implement delete support for NODE scope shaper Paolo Abeni
@ 2024-08-29 15:16 ` Paolo Abeni
2024-08-29 15:17 ` [PATCH v5 net-next 07/12] net: shaper: implement " Paolo Abeni
` (5 subsequent siblings)
11 siblings, 0 replies; 29+ messages in thread
From: Paolo Abeni @ 2024-08-29 15:16 UTC (permalink / raw)
To: netdev
Cc: Jakub Kicinski, Jiri Pirko, Madhu Chittim, Sridhar Samudrala,
Simon Horman, John Fastabend, Sunil Kovvuri Goutham,
Jamal Hadi Salim, Donald Hunter, anthony.l.nguyen,
przemyslaw.kitszel, intel-wired-lan, edumazet
Allow the user-space to fine-grain query the shaping features
supported by the NIC on each domain.
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
v4 -> v5:
- added pre/post helpers for dump op
---
Documentation/netlink/specs/net_shaper.yaml | 88 +++++++++++++++++++++
include/uapi/linux/net_shaper.h | 17 ++++
net/shaper/shaper.c | 32 ++++++++
net/shaper/shaper_nl_gen.c | 29 +++++++
net/shaper/shaper_nl_gen.h | 10 +++
5 files changed, 176 insertions(+)
diff --git a/Documentation/netlink/specs/net_shaper.yaml b/Documentation/netlink/specs/net_shaper.yaml
index ae40bd17c39c..fea296318468 100644
--- a/Documentation/netlink/specs/net_shaper.yaml
+++ b/Documentation/netlink/specs/net_shaper.yaml
@@ -27,6 +27,11 @@ doc: |
The user can query the running configuration via the @get operation.
+ Different devices can provide different feature sets, e.g. with no
+ support for complex scheduling hierarchy, or for some shaping
+ parameters. The user can introspect the HW capabilities via the
+ @cap-get operation.
+
definitions:
-
type: enum
@@ -191,6 +196,53 @@ attribute-sets:
name: priority
-
name: weight
+ -
+ name: capabilities
+ attributes:
+ -
+ name: ifindex
+ type: u32
+ doc: Interface index queried for shapers capabilities.
+ -
+ name: scope
+ type: u32
+ enum: scope
+ doc: The scope to which the queried capabilities apply.
+ -
+ name: support-metric-bps
+ type: flag
+ doc: The device accepts 'bps' metric for bw-min, bw-max and burst.
+ -
+ name: support-metric-pps
+ type: flag
+ doc: The device accepts 'pps' metric for bw-min, bw-max and burst.
+ -
+ name: support-nesting
+ type: flag
+ doc: |
+ The device supports nesting shaper belonging to this scope
+ below 'node' scoped shapers. Only 'queue' and 'node'
+ scope can have flag 'support-nesting'.
+ -
+ name: support-bw-min
+ type: flag
+ doc: The device supports a minimum guaranteed B/W.
+ -
+ name: support-bw-max
+ type: flag
+ doc: The device supports maximum B/W shaping.
+ -
+ name: support-burst
+ type: flag
+ doc: The device supports a maximum burst size.
+ -
+ name: support-priority
+ type: flag
+ doc: The device supports priority scheduling.
+ -
+ name: support-weight
+ type: flag
+ doc: The device supports weighted round robin scheduling.
operations:
list:
@@ -301,3 +353,39 @@ operations:
- node
reply:
attributes: *ns-binding
+
+ -
+ name: cap-get
+ doc: |
+ Get the shaper capabilities supported by the given device
+ for the specified scope.
+ attribute-set: capabilities
+
+ do:
+ pre: net-shaper-nl-cap-pre-doit
+ post: net-shaper-nl-cap-post-doit
+ request:
+ attributes:
+ - ifindex
+ - scope
+ reply:
+ attributes: &cap-attrs
+ - ifindex
+ - scope
+ - support-metric-bps
+ - support-metric-pps
+ - support-nesting
+ - support-bw-min
+ - support-bw-max
+ - support-burst
+ - support-priority
+ - support-weight
+
+ dump:
+ pre: net-shaper-nl-cap-pre-dumpit
+ post: net-shaper-nl-cap-post-dumpit
+ request:
+ attributes:
+ - ifindex
+ reply:
+ attributes: *cap-attrs
diff --git a/include/uapi/linux/net_shaper.h b/include/uapi/linux/net_shaper.h
index 03c774a2bec1..c0112119ca2a 100644
--- a/include/uapi/linux/net_shaper.h
+++ b/include/uapi/linux/net_shaper.h
@@ -67,11 +67,28 @@ enum {
NET_SHAPER_A_HANDLE_MAX = (__NET_SHAPER_A_HANDLE_MAX - 1)
};
+enum {
+ NET_SHAPER_A_CAPABILITIES_IFINDEX = 1,
+ NET_SHAPER_A_CAPABILITIES_SCOPE,
+ NET_SHAPER_A_CAPABILITIES_SUPPORT_METRIC_BPS,
+ NET_SHAPER_A_CAPABILITIES_SUPPORT_METRIC_PPS,
+ NET_SHAPER_A_CAPABILITIES_SUPPORT_NESTING,
+ NET_SHAPER_A_CAPABILITIES_SUPPORT_BW_MIN,
+ NET_SHAPER_A_CAPABILITIES_SUPPORT_BW_MAX,
+ NET_SHAPER_A_CAPABILITIES_SUPPORT_BURST,
+ NET_SHAPER_A_CAPABILITIES_SUPPORT_PRIORITY,
+ NET_SHAPER_A_CAPABILITIES_SUPPORT_WEIGHT,
+
+ __NET_SHAPER_A_CAPABILITIES_MAX,
+ NET_SHAPER_A_CAPABILITIES_MAX = (__NET_SHAPER_A_CAPABILITIES_MAX - 1)
+};
+
enum {
NET_SHAPER_CMD_GET = 1,
NET_SHAPER_CMD_SET,
NET_SHAPER_CMD_DELETE,
NET_SHAPER_CMD_GROUP,
+ NET_SHAPER_CMD_CAP_GET,
__NET_SHAPER_CMD_MAX,
NET_SHAPER_CMD_MAX = (__NET_SHAPER_CMD_MAX - 1)
diff --git a/net/shaper/shaper.c b/net/shaper/shaper.c
index f0d594a34588..98e17a95f39f 100644
--- a/net/shaper/shaper.c
+++ b/net/shaper/shaper.c
@@ -626,6 +626,27 @@ int net_shaper_nl_post_dumpit(struct netlink_callback *cb)
return 0;
}
+int net_shaper_nl_cap_pre_doit(const struct genl_split_ops *ops,
+ struct sk_buff *skb, struct genl_info *info)
+{
+ return -EOPNOTSUPP;
+}
+
+void net_shaper_nl_cap_post_doit(const struct genl_split_ops *ops,
+ struct sk_buff *skb, struct genl_info *info)
+{
+}
+
+int net_shaper_nl_cap_pre_dumpit(struct netlink_callback *cb)
+{
+ return -EOPNOTSUPP;
+}
+
+int net_shaper_nl_cap_post_dumpit(struct netlink_callback *cb)
+{
+ return -EOPNOTSUPP;
+}
+
int net_shaper_nl_get_doit(struct sk_buff *skb, struct genl_info *info)
{
struct net_shaper_binding *binding;
@@ -1175,6 +1196,17 @@ int net_shaper_nl_group_doit(struct sk_buff *skb, struct genl_info *info)
return ret;
}
+int net_shaper_nl_cap_get_doit(struct sk_buff *skb, struct genl_info *info)
+{
+ return 0;
+}
+
+int net_shaper_nl_cap_get_dumpit(struct sk_buff *skb,
+ struct netlink_callback *cb)
+{
+ return 0;
+}
+
static void net_shaper_flush(struct net_shaper_binding *binding)
{
struct net_shaper_data *data = net_shaper_binding_data(binding);
diff --git a/net/shaper/shaper_nl_gen.c b/net/shaper/shaper_nl_gen.c
index 06641811bfc1..0c7b026d3066 100644
--- a/net/shaper/shaper_nl_gen.c
+++ b/net/shaper/shaper_nl_gen.c
@@ -67,6 +67,17 @@ static const struct nla_policy net_shaper_group_nl_policy[NET_SHAPER_A_NODE + 1]
[NET_SHAPER_A_NODE] = NLA_POLICY_NESTED(net_shaper_node_info_nl_policy),
};
+/* NET_SHAPER_CMD_CAP_GET - do */
+static const struct nla_policy net_shaper_cap_get_do_nl_policy[NET_SHAPER_A_CAPABILITIES_SCOPE + 1] = {
+ [NET_SHAPER_A_CAPABILITIES_IFINDEX] = { .type = NLA_U32, },
+ [NET_SHAPER_A_CAPABILITIES_SCOPE] = NLA_POLICY_MAX(NLA_U32, 3),
+};
+
+/* NET_SHAPER_CMD_CAP_GET - dump */
+static const struct nla_policy net_shaper_cap_get_dump_nl_policy[NET_SHAPER_A_CAPABILITIES_IFINDEX + 1] = {
+ [NET_SHAPER_A_CAPABILITIES_IFINDEX] = { .type = NLA_U32, },
+};
+
/* Ops table for net_shaper */
static const struct genl_split_ops net_shaper_nl_ops[] = {
{
@@ -114,6 +125,24 @@ static const struct genl_split_ops net_shaper_nl_ops[] = {
.maxattr = NET_SHAPER_A_NODE,
.flags = GENL_ADMIN_PERM | GENL_CMD_CAP_DO,
},
+ {
+ .cmd = NET_SHAPER_CMD_CAP_GET,
+ .pre_doit = net_shaper_nl_cap_pre_doit,
+ .doit = net_shaper_nl_cap_get_doit,
+ .post_doit = net_shaper_nl_cap_post_doit,
+ .policy = net_shaper_cap_get_do_nl_policy,
+ .maxattr = NET_SHAPER_A_CAPABILITIES_SCOPE,
+ .flags = GENL_CMD_CAP_DO,
+ },
+ {
+ .cmd = NET_SHAPER_CMD_CAP_GET,
+ .start = net_shaper_nl_cap_pre_dumpit,
+ .dumpit = net_shaper_nl_cap_get_dumpit,
+ .done = net_shaper_nl_cap_post_dumpit,
+ .policy = net_shaper_cap_get_dump_nl_policy,
+ .maxattr = NET_SHAPER_A_CAPABILITIES_IFINDEX,
+ .flags = GENL_CMD_CAP_DUMP,
+ },
};
struct genl_family net_shaper_nl_family __ro_after_init = {
diff --git a/net/shaper/shaper_nl_gen.h b/net/shaper/shaper_nl_gen.h
index 0fe95a03f1b5..557c0c63f125 100644
--- a/net/shaper/shaper_nl_gen.h
+++ b/net/shaper/shaper_nl_gen.h
@@ -18,17 +18,27 @@ extern const struct nla_policy net_shaper_node_info_nl_policy[NET_SHAPER_A_PAREN
int net_shaper_nl_pre_doit(const struct genl_split_ops *ops,
struct sk_buff *skb, struct genl_info *info);
+int net_shaper_nl_cap_pre_doit(const struct genl_split_ops *ops,
+ struct sk_buff *skb, struct genl_info *info);
void
net_shaper_nl_post_doit(const struct genl_split_ops *ops, struct sk_buff *skb,
struct genl_info *info);
+void
+net_shaper_nl_cap_post_doit(const struct genl_split_ops *ops,
+ struct sk_buff *skb, struct genl_info *info);
int net_shaper_nl_pre_dumpit(struct netlink_callback *cb);
+int net_shaper_nl_cap_pre_dumpit(struct netlink_callback *cb);
int net_shaper_nl_post_dumpit(struct netlink_callback *cb);
+int net_shaper_nl_cap_post_dumpit(struct netlink_callback *cb);
int net_shaper_nl_get_doit(struct sk_buff *skb, struct genl_info *info);
int net_shaper_nl_get_dumpit(struct sk_buff *skb, struct netlink_callback *cb);
int net_shaper_nl_set_doit(struct sk_buff *skb, struct genl_info *info);
int net_shaper_nl_delete_doit(struct sk_buff *skb, struct genl_info *info);
int net_shaper_nl_group_doit(struct sk_buff *skb, struct genl_info *info);
+int net_shaper_nl_cap_get_doit(struct sk_buff *skb, struct genl_info *info);
+int net_shaper_nl_cap_get_dumpit(struct sk_buff *skb,
+ struct netlink_callback *cb);
extern struct genl_family net_shaper_nl_family;
--
2.45.2
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH v5 net-next 07/12] net: shaper: implement introspection support
2024-08-29 15:16 [PATCH v5 net-next 00/12] net: introduce TX H/W shaping API Paolo Abeni
` (5 preceding siblings ...)
2024-08-29 15:16 ` [PATCH v5 net-next 06/12] netlink: spec: add shaper introspection support Paolo Abeni
@ 2024-08-29 15:17 ` Paolo Abeni
2024-08-30 2:11 ` Jakub Kicinski
2024-08-29 15:17 ` [PATCH v5 net-next 08/12] testing: net-drv: add basic shaper test Paolo Abeni
` (4 subsequent siblings)
11 siblings, 1 reply; 29+ messages in thread
From: Paolo Abeni @ 2024-08-29 15:17 UTC (permalink / raw)
To: netdev
Cc: Jakub Kicinski, Jiri Pirko, Madhu Chittim, Sridhar Samudrala,
Simon Horman, John Fastabend, Sunil Kovvuri Goutham,
Jamal Hadi Salim, Donald Hunter, anthony.l.nguyen,
przemyslaw.kitszel, intel-wired-lan, edumazet
The netlink op is a simple wrapper around the device callback.
Extend the existing fetch_dev() helper adding an attribute argument
for the requested device. Reuse such helper in the newly implemented
operation.
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
v4 -> v5:
- replace net_device* with binding* in most functions
- de-deplicate some code thanks to more generic helpers in previous
patches
v3 -> v4:
- another dev_put() -> netdev_put() conversion, missed in previous
iteration
RFC v2 -> v3:
- dev_put() -> netdev_put()
---
net/shaper/shaper.c | 96 +++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 93 insertions(+), 3 deletions(-)
diff --git a/net/shaper/shaper.c b/net/shaper/shaper.c
index 98e17a95f39f..b7e5a3990328 100644
--- a/net/shaper/shaper.c
+++ b/net/shaper/shaper.c
@@ -629,22 +629,29 @@ int net_shaper_nl_post_dumpit(struct netlink_callback *cb)
int net_shaper_nl_cap_pre_doit(const struct genl_split_ops *ops,
struct sk_buff *skb, struct genl_info *info)
{
- return -EOPNOTSUPP;
+ return net_shaper_generic_pre(info, NET_SHAPER_A_CAPABILITIES_IFINDEX);
}
void net_shaper_nl_cap_post_doit(const struct genl_split_ops *ops,
struct sk_buff *skb, struct genl_info *info)
{
+ net_shaper_generic_post(info);
}
int net_shaper_nl_cap_pre_dumpit(struct netlink_callback *cb)
{
- return -EOPNOTSUPP;
+ struct net_shaper_nl_ctx *ctx = (struct net_shaper_nl_ctx *)cb->ctx;
+
+ return net_shaper_ctx_init(genl_info_dump(cb),
+ NET_SHAPER_A_CAPABILITIES_IFINDEX, ctx);
}
int net_shaper_nl_cap_post_dumpit(struct netlink_callback *cb)
{
- return -EOPNOTSUPP;
+ struct net_shaper_nl_ctx *ctx = (struct net_shaper_nl_ctx *)cb->ctx;
+
+ net_shaper_ctx_cleanup(ctx);
+ return 0;
}
int net_shaper_nl_get_doit(struct sk_buff *skb, struct genl_info *info)
@@ -1196,14 +1203,97 @@ int net_shaper_nl_group_doit(struct sk_buff *skb, struct genl_info *info)
return ret;
}
+static int
+net_shaper_cap_fill_one(struct sk_buff *msg,
+ struct net_shaper_binding *binding,
+ enum net_shaper_scope scope, unsigned long flags,
+ const struct genl_info *info)
+{
+ unsigned long cur;
+ void *hdr;
+
+ hdr = genlmsg_iput(msg, info);
+ if (!hdr)
+ return -EMSGSIZE;
+
+ if (net_shaper_fill_binding(msg, binding,
+ NET_SHAPER_A_CAPABILITIES_IFINDEX) ||
+ nla_put_u32(msg, NET_SHAPER_A_CAPABILITIES_SCOPE, scope))
+ goto nla_put_failure;
+
+ for (cur = NET_SHAPER_A_CAPABILITIES_SUPPORT_METRIC_BPS;
+ cur <= NET_SHAPER_A_CAPABILITIES_MAX; ++cur) {
+ if (flags & BIT(cur) && nla_put_flag(msg, cur))
+ goto nla_put_failure;
+ }
+
+ genlmsg_end(msg, hdr);
+
+ return 0;
+
+nla_put_failure:
+ genlmsg_cancel(msg, hdr);
+ return -EMSGSIZE;
+}
+
int net_shaper_nl_cap_get_doit(struct sk_buff *skb, struct genl_info *info)
{
+ struct net_shaper_binding *binding = info->user_ptr[0];
+ const struct net_shaper_ops *ops;
+ enum net_shaper_scope scope;
+ struct sk_buff *msg;
+ unsigned long flags;
+ int ret;
+
+ if (GENL_REQ_ATTR_CHECK(info, NET_SHAPER_A_CAPABILITIES_SCOPE))
+ return -EINVAL;
+
+ scope = nla_get_u32(info->attrs[NET_SHAPER_A_CAPABILITIES_SCOPE]);
+ ops = net_shaper_binding_ops(binding);
+ ret = ops->capabilities(binding, scope, &flags);
+ if (ret)
+ return ret;
+
+ msg = genlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL);
+ if (!msg)
+ return -ENOMEM;
+
+ ret = net_shaper_cap_fill_one(msg, binding, scope, flags, info);
+ if (ret)
+ goto free_msg;
+
+ ret = genlmsg_reply(msg, info);
+ if (ret)
+ goto free_msg;
return 0;
+
+free_msg:
+ nlmsg_free(msg);
+ return ret;
}
int net_shaper_nl_cap_get_dumpit(struct sk_buff *skb,
struct netlink_callback *cb)
{
+ const struct genl_info *info = genl_info_dump(cb);
+ struct net_shaper_binding *binding;
+ const struct net_shaper_ops *ops;
+ enum net_shaper_scope scope;
+ unsigned long flags;
+ int ret;
+
+ binding = net_shaper_binding_from_ctx(cb->ctx);
+ ops = net_shaper_binding_ops(binding);
+ for (scope = 0; scope <= NET_SHAPER_SCOPE_MAX; ++scope) {
+ if (ops->capabilities(binding, scope, &flags))
+ continue;
+
+ ret = net_shaper_cap_fill_one(skb, binding, scope, flags,
+ info);
+ if (ret)
+ return ret;
+ }
+
return 0;
}
--
2.45.2
^ permalink raw reply related [flat|nested] 29+ messages in thread* Re: [PATCH v5 net-next 07/12] net: shaper: implement introspection support
2024-08-29 15:17 ` [PATCH v5 net-next 07/12] net: shaper: implement " Paolo Abeni
@ 2024-08-30 2:11 ` Jakub Kicinski
0 siblings, 0 replies; 29+ messages in thread
From: Jakub Kicinski @ 2024-08-30 2:11 UTC (permalink / raw)
To: Paolo Abeni
Cc: netdev, Jiri Pirko, Madhu Chittim, Sridhar Samudrala,
Simon Horman, John Fastabend, Sunil Kovvuri Goutham,
Jamal Hadi Salim, Donald Hunter, anthony.l.nguyen,
przemyslaw.kitszel, intel-wired-lan, edumazet
On Thu, 29 Aug 2024 17:17:00 +0200 Paolo Abeni wrote:
> The netlink op is a simple wrapper around the device callback.
>
> Extend the existing fetch_dev() helper adding an attribute argument
> for the requested device. Reuse such helper in the newly implemented
> operation.
It's not just for introspection, it's also for the core to do error
checking. Does something prevent user from installing a PPS shaper
in iavf right now ?
^ permalink raw reply [flat|nested] 29+ messages in thread
* [PATCH v5 net-next 08/12] testing: net-drv: add basic shaper test
2024-08-29 15:16 [PATCH v5 net-next 00/12] net: introduce TX H/W shaping API Paolo Abeni
` (6 preceding siblings ...)
2024-08-29 15:17 ` [PATCH v5 net-next 07/12] net: shaper: implement " Paolo Abeni
@ 2024-08-29 15:17 ` Paolo Abeni
2024-08-29 15:17 ` [PATCH v5 net-next 09/12] virtchnl: support queue rate limit and quanta size configuration Paolo Abeni
` (3 subsequent siblings)
11 siblings, 0 replies; 29+ messages in thread
From: Paolo Abeni @ 2024-08-29 15:17 UTC (permalink / raw)
To: netdev
Cc: Jakub Kicinski, Jiri Pirko, Madhu Chittim, Sridhar Samudrala,
Simon Horman, John Fastabend, Sunil Kovvuri Goutham,
Jamal Hadi Salim, Donald Hunter, anthony.l.nguyen,
przemyslaw.kitszel, intel-wired-lan, edumazet
Leverage a basic/dummy netdevsim implementation to do functional
coverage for NL interface.
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
v4 -> v5:
- updated to new driver API
- more consistent indentation
rfc v1 -> v2:
- added more test-cases WRT nesting and grouping
---
drivers/net/Kconfig | 1 +
drivers/net/netdevsim/netdev.c | 43 +++
tools/testing/selftests/drivers/net/Makefile | 1 +
tools/testing/selftests/drivers/net/shaper.py | 290 ++++++++++++++++++
.../testing/selftests/net/lib/py/__init__.py | 1 +
tools/testing/selftests/net/lib/py/ynl.py | 5 +
6 files changed, 341 insertions(+)
create mode 100755 tools/testing/selftests/drivers/net/shaper.py
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index 9920b3a68ed1..1fd5acdc73c6 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -641,6 +641,7 @@ config NETDEVSIM
depends on PTP_1588_CLOCK_MOCK || PTP_1588_CLOCK_MOCK=n
select NET_DEVLINK
select PAGE_POOL
+ select NET_SHAPER
help
This driver is a developer testing tool and software model that can
be used to test various control path networking APIs, especially
diff --git a/drivers/net/netdevsim/netdev.c b/drivers/net/netdevsim/netdev.c
index 017a6102be0a..3c18191c7448 100644
--- a/drivers/net/netdevsim/netdev.c
+++ b/drivers/net/netdevsim/netdev.c
@@ -22,6 +22,7 @@
#include <net/netdev_queues.h>
#include <net/page_pool/helpers.h>
#include <net/netlink.h>
+#include <net/net_shaper.h>
#include <net/pkt_cls.h>
#include <net/rtnetlink.h>
#include <net/udp_tunnel.h>
@@ -475,6 +476,47 @@ static int nsim_stop(struct net_device *dev)
return 0;
}
+static int nsim_shaper_set(struct net_shaper_binding *binding,
+ const struct net_shaper_handle *handle,
+ const struct net_shaper_info *shaper,
+ struct netlink_ext_ack *extack)
+{
+ return 0;
+}
+
+static int nsim_shaper_del(struct net_shaper_binding *binding,
+ const struct net_shaper_handle *handle,
+ struct netlink_ext_ack *extack)
+{
+ return 0;
+}
+
+static int nsim_shaper_group(struct net_shaper_binding *binding,
+ int leaves_count,
+ const struct net_shaper_handle *leaves_handles,
+ const struct net_shaper_info *leaves,
+ const struct net_shaper_handle *root_handle,
+ const struct net_shaper_info *root,
+ struct netlink_ext_ack *extack)
+{
+ return 0;
+}
+
+static int nsim_shaper_cap(struct net_shaper_binding *binding,
+ enum net_shaper_scope scope,
+ unsigned long *flags)
+{
+ *flags = ULONG_MAX;
+ return 0;
+}
+
+static const struct net_shaper_ops nsim_shaper_ops = {
+ .set = nsim_shaper_set,
+ .delete = nsim_shaper_del,
+ .group = nsim_shaper_group,
+ .capabilities = nsim_shaper_cap,
+};
+
static const struct net_device_ops nsim_netdev_ops = {
.ndo_start_xmit = nsim_start_xmit,
.ndo_set_rx_mode = nsim_set_rx_mode,
@@ -496,6 +538,7 @@ static const struct net_device_ops nsim_netdev_ops = {
.ndo_bpf = nsim_bpf,
.ndo_open = nsim_open,
.ndo_stop = nsim_stop,
+ .net_shaper_ops = &nsim_shaper_ops,
};
static const struct net_device_ops nsim_vf_netdev_ops = {
diff --git a/tools/testing/selftests/drivers/net/Makefile b/tools/testing/selftests/drivers/net/Makefile
index 39fb97a8c1df..25aec5c081df 100644
--- a/tools/testing/selftests/drivers/net/Makefile
+++ b/tools/testing/selftests/drivers/net/Makefile
@@ -9,6 +9,7 @@ TEST_PROGS := \
ping.py \
queues.py \
stats.py \
+ shaper.py
# end of TEST_PROGS
include ../../lib.mk
diff --git a/tools/testing/selftests/drivers/net/shaper.py b/tools/testing/selftests/drivers/net/shaper.py
new file mode 100755
index 000000000000..ed1ceba13915
--- /dev/null
+++ b/tools/testing/selftests/drivers/net/shaper.py
@@ -0,0 +1,290 @@
+#!/usr/bin/env python3
+# SPDX-License-Identifier: GPL-2.0
+
+from lib.py import ksft_run, ksft_exit, ksft_eq, ksft_true, KsftSkipEx
+from lib.py import NetshaperFamily
+from lib.py import NetDrvEnv
+from lib.py import NlError
+from lib.py import cmd
+import glob
+import sys
+
+def get_shapers(cfg, nl_shaper) -> None:
+ try:
+ shapers = nl_shaper.get({'ifindex': cfg.ifindex},
+ dump=True)
+ except NlError as e:
+ if e.error == 95:
+ raise KsftSkipEx("shapers not supported by the device")
+ raise
+
+ # Default configuration: no shapers configured.
+ ksft_eq(len(shapers), 0)
+
+def get_caps(cfg, nl_shaper) -> None:
+ try:
+ caps = nl_shaper.cap_get({'ifindex': cfg.ifindex},
+ dump=True)
+ except NlError as e:
+ if e.error == 95:
+ raise KsftSkipEx("shapers not supported by the device")
+ raise
+
+ # Each device implementing shaper support must support some
+ # features in at least a scope.
+ ksft_true(len(caps)> 0)
+
+def set_qshapers(cfg, nl_shaper) -> None:
+ try:
+ caps = nl_shaper.cap_get({'ifindex': cfg.ifindex,
+ 'scope':'queue'})
+ except NlError as e:
+ if e.error == 95:
+ cfg.queues = False;
+ raise KsftSkipEx("shapers not supported by the device")
+ raise
+ if not 'support-bw-max' in caps or not 'support-metric-bps' in caps:
+ raise KsftSkipEx("device does not support queue scope shapers with bw_max and metric bps")
+
+ nl_shaper.set({'ifindex': cfg.ifindex,
+ 'shaper': {'handle': {'scope': 'queue', 'id': 1},
+ 'metric': 'bps',
+ 'bw-max': 10000}})
+ nl_shaper.set({'ifindex': cfg.ifindex,
+ 'shaper': {'handle': {'scope': 'queue', 'id': 2},
+ 'metric': 'bps',
+ 'bw-max': 20000}})
+
+ # Querying a specific shaper not yet configured must fail.
+ raised = False
+ try:
+ shaper_q0 = nl_shaper.get({'ifindex': cfg.ifindex,
+ 'handle': {'scope': 'queue', 'id': 0}})
+ except (NlError):
+ raised = True
+ ksft_eq(raised, True)
+
+ shaper_q1 = nl_shaper.get({'ifindex': cfg.ifindex,
+ 'handle': {'scope': 'queue', 'id': 1}})
+ ksft_eq(shaper_q1, {'ifindex': cfg.ifindex,
+ 'parent': {'scope': 'netdev'},
+ 'handle': {'scope': 'queue', 'id': 1},
+ 'metric': 'bps',
+ 'bw-max': 10000})
+
+ shapers = nl_shaper.get({'ifindex': cfg.ifindex},
+ dump=True)
+ ksft_eq(shapers, [{'ifindex': cfg.ifindex,
+ 'parent': {'scope': 'netdev'},
+ 'handle': {'scope': 'queue', 'id': 1},
+ 'metric': 'bps',
+ 'bw-max': 10000},
+ {'ifindex': cfg.ifindex,
+ 'parent': {'scope': 'netdev'},
+ 'handle': {'scope': 'queue', 'id': 2},
+ 'metric': 'bps',
+ 'bw-max': 20000}])
+
+def del_qshapers(cfg, nl_shaper) -> None:
+ if not cfg.queues:
+ raise KsftSkipEx("queue shapers not supported by device, skipping delete")
+
+ nl_shaper.delete({'ifindex': cfg.ifindex,
+ 'handle': {'scope': 'queue', 'id': 2}})
+ nl_shaper.delete({'ifindex': cfg.ifindex,
+ 'handle': {'scope': 'queue', 'id': 1}})
+ shapers = nl_shaper.get({'ifindex': cfg.ifindex},
+ dump=True)
+ ksft_eq(len(shapers), 0)
+
+def set_nshapers(cfg, nl_shaper) -> None:
+ # Check required features.
+ try:
+ caps = nl_shaper.cap_get({'ifindex': cfg.ifindex,
+ 'scope':'netdev'})
+ except NlError as e:
+ if e.error == 95:
+ cfg.netdev = False;
+ raise KsftSkipEx("shapers not supported by the device")
+ raise
+ if not 'support-bw-max' in caps or not 'support-metric-bps' in caps:
+ raise KsftSkipEx("device does not support nested netdev scope shapers with weight")
+
+ nl_shaper.set({'ifindex': cfg.ifindex,
+ 'shaper': {
+ 'handle': {'scope': 'netdev', 'id': 0},
+ 'bw-max': 100000}})
+
+ shapers = nl_shaper.get({'ifindex': cfg.ifindex},
+ dump=True)
+ ksft_eq(shapers, [{'ifindex': cfg.ifindex,
+ 'handle': {'scope': 'netdev'},
+ 'metric': 'bps',
+ 'bw-max': 100000}])
+
+def del_nshapers(cfg, nl_shaper) -> None:
+ if not cfg.netdev:
+ raise KsftSkipEx("netdev shaper not supported by device, skipping delete")
+
+ nl_shaper.delete({'ifindex': cfg.ifindex,
+ 'handle': {'scope': 'netdev'}})
+ shapers = nl_shaper.get({'ifindex': cfg.ifindex},
+ dump=True)
+ ksft_eq(len(shapers), 0)
+
+def basic_groups(cfg, nl_shaper) -> None:
+ if not cfg.netdev:
+ raise KsftSkipEx("netdev shaper not supported by the device")
+ try:
+ caps = nl_shaper.cap_get({'ifindex': cfg.ifindex,
+ 'scope':'queue'})
+ except NlError as e:
+ if e.error == 95:
+ cfg.queues = False;
+ raise KsftSkipEx("shapers not supported by the device")
+ raise
+ if not 'support-weight' in caps:
+ raise KsftSkipEx("device does not support queue scope shapers with weight")
+
+ node_handle = nl_shaper.group({
+ 'ifindex': cfg.ifindex,
+ 'leaves':[{'handle': {'scope': 'queue', 'id': 1},
+ 'weight': 1},
+ {'handle': {'scope': 'queue', 'id': 2},
+ 'weight': 2}],
+ 'node': {'handle': {'scope':'netdev'},
+ 'metric': 'bps',
+ 'bw-max': 10000}})
+ ksft_eq(node_handle, {'ifindex': cfg.ifindex,
+ 'handle': {'scope': 'netdev'}})
+
+ shaper = nl_shaper.get({'ifindex': cfg.ifindex,
+ 'handle': {'scope': 'queue', 'id': 1}})
+ ksft_eq(shaper, {'ifindex': cfg.ifindex,
+ 'parent': {'scope': 'netdev'},
+ 'handle': {'scope': 'queue', 'id': 1},
+ 'weight': 1 })
+
+ nl_shaper.delete({'ifindex': cfg.ifindex,
+ 'handle': {'scope': 'queue', 'id': 2}})
+ nl_shaper.delete({'ifindex': cfg.ifindex,
+ 'handle': {'scope': 'queue', 'id': 1}})
+
+ # Deleting all the leaves shaper does not affect the node one
+ # when the latter has 'netdev' scope.
+ shapers = nl_shaper.get({'ifindex': cfg.ifindex},
+ dump=True)
+ ksft_eq(len(shapers), 1)
+
+ nl_shaper.delete({'ifindex': cfg.ifindex,
+ 'handle': {'scope': 'netdev'}})
+
+def qgroups(cfg, nl_shaper) -> None:
+ try:
+ caps = nl_shaper.cap_get({'ifindex': cfg.ifindex,
+ 'scope':'node'})
+ except NlError as e:
+ if e.error == 95:
+ raise KsftSkipEx("shapers not supported by the device")
+ raise
+ if not 'support-bw-max' in caps or not 'support-metric-bps' in caps:
+ raise KsftSkipEx("device does not support node scope shapers with bw_max and metric bps")
+ try:
+ caps = nl_shaper.cap_get({'ifindex': cfg.ifindex,
+ 'scope':'queue'})
+ except NlError as e:
+ if e.error == 95:
+ raise KsftSkipEx("shapers not supported by the device")
+ raise
+ if not 'support-nesting' in caps or not 'support-weight' in caps or not 'support-metric-bps' in caps:
+ raise KsftSkipEx("device does not support nested queue scope shapers with weight")
+
+ node_handle = nl_shaper.group({
+ 'ifindex': cfg.ifindex,
+ 'leaves':[{'handle': {'scope': 'queue', 'id': 1},
+ 'metric': 'bps', 'weight': 3},
+ {'handle': {'scope': 'queue', 'id': 2},
+ 'metric': 'bps', 'weight': 2}],
+ 'node': {'handle': {'scope':'node'},
+ 'metric': 'bps',
+ 'bw-max': 10000}})
+ node_id = node_handle['handle']['id']
+
+ shaper = nl_shaper.get({'ifindex': cfg.ifindex,
+ 'handle': {'scope': 'queue', 'id': 1}})
+ ksft_eq(shaper, {'ifindex': cfg.ifindex,
+ 'parent': {'scope': 'node', 'id': node_id},
+ 'handle': {'scope': 'queue', 'id': 1},
+ 'weight': 3})
+
+ # Grouping to a specified, not existing node scope shaper must fail
+ raised = False
+ try:
+ nl_shaper.group({
+ 'ifindex': cfg.ifindex,
+ 'leaves':[{'handle': {'scope': 'queue', 'id': 3},
+ 'metric': 'bps',
+ 'weight': 3}],
+ 'node': {'handle': {'scope':'node', 'id': node_id + 1},
+ 'metric': 'bps',
+ 'bw-max': 10000}})
+
+ except (NlError):
+ raised = True
+ ksft_eq(raised, True)
+
+ node_handle = nl_shaper.group({
+ 'ifindex': cfg.ifindex,
+ 'leaves':[{'handle': {'scope': 'queue', 'id': 3},
+ 'metric': 'bps',
+ 'weight': 4}],
+ 'node': {'handle': {'scope':'node', 'id': node_id}}})
+ ksft_eq(node_handle, {'ifindex': cfg.ifindex,
+ 'handle': {'scope': 'node', 'id': node_id}})
+
+ shaper = nl_shaper.get({'ifindex': cfg.ifindex,
+ 'handle': {'scope': 'queue', 'id': 3}})
+ ksft_eq(shaper, {'ifindex': cfg.ifindex,
+ 'parent': {'scope': 'node', 'id': node_id},
+ 'handle': {'scope': 'queue', 'id': 3},
+ 'weight': 4})
+
+ nl_shaper.delete({'ifindex': cfg.ifindex,
+ 'handle': {'scope': 'queue', 'id': 2}})
+ nl_shaper.delete({'ifindex': cfg.ifindex,
+ 'handle': {'scope': 'queue', 'id': 1}})
+
+ # Deleting a non empty group will move the leaves downstream.
+ nl_shaper.delete({'ifindex': cfg.ifindex,
+ 'handle': {'scope': 'node', 'id': node_id}})
+ shapers = nl_shaper.get({'ifindex': cfg.ifindex},
+ dump=True)
+ ksft_eq(shapers, [{'ifindex': cfg.ifindex,
+ 'parent': {'scope': 'netdev'},
+ 'handle': {'scope': 'queue', 'id': 3},
+ 'weight': 4}])
+
+ # Finish and verify the complete cleanup.
+ nl_shaper.delete({'ifindex': cfg.ifindex,
+ 'handle': {'scope': 'queue', 'id': 3}})
+ shapers = nl_shaper.get({'ifindex': cfg.ifindex},
+ dump=True)
+ ksft_eq(len(shapers), 0)
+
+def main() -> None:
+ with NetDrvEnv(__file__, queue_count=4) as cfg:
+ cfg.queues = True
+ cfg.netdev = True
+ ksft_run([get_shapers,
+ get_caps,
+ set_qshapers,
+ del_qshapers,
+ set_nshapers,
+ del_nshapers,
+ basic_groups,
+ qgroups], args=(cfg, NetshaperFamily()))
+ ksft_exit()
+
+
+if __name__ == "__main__":
+ main()
diff --git a/tools/testing/selftests/net/lib/py/__init__.py b/tools/testing/selftests/net/lib/py/__init__.py
index b6d498d125fe..54d8f5eba810 100644
--- a/tools/testing/selftests/net/lib/py/__init__.py
+++ b/tools/testing/selftests/net/lib/py/__init__.py
@@ -6,3 +6,4 @@ from .netns import NetNS
from .nsim import *
from .utils import *
from .ynl import NlError, YnlFamily, EthtoolFamily, NetdevFamily, RtnlFamily
+from .ynl import NetshaperFamily
diff --git a/tools/testing/selftests/net/lib/py/ynl.py b/tools/testing/selftests/net/lib/py/ynl.py
index 1ace58370c06..a0d689d58c57 100644
--- a/tools/testing/selftests/net/lib/py/ynl.py
+++ b/tools/testing/selftests/net/lib/py/ynl.py
@@ -47,3 +47,8 @@ class NetdevFamily(YnlFamily):
def __init__(self):
super().__init__((SPEC_PATH / Path('netdev.yaml')).as_posix(),
schema='')
+
+class NetshaperFamily(YnlFamily):
+ def __init__(self):
+ super().__init__((SPEC_PATH / Path('net_shaper.yaml')).as_posix(),
+ schema='')
--
2.45.2
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH v5 net-next 09/12] virtchnl: support queue rate limit and quanta size configuration
2024-08-29 15:16 [PATCH v5 net-next 00/12] net: introduce TX H/W shaping API Paolo Abeni
` (7 preceding siblings ...)
2024-08-29 15:17 ` [PATCH v5 net-next 08/12] testing: net-drv: add basic shaper test Paolo Abeni
@ 2024-08-29 15:17 ` Paolo Abeni
2024-08-29 15:17 ` [PATCH v5 net-next 10/12] ice: Support VF " Paolo Abeni
` (2 subsequent siblings)
11 siblings, 0 replies; 29+ messages in thread
From: Paolo Abeni @ 2024-08-29 15:17 UTC (permalink / raw)
To: netdev
Cc: Jakub Kicinski, Jiri Pirko, Madhu Chittim, Sridhar Samudrala,
Simon Horman, John Fastabend, Sunil Kovvuri Goutham,
Jamal Hadi Salim, Donald Hunter, anthony.l.nguyen,
przemyslaw.kitszel, intel-wired-lan, edumazet
From: Wenjun Wu <wenjun1.wu@intel.com>
This patch adds new virtchnl opcodes and structures for rate limit
and quanta size configuration, which include:
1. VIRTCHNL_OP_CONFIG_QUEUE_BW, to configure max bandwidth for each
VF per queue.
2. VIRTCHNL_OP_CONFIG_QUANTA, to configure quanta size per queue.
3. VIRTCHNL_OP_GET_QOS_CAPS, VF queries current QoS configuration, such
as enabled TCs, arbiter type, up2tc and bandwidth of VSI node. The
configuration is previously set by DCB and PF, and now is the potential
QoS capability of VF. VF can take it as reference to configure queue TC
mapping.
Signed-off-by: Wenjun Wu <wenjun1.wu@intel.com>
---
include/linux/avf/virtchnl.h | 119 +++++++++++++++++++++++++++++++++++
1 file changed, 119 insertions(+)
diff --git a/include/linux/avf/virtchnl.h b/include/linux/avf/virtchnl.h
index f41395264dca..223e433c39fe 100644
--- a/include/linux/avf/virtchnl.h
+++ b/include/linux/avf/virtchnl.h
@@ -89,6 +89,9 @@ enum virtchnl_rx_hsplit {
VIRTCHNL_RX_HSPLIT_SPLIT_SCTP = 8,
};
+enum virtchnl_bw_limit_type {
+ VIRTCHNL_BW_SHAPER = 0,
+};
/* END GENERIC DEFINES */
/* Opcodes for VF-PF communication. These are placed in the v_opcode field
@@ -151,6 +154,11 @@ enum virtchnl_ops {
VIRTCHNL_OP_DISABLE_VLAN_STRIPPING_V2 = 55,
VIRTCHNL_OP_ENABLE_VLAN_INSERTION_V2 = 56,
VIRTCHNL_OP_DISABLE_VLAN_INSERTION_V2 = 57,
+ /* opcode 57 - 65 are reserved */
+ VIRTCHNL_OP_GET_QOS_CAPS = 66,
+ /* opcode 68 through 111 are reserved */
+ VIRTCHNL_OP_CONFIG_QUEUE_BW = 112,
+ VIRTCHNL_OP_CONFIG_QUANTA = 113,
VIRTCHNL_OP_MAX,
};
@@ -261,6 +269,7 @@ VIRTCHNL_CHECK_STRUCT_LEN(16, virtchnl_vsi_resource);
#define VIRTCHNL_VF_OFFLOAD_RX_FLEX_DESC BIT(26)
#define VIRTCHNL_VF_OFFLOAD_ADV_RSS_PF BIT(27)
#define VIRTCHNL_VF_OFFLOAD_FDIR_PF BIT(28)
+#define VIRTCHNL_VF_OFFLOAD_QOS BIT(29)
#define VF_BASE_MODE_OFFLOADS (VIRTCHNL_VF_OFFLOAD_L2 | \
VIRTCHNL_VF_OFFLOAD_VLAN | \
@@ -1416,6 +1425,85 @@ struct virtchnl_fdir_del {
VIRTCHNL_CHECK_STRUCT_LEN(12, virtchnl_fdir_del);
+struct virtchnl_shaper_bw {
+ /* Unit is Kbps */
+ u32 committed;
+ u32 peak;
+};
+
+VIRTCHNL_CHECK_STRUCT_LEN(8, virtchnl_shaper_bw);
+
+/* VIRTCHNL_OP_GET_QOS_CAPS
+ * VF sends this message to get its QoS Caps, such as
+ * TC number, Arbiter and Bandwidth.
+ */
+struct virtchnl_qos_cap_elem {
+ u8 tc_num;
+ u8 tc_prio;
+#define VIRTCHNL_ABITER_STRICT 0
+#define VIRTCHNL_ABITER_ETS 2
+ u8 arbiter;
+#define VIRTCHNL_STRICT_WEIGHT 1
+ u8 weight;
+ enum virtchnl_bw_limit_type type;
+ union {
+ struct virtchnl_shaper_bw shaper;
+ u8 pad2[32];
+ };
+};
+
+VIRTCHNL_CHECK_STRUCT_LEN(40, virtchnl_qos_cap_elem);
+
+struct virtchnl_qos_cap_list {
+ u16 vsi_id;
+ u16 num_elem;
+ struct virtchnl_qos_cap_elem cap[];
+};
+
+VIRTCHNL_CHECK_STRUCT_LEN(4, virtchnl_qos_cap_list);
+#define virtchnl_qos_cap_list_LEGACY_SIZEOF 44
+
+/* VIRTCHNL_OP_CONFIG_QUEUE_BW */
+struct virtchnl_queue_bw {
+ u16 queue_id;
+ u8 tc;
+ u8 pad;
+ struct virtchnl_shaper_bw shaper;
+};
+
+VIRTCHNL_CHECK_STRUCT_LEN(12, virtchnl_queue_bw);
+
+struct virtchnl_queues_bw_cfg {
+ u16 vsi_id;
+ u16 num_queues;
+ struct virtchnl_queue_bw cfg[];
+};
+
+VIRTCHNL_CHECK_STRUCT_LEN(4, virtchnl_queues_bw_cfg);
+#define virtchnl_queues_bw_cfg_LEGACY_SIZEOF 16
+
+enum virtchnl_queue_type {
+ VIRTCHNL_QUEUE_TYPE_TX = 0,
+ VIRTCHNL_QUEUE_TYPE_RX = 1,
+};
+
+/* structure to specify a chunk of contiguous queues */
+struct virtchnl_queue_chunk {
+ /* see enum virtchnl_queue_type */
+ s32 type;
+ u16 start_queue_id;
+ u16 num_queues;
+};
+
+VIRTCHNL_CHECK_STRUCT_LEN(8, virtchnl_queue_chunk);
+
+struct virtchnl_quanta_cfg {
+ u16 quanta_size;
+ struct virtchnl_queue_chunk queue_select;
+};
+
+VIRTCHNL_CHECK_STRUCT_LEN(12, virtchnl_quanta_cfg);
+
#define __vss_byone(p, member, count, old) \
(struct_size(p, member, count) + (old - 1 - struct_size(p, member, 0)))
@@ -1438,6 +1526,8 @@ VIRTCHNL_CHECK_STRUCT_LEN(12, virtchnl_fdir_del);
__vss(virtchnl_vlan_filter_list_v2, __vss_byelem, p, m, c), \
__vss(virtchnl_tc_info, __vss_byelem, p, m, c), \
__vss(virtchnl_rdma_qvlist_info, __vss_byelem, p, m, c), \
+ __vss(virtchnl_qos_cap_list, __vss_byelem, p, m, c), \
+ __vss(virtchnl_queues_bw_cfg, __vss_byelem, p, m, c), \
__vss(virtchnl_rss_key, __vss_byone, p, m, c), \
__vss(virtchnl_rss_lut, __vss_byone, p, m, c))
@@ -1637,6 +1727,35 @@ virtchnl_vc_validate_vf_msg(struct virtchnl_version_info *ver, u32 v_opcode,
case VIRTCHNL_OP_DISABLE_VLAN_INSERTION_V2:
valid_len = sizeof(struct virtchnl_vlan_setting);
break;
+ case VIRTCHNL_OP_GET_QOS_CAPS:
+ break;
+ case VIRTCHNL_OP_CONFIG_QUEUE_BW:
+ valid_len = virtchnl_queues_bw_cfg_LEGACY_SIZEOF;
+ if (msglen >= valid_len) {
+ struct virtchnl_queues_bw_cfg *q_bw =
+ (struct virtchnl_queues_bw_cfg *)msg;
+
+ valid_len = virtchnl_struct_size(q_bw, cfg,
+ q_bw->num_queues);
+ if (q_bw->num_queues == 0) {
+ err_msg_format = true;
+ break;
+ }
+ }
+ break;
+ case VIRTCHNL_OP_CONFIG_QUANTA:
+ valid_len = sizeof(struct virtchnl_quanta_cfg);
+ if (msglen >= valid_len) {
+ struct virtchnl_quanta_cfg *q_quanta =
+ (struct virtchnl_quanta_cfg *)msg;
+
+ if (q_quanta->quanta_size == 0 ||
+ q_quanta->queue_select.num_queues == 0) {
+ err_msg_format = true;
+ break;
+ }
+ }
+ break;
/* These are always errors coming from the VF. */
case VIRTCHNL_OP_EVENT:
case VIRTCHNL_OP_UNKNOWN:
--
2.45.2
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH v5 net-next 10/12] ice: Support VF queue rate limit and quanta size configuration
2024-08-29 15:16 [PATCH v5 net-next 00/12] net: introduce TX H/W shaping API Paolo Abeni
` (8 preceding siblings ...)
2024-08-29 15:17 ` [PATCH v5 net-next 09/12] virtchnl: support queue rate limit and quanta size configuration Paolo Abeni
@ 2024-08-29 15:17 ` Paolo Abeni
2024-08-29 15:17 ` [PATCH v5 net-next 11/12] iavf: Add net_shaper_ops support Paolo Abeni
2024-08-29 15:17 ` [PATCH v5 net-next 12/12] iavf: add support to exchange qos capabilities Paolo Abeni
11 siblings, 0 replies; 29+ messages in thread
From: Paolo Abeni @ 2024-08-29 15:17 UTC (permalink / raw)
To: netdev
Cc: Jakub Kicinski, Jiri Pirko, Madhu Chittim, Sridhar Samudrala,
Simon Horman, John Fastabend, Sunil Kovvuri Goutham,
Jamal Hadi Salim, Donald Hunter, anthony.l.nguyen,
przemyslaw.kitszel, intel-wired-lan, edumazet
From: Wenjun Wu <wenjun1.wu@intel.com>
Add support to configure VF queue rate limit and quanta size.
For quanta size configuration, the quanta profiles are divided evenly
by PF numbers. For each port, the first quanta profile is reserved for
default. When VF is asked to set queue quanta size, PF will search for
an available profile, change the fields and assigned this profile to the
queue.
Signed-off-by: Wenjun Wu <wenjun1.wu@intel.com>
---
drivers/net/ethernet/intel/ice/ice.h | 2 +
drivers/net/ethernet/intel/ice/ice_base.c | 2 +
drivers/net/ethernet/intel/ice/ice_common.c | 21 ++
.../net/ethernet/intel/ice/ice_hw_autogen.h | 8 +
drivers/net/ethernet/intel/ice/ice_txrx.h | 1 +
drivers/net/ethernet/intel/ice/ice_type.h | 1 +
drivers/net/ethernet/intel/ice/ice_vf_lib.h | 8 +
drivers/net/ethernet/intel/ice/ice_virtchnl.c | 335 ++++++++++++++++++
drivers/net/ethernet/intel/ice/ice_virtchnl.h | 11 +
.../intel/ice/ice_virtchnl_allowlist.c | 6 +
10 files changed, 395 insertions(+)
diff --git a/drivers/net/ethernet/intel/ice/ice.h b/drivers/net/ethernet/intel/ice/ice.h
index caaa10157909..35ace1907a62 100644
--- a/drivers/net/ethernet/intel/ice/ice.h
+++ b/drivers/net/ethernet/intel/ice/ice.h
@@ -659,6 +659,8 @@ struct ice_pf {
struct ice_agg_node vf_agg_node[ICE_MAX_VF_AGG_NODES];
struct ice_dplls dplls;
struct device *hwmon_dev;
+
+ u8 num_quanta_prof_used;
};
extern struct workqueue_struct *ice_lag_wq;
diff --git a/drivers/net/ethernet/intel/ice/ice_base.c b/drivers/net/ethernet/intel/ice/ice_base.c
index f448d3a84564..c238d440a623 100644
--- a/drivers/net/ethernet/intel/ice/ice_base.c
+++ b/drivers/net/ethernet/intel/ice/ice_base.c
@@ -349,6 +349,8 @@ ice_setup_tx_ctx(struct ice_tx_ring *ring, struct ice_tlan_ctx *tlan_ctx, u16 pf
break;
}
+ tlan_ctx->quanta_prof_idx = ring->quanta_prof_id;
+
tlan_ctx->tso_ena = ICE_TX_LEGACY;
tlan_ctx->tso_qnum = pf_q;
diff --git a/drivers/net/ethernet/intel/ice/ice_common.c b/drivers/net/ethernet/intel/ice/ice_common.c
index 009716a12a26..b22e71dc59d4 100644
--- a/drivers/net/ethernet/intel/ice/ice_common.c
+++ b/drivers/net/ethernet/intel/ice/ice_common.c
@@ -2436,6 +2436,25 @@ ice_parse_func_caps(struct ice_hw *hw, struct ice_hw_func_caps *func_p,
ice_recalc_port_limited_caps(hw, &func_p->common_cap);
}
+/**
+ * ice_func_id_to_logical_id - map from function id to logical pf id
+ * @active_function_bitmap: active function bitmap
+ * @pf_id: function number of device
+ *
+ * Return: logical PF ID.
+ */
+static int ice_func_id_to_logical_id(u32 active_function_bitmap, u8 pf_id)
+{
+ u8 logical_id = 0;
+ u8 i;
+
+ for (i = 0; i < pf_id; i++)
+ if (active_function_bitmap & BIT(i))
+ logical_id++;
+
+ return logical_id;
+}
+
/**
* ice_parse_valid_functions_cap - Parse ICE_AQC_CAPS_VALID_FUNCTIONS caps
* @hw: pointer to the HW struct
@@ -2453,6 +2472,8 @@ ice_parse_valid_functions_cap(struct ice_hw *hw, struct ice_hw_dev_caps *dev_p,
dev_p->num_funcs = hweight32(number);
ice_debug(hw, ICE_DBG_INIT, "dev caps: num_funcs = %d\n",
dev_p->num_funcs);
+
+ hw->logical_pf_id = ice_func_id_to_logical_id(number, hw->pf_id);
}
/**
diff --git a/drivers/net/ethernet/intel/ice/ice_hw_autogen.h b/drivers/net/ethernet/intel/ice/ice_hw_autogen.h
index 91cbae1eec89..af9302f0e376 100644
--- a/drivers/net/ethernet/intel/ice/ice_hw_autogen.h
+++ b/drivers/net/ethernet/intel/ice/ice_hw_autogen.h
@@ -6,6 +6,14 @@
#ifndef _ICE_HW_AUTOGEN_H_
#define _ICE_HW_AUTOGEN_H_
+#define GLCOMM_QUANTA_PROF(_i) (0x002D2D68 + ((_i) * 4))
+#define GLCOMM_QUANTA_PROF_MAX_INDEX 15
+#define GLCOMM_QUANTA_PROF_QUANTA_SIZE_S 0
+#define GLCOMM_QUANTA_PROF_QUANTA_SIZE_M ICE_M(0x3FFF, 0)
+#define GLCOMM_QUANTA_PROF_MAX_CMD_S 16
+#define GLCOMM_QUANTA_PROF_MAX_CMD_M ICE_M(0xFF, 16)
+#define GLCOMM_QUANTA_PROF_MAX_DESC_S 24
+#define GLCOMM_QUANTA_PROF_MAX_DESC_M ICE_M(0x3F, 24)
#define QTX_COMM_DBELL(_DBQM) (0x002C0000 + ((_DBQM) * 4))
#define QTX_COMM_HEAD(_DBQM) (0x000E0000 + ((_DBQM) * 4))
#define QTX_COMM_HEAD_HEAD_S 0
diff --git a/drivers/net/ethernet/intel/ice/ice_txrx.h b/drivers/net/ethernet/intel/ice/ice_txrx.h
index feba314a3fe4..ea2fae9035b5 100644
--- a/drivers/net/ethernet/intel/ice/ice_txrx.h
+++ b/drivers/net/ethernet/intel/ice/ice_txrx.h
@@ -406,6 +406,7 @@ struct ice_tx_ring {
#define ICE_TX_FLAGS_RING_VLAN_L2TAG2 BIT(2)
u8 flags;
u8 dcb_tc; /* Traffic class of ring */
+ u16 quanta_prof_id;
} ____cacheline_internodealigned_in_smp;
static inline bool ice_ring_uses_build_skb(struct ice_rx_ring *ring)
diff --git a/drivers/net/ethernet/intel/ice/ice_type.h b/drivers/net/ethernet/intel/ice/ice_type.h
index b9e443232335..953576003425 100644
--- a/drivers/net/ethernet/intel/ice/ice_type.h
+++ b/drivers/net/ethernet/intel/ice/ice_type.h
@@ -904,6 +904,7 @@ struct ice_hw {
u8 revision_id;
u8 pf_id; /* device profile info */
+ u8 logical_pf_id;
u16 max_burst_size; /* driver sets this value */
diff --git a/drivers/net/ethernet/intel/ice/ice_vf_lib.h b/drivers/net/ethernet/intel/ice/ice_vf_lib.h
index be4266899690..4261fe1c2bcd 100644
--- a/drivers/net/ethernet/intel/ice/ice_vf_lib.h
+++ b/drivers/net/ethernet/intel/ice/ice_vf_lib.h
@@ -59,6 +59,13 @@ struct ice_fdir_prof_info {
u64 fdir_active_cnt;
};
+struct ice_vf_qs_bw {
+ u32 committed;
+ u32 peak;
+ u16 queue_id;
+ u8 tc;
+};
+
/* VF operations */
struct ice_vf_ops {
enum ice_disq_rst_src reset_type;
@@ -140,6 +147,7 @@ struct ice_vf {
struct devlink_port devlink_port;
u16 num_msix; /* num of MSI-X configured on this VF */
+ struct ice_vf_qs_bw qs_bw[ICE_MAX_RSS_QS_PER_VF];
};
/* Flags for controlling behavior of ice_reset_vf */
diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl.c b/drivers/net/ethernet/intel/ice/ice_virtchnl.c
index 59f62306b9cb..96543f69f5de 100644
--- a/drivers/net/ethernet/intel/ice/ice_virtchnl.c
+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl.c
@@ -495,6 +495,9 @@ static int ice_vc_get_vf_res_msg(struct ice_vf *vf, u8 *msg)
if (vf->driver_caps & VIRTCHNL_VF_OFFLOAD_USO)
vfres->vf_cap_flags |= VIRTCHNL_VF_OFFLOAD_USO;
+ if (vf->driver_caps & VIRTCHNL_VF_OFFLOAD_QOS)
+ vfres->vf_cap_flags |= VIRTCHNL_VF_OFFLOAD_QOS;
+
vfres->num_vsis = 1;
/* Tx and Rx queue are equal for VF */
vfres->num_queue_pairs = vsi->num_txq;
@@ -1034,6 +1037,191 @@ static int ice_vc_config_rss_hfunc(struct ice_vf *vf, u8 *msg)
NULL, 0);
}
+/**
+ * ice_vc_get_qos_caps - Get current QoS caps from PF
+ * @vf: pointer to the VF info
+ *
+ * Get VF's QoS capabilities, such as TC number, arbiter and
+ * bandwidth from PF.
+ *
+ * Return: 0 on success or negative error value.
+ */
+static int ice_vc_get_qos_caps(struct ice_vf *vf)
+{
+ enum virtchnl_status_code v_ret = VIRTCHNL_STATUS_SUCCESS;
+ struct virtchnl_qos_cap_list *cap_list = NULL;
+ u8 tc_prio[ICE_MAX_TRAFFIC_CLASS] = { 0 };
+ struct virtchnl_qos_cap_elem *cfg = NULL;
+ struct ice_vsi_ctx *vsi_ctx;
+ struct ice_pf *pf = vf->pf;
+ struct ice_port_info *pi;
+ struct ice_vsi *vsi;
+ u8 numtc, tc;
+ u16 len = 0;
+ int ret, i;
+
+ if (!test_bit(ICE_VF_STATE_ACTIVE, vf->vf_states)) {
+ v_ret = VIRTCHNL_STATUS_ERR_PARAM;
+ goto err;
+ }
+
+ vsi = ice_get_vf_vsi(vf);
+ if (!vsi) {
+ v_ret = VIRTCHNL_STATUS_ERR_PARAM;
+ goto err;
+ }
+
+ pi = pf->hw.port_info;
+ numtc = vsi->tc_cfg.numtc;
+
+ vsi_ctx = ice_get_vsi_ctx(pi->hw, vf->lan_vsi_idx);
+ if (!vsi_ctx) {
+ v_ret = VIRTCHNL_STATUS_ERR_PARAM;
+ goto err;
+ }
+
+ len = struct_size(cap_list, cap, numtc);
+ cap_list = kzalloc(len, GFP_KERNEL);
+ if (!cap_list) {
+ v_ret = VIRTCHNL_STATUS_ERR_NO_MEMORY;
+ len = 0;
+ goto err;
+ }
+
+ cap_list->vsi_id = vsi->vsi_num;
+ cap_list->num_elem = numtc;
+
+ /* Store the UP2TC configuration from DCB to a user priority bitmap
+ * of each TC. Each element of prio_of_tc represents one TC. Each
+ * bitmap indicates the user priorities belong to this TC.
+ */
+ for (i = 0; i < ICE_MAX_USER_PRIORITY; i++) {
+ tc = pi->qos_cfg.local_dcbx_cfg.etscfg.prio_table[i];
+ tc_prio[tc] |= BIT(i);
+ }
+
+ for (i = 0; i < numtc; i++) {
+ cfg = &cap_list->cap[i];
+ cfg->tc_num = i;
+ cfg->tc_prio = tc_prio[i];
+ cfg->arbiter = pi->qos_cfg.local_dcbx_cfg.etscfg.tsatable[i];
+ cfg->weight = VIRTCHNL_STRICT_WEIGHT;
+ cfg->type = VIRTCHNL_BW_SHAPER;
+ cfg->shaper.committed = vsi_ctx->sched.bw_t_info[i].cir_bw.bw;
+ cfg->shaper.peak = vsi_ctx->sched.bw_t_info[i].eir_bw.bw;
+ }
+
+err:
+ ret = ice_vc_send_msg_to_vf(vf, VIRTCHNL_OP_GET_QOS_CAPS, v_ret,
+ (u8 *)cap_list, len);
+ kfree(cap_list);
+ return ret;
+}
+
+/**
+ * ice_vf_cfg_qs_bw - Configure per queue bandwidth
+ * @vf: pointer to the VF info
+ * @num_queues: number of queues to be configured
+ *
+ * Configure per queue bandwidth.
+ *
+ * Return: 0 on success or negative error value.
+ */
+static int ice_vf_cfg_qs_bw(struct ice_vf *vf, u16 num_queues)
+{
+ struct ice_hw *hw = &vf->pf->hw;
+ struct ice_vsi *vsi;
+ int ret;
+ u16 i;
+
+ vsi = ice_get_vf_vsi(vf);
+ if (!vsi)
+ return -EINVAL;
+
+ for (i = 0; i < num_queues; i++) {
+ u32 p_rate, min_rate;
+ u8 tc;
+
+ p_rate = vf->qs_bw[i].peak;
+ min_rate = vf->qs_bw[i].committed;
+ tc = vf->qs_bw[i].tc;
+ if (p_rate)
+ ret = ice_cfg_q_bw_lmt(hw->port_info, vsi->idx, tc,
+ vf->qs_bw[i].queue_id,
+ ICE_MAX_BW, p_rate);
+ else
+ ret = ice_cfg_q_bw_dflt_lmt(hw->port_info, vsi->idx, tc,
+ vf->qs_bw[i].queue_id,
+ ICE_MAX_BW);
+ if (ret)
+ return ret;
+
+ if (min_rate)
+ ret = ice_cfg_q_bw_lmt(hw->port_info, vsi->idx, tc,
+ vf->qs_bw[i].queue_id,
+ ICE_MIN_BW, min_rate);
+ else
+ ret = ice_cfg_q_bw_dflt_lmt(hw->port_info, vsi->idx, tc,
+ vf->qs_bw[i].queue_id,
+ ICE_MIN_BW);
+
+ if (ret)
+ return ret;
+ }
+
+ return 0;
+}
+
+/**
+ * ice_vf_cfg_q_quanta_profile - Configure quanta profile
+ * @vf: pointer to the VF info
+ * @quanta_prof_idx: pointer to the quanta profile index
+ * @quanta_size: quanta size to be set
+ *
+ * This function chooses available quanta profile and configures the register.
+ * The quanta profile is evenly divided by the number of device ports, and then
+ * available to the specific PF and VFs. The first profile for each PF is a
+ * reserved default profile. Only quanta size of the rest unused profile can be
+ * modified.
+ *
+ * Return: 0 on success or negative error value.
+ */
+static int ice_vf_cfg_q_quanta_profile(struct ice_vf *vf, u16 quanta_size,
+ u16 *quanta_prof_idx)
+{
+ const u16 n_desc = calc_quanta_desc(quanta_size);
+ struct ice_hw *hw = &vf->pf->hw;
+ const u16 n_cmd = 2 * n_desc;
+ struct ice_pf *pf = vf->pf;
+ u16 per_pf, begin_id;
+ u8 n_used;
+ u32 reg;
+
+ begin_id = (GLCOMM_QUANTA_PROF_MAX_INDEX + 1) / hw->dev_caps.num_funcs *
+ hw->logical_pf_id;
+
+ if (quanta_size == ICE_DFLT_QUANTA) {
+ *quanta_prof_idx = begin_id;
+ } else {
+ per_pf = (GLCOMM_QUANTA_PROF_MAX_INDEX + 1) /
+ hw->dev_caps.num_funcs;
+ n_used = pf->num_quanta_prof_used;
+ if (n_used < per_pf) {
+ *quanta_prof_idx = begin_id + 1 + n_used;
+ pf->num_quanta_prof_used++;
+ } else {
+ return -EINVAL;
+ }
+ }
+
+ reg = FIELD_PREP(GLCOMM_QUANTA_PROF_QUANTA_SIZE_M, quanta_size) |
+ FIELD_PREP(GLCOMM_QUANTA_PROF_MAX_CMD_M, n_cmd) |
+ FIELD_PREP(GLCOMM_QUANTA_PROF_MAX_DESC_M, n_desc);
+ wr32(hw, GLCOMM_QUANTA_PROF(*quanta_prof_idx), reg);
+
+ return 0;
+}
+
/**
* ice_vc_cfg_promiscuous_mode_msg
* @vf: pointer to the VF info
@@ -1635,6 +1823,141 @@ static int ice_vc_cfg_irq_map_msg(struct ice_vf *vf, u8 *msg)
NULL, 0);
}
+/**
+ * ice_vc_cfg_q_bw - Configure per queue bandwidth
+ * @vf: pointer to the VF info
+ * @msg: pointer to the msg buffer which holds the command descriptor
+ *
+ * Configure VF queues bandwidth.
+ *
+ * Return: 0 on success or negative error value.
+ */
+static int ice_vc_cfg_q_bw(struct ice_vf *vf, u8 *msg)
+{
+ enum virtchnl_status_code v_ret = VIRTCHNL_STATUS_SUCCESS;
+ struct virtchnl_queues_bw_cfg *qbw =
+ (struct virtchnl_queues_bw_cfg *)msg;
+ struct ice_vsi *vsi;
+ u16 i;
+
+ if (!test_bit(ICE_VF_STATE_ACTIVE, vf->vf_states) ||
+ !ice_vc_isvalid_vsi_id(vf, qbw->vsi_id)) {
+ v_ret = VIRTCHNL_STATUS_ERR_PARAM;
+ goto err;
+ }
+
+ vsi = ice_get_vf_vsi(vf);
+ if (!vsi) {
+ v_ret = VIRTCHNL_STATUS_ERR_PARAM;
+ goto err;
+ }
+
+ if (qbw->num_queues > ICE_MAX_RSS_QS_PER_VF ||
+ qbw->num_queues > min_t(u16, vsi->alloc_txq, vsi->alloc_rxq)) {
+ dev_err(ice_pf_to_dev(vf->pf), "VF-%d trying to configure more than allocated number of queues: %d\n",
+ vf->vf_id, min_t(u16, vsi->alloc_txq, vsi->alloc_rxq));
+ v_ret = VIRTCHNL_STATUS_ERR_PARAM;
+ goto err;
+ }
+
+ for (i = 0; i < qbw->num_queues; i++) {
+ if (qbw->cfg[i].shaper.peak != 0 && vf->max_tx_rate != 0 &&
+ qbw->cfg[i].shaper.peak > vf->max_tx_rate)
+ dev_warn(ice_pf_to_dev(vf->pf), "The maximum queue %d rate limit configuration may not take effect because the maximum TX rate for VF-%d is %d\n",
+ qbw->cfg[i].queue_id, vf->vf_id,
+ vf->max_tx_rate);
+ if (qbw->cfg[i].shaper.committed != 0 && vf->min_tx_rate != 0 &&
+ qbw->cfg[i].shaper.committed < vf->min_tx_rate)
+ dev_warn(ice_pf_to_dev(vf->pf), "The minimum queue %d rate limit configuration may not take effect because the minimum TX rate for VF-%d is %d\n",
+ qbw->cfg[i].queue_id, vf->vf_id,
+ vf->max_tx_rate);
+ }
+
+ for (i = 0; i < qbw->num_queues; i++) {
+ vf->qs_bw[i].queue_id = qbw->cfg[i].queue_id;
+ vf->qs_bw[i].peak = qbw->cfg[i].shaper.peak;
+ vf->qs_bw[i].committed = qbw->cfg[i].shaper.committed;
+ vf->qs_bw[i].tc = qbw->cfg[i].tc;
+ }
+
+ if (ice_vf_cfg_qs_bw(vf, qbw->num_queues))
+ v_ret = VIRTCHNL_STATUS_ERR_PARAM;
+
+err:
+ /* send the response to the VF */
+ return ice_vc_send_msg_to_vf(vf, VIRTCHNL_OP_CONFIG_QUEUE_BW,
+ v_ret, NULL, 0);
+}
+
+/**
+ * ice_vc_cfg_q_quanta - Configure per queue quanta
+ * @vf: pointer to the VF info
+ * @msg: pointer to the msg buffer which holds the command descriptor
+ *
+ * Configure VF queues quanta.
+ *
+ * Return: 0 on success or negative error value.
+ */
+static int ice_vc_cfg_q_quanta(struct ice_vf *vf, u8 *msg)
+{
+ enum virtchnl_status_code v_ret = VIRTCHNL_STATUS_SUCCESS;
+ u16 quanta_prof_id, quanta_size, start_qid, end_qid, i;
+ struct virtchnl_quanta_cfg *qquanta =
+ (struct virtchnl_quanta_cfg *)msg;
+ struct ice_vsi *vsi;
+ int ret;
+
+ if (!test_bit(ICE_VF_STATE_ACTIVE, vf->vf_states)) {
+ v_ret = VIRTCHNL_STATUS_ERR_PARAM;
+ goto err;
+ }
+
+ vsi = ice_get_vf_vsi(vf);
+ if (!vsi) {
+ v_ret = VIRTCHNL_STATUS_ERR_PARAM;
+ goto err;
+ }
+
+ end_qid = qquanta->queue_select.start_queue_id +
+ qquanta->queue_select.num_queues;
+ if (end_qid > ICE_MAX_RSS_QS_PER_VF ||
+ end_qid > min_t(u16, vsi->alloc_txq, vsi->alloc_rxq)) {
+ dev_err(ice_pf_to_dev(vf->pf), "VF-%d trying to configure more than allocated number of queues: %d\n",
+ vf->vf_id, min_t(u16, vsi->alloc_txq, vsi->alloc_rxq));
+ v_ret = VIRTCHNL_STATUS_ERR_PARAM;
+ goto err;
+ }
+
+ quanta_size = qquanta->quanta_size;
+ if (quanta_size > ICE_MAX_QUANTA_SIZE ||
+ quanta_size < ICE_MIN_QUANTA_SIZE) {
+ v_ret = VIRTCHNL_STATUS_ERR_PARAM;
+ goto err;
+ }
+
+ if (quanta_size % 64) {
+ dev_err(ice_pf_to_dev(vf->pf), "quanta size should be the product of 64\n");
+ v_ret = VIRTCHNL_STATUS_ERR_PARAM;
+ goto err;
+ }
+
+ ret = ice_vf_cfg_q_quanta_profile(vf, quanta_size,
+ &quanta_prof_id);
+ if (ret) {
+ v_ret = VIRTCHNL_STATUS_ERR_NOT_SUPPORTED;
+ goto err;
+ }
+
+ start_qid = qquanta->queue_select.start_queue_id;
+ for (i = start_qid; i < end_qid; i++)
+ vsi->tx_rings[i]->quanta_prof_id = quanta_prof_id;
+
+err:
+ /* send the response to the VF */
+ return ice_vc_send_msg_to_vf(vf, VIRTCHNL_OP_CONFIG_QUANTA,
+ v_ret, NULL, 0);
+}
+
/**
* ice_vc_cfg_qs_msg
* @vf: pointer to the VF info
@@ -3821,6 +4144,9 @@ static const struct ice_virtchnl_ops ice_virtchnl_dflt_ops = {
.dis_vlan_stripping_v2_msg = ice_vc_dis_vlan_stripping_v2_msg,
.ena_vlan_insertion_v2_msg = ice_vc_ena_vlan_insertion_v2_msg,
.dis_vlan_insertion_v2_msg = ice_vc_dis_vlan_insertion_v2_msg,
+ .get_qos_caps = ice_vc_get_qos_caps,
+ .cfg_q_bw = ice_vc_cfg_q_bw,
+ .cfg_q_quanta = ice_vc_cfg_q_quanta,
};
/**
@@ -4177,6 +4503,15 @@ void ice_vc_process_vf_msg(struct ice_pf *pf, struct ice_rq_event_info *event,
case VIRTCHNL_OP_DISABLE_VLAN_INSERTION_V2:
err = ops->dis_vlan_insertion_v2_msg(vf, msg);
break;
+ case VIRTCHNL_OP_GET_QOS_CAPS:
+ err = ops->get_qos_caps(vf);
+ break;
+ case VIRTCHNL_OP_CONFIG_QUEUE_BW:
+ err = ops->cfg_q_bw(vf, msg);
+ break;
+ case VIRTCHNL_OP_CONFIG_QUANTA:
+ err = ops->cfg_q_quanta(vf, msg);
+ break;
case VIRTCHNL_OP_UNKNOWN:
default:
dev_err(dev, "Unsupported opcode %d from VF %d\n", v_opcode,
diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl.h b/drivers/net/ethernet/intel/ice/ice_virtchnl.h
index 3a4115869153..0c629aef9baf 100644
--- a/drivers/net/ethernet/intel/ice/ice_virtchnl.h
+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl.h
@@ -13,6 +13,13 @@
/* Restrict number of MAC Addr and VLAN that non-trusted VF can programmed */
#define ICE_MAX_VLAN_PER_VF 8
+#define ICE_DFLT_QUANTA 1024
+#define ICE_MAX_QUANTA_SIZE 4096
+#define ICE_MIN_QUANTA_SIZE 256
+
+#define calc_quanta_desc(x) \
+ max_t(u16, 12, min_t(u16, 63, (((x) + 66) / 132) * 2 + 4))
+
/* MAC filters: 1 is reserved for the VF's default/perm_addr/LAA MAC, 1 for
* broadcast, and 16 for additional unicast/multicast filters
*/
@@ -61,6 +68,10 @@ struct ice_virtchnl_ops {
int (*dis_vlan_stripping_v2_msg)(struct ice_vf *vf, u8 *msg);
int (*ena_vlan_insertion_v2_msg)(struct ice_vf *vf, u8 *msg);
int (*dis_vlan_insertion_v2_msg)(struct ice_vf *vf, u8 *msg);
+ int (*get_qos_caps)(struct ice_vf *vf);
+ int (*cfg_q_tc_map)(struct ice_vf *vf, u8 *msg);
+ int (*cfg_q_bw)(struct ice_vf *vf, u8 *msg);
+ int (*cfg_q_quanta)(struct ice_vf *vf, u8 *msg);
};
#ifdef CONFIG_PCI_IOV
diff --git a/drivers/net/ethernet/intel/ice/ice_virtchnl_allowlist.c b/drivers/net/ethernet/intel/ice/ice_virtchnl_allowlist.c
index d796dbd2a440..c105a82ee136 100644
--- a/drivers/net/ethernet/intel/ice/ice_virtchnl_allowlist.c
+++ b/drivers/net/ethernet/intel/ice/ice_virtchnl_allowlist.c
@@ -84,6 +84,11 @@ static const u32 fdir_pf_allowlist_opcodes[] = {
VIRTCHNL_OP_ADD_FDIR_FILTER, VIRTCHNL_OP_DEL_FDIR_FILTER,
};
+static const u32 tc_allowlist_opcodes[] = {
+ VIRTCHNL_OP_GET_QOS_CAPS, VIRTCHNL_OP_CONFIG_QUEUE_BW,
+ VIRTCHNL_OP_CONFIG_QUANTA,
+};
+
struct allowlist_opcode_info {
const u32 *opcodes;
size_t size;
@@ -104,6 +109,7 @@ static const struct allowlist_opcode_info allowlist_opcodes[] = {
ALLOW_ITEM(VIRTCHNL_VF_OFFLOAD_ADV_RSS_PF, adv_rss_pf_allowlist_opcodes),
ALLOW_ITEM(VIRTCHNL_VF_OFFLOAD_FDIR_PF, fdir_pf_allowlist_opcodes),
ALLOW_ITEM(VIRTCHNL_VF_OFFLOAD_VLAN_V2, vlan_v2_allowlist_opcodes),
+ ALLOW_ITEM(VIRTCHNL_VF_OFFLOAD_QOS, tc_allowlist_opcodes),
};
/**
--
2.45.2
^ permalink raw reply related [flat|nested] 29+ messages in thread* [PATCH v5 net-next 11/12] iavf: Add net_shaper_ops support
2024-08-29 15:16 [PATCH v5 net-next 00/12] net: introduce TX H/W shaping API Paolo Abeni
` (9 preceding siblings ...)
2024-08-29 15:17 ` [PATCH v5 net-next 10/12] ice: Support VF " Paolo Abeni
@ 2024-08-29 15:17 ` Paolo Abeni
2024-08-30 2:09 ` Jakub Kicinski
2024-08-29 15:17 ` [PATCH v5 net-next 12/12] iavf: add support to exchange qos capabilities Paolo Abeni
11 siblings, 1 reply; 29+ messages in thread
From: Paolo Abeni @ 2024-08-29 15:17 UTC (permalink / raw)
To: netdev
Cc: Jakub Kicinski, Jiri Pirko, Madhu Chittim, Sridhar Samudrala,
Simon Horman, John Fastabend, Sunil Kovvuri Goutham,
Jamal Hadi Salim, Donald Hunter, anthony.l.nguyen,
przemyslaw.kitszel, intel-wired-lan, edumazet
From: Sudheer Mogilappagari <sudheer.mogilappagari@intel.com>
Implement net_shaper_ops support for IAVF. This enables configuration
of rate limiting on per queue basis. Customer intends to enforce
bandwidth limit on Tx traffic steered to the queue by configuring
rate limits on the queue.
To set rate limiting for a queue, update shaper object of given queues
in driver and send VIRTCHNL_OP_CONFIG_QUEUE_BW to PF to update HW
configuration.
Deleting shaper configured for queue is nothing but configuring shaper
with bw_max 0. The PF restores the default rate limiting config
when bw_max is zero.
Signed-off-by: Sudheer Mogilappagari <sudheer.mogilappagari@intel.com>
---
v4 -> v5:
- fix kdoc
---
drivers/net/ethernet/intel/Kconfig | 1 +
drivers/net/ethernet/intel/iavf/iavf.h | 3 +
drivers/net/ethernet/intel/iavf/iavf_main.c | 141 ++++++++++++++++++
drivers/net/ethernet/intel/iavf/iavf_txrx.h | 2 +
.../net/ethernet/intel/iavf/iavf_virtchnl.c | 65 ++++++++
5 files changed, 212 insertions(+)
diff --git a/drivers/net/ethernet/intel/Kconfig b/drivers/net/ethernet/intel/Kconfig
index 0375c7448a57..20bc40eec487 100644
--- a/drivers/net/ethernet/intel/Kconfig
+++ b/drivers/net/ethernet/intel/Kconfig
@@ -258,6 +258,7 @@ config I40E_DCB
config IAVF
tristate
select LIBIE
+ select NET_SHAPER
config I40EVF
tristate "Intel(R) Ethernet Adaptive Virtual Function support"
diff --git a/drivers/net/ethernet/intel/iavf/iavf.h b/drivers/net/ethernet/intel/iavf/iavf.h
index 48cd1d06761c..a84bdbfbb0f7 100644
--- a/drivers/net/ethernet/intel/iavf/iavf.h
+++ b/drivers/net/ethernet/intel/iavf/iavf.h
@@ -34,6 +34,7 @@
#include <net/tc_act/tc_gact.h>
#include <net/tc_act/tc_mirred.h>
#include <net/tc_act/tc_skbedit.h>
+#include <net/net_shaper.h>
#include "iavf_type.h"
#include <linux/avf/virtchnl.h>
@@ -336,6 +337,7 @@ struct iavf_adapter {
#define IAVF_FLAG_AQ_DISABLE_CTAG_VLAN_INSERTION BIT_ULL(36)
#define IAVF_FLAG_AQ_ENABLE_STAG_VLAN_INSERTION BIT_ULL(37)
#define IAVF_FLAG_AQ_DISABLE_STAG_VLAN_INSERTION BIT_ULL(38)
+#define IAVF_FLAG_AQ_CONFIGURE_QUEUES_BW BIT_ULL(39)
/* flags for processing extended capability messages during
* __IAVF_INIT_EXTENDED_CAPS. Each capability exchange requires
@@ -581,6 +583,7 @@ void iavf_virtchnl_completion(struct iavf_adapter *adapter,
int iavf_config_rss(struct iavf_adapter *adapter);
int iavf_lan_add_device(struct iavf_adapter *adapter);
int iavf_lan_del_device(struct iavf_adapter *adapter);
+void iavf_cfg_queues_bw(struct iavf_adapter *adapter);
void iavf_enable_channels(struct iavf_adapter *adapter);
void iavf_disable_channels(struct iavf_adapter *adapter);
void iavf_add_cloud_filter(struct iavf_adapter *adapter);
diff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethernet/intel/iavf/iavf_main.c
index f782402cd789..5046a1808687 100644
--- a/drivers/net/ethernet/intel/iavf/iavf_main.c
+++ b/drivers/net/ethernet/intel/iavf/iavf_main.c
@@ -2085,6 +2085,11 @@ static int iavf_process_aq_command(struct iavf_adapter *adapter)
return 0;
}
+ if (adapter->aq_required & IAVF_FLAG_AQ_CONFIGURE_QUEUES_BW) {
+ iavf_cfg_queues_bw(adapter);
+ return 0;
+ }
+
if (adapter->aq_required & IAVF_FLAG_AQ_CONFIGURE_QUEUES) {
iavf_configure_queues(adapter);
return 0;
@@ -2918,6 +2923,30 @@ static void iavf_disable_vf(struct iavf_adapter *adapter)
dev_info(&adapter->pdev->dev, "Reset task did not complete, VF disabled\n");
}
+/**
+ * iavf_reconfig_qs_bw - Call-back task to handle hardware reset
+ * @adapter: board private structure
+ *
+ * After a reset, the shaper parameters of queues need to be replayed again.
+ * Since the net_shaper_info object inside TX rings persists across reset,
+ * set the update flag for all queues so that the virtchnl message is triggered
+ * for all queues.
+ **/
+static void iavf_reconfig_qs_bw(struct iavf_adapter *adapter)
+{
+ int i, num = 0;
+
+ for (i = 0; i < adapter->num_active_queues; i++)
+ if (adapter->tx_rings[i].q_shaper.bw_min ||
+ adapter->tx_rings[i].q_shaper.bw_max) {
+ adapter->tx_rings[i].q_shaper_update = true;
+ num++;
+ }
+
+ if (num)
+ adapter->aq_required |= IAVF_FLAG_AQ_CONFIGURE_QUEUES_BW;
+}
+
/**
* iavf_reset_task - Call-back task to handle hardware reset
* @work: pointer to work_struct
@@ -3124,6 +3153,8 @@ static void iavf_reset_task(struct work_struct *work)
iavf_up_complete(adapter);
iavf_irq_enable(adapter, true);
+
+ iavf_reconfig_qs_bw(adapter);
} else {
iavf_change_state(adapter, __IAVF_DOWN);
wake_up(&adapter->down_waitqueue);
@@ -4893,6 +4924,115 @@ static netdev_features_t iavf_fix_features(struct net_device *netdev,
return iavf_fix_strip_features(adapter, features);
}
+static int iavf_verify_handle(struct net_shaper_binding *binding,
+ const struct net_shaper_handle *handle,
+ struct netlink_ext_ack *extack)
+{
+ struct iavf_adapter *adapter = netdev_priv(binding->netdev);
+ enum net_shaper_scope scope = handle->scope;
+ int qid = handle->id;
+
+ if (scope != NET_SHAPER_SCOPE_QUEUE) {
+ NL_SET_ERR_MSG_FMT(extack, "Invalid shaper handle, unsupported scope %d",
+ scope);
+ return -EOPNOTSUPP;
+ }
+
+ if (qid >= adapter->num_active_queues) {
+ NL_SET_ERR_MSG_FMT(extack, "Invalid shaper handle, queued id %d max %d",
+ qid, adapter->num_active_queues);
+ return -EINVAL;
+ }
+ return 0;
+}
+
+static int
+iavf_shaper_set(struct net_shaper_binding *binding,
+ const struct net_shaper_handle *handle,
+ const struct net_shaper_info *shaper,
+ struct netlink_ext_ack *extack)
+{
+ struct iavf_adapter *adapter = netdev_priv(binding->netdev);
+ bool need_cfg_update = false;
+ int ret = 0;
+
+ ret = iavf_verify_handle(binding, handle, extack);
+ if (ret)
+ return ret;
+
+ if (handle->scope == NET_SHAPER_SCOPE_QUEUE) {
+ struct iavf_ring *tx_ring = &adapter->tx_rings[handle->id];
+
+ tx_ring->q_shaper.bw_min = div_u64(shaper->bw_min, 1000);
+ tx_ring->q_shaper.bw_max = div_u64(shaper->bw_max, 1000);
+ tx_ring->q_shaper_update = true;
+ need_cfg_update = true;
+ }
+
+ if (need_cfg_update)
+ adapter->aq_required |= IAVF_FLAG_AQ_CONFIGURE_QUEUES_BW;
+
+ return 0;
+}
+
+static int iavf_shaper_del(struct net_shaper_binding *binding,
+ const struct net_shaper_handle *handle,
+ struct netlink_ext_ack *extack)
+{
+ struct iavf_adapter *adapter = netdev_priv(binding->netdev);
+ bool need_cfg_update = false;
+ int ret;
+
+ ret = iavf_verify_handle(binding, handle, extack);
+ if (ret < 0)
+ return ret;
+
+ if (handle->scope == NET_SHAPER_SCOPE_QUEUE) {
+ struct iavf_ring *tx_ring = &adapter->tx_rings[handle->id];
+
+ tx_ring->q_shaper.bw_min = 0;
+ tx_ring->q_shaper.bw_max = 0;
+ tx_ring->q_shaper_update = true;
+ need_cfg_update = true;
+ }
+
+ if (need_cfg_update)
+ adapter->aq_required |= IAVF_FLAG_AQ_CONFIGURE_QUEUES_BW;
+
+ return 0;
+}
+
+static int iavf_shaper_group(struct net_shaper_binding *binding,
+ int leaves_count,
+ const struct net_shaper_handle *leaves_handles,
+ const struct net_shaper_info *leaves,
+ const struct net_shaper_handle *root_handle,
+ const struct net_shaper_info *root,
+ struct netlink_ext_ack *extack)
+{
+ return -EOPNOTSUPP;
+}
+
+static int iavf_shaper_cap(struct net_shaper_binding *binding,
+ enum net_shaper_scope scope,
+ unsigned long *flags)
+{
+ if (scope != NET_SHAPER_SCOPE_QUEUE)
+ return -EOPNOTSUPP;
+
+ *flags = BIT(NET_SHAPER_A_CAPABILITIES_SUPPORT_BW_MIN) |
+ BIT(NET_SHAPER_A_CAPABILITIES_SUPPORT_BW_MAX) |
+ BIT(NET_SHAPER_A_CAPABILITIES_SUPPORT_METRIC_BPS);
+ return 0;
+}
+
+static const struct net_shaper_ops iavf_shaper_ops = {
+ .set = iavf_shaper_set,
+ .delete = iavf_shaper_del,
+ .group = iavf_shaper_group,
+ .capabilities = iavf_shaper_cap,
+};
+
static const struct net_device_ops iavf_netdev_ops = {
.ndo_open = iavf_open,
.ndo_stop = iavf_close,
@@ -4908,6 +5048,7 @@ static const struct net_device_ops iavf_netdev_ops = {
.ndo_fix_features = iavf_fix_features,
.ndo_set_features = iavf_set_features,
.ndo_setup_tc = iavf_setup_tc,
+ .net_shaper_ops = &iavf_shaper_ops,
};
/**
diff --git a/drivers/net/ethernet/intel/iavf/iavf_txrx.h b/drivers/net/ethernet/intel/iavf/iavf_txrx.h
index d7b5587aeb8e..dd503ee50b7f 100644
--- a/drivers/net/ethernet/intel/iavf/iavf_txrx.h
+++ b/drivers/net/ethernet/intel/iavf/iavf_txrx.h
@@ -296,6 +296,8 @@ struct iavf_ring {
*/
u32 rx_buf_len;
+ struct net_shaper_info q_shaper;
+ bool q_shaper_update;
} ____cacheline_internodealigned_in_smp;
#define IAVF_ITR_ADAPTIVE_MIN_INC 0x0002
diff --git a/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c b/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c
index 7e810b65380c..f719a6724774 100644
--- a/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c
+++ b/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c
@@ -1507,6 +1507,60 @@ iavf_set_adapter_link_speed_from_vpe(struct iavf_adapter *adapter,
adapter->link_speed = vpe->event_data.link_event.link_speed;
}
+/**
+ * iavf_cfg_queues_bw - configure bandwidth of allocated queues
+ * @adapter: iavf adapter structure instance
+ *
+ * This function requests PF to configure queue bandwidth of allocated queues
+ */
+void iavf_cfg_queues_bw(struct iavf_adapter *adapter)
+{
+ struct virtchnl_queues_bw_cfg *qs_bw_cfg;
+ struct net_shaper_info *q_shaper;
+ int qs_to_update = 0;
+ int i, inx = 0;
+ size_t len;
+
+ if (adapter->current_op != VIRTCHNL_OP_UNKNOWN) {
+ /* bail because we already have a command pending */
+ dev_err(&adapter->pdev->dev,
+ "Cannot set tc queue bw, command %d pending\n",
+ adapter->current_op);
+ return;
+ }
+
+ for (i = 0; i < adapter->num_active_queues; i++) {
+ if (adapter->tx_rings[i].q_shaper_update)
+ qs_to_update++;
+ }
+ len = struct_size(qs_bw_cfg, cfg, qs_to_update);
+ qs_bw_cfg = kzalloc(len, GFP_KERNEL);
+ if (!qs_bw_cfg)
+ return;
+
+ qs_bw_cfg->vsi_id = adapter->vsi.id;
+ qs_bw_cfg->num_queues = qs_to_update;
+
+ for (i = 0; i < adapter->num_active_queues; i++) {
+ struct iavf_ring *tx_ring = &adapter->tx_rings[i];
+
+ q_shaper = &tx_ring->q_shaper;
+ if (tx_ring->q_shaper_update) {
+ qs_bw_cfg->cfg[inx].queue_id = i;
+ qs_bw_cfg->cfg[inx].shaper.peak = q_shaper->bw_max;
+ qs_bw_cfg->cfg[inx].shaper.committed = q_shaper->bw_min;
+ qs_bw_cfg->cfg[inx].tc = 0;
+ inx++;
+ }
+ }
+
+ adapter->current_op = VIRTCHNL_OP_CONFIG_QUEUE_BW;
+ adapter->aq_required &= ~IAVF_FLAG_AQ_CONFIGURE_QUEUES_BW;
+ iavf_send_pf_msg(adapter, VIRTCHNL_OP_CONFIG_QUEUE_BW,
+ (u8 *)qs_bw_cfg, len);
+ kfree(qs_bw_cfg);
+}
+
/**
* iavf_enable_channels
* @adapter: adapter structure
@@ -2227,6 +2281,10 @@ void iavf_virtchnl_completion(struct iavf_adapter *adapter,
VIRTCHNL_RSS_ALG_TOEPLITZ_SYMMETRIC;
break;
+ case VIRTCHNL_OP_CONFIG_QUEUE_BW:
+ dev_warn(&adapter->pdev->dev, "Failed to Config Queue BW, error %s\n",
+ iavf_stat_str(&adapter->hw, v_retval));
+ break;
default:
dev_err(&adapter->pdev->dev, "PF returned error %d (%s) to our request %d\n",
v_retval, iavf_stat_str(&adapter->hw, v_retval),
@@ -2569,6 +2627,13 @@ void iavf_virtchnl_completion(struct iavf_adapter *adapter,
if (!v_retval)
iavf_netdev_features_vlan_strip_set(netdev, false);
break;
+ case VIRTCHNL_OP_CONFIG_QUEUE_BW: {
+ int i;
+ /* shaper configuration is successful for all queues */
+ for (i = 0; i < adapter->num_active_queues; i++)
+ adapter->tx_rings[i].q_shaper_update = false;
+ }
+ break;
default:
if (adapter->current_op && (v_opcode != adapter->current_op))
dev_warn(&adapter->pdev->dev, "Expected response %d from PF, received %d\n",
--
2.45.2
^ permalink raw reply related [flat|nested] 29+ messages in thread* Re: [PATCH v5 net-next 11/12] iavf: Add net_shaper_ops support
2024-08-29 15:17 ` [PATCH v5 net-next 11/12] iavf: Add net_shaper_ops support Paolo Abeni
@ 2024-08-30 2:09 ` Jakub Kicinski
0 siblings, 0 replies; 29+ messages in thread
From: Jakub Kicinski @ 2024-08-30 2:09 UTC (permalink / raw)
To: Paolo Abeni
Cc: netdev, Jiri Pirko, Madhu Chittim, Sridhar Samudrala,
Simon Horman, John Fastabend, Sunil Kovvuri Goutham,
Jamal Hadi Salim, Donald Hunter, anthony.l.nguyen,
przemyslaw.kitszel, intel-wired-lan, edumazet
On Thu, 29 Aug 2024 17:17:04 +0200 Paolo Abeni wrote:
> +static int iavf_verify_handle(struct net_shaper_binding *binding,
> + const struct net_shaper_handle *handle,
> + struct netlink_ext_ack *extack)
> +{
> + struct iavf_adapter *adapter = netdev_priv(binding->netdev);
> + enum net_shaper_scope scope = handle->scope;
> + int qid = handle->id;
> +
> + if (scope != NET_SHAPER_SCOPE_QUEUE) {
should be checked by the core. add "mask of supported scopes" to caps
> + NL_SET_ERR_MSG_FMT(extack, "Invalid shaper handle, unsupported scope %d",
> + scope);
> + return -EOPNOTSUPP;
> + }
> +
> + if (qid >= adapter->num_active_queues) {
should be checked by the core..
we prolly want to trim the queue shapers on channel reconfig,
then, too? :(
> + NL_SET_ERR_MSG_FMT(extack, "Invalid shaper handle, queued id %d max %d",
> + qid, adapter->num_active_queues);
> + return -EINVAL;
> + }
> + return 0;
> +}
> +static int iavf_shaper_group(struct net_shaper_binding *binding,
> + int leaves_count,
> + const struct net_shaper_handle *leaves_handles,
> + const struct net_shaper_info *leaves,
> + const struct net_shaper_handle *root_handle,
> + const struct net_shaper_info *root,
> + struct netlink_ext_ack *extack)
> +{
> + return -EOPNOTSUPP;
Core should check if op is defined.
^ permalink raw reply [flat|nested] 29+ messages in thread
* [PATCH v5 net-next 12/12] iavf: add support to exchange qos capabilities
2024-08-29 15:16 [PATCH v5 net-next 00/12] net: introduce TX H/W shaping API Paolo Abeni
` (10 preceding siblings ...)
2024-08-29 15:17 ` [PATCH v5 net-next 11/12] iavf: Add net_shaper_ops support Paolo Abeni
@ 2024-08-29 15:17 ` Paolo Abeni
11 siblings, 0 replies; 29+ messages in thread
From: Paolo Abeni @ 2024-08-29 15:17 UTC (permalink / raw)
To: netdev
Cc: Jakub Kicinski, Jiri Pirko, Madhu Chittim, Sridhar Samudrala,
Simon Horman, John Fastabend, Sunil Kovvuri Goutham,
Jamal Hadi Salim, Donald Hunter, anthony.l.nguyen,
przemyslaw.kitszel, intel-wired-lan, edumazet
From: Sudheer Mogilappagari <sudheer.mogilappagari@intel.com>
During driver initialization VF determines QOS capability is allowed
by PF and receives QOS parameters. After which quanta size for queues
is configured which is not configurable and is set to 1KB currently.
Signed-off-by: Sudheer Mogilappagari <sudheer.mogilappagari@intel.com>
---
drivers/net/ethernet/intel/iavf/iavf.h | 10 ++
drivers/net/ethernet/intel/iavf/iavf_main.c | 51 +++++++++-
.../net/ethernet/intel/iavf/iavf_virtchnl.c | 92 ++++++++++++++++++-
3 files changed, 150 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/intel/iavf/iavf.h b/drivers/net/ethernet/intel/iavf/iavf.h
index a84bdbfbb0f7..75ac69670789 100644
--- a/drivers/net/ethernet/intel/iavf/iavf.h
+++ b/drivers/net/ethernet/intel/iavf/iavf.h
@@ -251,6 +251,9 @@ struct iavf_cloud_filter {
#define IAVF_RESET_WAIT_DETECTED_COUNT 500
#define IAVF_RESET_WAIT_COMPLETE_COUNT 2000
+#define IAVF_MAX_QOS_TC_NUM 8
+#define IAVF_DEFAULT_QUANTA_SIZE 1024
+
/* board specific private data structure */
struct iavf_adapter {
struct workqueue_struct *wq;
@@ -338,6 +341,8 @@ struct iavf_adapter {
#define IAVF_FLAG_AQ_ENABLE_STAG_VLAN_INSERTION BIT_ULL(37)
#define IAVF_FLAG_AQ_DISABLE_STAG_VLAN_INSERTION BIT_ULL(38)
#define IAVF_FLAG_AQ_CONFIGURE_QUEUES_BW BIT_ULL(39)
+#define IAVF_FLAG_AQ_CFG_QUEUES_QUANTA_SIZE BIT_ULL(40)
+#define IAVF_FLAG_AQ_GET_QOS_CAPS BIT_ULL(41)
/* flags for processing extended capability messages during
* __IAVF_INIT_EXTENDED_CAPS. Each capability exchange requires
@@ -410,6 +415,8 @@ struct iavf_adapter {
VIRTCHNL_VF_OFFLOAD_FDIR_PF)
#define ADV_RSS_SUPPORT(_a) ((_a)->vf_res->vf_cap_flags & \
VIRTCHNL_VF_OFFLOAD_ADV_RSS_PF)
+#define QOS_ALLOWED(_a) ((_a)->vf_res->vf_cap_flags & \
+ VIRTCHNL_VF_OFFLOAD_QOS)
struct virtchnl_vf_resource *vf_res; /* incl. all VSIs */
struct virtchnl_vsi_resource *vsi_res; /* our LAN VSI */
struct virtchnl_version_info pf_version;
@@ -418,6 +425,7 @@ struct iavf_adapter {
struct virtchnl_vlan_caps vlan_v2_caps;
u16 msg_enable;
struct iavf_eth_stats current_stats;
+ struct virtchnl_qos_cap_list *qos_caps;
struct iavf_vsi vsi;
u32 aq_wait_count;
/* RSS stuff */
@@ -584,6 +592,8 @@ int iavf_config_rss(struct iavf_adapter *adapter);
int iavf_lan_add_device(struct iavf_adapter *adapter);
int iavf_lan_del_device(struct iavf_adapter *adapter);
void iavf_cfg_queues_bw(struct iavf_adapter *adapter);
+void iavf_cfg_queues_quanta_size(struct iavf_adapter *adapter);
+void iavf_get_qos_caps(struct iavf_adapter *adapter);
void iavf_enable_channels(struct iavf_adapter *adapter);
void iavf_disable_channels(struct iavf_adapter *adapter);
void iavf_add_cloud_filter(struct iavf_adapter *adapter);
diff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethernet/intel/iavf/iavf_main.c
index 5046a1808687..42b3dbc0aa98 100644
--- a/drivers/net/ethernet/intel/iavf/iavf_main.c
+++ b/drivers/net/ethernet/intel/iavf/iavf_main.c
@@ -2090,6 +2090,16 @@ static int iavf_process_aq_command(struct iavf_adapter *adapter)
return 0;
}
+ if (adapter->aq_required & IAVF_FLAG_AQ_GET_QOS_CAPS) {
+ iavf_get_qos_caps(adapter);
+ return 0;
+ }
+
+ if (adapter->aq_required & IAVF_FLAG_AQ_CFG_QUEUES_QUANTA_SIZE) {
+ iavf_cfg_queues_quanta_size(adapter);
+ return 0;
+ }
+
if (adapter->aq_required & IAVF_FLAG_AQ_CONFIGURE_QUEUES) {
iavf_configure_queues(adapter);
return 0;
@@ -2675,6 +2685,9 @@ static void iavf_init_config_adapter(struct iavf_adapter *adapter)
/* request initial VLAN offload settings */
iavf_set_vlan_offload_features(adapter, 0, netdev->features);
+ if (QOS_ALLOWED(adapter))
+ adapter->aq_required |= IAVF_FLAG_AQ_GET_QOS_CAPS;
+
iavf_schedule_finish_config(adapter);
return;
@@ -4946,6 +4959,31 @@ static int iavf_verify_handle(struct net_shaper_binding *binding,
return 0;
}
+static int
+iavf_verify_shaper_info(struct net_shaper_binding *binding,
+ const struct net_shaper_handle *handle,
+ const struct net_shaper_info *shaper,
+ struct netlink_ext_ack *extack)
+{
+ struct iavf_adapter *adapter = netdev_priv(binding->netdev);
+ u64 vf_max;
+ int ret;
+
+ ret = iavf_verify_handle(binding, handle, extack);
+ if (ret)
+ return ret;
+
+ if (handle->scope == NET_SHAPER_SCOPE_QUEUE) {
+ vf_max = adapter->qos_caps->cap[0].shaper.peak;
+ if (vf_max && shaper->bw_max > vf_max) {
+ NL_SET_ERR_MSG_FMT(extack, "Max rate (%llu) of queue %d can't exceed max TX rate of VF (%llu kbps)",
+ shaper->bw_max, handle->id,
+ vf_max);
+ }
+ }
+ return 0;
+}
+
static int
iavf_shaper_set(struct net_shaper_binding *binding,
const struct net_shaper_handle *handle,
@@ -4956,7 +4994,7 @@ iavf_shaper_set(struct net_shaper_binding *binding,
bool need_cfg_update = false;
int ret = 0;
- ret = iavf_verify_handle(binding, handle, extack);
+ ret = iavf_verify_shaper_info(binding, handle, shaper, extack);
if (ret)
return ret;
@@ -5195,7 +5233,7 @@ static int iavf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
struct net_device *netdev;
struct iavf_adapter *adapter = NULL;
struct iavf_hw *hw = NULL;
- int err;
+ int err, len;
err = pci_enable_device(pdev);
if (err)
@@ -5263,6 +5301,13 @@ static int iavf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
hw->bus.func = PCI_FUNC(pdev->devfn);
hw->bus.bus_id = pdev->bus->number;
+ len = struct_size(adapter->qos_caps, cap, IAVF_MAX_QOS_TC_NUM);
+ adapter->qos_caps = kzalloc(len, GFP_KERNEL);
+ if (!adapter->qos_caps) {
+ err = -ENOMEM;
+ goto err_alloc_qos_cap;
+ }
+
/* set up the locks for the AQ, do this only once in probe
* and destroy them only once in remove
*/
@@ -5301,6 +5346,8 @@ static int iavf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
/* Initialization goes on in the work. Do not add more of it below. */
return 0;
+err_alloc_qos_cap:
+ iounmap(hw->hw_addr);
err_ioremap:
destroy_workqueue(adapter->wq);
err_alloc_wq:
diff --git a/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c b/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c
index f719a6724774..665eb52f11b2 100644
--- a/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c
+++ b/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c
@@ -151,7 +151,8 @@ int iavf_send_vf_config_msg(struct iavf_adapter *adapter)
VIRTCHNL_VF_OFFLOAD_USO |
VIRTCHNL_VF_OFFLOAD_FDIR_PF |
VIRTCHNL_VF_OFFLOAD_ADV_RSS_PF |
- VIRTCHNL_VF_CAP_ADV_LINK_SPEED;
+ VIRTCHNL_VF_CAP_ADV_LINK_SPEED |
+ VIRTCHNL_VF_OFFLOAD_QOS;
adapter->current_op = VIRTCHNL_OP_GET_VF_RESOURCES;
adapter->aq_required &= ~IAVF_FLAG_AQ_GET_CONFIG;
@@ -1507,6 +1508,76 @@ iavf_set_adapter_link_speed_from_vpe(struct iavf_adapter *adapter,
adapter->link_speed = vpe->event_data.link_event.link_speed;
}
+/**
+ * iavf_get_qos_caps - get qos caps support
+ * @adapter: iavf adapter struct instance
+ *
+ * This function requests PF for Supported QoS Caps.
+ */
+void iavf_get_qos_caps(struct iavf_adapter *adapter)
+{
+ if (adapter->current_op != VIRTCHNL_OP_UNKNOWN) {
+ /* bail because we already have a command pending */
+ dev_err(&adapter->pdev->dev,
+ "Cannot get qos caps, command %d pending\n",
+ adapter->current_op);
+ return;
+ }
+
+ adapter->current_op = VIRTCHNL_OP_GET_QOS_CAPS;
+ adapter->aq_required &= ~IAVF_FLAG_AQ_GET_QOS_CAPS;
+ iavf_send_pf_msg(adapter, VIRTCHNL_OP_GET_QOS_CAPS, NULL, 0);
+}
+
+/**
+ * iavf_set_quanta_size - set quanta size of queue chunk
+ * @adapter: iavf adapter struct instance
+ * @quanta_size: quanta size in bytes
+ * @queue_index: starting index of queue chunk
+ * @num_queues: number of queues in the queue chunk
+ *
+ * This function requests PF to set quanta size of queue chunk
+ * starting at queue_index.
+ */
+static void
+iavf_set_quanta_size(struct iavf_adapter *adapter, u16 quanta_size,
+ u16 queue_index, u16 num_queues)
+{
+ struct virtchnl_quanta_cfg quanta_cfg;
+
+ if (adapter->current_op != VIRTCHNL_OP_UNKNOWN) {
+ /* bail because we already have a command pending */
+ dev_err(&adapter->pdev->dev,
+ "Cannot set queue quanta size, command %d pending\n",
+ adapter->current_op);
+ return;
+ }
+
+ adapter->current_op = VIRTCHNL_OP_CONFIG_QUANTA;
+ quanta_cfg.quanta_size = quanta_size;
+ quanta_cfg.queue_select.type = VIRTCHNL_QUEUE_TYPE_TX;
+ quanta_cfg.queue_select.start_queue_id = queue_index;
+ quanta_cfg.queue_select.num_queues = num_queues;
+ adapter->aq_required &= ~IAVF_FLAG_AQ_CFG_QUEUES_QUANTA_SIZE;
+ iavf_send_pf_msg(adapter, VIRTCHNL_OP_CONFIG_QUANTA,
+ (u8 *)&quanta_cfg, sizeof(quanta_cfg));
+}
+
+/**
+ * iavf_cfg_queues_quanta_size - configure quanta size of queues
+ * @adapter: adapter structure
+ *
+ * Request that the PF configure quanta size of allocated queues.
+ **/
+void iavf_cfg_queues_quanta_size(struct iavf_adapter *adapter)
+{
+ int quanta_size = IAVF_DEFAULT_QUANTA_SIZE;
+
+ /* Set Queue Quanta Size to default */
+ iavf_set_quanta_size(adapter, quanta_size, 0,
+ adapter->num_active_queues);
+}
+
/**
* iavf_cfg_queues_bw - configure bandwidth of allocated queues
* @adapter: iavf adapter structure instance
@@ -2281,6 +2352,14 @@ void iavf_virtchnl_completion(struct iavf_adapter *adapter,
VIRTCHNL_RSS_ALG_TOEPLITZ_SYMMETRIC;
break;
+ case VIRTCHNL_OP_GET_QOS_CAPS:
+ dev_warn(&adapter->pdev->dev, "Failed to Get Qos CAPs, error %s\n",
+ iavf_stat_str(&adapter->hw, v_retval));
+ break;
+ case VIRTCHNL_OP_CONFIG_QUANTA:
+ dev_warn(&adapter->pdev->dev, "Failed to Config Quanta, error %s\n",
+ iavf_stat_str(&adapter->hw, v_retval));
+ break;
case VIRTCHNL_OP_CONFIG_QUEUE_BW:
dev_warn(&adapter->pdev->dev, "Failed to Config Queue BW, error %s\n",
iavf_stat_str(&adapter->hw, v_retval));
@@ -2627,6 +2706,17 @@ void iavf_virtchnl_completion(struct iavf_adapter *adapter,
if (!v_retval)
iavf_netdev_features_vlan_strip_set(netdev, false);
break;
+ case VIRTCHNL_OP_GET_QOS_CAPS: {
+ u16 len = struct_size(adapter->qos_caps, cap,
+ IAVF_MAX_QOS_TC_NUM);
+
+ memcpy(adapter->qos_caps, msg, min(msglen, len));
+
+ adapter->aq_required |= IAVF_FLAG_AQ_CFG_QUEUES_QUANTA_SIZE;
+ }
+ break;
+ case VIRTCHNL_OP_CONFIG_QUANTA:
+ break;
case VIRTCHNL_OP_CONFIG_QUEUE_BW: {
int i;
/* shaper configuration is successful for all queues */
--
2.45.2
^ permalink raw reply related [flat|nested] 29+ messages in thread