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 9532341D8D for ; Mon, 27 Feb 2023 08:17:22 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8B95041140; Mon, 27 Feb 2023 08:17:22 +0100 (CET) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2054.outbound.protection.outlook.com [40.107.237.54]) by mails.dpdk.org (Postfix) with ESMTP id 078B9410EE for ; Mon, 27 Feb 2023 08:17:21 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZXpgAj64JYYKFUS+7ngavZSygwhdK72ZX1MuRi3x45rCxsiYk02cCk+mmRm5vWdt++T8OCoA3Ih+RxLeWUVHE+IdYL1x06OJ1sczIFzwx6x9d96dVerX9Ae8lsw5Qv1I7JPJeFUgFt2CY7VfcD2S0A116j3tl27lAK71aZPhjyJ/h4tWBFe4+odOfvUrHXAgKHMdYsxfgZc4Qm0mamtQLw4ER6Es1RYt7MMOQoAqhZ4d0iPcF+IoqqCNZZJaJZq812Vc/zotkyAWOu3kRVXkv8lEEzsMrm5U75gIQ3NwhwQvhxn9ndP0Kb+9ZXgAYznCRgfp03JOU4JpUtU2s+WMBA== 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=CVIpoHq6dzy669dtJWVA9s8Uru0BneKqhEL0nPd89zw=; b=H02xYDjJ6guXlCIaFTMfsJcuZmG9eQybCskHnNKdVdYkDk0Mk5F1HN4KlDIUTxdcTZRGvsoC37lUrzepRZdgxz7fubYsF+pZX6/URm9Mh8i/QNj0n7Vi+gDxzGiRQtmq2w8TLNEMPUi+R8xyV+DTT9prbxCR6EcqDTL5cr1QM6IZ03aEWCJsyw1yNqihAGM0x57FNel7Wozb7HIhVHWUmhu26yMUVmBX8arlp4ObCZS5nsmqDlmqRGm6T8MlS6XLz68ZxB8Htc49tgiPL63FIisBZxxUJeUPrXaePcl/axYhdhx7x1zgtW4heK9Ts4WklOEs2hnM62UINrJqMiasfQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) 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=CVIpoHq6dzy669dtJWVA9s8Uru0BneKqhEL0nPd89zw=; b=etWOJG3rmPoZvDr5f+Jjpr6ynIJ9Cht7Qha+51sYT205fUt2F3M5hAu4ijFgbzYX+rTSAnvDfNP+I8zgkwImAn1i5iye5Vk6LsvU2q+U04X0f7KLutZcucw51gt5FOwr44xxheleipJ91n9tKI1zDhUuk1LCcVS0GUG41PGq2Hc0LyvMRj+0HqH8rygJ8KonTv+BcThhADIf2fMj09nj2LPwvu+qu+9HAEHLjHqlL71r9/LhwLmNYD3UKg4//uEMVs5Y5Dq58XytnT32JaaL7wHXZ03ksmMV2DX2OGfm/TxjhAY3B0CzrcT0EI7Ipe831DrQIZaGNKwfzTNTVi99OQ== Received: from MN2PR19CA0027.namprd19.prod.outlook.com (2603:10b6:208:178::40) by CH0PR12MB5169.namprd12.prod.outlook.com (2603:10b6:610:b8::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.28; Mon, 27 Feb 2023 07:17:18 +0000 Received: from BL02EPF00010206.namprd05.prod.outlook.com (2603:10b6:208:178:cafe::87) by MN2PR19CA0027.outlook.office365.com (2603:10b6:208:178::40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6111.21 via Frontend Transport; Mon, 27 Feb 2023 07:17:18 +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 BL02EPF00010206.mail.protection.outlook.com (10.167.241.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.12 via Frontend Transport; Mon, 27 Feb 2023 07:17:18 +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.986.36; Sun, 26 Feb 2023 23:17:07 -0800 Received: from nvidia.com (10.126.231.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, 26 Feb 2023 23:17:04 -0800 From: Xueming Li To: Megha Ajmera CC: Cristian Dumitrescu , dpdk stable Subject: patch 'sched: fix alignment of structs in subport' has been queued to stable release 22.11.2 Date: Mon, 27 Feb 2023 15:00:57 +0800 Message-ID: <20230227070107.15664-149-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230227070107.15664-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230227070107.15664-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.37] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF00010206:EE_|CH0PR12MB5169:EE_ X-MS-Office365-Filtering-Correlation-Id: 768faac9-a406-4141-18e3-08db1892a8ff X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OVElWGhvC9FHgjl8fF0wNhahD0mU6noyZ0LJp1OoMEBcN6Vq4epHlnEUVpfon2pNP/g263jUwNGcikPnHqid7ZFinPcVikuPNSD5gY+9JjRSN3IYObfm3kO6gkpSn2DrpItnF2BKyChQhVFk6tigvuMd+Ul/IXd/o7SA92i6dlikEKvIbA9s3ABpvE89jTT4bqbEAs16UNhNZY3JktN22qwNh0ZrjU/J5pGFq+jCVlxH6BQRngckl8C355QoB6vqTXnrjOiisFblHyv/89yR7t9LKWpm7KunQvQC1R/zCEyuPe3Nnf/KaOlRfEmshZrqnqJEgwGFcQFAMzR6dLukHX+nWQwJtIcOt+N2A2t7U3yr0ADvYnFcY4r5vsa8zuBKDwRG3DjK/6Jzd9rjFLa97SMcQdNBtRP9DB7P1mwAsCQglhIX2ucCHmX58alYkZBFyvmEHJwX/Tj5UkvWwmZWkCDWpngHzt0F/YnkD5LEJMd7POEN4HDLTdEYMnsTCgfR6Oua00Go+6Wx57p64kTNRy4qYyMosOZK7OZ/7N26Llg5UkJSrc/lb3Ye7KSdOOFBjrBqGhu+Fvkdyj33SqOQC3MnZe2k4hD5WQGq7dG7AMecLgBBultH5N5/6XsSdM8CtQWl+0igpOIx5ePc+vLWbv5CXJUwdx6NepQ93Ufw9cDOEZD+vOH/mOZjM+kXt26PihrJlw/p7/P1snupZvHMDCGOgaXcEI59XVkryfvM935bdZJi+CS5Jc2kURfcxAGMgJ1bn/HQTJ+U/NuaVd8vDSKtQFeLxFCaRIlBZJ9EmPM= 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:(13230025)(4636009)(346002)(376002)(39860400002)(136003)(396003)(451199018)(46966006)(40470700004)(36840700001)(356005)(336012)(2616005)(86362001)(966005)(316002)(40480700001)(70206006)(36756003)(70586007)(6666004)(55016003)(478600001)(40460700003)(54906003)(7696005)(26005)(41300700001)(53546011)(8676002)(1076003)(16526019)(6286002)(7636003)(186003)(36860700001)(6916009)(4326008)(2906002)(82740400003)(8936002)(47076005)(426003)(83380400001)(5660300002)(82310400005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2023 07:17:18.0608 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 768faac9-a406-4141-18e3-08db1892a8ff 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: BL02EPF00010206.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR12MB5169 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 03/01/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/commit/?h=22.11-staging&id=a656595e9bac405e7384fe429d3931b9c8e50816 Thanks. Xueming Li --- >From a656595e9bac405e7384fe429d3931b9c8e50816 Mon Sep 17 00:00:00 2001 From: Megha Ajmera Date: Tue, 7 Feb 2023 06:10:08 +0000 Subject: [PATCH] sched: fix alignment of structs in subport Cc: Xueming Li [ upstream commit bc3b950d80941420873b40d56ee387867fc34dad ] Big structures like bitmap, pipes and queues in subport are addressed using offset of 'memory' field in subport structures. This means no other variable should be added after 'memory' variable or else addressing of such structs like bitmap etc. become incorrect. Realigned tc_ov_enabled variable in subport structure. Fixes: f5e60154ade ("sched: enable traffic class oversubscription conditionally") Signed-off-by: Megha Ajmera Acked-by: Cristian Dumitrescu --- lib/sched/rte_sched.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/sched/rte_sched.c b/lib/sched/rte_sched.c index c91697131d..19768d8c38 100644 --- a/lib/sched/rte_sched.c +++ b/lib/sched/rte_sched.c @@ -202,6 +202,9 @@ struct rte_sched_subport { uint32_t qsize_add[RTE_SCHED_QUEUES_PER_PIPE]; uint32_t qsize_sum; + /* TC oversubscription activation */ + int tc_ov_enabled; + struct rte_sched_pipe *pipe; struct rte_sched_queue *queue; struct rte_sched_queue_extra *queue_extra; @@ -209,9 +212,6 @@ struct rte_sched_subport { uint8_t *bmp_array; struct rte_mbuf **queue_array; uint8_t memory[0] __rte_cache_aligned; - - /* TC oversubscription activation */ - int tc_ov_enabled; } __rte_cache_aligned; struct rte_sched_port { -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-27 14:08:45.641189400 +0800 +++ 0150-sched-fix-alignment-of-structs-in-subport.patch 2023-02-27 14:08:40.959237000 +0800 @@ -1 +1 @@ -From bc3b950d80941420873b40d56ee387867fc34dad Mon Sep 17 00:00:00 2001 +From a656595e9bac405e7384fe429d3931b9c8e50816 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit bc3b950d80941420873b40d56ee387867fc34dad ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org