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 E9216431D5 for ; Sun, 22 Oct 2023 16:31:58 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E366040F35; Sun, 22 Oct 2023 16:31:58 +0200 (CEST) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on2074.outbound.protection.outlook.com [40.107.96.74]) by mails.dpdk.org (Postfix) with ESMTP id 76B2C40ED0 for ; Sun, 22 Oct 2023 16:31:57 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kC46eXiWURN23IJ+RiezEuhO+i0KbTah2EDS8k4t4NZN6h1NrrDAtmMlachc9l88LRI486fEWxCuKCTBRUg/7efC4AfCxYlks2vObuVZebQfwJVC34Qi6xE2O/b4fMv0mDgJwu7BQPPTEg5IxJjvARpeuoExYpLg6eEe+3qt8vQwzoR8EABChpz8CXQt8Pl5dgsf3H29xSKcsfDu43wldB4DXBAxjPComN21QeXthfp2Xq4Uu75vJa+woslF6Abb0sKwC20B0fp4cjCO/2EMwAtGv67vrNh69E6KJSAQMAz8dn9nTC2Ruj9oxI7UFsCxIdOTzD54WrSrxIRE5zWUQA== 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=+pIa6qUskkP2Ecg5Ry1wOkp6u/Kb80iECxnCPxK0a8s=; b=V9e4tkj9dFA+rzTA/IXkvAbH8dZLSJs9NLSw+jTRhQb6ABw2dlMV6THu3oSKDp48hrTqyvBbagTjdXc44zq6m/8627fJxenRjLicFA96Il0lpSNPKHeG2Br+5HtFbVcNw3J5En2HBh0CRnq4yK55zT+CmAD09f8OqC3IaIwebK+L/vIC/ni25xU8/6Fdmy59J33zMs93Lmscx+qTGZubjI53IWqvgicdzDGy/0e770tHqF4WQEMGIdfQe/56j2w5Z6Fg9k0rpHpJj4Q1Pj2R9dAXXyVWHZtjlmO1cGXdgth3f0p2O09dpehCpwl+StDD2zcE0eoQg3sbhlHsrWUtXA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=dpdk.org 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=+pIa6qUskkP2Ecg5Ry1wOkp6u/Kb80iECxnCPxK0a8s=; b=Kr0Wnt/RQJvg8K8W4f9j9LyOM3vGDXT9nH+nSfVG44nGaopFc3ldfGxUWlaKmzh5Dtt+uc44qYZZmnY9JVdX+bxrflWBIeZA1QUV3QXT0MRNRvfeSZeJB1xACEPsQZgRNTYqtjqJheOb8Prd+uOPesG55632fV2Vqz2QUCo0eIgXqkbiNLkNtjFZomgt3TgtNXP1hbPNthEz8DP7dLvKWmJ+Jo6yMhYpxDkTbUuESc5Wn0Lqg641XEQF6l+dzl5Fb5x3yIqaDdcvDkE3XO4E9brbiQQrmry5aHtpSF1dus5MYnO9sXhUWFWE9+CQ0+rcOoUYI/fMMOIi91eU/y7RnQ== Received: from DS7PR05CA0023.namprd05.prod.outlook.com (2603:10b6:5:3b9::28) by DM4PR12MB7552.namprd12.prod.outlook.com (2603:10b6:8:10c::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.26; Sun, 22 Oct 2023 14:31:54 +0000 Received: from CY4PEPF0000EE32.namprd05.prod.outlook.com (2603:10b6:5:3b9:cafe::bc) by DS7PR05CA0023.outlook.office365.com (2603:10b6:5:3b9::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.14 via Frontend Transport; Sun, 22 Oct 2023 14:31:54 +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 CY4PEPF0000EE32.mail.protection.outlook.com (10.167.242.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.15 via Frontend Transport; Sun, 22 Oct 2023 14:31:54 +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.41; Sun, 22 Oct 2023 07:31:50 -0700 Received: from nvidia.com (10.126.231.35) 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.41; Sun, 22 Oct 2023 07:31:49 -0700 From: Xueming Li To: Dariusz Sosnowski CC: Suanming Mou , dpdk stable Subject: patch 'net/mlx5: fix jump ipool entry size' has been queued to stable release 22.11.4 Date: Sun, 22 Oct 2023 22:22:10 +0800 Message-ID: <20231022142250.10324-102-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231022142250.10324-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EE32:EE_|DM4PR12MB7552:EE_ X-MS-Office365-Filtering-Correlation-Id: b3e4d3cd-0049-468e-b382-08dbd30ba377 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fP2Od/ZQeo6NMmwOKue2C1aanVeiEqcwFxvF/TrHbSBWtNlosCUAZujaTS2VEiaxOf25GCW93vd8l7hS30u7ALaORjjQ1EnHJFBwlnGQXdGVSYeDRrhhcMbVMVG1TIPCoihYpXu7mPXnAY55cnVuSGrbeLSqAVvlO4hgYLP51YvTydl2JhbWlGu5P9syvC1HL0KOVgHvnkAHrmjI4wiGXgGjlOPuKZTC4NJvsYhx0A8Uy1A/Q8hC+JiQ2WvQCOBs9Vu7IzHPT+i7P6VisLjb+YYQ6wO0BSL0+7CkbVEzY1pWFf6KyIETdXT36j/CKwHuvKyJCC1b4R/7YdX14j/ZkqcBlEWTNa2mLWgvYyeqOqXvTzJMOTTVUyTTgjxAOy5TbZ2Vh6ktYwx3aDMflGWFvboJMLi2L6/XHbf5veGYb6DYLyeCRIB2XX/CNSdXvO33JhmpNoDQgPrxdzmNlJTS03WAHYq5KLrsJ7/psLC+0H063MLCgAvjx+hJL1rSIHkyM2B3uQ3KOwGm/I8PyPmavxLUbwAm60XZCQdduuOvIk/ZkD2fGouYaMrBzEZ3A+lK5mYmdKq2TByX0HfC3PQBzAq3Eg48v+TJI5S88GbuT8DsqCcCiZMoE83IE2gSc2TEkzSgim8ZSiceJ+GNeuLP5aocTa+2ZYSMAi2Jsw07QDi4fX7DmHSJUX/3KW6AD+KAyCVue8aButK2jG/s/0ZkSVGfGmv8xHJpecbmvxG7qByM3LEuZk6NrkGNXSJ1TANWKj+V9dq2ytZAbh5GIxYI/E51s3LvCHHxPDaoKqwgToQ= 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:(13230031)(4636009)(136003)(376002)(39850400004)(346002)(396003)(230922051799003)(82310400011)(186009)(1800799009)(451199024)(64100799003)(40470700004)(36840700001)(46966006)(4001150100001)(6666004)(316002)(6636002)(86362001)(83380400001)(7696005)(2906002)(53546011)(55016003)(2616005)(478600001)(1076003)(26005)(6286002)(16526019)(47076005)(426003)(336012)(5660300002)(4326008)(6862004)(8676002)(8936002)(966005)(70206006)(37006003)(54906003)(70586007)(36756003)(41300700001)(40480700001)(40460700003)(36860700001)(82740400003)(7636003)(356005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2023 14:31:54.2126 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b3e4d3cd-0049-468e-b382-08dbd30ba377 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: CY4PEPF0000EE32.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB7552 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/15/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=1c9bab50cca4023aad3f12dfab27a39b5f72fdba Thanks. Xueming Li --- >From 1c9bab50cca4023aad3f12dfab27a39b5f72fdba Mon Sep 17 00:00:00 2001 From: Dariusz Sosnowski Date: Fri, 25 Aug 2023 21:43:30 +0300 Subject: [PATCH] net/mlx5: fix jump ipool entry size Cc: Xueming Li [ upstream commit 015a3e811148e9135fba20e5b679989520ab56f6 ] In mlx5 PMD, MLX5_IPOOL_JUMP ipool configuration is used to initialize the ipool containing either: - flow table entry when DV flow engine is chosen or, - group table entry when HW steering flow engine is chosen. Default configuration for MLX5_IPOOL_JUMP ipool specified entry size as size of mlx5_flow_tbl_data_entry struct, used with DV flow engine. This could lead to memory corruption when mlx5_flow_group struct (used with HW steering flow engine) would have bigger size than mlx5_flow_tbl_data_entry. This patch fixes that. Entry size for MLX5_IPOOL_JUMP ipool is chosen dynamically based on device configuration. Fixes: d1559d66ed2d ("net/mlx5: add table management") Signed-off-by: Dariusz Sosnowski Acked-by: Suanming Mou --- drivers/net/mlx5/mlx5.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index 8250c94803..f787ae91fe 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -241,7 +241,12 @@ static const struct mlx5_indexed_pool_config mlx5_ipool_cfg[] = { .type = "mlx5_port_id_ipool", }, [MLX5_IPOOL_JUMP] = { - .size = sizeof(struct mlx5_flow_tbl_data_entry), + /* + * MLX5_IPOOL_JUMP ipool entry size depends on selected flow engine. + * When HW steering is enabled mlx5_flow_group struct is used. + * Otherwise mlx5_flow_tbl_data_entry struct is used. + */ + .size = 0, .trunk_size = 64, .grow_trunk = 3, .grow_shift = 2, @@ -902,6 +907,14 @@ mlx5_flow_ipool_create(struct mlx5_dev_ctx_shared *sh) sizeof(struct mlx5_flow_handle) : MLX5_FLOW_HANDLE_VERBS_SIZE; break; +#if defined(HAVE_IBV_FLOW_DV_SUPPORT) || !defined(HAVE_INFINIBAND_VERBS_H) + /* Set MLX5_IPOOL_JUMP ipool entry size depending on selected flow engine. */ + case MLX5_IPOOL_JUMP: + cfg.size = sh->config.dv_flow_en == 2 ? + sizeof(struct mlx5_flow_group) : + sizeof(struct mlx5_flow_tbl_data_entry); + break; +#endif } if (sh->config.reclaim_mode) { cfg.release_mem_en = 1; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-10-22 22:17:38.064060900 +0800 +++ 0101-net-mlx5-fix-jump-ipool-entry-size.patch 2023-10-22 22:17:34.376723700 +0800 @@ -1 +1 @@ -From 015a3e811148e9135fba20e5b679989520ab56f6 Mon Sep 17 00:00:00 2001 +From 1c9bab50cca4023aad3f12dfab27a39b5f72fdba Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 015a3e811148e9135fba20e5b679989520ab56f6 ] @@ -22 +24,0 @@ -Cc: stable@dpdk.org @@ -31 +33 @@ -index 6d05de114e..997df595d0 100644 +index 8250c94803..f787ae91fe 100644 @@ -48 +50 @@ -@@ -904,6 +909,14 @@ mlx5_flow_ipool_create(struct mlx5_dev_ctx_shared *sh) +@@ -902,6 +907,14 @@ mlx5_flow_ipool_create(struct mlx5_dev_ctx_shared *sh)