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 C3BF8433D8 for ; Mon, 11 Dec 2023 11:20:17 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BF40942D92; Mon, 11 Dec 2023 11:20:17 +0100 (CET) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2069.outbound.protection.outlook.com [40.107.223.69]) by mails.dpdk.org (Postfix) with ESMTP id CD04B40ED2 for ; Mon, 11 Dec 2023 11:20:15 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j8+En+4tEQJO4kZ57UjdXp9vP8gEgce/pcLF0eoAJcnuqA2TWacBSP6C++XQXPwyPBwm7F48eaCVtXpCNF6Una8r8zlU5g3SGqDBldxKdc4H5IfozkRCbT0I8+UJuiVL6XQ2BwU2XneZa/2pvqZ/SJs74GdM22qs+eXIAxelyhLzCZvqLqVOIAxw8tukmcbLY13Ymahc6PmotvLk6nRNyudhElpHNRMf5WSpAT4Zv+xzZJ9NPpGtla12oZb4JR3j4QYhltq32J3iCFBsmXxG+3WKzcelhhW7gDP6d5VcfUl0XzeVNALLUmiVSft4KzSptt4dGm/UYCJidmO31iPX0Q== 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=UlB0i5c0pJzzGrzR2IX1qDARSouCUjfeOFija3EiJ8M=; b=GVqT+865GcgVpVS95HcRXIVGLRvC8KkM5fu2Z2LfFH4k9gses1qWtkjviUrEv+z44/jB/p6DCk8mfpsXa6v30clHSsDQO99oWOG0iak4U08XKITV5JPrb0r/bzkpe82kXK2cVHFcOKbGaCv/7pXuLVh4f306phdUOJfk7ZdcU148WG7hirx037dSx+SuVo1ZkLCJ4h4Sk687pgsrKDjIAezRQ7DvxbTjBEXp582NAKcKq5CcRgtBeyg4miArcshBRrWikl5RAAWtig3xdjX8F6UKBA6op4dz7eqoLV/YfRouOiUIeLS2d4AmmshXAPY5AP2ETQYN1n8ss9XiLGdHfA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=xencore.cn 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=UlB0i5c0pJzzGrzR2IX1qDARSouCUjfeOFija3EiJ8M=; b=TVCc8TtDRoDsIJ2Fj0dqBSJchHM6oHG2P9I7kRqWy0/1nSFgQULe/DNI3sY4PSsq65Al8gr0E0rVB+iF3RxSKbwQr5OTMIArt/Qc77BVERBn1vJE/POh3SgMFg/YOjnJQiMrOnX1uemdMT8/fyaVKni+xtVnU60isiKX+k2r1ySgZWsWpO/87F6e1+lohFSV3U/Bt9iyJRcjG/wX1OyQH98WFTLlxmEmlhIKelbNgWCr6voFM2fyhmjGotRYgQa62n9YmpAsNZ1GU2tMsGLb6AUgzbtNgmarvW5JemvfriVImeO9fIVjCHKiWqQFtjAMjNAiEInaK1v6EcAy4gIGnQ== Received: from CH2PR11CA0008.namprd11.prod.outlook.com (2603:10b6:610:54::18) by SJ0PR12MB6808.namprd12.prod.outlook.com (2603:10b6:a03:47a::10) 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:20:13 +0000 Received: from CY4PEPF0000EE3F.namprd03.prod.outlook.com (2603:10b6:610:54:cafe::46) by CH2PR11CA0008.outlook.office365.com (2603:10b6:610:54::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32 via Frontend Transport; Mon, 11 Dec 2023 10:20:12 +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 CY4PEPF0000EE3F.mail.protection.outlook.com (10.167.242.19) 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:20:12 +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.41; Mon, 11 Dec 2023 02:20:02 -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:20:00 -0800 From: Xueming Li To: Weiguo Li CC: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix unlock mismatch' has been queued to stable release 22.11.4 Date: Mon, 11 Dec 2023 18:11:49 +0800 Message-ID: <20231211101226.2122-85-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: CY4PEPF0000EE3F:EE_|SJ0PR12MB6808:EE_ X-MS-Office365-Filtering-Correlation-Id: 6a8caa7b-65a5-4fab-bfee-08dbfa32c28f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2+g5fAMt/AP+90JLFOGdef1C9+pCAVqttj6Ob/q0QxDOe8yy341YNae52Pw4/lA6RJeGXTfNQW3FJwyVV5Dg79O/e5jLFaqBhAvYqGNhupKTY6vvhUdtYq1E19+ei03hq/Fe14Vc3Lf5RYLlHT/h4tp9mRvOIIBuC7lPzhO6C/CJJbJjWHtP2XeungVMnTKO3ZndXrMQi6IYyK81o+36pHaiFvgTSSJ1FzzoCefgoA/l1FGnY4oUQN/kedoWC9jb5IyIjQiXP70mKhgctEqEc1jXcwquJWKefyfYyjZ+2NZU5hBOzkpZLL0dp0NLuOCmYXj5r3+fzWEFNMlkozBwknaVLzaNz5LEp1F3oaQvLjoGBZat3eV2Rqf2lWF5F5fwvg6yG8uQLJdE7Y1j30Dt748Osq4icaKjFZYzClDsbflJnZGK35lXiYM0asjvq+63tsq08lFkpT0oHobmaLNjcSytaxZ57vhs12EGTc6t0DbllXJ4yyX4NMsmKDL7soqVCw1vJ2RP0EjaFLN+ZosVbenjVGtYM4sYo2ELieHkU3tb/ru2uzn4yKyjtQXVG9Zj/AqB2M3Lr94TCSQMxm0yn1kt4tqYqqQAWIF5XEWfph4Jv7l+tzIg8u7WRLghkpFSAdgwMJ7s+asq8wCB4tiqTYuKuS5YY/UyAx7N7LmdsS01pI4mQc6gxrFc+r3CN9442G3jCRP1iVZJKRxiTB78FUOCHfw1yIPuWceerq8maaAjkgHWw0qrZNFmtMRqG9IzDfXL8yGAzxDXTMopPF91aTls+hrvBg+pdMqXanB8ctg= 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:(13230031)(4636009)(136003)(346002)(39860400002)(376002)(396003)(230922051799003)(64100799003)(451199024)(82310400011)(1800799012)(186009)(36840700001)(40470700004)(46966006)(55016003)(40480700001)(41300700001)(4001150100001)(40460700003)(2906002)(5660300002)(316002)(4326008)(6916009)(8936002)(8676002)(70586007)(54906003)(70206006)(356005)(82740400003)(7636003)(2616005)(86362001)(36756003)(36860700001)(47076005)(966005)(83380400001)(426003)(26005)(478600001)(6666004)(6286002)(336012)(1076003)(16526019)(7696005)(53546011); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 10:20:12.1160 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6a8caa7b-65a5-4fab-bfee-08dbfa32c28f 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: CY4PEPF0000EE3F.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR12MB6808 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=f00e3b40fd33b32fc796cd5b1fda4049d7bf21ce Thanks. Xueming Li --- >From f00e3b40fd33b32fc796cd5b1fda4049d7bf21ce Mon Sep 17 00:00:00 2001 From: Weiguo Li Date: Sat, 4 Nov 2023 12:07:33 +0800 Subject: [PATCH] net/mlx5: fix unlock mismatch Cc: Xueming Li [ upstream commit 29f99df4200eafcc528eea08b0fffb8efb1a595a ] The 'need_lock' parameter controls whether the function acquires and releases the spinlock, but the first unlock operation occurs regardless of the 'need_lock' parameter. To fix this issue, the spin unlock operation should be invoked within an 'if (need_lock)' block, ensuring that the function only unlocks the spinlock if it has previously been acquired. Fixes: 48fbb0e93d06 ("net/mlx5: support flow meter mark indirect action with HWS") Signed-off-by: Weiguo Li Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow_aso.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow_aso.c b/drivers/net/mlx5/mlx5_flow_aso.c index 29bd7ce9e8..8441be3dea 100644 --- a/drivers/net/mlx5/mlx5_flow_aso.c +++ b/drivers/net/mlx5/mlx5_flow_aso.c @@ -932,7 +932,8 @@ mlx5_aso_mtr_completion_handle(struct mlx5_aso_sq *sq, bool need_lock) rte_spinlock_lock(&sq->sqsl); max = (uint16_t)(sq->head - sq->tail); if (unlikely(!max)) { - rte_spinlock_unlock(&sq->sqsl); + if (need_lock) + rte_spinlock_unlock(&sq->sqsl); return; } do { -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-11 17:56:25.804788300 +0800 +++ 0084-net-mlx5-fix-unlock-mismatch.patch 2023-12-11 17:56:23.137652300 +0800 @@ -1 +1 @@ -From 29f99df4200eafcc528eea08b0fffb8efb1a595a Mon Sep 17 00:00:00 2001 +From f00e3b40fd33b32fc796cd5b1fda4049d7bf21ce Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 29f99df4200eafcc528eea08b0fffb8efb1a595a ] @@ -15 +17,0 @@ -Cc: stable@dpdk.org @@ -24 +26 @@ -index 3c08da0614..f311443472 100644 +index 29bd7ce9e8..8441be3dea 100644