Rate management on traffic classes + misc
Subsystems (10)
Tariq Toukan
maintainercover Rate management on traffic classes + misc
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Hi,
This patchset consists of multiple features from the team to the mlx5 core and Eth drivers.
The first 5 patches by Carolina are V7 of the feature that adds rate management support on traffic classes in devlink and mlx5, more details below [1].
Patches 6-8 by William reduce the memory consumption for representors to achieve better scalability.
Patches 9-10 by Akiva expose ICM memory consumption per function.
Patches 11-13 expose helpful information on RSS resources in devlink RX reporter diagnose.
Patches 14-15 are simple enhancements by Alex Lazar.
Regards,
Tariq
[1]
This is V7 of the feature. Find V6 here:
https://lore.kernel.org/all/[email protected]/
This feature extends the devlink-rate API to support traffic class (TC) bandwidth management, enabling more granular control over traffic shaping and rate limiting across multiple TCs. The API now allows users to specify bandwidth proportions for different traffic classes in a single command. This is particularly useful for managing Enhanced Transmission Selection (ETS) for groups of Virtual Functions (VFs), allowing precise bandwidth allocation across traffic classes.
Additionally, it refines the QoS handling in net/mlx5 to support TC arbitration and bandwidth management on vports and rate nodes.
Discussions on traffic class shaping in net-shapers began in V5 [2], where we discussed with maintainers whether net-shapers should support traffic classes and how this could be implemented.
Later, after further conversations with Paolo Abeni and Simon Horman, Cosmin provided an update [3], confirming that net-shapers' tree-based hierarchy aligns well with traffic classes when treated as distinct subsets of netdev queues. Since mlx5 enforces a 1:1 mapping between TX queues and traffic classes, this approach seems feasible, though some open questions remain regarding queue reconfiguration and certain mlx5 scheduling behaviors.
[2]
https://lore.kernel.org/netdev/[email protected]/
[3]
https://lore.kernel.org/netdev/[email protected]/
V7:
- Fixed disabling tc-bw on leaf nodes that did not have tc-bw configured.
- Fixed an issue where tc-bw was disabled on a node with assigned vports, ensuring that vport->qos.sched_node->parent is correctly updated with the cloned node.
- Declared a constant for the maximum allowed Traffic Class index in devlink rate.
- Added a range check to validate rate-tc-index.
- Added documentation for the tc-bw argument.
- Add a validation check to ensure that the total bandwidth assigned to all traffic classes sums to 100.
Akiva Goldberger (2):
net/mlx5: Rename and move mlx5_esw_query_vport_vhca_id net/mlx5: Expose ICM consumption per function
Alexei Lazar (2):
net/mlx5: Extend Ethtool loopback selftest to support non-linear SKB net/mlx5: XDP, Enable TX side XDP multi-buffer support
Amir Tzin (3):
net/mlx5e: Move RQs diagnose to a dedicated function net/mlx5e: Add direct TIRs to devlink rx reporter diagnose net/mlx5e: Expose RSS via devlink rx reporter diagnose
Carolina Jubran (5):
devlink: Extend devlink rate API with traffic classes bandwidth
management
net/mlx5: Add no-op implementation for setting tc-bw on rate objects net/mlx5: Add support for setting tc-bw on nodes
net/mlx5: Add traffic class scheduling support for vport QoS net/mlx5: Manage TC arbiter nodes and implement full support for tc-bw
William Tu (3):
net/mlx5e: reduce the max log mpwrq sz for ECPF and reps net/mlx5e: reduce rep rxq depth to 256 for ECPF net/mlx5e: set the tx_queue_len for pfifo_fast
Documentation/netlink/specs/devlink.yaml | 36 +- .../networking/devlink/devlink-port.rst | 7 + Documentation/networking/devlink/mlx5.rst | 4 + .../net/ethernet/mellanox/mlx5/core/devlink.c | 2 + .../mellanox/mlx5/core/diag/reporter_vnic.c | 46 + drivers/net/ethernet/mellanox/mlx5/core/en.h | 3 - .../ethernet/mellanox/mlx5/core/en/params.c | 16 +- .../ethernet/mellanox/mlx5/core/en/params.h | 1 - .../mellanox/mlx5/core/en/reporter_rx.c | 119 ++- .../mellanox/mlx5/core/en/reporter_tx.c | 1 - .../net/ethernet/mellanox/mlx5/core/en/rss.c | 15 + .../net/ethernet/mellanox/mlx5/core/en/rss.h | 3 + .../ethernet/mellanox/mlx5/core/en/rx_res.c | 9 +- .../ethernet/mellanox/mlx5/core/en/rx_res.h | 5 + .../net/ethernet/mellanox/mlx5/core/en/xdp.c | 49 +- .../net/ethernet/mellanox/mlx5/core/en_main.c | 29 - .../net/ethernet/mellanox/mlx5/core/en_rep.c | 5 + .../ethernet/mellanox/mlx5/core/en_selftest.c | 3 + .../net/ethernet/mellanox/mlx5/core/esw/qos.c | 815 +++++++++++++++++- .../net/ethernet/mellanox/mlx5/core/esw/qos.h | 4 + .../net/ethernet/mellanox/mlx5/core/eswitch.h | 13 +- .../mellanox/mlx5/core/eswitch_offloads.c | 29 +- .../ethernet/mellanox/mlx5/core/lib/fs_ttc.c | 19 + .../ethernet/mellanox/mlx5/core/lib/fs_ttc.h | 1 + .../ethernet/mellanox/mlx5/core/mlx5_core.h | 2 + .../net/ethernet/mellanox/mlx5/core/vport.c | 25 + include/net/devlink.h | 9 + include/uapi/linux/devlink.h | 4 + net/devlink/netlink_gen.c | 16 +- net/devlink/netlink_gen.h | 2 + net/devlink/rate.c | 127 +++ 31 files changed, 1274 insertions(+), 145 deletions(-)
base-commit: acdefab0dcbc3833b5a734ab80d792bb778517a0
Signature · 1 line
2.45.0
Tariq Toukan
maintainerPATCH 1/15 devlink: Extend devlink rate API with traffic classes bandwidth management
From: Carolina Jubran <[email protected]>
Introduce support for specifying bandwidth proportions between traffic classes (TC) in the devlink-rate API. This new option allows users to allocate bandwidth across multiple traffic classes in a single command.
This feature provides a more granular control over traffic management, especially for scenarios requiring Enhanced Transmission Selection.
Users can now define a specific bandwidth share for each traffic class, such as allocating 20% for TC0 (TCP/UDP) and 80% for TC5 (RoCE).
Example:
DEV=pci/0000:08:00.0
$ devlink port function rate add $DEV/vfs_group tx_share 10Gbit \ tx_max 50Gbit tc-bw 0:20 1:0 2:0 3:0 4:0 5:80 6:0 7:0
$ devlink port function rate set $DEV/vfs_group \ tc-bw 0:20 1:0 2:0 3:0 4:0 5:20 6:60 7:0
Example usage with ynl:
./tools/net/ynl/cli.py --spec Documentation/netlink/specs/devlink.yaml \
--do rate-set --json '{
"bus-name": "pci",
"dev-name": "0000:08:00.0",
"port-index": 1,
"rate-tc-bws": [
{"rate-tc-index": 0, "rate-tc-bw": 50},
{"rate-tc-index": 1, "rate-tc-bw": 50},
{"rate-tc-index": 2, "rate-tc-bw": 0},
{"rate-tc-index": 3, "rate-tc-bw": 0},
{"rate-tc-index": 4, "rate-tc-bw": 0},
{"rate-tc-index": 5, "rate-tc-bw": 0},
{"rate-tc-index": 6, "rate-tc-bw": 0},
{"rate-tc-index": 7, "rate-tc-bw": 0} ]
}'
./tools/net/ynl/cli.py --spec Documentation/netlink/specs/devlink.yaml \
--do rate-get --json '{
"bus-name": "pci",
"dev-name": "0000:08:00.0",
"port-index": 1
}'
output for rate-get:
{'bus-name': 'pci',
'dev-name': '0000:08:00.0',
'port-index': 1,
'rate-tc-bws': [{'rate-tc-bw': 50, 'rate-tc-index': 0},
{'rate-tc-bw': 50, 'rate-tc-index': 1},
{'rate-tc-bw': 0, 'rate-tc-index': 2},
{'rate-tc-bw': 0, 'rate-tc-index': 3},
{'rate-tc-bw': 0, 'rate-tc-index': 4},
{'rate-tc-bw': 0, 'rate-tc-index': 5},
{'rate-tc-bw': 0, 'rate-tc-index': 6},
{'rate-tc-bw': 0, 'rate-tc-index': 7}], 'rate-tx-max': 0,
'rate-tx-priority': 0,
'rate-tx-share': 0,
'rate-tx-weight': 0,
'rate-type': 'leaf'}
--- Documentation/netlink/specs/devlink.yaml | 36 ++++- .../networking/devlink/devlink-port.rst | 7 + include/net/devlink.h | 9 ++ include/uapi/linux/devlink.h | 4 + net/devlink/netlink_gen.c | 16 ++- net/devlink/netlink_gen.h | 2 + net/devlink/rate.c | 127 ++++++++++++++++++ 7 files changed, 196 insertions(+), 5 deletions(-)
Documentation/netlink/specs/devlink.yaml +35 -1
@@ -202,6 +202,11 @@ definitions: name: exception - name: control + - + name: devlink-rate-tc-index-max + header: net/devlink.h + type: const + value: 7 attribute-sets: -
@@ -820,7 +825,26 @@ attribute-sets: - name: region-direct type: flag - + - + name: rate-tc-bws + type: nest + multi-attr: true + nested-attributes: dl-rate-tc-bws + - + name: rate-tc-index + type: u8 + checks: + min: 0 + max: devlink-rate-tc-index-max + - + name: rate-tc-bw + type: u32 + doc: | + Specifies the bandwidth allocation for the Traffic Class as a + percentage. + checks: + min: 0 + max: 100 - name: dl-dev-stats subset-of: devlink
@@ -1225,6 +1249,14 @@ attribute-sets: - name: flash type: flag + - + name: dl-rate-tc-bws + subset-of: devlink + attributes: + - + name: rate-tc-index + - + name: rate-tc-bw operations: enum-model: directional
@@ -2149,6 +2181,7 @@ operations: - rate-tx-priority - rate-tx-weight - rate-parent-node-name + - rate-tc-bws - name: rate-new
@@ -2169,6 +2202,7 @@ operations: - rate-tx-priority - rate-tx-weight - rate-parent-node-name + - rate-tc-bws - name: rate-del
Documentation/networking/devlink/devlink-port.rst +7 -0
@@ -418,6 +418,13 @@ API allows to configure following rate object's parameters: to all node children limits. ``tx_max`` is an upper limit for children. ``tx_share`` is a total bandwidth distributed among children. +``tc_bw`` + Allow users to set the bandwidth allocation per traffic class on rate + objects. This enables fine-grained QoS configurations by assigning specific + bandwidth percentages to different traffic classes. When applied to a + non-leaf node, tc_bw determines how bandwidth is shared among its child + elements. + ``tx_priority`` and ``tx_weight`` can be used simultaneously. In that case nodes with the same priority form a WFQ subgroup in the sibling group and arbitration among them is based on assigned weights.
include/net/devlink.h +9 -0
@@ -20,6 +20,7 @@#include <uapi/linux/devlink.h> #include <linux/xarray.h> #include <linux/firmware.h> +#include <linux/dcbnl.h> struct devlink ;struct devlink_linecard ;
@@ -99,6 +100,8 @@ struct devlink_port_attrs { }; }; +#define DEVLINK_RATE_TC_INDEX_MAX (IEEE_8021QAZ_MAX_TCS - 1) +struct devlink_rate {struct list_head list;enum devlink_rate_type type;
@@ -118,6 +121,8 @@ struct devlink_rate {u32 tx_priority;u32 tx_weight; + +u32 tc_bw[IEEE_8021QAZ_MAX_TCS ]; };struct devlink_port {
@@ -1482,6 +1487,8 @@ struct devlink_ops { u32 tx_priority, struct netlink_ext_ack *extack);int (*rate_leaf_tx_weight_set)(struct devlink_rate *devlink_rate,void *priv,u32 tx_weight,struct netlink_ext_ack *extack); +int (*rate_leaf_tc_bw_set)(struct devlink_rate *devlink_rate,void *priv, +u32 *tc_bw,struct netlink_ext_ack *extack);int (*rate_node_tx_share_set)(struct devlink_rate *devlink_rate,void *priv,u64 tx_share,struct netlink_ext_ack *extack); int (*rate_node_tx_max_set)(struct devlink_rate *devlink_rate, void *priv,
@@ -1490,6 +1497,8 @@ struct devlink_ops { u32 tx_priority, struct netlink_ext_ack *extack);int (*rate_node_tx_weight_set)(struct devlink_rate *devlink_rate,void *priv,u32 tx_weight,struct netlink_ext_ack *extack); +int (*rate_node_tc_bw_set)(struct devlink_rate *devlink_rate,void *priv, +u32 *tc_bw,struct netlink_ext_ack *extack);int (*rate_node_new)(struct devlink_rate *rate_node,void **priv,struct netlink_ext_ack *extack); int (*rate_node_del)(struct devlink_rate *rate_node, void *priv,
include/uapi/linux/devlink.h +4 -0
@@ -614,6 +614,10 @@ enum devlink_attr {DEVLINK_ATTR_REGION_DIRECT ,/* flag */ +DEVLINK_ATTR_RATE_TC_BWS ,/* nested */ +DEVLINK_ATTR_RATE_TC_INDEX ,/* u8 */ +DEVLINK_ATTR_RATE_TC_BW ,/* u32 */ +/* Add new attributes above here, update the spec in * Documentation/netlink/specs/devlink.yaml and re-generate * net/devlink/netlink_gen.c.
net/devlink/netlink_gen.c +12 -4
@@ -9,6 +9,7 @@#include "netlink_gen.h" #include <uapi/linux/devlink.h> +#include <net/devlink.h> /* Common nested types */ const struct nla_policy devlink_dl_port_function_nl_policy[DEVLINK_PORT_FN_ATTR_CAPS +1 ] = {
@@ -18,6 +19,11 @@ const struct nla_policy devlink_dl_port_function_nl_policy[DEVLINK_PORT_FN_ATTR_ [DEVLINK_PORT_FN_ATTR_CAPS] = NLA_POLICY_BITFIELD32(15), }; +const struct nla_policy devlink_dl_rate_tc_bws_nl_policy[DEVLINK_ATTR_RATE_TC_BW +1 ] = { + [DEVLINK_ATTR_RATE_TC_INDEX ] =NLA_POLICY_RANGE (NLA_U8 ,0 ,DEVLINK_RATE_TC_INDEX_MAX ), + [DEVLINK_ATTR_RATE_TC_BW ] =NLA_POLICY_RANGE (NLA_U32 ,0 ,100 ), +}; +const struct nla_policy devlink_dl_selftest_id_nl_policy[DEVLINK_ATTR_SELFTEST_ID_FLASH +1 ] = { [DEVLINK_ATTR_SELFTEST_ID_FLASH ] = { .type =NLA_FLAG , }, };
@@ -496,7 +502,7 @@ static const struct nla_policy devlink_rate_get_dump_nl_policy[DEVLINK_ATTR_DEV_ };/* DEVLINK_CMD_RATE_SET - do */ -static const struct nla_policy devlink_rate_set_nl_policy[DEVLINK_ATTR_RATE_TX_WEIGHT +1 ] = { +static const struct nla_policy devlink_rate_set_nl_policy[DEVLINK_ATTR_RATE_TC_BWS +1 ] = { [DEVLINK_ATTR_BUS_NAME ] = { .type =NLA_NUL_STRING , }, [DEVLINK_ATTR_DEV_NAME ] = { .type =NLA_NUL_STRING , }, [DEVLINK_ATTR_RATE_NODE_NAME ] = { .type =NLA_NUL_STRING , },
@@ -505,10 +511,11 @@ static const struct nla_policy devlink_rate_set_nl_policy[DEVLINK_ATTR_RATE_TX_W [DEVLINK_ATTR_RATE_TX_PRIORITY] = { .type = NLA_U32, }, [DEVLINK_ATTR_RATE_TX_WEIGHT] = { .type = NLA_U32, }, [DEVLINK_ATTR_RATE_PARENT_NODE_NAME] = { .type = NLA_NUL_STRING, }, + [DEVLINK_ATTR_RATE_TC_BWS] = NLA_POLICY_NESTED(devlink_dl_rate_tc_bws_nl_policy), };/* DEVLINK_CMD_RATE_NEW - do */ -static const struct nla_policy devlink_rate_new_nl_policy[DEVLINK_ATTR_RATE_TX_WEIGHT +1 ] = { +static const struct nla_policy devlink_rate_new_nl_policy[DEVLINK_ATTR_RATE_TC_BWS +1 ] = { [DEVLINK_ATTR_BUS_NAME ] = { .type =NLA_NUL_STRING , }, [DEVLINK_ATTR_DEV_NAME ] = { .type =NLA_NUL_STRING , }, [DEVLINK_ATTR_RATE_NODE_NAME ] = { .type =NLA_NUL_STRING , },
@@ -517,6 +524,7 @@ static const struct nla_policy devlink_rate_new_nl_policy[DEVLINK_ATTR_RATE_TX_W [DEVLINK_ATTR_RATE_TX_PRIORITY] = { .type = NLA_U32, }, [DEVLINK_ATTR_RATE_TX_WEIGHT] = { .type = NLA_U32, }, [DEVLINK_ATTR_RATE_PARENT_NODE_NAME] = { .type = NLA_NUL_STRING, }, + [DEVLINK_ATTR_RATE_TC_BWS] = NLA_POLICY_NESTED(devlink_dl_rate_tc_bws_nl_policy), };/* DEVLINK_CMD_RATE_DEL - do */
@@ -1164,7 +1172,7 @@ const struct genl_split_ops devlink_nl_ops[74] = { .doit = devlink_nl_rate_set_doit, .post_doit = devlink_nl_post_doit, .policy = devlink_rate_set_nl_policy, - .maxattr = DEVLINK_ATTR_RATE_TX_WEIGHT, + .maxattr = DEVLINK_ATTR_RATE_TC_BWS, .flags = GENL_ADMIN_PERM | GENL_CMD_CAP_DO, }, {
@@ -1174,7 +1182,7 @@ const struct genl_split_ops devlink_nl_ops[74] = { .doit = devlink_nl_rate_new_doit, .post_doit = devlink_nl_post_doit, .policy = devlink_rate_new_nl_policy, - .maxattr = DEVLINK_ATTR_RATE_TX_WEIGHT, + .maxattr = DEVLINK_ATTR_RATE_TC_BWS, .flags = GENL_ADMIN_PERM | GENL_CMD_CAP_DO, }, {
net/devlink/netlink_gen.h +2 -0
@@ -10,9 +10,11 @@#include <net/genetlink.h> #include <uapi/linux/devlink.h> +#include <net/devlink.h> /* Common nested types */ extern const struct nla_policy devlink_dl_port_function_nl_policy[DEVLINK_PORT_FN_ATTR_CAPS +1 ]; +extern const struct nla_policy devlink_dl_rate_tc_bws_nl_policy[DEVLINK_ATTR_RATE_TC_BW +1 ];extern const struct nla_policy devlink_dl_selftest_id_nl_policy[DEVLINK_ATTR_SELFTEST_ID_FLASH +1 ];/* Ops table for devlink */
net/devlink/rate.c +127 -0
163 lines not on this page · raw message
Signature · 1 line
2.45.0
Tariq Toukan
maintainerPATCH 2/15 net/mlx5: Add no-op implementation for setting tc-bw on rate objects
In reply to Tariq ToukanFrom: Carolina Jubran <[email protected]>
Introduce mlx5_esw_devlink_rate_node_tc_bw_set() and mlx5_esw_devlink_rate_leaf_tc_bw_set() with no-op logic.
Future patches will add support for setting traffic class bandwidth on rate objects.
--- drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 2 ++ drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c | 14 ++++++++++++++ drivers/net/ethernet/mellanox/mlx5/core/esw/qos.h | 4 ++++ 3 files changed, 20 insertions(+)
drivers/net/ethernet/mellanox/mlx5/core/devlink.c +2 -0
@@ -320,6 +320,8 @@ static const struct devlink_ops mlx5_devlink_ops = { .eswitch_encap_mode_get = mlx5_devlink_eswitch_encap_mode_get, .rate_leaf_tx_share_set = mlx5_esw_devlink_rate_leaf_tx_share_set, .rate_leaf_tx_max_set = mlx5_esw_devlink_rate_leaf_tx_max_set, + .rate_leaf_tc_bw_set = mlx5_esw_devlink_rate_leaf_tc_bw_set, + .rate_node_tc_bw_set = mlx5_esw_devlink_rate_node_tc_bw_set, .rate_node_tx_share_set = mlx5_esw_devlink_rate_node_tx_share_set, .rate_node_tx_max_set = mlx5_esw_devlink_rate_node_tx_max_set, .rate_node_new = mlx5_esw_devlink_rate_node_new,
drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c +14 -0
@@ -882,6 +882,20 @@ int mlx5_esw_devlink_rate_leaf_tx_max_set(struct devlink_rate *rate_leaf, void *return err; } +int mlx5_esw_devlink_rate_leaf_tc_bw_set (struct devlink_rate *rate_leaf,void *priv, +u32 *tc_bw,struct netlink_ext_ack *extack) +{ +NL_SET_ERR_MSG_MOD (extack,"TC bandwidth shares are not supported on leafs" ); +return -EOPNOTSUPP ; +} + +int mlx5_esw_devlink_rate_node_tc_bw_set (struct devlink_rate *rate_node,void *priv, +u32 *tc_bw,struct netlink_ext_ack *extack) +{ +NL_SET_ERR_MSG_MOD (extack,"TC bandwidth shares are not supported on nodes" ); +return -EOPNOTSUPP ; +} +int mlx5_esw_devlink_rate_node_tx_share_set (struct devlink_rate *rate_node,void *priv,u64 tx_share,struct netlink_ext_ack *extack) {
drivers/net/ethernet/mellanox/mlx5/core/esw/qos.h +4 -0
@@ -21,6 +21,10 @@ int mlx5_esw_devlink_rate_leaf_tx_share_set(struct devlink_rate *rate_leaf, void u64 tx_share, struct netlink_ext_ack *extack);int mlx5_esw_devlink_rate_leaf_tx_max_set (struct devlink_rate *rate_leaf,void *priv,u64 tx_max,struct netlink_ext_ack *extack); +int mlx5_esw_devlink_rate_leaf_tc_bw_set (struct devlink_rate *rate_node,void *priv, +u32 *tc_bw,struct netlink_ext_ack *extack); +int mlx5_esw_devlink_rate_node_tc_bw_set (struct devlink_rate *rate_node,void *priv, +u32 *tc_bw,struct netlink_ext_ack *extack);int mlx5_esw_devlink_rate_node_tx_share_set (struct devlink_rate *rate_node,void *priv,u64 tx_share,struct netlink_ext_ack *extack); int mlx5_esw_devlink_rate_node_tx_max_set(struct devlink_rate *rate_node, void *priv,
Signature · 1 line
2.45.0
Tariq Toukan
maintainerPATCH 3/15 net/mlx5: Add support for setting tc-bw on nodes
In reply to Tariq ToukanFrom: Carolina Jubran <[email protected]>
Introduce support for enabling and disabling Traffic Class (TC) arbitration for existing devlink rate nodes. This patch adds support for a new scheduling node type, SCHED_NODE_TYPE_TC_ARBITER_TSAR.
Key changes include:
- New helper functions for transitioning existing rate nodes to TC arbiter nodes and vice versa. These functions handle the allocation of TC arbiter nodes, copying of child nodes, and restoring vport QoS settings when TC arbitration is disabled.
- Implementation of mlx5_esw_devlink_rate_node_tc_bw_set() to manage tc-bw configuration on nodes.
- Introduced stubs for esw_qos_tc_arbiter_scheduling_setup() and esw_qos_tc_arbiter_scheduling_teardown(), which will be extended in future patches to provide full support for tc-bw on devlink rate objects.
- Validation functions for tc-bw settings, allowing graceful handling of unsupported traffic class bandwidth configurations.
- Updated __esw_qos_alloc_node() to insert the new node into the parent’s children list only if the parent is not NULL. For the root TSAR, the new node is inserted directly after the allocation call.
- Updated esw_qos_create_node_sched_elem to receive max_rate and bw_share values to save the old configuration when changing the group type.
This patch lays the groundwork for future support for configuring tc-bw on devlink rate nodes. Although the infrastructure is in place, full support for tc-bw is not yet implemented; attempts to set tc-bw on nodes will return -EOPNOTSUPP.
No functional changes are introduced at this stage.
--- .../net/ethernet/mellanox/mlx5/core/esw/qos.c | 279 ++++++++++++++++-- 1 file changed, 262 insertions(+), 17 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c +262 -17
@@ -64,11 +64,13 @@ static void esw_qos_domain_release(struct mlx5_eswitch *esw)enum sched_node_type {SCHED_NODE_TYPE_VPORTS_TSAR ,SCHED_NODE_TYPE_VPORT , +SCHED_NODE_TYPE_TC_ARBITER_TSAR , };static const char *const sched_node_type_str[] = { [SCHED_NODE_TYPE_VPORTS_TSAR ] ="vports TSAR" , [SCHED_NODE_TYPE_VPORT ] ="vport" , + [SCHED_NODE_TYPE_TC_ARBITER_TSAR ] ="TC Arbiter TSAR" , };struct mlx5_esw_sched_node {
@@ -92,6 +94,13 @@ struct mlx5_esw_sched_node {struct mlx5_vport *vport; }; +static int esw_qos_num_tcs (struct mlx5_core_dev *dev) +{ +int num_tcs =mlx5_max_tc (dev) +1 ; + +return num_tcs <IEEE_8021QAZ_MAX_TCS ? num_tcs :IEEE_8021QAZ_MAX_TCS ; +} +static void esw_qos_node_set_parent (struct mlx5_esw_sched_node *node,struct mlx5_esw_sched_node *parent) {
@@ -101,6 +110,25 @@ esw_qos_node_set_parent(struct mlx5_esw_sched_node *node, struct mlx5_esw_sched_ node->esw = parent->esw; } +static void +esw_qos_nodes_set_parent (struct list_head *nodes,struct mlx5_esw_sched_node *parent) +{ +struct mlx5_esw_sched_node *node, *tmp; + +list_for_each_entry_safe (node, tmp, nodes, entry) { +esw_qos_node_set_parent (node, parent); +if (!list_empty (&node->children) && + parent->type ==SCHED_NODE_TYPE_TC_ARBITER_TSAR ) { +struct mlx5_esw_sched_node *child; + +list_for_each_entry (child, &node->children, entry) { +if (child->vport) + child->vport->qos.sched_node->parent = parent; + } + } + } +} +void mlx5_esw_qos_vport_qos_free (struct mlx5_vport *vport) {kfree (vport->qos.sched_node);
@@ -126,16 +154,23 @@ mlx5_esw_qos_vport_get_parent(const struct mlx5_vport *vport)static void esw_qos_sched_elem_warn (struct mlx5_esw_sched_node *node,int err,const char *op) { -if (node->vport) { +switch (node->type) { +case SCHED_NODE_TYPE_VPORT :esw_warn (node->esw->dev,"E-Switch %s %s scheduling element failed (vport=%d,err=%d)\n" , op, sched_node_type_str[node->type], node->vport->vport, err); -return ; +break ; +case SCHED_NODE_TYPE_TC_ARBITER_TSAR : +case SCHED_NODE_TYPE_VPORTS_TSAR : +esw_warn (node->esw->dev, +"E-Switch %s %s scheduling element failed (err=%d)\n" , + op, sched_node_type_str[node->type], err); +break ; +default : +esw_warn (node->esw->dev, +"E-Switch %s scheduling element failed (err=%d)\n" , op, err); +break ; } - -esw_warn (node->esw->dev, -"E-Switch %s %s scheduling element failed (err=%d)\n" , - op, sched_node_type_str[node->type], err); } static int esw_qos_node_create_sched_element(struct mlx5_esw_sched_node *node, void *ctx,
@@ -306,7 +341,7 @@ static int esw_qos_set_node_min_rate(struct mlx5_esw_sched_node *node, }static int esw_qos_create_node_sched_elem (struct mlx5_core_dev *dev,u32 parent_element_id, -u32 *tsar_ix) +u32 max_rate,u32 bw_share,u32 *tsar_ix) {u32 tsar_ctx[MLX5_ST_SZ_DW (scheduling_context)] = {};void *attr;
@@ -323,6 +358,8 @@ static int esw_qos_create_node_sched_elem(struct mlx5_core_dev *dev, u32 parent_ SCHEDULING_CONTEXT_ELEMENT_TYPE_TSAR);MLX5_SET (scheduling_context, tsar_ctx, parent_element_id, parent_element_id); +MLX5_SET (scheduling_context, tsar_ctx, max_average_bw, max_rate); +MLX5_SET (scheduling_context, tsar_ctx, bw_share, bw_share); attr =MLX5_ADDR_OF (scheduling_context, tsar_ctx, element_attributes);MLX5_SET (tsar_element, attr, tsar_type,TSAR_ELEMENT_TSAR_TYPE_DWRR );
@@ -358,7 +395,6 @@ static struct mlx5_esw_sched_node * __esw_qos_alloc_node(struct mlx5_eswitch *esw, u32 tsar_ix, enum sched_node_type type, struct mlx5_esw_sched_node *parent) { - struct list_head *parent_children; struct mlx5_esw_sched_node *node; node =kzalloc (sizeof (*node),GFP_KERNEL );
@@ -370,8 +406,10 @@ __esw_qos_alloc_node(struct mlx5_eswitch *esw, u32 tsar_ix, enum sched_node_type node->type = type; node->parent = parent;INIT_LIST_HEAD (&node->children); - parent_children = parent ? &parent->children : &esw->qos.domain->nodes; -list_add_tail (&node->entry, parent_children); +if (parent) +list_add_tail (&node->entry, &parent->children); +else +INIT_LIST_HEAD (&node->entry);return node; }
@@ -396,7 +434,7 @@ __esw_qos_create_vports_sched_node(struct mlx5_eswitch *esw, struct mlx5_esw_schu32 tsar_ix;int err; - err =esw_qos_create_node_sched_elem (esw->dev, esw->qos.root_tsar_ix, &tsar_ix); + err =esw_qos_create_node_sched_elem (esw->dev, esw->qos.root_tsar_ix,0 ,0 , &tsar_ix);if (err) {NL_SET_ERR_MSG_MOD (extack,"E-Switch create TSAR for node failed" );return ERR_PTR (err);
@@ -409,6 +447,7 @@ __esw_qos_create_vports_sched_node(struct mlx5_eswitch *esw, struct mlx5_esw_sch goto err_alloc_node; } +list_add_tail (&node->entry, &esw->qos.domain->nodes);esw_qos_normalize_min_rate (esw,NULL , extack);trace_mlx5_esw_node_qos_create (esw->dev, node, node->ix);
@@ -463,7 +502,7 @@ static int esw_qos_create(struct mlx5_eswitch *esw, struct netlink_ext_ack *extaif (!MLX5_CAP_GEN (dev, qos) || !MLX5_CAP_QOS (dev, esw_scheduling))return -EOPNOTSUPP ; - err =esw_qos_create_node_sched_elem (esw->dev,0 , &esw->qos.root_tsar_ix); + err =esw_qos_create_node_sched_elem (esw->dev,0 ,0 ,0 , &esw->qos.root_tsar_ix);if (err) {esw_warn (dev,"E-Switch create root TSAR failed (%d)\n" , err);return err;
@@ -475,11 +514,11 @@ static int esw_qos_create(struct mlx5_eswitch *esw, struct netlink_ext_ack *exta/* The eswitch doesn't support scheduling nodes. * Create a software-only node0 using the root TSAR to attach vport QoS to. */ -if (!__esw_qos_alloc_node (esw, - esw->qos.root_tsar_ix, -SCHED_NODE_TYPE_VPORTS_TSAR , +if (!__esw_qos_alloc_node (esw, esw->qos.root_tsar_ix,SCHED_NODE_TYPE_VPORTS_TSAR ,NULL )) esw->qos.node0 =ERR_PTR (-ENOMEM ); +else +list_add_tail (&esw->qos.node0->entry, &esw->qos.domain->nodes); }if (IS_ERR (esw->qos.node0)) { err =PTR_ERR (esw->qos.node0);
@@ -537,6 +576,17 @@ static void esw_qos_put(struct mlx5_eswitch *esw)esw_qos_destroy (esw); } +static void esw_qos_tc_arbiter_scheduling_teardown (struct mlx5_esw_sched_node *node, +struct netlink_ext_ack *extack) +{} + +static int esw_qos_tc_arbiter_scheduling_setup (struct mlx5_esw_sched_node *node, +struct netlink_ext_ack *extack) +{ +NL_SET_ERR_MSG_MOD (extack,"TC arbiter elements are not supported." ); +return -EOPNOTSUPP ; +} +static void esw_qos_vport_disable (struct mlx5_vport *vport,struct netlink_ext_ack *extack) {struct mlx5_esw_sched_node *vport_node = vport->qos.sched_node;
@@ -699,6 +749,158 @@ static int esw_qos_vport_update_parent(struct mlx5_vport *vport, struct mlx5_eswreturn err; } +static void esw_qos_switch_vport_tcs_to_vport (struct mlx5_esw_sched_node *tc_arbiter_node, +struct mlx5_esw_sched_node *node, +struct netlink_ext_ack *extack) +{ +struct mlx5_esw_sched_node *vports_tc_node, *vport_tc_node, *tmp; + + vports_tc_node = list_first_entry(&tc_arbiter_node->children, struct mlx5_esw_sched_node, + entry); + +list_for_each_entry_safe (vport_tc_node, tmp, &vports_tc_node->children, entry) +esw_qos_vport_update_parent (vport_tc_node->vport, node, extack); +} + +static int esw_qos_switch_tc_arbiter_node_to_vports (struct mlx5_esw_sched_node *tc_arbiter_node, +struct mlx5_esw_sched_node *node, +struct netlink_ext_ack *extack) +{ +u32 parent_tsar_ix = node->parent ? node->parent->ix : node->esw->qos.root_tsar_ix; +int err; + + err =esw_qos_create_node_sched_elem (node->esw->dev, parent_tsar_ix, node->max_rate, + node->bw_share, &node->ix); +if (err) { +NL_SET_ERR_MSG_MOD (extack, +"Failed to create scheduling element for vports node when disabliing vports TC QoS" ); +return err; + } + + node->type =SCHED_NODE_TYPE_VPORTS_TSAR ; + +/* Disable TC QoS for vports in the arbiter node. */ +esw_qos_switch_vport_tcs_to_vport (tc_arbiter_node, node, extack); + +return 0 ; +} + +static int esw_qos_switch_vports_node_to_tc_arbiter (struct mlx5_esw_sched_node *node, +struct mlx5_esw_sched_node *tc_arbiter_node, +struct netlink_ext_ack *extack) +{ +struct mlx5_esw_sched_node *vport_node, *tmp; +struct mlx5_vport *vport; +int err; + +/* Enable TC QoS for each vport in the node. */ +list_for_each_entry_safe (vport_node, tmp, &node->children, entry) { + vport = vport_node->vport; + err =esw_qos_vport_update_parent (vport, tc_arbiter_node, extack); +if (err) + goto err_out; + } + +/* Destroy the current vports node TSAR. */ + err =mlx5_destroy_scheduling_element_cmd (node->esw->dev,SCHEDULING_HIERARCHY_E_SWITCH , + node->ix); +if (err) + goto err_out; + +return 0 ; +err_out: +/* Restore vports back into the node if an error occurs. */ +esw_qos_switch_vport_tcs_to_vport (tc_arbiter_node, node,NULL ); + +return err; +} + +static struct mlx5_esw_sched_node *esw_qos_move_node (struct mlx5_esw_sched_node *curr_node) +{ +struct mlx5_esw_sched_node *new_node; + + new_node =__esw_qos_alloc_node (curr_node->esw, curr_node->ix, curr_node->type,NULL ); +if (!IS_ERR (new_node)) +esw_qos_nodes_set_parent (&curr_node->children, new_node); + +return new_node; +} + +static int esw_qos_node_disable_tc_arbitration (struct mlx5_esw_sched_node *node, +struct netlink_ext_ack *extack) +{ +struct mlx5_esw_sched_node *curr_node; +int err; + +if (node->type !=SCHED_NODE_TYPE_TC_ARBITER_TSAR ) +return 0 ; + +/* Allocate a new rate node to hold the current state, which will allow +* for restoring the vports back to this node after disabling TC arbitration. +*/ + curr_node =esw_qos_move_node (node); +if (IS_ERR (curr_node)) { +NL_SET_ERR_MSG_MOD (extack,"Failed setting up vports node" ); +return PTR_ERR (curr_node); + } + +/* Disable TC QoS for all vports, and assign them back to the node. */ + err =esw_qos_switch_tc_arbiter_node_to_vports (curr_node, node, extack); +if (err) + goto err_out; + +/* Clean up the TC arbiter node after disabling TC QoS for vports. */ +esw_qos_tc_arbiter_scheduling_teardown (curr_node, extack); + goto out; +err_out: +esw_qos_nodes_set_parent (&curr_node->children, node); +out: +__esw_qos_free_node (curr_node); +return err; +} + +static int esw_qos_node_enable_tc_arbitration (struct mlx5_esw_sched_node *node, +struct netlink_ext_ack *extack) +{ +struct mlx5_esw_sched_node *curr_node; +int err; + +if (node->type ==SCHED_NODE_TYPE_TC_ARBITER_TSAR ) +return 0 ; + +/* Allocate a new node that will store the information of the current node. +* This will be used later to restore the node if necessary. +*/ + curr_node =esw_qos_move_node (node); +if (IS_ERR (curr_node)) { +NL_SET_ERR_MSG_MOD (extack,"Failed setting up node TC QoS" ); +return PTR_ERR (curr_node); + } + +/* Initialize the TC arbiter node for QoS management. +* This step prepares the node for handling Traffic Class arbitration. +*/ + err =esw_qos_tc_arbiter_scheduling_setup (node, extack); +if (err) + goto err_setup; + +/* Enable TC QoS for each vport within the current node. */ + err =esw_qos_switch_vports_node_to_tc_arbiter (curr_node, node, extack); +if (err) + goto err_switch_vports; + goto out; + +err_switch_vports: +esw_qos_tc_arbiter_scheduling_teardown (node,NULL ); + node->ix = curr_node->ix; + node->type = curr_node->type; +err_setup: +esw_qos_nodes_set_parent (&curr_node->children, node); +out: +__esw_qos_free_node (curr_node); +return err; +} +static u32 mlx5_esw_qos_lag_link_speed_get_locked (struct mlx5_core_dev *mdev) {struct ethtool_link_ksettings lksettings;
@@ -824,6 +1026,30 @@ static int esw_qos_devlink_rate_to_mbps(struct mlx5_core_dev *mdev, const char *return 0 ; } +static bool esw_qos_validate_unsupported_tc_bw (struct mlx5_eswitch *esw,u32 *tc_bw) +{ +int i, num_tcs =esw_qos_num_tcs (esw->dev); + +for (i = num_tcs; i <IEEE_8021QAZ_MAX_TCS ; i++) { +if (tc_bw[i]) +return false; + } + +return true; +} + +static bool esw_qos_tc_bw_disabled (u32 *tc_bw) +{ +int i; + +for (i =0 ; i <IEEE_8021QAZ_MAX_TCS ; i++) { +if (tc_bw[i]) +return false; + } + +return true; +} +int mlx5_esw_qos_init (struct mlx5_eswitch *esw) {if (esw->qos.domain)
@@ -892,8 +1118,27 @@ int mlx5_esw_devlink_rate_leaf_tc_bw_set(struct devlink_rate *rate_leaf, void *pint mlx5_esw_devlink_rate_node_tc_bw_set (struct devlink_rate *rate_node,void *priv,u32 *tc_bw,struct netlink_ext_ack *extack) { -NL_SET_ERR_MSG_MOD (extack,"TC bandwidth shares are not supported on nodes" ); -return -EOPNOTSUPP ; +struct mlx5_esw_sched_node *node = priv; +struct mlx5_eswitch *esw = node->esw; +bool disable; +int err; + +if (!esw_qos_validate_unsupported_tc_bw (esw, tc_bw)) { +NL_SET_ERR_MSG_MOD (extack,"E-Switch traffic classes number is not supported" ); +return -EOPNOTSUPP ; + } + + disable =esw_qos_tc_bw_disabled (tc_bw); +esw_qos_lock (esw); +if (disable) { + err =esw_qos_node_disable_tc_arbitration (node, extack); + goto unlock; + } + + err =esw_qos_node_enable_tc_arbitration (node, extack); +unlock: +esw_qos_unlock (esw); +return err; } int mlx5_esw_devlink_rate_node_tx_share_set(struct devlink_rate *rate_node, void *priv,
Signature · 1 line
2.45.0
Tariq Toukan
maintainerPATCH 4/15 net/mlx5: Add traffic class scheduling support for vport QoS
In reply to Tariq ToukanFrom: Carolina Jubran <[email protected]>
Introduce support for traffic class (TC) scheduling on vports by allowing the vport to own multiple TC scheduling nodes. This patch enables more granular control of QoS by defining three distinct QoS states for vports, each providing unique scheduling behavior:
1. Regular QoS: The sched_node represents the vport directly, handling QoS as a single scheduling entity.
2. TC QoS on the vport: The sched_node acts as a TC arbiter, enabling TC scheduling directly on the vport.
3. TC QoS on the parent node: The sched_node functions as a rate limiter, with TC arbitration enabled at the parent level, associating multiple scheduling nodes with each vport.
Key changes include:
- Added support for new scheduling elements, vport traffic class and rate limiter.
- New helper functions for creating, destroying, and restoring vport TC scheduling nodes, handling transitions between regular QoS and TC arbitration states.
- Updated esw_qos_vport_enable() and esw_qos_vport_disable() to support both regular QoS and TC arbitration states, ensuring consistent transitions between scheduling modes.
- Introduced a sched_nodes array under vport->qos to store multiple TC scheduling nodes per vport, enabling finer control over per-TC QoS.
- Enhanced esw_qos_vport_update_parent() to handle transitions between the three QoS states based on the current and new parent node types.
This patch lays the groundwork for future support for configuring tc-bw on vports. Although the infrastructure is in place, full support for tc-bw is not yet implemented; attempts to set tc-bw on vports will return -EOPNOTSUPP.
No functional changes are introduced at this stage.
--- .../net/ethernet/mellanox/mlx5/core/esw/qos.c | 361 +++++++++++++++++- .../net/ethernet/mellanox/mlx5/core/eswitch.h | 13 +- 2 files changed, 353 insertions(+), 21 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c +342 -19
@@ -65,12 +65,16 @@ enum sched_node_type {SCHED_NODE_TYPE_VPORTS_TSAR ,SCHED_NODE_TYPE_VPORT ,SCHED_NODE_TYPE_TC_ARBITER_TSAR , +SCHED_NODE_TYPE_RATE_LIMITER , + SCHED_NODE_TYPE_VPORT_TC, };static const char *const sched_node_type_str[] = { [SCHED_NODE_TYPE_VPORTS_TSAR ] ="vports TSAR" , [SCHED_NODE_TYPE_VPORT ] ="vport" , [SCHED_NODE_TYPE_TC_ARBITER_TSAR ] ="TC Arbiter TSAR" , + [SCHED_NODE_TYPE_RATE_LIMITER ] ="Rate Limiter" , + [SCHED_NODE_TYPE_VPORT_TC ] ="vport TC" , }; struct mlx5_esw_sched_node {
@@ -92,6 +96,8 @@ struct mlx5_esw_sched_node {struct list_head children;/* Valid only if this node is associated with a vport. */ struct mlx5_vport *vport; +/* Valid only when this node represents a traffic class. */ +u8 tc; };static int esw_qos_num_tcs (struct mlx5_core_dev *dev)
@@ -131,6 +137,14 @@ esw_qos_nodes_set_parent(struct list_head *nodes, struct mlx5_esw_sched_node *pavoid mlx5_esw_qos_vport_qos_free (struct mlx5_vport *vport) { +if (vport->qos.sched_nodes) { +int i, num_tcs =esw_qos_num_tcs (vport->qos.sched_node->esw->dev); + +for (i =0 ; i < num_tcs; i++) +kfree (vport->qos.sched_nodes[i]); +kfree (vport->qos.sched_nodes); + } +kfree (vport->qos.sched_node);memset (&vport->qos,0 ,sizeof (vport->qos)); }
@@ -155,11 +169,17 @@ mlx5_esw_qos_vport_get_parent(const struct mlx5_vport *vport)static void esw_qos_sched_elem_warn (struct mlx5_esw_sched_node *node,int err,const char *op) {switch (node->type) { +case SCHED_NODE_TYPE_VPORT_TC : +esw_warn (node->esw->dev, +"E-Switch %s %s scheduling element failed (vport=%d,tc=%d,err=%d)\n" , + op, sched_node_type_str[node->type], node->vport->vport, node->tc, err); +break ;case SCHED_NODE_TYPE_VPORT :esw_warn (node->esw->dev,"E-Switch %s %s scheduling element failed (vport=%d,err=%d)\n" , op, sched_node_type_str[node->type], node->vport->vport, err);break ; +case SCHED_NODE_TYPE_RATE_LIMITER :case SCHED_NODE_TYPE_TC_ARBITER_TSAR :case SCHED_NODE_TYPE_VPORTS_TSAR : esw_warn(node->esw->dev,
@@ -253,6 +273,23 @@ static int esw_qos_sched_elem_config(struct mlx5_esw_sched_node *node, u32 max_rreturn 0 ; } +static int esw_qos_create_rate_limit_element (struct mlx5_esw_sched_node *node, +struct netlink_ext_ack *extack) +{ +u32 sched_ctx[MLX5_ST_SZ_DW (scheduling_context)] = {}; + +if (!mlx5_qos_element_type_supported (node->esw->dev, +SCHEDULING_CONTEXT_ELEMENT_TYPE_RATE_LIMIT , +SCHEDULING_HIERARCHY_E_SWITCH )) +return -EOPNOTSUPP ; + +MLX5_SET (scheduling_context, sched_ctx, max_average_bw, node->max_rate); +MLX5_SET (scheduling_context, sched_ctx, element_type, +SCHEDULING_CONTEXT_ELEMENT_TYPE_RATE_LIMIT ); + +return esw_qos_node_create_sched_element (node, sched_ctx, extack); +} +static u32 esw_qos_calculate_min_rate_divider (struct mlx5_eswitch *esw,struct mlx5_esw_sched_node *parent) {
@@ -391,6 +428,31 @@ static int esw_qos_vport_create_sched_element(struct mlx5_esw_sched_node *vport_return esw_qos_node_create_sched_element (vport_node, sched_ctx, extack); } +static int esw_qos_vport_tc_create_sched_element (struct mlx5_esw_sched_node *vport_tc_node, +u32 rate_limit_elem_ix, +struct netlink_ext_ack *extack) +{ +u32 sched_ctx[MLX5_ST_SZ_DW (scheduling_context)] = {}; +struct mlx5_core_dev *dev = vport_tc_node->esw->dev; +void *attr; + +if (!mlx5_qos_element_type_supported (dev, +SCHEDULING_CONTEXT_ELEMENT_TYPE_VPORT_TC , +SCHEDULING_HIERARCHY_E_SWITCH )) +return -EOPNOTSUPP ; + +MLX5_SET (scheduling_context, sched_ctx, element_type, +SCHEDULING_CONTEXT_ELEMENT_TYPE_VPORT_TC ); + attr =MLX5_ADDR_OF (scheduling_context, sched_ctx, element_attributes); +MLX5_SET (vport_tc_element, attr, vport_number, vport_tc_node->vport->vport); +MLX5_SET (vport_tc_element, attr, traffic_class, vport_tc_node->tc); +MLX5_SET (scheduling_context, sched_ctx, max_bw_obj_id, rate_limit_elem_ix); +MLX5_SET (scheduling_context, sched_ctx, parent_element_id, vport_tc_node->parent->ix); +MLX5_SET (scheduling_context, sched_ctx, bw_share, vport_tc_node->bw_share); + +return esw_qos_node_create_sched_element (vport_tc_node, sched_ctx, extack); +} +static struct mlx5_esw_sched_node *__esw_qos_alloc_node (struct mlx5_eswitch *esw,u32 tsar_ix,enum sched_node_type type,struct mlx5_esw_sched_node *parent)
@@ -587,12 +649,169 @@ static int esw_qos_tc_arbiter_scheduling_setup(struct mlx5_esw_sched_node *node,return -EOPNOTSUPP ; } +static int esw_qos_create_vport_tc_sched_node (struct mlx5_vport *vport, +u32 rate_limit_elem_ix, +struct mlx5_esw_sched_node *vports_tc_node, +struct netlink_ext_ack *extack) +{ +struct mlx5_esw_sched_node *vport_node = vport->qos.sched_node; +struct mlx5_esw_sched_node *vport_tc_node; +u8 tc = vports_tc_node->tc; +int err; + + vport_tc_node =__esw_qos_alloc_node (vport_node->esw,0 ,SCHED_NODE_TYPE_VPORT_TC , + vports_tc_node); +if (!vport_tc_node) +return -ENOMEM ; + + vport_tc_node->min_rate = vport_node->min_rate; + vport_tc_node->tc = tc; + vport_tc_node->vport = vport; + err =esw_qos_vport_tc_create_sched_element (vport_tc_node, rate_limit_elem_ix, extack); +if (err) + goto err_out; + + vport->qos.sched_nodes[tc] = vport_tc_node; + +return 0 ; +err_out: +__esw_qos_free_node (vport_tc_node); +return err; +} + +static void esw_qos_destroy_vport_tc_sched_elements (struct mlx5_vport *vport, +struct netlink_ext_ack *extack) +{ +int i, num_tcs =esw_qos_num_tcs (vport->qos.sched_node->esw->dev); + +for (i =0 ; i < num_tcs; i++) { +if (vport->qos.sched_nodes[i]) +__esw_qos_destroy_node (vport->qos.sched_nodes[i], extack); + } + +kfree (vport->qos.sched_nodes); + vport->qos.sched_nodes =NULL ; +} + +static int esw_qos_create_vport_tc_sched_elements (struct mlx5_vport *vport, +enum sched_node_type type, +struct netlink_ext_ack *extack) +{ +struct mlx5_esw_sched_node *vport_node = vport->qos.sched_node; +struct mlx5_esw_sched_node *tc_arbiter_node, *vports_tc_node; +int err, num_tcs =esw_qos_num_tcs (vport_node->esw->dev); +u32 rate_limit_elem_ix; + + vport->qos.sched_nodes =kcalloc (num_tcs,sizeof (struct mlx5_esw_sched_node *),GFP_KERNEL ); +if (!vport->qos.sched_nodes) { +NL_SET_ERR_MSG_MOD (extack,"Allocating the vport TC scheduling elements failed." ); +return -ENOMEM ; + } + + rate_limit_elem_ix = type ==SCHED_NODE_TYPE_RATE_LIMITER ? vport_node->ix :0 ; + tc_arbiter_node = type ==SCHED_NODE_TYPE_RATE_LIMITER ? vport_node->parent : vport_node; +list_for_each_entry (vports_tc_node, &tc_arbiter_node->children, entry) { + err =esw_qos_create_vport_tc_sched_node (vport, rate_limit_elem_ix, vports_tc_node, + extack); +if (err) + goto err_create_vport_tc; + } + +return 0 ; + +err_create_vport_tc: +esw_qos_destroy_vport_tc_sched_elements (vport,NULL ); + +return err; +} + +static int esw_qos_vport_tc_enable (struct mlx5_vport *vport,enum sched_node_type type, +struct netlink_ext_ack *extack) +{ +struct mlx5_esw_sched_node *vport_node = vport->qos.sched_node; +int err; + +if (type ==SCHED_NODE_TYPE_TC_ARBITER_TSAR && +MLX5_CAP_QOS (vport_node->esw->dev, log_esw_max_sched_depth) <2 ) { +NL_SET_ERR_MSG_MOD (extack,"Setting up TC Arbiter for a vport is not supported." ); +return -EOPNOTSUPP ; + } + +esw_assert_qos_lock_held (vport->dev->priv.eswitch); + +if (type ==SCHED_NODE_TYPE_RATE_LIMITER ) + err =esw_qos_create_rate_limit_element (vport_node, extack); +else + err =esw_qos_tc_arbiter_scheduling_setup (vport_node, extack); +if (err) +return err; + +/* Rate limiters impact multiple nodes not directly connected to them +* and are not direct members of the QoS hierarchy. +* Unlink it from the parent to reflect that. +*/ +if (type ==SCHED_NODE_TYPE_RATE_LIMITER ) +list_del_init (&vport_node->entry); + + err =esw_qos_create_vport_tc_sched_elements (vport, type, extack); +if (err) + goto err_sched_nodes; + +return 0 ; + +err_sched_nodes: +if (type ==SCHED_NODE_TYPE_RATE_LIMITER ) { +esw_qos_node_destroy_sched_element (vport_node,NULL ); +list_add_tail (&vport_node->entry, &vport_node->parent->children); + }else { +esw_qos_tc_arbiter_scheduling_teardown (vport_node,NULL ); + } +return err; +} + +static void esw_qos_vport_tc_disable (struct mlx5_vport *vport,struct netlink_ext_ack *extack) +{ +struct mlx5_esw_sched_node *vport_node = vport->qos.sched_node; +enum sched_node_type curr_type = vport_node->type; + +esw_qos_destroy_vport_tc_sched_elements (vport, extack); + +if (curr_type ==SCHED_NODE_TYPE_RATE_LIMITER ) +esw_qos_node_destroy_sched_element (vport_node, extack); +else +esw_qos_tc_arbiter_scheduling_teardown (vport_node, extack); +} + +static int esw_qos_set_vport_tcs_min_rate (struct mlx5_vport *vport,u32 min_rate, +struct netlink_ext_ack *extack) +{ +struct mlx5_esw_sched_node *vport_node = vport->qos.sched_node; +int err, i, num_tcs =esw_qos_num_tcs (vport_node->esw->dev); + +for (i =0 ; i < num_tcs; i++) { + err =esw_qos_set_node_min_rate (vport->qos.sched_nodes[i], min_rate, extack); +if (err) + goto err_out; + } + vport_node->min_rate = min_rate; + +return 0 ; +err_out: +for (--i; i >=0 ; i--) +esw_qos_set_node_min_rate (vport->qos.sched_nodes[i], vport_node->min_rate, extack); +return err; +} +static void esw_qos_vport_disable (struct mlx5_vport *vport,struct netlink_ext_ack *extack) {struct mlx5_esw_sched_node *vport_node = vport->qos.sched_node;struct mlx5_esw_sched_node *parent = vport_node->parent; +enum sched_node_type curr_type = vport_node->type; -esw_qos_node_destroy_sched_element (vport_node, extack); +if (curr_type ==SCHED_NODE_TYPE_VPORT ) +esw_qos_node_destroy_sched_element (vport_node, extack); +else +esw_qos_vport_tc_disable (vport, extack); vport_node->bw_share =0 ;list_del_init (&vport_node->entry);
@@ -601,7 +820,8 @@ static void esw_qos_vport_disable(struct mlx5_vport *vport, struct netlink_ext_atrace_mlx5_esw_vport_qos_destroy (vport_node->esw->dev, vport); } -static int esw_qos_vport_enable (struct mlx5_vport *vport,struct mlx5_esw_sched_node *parent, +static int esw_qos_vport_enable (struct mlx5_vport *vport,enum sched_node_type type, +struct mlx5_esw_sched_node *parent,struct netlink_ext_ack *extack) {int err;
@@ -609,10 +829,14 @@ static int esw_qos_vport_enable(struct mlx5_vport *vport, struct mlx5_esw_sched_esw_assert_qos_lock_held (vport->dev->priv.eswitch);esw_qos_node_set_parent (vport->qos.sched_node, parent); - err =esw_qos_vport_create_sched_element (vport->qos.sched_node, extack); +if (type ==SCHED_NODE_TYPE_VPORT ) + err =esw_qos_vport_create_sched_element (vport->qos.sched_node, extack); +else + err =esw_qos_vport_tc_enable (vport, type, extack);if (err)return err; + vport->qos.sched_node->type = type;esw_qos_normalize_min_rate (parent->esw, parent, extack);return 0 ;
@@ -640,7 +864,7 @@ static int mlx5_esw_qos_vport_enable(struct mlx5_vport *vport, enum sched_node_t sched_node->min_rate = min_rate; sched_node->vport = vport; vport->qos.sched_node = sched_node; - err =esw_qos_vport_enable (vport, parent, extack); + err =esw_qos_vport_enable (vport, type, parent, extack);if (err)esw_qos_put (esw);
@@ -692,6 +916,8 @@ static int mlx5_esw_qos_set_vport_min_rate(struct mlx5_vport *vport, u32 min_ratif (!vport_node)return mlx5_esw_qos_vport_enable (vport,SCHED_NODE_TYPE_VPORT ,NULL ,0 , min_rate, extack); +else if (vport_node->type ==SCHED_NODE_TYPE_RATE_LIMITER ) +return esw_qos_set_vport_tcs_min_rate (vport, min_rate, extack);else return esw_qos_set_node_min_rate (vport_node, min_rate, extack); }
@@ -724,12 +950,59 @@ bool mlx5_esw_qos_get_vport_rate(struct mlx5_vport *vport, u32 *max_rate, u32 *mreturn enabled; } +static int esw_qos_vport_tc_check_type (enum sched_node_type curr_type, +enum sched_node_type new_type, +struct netlink_ext_ack *extack) +{ +if (curr_type ==SCHED_NODE_TYPE_TC_ARBITER_TSAR && + new_type ==SCHED_NODE_TYPE_RATE_LIMITER ) { +NL_SET_ERR_MSG_MOD (extack, +"Cannot switch from vport-level TC arbitration to node-level TC arbitration" ); +return -EOPNOTSUPP ; + } + +if (curr_type ==SCHED_NODE_TYPE_RATE_LIMITER && + new_type ==SCHED_NODE_TYPE_TC_ARBITER_TSAR ) { +NL_SET_ERR_MSG_MOD (extack, +"Cannot switch from node-level TC arbitration to vport-level TC arbitration" ); +return -EOPNOTSUPP ; + } + +return 0 ; +} + +static int esw_qos_vport_update (struct mlx5_vport *vport,enum sched_node_type type, +struct mlx5_esw_sched_node *parent, +struct netlink_ext_ack *extack) +{ +struct mlx5_esw_sched_node *curr_parent = vport->qos.sched_node->parent; +enum sched_node_type curr_type = vport->qos.sched_node->type; +int err; + +esw_assert_qos_lock_held (vport->dev->priv.eswitch); + parent = parent ?: curr_parent; +if (curr_type == type && curr_parent == parent) +return 0 ; + + err =esw_qos_vport_tc_check_type (curr_type, type, extack); +if (err) +return err; + +esw_qos_vport_disable (vport, extack); + + err =esw_qos_vport_enable (vport, type, parent, extack); +if (err) +esw_qos_vport_enable (vport, curr_type, curr_parent,NULL ); + +return err; +} +static int esw_qos_vport_update_parent (struct mlx5_vport *vport,struct mlx5_esw_sched_node *parent,struct netlink_ext_ack *extack) {struct mlx5_eswitch *esw = vport->dev->priv.eswitch;struct mlx5_esw_sched_node *curr_parent; -int err; +enum sched_node_type type;esw_assert_qos_lock_held (esw); curr_parent = vport->qos.sched_node->parent;
@@ -737,16 +1010,17 @@ static int esw_qos_vport_update_parent(struct mlx5_vport *vport, struct mlx5_eswif (curr_parent == parent)return 0 ; -esw_qos_vport_disable (vport, extack); - - err =esw_qos_vport_enable (vport, parent, extack); -if (err) { -if (esw_qos_vport_enable (vport, curr_parent,NULL )) -esw_warn (parent->esw->dev,"vport restore QoS failed (vport=%d)\n" , - vport->vport); - } +/* Set vport QoS type based on parent node type if different from default QoS; +* otherwise, use the vport's current QoS type. +*/ +if (parent->type ==SCHED_NODE_TYPE_TC_ARBITER_TSAR ) + type =SCHED_NODE_TYPE_RATE_LIMITER ; +else if (curr_parent->type ==SCHED_NODE_TYPE_TC_ARBITER_TSAR ) + type =SCHED_NODE_TYPE_VPORT ; +else + type = vport->qos.sched_node->type; -return err; +return esw_qos_vport_update (vport, type, parent, extack); } static void esw_qos_switch_vport_tcs_to_vport(struct mlx5_esw_sched_node *tc_arbiter_node,
@@ -1038,6 +1312,14 @@ static bool esw_qos_validate_unsupported_tc_bw(struct mlx5_eswitch *esw, u32 *tcreturn true; } +static bool esw_qos_vport_validate_unsupported_tc_bw (struct mlx5_vport *vport,u32 *tc_bw) +{ +struct mlx5_eswitch *esw = vport->qos.sched_node ? + vport->qos.sched_node->parent->esw : vport->dev->priv.eswitch; + +return esw_qos_validate_unsupported_tc_bw (esw, tc_bw); +} +static bool esw_qos_tc_bw_disabled (u32 *tc_bw) {int i;
@@ -1111,8 +1393,45 @@ int mlx5_esw_devlink_rate_leaf_tx_max_set(struct devlink_rate *rate_leaf, void *int mlx5_esw_devlink_rate_leaf_tc_bw_set (struct devlink_rate *rate_leaf,void *priv,u32 *tc_bw,struct netlink_ext_ack *extack) { -NL_SET_ERR_MSG_MOD (extack,"TC bandwidth shares are not supported on leafs" ); -return -EOPNOTSUPP ; +struct mlx5_esw_sched_node *vport_node; +struct mlx5_vport *vport = priv; +struct mlx5_eswitch *esw; +bool disable; +int err =0 ; + + esw = vport->dev->priv.eswitch; +if (!mlx5_esw_allowed (esw)) +return -EPERM ; + + disable =esw_qos_tc_bw_disabled (tc_bw); +esw_qos_lock (esw); + +if (!esw_qos_vport_validate_unsupported_tc_bw (vport, tc_bw)) { +NL_SET_ERR_MSG_MOD (extack,"E-Switch traffic classes number is not supported" ); + err = -EOPNOTSUPP ; + goto unlock; + } + + vport_node = vport->qos.sched_node; +if (disable && !vport_node) + goto unlock; + +if (disable) { +if (vport_node->type ==SCHED_NODE_TYPE_TC_ARBITER_TSAR ) + err =esw_qos_vport_update (vport,SCHED_NODE_TYPE_VPORT ,NULL , extack); + goto unlock; + } + +if (!vport_node) { + err =mlx5_esw_qos_vport_enable (vport,SCHED_NODE_TYPE_TC_ARBITER_TSAR ,NULL ,0 ,0 , + extack); + vport_node = vport->qos.sched_node; + }else { + err =esw_qos_vport_update (vport,SCHED_NODE_TYPE_TC_ARBITER_TSAR ,NULL , extack); + } +unlock: +esw_qos_unlock (esw); +return err; } int mlx5_esw_devlink_rate_node_tc_bw_set(struct devlink_rate *rate_node, void *priv,
@@ -1231,10 +1550,14 @@ int mlx5_esw_qos_vport_update_parent(struct mlx5_vport *vport, struct mlx5_esw_s }esw_qos_lock (esw); -if (!vport->qos.sched_node && parent) - err =mlx5_esw_qos_vport_enable (vport,SCHED_NODE_TYPE_VPORT , parent,0 ,0 , extack); -else if (vport->qos.sched_node) +if (!vport->qos.sched_node && parent) { +enum sched_node_type type = parent->type ==SCHED_NODE_TYPE_TC_ARBITER_TSAR ? +SCHED_NODE_TYPE_RATE_LIMITER :SCHED_NODE_TYPE_VPORT ; + + err =mlx5_esw_qos_vport_enable (vport, type, parent,0 ,0 , extack); + }else if (vport->qos.sched_node) { err =esw_qos_vport_update_parent (vport, parent, extack); + }esw_qos_unlock (esw);return err; }
drivers/net/ethernet/mellanox/mlx5/core/eswitch.h +11 -2
@@ -212,10 +212,19 @@ struct mlx5_vport {struct mlx5_vport_info info; -/* Protected with the E-Switch qos domain lock. */ +/* Protected with the E-Switch qos domain lock. The Vport QoS can +* either be disabled (sched_node is NULL) or in one of three states: +* 1. Regular QoS (sched_node is a vport node). +* 2. TC QoS enabled on the vport (sched_node is a TC arbiter). +* 3. TC QoS enabled on the vport's parent node +* (sched_node is a rate limit node). +* When TC is enabled in either mode, the vport owns vport TC scheduling nodes. +*/ struct { -/* Vport scheduling element node. */ +/* Vport scheduling node. */ struct mlx5_esw_sched_node *sched_node; +/* Array of vport traffic class scheduling nodes. */ +struct mlx5_esw_sched_node **sched_nodes; } qos;u16 vport;
Signature · 1 line
2.45.0
Tariq Toukan
maintainerPATCH 5/15 net/mlx5: Manage TC arbiter nodes and implement full support for tc-bw
In reply to Tariq ToukanFrom: Carolina Jubran <[email protected]>
Introduce support for managing Traffic Class (TC) arbiter nodes and associated vports TC nodes within the E-Switch QoS hierarchy. This patch adds support for the new scheduling node type, SCHED_NODE_TYPE_VPORTS_TC_TSAR, and implements full support for setting tc-bw on both vports and nodes.
Key changes include:
- Introduced the new scheduling node type, SCHED_NODE_TYPE_VPORTS_TC_TSAR, for managing vports within the TC arbiter node.
- New helper functions for creating and destroying vports TC nodes under the TC arbiter.
- Updated the minimum rate normalization function to skip nodes of type SCHED_NODE_TYPE_VPORTS_TC_TSAR. Vports TC TSARs have bandwidth shares configured on them but not minimum rates, so their min_rate cannot be normalized.
- Implementation of esw_qos_tc_arbiter_scheduling_setup() and esw_qos_tc_arbiter_scheduling_teardown() for initializing and cleaning up TC arbiter scheduling elements. These functions now fully support tc-bw configuration on TC arbiter nodes.
- Added esw_qos_tc_arbiter_get_bw_shares() and esw_qos_set_tc_arbiter_bw_shares() to handle the settings of bandwidth shares for vports traffic class TSARs.
- Refactored mlx5_esw_devlink_rate_node_tc_bw_set() and mlx5_esw_devlink_rate_leaf_tc_bw_set() to fully support configuring tc-bw on devlink rate nodes and vports, respectively.
--- .../net/ethernet/mellanox/mlx5/core/esw/qos.c | 185 +++++++++++++++++- 1 file changed, 180 insertions(+), 5 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c +180 -5
@@ -67,6 +67,7 @@ enum sched_node_type {SCHED_NODE_TYPE_TC_ARBITER_TSAR ,SCHED_NODE_TYPE_RATE_LIMITER ,SCHED_NODE_TYPE_VPORT_TC , + SCHED_NODE_TYPE_VPORTS_TC_TSAR, }; static const char * const sched_node_type_str[] = {
@@ -75,6 +76,7 @@ static const char * const sched_node_type_str[] = { [SCHED_NODE_TYPE_TC_ARBITER_TSAR] = "TC Arbiter TSAR", [SCHED_NODE_TYPE_RATE_LIMITER] = "Rate Limiter", [SCHED_NODE_TYPE_VPORT_TC] = "vport TC", + [SCHED_NODE_TYPE_VPORTS_TC_TSAR] = "vports TC TSAR", };struct mlx5_esw_sched_node {
@@ -169,6 +171,11 @@ mlx5_esw_qos_vport_get_parent(const struct mlx5_vport *vport)static void esw_qos_sched_elem_warn (struct mlx5_esw_sched_node *node,int err,const char *op) {switch (node->type) { +case SCHED_NODE_TYPE_VPORTS_TC_TSAR : +esw_warn (node->esw->dev, +"E-Switch %s %s scheduling element failed (tc=%d,err=%d)\n" , + op, sched_node_type_str[node->type], node->tc, err); +break ;case SCHED_NODE_TYPE_VPORT_TC : esw_warn(node->esw->dev, "E-Switch %s %s scheduling element failed (vport=%d,tc=%d,err=%d)\n",
@@ -354,7 +361,11 @@ static void esw_qos_normalize_min_rate(struct mlx5_eswitch *esw,if (node->esw != esw || node->ix == esw->qos.root_tsar_ix)continue ; -esw_qos_update_sched_node_bw_share (node, divider, extack); +/* Vports TC TSARs don't have a minimum rate configured, +* so there's no need to update the bw_share on them. +*/ +if (node->type !=SCHED_NODE_TYPE_VPORTS_TC_TSAR ) +esw_qos_update_sched_node_bw_share (node, divider, extack);if (list_empty (&node->children))continue ;
@@ -488,6 +499,129 @@ static void esw_qos_destroy_node(struct mlx5_esw_sched_node *node, struct netlin__esw_qos_free_node (node); } +static int esw_qos_create_vports_tc_node (struct mlx5_esw_sched_node *parent,u8 tc, +struct netlink_ext_ack *extack) +{ +u32 tsar_ctx[MLX5_ST_SZ_DW (scheduling_context)] = {}; +struct mlx5_core_dev *dev = parent->esw->dev; +struct mlx5_esw_sched_node *vports_tc_node; +void *attr; +int err; + +if (!mlx5_qos_element_type_supported (dev, +SCHEDULING_CONTEXT_ELEMENT_TYPE_TSAR , +SCHEDULING_HIERARCHY_E_SWITCH ) || + !mlx5_qos_tsar_type_supported (dev, +TSAR_ELEMENT_TSAR_TYPE_DWRR , +SCHEDULING_HIERARCHY_E_SWITCH )) +return -EOPNOTSUPP ; + + vports_tc_node =__esw_qos_alloc_node (parent->esw,0 ,SCHED_NODE_TYPE_VPORTS_TC_TSAR , + parent); +if (!vports_tc_node) { +NL_SET_ERR_MSG_MOD (extack,"E-Switch alloc node failed" ); +esw_warn (dev,"Failed to alloc vports TC node (tc=%d)\n" , tc); +return -ENOMEM ; + } + + attr =MLX5_ADDR_OF (scheduling_context, tsar_ctx, element_attributes); +MLX5_SET (tsar_element, attr, tsar_type,TSAR_ELEMENT_TSAR_TYPE_DWRR ); +MLX5_SET (tsar_element, attr, traffic_class, tc); +MLX5_SET (scheduling_context, tsar_ctx, parent_element_id, parent->ix); +MLX5_SET (scheduling_context, tsar_ctx, element_type,SCHEDULING_CONTEXT_ELEMENT_TYPE_TSAR ); + + err =esw_qos_node_create_sched_element (vports_tc_node, tsar_ctx, extack); +if (err) + goto err_create_sched_element; + + vports_tc_node->tc = tc; + +return 0 ; + +err_create_sched_element: +__esw_qos_free_node (vports_tc_node); +return err; +} + +static void +esw_qos_tc_arbiter_get_bw_shares (struct mlx5_esw_sched_node *tc_arbiter_node,u32 *tc_bw) +{ +struct mlx5_esw_sched_node *vports_tc_node; + +list_for_each_entry (vports_tc_node, &tc_arbiter_node->children, entry) + tc_bw[vports_tc_node->tc] = vports_tc_node->bw_share; +} + +static void esw_qos_set_tc_arbiter_bw_shares (struct mlx5_esw_sched_node *tc_arbiter_node, +u32 *tc_bw,struct netlink_ext_ack *extack) +{ +struct mlx5_esw_sched_node *vports_tc_node; + +list_for_each_entry (vports_tc_node, &tc_arbiter_node->children, entry) { +u32 bw_share; +u8 tc; + + tc = vports_tc_node->tc; + bw_share = tc_bw[tc] ?:MLX5_MIN_BW_SHARE ; +esw_qos_sched_elem_config (vports_tc_node,0 , bw_share, extack); + } +} + +static void esw_qos_destroy_vports_tc_nodes (struct mlx5_esw_sched_node *tc_arbiter_node, +struct netlink_ext_ack *extack) +{ +struct mlx5_esw_sched_node *vports_tc_node, *tmp; + +list_for_each_entry_safe (vports_tc_node, tmp, &tc_arbiter_node->children, entry) +esw_qos_destroy_node (vports_tc_node, extack); +} + +static int esw_qos_create_vports_tc_nodes (struct mlx5_esw_sched_node *tc_arbiter_node, +struct netlink_ext_ack *extack) +{ +struct mlx5_eswitch *esw = tc_arbiter_node->esw; +int err, i, num_tcs =esw_qos_num_tcs (esw->dev); + +for (i =0 ; i < num_tcs; i++) { + err =esw_qos_create_vports_tc_node (tc_arbiter_node, i, extack); +if (err) + goto err_tc_node_create; + } + +return 0 ; + +err_tc_node_create: +esw_qos_destroy_vports_tc_nodes (tc_arbiter_node,NULL ); +return err; +} + +static int esw_qos_create_tc_arbiter_sched_elem (struct mlx5_esw_sched_node *tc_arbiter_node, +struct netlink_ext_ack *extack) +{ +u32 tsar_ctx[MLX5_ST_SZ_DW (scheduling_context)] = {}; +u32 tsar_parent_ix; +void *attr; + +if (!mlx5_qos_tsar_type_supported (tc_arbiter_node->esw->dev, +TSAR_ELEMENT_TSAR_TYPE_TC_ARB , +SCHEDULING_HIERARCHY_E_SWITCH )) { +NL_SET_ERR_MSG_MOD (extack, +"E-Switch TC Arbiter scheduling element is not supported" ); +return -EOPNOTSUPP ; + } + + attr =MLX5_ADDR_OF (scheduling_context, tsar_ctx, element_attributes); +MLX5_SET (tsar_element, attr, tsar_type,TSAR_ELEMENT_TSAR_TYPE_TC_ARB ); + tsar_parent_ix = tc_arbiter_node->parent ? tc_arbiter_node->parent->ix : + tc_arbiter_node->esw->qos.root_tsar_ix; +MLX5_SET (scheduling_context, tsar_ctx, parent_element_id, tsar_parent_ix); +MLX5_SET (scheduling_context, tsar_ctx, element_type,SCHEDULING_CONTEXT_ELEMENT_TYPE_TSAR ); +MLX5_SET (scheduling_context, tsar_ctx, max_average_bw, tc_arbiter_node->max_rate); +MLX5_SET (scheduling_context, tsar_ctx, bw_share, tc_arbiter_node->bw_share); + +return esw_qos_node_create_sched_element (tc_arbiter_node, tsar_ctx, extack); +} +static struct mlx5_esw_sched_node *__esw_qos_create_vports_sched_node (struct mlx5_eswitch *esw,struct mlx5_esw_sched_node *parent,struct netlink_ext_ack *extack)
@@ -551,6 +685,9 @@ static void __esw_qos_destroy_node(struct mlx5_esw_sched_node *node, struct netl {struct mlx5_eswitch *esw = node->esw; +if (node->type ==SCHED_NODE_TYPE_TC_ARBITER_TSAR ) +esw_qos_destroy_vports_tc_nodes (node, extack); +trace_mlx5_esw_node_qos_destroy (esw->dev, node, node->ix);esw_qos_destroy_node (node, extack);esw_qos_normalize_min_rate (esw,NULL , extack);
@@ -640,13 +777,38 @@ static void esw_qos_put(struct mlx5_eswitch *esw)static void esw_qos_tc_arbiter_scheduling_teardown (struct mlx5_esw_sched_node *node,struct netlink_ext_ack *extack) -{} +{ +/* Clean up all Vports TC nodes within the TC arbiter node. */ +esw_qos_destroy_vports_tc_nodes (node, extack); +/* Destroy the scheduling element for the TC arbiter node itself. */ +esw_qos_node_destroy_sched_element (node, extack); +}static int esw_qos_tc_arbiter_scheduling_setup (struct mlx5_esw_sched_node *node,struct netlink_ext_ack *extack) { -NL_SET_ERR_MSG_MOD (extack,"TC arbiter elements are not supported." ); -return -EOPNOTSUPP ; +u32 curr_ix = node->ix; +int err; + + err =esw_qos_create_tc_arbiter_sched_elem (node, extack); +if (err) +return err; +/* Initialize the vports TC nodes within created TC arbiter TSAR. */ + err =esw_qos_create_vports_tc_nodes (node, extack); +if (err) + goto err_vports_tc_nodes; + + node->type =SCHED_NODE_TYPE_TC_ARBITER_TSAR ; + +return 0 ; + +err_vports_tc_nodes: +/* If initialization fails, clean up the scheduling element +* for the TC arbiter node. +*/ +esw_qos_node_destroy_sched_element (node,NULL ); + node->ix = curr_ix; +return err; } static int esw_qos_create_vport_tc_sched_node(struct mlx5_vport *vport,
@@ -977,6 +1139,7 @@ static int esw_qos_vport_update(struct mlx5_vport *vport, enum sched_node_type t {struct mlx5_esw_sched_node *curr_parent = vport->qos.sched_node->parent;enum sched_node_type curr_type = vport->qos.sched_node->type; +u32 curr_tc_bw[IEEE_8021QAZ_MAX_TCS ] = {0 };int err;esw_assert_qos_lock_held (vport->dev->priv.eswitch);
@@ -988,11 +1151,19 @@ static int esw_qos_vport_update(struct mlx5_vport *vport, enum sched_node_type tif (err)return err; +if (curr_type ==SCHED_NODE_TYPE_TC_ARBITER_TSAR && curr_type == type) +esw_qos_tc_arbiter_get_bw_shares (vport->qos.sched_node, curr_tc_bw); +esw_qos_vport_disable (vport, extack); err =esw_qos_vport_enable (vport, type, parent, extack); -if (err) +if (err) {esw_qos_vport_enable (vport, curr_type, curr_parent,NULL ); + extack =NULL ; + } + +if (curr_type ==SCHED_NODE_TYPE_TC_ARBITER_TSAR && curr_type == type) +esw_qos_set_tc_arbiter_bw_shares (vport->qos.sched_node, curr_tc_bw, extack);return err; }
@@ -1429,6 +1600,8 @@ int mlx5_esw_devlink_rate_leaf_tc_bw_set(struct devlink_rate *rate_leaf, void *p }else { err =esw_qos_vport_update (vport,SCHED_NODE_TYPE_TC_ARBITER_TSAR ,NULL , extack); } +if (!err) +esw_qos_set_tc_arbiter_bw_shares (vport_node, tc_bw, extack); unlock:esw_qos_unlock (esw);return err;
@@ -1455,6 +1628,8 @@ int mlx5_esw_devlink_rate_node_tc_bw_set(struct devlink_rate *rate_node, void *p } err =esw_qos_node_enable_tc_arbitration (node, extack); +if (!err) +esw_qos_set_tc_arbiter_bw_shares (node, tc_bw, extack); unlock:esw_qos_unlock (esw);return err;
Signature · 1 line
2.45.0
Tariq Toukan
maintainerPATCH 6/15 net/mlx5e: reduce the max log mpwrq sz for ECPF and reps
In reply to Tariq ToukanFrom: William Tu <[email protected]>
For the ECPF and representors, reduce the max MPWRQ size from 256KB (18) to 128KB (17). This prepares the later patch for saving representor memory.
With Striding RQ, there is a minimum of 4 MPWQEs. So with 128KB of max MPWRQ size, the minimal memory is 4 * 128KB = 512KB. When creating page pool, consider 1500 mtu, the minimal page pool size will be 512KB/4KB = 128 pages = 256 rx ring entries (2 entries per page).
Before this patch, setting RX ringsize (ethtool -G rx) to 256 causes driver to allocate page pool size more than it needs due to max MPWRQ is 256KB (18). Ex: 4 * 256KB = 1MB, 1MB/4KB = 256 pages, but actually 128 pages is good enough. Reducing the max MPWRQ to 128KB fixes the limitation.
--- drivers/net/ethernet/mellanox/mlx5/core/en.h | 2 -- .../net/ethernet/mellanox/mlx5/core/en/params.c | 15 +++++++++++---- 2 files changed, 11 insertions(+), 6 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en.h +0 -2
@@ -95,8 +95,6 @@ struct page_pool;#define MLX5_MPWRQ_DEF_LOG_STRIDE_SZ (mdev) \ MLX5_MPWRQ_LOG_STRIDE_SZ(mdev, order_base_2(MLX5E_RX_MAX_HEAD)) -#define MLX5_MPWRQ_MAX_LOG_WQE_SZ 18 -/* Keep in sync with mlx5e_mpwrq_log_wqe_sz. * These are theoretical maximums, which can be further restricted by * capabilities. These values are used for static resource allocations and
drivers/net/ethernet/mellanox/mlx5/core/en/params.c +11 -4
@@ -10,6 +10,9 @@#include <net/page_pool/types.h> #include <net/xdp_sock_drv.h> +#define MLX5_MPWRQ_MAX_LOG_WQE_SZ 18 +#define MLX5_REP_MPWRQ_MAX_LOG_WQE_SZ 17 +static u8 mlx5e_mpwrq_min_page_shift (struct mlx5_core_dev *mdev) {u8 min_page_shift =MLX5_CAP_GEN_2 (mdev, log_min_mkey_entity_size);
@@ -103,18 +106,22 @@ u8 mlx5e_mpwrq_log_wqe_sz(struct mlx5_core_dev *mdev, u8 page_shift, enum mlx5e_mpwrq_umr_mode umr_mode) {u8 umr_entry_size =mlx5e_mpwrq_umr_entry_size (umr_mode); -u8 max_pages_per_wqe, max_log_mpwqe_size; +u8 max_pages_per_wqe, max_log_wqe_size_calc; +u8 max_log_wqe_size_cap;u16 max_wqe_size;/* Keep in sync with MLX5_MPWRQ_MAX_PAGES_PER_WQE. */ max_wqe_size =mlx5e_get_max_sq_aligned_wqebbs (mdev) *MLX5_SEND_WQE_BB ; max_pages_per_wqe =ALIGN_DOWN (max_wqe_size -sizeof (struct mlx5e_umr_wqe ),MLX5_UMR_FLEX_ALIGNMENT ) / umr_entry_size; - max_log_mpwqe_size =ilog2 (max_pages_per_wqe) + page_shift; + max_log_wqe_size_calc =ilog2 (max_pages_per_wqe) + page_shift; + +WARN_ON_ONCE (max_log_wqe_size_calc <MLX5E_ORDER2_MAX_PACKET_MTU ); -WARN_ON_ONCE (max_log_mpwqe_size <MLX5E_ORDER2_MAX_PACKET_MTU ); + max_log_wqe_size_cap =mlx5_core_is_ecpf (mdev) ? +MLX5_REP_MPWRQ_MAX_LOG_WQE_SZ :MLX5_MPWRQ_MAX_LOG_WQE_SZ ; -return min_t (u8, max_log_mpwqe_size,MLX5_MPWRQ_MAX_LOG_WQE_SZ ); +return min_t (u8, max_log_wqe_size_calc, max_log_wqe_size_cap); } u8 mlx5e_mpwrq_pages_per_wqe(struct mlx5_core_dev *mdev, u8 page_shift,
Signature · 1 line
2.45.0
Re: [PATCH net-next 06/15] net/mlx5e: reduce the max log mpwrq sz for ECPF and reps
Quoted 65 lines · Tariq Toukan
From: William Tu <[email protected]>
For the ECPF and representors, reduce the max MPWRQ size from 256KB (18) to 128KB (17). This prepares the later patch for saving representor memory.
With Striding RQ, there is a minimum of 4 MPWQEs. So with 128KB of max MPWRQ size, the minimal memory is 4 * 128KB = 512KB. When creating page pool, consider 1500 mtu, the minimal page pool size will be 512KB/4KB = 128 pages = 256 rx ring entries (2 entries per page).
Before this patch, setting RX ringsize (ethtool -G rx) to 256 causes driver to allocate page pool size more than it needs due to max MPWRQ is 256KB (18). Ex: 4 * 256KB = 1MB, 1MB/4KB = 256 pages, but actually 128 pages is good enough. Reducing the max MPWRQ to 128KB fixes the limitation.
Signed-off-by William Tu <[email protected]>Signed-off-by Tariq Toukan <[email protected]>--- drivers/net/ethernet/mellanox/mlx5/core/en.h | 2 -- .../net/ethernet/mellanox/mlx5/core/en/params.c | 15 +++++++++++---- 2 files changed, 11 insertions(+), 6 deletions(-)drivers/net/ethernet/mellanox/mlx5/core/en.h +0
-2@@ -95,8 +95,6 @@ struct page_pool;#define MLX5_MPWRQ_DEF_LOG_STRIDE_SZ (mdev) \ MLX5_MPWRQ_LOG_STRIDE_SZ(mdev, order_base_2(MLX5E_RX_MAX_HEAD)) -#define MLX5_MPWRQ_MAX_LOG_WQE_SZ 18 -/* Keep in sync with mlx5e_mpwrq_log_wqe_sz. * These are theoretical maximums, which can be further restricted by * capabilities. These values are used for static resource allocations and drivers/net/ethernet/mellanox/mlx5/core/en/params.c +5
-2@@ -10,6 +10,9 @@#include <net/page_pool/types.h> #include <net/xdp_sock_drv.h> +#define MLX5_MPWRQ_MAX_LOG_WQE_SZ 18 +#define MLX5_REP_MPWRQ_MAX_LOG_WQE_SZ 17 +static u8 mlx5e_mpwrq_min_page_shift (struct mlx5_core_dev *mdev) {u8 min_page_shift =MLX5_CAP_GEN_2 (mdev, log_min_mkey_entity_size);@@ -103,18 +106,22 @@ u8 mlx5e_mpwrq_log_wqe_sz(struct mlx5_core_dev *mdev, u8 page_shift, enum mlx5e_mpwrq_umr_mode umr_mode) {u8 umr_entry_size =mlx5e_mpwrq_umr_entry_size (umr_mode); -u8 max_pages_per_wqe, max_log_mpwqe_size; +u8 max_pages_per_wqe, max_log_wqe_size_calc; +u8 max_log_wqe_size_cap;u16 max_wqe_size;/* Keep in sync with MLX5_MPWRQ_MAX_PAGES_PER_WQE. */ max_wqe_size =mlx5e_get_max_sq_aligned_wqebbs (mdev) *MLX5_SEND_WQE_BB ; max_pages_per_wqe =ALIGN_DOWN (max_wqe_size -sizeof (struct mlx5e_umr_wqe ),MLX5_UMR_FLEX_ALIGNMENT ) / umr_entry_size; - max_log_mpwqe_size =ilog2 (max_pages_per_wqe) + page_shift;
drivers/net/ethernet/mellanox/mlx5/core/en/params.c u8 mlx5e_mpwrq_log_wqe_sz(struct mlx5_core_dev *mdev, u8 page_shift, · line 124
Quoted 10 lines
drivers/net/ethernet/mellanox/mlx5/core/en/params.c +6
-2+ max_log_wqe_size_calc =ilog2 (max_pages_per_wqe) + page_shift; + +WARN_ON_ONCE (max_log_wqe_size_calc <MLX5E_ORDER2_MAX_PACKET_MTU ); -WARN_ON_ONCE (max_log_mpwqe_size <MLX5E_ORDER2_MAX_PACKET_MTU ); + max_log_wqe_size_cap =mlx5_core_is_ecpf (mdev) ? +MLX5_REP_MPWRQ_MAX_LOG_WQE_SZ :MLX5_MPWRQ_MAX_LOG_WQE_SZ ; -return min_t (u8, max_log_mpwqe_size,MLX5_MPWRQ_MAX_LOG_WQE_SZ ); +return min_t (u8, max_log_wqe_size_calc, max_log_wqe_size_cap);
Changing the variable name looks like uneccessary complication, as it is still used for the same purpouse.
I remember there were some patches to devlink for supporting changing the representor parameters. Is it sth different or you decided to only change the default value to fix the memory problem? (sorry, maybe I miss the devlink series).
Anyway, looks fine, thanks:
Quoted 5 lines
drivers/net/ethernet/mellanox/mlx5/core/en/params.c +0
-0} u8 mlx5e_mpwrq_pages_per_wqe(struct mlx5_core_dev *mdev, u8 page_shift,Signature · 1 line
2.45.0
Tariq Toukan
maintainerPATCH 7/15 net/mlx5e: reduce rep rxq depth to 256 for ECPF
In reply to Tariq ToukanFrom: William Tu <[email protected]>
By experiments, a single queue representor netdev consumes kernel memory around 2.8MB, and 1.8MB out of the 2.8MB is due to page pool for the RXQ. Scaling to a thousand representors consumes 2.8GB, which becomes a memory pressure issue for embedded devices such as BlueField-2 16GB / BlueField-3 32GB memory.
Since representor netdevs mostly handles miss traffic, and ideally, most of the traffic will be offloaded, reduce the default non-uplink rep netdev's RXQ default depth from 1024 to 256 if mdev is ecpf eswitch manager. This saves around 1MB of memory per regular RQ, (1024 - 256) * 2KB, allocated from page pool.
With rxq depth of 256, the netlink page pool tool reports $./tools/net/ynl/cli.py --spec Documentation/netlink/specs/netdev.yaml \
--dump page-pool-get
{'id': 277,
'ifindex': 9,
'inflight': 128,
'inflight-mem': 786432,
'napi-id': 775}]
This is due to mtu 1500 + headroom consumes half pages, so 256 rxq entries consumes around 128 pages (thus create a page pool with size 128), shown above at inflight.
Note that each netdev has multiple types of RQs, including Regular RQ, XSK, PTP, Drop, Trap RQ. Since non-uplink representor only supports regular rq, this patch only changes the regular RQ's default depth.
--- drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +3 -0
@@ -65,6 +65,7 @@#define MLX5E_REP_PARAMS_DEF_LOG_SQ_SIZE \ max(0x7, MLX5E_PARAMS_MINIMUM_LOG_SQ_SIZE)#define MLX5E_REP_PARAMS_DEF_NUM_CHANNELS 1 +#define MLX5E_REP_PARAMS_DEF_LOG_RQ_SIZE 0x8static const char mlx5e_rep_driver_name[] ="mlx5e_rep" ;
@@ -855,6 +856,8 @@ static void mlx5e_build_rep_params(struct net_device *netdev)/* RQ */ mlx5e_build_rq_params (mdev, params); +if (!mlx5e_is_uplink_rep (priv) &&mlx5_core_is_ecpf (mdev)) + params->log_rq_mtu_frames =MLX5E_REP_PARAMS_DEF_LOG_RQ_SIZE ;/* If netdev is already registered (e.g. move from nic profile to uplink, * RTNL lock must be held before triggering netdev notifiers.
Signature · 1 line
2.45.0
Re: [PATCH net-next 07/15] net/mlx5e: reduce rep rxq depth to 256 for ECPF
Quoted 53 lines · Tariq Toukan
From: William Tu <[email protected]>
By experiments, a single queue representor netdev consumes kernel memory around 2.8MB, and 1.8MB out of the 2.8MB is due to page pool for the RXQ. Scaling to a thousand representors consumes 2.8GB, which becomes a memory pressure issue for embedded devices such as BlueField-2 16GB / BlueField-3 32GB memory.
Since representor netdevs mostly handles miss traffic, and ideally, most of the traffic will be offloaded, reduce the default non-uplink rep netdev's RXQ default depth from 1024 to 256 if mdev is ecpf eswitch manager. This saves around 1MB of memory per regular RQ, (1024 - 256) * 2KB, allocated from page pool.
With rxq depth of 256, the netlink page pool tool reports
$./tools/net/ynl/cli.py--specDocumentation/netlink/specs/netdev.yaml\
--dump page-pool-get
{'id': 277,
'ifindex': 9,
'inflight': 128,
'inflight-mem': 786432,
'napi-id': 775}]This is due to mtu 1500 + headroom consumes half pages, so 256 rxq entries consumes around 128 pages (thus create a page pool with size 128), shown above at inflight.
Note that each netdev has multiple types of RQs, including Regular RQ, XSK, PTP, Drop, Trap RQ. Since non-uplink representor only supports regular rq, this patch only changes the regular RQ's default depth.
Signed-off-by William Tu <[email protected]>Reviewed-by Bodong Wang <[email protected]>Reviewed-by Saeed Mahameed <[email protected]>Signed-off-by Tariq Toukan <[email protected]>--- drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 3 +++ 1 file changed, 3 insertions(+)drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +1
-0@@ -65,6 +65,7 @@#define MLX5E_REP_PARAMS_DEF_LOG_SQ_SIZE \ max(0x7, MLX5E_PARAMS_MINIMUM_LOG_SQ_SIZE)#define MLX5E_REP_PARAMS_DEF_NUM_CHANNELS 1 +#define MLX5E_REP_PARAMS_DEF_LOG_RQ_SIZE 0x8static const char mlx5e_rep_driver_name[] ="mlx5e_rep" ;
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c static void mlx5e_build_rep_params(struct net_device *netdev) · line 863
Quoted 8 lines
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +2
-0@@ -855,6 +856,8 @@ static void mlx5e_build_rep_params(struct net_device *netdev)/* RQ */ mlx5e_build_rq_params (mdev, params); +if (!mlx5e_is_uplink_rep (priv) &&mlx5_core_is_ecpf (mdev)) + params->log_rq_mtu_frames =MLX5E_REP_PARAMS_DEF_LOG_RQ_SIZE ;/* If netdev is already registered (e.g. move from nic profile to uplink, * RTNL lock must be held before triggering netdev notifiers.
Thanks for detailed commit message.
Quoted 2 lines
Signature · 1 line
2.45.0
Tariq Toukan
maintainerPATCH 8/15 net/mlx5e: set the tx_queue_len for pfifo_fast
In reply to Tariq ToukanFrom: William Tu <[email protected]>
By default, the mq netdev creates a pfifo_fast qdisc. On a system with 16 core, the pfifo_fast with 3 bands consumes 16 * 3 * 8 (size of pointer) * 1024 (default tx queue len) = 393KB. The patch sets the tx qlen to representor default value, 128 (1<<MLX5E_REP_PARAMS_DEF_LOG_SQ_SIZE), which consumes 16 * 3 * 8 * 128 = 49KB, saving 344KB for each representor at ECPF.
--- drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +2 -0
@@ -889,6 +889,8 @@ static void mlx5e_build_rep_netdev(struct net_device *netdev, netdev->ethtool_ops = &mlx5e_rep_ethtool_ops; netdev->watchdog_timeo =15 *HZ ; +if (mlx5_core_is_ecpf (mdev)) + netdev->tx_queue_len =1 <<MLX5E_REP_PARAMS_DEF_LOG_SQ_SIZE ;#if IS_ENABLED (CONFIG_MLX5_CLS_ACT ) netdev->hw_features |=NETIF_F_HW_TC ;
Signature · 1 line
2.45.0
Re: [PATCH net-next 08/15] net/mlx5e: set the tx_queue_len for pfifo_fast
Quoted 22 lines · Tariq Toukan
From: William Tu <[email protected]>
By default, the mq netdev creates a
pfifo_fastqdisc. On a system with 16 core, thepfifo_fastwith 3 bands consumes 16 * 3 * 8 (size of pointer) * 1024 (default tx queue len) = 393KB. The patch sets the tx qlen to representor default value, 128 (1<<MLX5E_REP_PARAMS_DEF_LOG_SQ_SIZE), which consumes 16 * 3 * 8 * 128 = 49KB, saving 344KB for each representor at ECPF.Signed-off-by William Tu <[email protected]>Reviewed-by Daniel Jurgens <[email protected]>Signed-off-by Tariq Toukan <[email protected]>--- drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 2 ++ 1 file changed, 2 insertions(+)drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +0
-0
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c static void mlx5e_build_rep_netdev(struct net_device *netdev, · line 896
Quoted 8 lines
drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +2
-0@@ -889,6 +889,8 @@ static void mlx5e_build_rep_netdev(struct net_device *netdev, netdev->ethtool_ops = &mlx5e_rep_ethtool_ops; netdev->watchdog_timeo =15 *HZ ; +if (mlx5_core_is_ecpf (mdev)) + netdev->tx_queue_len =1 <<MLX5E_REP_PARAMS_DEF_LOG_SQ_SIZE ;#if IS_ENABLED (CONFIG_MLX5_CLS_ACT ) netdev->hw_features |=NETIF_F_HW_TC ;
Quoted 2 lines
Signature · 1 line
2.45.0
Tariq Toukan
maintainerPATCH 9/15 net/mlx5: Rename and move mlx5_esw_query_vport_vhca_id
In reply to Tariq ToukanFrom: Akiva Goldberger <[email protected]>
Rename mlx5_esw_query_vport_vhca_id to mlx5_vport_get_vhca_id and move it to vport file. Also, add function declaration to mlx5_core header file. This better represents the function's usage and allows for it to be called from other parts of the mlx5_core driver.
--- .../mellanox/mlx5/core/eswitch_offloads.c | 29 ++----------------- .../ethernet/mellanox/mlx5/core/mlx5_core.h | 2 ++ .../net/ethernet/mellanox/mlx5/core/vport.c | 25 ++++++++++++++++ 3 files changed, 29 insertions(+), 27 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c +2 -27
@@ -4157,37 +4157,12 @@ u32 mlx5_eswitch_get_vport_metadata_for_match(struct mlx5_eswitch *esw, }EXPORT_SYMBOL (mlx5_eswitch_get_vport_metadata_for_match); -static int mlx5_esw_query_vport_vhca_id (struct mlx5_eswitch *esw,u16 vport_num,u16 *vhca_id) -{ -int query_out_sz =MLX5_ST_SZ_BYTES (query_hca_cap_out); -void *query_ctx; -void *hca_caps; -int err; - - *vhca_id =0 ; - - query_ctx =kzalloc (query_out_sz,GFP_KERNEL ); -if (!query_ctx) -return -ENOMEM ; - - err =mlx5_vport_get_other_func_general_cap (esw->dev, vport_num, query_ctx); -if (err) - goto out_free; - - hca_caps =MLX5_ADDR_OF (query_hca_cap_out, query_ctx, capability); - *vhca_id =MLX5_GET (cmd_hca_cap, hca_caps, vhca_id); - -out_free: -kfree (query_ctx); -return err; -} -int mlx5_esw_vport_vhca_id_set (struct mlx5_eswitch *esw,u16 vport_num) {u16 *old_entry, *vhca_map_entry, vhca_id;int err; - err =mlx5_esw_query_vport_vhca_id (esw, vport_num, &vhca_id); + err =mlx5_vport_get_vhca_id (esw->dev, vport_num, &vhca_id);if (err) {esw_warn (esw->dev,"Getting vhca_id for vport failed (vport=%u,err=%d)\n" , vport_num, err);
@@ -4213,7 +4188,7 @@ void mlx5_esw_vport_vhca_id_clear(struct mlx5_eswitch *esw, u16 vport_num)u16 *vhca_map_entry, vhca_id;int err; - err =mlx5_esw_query_vport_vhca_id (esw, vport_num, &vhca_id); + err =mlx5_vport_get_vhca_id (esw->dev, vport_num, &vhca_id);if (err)esw_warn (esw->dev,"Getting vhca_id for vport failed (vport=%hu,err=%d)\n" , vport_num, err);
drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h +2 -0
@@ -346,6 +346,8 @@ int mlx5_vport_set_other_func_cap(struct mlx5_core_dev *dev, const void *hca_cap#define mlx5_vport_get_other_func_general_cap (dev, vport, out) \ mlx5_vport_get_other_func_cap(dev, vport, out, MLX5_CAP_GENERAL) +int mlx5_vport_get_vhca_id (struct mlx5_core_dev *dev,u16 vport,u16 *vhca_id); +static inline u32 mlx5_sriov_get_vf_total_msix (struct pci_dev *pdev) {struct mlx5_core_dev *dev =pci_get_drvdata (pdev);
drivers/net/ethernet/mellanox/mlx5/core/vport.c +25 -0
@@ -1199,6 +1199,31 @@ int mlx5_vport_get_other_func_cap(struct mlx5_core_dev *dev, u16 vport, void *ou }EXPORT_SYMBOL_GPL (mlx5_vport_get_other_func_cap); +int mlx5_vport_get_vhca_id (struct mlx5_core_dev *dev,u16 vport,u16 *vhca_id) +{ +int query_out_sz =MLX5_ST_SZ_BYTES (query_hca_cap_out); +void *query_ctx; +void *hca_caps; +int err; + + *vhca_id =0 ; + + query_ctx =kzalloc (query_out_sz,GFP_KERNEL ); +if (!query_ctx) +return -ENOMEM ; + + err =mlx5_vport_get_other_func_general_cap (dev, vport, query_ctx); +if (err) + goto out_free; + + hca_caps =MLX5_ADDR_OF (query_hca_cap_out, query_ctx, capability); + *vhca_id =MLX5_GET (cmd_hca_cap, hca_caps, vhca_id); + +out_free: +kfree (query_ctx); +return err; +} +int mlx5_vport_set_other_func_cap (struct mlx5_core_dev *dev,const void *hca_cap,u16 vport,u16 opmod) {
Signature · 1 line
2.45.0
Tariq Toukan
maintainerPATCH 10/15 net/mlx5: Expose ICM consumption per function
In reply to Tariq ToukanFrom: Akiva Goldberger <[email protected]>
ICM is a portion of the host's memory assigned to a function by the OS through requests made by the NIC's firmware.
PF ICM consumption can be accessed directly, while VF/SF ICM consumption can be accessed through their representors in switchdev mode.
The value is exposed to the user in granularity of 4KB through the vnic health reporter as follows:
$ devlink health diagnose pci/0000:08:00.0 reporter vnic
vNIC env counters:
total_error_queues: 0 send_queue_priority_update_flow: 0
comp_eq_overrun: 0 async_eq_overrun: 0 cq_overrun: 0
invalid_command: 0 quota_exceeded_command: 0
nic_receive_steering_discard: 0 icm_consumption: 1032--- Documentation/networking/devlink/mlx5.rst | 4 ++ .../mellanox/mlx5/core/diag/reporter_vnic.c | 46 +++++++++++++++++++ 2 files changed, 50 insertions(+)
Documentation/networking/devlink/mlx5.rst +4 -0
@@ -280,6 +280,10 @@ Description of the vnic counters: number of packets handled by the VNIC experiencing unexpected steering failure (at any point in steering flow owned by the VNIC, including the FDB for the eswitch owner). +- icm_consumption + amount of Interconnect Host Memory (ICM) consumed by the vnic in + granularity of 4KB. ICM is host memory allocated by SW upon HCA request + and is used for storing data structures that control HCA operation. User commands examples:
drivers/net/ethernet/mellanox/mlx5/core/diag/reporter_vnic.c +46 -0
58 lines not on this page · raw message
Signature · 1 line
2.45.0
Tariq Toukan
maintainerPATCH 11/15 net/mlx5e: Move RQs diagnose to a dedicated function
In reply to Tariq ToukanFrom: Amir Tzin <[email protected]>
Move rx reporter RQs diagnose from mlx5e_rx_reporter_diagnose() to a dedicated function. This change is a preparation for the following series which extends diagnose output for the rx reporter. While at it, also pass a mlx5e_priv pointer to mlx5e_rx_reporter_diagnose_common_config() as this is the argument the latter actually needs.
--- .../mellanox/mlx5/core/en/reporter_rx.c | 31 +++++++++++-------- 1 file changed, 18 insertions(+), 13 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c +18 -13
@@ -317,10 +317,8 @@ mlx5e_rx_reporter_diagnose_common_ptp_config(struct mlx5e_priv *priv, struct mlx }static void -mlx5e_rx_reporter_diagnose_common_config (struct devlink_health_reporter *reporter, -struct devlink_fmsg *fmsg) +mlx5e_rx_reporter_diagnose_common_config (struct mlx5e_priv *priv,struct devlink_fmsg *fmsg) { -struct mlx5e_priv *priv =devlink_health_reporter_priv (reporter);struct mlx5e_rq *generic_rq = &priv->channels.c[0 ]->rq;struct mlx5e_ptp *ptp_ch = priv->channels.ptp;
@@ -340,20 +338,11 @@ static void mlx5e_rx_reporter_build_diagnose_output_ptp_rq(struct mlx5e_rq *rq,devlink_fmsg_obj_nest_end (fmsg); } -static int mlx5e_rx_reporter_diagnose (struct devlink_health_reporter *reporter, -struct devlink_fmsg *fmsg, -struct netlink_ext_ack *extack) +static void mlx5e_rx_reporter_diagnose_rqs (struct mlx5e_priv *priv,struct devlink_fmsg *fmsg) { -struct mlx5e_priv *priv =devlink_health_reporter_priv (reporter);struct mlx5e_ptp *ptp_ch = priv->channels.ptp;int i; -mutex_lock (&priv->state_lock); - -if (!test_bit (MLX5E_STATE_OPENED , &priv->state)) - goto unlock; - -mlx5e_rx_reporter_diagnose_common_config (reporter, fmsg);devlink_fmsg_arr_pair_nest_start (fmsg,"RQs" );for (i =0 ; i < priv->channels.num; i++) {
@@ -367,7 +356,23 @@ static int mlx5e_rx_reporter_diagnose(struct devlink_health_reporter *reporter, }if (ptp_ch &&test_bit (MLX5E_PTP_STATE_RX , ptp_ch->state))mlx5e_rx_reporter_build_diagnose_output_ptp_rq (&ptp_ch->rq, fmsg); +devlink_fmsg_arr_pair_nest_end (fmsg); +} + +static int mlx5e_rx_reporter_diagnose (struct devlink_health_reporter *reporter, +struct devlink_fmsg *fmsg, +struct netlink_ext_ack *extack) +{ +struct mlx5e_priv *priv =devlink_health_reporter_priv (reporter); + +mutex_lock (&priv->state_lock); + +if (!test_bit (MLX5E_STATE_OPENED , &priv->state)) + goto unlock; + +mlx5e_rx_reporter_diagnose_common_config (priv, fmsg); +mlx5e_rx_reporter_diagnose_rqs (priv, fmsg); unlock:mutex_unlock (&priv->state_lock);return 0 ;
Signature · 1 line
2.45.0
Tariq Toukan
maintainerPATCH 12/15 net/mlx5e: Add direct TIRs to devlink rx reporter diagnose
In reply to Tariq ToukanFrom: Amir Tzin <[email protected]>
Add "RX resources" tag to the output of rx reporter diagnose callback. Underneath add tag for direct TIRs, for each TIR expose its tirn and the corresponding rqtn.
$ sudo devlink health diagnose auxiliary/mlx5_core.eth.0/65535 reporter rx
....
rx resources:
Direct TIRs:
ix: 0 tirn: 20 rqtn: 1
ix: 1 tirn: 21 rqtn: 2
ix: 2 tirn: 22 rqtn: 3
ix: 3 tirn: 23 rqtn: 4
ix: 4 tirn: 24 rqtn: 5
ix: 5 tirn: 25 rqtn: 6
ix: 6 tirn: 26 rqtn: 7
ix: 7 tirn: 27 rqtn: 8
ix: 8 tirn: 28 rqtn: 9
ix: 9 tirn: 29 rqtn: 10
ix: 10 tirn: 30 rqtn: 11
ix: 11 tirn: 31 rqtn: 12
ix: 12 tirn: 32 rqtn: 13
ix: 13 tirn: 33 rqtn: 14
ix: 14 tirn: 34 rqtn: 15
ix: 15 tirn: 35 rqtn: 16
ix: 16 tirn: 36 rqtn: 17
ix: 17 tirn: 37 rqtn: 18
ix: 18 tirn: 38 rqtn: 19
ix: 19 tirn: 39 rqtn: 20
ix: 20 tirn: 40 rqtn: 21
ix: 21 tirn: 41 rqtn: 22
ix: 22 tirn: 42 rqtn: 23
ix: 23 tirn: 43 rqtn: 24--- .../mellanox/mlx5/core/en/reporter_rx.c | 32 +++++++++++++++++++ .../ethernet/mellanox/mlx5/core/en/rx_res.c | 7 +++- .../ethernet/mellanox/mlx5/core/en/rx_res.h | 2 ++ 3 files changed, 40 insertions(+), 1 deletion(-)
drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c +32 -0
@@ -338,6 +338,37 @@ static void mlx5e_rx_reporter_build_diagnose_output_ptp_rq(struct mlx5e_rq *rq,devlink_fmsg_obj_nest_end (fmsg); } +static void mlx5e_rx_reporter_diagnose_rx_res_dir_tirns (struct mlx5e_rx_res *rx_res, +struct devlink_fmsg *fmsg) +{ +unsigned int max_nch =mlx5e_rx_res_get_max_nch (rx_res); +int i; + +devlink_fmsg_arr_pair_nest_start (fmsg,"Direct TIRs" ); + +for (i =0 ; i < max_nch; i++) { +devlink_fmsg_obj_nest_start (fmsg); + +devlink_fmsg_u32_pair_put (fmsg,"ix" , i); +devlink_fmsg_u32_pair_put (fmsg,"tirn" ,mlx5e_rx_res_get_tirn_direct (rx_res, i)); +devlink_fmsg_u32_pair_put (fmsg,"rqtn" ,mlx5e_rx_res_get_rqtn_direct (rx_res, i)); + +devlink_fmsg_obj_nest_end (fmsg); + } + +devlink_fmsg_arr_pair_nest_end (fmsg); +} + +static void mlx5e_rx_reporter_diagnose_rx_res (struct mlx5e_priv *priv, +struct devlink_fmsg *fmsg) +{ +struct mlx5e_rx_res *rx_res = priv->rx_res; + +mlx5e_health_fmsg_named_obj_nest_start (fmsg,"RX resources" ); +mlx5e_rx_reporter_diagnose_rx_res_dir_tirns (rx_res, fmsg); +mlx5e_health_fmsg_named_obj_nest_end (fmsg); +} +static void mlx5e_rx_reporter_diagnose_rqs (struct mlx5e_priv *priv,struct devlink_fmsg *fmsg) {struct mlx5e_ptp *ptp_ch = priv->channels.ptp;
@@ -373,6 +404,7 @@ static int mlx5e_rx_reporter_diagnose(struct devlink_health_reporter *reporter,mlx5e_rx_reporter_diagnose_common_config (priv, fmsg);mlx5e_rx_reporter_diagnose_rqs (priv, fmsg); +mlx5e_rx_reporter_diagnose_rx_res (priv, fmsg); unlock:mutex_unlock (&priv->state_lock);return 0 ;
drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.c +6 -1
@@ -497,6 +497,11 @@ void mlx5e_rx_res_destroy(struct mlx5e_rx_res *res)mlx5e_rx_res_free (res); } +unsigned int mlx5e_rx_res_get_max_nch (struct mlx5e_rx_res *res) +{ +return res->max_nch; +} +u32 mlx5e_rx_res_get_tirn_direct (struct mlx5e_rx_res *res,unsigned int ix) {return mlx5e_tir_get_tirn (&res->channels[ix].direct_tir);
@@ -522,7 +527,7 @@ u32 mlx5e_rx_res_get_tirn_ptp(struct mlx5e_rx_res *res)return mlx5e_tir_get_tirn (&res->ptp.tir); } -static u32 mlx5e_rx_res_get_rqtn_direct (struct mlx5e_rx_res *res,unsigned int ix) +u32 mlx5e_rx_res_get_rqtn_direct (struct mlx5e_rx_res *res,unsigned int ix) {return mlx5e_rqt_get_rqtn (&res->channels[ix].direct_rqt); }
drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.h +2 -0
@@ -34,6 +34,8 @@ u32 mlx5e_rx_res_get_tirn_direct(struct mlx5e_rx_res *res, unsigned int ix);u32 mlx5e_rx_res_get_tirn_rss (struct mlx5e_rx_res *res,enum mlx5_traffic_types tt);u32 mlx5e_rx_res_get_tirn_rss_inner (struct mlx5e_rx_res *res,enum mlx5_traffic_types tt);u32 mlx5e_rx_res_get_tirn_ptp (struct mlx5e_rx_res *res); +u32 mlx5e_rx_res_get_rqtn_direct (struct mlx5e_rx_res *res,unsigned int ix); +unsigned int mlx5e_rx_res_get_max_nch (struct mlx5e_rx_res *res);/* Activate/deactivate API */ void mlx5e_rx_res_channels_activate (struct mlx5e_rx_res *res,struct mlx5e_channels *chs);
Signature · 1 line
2.45.0
Tariq Toukan
maintainerPATCH 13/15 net/mlx5e: Expose RSS via devlink rx reporter diagnose
In reply to Tariq ToukanFrom: Amir Tzin <[email protected]>
Underneath "rx resources" tag expose RSS diagnostic information. For each RSS expose its rqtn, TIRs and inner TIRs.
$ devlink health diagnose auxiliary/mlx5_core.eth.0/65535 reporter rx
.......
RSS:
Index: 0 rqtn: 0
TIRs Numbers:
tt: TT_IPV4_TCP tirn: 0
tt: TT_IPV6_TCP tirn: 1
tt: TT_IPV4_UDP tirn: 2
tt: TT_IPV6_UDP tirn: 3
tt: TT_IPV4_IPSEC_AH tirn: 4
tt: TT_IPV6_IPSEC_AH tirn: 5
tt: TT_IPV4_IPSEC_ESP tirn: 6
tt: TT_IPV6_IPSEC_ESP tirn: 7
tt: TT_IPV4 tirn: 8
tt: TT_IPV6 tirn: 9
Inner TIRs Numbers:
tt: TT_IPV4_TCP tirn: 10
tt: TT_IPV6_TCP tirn: 11
tt: TT_IPV4_UDP tirn: 12
tt: TT_IPV6_UDP tirn: 13
tt: TT_IPV4_IPSEC_AH tirn: 14
tt: TT_IPV6_IPSEC_AH tirn: 15
tt: TT_IPV4_IPSEC_ESP tirn: 16
tt: TT_IPV6_IPSEC_ESP tirn: 17
tt: TT_IPV4 tirn: 18
tt: TT_IPV6 tirn: 19
Index: 2 rqtn: 27
TIRs Numbers:
tt: TT_IPV6_TCP tirn: 46--- .../mellanox/mlx5/core/en/reporter_rx.c | 58 +++++++++++++++++++ .../net/ethernet/mellanox/mlx5/core/en/rss.c | 15 +++++ .../net/ethernet/mellanox/mlx5/core/en/rss.h | 3 + .../ethernet/mellanox/mlx5/core/en/rx_res.c | 2 - .../ethernet/mellanox/mlx5/core/en/rx_res.h | 3 + .../ethernet/mellanox/mlx5/core/lib/fs_ttc.c | 19 ++++++ .../ethernet/mellanox/mlx5/core/lib/fs_ttc.h | 1 + 7 files changed, 99 insertions(+), 2 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en/reporter_rx.c +58 -0
@@ -359,6 +359,63 @@ static void mlx5e_rx_reporter_diagnose_rx_res_dir_tirns(struct mlx5e_rx_res *rx_devlink_fmsg_arr_pair_nest_end (fmsg); } +static void mlx5e_rx_reporter_diagnose_rx_res_rss_tirn (struct mlx5e_rss *rss,bool inner, +struct devlink_fmsg *fmsg) +{ +bool found_valid_tir = false; +int tt; + +for (tt =0 ; tt <MLX5E_NUM_INDIR_TIRS ; tt++) { +if (!mlx5e_rss_valid_tir (rss, tt, inner)) +continue ; + +if (!found_valid_tir) { +char *tir_msg = inner ?"Inner TIRs Numbers" :"TIRs Numbers" ; + + found_valid_tir = true; +devlink_fmsg_arr_pair_nest_start (fmsg, tir_msg); + } + +devlink_fmsg_obj_nest_start (fmsg); +devlink_fmsg_string_pair_put (fmsg,"tt" ,mlx5_ttc_get_name (tt)); +devlink_fmsg_u32_pair_put (fmsg,"tirn" ,mlx5e_rss_get_tirn (rss, tt, inner)); +devlink_fmsg_obj_nest_end (fmsg); + } + +if (found_valid_tir) +devlink_fmsg_arr_pair_nest_end (fmsg); +} + +static void mlx5e_rx_reporter_diagnose_rx_res_rss_ix (struct mlx5e_rx_res *rx_res,u32 rss_idx, +struct devlink_fmsg *fmsg) +{ +struct mlx5e_rss *rss =mlx5e_rx_res_rss_get (rx_res, rss_idx); + +if (!rss) +return ; + +devlink_fmsg_obj_nest_start (fmsg); + +devlink_fmsg_u32_pair_put (fmsg,"Index" , rss_idx); +devlink_fmsg_u32_pair_put (fmsg,"rqtn" ,mlx5e_rss_get_rqtn (rss)); +mlx5e_rx_reporter_diagnose_rx_res_rss_tirn (rss, false, fmsg); +if (mlx5e_rss_get_inner_ft_support (rss)) +mlx5e_rx_reporter_diagnose_rx_res_rss_tirn (rss, true, fmsg); + +devlink_fmsg_obj_nest_end (fmsg); +} + +static void mlx5e_rx_reporter_diagnose_rx_res_rss (struct mlx5e_rx_res *rx_res, +struct devlink_fmsg *fmsg) +{ +int rss_ix; + +devlink_fmsg_arr_pair_nest_start (fmsg,"RSS" ); +for (rss_ix =0 ; rss_ix <MLX5E_MAX_NUM_RSS ; rss_ix++) +mlx5e_rx_reporter_diagnose_rx_res_rss_ix (rx_res, rss_ix, fmsg); +devlink_fmsg_arr_pair_nest_end (fmsg); +} +static void mlx5e_rx_reporter_diagnose_rx_res (struct mlx5e_priv *priv,struct devlink_fmsg *fmsg) {
@@ -366,6 +423,7 @@ static void mlx5e_rx_reporter_diagnose_rx_res(struct mlx5e_priv *priv,mlx5e_health_fmsg_named_obj_nest_start (fmsg,"RX resources" );mlx5e_rx_reporter_diagnose_rx_res_dir_tirns (rx_res, fmsg); +mlx5e_rx_reporter_diagnose_rx_res_rss (rx_res, fmsg);mlx5e_health_fmsg_named_obj_nest_end (fmsg); }
drivers/net/ethernet/mellanox/mlx5/core/en/rss.c +15 -0
@@ -81,6 +81,11 @@ struct mlx5e_rss {refcount_t refcnt; }; +bool mlx5e_rss_get_inner_ft_support (struct mlx5e_rss *rss) +{ +return rss->inner_ft_support; +} +void mlx5e_rss_params_indir_modify_actual_size (struct mlx5e_rss *rss,u32 num_channels) { rss->indir.actual_table_size =mlx5e_rqt_size (rss->mdev, num_channels);
@@ -449,6 +454,16 @@ u32 mlx5e_rss_get_tirn(struct mlx5e_rss *rss, enum mlx5_traffic_types tt,return mlx5e_tir_get_tirn (tir); } +u32 mlx5e_rss_get_rqtn (struct mlx5e_rss *rss) +{ +return mlx5e_rqt_get_rqtn (&rss->rqt); +} + +bool mlx5e_rss_valid_tir (struct mlx5e_rss *rss,enum mlx5_traffic_types tt,bool inner) +{ +return !!rss_get_tir (rss, tt, inner); +} +/* Fill the "tirn" output parameter. * Create the requested TIR if it's its first usage. */
drivers/net/ethernet/mellanox/mlx5/core/en/rss.h +3 -0
@@ -32,8 +32,11 @@ void mlx5e_rss_refcnt_inc(struct mlx5e_rss *rss);void mlx5e_rss_refcnt_dec (struct mlx5e_rss *rss);unsigned int mlx5e_rss_refcnt_read (struct mlx5e_rss *rss); +bool mlx5e_rss_get_inner_ft_support (struct mlx5e_rss *rss);u32 mlx5e_rss_get_tirn (struct mlx5e_rss *rss,enum mlx5_traffic_types tt,bool inner); +bool mlx5e_rss_valid_tir (struct mlx5e_rss *rss,enum mlx5_traffic_types tt,bool inner); +u32 mlx5e_rss_get_rqtn (struct mlx5e_rss *rss); int mlx5e_rss_obtain_tirn(struct mlx5e_rss *rss, enum mlx5_traffic_types tt, const struct mlx5e_packet_merge_param *init_pkt_merge_param,
drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.c +0 -2
@@ -5,8 +5,6 @@#include "channels.h" #include "params.h" -#define MLX5E_MAX_NUM_RSS 16 -struct mlx5e_rx_res {struct mlx5_core_dev *mdev;/* primary */ enum mlx5e_rx_res_features features;
drivers/net/ethernet/mellanox/mlx5/core/en/rx_res.h +3 -0
@@ -10,6 +10,8 @@#include "fs.h" #include "rss.h" +#define MLX5E_MAX_NUM_RSS 16 +struct mlx5e_rx_res ;struct mlx5e_channels ;
@@ -36,6 +38,7 @@ u32 mlx5e_rx_res_get_tirn_rss_inner(struct mlx5e_rx_res *res, enum mlx5_traffic_u32 mlx5e_rx_res_get_tirn_ptp (struct mlx5e_rx_res *res);u32 mlx5e_rx_res_get_rqtn_direct (struct mlx5e_rx_res *res,unsigned int ix);unsigned int mlx5e_rx_res_get_max_nch (struct mlx5e_rx_res *res); +bool mlx5_rx_res_rss_inner_ft_support (struct mlx5e_rx_res *res);/* Activate/deactivate API */ void mlx5e_rx_res_channels_activate (struct mlx5e_rx_res *res,struct mlx5e_channels *chs);
drivers/net/ethernet/mellanox/mlx5/core/lib/fs_ttc.c +19 -0
@@ -61,6 +61,25 @@ static void mlx5_cleanup_ttc_rules(struct mlx5_ttc_table *ttc) } } +static const char *mlx5_traffic_types_names[MLX5_NUM_TT ] = { + [MLX5_TT_IPV4_TCP ] ="TT_IPV4_TCP" , + [MLX5_TT_IPV6_TCP ] ="TT_IPV6_TCP" , + [MLX5_TT_IPV4_UDP ] ="TT_IPV4_UDP" , + [MLX5_TT_IPV6_UDP ] ="TT_IPV6_UDP" , + [MLX5_TT_IPV4_IPSEC_AH ] ="TT_IPV4_IPSEC_AH" , + [MLX5_TT_IPV6_IPSEC_AH ] ="TT_IPV6_IPSEC_AH" , + [MLX5_TT_IPV4_IPSEC_ESP ] ="TT_IPV4_IPSEC_ESP" , + [MLX5_TT_IPV6_IPSEC_ESP ] ="TT_IPV6_IPSEC_ESP" , + [MLX5_TT_IPV4 ] ="TT_IPV4" , + [MLX5_TT_IPV6 ] ="TT_IPV6" , + [MLX5_TT_ANY ] ="TT_ANY" +}; + +const char *mlx5_ttc_get_name (enum mlx5_traffic_types tt) +{ +return mlx5_traffic_types_names[tt]; +} +struct mlx5_etype_proto {u16 etype;u8 proto;
drivers/net/ethernet/mellanox/mlx5/core/lib/fs_ttc.h +1 -0
@@ -49,6 +49,7 @@ struct ttc_params {struct mlx5_flow_destination tunnel_dests[MLX5_NUM_TUNNEL_TT ]; }; +const char *mlx5_ttc_get_name (enum mlx5_traffic_types tt);struct mlx5_flow_table *mlx5_get_ttc_flow_table (struct mlx5_ttc_table *ttc); struct mlx5_ttc_table *mlx5_create_ttc_table(struct mlx5_core_dev *dev,
Signature · 1 line
2.45.0
Tariq Toukan
maintainerPATCH 14/15 net/mlx5: Extend Ethtool loopback selftest to support non-linear SKB
In reply to Tariq ToukanFrom: Alexei Lazar <[email protected]>
Current loopback test validation ignores non-linear SKB case in the SKB access, which can lead to failures in scenarios such as when HW GRO is enabled.
Linearize the SKB so both cases will be handled.
--- drivers/net/ethernet/mellanox/mlx5/core/en_selftest.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/ethernet/mellanox/mlx5/core/en_selftest.c +3 -0
@@ -166,6 +166,9 @@ mlx5e_test_loopback_validate(struct sk_buff *skb,struct udphdr *udph;struct iphdr *iph; +if (skb_linearize (skb)) + goto out; +/* We are only going to peek, no need to clone the SKB */ if (MLX5E_TEST_PKT_SIZE -ETH_HLEN >skb_headlen (skb)) goto out;
Signature · 1 line
2.45.0
Tariq Toukan
maintainerPATCH 15/15 net/mlx5: XDP, Enable TX side XDP multi-buffer support
In reply to Tariq ToukanFrom: Alexei Lazar <[email protected]>
In XDP scenarios, fragmented packets can occur if the MTU is larger than the page size, even when the packet size fits within the linear part.
If XDP multi-buffer support is disabled, the fragmented part won't be handled in the TX flow, leading to packet drops.
Since XDP multi-buffer support is always available, this commit removes the conditional check for enabling it.
This ensures that XDP multi-buffer support is always enabled, regardless of the is_xdp_mb parameter, and guarantees the handling of fragmented packets in such scenarios.
--- drivers/net/ethernet/mellanox/mlx5/core/en.h | 1 - .../ethernet/mellanox/mlx5/core/en/params.c | 1 - .../ethernet/mellanox/mlx5/core/en/params.h | 1 - .../mellanox/mlx5/core/en/reporter_tx.c | 1 - .../net/ethernet/mellanox/mlx5/core/en/xdp.c | 49 ++++++++----------- .../net/ethernet/mellanox/mlx5/core/en_main.c | 29 ----------- 6 files changed, 21 insertions(+), 61 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/en.h +0 -1
@@ -384,7 +384,6 @@ enum {MLX5E_SQ_STATE_VLAN_NEED_L2_INLINE ,MLX5E_SQ_STATE_PENDING_XSK_TX ,MLX5E_SQ_STATE_PENDING_TLS_RX_RESYNC , -MLX5E_SQ_STATE_XDP_MULTIBUF , MLX5E_NUM_SQ_STATES, /* Must be kept last */ };
drivers/net/ethernet/mellanox/mlx5/core/en/params.c +0 -1
@@ -1247,7 +1247,6 @@ void mlx5e_build_xdpsq_param(struct mlx5_core_dev *mdev,mlx5e_build_sq_param_common (mdev, param);MLX5_SET (wq, wq, log_wq_sz, params->log_sq_size); param->is_mpw =MLX5E_GET_PFLAG (params,MLX5E_PFLAG_XDP_TX_MPWQE ); - param->is_xdp_mb = !mlx5e_rx_is_linear_skb (mdev, params, xsk);mlx5e_build_tx_cq_param (mdev, params, ¶m->cqp); }
drivers/net/ethernet/mellanox/mlx5/core/en/params.h +0 -1
@@ -33,7 +33,6 @@ struct mlx5e_sq_param {struct mlx5_wq_param wq;bool is_mpw;bool is_tls; -bool is_xdp_mb;u16 stop_room; };
drivers/net/ethernet/mellanox/mlx5/core/en/reporter_tx.c +0 -1
@@ -16,7 +16,6 @@ static const char * const sq_sw_state_type_name[] = { [MLX5E_SQ_STATE_VLAN_NEED_L2_INLINE] = "vlan_need_l2_inline", [MLX5E_SQ_STATE_PENDING_XSK_TX] = "pending_xsk_tx", [MLX5E_SQ_STATE_PENDING_TLS_RX_RESYNC] = "pending_tls_rx_resync", - [MLX5E_SQ_STATE_XDP_MULTIBUF] = "xdp_multibuf", };static int mlx5e_wait_for_sq_flush (struct mlx5e_txqsq *sq)
drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c +21 -28
68 lines not on this page · raw message
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +0 -29
@@ -2023,41 +2023,12 @@ int mlx5e_open_xdpsq(struct mlx5e_channel *c, struct mlx5e_params *params, csp.min_inline_mode = sq->min_inline_mode;set_bit (MLX5E_SQ_STATE_ENABLED , &sq->state); -if (param->is_xdp_mb) -set_bit (MLX5E_SQ_STATE_XDP_MULTIBUF , &sq->state); - err =mlx5e_create_sq_rdy (c->mdev, param, &csp,0 , &sq->sqn);if (err) goto err_free_xdpsq;mlx5e_set_xmit_fp (sq, param->is_mpw); -if (!param->is_mpw && !test_bit (MLX5E_SQ_STATE_XDP_MULTIBUF , &sq->state)) { -unsigned int ds_cnt =MLX5E_TX_WQE_EMPTY_DS_COUNT +1 ; -unsigned int inline_hdr_sz =0 ; -int i; - -if (sq->min_inline_mode !=MLX5_INLINE_MODE_NONE ) { - inline_hdr_sz =MLX5E_XDP_MIN_INLINE ; - ds_cnt++; - } - -/* Pre initialize fixed WQE fields */ -for (i =0 ; i <mlx5_wq_cyc_get_size (&sq->wq); i++) { -struct mlx5e_tx_wqe *wqe =mlx5_wq_cyc_get_wqe (&sq->wq, i); -struct mlx5_wqe_ctrl_seg *cseg = &wqe->ctrl; -struct mlx5_wqe_eth_seg *eseg = &wqe->eth; - - sq->db.wqe_info[i] = (struct mlx5e_xdp_wqe_info ) { - .num_wqebbs =1 , - .num_pkts =1 , - }; - - cseg->qpn_ds =cpu_to_be32 ((sq->sqn <<8 ) | ds_cnt); - eseg->inline_hdr.sz =cpu_to_be16 (inline_hdr_sz); - } - } -return 0 ; err_free_xdpsq:
Signature · 1 line
2.45.0
Jakub Kicinski
maintainerQuoted 15 lines · On Sun, 9 Feb 2025 12:17:01 +0200 Tariq Toukan wrote:
This feature extends the devlink-rate API to support traffic class (TC) bandwidth management, enabling more granular control over traffic shaping and rate limiting across multiple TCs. The API now allows users to specify bandwidth proportions for different traffic classes in a single command. This is particularly useful for managing Enhanced Transmission Selection (ETS) for groups of Virtual Functions (VFs), allowing precise bandwidth allocation across traffic classes.
Additionally, it refines the QoS handling in net/mlx5 to support TC arbitration and bandwidth management on vports and rate nodes.
Discussions on traffic class shaping in net-shapers began in V5 [2], where we discussed with maintainers whether net-shapers should support traffic classes and how this could be implemented.
Quoted 7 lines
Later, after further conversations with Paolo Abeni and Simon Horman, Cosmin provided an update [3], confirming that net-shapers' tree-based hierarchy aligns well with traffic classes when treated as distinct subsets of netdev queues. Since mlx5 enforces a 1:1 mapping between TX queues and traffic classes, this approach seems feasible, though some open questions remain regarding queue reconfiguration and certain mlx5 scheduling behaviors.
/trim CC, add Carolina.
I don't understand what the plan is for shapers. As you say at netdev level the classes will likely be associated with queues, so there isn't much to do. So how will we represent the TCs based on classification? I appreciate you working with Paolo and Simon, but from my perspective none of the questions have been answered.
I'm not even asking you to write the code, just to have a solid plan.
Tariq, LMK if you want me to apply the patches starting from patch 6. The rest of the series looks good. Two process notes, FWIW:
- pretty sure we agreed in the past that it's okay to have patches which significantly extend uAPI or core to be handled outside of the main "driver update stream"; what "significant" means may take a bit of trial and error but I can't think of any misunderstandings so far
- from my PoV it'd be perfectly fine if you were to submit multiple series at once if they are independent. Just as long as there's not more than 15 patches for either tree outstanding. But I understand that comes at it's own cost
Quoted 1 line · Jakub Kicinski
On Sun, 9 Feb 2025 12:17:01 +0200 Tariq Toukan wrote:
..
Quoted 1 line
Tariq, LMK if you want me to apply the patches starting from patch 6.
Yes, please apply.
Quoted 11 lines
The rest of the series looks good. Two process notes, FWIW:
- pretty sure we agreed in the past that it's okay to have patches which significantly extend uAPI or core to be handled outside of the main "driver update stream"; what "significant" means may take a bit of trial and error but I can't think of any misunderstandings so far
- from my PoV it'd be perfectly fine if you were to submit multiple series at once if they are independent. Just as long as there's not more than 15 patches for either tree outstanding. But I understand that comes at it's own cost
Ack.
That sounds good.
Can be helpful in some cases.
Regards,
Tariq
Quoted 26 lines · Jakub Kicinski
Quoted 15 lines · On Sun, 9 Feb 2025 12:17:01 +0200 Tariq Toukan wrote:
This feature extends the devlink-rate API to support traffic class (TC) bandwidth management, enabling more granular control over traffic shaping and rate limiting across multiple TCs. The API now allows users to specify bandwidth proportions for different traffic classes in a single command. This is particularly useful for managing Enhanced Transmission Selection (ETS) for groups of Virtual Functions (VFs), allowing precise bandwidth allocation across traffic classes.
Additionally, it refines the QoS handling in net/mlx5 to support TC arbitration and bandwidth management on vports and rate nodes.
Discussions on traffic class shaping in net-shapers began in V5 [2], where we discussed with maintainers whether net-shapers should support traffic classes and how this could be implemented.
Quoted 7 lines
Later, after further conversations with Paolo Abeni and Simon Horman, Cosmin provided an update [3], confirming that net-shapers' tree-based hierarchy aligns well with traffic classes when treated as distinct subsets of netdev queues. Since mlx5 enforces a 1:1 mapping between TX queues and traffic classes, this approach seems feasible, though some open questions remain regarding queue reconfiguration and certain mlx5 scheduling behaviors.
/trim CC, add Carolina.
Quoted 8 lines
I don't understand what the plan is for shapers. As you say at netdev level the classes will likely be associated with queues, so there isn't much to do. So how will we represent the TCs based on classification? I appreciate you working with Paolo and Simon, but from my perspective none of the questions have been answered.
I'm not even asking you to write the code, just to have a solid plan.
This is WIP. We'll share more details soon.
Tariq.
Quoted 11 lines · Jakub Kicinski
/trim CC, add Carolina.
I don't understand what the plan is for shapers. As you say at netdev level the classes will likely be associated with queues, so there isn't
much to do. So how will we represent the TCs based on classification? I appreciate you working with Paolo and Simon, but from my perspective
none of the questions have been answered.I'm not even asking you to write the code, just to have a solid plan.
I have sent something up at
https://lore.kernel.org/netdev/[email protected]/T/#u
This is the result of several meetings with Paolo, Simon and Carolina over the last couple of months.
Let's continue the discussion on that thread.
Cosmin.
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 10 lines · On Sun, 9 Feb 2025 12:17:01 +0200 you wrote:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bitHi,
This patchset consists of multiple features from the team to the mlx5 core and Eth drivers.
[...]
Here is the summary with links:
- [net-next,01/15] devlink: Extend devlink rate API with traffic classes bandwidth management (no matching commit)
- [net-next,02/15] net/mlx5: Add no-op implementation for setting tc-bw on rate objects (no matching commit)
- [net-next,03/15] net/mlx5: Add support for setting tc-bw on nodes
(no matching commit)
- [net-next,04/15] net/mlx5: Add traffic class scheduling support for vport QoS (no matching commit)
- [net-next,05/15] net/mlx5: Manage TC arbiter nodes and implement full support for tc-bw (no matching commit)
- [net-next,06/15] net/mlx5e: reduce the max log mpwrq sz for ECPF and reps
https://git.kernel.org/netdev/net-next/c/e1d68ea58c7e - [net-next,07/15] net/mlx5e: reduce rep rxq depth to 256 for ECPF https://git.kernel.org/netdev/net-next/c/b9cc8f9d7008 - [net-next,08/15] net/mlx5e: set the tx_queue_len for pfifo_fast https://git.kernel.org/netdev/net-next/c/a38cc5706fb9 - [net-next,09/15] net/mlx5: Rename and move mlx5_esw_query_vport_vhca_id https://git.kernel.org/netdev/net-next/c/38b3d42e5afa - [net-next,10/15] net/mlx5: Expose ICM consumption per function https://git.kernel.org/netdev/net-next/c/b820864335c8 - [net-next,11/15] net/mlx5e: Move RQs diagnose to a dedicated function https://git.kernel.org/netdev/net-next/c/913175b3f919 - [net-next,12/15] net/mlx5e: Add direct TIRs to devlink rx reporter diagnose https://git.kernel.org/netdev/net-next/c/99c55284e85b - [net-next,13/15] net/mlx5e: Expose RSS via devlink rx reporter diagnose https://git.kernel.org/netdev/net-next/c/896c92aa7429 - [net-next,14/15] net/mlx5: Extend Ethtool loopback selftest to support non-linear SKB https://git.kernel.org/netdev/net-next/c/95b9606b15bb - [net-next,15/15] net/mlx5: XDP, Enable TX side XDP multi-buffer support https://git.kernel.org/netdev/net-next/c/1a9304859b3a
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html