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 59F9C433D8 for ; Mon, 11 Dec 2023 11:16:57 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 53B2440ED2; Mon, 11 Dec 2023 11:16:57 +0100 (CET) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2043.outbound.protection.outlook.com [40.107.244.43]) by mails.dpdk.org (Postfix) with ESMTP id BCF6940E0F for ; Mon, 11 Dec 2023 11:16:56 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jhTw64IfnO/NuI0KGtSUy4qffpX8XtzG5pKNzPZv7Rl5kqyJ8Qylo8dzpEE0fd86oWDbACH6F8LjrvsbquKzyaK6xssF06bQKkOMaMbalRF1dGXDI3XpixTyPwWCHRVuFgKD/srsWOBw8PfW1MkM89azwUqq5SS4LFiokMhQ+Uvq32CcBdkTaogr8F1/b3H+GMKwwIk0fhJJ1tGFQhEjnX7yJJiqjmzaUxacxnTLYa3JdH7e6MVVJUVPMF2BgT/3UfD0UojuScyvWvgoC+SGXQ/Mw43Ai++UtcX81KbMuh/oivPm5Li5XuU/MkFXUSn9ocKt4n76eXx3ZBfpWYZRUg== 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=xlF2Q5+TKGKYGUxORKkPzs0TWng1qIh1r9D1odSHj68=; b=JQodyHipRRukVdXAKGoNJI9RUNDxQh/v68bJPMDagQ3+oQyBEu3/iJO8ZnZKq95u25QuvxW2LPVuDnp6nS6rsfizquQryG0LEHhpW8WqoN4W+TfZFc7GAU3FcfEJAtRNxyIP8zT07Iwnw+s8xHHYDDMNLNz+bKLOX/kunrcOeVYAFfPLPC96JSOOst5aeDP6ZG/bJZ0YintVq4Gxd69GbCK2COSYsk3f5Brn70BvRSINDpFRCcCxpcJFOrds22VVimzYc/9FvGU8NfqU+U6B1Q06ZMzi9Bdln6q1wr2MKOEiK9nFG9fzUXNAXTo8HGW2t/1qy4kyadXTaElsW34wCg== 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=xlF2Q5+TKGKYGUxORKkPzs0TWng1qIh1r9D1odSHj68=; b=DVXbwZ6hrefWZ1w0U2Mhq+EeOQsd75aLma6w4I0kV6vxB/8atwigXrJ7dYoEuQL8hbi2sbAbt7p8SGuC7pyrIxfxP3RkJB0Nv2tLFWHs3s83wq7tAQgu6rkfbZK3Yi/0CbuYkf7x7ZIN9DRWsUzMQNbl4ezR9LvpfFwsdeiNHo+tw+VuZotrtvUb9DBxwkXT/tVtJBqTBpoET/GYWtW06lG/AqvQpUA6ifS6U+tXV+KZ/J5yiUw1K1g1QuwXgNJOQSeDbv1YYHv7615GHgOINbMHqHAwnAzO1mvML4IERuc8keeyNBW/6pjC2zzGGr/Kc7B6QsvKK03Gdl6dt4eZfQ== Received: from SJ0PR05CA0166.namprd05.prod.outlook.com (2603:10b6:a03:339::21) by CYXPR12MB9441.namprd12.prod.outlook.com (2603:10b6:930:dc::6) 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:16:54 +0000 Received: from DS3PEPF000099E0.namprd04.prod.outlook.com (2603:10b6:a03:339:cafe::ce) by SJ0PR05CA0166.outlook.office365.com (2603:10b6:a03:339::21) 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:16: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 DS3PEPF000099E0.mail.protection.outlook.com (10.167.17.203) 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:16: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; Mon, 11 Dec 2023 02:16: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:16:41 -0800 From: Xueming Li To: Jiawei Wang CC: Suanming Mou , dpdk stable Subject: patch 'net/mlx5: fix decap action checking in sample flow' has been queued to stable release 22.11.4 Date: Mon, 11 Dec 2023 18:11:12 +0800 Message-ID: <20231211101226.2122-48-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: DS3PEPF000099E0:EE_|CYXPR12MB9441:EE_ X-MS-Office365-Filtering-Correlation-Id: 131da48c-5af5-4153-7d38-08dbfa324cac X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ki3arRhT/4Tj+DBd6QagEfr2KzYK9dXvJsYoAh/Q+iXqX7m8Lu3QRqwzM0YAGpoWni1c5w5XdDxtweJPWvzmiMZq8XEbJKQet5v4HEDO/w5qwdEwjWsk3jwo9Vjk1O9JAnKY6r+CS+DEKT/AMB16X037dtZ6Ms5UCosahGd82O1HtPh4zenKc2jDS7pLZSUNsfYQ2l31dGdJNy3/CBhxElmgtVJbQe8smO9y0pdfsezpTBD7uzA7kam585cGOWntbYPSb3PbYdlbhvE6eyF9Wvl0ed5HZ5PKY1yzFLEeTrJFihBpdUDKd1xOE3Ug+DxwWjtnSD19910Z7o5LBKp9WgNOc+tqHZfsdPxlHMszos5+k45zv9jF8yrsa8TsG9KiKSAtDdpflGbv2/gcDVd7GjSDc1P1PNaA0L5jUUsKt30/DfaWRIsQ4LlBEN8ricz1Mx8sEGPQnDZDko/qahrMF38FAJa71+pqqw52INngFmhmAiEAbjDZFE+kjVr1XQC9Py1iEXoaTyTZvxt9Gghq7xoxYTn8HM44HV9rJ75eKY9F3C08aA27S60s9NbUrjykafZwG1FNHS/h/3w6xw+cBSj5pCmzUWjNhuP1OMcnlA54Qq9636nf50o1TNjkYyFAIIFV6kV5LA74/vbmHbMPojmm/Ojb9+ljOQe7IsgBTYEXitmMwSWs3oRR+MqE6vw9Iw3uFWwLjYC3Z0zKW+gbPJd1ZoEgzU/TD5dGkzzfqu9aelqi0tTHEhx8w8xQNO7UrgRHy/0hKm3hRq1mBKg3zw== 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)(346002)(376002)(396003)(39860400002)(136003)(84040400005)(230922051799003)(186009)(82310400011)(451199024)(1800799012)(64100799003)(46966006)(36840700001)(40470700004)(40480700001)(1076003)(336012)(426003)(16526019)(6286002)(26005)(2616005)(40460700003)(82740400003)(55016003)(86362001)(356005)(7636003)(36756003)(316002)(47076005)(83380400001)(5660300002)(53546011)(6666004)(7696005)(36860700001)(70206006)(70586007)(966005)(8936002)(8676002)(6636002)(54906003)(37006003)(4001150100001)(2906002)(41300700001)(4326008)(6862004)(478600001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 10:16:54.3176 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 131da48c-5af5-4153-7d38-08dbfa324cac 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: DS3PEPF000099E0.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYXPR12MB9441 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=74b594dfd3c7aa431cea5f1db0527d32d4f3a9fe Thanks. Xueming Li --- >From 74b594dfd3c7aa431cea5f1db0527d32d4f3a9fe Mon Sep 17 00:00:00 2001 From: Jiawei Wang Date: Wed, 11 Oct 2023 09:36:31 +0300 Subject: [PATCH] net/mlx5: fix decap action checking in sample flow Cc: Xueming Li [ upstream commit c40023aece2ec9a7899fafecf474d7337212776e ] This patch uses the temp variable to check the current action type, to avoid overlap the sample action following the decap. Fixes: 7356aec64c48 ("net/mlx5: fix mirror flow split with L3 encapsulation") Signed-off-by: Jiawei Wang Acked-by: Suanming Mou --- drivers/net/mlx5/mlx5_flow.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c index 942dccf518..ea0a49827f 100644 --- a/drivers/net/mlx5/mlx5_flow.c +++ b/drivers/net/mlx5/mlx5_flow.c @@ -5891,6 +5891,7 @@ flow_check_match_action(const struct rte_flow_action actions[], { const struct rte_flow_action_sample *sample; const struct rte_flow_action_raw_decap *decap; + const struct rte_flow_action *action_cur = NULL; int actions_n = 0; uint32_t ratio = 0; int sub_type = 0; @@ -5951,12 +5952,12 @@ flow_check_match_action(const struct rte_flow_action actions[], break; case RTE_FLOW_ACTION_TYPE_RAW_DECAP: decap = actions->conf; - while ((++actions)->type == RTE_FLOW_ACTION_TYPE_VOID) + action_cur = actions; + while ((++action_cur)->type == RTE_FLOW_ACTION_TYPE_VOID) ; - actions_n++; - if (actions->type == RTE_FLOW_ACTION_TYPE_RAW_ENCAP) { + if (action_cur->type == RTE_FLOW_ACTION_TYPE_RAW_ENCAP) { const struct rte_flow_action_raw_encap *encap = - actions->conf; + action_cur->conf; if (decap->size <= MLX5_ENCAPSULATION_DECISION_SIZE && encap->size > -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-11 17:56:24.658756900 +0800 +++ 0047-net-mlx5-fix-decap-action-checking-in-sample-flow.patch 2023-12-11 17:56:22.997652300 +0800 @@ -1 +1 @@ -From c40023aece2ec9a7899fafecf474d7337212776e Mon Sep 17 00:00:00 2001 +From 74b594dfd3c7aa431cea5f1db0527d32d4f3a9fe Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit c40023aece2ec9a7899fafecf474d7337212776e ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ -index 8ad85e6027..772f6afb66 100644 +index 942dccf518..ea0a49827f 100644 @@ -22 +24 @@ -@@ -6159,6 +6159,7 @@ flow_check_match_action(const struct rte_flow_action actions[], +@@ -5891,6 +5891,7 @@ flow_check_match_action(const struct rte_flow_action actions[], @@ -30 +32 @@ -@@ -6219,12 +6220,12 @@ flow_check_match_action(const struct rte_flow_action actions[], +@@ -5951,12 +5952,12 @@ flow_check_match_action(const struct rte_flow_action actions[],