From nobody Wed Oct 8 12:40:49 2025 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2042.outbound.protection.outlook.com [40.107.243.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C0451EEAA; Sun, 29 Jun 2025 14:22:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.243.42 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751206957; cv=fail; b=LFYsvB+Z8aSIyL/mopw6yXHYP6/FToVti/BuKwlbpO1SYYhoKe4ZTFNK4uQndYXhk/WNtXy2eVUeG99oARChHmfNnBKVZce/l5b9jetE1kBLcY5bmkIqiuL9FHmLbyYddRAvgGNngoxlGKscAQ+R4DpwcpjEbJ6ca1PVns02dt8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751206957; c=relaxed/simple; bh=h9NW1T3RCvy5b/laq9B7kL+8tx5n1Dnu10xD5eoCkhE=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=OqyZ2+DQ4ftv6yaW8X6sGiGwp8W+sWmLVQNjsCJyxYSjoqGDDYEui6KB0bSUn0hAkDVPqsCm7WHyijEUhOcKjq76/aeNwY/8FgPJXLqVaY/fsQO5VERkerWG/5PpZEkvcL5DlFg+UlUEk+hv1iPulqRvEfJCnO1OLFXAj/SDoLM= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=X3Qp4JZv; arc=fail smtp.client-ip=40.107.243.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="X3Qp4JZv" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=jf+aTK7zbkkoIbzvJCdsfjphMhiUpqnKAs68GIznoPkj6EDDO5lBHKOryZfbhDHhuefkGbRZl309pRuakdd5tMRn41U913YxdoGYoJq89tiTKIAQq29ZyA4dw83WPud+gD1pOZNb9lpu9JLau8VD1DIb2OWexna7AYkqLlhJChjK8N9rSzWSTTMO8L+kOgV9/aLKvVfvA6EOVjsYPQrC+4Obzw0Dg0Q/tlzwic4aiuo2N25748oJ/8ULtDghzC0dvvng9ZnQXhtN18FrYpnMUabcr1T1wLe+/+y8C6Y+gxtMJS6RW2TiPlZ7jMGOuB8JvipXusu+UBoVEW0xwVWUSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=+vJaLhtj0XqSsNj6e/xm49/XWG8MJo5fG4v9D4OcFBU=; b=LlkBCWRtXGkZrivpw1nBMd1egKCVnUUVbBZLCc0S1u6JG7QxI4YLOVYUPtgkolAqLhF52vwQ2/yeH/xXhWDcvu0I9DehutvCfadceMVVh7rFb0Az6nlB38NLPxJGxKTUDAUlj4oxnifkdBcjB6uudWrfJYEYyxIR3PWZYPzWqTfg8ZhyeC+MTCykTy+Yk6fOQmErqVigRe4byJf03kVOYbGrUvhXQuEU18uPYO71+XsppMuW8ElPjyfyjFEw62WGG/dEKhM7O91+2AEMDcN7zkYcJYF7anD7IZj1ylrPK2MWkenPhpVNpft58wHS4N/Rxaq5f3DAkZyuKzPDTtmjMw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=davemloft.net smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+vJaLhtj0XqSsNj6e/xm49/XWG8MJo5fG4v9D4OcFBU=; b=X3Qp4JZv8+Zf6ZOW3x5f5JGHHubeT1rLm98qBorRmJlL7IfpE+Q4wtRPP1UE5o431E/LjLCOZAp6Xy0Mj4hdSnRxU48RQHEqwfD9jWR2eaz3FZqDULKB7R1SA4R35dkhhop+5hdVo2GGd/IbyzZAgswyzZcyk91gFXQ/p+LCKm7kNgZBSjKnj1eZbFuBEDqKmXrSCqOYZpyaK5PwN8s8SXxIsEIU/qZuwt2BjpjytUYL7pYrbS34aFG/EhUeeFEmPZvy8wNtg6fbGS0xvTO0WPN6oHzgWjhGb6LFvqoFF9dvrhEBPj/YOLm8nOzlRIGvwE3jYkSWdGX9RyFbwEF2sA== Received: from SJ0PR03CA0384.namprd03.prod.outlook.com (2603:10b6:a03:3a1::29) by DS7PR12MB6117.namprd12.prod.outlook.com (2603:10b6:8:9b::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8880.25; Sun, 29 Jun 2025 14:22:29 +0000 Received: from MWH0EPF000971E3.namprd02.prod.outlook.com (2603:10b6:a03:3a1:cafe::d) by SJ0PR03CA0384.outlook.office365.com (2603:10b6:a03:3a1::29) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8880.27 via Frontend Transport; Sun, 29 Jun 2025 14:22:28 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by MWH0EPF000971E3.mail.protection.outlook.com (10.167.243.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.15 via Frontend Transport; Sun, 29 Jun 2025 14:22:28 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Sun, 29 Jun 2025 07:22:16 -0700 Received: from rnnvmail201.nvidia.com (10.129.68.8) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Sun, 29 Jun 2025 07:22:16 -0700 Received: from vdi.nvidia.com (10.127.8.10) by mail.nvidia.com (10.129.68.8) with Microsoft SMTP Server id 15.2.1544.14 via Frontend Transport; Sun, 29 Jun 2025 07:22:09 -0700 From: Mark Bloch To: "David S. Miller" , Jakub Kicinski , Paolo Abeni , Eric Dumazet , "Andrew Lunn" , Simon Horman CC: , , , , Donald Hunter , Jiri Pirko , Jonathan Corbet , Leon Romanovsky , Chuck Lever , Jeff Layton , NeilBrown , Olga Kornievskaia , Dai Ngo , Tom Talpey , Shuah Khan , , , , , , , Carolina Jubran , Cosmin Ratiu , Jiri Pirko , Mark Bloch , Subject: [PATCH net-next v12 2/8] devlink: Extend devlink rate API with traffic classes bandwidth management Date: Sun, 29 Jun 2025 17:21:32 +0300 Message-ID: <20250629142138.361537-3-mbloch@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250629142138.361537-1-mbloch@nvidia.com> References: <20250629142138.361537-1-mbloch@nvidia.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-NV-OnPremToCloud: AnonymousSubmission X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWH0EPF000971E3:EE_|DS7PR12MB6117:EE_ X-MS-Office365-Filtering-Correlation-Id: e15c46d9-1159-424b-3ffc-08ddb71860ca X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|36860700013|7416014|1800799024|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Yp/9ChOK79hTrQRXbaoPK+oEAH+oNcI4BL74Ow2jrfH9S4WY6n8js7i1edqB?= =?us-ascii?Q?lJGf5UK7BNBIQHQCWJMRhthtkA8HbeqrShynsRnKwW0d9eLggIPN3V5p7DxA?= =?us-ascii?Q?0I1xlRQ7VamOgRj5lIHWd0DUY9oBtWKKoGy1buYY8/cIYjCr7ddfpzN38Ltk?= =?us-ascii?Q?F5AM0aVl+2jYd4eA74VKaBJOUVkNEqphfOcfpZaz20o4CE8H+Oifd/8I2+6p?= =?us-ascii?Q?XHOoAWhx0oMyqQolU8fONsbZf18ErRTMzPIU6WzZC1klpKUIMU+Ew6BPej7J?= =?us-ascii?Q?M25Me+OjPhJQQhJ22hO7WRiD7RSJVBvmlHSUK25jhtHu6n10O1Y487VJHrw8?= =?us-ascii?Q?NKDyp64JHccV7GlfbMRfJ6oB3TLWc/csRqpWueecmbVJE2WjO5Ja9FVm1os1?= =?us-ascii?Q?OIpxFbo/g+nIp1igYMps0v24cTn0x6nqiDnfcjO35jbi0//ryHUIpn1lhrpq?= =?us-ascii?Q?vAdpViDsLDQjkrOSMiCXApfstVApQnwZDu9JTgt3vBB/sdOEYzBRe7NeVuvh?= =?us-ascii?Q?T5CWLwFsQs8pvLXIUcEK1nhvSW5eWktmOOfyzOdef2bkYtxepIBR/EAX9Iv2?= =?us-ascii?Q?OpHDUJqiIawyRogj9U5xSlknhpiP8ue5hhypU/NbzGUGiy11kAtjB7xAv4lx?= =?us-ascii?Q?LXfwzxpSgrYe3NmyzlNwu2dd+EYXxT0jDtFhCpvB3bWc33PxzaH0LrhSUBnd?= =?us-ascii?Q?vym2dDGoTydvExcT12YOsrSZ36NtQvGmK7jVDxhi8r9K3Hpri94/KZmMA7ST?= =?us-ascii?Q?93rpo56WCKGGMg/4vHnlA2uEC9usfyiMhizWsa6C36fYZieykU6R5NoqcUz2?= =?us-ascii?Q?pNTBqnmlC0jD6p1D+FGjTuJHBJ7MOI1pIxMmIdO8p3w2jBwqDqNAQgpus9nn?= =?us-ascii?Q?cob8Iasb9A2rqsNdnVC3ip+9q/WovwT9DaIvir0GSFSL60vAeJYTvNSbmOl0?= =?us-ascii?Q?Ep8Ngt9lioREduTImm5EVMViutM+nK264nvG7LcHZCrlDmp65nZw0PHtHLZI?= =?us-ascii?Q?sCGgAfmh/hkdedgBcX70eH7beakrT1/cYFrFQGP4v+OJlr9A8bPSL4ZbTcML?= =?us-ascii?Q?WlVqyL4TUhiU6WHqmUbuIwmiqbvOUasjuJEo0B6L21vRnfqnNirzUWxoqfys?= =?us-ascii?Q?/i9BERTlBCQas4AwsjI8RudHGIAml2QN0szUtiPbZnTQA/oM4zf/nJkba5d7?= =?us-ascii?Q?ubd3IvZL9aeyoie2msl6csNuyRDKy6ShD810rOLjfEx//VB2sUkCI3GCKmdy?= =?us-ascii?Q?n3Jgi6AkKg08q3godPgJdKFxdUIq6tr1LpdetKW5BSSfpXOnU1H9nvQq4ITt?= =?us-ascii?Q?jF97CGJ+AIZhKUlk7PoNicgbkxP2cenB8MyOb/EHbICtB6qnF6vZCjD0kPAT?= =?us-ascii?Q?QM6TL9UyiRCvY88hZNn7PWiTtjlIngQ+k+Rl1eeu0ZOyvQJfSPjzvc+z3Rt/?= =?us-ascii?Q?PxOtsO28iVXmui1ZVegS7DBs6H8Uvofp3SYOGCvagjDacCgxnlM+PuIaC1T7?= =?us-ascii?Q?AD08N81dA1Bwd42QOmNHoVRqvn19hxzts40W?= X-Forefront-Antispam-Report: CIP:216.228.117.161;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge2.nvidia.com;CAT:NONE;SFS:(13230040)(82310400026)(36860700013)(7416014)(1800799024)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Jun 2025 14:22:28.6700 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e15c46d9-1159-424b-3ffc-08ddb71860ca X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.161];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: MWH0EPF000971E3.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB6117 Content-Type: text/plain; charset="utf-8" From: Carolina Jubran Introduce support for specifying relative bandwidth shares 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 relative bandwidth share for each traffic class. For example, assigning share values of 20 to TC0 (TCP/UDP) and 80 to TC5 (RoCE) will result in TC0 receiving 20% and TC5 receiving 80% of the total bandwidth. The actual percentage each class receives depends on the ratio of its share value to the sum of all shares. Example: DEV=3Dpci/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'} Signed-off-by: Carolina Jubran Reviewed-by: Cosmin Ratiu Reviewed-by: Jiri Pirko Signed-off-by: Tariq Toukan Signed-off-by: Mark Bloch --- Documentation/netlink/specs/devlink.yaml | 32 ++++- .../networking/devlink/devlink-port.rst | 8 ++ include/net/devlink.h | 8 ++ include/uapi/linux/devlink.h | 9 ++ net/devlink/netlink_gen.c | 15 ++- net/devlink/netlink_gen.h | 1 + net/devlink/rate.c | 127 ++++++++++++++++++ 7 files changed, 195 insertions(+), 5 deletions(-) diff --git a/Documentation/netlink/specs/devlink.yaml b/Documentation/netli= nk/specs/devlink.yaml index bfba466d694a..1c4bb0cbe5f0 100644 --- a/Documentation/netlink/specs/devlink.yaml +++ b/Documentation/netlink/specs/devlink.yaml @@ -224,6 +224,10 @@ definitions: value: 10 - name: binary + - + name: rate-tc-index-max + type: const + value: 7 =20 attribute-sets: - @@ -844,7 +848,23 @@ 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: + max: rate-tc-index-max + - + name: rate-tc-bw + type: u32 + doc: | + Specifies the bandwidth share assigned to the Traffic Class. + The bandwidth for the traffic class is determined + in proportion to the sum of the shares of all configured clas= ses. - name: dl-dev-stats subset-of: devlink @@ -1249,6 +1269,14 @@ attribute-sets: - name: flash type: flag + - + name: dl-rate-tc-bws + subset-of: devlink + attributes: + - + name: rate-tc-index + - + name: rate-tc-bw =20 operations: enum-model: directional @@ -2176,6 +2204,7 @@ operations: - rate-tx-priority - rate-tx-weight - rate-parent-node-name + - rate-tc-bws =20 - name: rate-new @@ -2196,6 +2225,7 @@ operations: - rate-tx-priority - rate-tx-weight - rate-parent-node-name + - rate-tc-bws =20 - name: rate-del diff --git a/Documentation/networking/devlink/devlink-port.rst b/Documentat= ion/networking/devlink/devlink-port.rst index 9d22d41a7cd1..5e397798a402 100644 --- a/Documentation/networking/devlink/devlink-port.rst +++ b/Documentation/networking/devlink/devlink-port.rst @@ -418,6 +418,14 @@ API allows to configure following rate object's parame= ters: to all node children limits. ``tx_max`` is an upper limit for children. ``tx_share`` is a total bandwidth distributed among children. =20 +``tc_bw`` + Allow users to set the bandwidth allocation per traffic class on rate + objects. This enables fine-grained QoS configurations by assigning a rel= ative + share value to each traffic class. The bandwidth is distributed in propo= rtion + to the share value for each class, relative to the sum of all shares. + 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. diff --git a/include/net/devlink.h b/include/net/devlink.h index 63517646a497..d0ce5a7e984c 100644 --- a/include/net/devlink.h +++ b/include/net/devlink.h @@ -118,6 +118,8 @@ struct devlink_rate { =20 u32 tx_priority; u32 tx_weight; + + u32 tc_bw[DEVLINK_RATE_TCS_MAX]; }; =20 struct devlink_port { @@ -1486,6 +1488,9 @@ struct devlink_ops { u32 tx_priority, struct netlink_ext_ack *extack); int (*rate_leaf_tx_weight_set)(struct devlink_rate *devlink_rate, void *p= riv, 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 *pr= iv, u64 tx_share, struct netlink_ext_ack *extack); int (*rate_node_tx_max_set)(struct devlink_rate *devlink_rate, void *priv, @@ -1494,6 +1499,9 @@ struct devlink_ops { u32 tx_priority, struct netlink_ext_ack *extack); int (*rate_node_tx_weight_set)(struct devlink_rate *devlink_rate, void *p= riv, 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, diff --git a/include/uapi/linux/devlink.h b/include/uapi/linux/devlink.h index a5ee0f13740a..e72bcc239afd 100644 --- a/include/uapi/linux/devlink.h +++ b/include/uapi/linux/devlink.h @@ -221,6 +221,11 @@ enum devlink_port_flavour { */ }; =20 +/* IEEE 802.1Qaz standard supported values. */ + +#define DEVLINK_RATE_TCS_MAX 8 +#define DEVLINK_RATE_TC_INDEX_MAX (DEVLINK_RATE_TCS_MAX - 1) + enum devlink_rate_type { DEVLINK_RATE_TYPE_LEAF, DEVLINK_RATE_TYPE_NODE, @@ -629,6 +634,10 @@ enum devlink_attr { =20 DEVLINK_ATTR_REGION_DIRECT, /* flag */ =20 + 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. diff --git a/net/devlink/netlink_gen.c b/net/devlink/netlink_gen.c index e340d955cf3b..c50436433c18 100644 --- a/net/devlink/netlink_gen.c +++ b/net/devlink/netlink_gen.c @@ -45,6 +45,11 @@ const struct nla_policy devlink_dl_port_function_nl_poli= cy[DEVLINK_PORT_FN_ATTR_ [DEVLINK_PORT_FN_ATTR_CAPS] =3D NLA_POLICY_BITFIELD32(15), }; =20 +const struct nla_policy devlink_dl_rate_tc_bws_nl_policy[DEVLINK_ATTR_RATE= _TC_BW + 1] =3D { + [DEVLINK_ATTR_RATE_TC_INDEX] =3D NLA_POLICY_MAX(NLA_U8, DEVLINK_RATE_TC_I= NDEX_MAX), + [DEVLINK_ATTR_RATE_TC_BW] =3D { .type =3D NLA_U32, }, +}; + const struct nla_policy devlink_dl_selftest_id_nl_policy[DEVLINK_ATTR_SELF= TEST_ID_FLASH + 1] =3D { [DEVLINK_ATTR_SELFTEST_ID_FLASH] =3D { .type =3D NLA_FLAG, }, }; @@ -523,7 +528,7 @@ static const struct nla_policy devlink_rate_get_dump_nl= _policy[DEVLINK_ATTR_DEV_ }; =20 /* DEVLINK_CMD_RATE_SET - do */ -static const struct nla_policy devlink_rate_set_nl_policy[DEVLINK_ATTR_RAT= E_TX_WEIGHT + 1] =3D { +static const struct nla_policy devlink_rate_set_nl_policy[DEVLINK_ATTR_RAT= E_TC_BWS + 1] =3D { [DEVLINK_ATTR_BUS_NAME] =3D { .type =3D NLA_NUL_STRING, }, [DEVLINK_ATTR_DEV_NAME] =3D { .type =3D NLA_NUL_STRING, }, [DEVLINK_ATTR_RATE_NODE_NAME] =3D { .type =3D NLA_NUL_STRING, }, @@ -532,10 +537,11 @@ static const struct nla_policy devlink_rate_set_nl_po= licy[DEVLINK_ATTR_RATE_TX_W [DEVLINK_ATTR_RATE_TX_PRIORITY] =3D { .type =3D NLA_U32, }, [DEVLINK_ATTR_RATE_TX_WEIGHT] =3D { .type =3D NLA_U32, }, [DEVLINK_ATTR_RATE_PARENT_NODE_NAME] =3D { .type =3D NLA_NUL_STRING, }, + [DEVLINK_ATTR_RATE_TC_BWS] =3D NLA_POLICY_NESTED(devlink_dl_rate_tc_bws_n= l_policy), }; =20 /* DEVLINK_CMD_RATE_NEW - do */ -static const struct nla_policy devlink_rate_new_nl_policy[DEVLINK_ATTR_RAT= E_TX_WEIGHT + 1] =3D { +static const struct nla_policy devlink_rate_new_nl_policy[DEVLINK_ATTR_RAT= E_TC_BWS + 1] =3D { [DEVLINK_ATTR_BUS_NAME] =3D { .type =3D NLA_NUL_STRING, }, [DEVLINK_ATTR_DEV_NAME] =3D { .type =3D NLA_NUL_STRING, }, [DEVLINK_ATTR_RATE_NODE_NAME] =3D { .type =3D NLA_NUL_STRING, }, @@ -544,6 +550,7 @@ static const struct nla_policy devlink_rate_new_nl_poli= cy[DEVLINK_ATTR_RATE_TX_W [DEVLINK_ATTR_RATE_TX_PRIORITY] =3D { .type =3D NLA_U32, }, [DEVLINK_ATTR_RATE_TX_WEIGHT] =3D { .type =3D NLA_U32, }, [DEVLINK_ATTR_RATE_PARENT_NODE_NAME] =3D { .type =3D NLA_NUL_STRING, }, + [DEVLINK_ATTR_RATE_TC_BWS] =3D NLA_POLICY_NESTED(devlink_dl_rate_tc_bws_n= l_policy), }; =20 /* DEVLINK_CMD_RATE_DEL - do */ @@ -1191,7 +1198,7 @@ const struct genl_split_ops devlink_nl_ops[74] =3D { .doit =3D devlink_nl_rate_set_doit, .post_doit =3D devlink_nl_post_doit, .policy =3D devlink_rate_set_nl_policy, - .maxattr =3D DEVLINK_ATTR_RATE_TX_WEIGHT, + .maxattr =3D DEVLINK_ATTR_RATE_TC_BWS, .flags =3D GENL_ADMIN_PERM | GENL_CMD_CAP_DO, }, { @@ -1201,7 +1208,7 @@ const struct genl_split_ops devlink_nl_ops[74] =3D { .doit =3D devlink_nl_rate_new_doit, .post_doit =3D devlink_nl_post_doit, .policy =3D devlink_rate_new_nl_policy, - .maxattr =3D DEVLINK_ATTR_RATE_TX_WEIGHT, + .maxattr =3D DEVLINK_ATTR_RATE_TC_BWS, .flags =3D GENL_ADMIN_PERM | GENL_CMD_CAP_DO, }, { diff --git a/net/devlink/netlink_gen.h b/net/devlink/netlink_gen.h index 8f2bd50ddf5e..fb733b5d4ff1 100644 --- a/net/devlink/netlink_gen.h +++ b/net/devlink/netlink_gen.h @@ -13,6 +13,7 @@ =20 /* 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_AT= TR_RATE_TC_BW + 1]; extern const struct nla_policy devlink_dl_selftest_id_nl_policy[DEVLINK_AT= TR_SELFTEST_ID_FLASH + 1]; =20 /* Ops table for devlink */ diff --git a/net/devlink/rate.c b/net/devlink/rate.c index 8828ffaf6cbc..d39300a9b3d4 100644 --- a/net/devlink/rate.c +++ b/net/devlink/rate.c @@ -80,6 +80,29 @@ devlink_rate_get_from_info(struct devlink *devlink, stru= ct genl_info *info) return ERR_PTR(-EINVAL); } =20 +static int devlink_rate_put_tc_bws(struct sk_buff *msg, u32 *tc_bw) +{ + struct nlattr *nla_tc_bw; + int i; + + for (i =3D 0; i < DEVLINK_RATE_TCS_MAX; i++) { + nla_tc_bw =3D nla_nest_start(msg, DEVLINK_ATTR_RATE_TC_BWS); + if (!nla_tc_bw) + return -EMSGSIZE; + + if (nla_put_u8(msg, DEVLINK_ATTR_RATE_TC_INDEX, i) || + nla_put_u32(msg, DEVLINK_ATTR_RATE_TC_BW, tc_bw[i])) + goto nla_put_failure; + + nla_nest_end(msg, nla_tc_bw); + } + return 0; + +nla_put_failure: + nla_nest_cancel(msg, nla_tc_bw); + return -EMSGSIZE; +} + static int devlink_nl_rate_fill(struct sk_buff *msg, struct devlink_rate *devlink_rate, enum devlink_command cmd, u32 portid, u32 seq, @@ -129,6 +152,9 @@ static int devlink_nl_rate_fill(struct sk_buff *msg, devlink_rate->parent->name)) goto nla_put_failure; =20 + if (devlink_rate_put_tc_bws(msg, devlink_rate->tc_bw)) + goto nla_put_failure; + genlmsg_end(msg, hdr); return 0; =20 @@ -316,6 +342,87 @@ devlink_nl_rate_parent_node_set(struct devlink_rate *d= evlink_rate, return 0; } =20 +static int devlink_nl_rate_tc_bw_parse(struct nlattr *parent_nest, u32 *tc= _bw, + unsigned long *bitmap, + struct netlink_ext_ack *extack) +{ + struct nlattr *tb[DEVLINK_ATTR_MAX + 1]; + u8 tc_index; + int err; + + err =3D nla_parse_nested(tb, DEVLINK_ATTR_MAX, parent_nest, + devlink_dl_rate_tc_bws_nl_policy, extack); + if (err) + return err; + + if (!tb[DEVLINK_ATTR_RATE_TC_INDEX]) { + NL_SET_ERR_ATTR_MISS(extack, parent_nest, + DEVLINK_ATTR_RATE_TC_INDEX); + return -EINVAL; + } + + tc_index =3D nla_get_u8(tb[DEVLINK_ATTR_RATE_TC_INDEX]); + + if (!tb[DEVLINK_ATTR_RATE_TC_BW]) { + NL_SET_ERR_ATTR_MISS(extack, parent_nest, + DEVLINK_ATTR_RATE_TC_BW); + return -EINVAL; + } + + if (test_and_set_bit(tc_index, bitmap)) { + NL_SET_ERR_MSG_FMT(extack, + "Duplicate traffic class index specified (%u)", + tc_index); + return -EINVAL; + } + + tc_bw[tc_index] =3D nla_get_u32(tb[DEVLINK_ATTR_RATE_TC_BW]); + + return 0; +} + +static int devlink_nl_rate_tc_bw_set(struct devlink_rate *devlink_rate, + struct genl_info *info) +{ + DECLARE_BITMAP(bitmap, DEVLINK_RATE_TCS_MAX) =3D {}; + struct devlink *devlink =3D devlink_rate->devlink; + const struct devlink_ops *ops =3D devlink->ops; + u32 tc_bw[DEVLINK_RATE_TCS_MAX] =3D {}; + int rem, err =3D -EOPNOTSUPP, i; + struct nlattr *attr; + + nlmsg_for_each_attr_type(attr, DEVLINK_ATTR_RATE_TC_BWS, info->nlhdr, + GENL_HDRLEN, rem) { + err =3D devlink_nl_rate_tc_bw_parse(attr, tc_bw, bitmap, + info->extack); + if (err) + return err; + } + + for (i =3D 0; i < DEVLINK_RATE_TCS_MAX; i++) { + if (!test_bit(i, bitmap)) { + NL_SET_ERR_MSG_FMT(info->extack, + "Bandwidth values must be specified for all %u traffic classes", + DEVLINK_RATE_TCS_MAX); + return -EINVAL; + } + } + + if (devlink_rate_is_leaf(devlink_rate)) + err =3D ops->rate_leaf_tc_bw_set(devlink_rate, devlink_rate->priv, + tc_bw, info->extack); + else if (devlink_rate_is_node(devlink_rate)) + err =3D ops->rate_node_tc_bw_set(devlink_rate, devlink_rate->priv, + tc_bw, info->extack); + + if (err) + return err; + + memcpy(devlink_rate->tc_bw, tc_bw, sizeof(tc_bw)); + + return 0; +} + static int devlink_nl_rate_set(struct devlink_rate *devlink_rate, const struct devlink_ops *ops, struct genl_info *info) @@ -388,6 +495,12 @@ static int devlink_nl_rate_set(struct devlink_rate *de= vlink_rate, return err; } =20 + if (attrs[DEVLINK_ATTR_RATE_TC_BWS]) { + err =3D devlink_nl_rate_tc_bw_set(devlink_rate, info); + if (err) + return err; + } + return 0; } =20 @@ -423,6 +536,13 @@ static bool devlink_rate_set_ops_supported(const struc= t devlink_ops *ops, "TX weight set isn't supported for the leafs"); return false; } + if (attrs[DEVLINK_ATTR_RATE_TC_BWS] && + !ops->rate_leaf_tc_bw_set) { + NL_SET_ERR_MSG_ATTR(info->extack, + attrs[DEVLINK_ATTR_RATE_TC_BWS], + "TC bandwidth set isn't supported for the leafs"); + return false; + } } else if (type =3D=3D DEVLINK_RATE_TYPE_NODE) { if (attrs[DEVLINK_ATTR_RATE_TX_SHARE] && !ops->rate_node_tx_share_set) { NL_SET_ERR_MSG(info->extack, "TX share set isn't supported for the node= s"); @@ -449,6 +569,13 @@ static bool devlink_rate_set_ops_supported(const struc= t devlink_ops *ops, "TX weight set isn't supported for the nodes"); return false; } + if (attrs[DEVLINK_ATTR_RATE_TC_BWS] && + !ops->rate_node_tc_bw_set) { + NL_SET_ERR_MSG_ATTR(info->extack, + attrs[DEVLINK_ATTR_RATE_TC_BWS], + "TC bandwidth set isn't supported for the nodes"); + return false; + } } else { WARN(1, "Unknown type of rate object"); return false; --=20 2.34.1