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 1150A433D8 for ; Mon, 11 Dec 2023 11:22:02 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 01D7040ED2; Mon, 11 Dec 2023 11:22:02 +0100 (CET) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2063.outbound.protection.outlook.com [40.107.92.63]) by mails.dpdk.org (Postfix) with ESMTP id AD4F940E0F for ; Mon, 11 Dec 2023 11:22:00 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mU/59K/fEJKpu4NsxFZ6hZUuMDHARy6p4gjHU30bbT67KytBT3xUch0zekb8rp89TteX00F5oPZwTjX0qO00OFgII0oxLtbfx7UXmZvTYZz+sZnVHQWG2WDDj/NpP3YddvHFS9YqpMQ+FYIyzm0WarIzy3T4AM/sqmAhJaZ0eGIPTHzOzDOR4xMq90MkSm/R56fWxPNlRjH6NDI6r2Azevh2PRj2BFDdXOu4NY0jwDfzSfnT9O+Vtd0dvuGm8R9i5q2k/W9+fbxHewd1VmNLmeHIr/9zeazHxkMAPsVICWSKNG+SoKRyFd2PHuaRNwdUCqPYS/zYUNbMrKjAAijdBA== 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=viDxaK1Z9oZQRTutczeBxOqu5pf0OQ6nDU1ZAgpKujk=; b=bdpr9YXPqSohxs/lqbje3IvgKfpAZMlmPSlcJLzfK9e4GYVcdwgopVlQCyELNFSHcUUZllJrtl/CK1H9TfRDvzI5Bhp8IKV/ZjtXdin/sdsEJQLVMcExWGVMJwCS5LOntLLHMiXbd8msKc6x+4UvFWLn1TK4CbIqv8l3rQ0OMWbtXD1k3NZO9YlQ1NMSJuW12MMGHPXByD4f5PHKzpSLz3PjZxQUvdCU+OkEd4WPmAnSn5E25pEikJNo0YoxjADrJubQ7SzpoKhnjqMMhqj1xXMwENDxtHJfsb2Cz/TS1slJEVN8Yg+f/aQPGsTiNO2bRA7lNykviGNJY60s+KK/OQ== 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 (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=viDxaK1Z9oZQRTutczeBxOqu5pf0OQ6nDU1ZAgpKujk=; b=KhD0JCoenU7zwJbyyowxnmlVJpcscDkm7wcwFg+qDnaSDINtPgXZ8Hjn3keT02KA/g33//xcjj0DEwqljNVDK1UQPejdcBsiXmk5+36vnVH5L7td1TWvOjfS6zea9uNkWo5AbI1ou04BQ8ooHfenNN7GgPjc5lHfcFen455PS/lQG220/xMrRZRnOKeEDEnmAyLcdHB/ngTYkBp/YYFSIoAATgBOmu53urJuePZKXg2vpM7+jQW/+0j2aYAWrisefPJL/BSbFjFyz9lwgU8BIEpsuyRgRL3VaDS7i9xEgikEt5kJpu3pRYN84A4okXcR4kltBZuxqf2Zo+5dhkz10g== Received: from SA9PR13CA0084.namprd13.prod.outlook.com (2603:10b6:806:23::29) by PH7PR12MB6812.namprd12.prod.outlook.com (2603:10b6:510:1b6::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32; Mon, 11 Dec 2023 10:21:58 +0000 Received: from SN1PEPF0002529E.namprd05.prod.outlook.com (2603:10b6:806:23:cafe::3d) by SA9PR13CA0084.outlook.office365.com (2603:10b6:806:23::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.21 via Frontend Transport; Mon, 11 Dec 2023 10:21:58 +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 SN1PEPF0002529E.mail.protection.outlook.com (10.167.242.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.18 via Frontend Transport; Mon, 11 Dec 2023 10:21:58 +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; Mon, 11 Dec 2023 02:21:43 -0800 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; Mon, 11 Dec 2023 02:21:42 -0800 From: Xueming Li To: Dariusz Sosnowski CC: Ori Kam , dpdk stable Subject: patch 'net/mlx5: fix offset size in conntrack flow action' has been queued to stable release 22.11.4 Date: Mon, 11 Dec 2023 18:12:07 +0800 Message-ID: <20231211101226.2122-103-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231211101226.2122-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> <20231211101226.2122-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: SN1PEPF0002529E:EE_|PH7PR12MB6812:EE_ X-MS-Office365-Filtering-Correlation-Id: 7a2f9b32-580d-442a-6cd3-08dbfa3301e3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 54qdsINmr3i7RCKbPHXRMwzZo6lkxz7F03geMd4p7FQBSV9Ho4fnhVskWCBcNTmVhd+JO6ejHXyz+zOwDqH0AKiOQWmGxCipGp0FW7xtqQoBs6UIk7EsBPEjSSvbD62slhle9SosuE/lMtuaORZj9db/S8HoPXaVP+QteIP8a4zg1Q9hiL2myQrWyWomNszCLJjeipjxV5hxblR3xmi7TQH4Jhj6zqilCHgNc1U1UYpsPD/dIJuRbh9dn+7MEt0bPc6oC3tK65kSiGSaGkJAZUT4PEKseMA/ijcS5OQMPSTwh2zSSUcxG5pTASjmwIKMnTPc7xqeEu9rcJcWjo8/bQ8uJwIj0h8TXfKKPvJQK1aP9xCVnY3NztFmvZ+4k1eLTJj0Uh+H5FEuQKxZwFqAagftk1hGmKePnkbBQJUpN7ykHMx9hVJFhH739lhcWdvlG4UtPlqEe4LFB2Eu87905LlMxoNsj2dwkxr3ZtrtlxHDw8QHqrBVyVhn5/FB9cwScQ45B4tyK/vaQdgwBUqwyBMGOos4mD4M3OBQocn33IJ3pjSyBYoqnp+hW4x70py1lFoNq4z609j/n7r6LXR5OQDcDbJeU3A4iV3PyvTO9stda/S8K2RZa5oHYniVntnxiuRhLnwv9Z1x6JHaWkQTRaVvx1gwTtJIjJg7ieHYY4BkS7IS2h5a20wgVrCQR7Cr1jcpidmqbGggpEO/oSvxacX5AAkyMqmp1FosWw0FD/bAVGfyVg9zjFquRMoISh1lZDpuy6jykybE8k0NYV4amscQmzoIGBWSv4/+xDx0yEw= 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)(39860400002)(396003)(376002)(346002)(136003)(230922051799003)(64100799003)(82310400011)(1800799012)(451199024)(186009)(40470700004)(46966006)(36840700001)(4001150100001)(6666004)(7696005)(2906002)(6636002)(54906003)(70206006)(37006003)(53546011)(7636003)(356005)(86362001)(36756003)(8936002)(4326008)(6862004)(8676002)(316002)(5660300002)(55016003)(40480700001)(70586007)(966005)(478600001)(40460700003)(41300700001)(36860700001)(82740400003)(47076005)(6286002)(26005)(336012)(426003)(1076003)(2616005)(83380400001)(16526019); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 10:21:58.3608 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7a2f9b32-580d-442a-6cd3-08dbfa3301e3 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: SN1PEPF0002529E.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB6812 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 12/13/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=b5913482ec13aaeb385a5d7ac7e7f4b89077b4a1 Thanks. Xueming Li --- >From b5913482ec13aaeb385a5d7ac7e7f4b89077b4a1 Mon Sep 17 00:00:00 2001 From: Dariusz Sosnowski Date: Mon, 20 Nov 2023 10:24:57 +0200 Subject: [PATCH] net/mlx5: fix offset size in conntrack flow action Cc: Xueming Li [ upstream commit 04aa27164533702ca5b9b00bd78aff39c816e7af ] In mlx5 PMD, struct mlx5_aso_ct_action represents a single ASO CT object inside a ASO CT bulk, which is used to implement conntrack flow action. offset field, which is 16 bits wide, in this struct represents an offset of the given object inside a bulk. When SW Steering flow engine is used, ASO CT bulks are allocated on demand, each having 64 objects. In this case offset field can fit any valid object offset. When HW Steering flow engine is used, a single ASO CT bulk is allocated during flow engine configuration. Since HW supports bulks bigger than 2^16 this offset field is too small to fit all valid values. This causes some ASO CT objects to be incorrectly reused on multiple connections, when more than 2^16 conntrack flow actions are used. This patch fixes this behavior. offset field size is increased to 32 bits. Fixes: 463170a7c934 ("net/mlx5: support connection tracking with HWS") Signed-off-by: Dariusz Sosnowski Acked-by: Ori Kam --- drivers/net/mlx5/mlx5.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index deb9959f67..ba7c4441e5 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -1245,7 +1245,7 @@ struct mlx5_aso_ct_action { /* General action object for reply dir. */ void *dr_action_rply; uint32_t refcnt; /* Action used count in device flows. */ - uint16_t offset; /* Offset of ASO CT in DevX objects bulk. */ + uint32_t offset; /* Offset of ASO CT in DevX objects bulk. */ uint16_t peer; /* The only peer port index could also use this CT. */ enum mlx5_aso_ct_state state; /* ASO CT state. */ bool is_original; /* The direction of the DR action to be used. */ -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-11 17:56:26.396849300 +0800 +++ 0102-net-mlx5-fix-offset-size-in-conntrack-flow-action.patch 2023-12-11 17:56:23.217652300 +0800 @@ -1 +1 @@ -From 04aa27164533702ca5b9b00bd78aff39c816e7af Mon Sep 17 00:00:00 2001 +From b5913482ec13aaeb385a5d7ac7e7f4b89077b4a1 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 04aa27164533702ca5b9b00bd78aff39c816e7af ] @@ -25 +27,0 @@ -Cc: stable@dpdk.org @@ -34 +36 @@ -index 76bf7d0f4f..263ebead7f 100644 +index deb9959f67..ba7c4441e5 100644 @@ -37 +39 @@ -@@ -1286,7 +1286,7 @@ struct mlx5_aso_ct_action { +@@ -1245,7 +1245,7 @@ struct mlx5_aso_ct_action {