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 7EAAE433D8 for ; Mon, 11 Dec 2023 11:20:45 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 71A3E40ED2; Mon, 11 Dec 2023 11:20:45 +0100 (CET) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2054.outbound.protection.outlook.com [40.107.243.54]) by mails.dpdk.org (Postfix) with ESMTP id BE48740E0F for ; Mon, 11 Dec 2023 11:20:43 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Nm8YmRDBz8k9mMuenkesMr47LoOR6tTMbdVnv9KRje60D76IJBELCmi+h2n+Wy6yrDs8whoXM1+aIyD66rONSdWBGS/oNibJxT1RRE2MP2k02i+pTySGRnIrHxoLSFG09beMMVh2Pvvle2Yp0tve5nz4ycQLdK6s4u/qCZ6ZCaS719nPRpjmgcJIw4HkziKngwvspwiekG/lW1hvqWU+iv6Kp9QpL2+OorwmI29nyobHYfk3cIbf+ViZIUdUHPMQj9cqXjpd/5sa0/sRq8Wq44c/Qk7DzeX/3bA1X6lmudQ5A/yrYh2hSdScG+10SKSGCFJRdIWrDQsOgqwOJoR45g== 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=LWv3+HA93WnT4KCapAQyO6aUUZDwvWDXtMaKcas/jPY=; b=gi3QMpn1RxzDlKZB6KncUndY+x/llZqdUzooButCYry6tkuZTLAqP5kWYDBPgQb0cKDtUgioUjOOm/AIhxfN5SehIXHnfWDBw3cfYuSG3nA5a6ljuxk+W1fhbNfxKyptboY4AVDVrinXvbZLJmaamcXgvHvF+BtBgLRRIV2Y+jKfTZNcAq6dGZ1aoButZwNZS9Gw2TNoFSniTbNFp/rDTCwNfiUmX3Rk/ciHOVHwQKFSCR5aHj8OfB4Tq905/Xp9oSBKGVt+MbTNlxNXLp4fq47G13L5nJ0EaYO5umfSXToFY1wUOGwnzS8qbUTcbX/eAvH2brJVn0XbDKEWM1gnSA== 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=LWv3+HA93WnT4KCapAQyO6aUUZDwvWDXtMaKcas/jPY=; b=E3DFZ3Fi1nnBxYxG2EVSTczhsukF4Kn+7LnQImP1vbPNzg7aK4IjqldDpe/x5G3fDo+Kj4BhhBwKiMI2pyUZKW1kGJQaJ/eVSJe4yoDJIExdC+OtxeYv5qmu1qDxyFqXMVUqF5wuKWhi2CR5BL73eIt2VcaTq1TCd8Cc3k2cbcbEjLSO+cNghBaUMMvvo+u50s0KLN8CgmZ3FEArBcwHCSy/1obKm6J9FpqX0BkqWNqs/dYdurM0ZH0rSsHNwzmsLN7yPNgcrgCyUgls0ulwSnnZakgRND0Jf31RAAfxICQ4dlUG21O81MKOOwzmjAf4GhxCmLuM5rqpn5+bqL0asg== Received: from BN8PR15CA0065.namprd15.prod.outlook.com (2603:10b6:408:80::42) by BL1PR12MB5095.namprd12.prod.outlook.com (2603:10b6:208:31b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.33; Mon, 11 Dec 2023 10:20:39 +0000 Received: from SN1PEPF0002529F.namprd05.prod.outlook.com (2603:10b6:408:80:cafe::a6) by BN8PR15CA0065.outlook.office365.com (2603:10b6:408:80::42) 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:39 +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 SN1PEPF0002529F.mail.protection.outlook.com (10.167.242.6) 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:38 +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:20:21 -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:20 -0800 From: Xueming Li To: Jiawei Wang CC: Matan Azrad , dpdk stable Subject: patch 'net/mlx5: fix validation of sample encap flow action' has been queued to stable release 22.11.4 Date: Mon, 11 Dec 2023 18:11:50 +0800 Message-ID: <20231211101226.2122-86-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: SN1PEPF0002529F:EE_|BL1PR12MB5095:EE_ X-MS-Office365-Filtering-Correlation-Id: bed1dd86-2d1c-402f-ab7e-08dbfa32d279 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ECPjy3kXH/FWQQUNby6H/+a9SG/0ADJIshUuPwiJhSmc3epDHuel6laojofD07CUAiuyCsG3yXJxwnD9lJ4OZYsne6Yebap988fHF8GDbS9M41t7/yMdB3Jdy+VNhmRlVpYRVkm3NgdIDVaQauuqCIFcbiCEqee8ZV3qQ+prLa29TiDBR75E+sGVIZICnKCFTMJPESAxqcaWC1wLGmDBUNgZKJ8dFc5mMnj4Y7m+Vq224mdE5t/j4UoJ9bJ9NV1ELUexzzPNM7A3oJmzG1OaROqWbv+kSG4r6ZflsYEnALWxzQSOcHJJkdEdOwSy7GuLNuM9wMc92Ldz7NHXX6r3tkHQ+9JhcKdRNiLODe9TST/QCf1DGaFHb+JJ9ciaWAyL07z8YHK4Bk0z5VkcXUCNJbcVlnJbZn7qVu9fBsPVMiAlA2YED/Qd+l1TCq03gbbj/dx7zkRno96oAKLDLamo9X6QMsI/8VHlG854sq1RJcBtfw2BxKbZ5qfViNMF8YG5NXCzcAujDTkOW0z88Cv6Jvhxqlk/ymiR8rM8u50whxbE74zAbJO3GTZ3RECVQ4AeYlc4zbOPLuOB4bcunDQe6Jl3L1v+/49JV3v90UIIwXv8rmllcC3lPpZWU7utR3nHugLAjR0yuylQ4JJ3FBulxg0LKqtaTS+56PDx/w2jWKH8W4rEMmBdz6MW6jarWDG8cV/D0v9iFSomjXM/hpf87HM1jrXIuaYdpUcrKESte3jR0gqWMNR80vHyrdSkNtIm2pNTOkB46H3HlEl6bEGGEPKiqv9PG9eLmPCRft9FL4c= 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)(376002)(136003)(396003)(346002)(230922051799003)(1800799012)(186009)(82310400011)(64100799003)(451199024)(40470700004)(46966006)(36840700001)(40460700003)(4001150100001)(2906002)(41300700001)(36860700001)(36756003)(86362001)(82740400003)(356005)(7636003)(2616005)(336012)(426003)(16526019)(1076003)(26005)(6286002)(478600001)(6666004)(53546011)(7696005)(47076005)(966005)(83380400001)(6862004)(4326008)(5660300002)(6636002)(316002)(70586007)(54906003)(37006003)(70206006)(8936002)(8676002)(55016003)(40480700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 10:20:38.8148 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bed1dd86-2d1c-402f-ab7e-08dbfa32d279 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: SN1PEPF0002529F.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5095 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=49bd7912ee2bdf7325360c5209dd01b5a8b517f8 Thanks. Xueming Li --- >From 49bd7912ee2bdf7325360c5209dd01b5a8b517f8 Mon Sep 17 00:00:00 2001 From: Jiawei Wang Date: Tue, 7 Nov 2023 17:08:20 +0200 Subject: [PATCH] net/mlx5: fix validation of sample encap flow action Cc: Xueming Li [ upstream commit a2a709f0e7b88b785acaae87dd9724821438c969 ] The flow sample/mirror action includes sub-actions for the duplicated packet. In SW steering case, dv_flow_en=1, there is a FW limitation that forces configuring also encap action when port action for the wire port is configured in the duplicated packet's sub-actions. The driver did a wrong validation for the above limitation and forced other actions instead of encap for the wire port. Force only encap action in case of wire port. This patch fixes the wrongly checking for the sample encap action. Fixes: a8697f50f50f ("net/mlx5: fix E-Switch mirror flow rule validation") Signed-off-by: Jiawei Wang Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_flow_dv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 8ccef8e460..aa3a258ae7 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -8352,7 +8352,7 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, RTE_FLOW_ERROR_TYPE_ACTION, NULL, "mirror to rep port with encap is not supported"); } else { - if ((sub_action_flags & ~MLX5_FLOW_ACTION_ENCAP) && + if (!(sub_action_flags & MLX5_FLOW_ACTION_ENCAP) && (action_flags & MLX5_FLOW_ACTION_JUMP)) return rte_flow_error_set(error, ENOTSUP, RTE_FLOW_ERROR_TYPE_ACTION, NULL, -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-11 17:56:25.829289000 +0800 +++ 0085-net-mlx5-fix-validation-of-sample-encap-flow-action.patch 2023-12-11 17:56:23.157652300 +0800 @@ -1 +1 @@ -From a2a709f0e7b88b785acaae87dd9724821438c969 Mon Sep 17 00:00:00 2001 +From 49bd7912ee2bdf7325360c5209dd01b5a8b517f8 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit a2a709f0e7b88b785acaae87dd9724821438c969 ] @@ -20 +22,0 @@ -Cc: stable@dpdk.org @@ -29 +31 @@ -index 154e509707..9753af2cb1 100644 +index 8ccef8e460..aa3a258ae7 100644 @@ -32 +34 @@ -@@ -8721,7 +8721,7 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr, +@@ -8352,7 +8352,7 @@ flow_dv_validate(struct rte_eth_dev *dev, const struct rte_flow_attr *attr,