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 78ABFA0093 for ; Wed, 9 Mar 2022 12:03:28 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 70C7D410E6; Wed, 9 Mar 2022 12:03:28 +0100 (CET) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id 1A023410E8 for ; Wed, 9 Mar 2022 12:03:27 +0100 (CET) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id E371B3F616 for ; Wed, 9 Mar 2022 11:03:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1646823806; bh=4KC6WdPYdJOezNu2hUFPCxJiPX3YCurLUu3OUn5Rhws=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=JjLXX5nNjcLDikvR6FEdCOcZeWV6G6qEZmJRq/SUBw/aHrYsLFVABozfRCuFZwt3p s7OvlU3wiQJFfyEOULYVPaN/8+mb5ZTzSsffpEuTawkz7sN6R6vd7wCwa9hXcGH4rJ XnCiwanPkfpUpBeLBJetUQxNpmL5mreLX9mOcGq7WRMIlooYRTOppjHJ6JLgJ/Tuh0 Jic8F5afBVCDhy20JRTdatxxG8cbkbFLLlcVImJdByBxOksSb2bJK0ADBTKwItA1nJ L5tAVtD2yYXzZhNQDkAyeqGVo6Mk6H8HogROWjIQYLwXX/ySelosik2a/gU27XkUSp 4kfiwCMDGMxlg== Received: by mail-ed1-f72.google.com with SMTP id l14-20020a056402344e00b0041593c729adso1078981edc.18 for ; Wed, 09 Mar 2022 03:03:26 -0800 (PST) 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=4KC6WdPYdJOezNu2hUFPCxJiPX3YCurLUu3OUn5Rhws=; b=1yRnB/zA+DyM0/qMtd12lspcJjCLPvGxRaXh2PpkM8Nw8E3HGJrGcbEnl+BL2XrxKV CaofFM2nxd4E3+DsEmvmzyvPQadj5seUFPp6hXUWVsJ2SfxF01aFERIUrI3YT7WWJi8i pWzWaqu1Mt9arRr/owdqmEsUuGVR0TVsCiY3wXS1QivZmFNIrKIOF4bmeRkQhHkz8GFa QKYE731eWmu4jpsMckahzFSJhbY1DhpRbstz3QP/RFTu67K5pIxjrvTY9KYB79WLJ8iu dXH5C9x8HFwsn2VgRJHz/HsxMDa3SnedAMFO4MmyLHDVuYT1ch+5Z24f5JPxgG1hxX1L cZPg== X-Gm-Message-State: AOAM532g9xWq5hDiZDMZ3t157XsCMtffQ5rswSyHDVwOFabfplnBoHWx fLR2SMGzJdFk4jvNqDb23/QgSgB3WYzN9smkS6MBM3PL1LqjDikSnXpDXzKPSWYHo2h0yM8eMcW CYQI+JKXKHfCFUanx5Ct7eTq0 X-Received: by 2002:a17:906:b1d0:b0:6cf:7f39:50e0 with SMTP id bv16-20020a170906b1d000b006cf7f3950e0mr17768466ejb.760.1646823805948; Wed, 09 Mar 2022 03:03:25 -0800 (PST) X-Google-Smtp-Source: ABdhPJx4OjTIsxm5fGdMad/krZqxYLgkdRk6FoUWpPb2vWVcbQ++DZvY+/i1fBGqO27nXt1PLEQX9w== X-Received: by 2002:a17:906:b1d0:b0:6cf:7f39:50e0 with SMTP id bv16-20020a170906b1d000b006cf7f3950e0mr17768453ejb.760.1646823805747; Wed, 09 Mar 2022 03:03:25 -0800 (PST) Received: from localhost.localdomain (068-133-067-156.ip-addr.inexio.net. [156.67.133.68]) by smtp.gmail.com with ESMTPSA id c1-20020a170906762100b006d00ae72b0csm568601ejn.221.2022.03.09.03.03.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Mar 2022 03:03:24 -0800 (PST) From: christian.ehrhardt@canonical.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 19.11.12 Date: Wed, 9 Mar 2022 12:01:10 +0100 Message-Id: <20220309110116.1295395-39-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220309110116.1295395-1-christian.ehrhardt@canonical.com> References: <20220309110116.1295395-1-christian.ehrhardt@canonical.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 19.11.12 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/33dfe70b326a8e10d4c934d84b7717847b13f8b4 Thanks. Christian Ehrhardt --- >From 33dfe70b326a8e10d4c934d84b7717847b13f8b4 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 6f0876f233..dd62bbbbfb 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -7858,11 +7858,13 @@ cnt_err: 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.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-03-09 11:57:45.389986617 +0100 +++ 0039-net-mlx5-fix-matcher-priority-with-ICMP-or-ICMPv6.patch 2022-03-09 11:57:43.416938533 +0100 @@ -1 +1 @@ -From dfb8c448daaf29a10d6249fc045bd2eef9655684 Mon Sep 17 00:00:00 2001 +From 33dfe70b326a8e10d4c934d84b7717847b13f8b4 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 6f0876f233..dd62bbbbfb 100644 @@ -38 +39 @@ -@@ -13675,11 +13675,13 @@ flow_dv_translate(struct rte_eth_dev *dev, +@@ -7858,11 +7858,13 @@ cnt_err: