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 2BCD3A00C2 for ; Tue, 8 Mar 2022 15:16:09 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 254C44068B; Tue, 8 Mar 2022 15:16:09 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 6108740696 for ; Tue, 8 Mar 2022 15:16:08 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646748967; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=AugqtOVH93SZ2yZCKevWAUriTDeBks+NJsc6qp549Lc=; b=NnXYfU097N3FyNDkypES4OTZKlGSi3nJFz/16gdkVDldm1crY0Sx6am09M2Qdsgbka/1Yf nRG2he+JXKrCew49lfaUJ/dxkyOHRrvd3eu3DLHLOxTbSvcTKyQUhVGnHkOXHzwe5gzQPM Zl+XA+X/mb49mWoOhp1xnYzifUFjwBM= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-38-grXL38zxNc6374c_IGPivA-1; Tue, 08 Mar 2022 09:16:04 -0500 X-MC-Unique: grXL38zxNc6374c_IGPivA-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7747B520F; Tue, 8 Mar 2022 14:16:03 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.190]) by smtp.corp.redhat.com (Postfix) with ESMTP id 657428659F; Tue, 8 Mar 2022 14:16:02 +0000 (UTC) From: Kevin Traynor 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 21.11.1 Date: Tue, 8 Mar 2022 14:14:41 +0000 Message-Id: <20220308141500.286915-26-ktraynor@redhat.com> In-Reply-To: <20220308141500.286915-1-ktraynor@redhat.com> References: <20220308141500.286915-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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 21.11.1 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/14/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/80f0ecc2738dbeea117c1c58ba94bfe3161c8759 Thanks. Kevin --- >From 80f0ecc2738dbeea117c1c58ba94bfe3161c8759 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 ce0d5b1e37..7a5f17a8b7 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -13566,4 +13566,5 @@ flow_dv_translate(struct rte_eth_dev *dev, flow_dv_translate_item_icmp(match_mask, match_value, items, tunnel); + matcher.priority = MLX5_PRIORITY_MAP_L4; last_item = MLX5_FLOW_LAYER_ICMP; break; @@ -13571,4 +13572,5 @@ flow_dv_translate(struct rte_eth_dev *dev, flow_dv_translate_item_icmp6(match_mask, match_value, items, tunnel); + matcher.priority = MLX5_PRIORITY_MAP_L4; last_item = MLX5_FLOW_LAYER_ICMP6; break; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-08 13:55:29.080401651 +0000 +++ 0026-net-mlx5-fix-matcher-priority-with-ICMP-or-ICMPv6.patch 2022-03-08 13:55:28.495315160 +0000 @@ -1 +1 @@ -From dfb8c448daaf29a10d6249fc045bd2eef9655684 Mon Sep 17 00:00:00 2001 +From 80f0ecc2738dbeea117c1c58ba94bfe3161c8759 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 ce0d5b1e37..7a5f17a8b7 100644 @@ -38 +39 @@ -@@ -13676,4 +13676,5 @@ flow_dv_translate(struct rte_eth_dev *dev, +@@ -13566,4 +13566,5 @@ flow_dv_translate(struct rte_eth_dev *dev, @@ -44 +45 @@ -@@ -13681,4 +13682,5 @@ flow_dv_translate(struct rte_eth_dev *dev, +@@ -13571,4 +13572,5 @@ flow_dv_translate(struct rte_eth_dev *dev,