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 AE96EA0093 for ; Wed, 9 Mar 2022 17:31:49 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A8EB54013F; Wed, 9 Mar 2022 17:31:49 +0100 (CET) Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mails.dpdk.org (Postfix) with ESMTP id 889724013F for ; Wed, 9 Mar 2022 17:31:48 +0100 (CET) Received: by mail-wr1-f47.google.com with SMTP id q14so3947161wrc.4 for ; Wed, 09 Mar 2022 08:31:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3G+jAYIoLEKh2I2ILmywqn31jLU2kz2o4yHQuMp3Cw4=; b=jhHg5mvZrldvFUJKnTMxQxe7BNzTin1AHgYLlXSwPRvxgZYQqX5cjmllHrBTx/tRL2 n2PBBHRlRYlkyh2VRP2bV96fyzoqPm9scpPbK83DfVOiuYfeqaFF7Cn1bNbQFXcWdYWr SbcVCM9UYO80TjP19BcCMEpA1rx9A8WdVVjNCWje34XfJaG/RPvreAPNm7usEqp5ZESe Nf3rEPCOSrOGDANmrblS1PvQxUgT/JIL153PqtkxmiEAAfPehaS8msvZPaw/8Vf0UAgg f+eZTt/LinqA90HOQUdp4l2SBnKFqpFHcPpgLTb8IJ44fSHMY97UWtPccjysnN958I1v t1Qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3G+jAYIoLEKh2I2ILmywqn31jLU2kz2o4yHQuMp3Cw4=; b=Qmc2q/ypUwhRmEe4mDU/dDOrCIQS2C1kRzPyP7N1tsogaHBqaY+8Pok1PPWRN6ZVD7 Ngx8KYrBzUpgrulFsbw0xzuxTocRhH1yXyMG5Z5ZRfONZ2yfbva+gGpqqPCtNwsSYBML XdhsEuV6uEndQ/o5No3WmkjrWw5oZ81aNlnhiQVi8mu53fYMWVDdvOq85kGRfG1M7rvY enlTE2jOManFDMNV5jQXI3I+GkrVodwGzeu1UwUbzk90QWqKgE5P0yf22UWC9JyZ3xOY KR498bRIoGcciX5RmhX1iX6Qso704lamCnRBfNM2T8YQJkXj7CAPwToyeFaEl9YhHr2b 4qSg== X-Gm-Message-State: AOAM533A69p1EqWx/MHVNLfiqy0Lms+kJR/Na9LST+8nHqsf3QC7+SO/ h2tKjSlZs+8liNyjLbVympngk9i/Pk8= X-Google-Smtp-Source: ABdhPJz1IkPhtv087CNCG3qeUNGcMy3GfbnmUG6iISdftobLv4kNzxfz9xWg4Euaaq9YLVOwNUSTGA== X-Received: by 2002:adf:ed0e:0:b0:1f0:d60:a5d with SMTP id a14-20020adfed0e000000b001f00d600a5dmr316859wro.647.1646843508245; Wed, 09 Mar 2022 08:31:48 -0800 (PST) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id ay9-20020a5d6f09000000b001f1f3330fc5sm2155087wrb.28.2022.03.09.08.31.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Mar 2022 08:31:47 -0800 (PST) From: luca.boccassi@gmail.com To: Bing Zhao Cc: Viacheslav Ovsiienko , dpdk stable Subject: patch 'net/mlx5: fix matcher priority with ICMP or ICMPv6' has been queued to stable release 20.11.5 Date: Wed, 9 Mar 2022 16:30:33 +0000 Message-Id: <20220309163053.245754-17-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220309163053.245754-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-1-luca.boccassi@gmail.com> <20220309163053.245754-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 20.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/11/22. 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://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/ebf7ca8c7ea7246dd4f14c98dc4505902cd550b7 Thanks. Luca Boccassi --- >From ebf7ca8c7ea7246dd4f14c98dc4505902cd550b7 Mon Sep 17 00:00:00 2001 From: Bing Zhao Date: Mon, 28 Feb 2022 13:41:49 +0200 Subject: [PATCH] net/mlx5: fix matcher priority with ICMP or ICMPv6 [ upstream commit dfb8c448daaf29a10d6249fc045bd2eef9655684 ] On TCP/IP-based layered network, ICMP is considered and implemented as part of layer 3 IP protocol. Actually, it is a user of the IP protocol and must be encapsulated within IP packets. There is no layer 4 protocol over ICMP. The rule with layer 4 should be matched prior to the rule only with layer 3 pattern when: 1. Both rules are created in the same table 2. Both rules could be hit 3. The rules has the same priority The steering result of the packet is indeterministic if there are rules with patterns IP and IP+ICMP in the same table with the same priority. Like TCP / UDP, a packet should hit the rule with a longer matching criterion. By treating the priority of ICMP/ICMPv6 as a layer 4 priority in the PMD internally, the IP+ICMP will be hit in prior to IP only. Fixes: d53aa89aea91 ("net/mlx5: support matching on ICMP/ICMP6") Signed-off-by: Bing Zhao Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/mlx5_flow_dv.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 35c87e1fc5..e2dc48f471 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -10601,11 +10601,13 @@ flow_dv_translate(struct rte_eth_dev *dev, case RTE_FLOW_ITEM_TYPE_ICMP: flow_dv_translate_item_icmp(match_mask, match_value, items, tunnel); + matcher.priority = MLX5_PRIORITY_MAP_L4; last_item = MLX5_FLOW_LAYER_ICMP; break; case RTE_FLOW_ITEM_TYPE_ICMP6: flow_dv_translate_item_icmp6(match_mask, match_value, items, tunnel); + matcher.priority = MLX5_PRIORITY_MAP_L4; last_item = MLX5_FLOW_LAYER_ICMP6; break; case RTE_FLOW_ITEM_TYPE_TAG: -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-09 16:30:09.161620896 +0000 +++ 0017-net-mlx5-fix-matcher-priority-with-ICMP-or-ICMPv6.patch 2022-03-09 16:30:08.543025064 +0000 @@ -1 +1 @@ -From dfb8c448daaf29a10d6249fc045bd2eef9655684 Mon Sep 17 00:00:00 2001 +From ebf7ca8c7ea7246dd4f14c98dc4505902cd550b7 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit dfb8c448daaf29a10d6249fc045bd2eef9655684 ] + @@ -26 +27,0 @@ -Cc: stable@dpdk.org @@ -35 +36 @@ -index c4a9b022b7..7a7591144a 100644 +index 35c87e1fc5..e2dc48f471 100644 @@ -38 +39 @@ -@@ -13675,11 +13675,13 @@ flow_dv_translate(struct rte_eth_dev *dev, +@@ -10601,11 +10601,13 @@ flow_dv_translate(struct rte_eth_dev *dev,