From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id C6851428F8 for ; Sun, 9 Apr 2023 17:36:44 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C235942BD9; Sun, 9 Apr 2023 17:36:44 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2082.outbound.protection.outlook.com [40.107.223.82]) by mails.dpdk.org (Postfix) with ESMTP id 37BD141149 for ; Sun, 9 Apr 2023 17:36:43 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KwHwpHQTvsg0rMYeQh5UC1hzAlnnyQsLjv1qmy2EMzIshvs1q8Ko8NzRjrNwX6ZHZ6PIwYYbrFG8sLXWtempxuX3dgUgi8LeLfqowHwWGzZJhP6mswSYrXGQ6Q2OsIpfV94vBrIZAuMQtLKxtaF3m6gDalS8BtZShLE4ojhSGVbhN8J/ANWjQW2/xn++4o43jb4BA3zYrFhVBI8l+DhiycOGUY9AO7oSlFi4ZyYjmwrMqBLCDqgj2vFhr2H/iVafqksvN0Fm5CxCfZ4tMt6ANtA7Qg1c5kSMtQW6ZKSBkP9tJVMbZ7sraCeuALVCgC86aMMVQsCK1pXNPnnwtnSEhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=0Tcx/alHIA6iA3FGpKk+lxVIo1+vACV4OBzFSyQpRnA=; b=l8nPNSfGu+GoPv5rT28NbZzYg8C+4wAVUtNZoAXEc57+gPK1cnR6S/5bWjHKa4AUWcCU6goyD55xO8MxOoTXkXlNw5uGwHSBR8oSvgl8PM6nDX4Cv0NUG6oR9YNDpq2vextD1ywEsHak1XoqVuiZGrQKgXIaQWBxsVCG7qRaZyPfnNantIlL18s/QEEffySTBJLVyfURbHdIkxWEFZWI/5vc7/5PyB4xPMTlbsommz8dttagGRrB+mTB5+az5j7LpjAyj5mr6C/gWdXS8PoR7AKm+AkW1zhs3CpQYvWfwgxo8ETn3ZPyhDCRAulWTvUOOnTp0urelZt4XAY5+369DA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=intel.com 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 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=0Tcx/alHIA6iA3FGpKk+lxVIo1+vACV4OBzFSyQpRnA=; b=CSmJaL6CVmM/WHYEdxsDmSFV6f47X0fiEDj6szyQxJ8ORBgpmIUd5FABPOz1iZdUMR7f++Yg4OSRhIr/PigPDnIZePOx1AWBnX9RSEKNv0wi1VboH9FiTSh9pEE8+jhYb8T8lAP6mTYXOqoT5gsBgl12MGTVG/TC+IfXBlbKwdYpLKHEb6Hj3hG4Z0+pKAFEURPgI+7e0Q0zTx6iesKmEkQa8EKrjjduTSJ4I/217Xnl30sStkhl7tuAU/mbl43uLmTJnxc1vfIYJ5cbo6SxdKpYeA9yQCxB63IvfYiFuWFh5VdTRp8r/n320SbcTXgKlfCR5vnJGxcSw3NAvdvWRg== Received: from MW2PR16CA0068.namprd16.prod.outlook.com (2603:10b6:907:1::45) by CH0PR12MB5188.namprd12.prod.outlook.com (2603:10b6:610:bb::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.36; Sun, 9 Apr 2023 15:36:41 +0000 Received: from CO1NAM11FT043.eop-nam11.prod.protection.outlook.com (2603:10b6:907:1:cafe::5a) by MW2PR16CA0068.outlook.office365.com (2603:10b6:907:1::45) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.36 via Frontend Transport; Sun, 9 Apr 2023 15:36:41 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CO1NAM11FT043.mail.protection.outlook.com (10.13.174.193) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.25 via Frontend Transport; Sun, 9 Apr 2023 15:36:41 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Sun, 9 Apr 2023 08:36:31 -0700 Received: from nvidia.com (10.126.230.37) 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.986.37; Sun, 9 Apr 2023 08:36:29 -0700 From: Xueming Li To: Bruce Richardson CC: Cristian Dumitrescu , dpdk stable Subject: patch 'examples/qos_sched: fix config entries in wrong sections' has been queued to stable release 22.11.2 Date: Sun, 9 Apr 2023 23:25:15 +0800 Message-ID: <20230409152529.5308-128-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230409152529.5308-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230409152529.5308-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT043:EE_|CH0PR12MB5188:EE_ X-MS-Office365-Filtering-Correlation-Id: 27a8942f-d9d5-4e96-2ba8-08db39103784 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LweOfSsXKf7AZ3Rha9g8qFmooKGNVNNcT5qwZ5HfsPzdKSCPURatQaGKsqCfFkmx1YCzZm1trW3fnqTIm70Uac/MBaH54Q0+Md7OY5jKpPkuu0GtldDIPHp8GFzJFSwY4MIz0Y6/po/G+M9paXYcbRUY6wMhDjLBU6jCNIOBL6EESdgys6yKkgAT+9HXgcIocwUlqR8CTrUqHvQlf7Cug4/yww9UdJqIy9MEjNd0GV4EYE/2Aqho+Vktv8n93HtNXj2URD4gdvc16Ysjts7H8u5QtWZrauWyJlh9Vwt0qcYiCX/nzi+c5fTRprU3SxwzZPeCS8Uy1mqPJArMjk6OWTVXC73/QbFaVm2IG2vf79EOniNgD+MCeMaR6NACQoL0pzNS57urau3pOQT4dB7Dvfk83FUDwqr8S+g3f7zOPX0IImfNSeZQu72ASoxrs84P4HNgVfONTgzMjjwcRewPNa+JDDK7+O9hiSaxbzM00bPzZUH8hDsVqi4MSr9VDl8OgSyuJp7X7NCVK2y4hBtDhnqos16rJ7cqTNWZ9gkRaLmTBJ9qb1DwwteBnZ+GTQErY6piuvcmjP92zVOSejnSi4TBH5lziisqygbAY7syaNkNAuuQHGqO/0lKpPDpGNYjZW7ynkcqFUM1BGSFBEe1avnYkqPLGtn5s1RqbMYaxra73AWRY4udp6HkxnB0kHxC8eg3zcGYIRCDGw7eGE3wuXdnPTeQeymYaZYOMUikhuNPHZP9pwCrQ1I3ljH1PnImcJjx4sYRW4wkjtv2UUgmFgwwQogQEfyif9fHydviOErQ2yyeCtvxdFXfncYPy+GpJUrfEreR9p8sEAO4/uiybA== X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(39860400002)(346002)(376002)(396003)(136003)(451199021)(46966006)(36840700001)(40470700004)(36860700001)(40460700003)(36756003)(5660300002)(2906002)(316002)(86362001)(8676002)(8936002)(82310400005)(55016003)(40480700001)(70206006)(6916009)(356005)(7636003)(41300700001)(82740400003)(4326008)(966005)(47076005)(2616005)(83380400001)(426003)(336012)(70586007)(54906003)(26005)(53546011)(1076003)(478600001)(7696005)(16526019)(6286002)(186003)(6666004); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2023 15:36:41.5788 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 27a8942f-d9d5-4e96-2ba8-08db39103784 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.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT043.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR12MB5188 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 22.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/11/23. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging/commit/6a3a2809eb5392c20d34bee58cb5292b67980134 Thanks. Xueming Li --- >From 6a3a2809eb5392c20d34bee58cb5292b67980134 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Tue, 21 Mar 2023 13:13:49 +0000 Subject: [PATCH] examples/qos_sched: fix config entries in wrong sections Cc: Xueming Li [ upstream commit 86dfed2a8ed704e013f054985a92d46f07ff48d1 ] When specifying the QoS config, the profiles to be used for each pipe within a subport must be specified in the subport section, not in the section for the subport profile itself. Similarly for subport profiles, those should be specified in the port section. Fixes: de3cfa2c9823 ("sched: initial import") Signed-off-by: Bruce Richardson Acked-by: Cristian Dumitrescu --- examples/qos_sched/profile.cfg | 6 +++--- examples/qos_sched/profile_ov.cfg | 6 +++--- examples/qos_sched/profile_pie.cfg | 6 +++--- examples/qos_sched/profile_red.cfg | 6 +++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/examples/qos_sched/profile.cfg b/examples/qos_sched/profile.cfg index e8de101b6c..00d4c7c1a5 100644 --- a/examples/qos_sched/profile.cfg +++ b/examples/qos_sched/profile.cfg @@ -26,6 +26,8 @@ number of subports per port = 1 number of pipes per subport = 4096 queue sizes = 64 64 64 64 64 64 64 64 64 64 64 64 64 +pipe 0-4095 = 0 ; These pipes are configured with pipe profile 0 + [subport profile 0] tb rate = 1250000000 ; Bytes per second tb size = 1000000 ; Bytes @@ -46,8 +48,6 @@ tc 12 rate = 1250000000 ; Bytes per second tc period = 10 ; Milliseconds -pipe 0-4095 = 0 ; These pipes are configured with pipe profile 0 - ; Pipe configuration [pipe profile 0] tb rate = 305175 ; Bytes per second @@ -71,4 +71,4 @@ tc period = 40 ; Milliseconds tc 12 oversubscription weight = 1 -tc 12 wrr weights = 1 1 1 1 \ No newline at end of file +tc 12 wrr weights = 1 1 1 1 diff --git a/examples/qos_sched/profile_ov.cfg b/examples/qos_sched/profile_ov.cfg index 14c89ae340..b6fe21ee1e 100644 --- a/examples/qos_sched/profile_ov.cfg +++ b/examples/qos_sched/profile_ov.cfg @@ -6,12 +6,14 @@ frame overhead = 24 number of subports per port = 1 +subport 0-8 = 0 + ; Subport configuration [subport 0] number of pipes per subport = 32 queue sizes = 64 64 64 64 64 64 64 64 64 64 64 64 64 -subport 0-8 = 0 +pipe 0-31 = 0 ; These pipes are configured with pipe profile 0 [subport profile 0] tb rate = 8400000 ; Bytes per second @@ -32,8 +34,6 @@ tc 11 rate = 8400000 ; Bytes per second tc 12 rate = 8400000 ; Bytes per second tc period = 10 ; Milliseconds -pipe 0-31 = 0 ; These pipes are configured with pipe profile 0 - ; Pipe configuration [pipe profile 0] tb rate = 16800000 ; Bytes per second diff --git a/examples/qos_sched/profile_pie.cfg b/examples/qos_sched/profile_pie.cfg index 241f748b33..bbc09d912b 100644 --- a/examples/qos_sched/profile_pie.cfg +++ b/examples/qos_sched/profile_pie.cfg @@ -21,12 +21,14 @@ frame overhead = 24 number of subports per port = 1 +subport 0-8 = 0 ; These subports are configured with subport profile 0 + ; Subport configuration [subport 0] number of pipes per subport = 4096 queue sizes = 64 64 64 64 64 64 64 64 64 64 64 64 64 -subport 0-8 = 0 ; These subports are configured with subport profile 0 +pipe 0-4095 = 0 ; These pipes are configured with pipe profile 0 [subport profile 0] tb rate = 1250000000 ; Bytes per second @@ -48,8 +50,6 @@ tc 12 rate = 1250000000 ; Bytes per second tc period = 10 ; Milliseconds -pipe 0-4095 = 0 ; These pipes are configured with pipe profile 0 - ; Pipe configuration [pipe profile 0] tb rate = 305175 ; Bytes per second diff --git a/examples/qos_sched/profile_red.cfg b/examples/qos_sched/profile_red.cfg index 4486d2799e..cee1470fd7 100644 --- a/examples/qos_sched/profile_red.cfg +++ b/examples/qos_sched/profile_red.cfg @@ -21,12 +21,14 @@ frame overhead = 24 number of subports per port = 1 +subport 0-8 = 0 ; These subports are configured with subport profile 0 + ; Subport configuration [subport 0] number of pipes per subport = 4096 queue sizes = 64 64 64 64 64 64 64 64 64 64 64 64 64 -subport 0-8 = 0 ; These subports are configured with subport profile 0 +pipe 0-4095 = 0 ; These pipes are configured with pipe profile 0 [subport profile 0] tb rate = 1250000000 ; Bytes per second @@ -48,8 +50,6 @@ tc 12 rate = 1250000000 ; Bytes per second tc period = 10 ; Milliseconds -pipe 0-4095 = 0 ; These pipes are configured with pipe profile 0 - ; Pipe configuration [pipe profile 0] tb rate = 305175 ; Bytes per second -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-04-09 21:45:42.016427900 +0800 +++ 0127-examples-qos_sched-fix-config-entries-in-wrong-secti.patch 2023-04-09 21:45:38.799042200 +0800 @@ -1 +1 @@ -From 86dfed2a8ed704e013f054985a92d46f07ff48d1 Mon Sep 17 00:00:00 2001 +From 6a3a2809eb5392c20d34bee58cb5292b67980134 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 86dfed2a8ed704e013f054985a92d46f07ff48d1 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org