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 21A9A4301F for ; Thu, 10 Aug 2023 02:12:08 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1C41743258; Thu, 10 Aug 2023 02:12:08 +0200 (CEST) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2067.outbound.protection.outlook.com [40.107.212.67]) by mails.dpdk.org (Postfix) with ESMTP id 8D4F843258 for ; Thu, 10 Aug 2023 02:12:06 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CJwkiGbxzRG1o1i6b8ZBPNm/6qJZaoTbPdzjLOQj2HJWPOqW6An2iKweDmXOjoSvVUbJpYIhP/ZdccrrIAe0XrV5bYOy0LWDVvsKaatvvMVoiLkmeSzdS/xQ8v+Ye5D1ImNZyjT7VN7x0ViaTCd9zNNWmkAjX1NX+5+ublkombespCt6RxqAd8noGGluOPw/bNA/JeQgy4/1sWeZNK21Cii4PiOP/9qxD2OSFgQPkr/iCL4UdVn5128dKrxChSawRe3RFO7Zoe5LPFRX78v6vZCMqUbjM4JcUR82+aLwRVvlPX6DtijNuJWodqf+Gvk1vK+iqlgOX7lDC3aA1aKQVw== 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=+n05DasyzvxtvpRZ9o889+AeTfzxXpf79c9EC4ZXdvA=; b=DHf88tVz2euoiQIkfEnE6fSi0HLc144aymn+Ytg9iY0+ckQ7Ue+iBN+NuaF600+WzW8933QCBgBLqX795S7PH0asxI0W2ouEjkxe0e78JdaCp8oOFOpmuQ0AUZKg6CPxBTgCsHMl60lkOQCVJaipiLtSzMKXk8F2l/iXjW6tn/k2JznliiLZxYD/qNFa45u2aq4WuxnhRGRv8lk4NPYNUHL047wjEp7bT+HStO66CBPUX+znY/KpaDvgz/8ndWGzvvUZoLoLlqVyjFmQRubLzOS3I3zZgXhRmR67kDMlEOmNq0N3du99snwiViR2tK575i2SnnLzzRcaPZTgjgcGaQ== 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=+n05DasyzvxtvpRZ9o889+AeTfzxXpf79c9EC4ZXdvA=; b=ZS/x7lWM/XqDyfIqccZ03MzcnUtySw7k69JnAjSOJzhXB/I9e7eC1ZtApb1BwwqDmmf+T431u74SWxo8elMmEDMpOOAzBzIzODPhZS5ta1O6mWwaKKqDFhxCXcYHeswQRbxBqhKJ8Wf3IYgOzBVS1OIqb6QPzNSaYSRNl5c7p+8IZNy12T2bDf8Yb5OrEGyOtx8ziPbkvWI0Y4hiZ/9Or78NcskmxdVjre6xH2M5fnB7RunT1JptYBV7cq7lTKJYFk8QhueYj8N1lwbfNyE8CiyxossMSBprOJFBZzKV3kdGuc0VQ30kjh9CNIsPk+a4a9o9K8hBzT9Pbp+Uz9IWCg== Received: from SJ0PR13CA0162.namprd13.prod.outlook.com (2603:10b6:a03:2c7::17) by SA1PR12MB6945.namprd12.prod.outlook.com (2603:10b6:806:24c::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.28; Thu, 10 Aug 2023 00:12:04 +0000 Received: from CO1PEPF000044F5.namprd05.prod.outlook.com (2603:10b6:a03:2c7:cafe::3e) by SJ0PR13CA0162.outlook.office365.com (2603:10b6:a03:2c7::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.18 via Frontend Transport; Thu, 10 Aug 2023 00:12:04 +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 CO1PEPF000044F5.mail.protection.outlook.com (10.167.241.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.19 via Frontend Transport; Thu, 10 Aug 2023 00:12:04 +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.5; Wed, 9 Aug 2023 17:11:50 -0700 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; Wed, 9 Aug 2023 17:11:49 -0700 From: Xueming Li To: Alexander Kozyrev CC: Ori Kam , dpdk stable Subject: patch 'net/mlx5: fix handle validation for meter mark' has been queued to stable release 22.11.3 Date: Thu, 10 Aug 2023 08:10:33 +0800 Message-ID: <20230810001045.2662-13-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230810001045.2662-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> <20230810001045.2662-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: CO1PEPF000044F5:EE_|SA1PR12MB6945:EE_ X-MS-Office365-Filtering-Correlation-Id: 5ecd7ba5-cf84-4713-bac1-08db99366d2c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iSeOkX4gZwlMHOxsf8k1EFWqRloKPohkK4Q4ncWeXFnzpK8BfEHFMNHVPTcanGt+GOQS3kRtImzdIRuzKl3biAdWwBVI9bmIVNVZiQEDvzE9yu3nAXyYTU1mp99AkmY+Fuq5ZT91NhCt7BdWJ/WavdU6bW22ufghwRYJoU9VZCFRQZRIZkR0l7ub53uZ9cQepRTgHT+ZCtFcCzk8MWQAlQhd/W0oVp3rsnworVzkAWxZrtJ3KMmKjlShgIPgZlo7w/OMTixqKSqsOdooUO6SvDmtV3ta2/l7H5fcslDjbwDfkZM2Dm/uC/0xnaI2BJf3y/841C/CB0rhADlPWotEOLSuq6xVJL8I5Hnw2ffPiS9FDoF64umk/TSV8Whud2CFG3iazc/wnGC/Lg7B6gERc85e7AUMCwtrWiUznYzqhinexfBsx8VrPw6FX11HPwnhckW5nXsR92P1STa3X8wcPLzPJsO+8+FQSI/9yo65dFTjW2LlrFLTOW/On5XrOFiGOlYJPhJSKC/2L32DDRUDJj959bfdJQfxfn5AB9l0mICIlTLxFkUt/pklX2KPBpSdNJappvymmDSQ9Sv9nlFV8hNB1ugFpmMmLmDOhzQQvbDuV6YvWVDPekCGPyLo1JP22vu2m9pBGqw1th97z+s6cc8PL9XA9KtgRfugBZGU0p+Ey2AyeuPFVznNZlYYgVeR4JGhYZfqe3FSneoiu873h2zaikztmL3yxoCChwo5azAolQSQu3L3KQTX6L5fYZJqj7F5fG9HranEmuU0CpMGTw== 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:(13230028)(4636009)(346002)(39860400002)(396003)(136003)(376002)(186006)(1800799006)(82310400008)(451199021)(46966006)(40470700004)(36840700001)(36756003)(54906003)(478600001)(6666004)(1076003)(70586007)(6636002)(336012)(4326008)(37006003)(53546011)(26005)(70206006)(47076005)(2906002)(966005)(8676002)(316002)(8936002)(41300700001)(6862004)(6286002)(16526019)(7636003)(5660300002)(86362001)(356005)(82740400003)(426003)(2616005)(36860700001)(83380400001)(7696005)(40480700001)(55016003)(40460700003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Aug 2023 00:12:04.1207 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5ecd7ba5-cf84-4713-bac1-08db99366d2c 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: CO1PEPF000044F5.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB6945 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/11/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=532cb75dec42a09d1a65720d36013fd4f4aaf4aa Thanks. Xueming Li --- >From 532cb75dec42a09d1a65720d36013fd4f4aaf4aa Mon Sep 17 00:00:00 2001 From: Alexander Kozyrev Date: Tue, 18 Jul 2023 16:32:13 +0300 Subject: [PATCH] net/mlx5: fix handle validation for meter mark Cc: Xueming Li [ upstream commit 8b6f24396fc737ca831678a6acd3820c2073be87 ] Skip the METER_MARK validation for the indirect action update. The old synchronous indirect action update was left out during the METER_MARK implementation in favor of the async way. Allow the sync method of doing this with relaxed validation. Fixes: 48fbb0e93d06 ("net/mlx5: support flow meter mark indirect action with HWS") Signed-off-by: Alexander Kozyrev Acked-by: Ori Kam --- drivers/net/mlx5/mlx5_flow.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index e3ca7b6093..942dccf518 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -10137,6 +10137,7 @@ mlx5_action_handle_update(struct rte_eth_dev *dev, switch (type) { case MLX5_INDIRECT_ACTION_TYPE_CT: + case MLX5_INDIRECT_ACTION_TYPE_METER_MARK: ret = 0; break; default: -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-08-09 21:51:21.110385400 +0800 +++ 0116-net-mlx5-fix-handle-validation-for-meter-mark.patch 2023-08-09 21:51:18.284352000 +0800 @@ -1 +1 @@ -From 8b6f24396fc737ca831678a6acd3820c2073be87 Mon Sep 17 00:00:00 2001 +From 532cb75dec42a09d1a65720d36013fd4f4aaf4aa Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 8b6f24396fc737ca831678a6acd3820c2073be87 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index 9bd92f28fd..e91eb636d0 100644 +index e3ca7b6093..942dccf518 100644 @@ -24 +26 @@ -@@ -10758,6 +10758,7 @@ mlx5_action_handle_update(struct rte_eth_dev *dev, +@@ -10137,6 +10137,7 @@ mlx5_action_handle_update(struct rte_eth_dev *dev,