From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 9005541EA5
for <public@inbox.dpdk.org>; Wed, 15 Mar 2023 23:47:07 +0100 (CET)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 8CF544282D;
Wed, 15 Mar 2023 23:47:07 +0100 (CET)
Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com
[209.85.128.51]) by mails.dpdk.org (Postfix) with ESMTP id ACD3340A7A
for <stable@dpdk.org>; Wed, 15 Mar 2023 23:47:06 +0100 (CET)
Received: by mail-wm1-f51.google.com with SMTP id
k25-20020a7bc419000000b003ed23114fa7so1991415wmi.4
for <stable@dpdk.org>; Wed, 15 Mar 2023 15:47:06 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20210112; t=1678920426;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=sZrddAH2bMyeY+mSBmqWTz6x6+olNO7BGoBlYKhzgs0=;
b=e72mLDXaHi31JYXW896TZ6cW44bTj7usVLiEzXg+zZ1EaY31Ld6MT7/VLUcXYQjLHk
2XqCgZvIJ2Zyuv8baNSC2opdRU4IwjUFJbkgJ32Uk0bN19dpuVCBW43P4cs4lmMhS+FE
gFIzIOZ0l7TWIGFu1o6ntzQ5bPXYXwUm5se0EuLdF9bJJ3NCJxeKJa/lV4995akXg8yJ
3/k6QcIJHIE0Ujn9Pn7/rfYagZ9CQi9D2qaF6qommpRAezKTKLBbPf/Kjwb46LCTyFEl
DZgBFUwy25g/VsXX0/I+OnbNB7BT61bWNwkZMruNBVzhc9CK6J92qfNNqfZa9aMnLFpP
5Nuw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20210112; t=1678920426;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=sZrddAH2bMyeY+mSBmqWTz6x6+olNO7BGoBlYKhzgs0=;
b=tXRtLtnG/RD7NmiRg9imI3iYwxE3nKVT7hNBENJt7Vrg+tDTRtJ3jaJL83ZTgN1XbK
LVF0KF5wVlJp8jxTGkuPe2pdGfEjLFj9BzteOqzC6TOhNIXvw29sZxHlj0OK5O3NCfbf
n3MW94Tw6qgpT4AGinopQUscUbfFdDW8qZITPmVQy4btuwZb6Dahn+AVnluT7BUzZyHB
VzGxN7Iy1vgq5Dctp8UpvXG2WV3aAB7jk3NH3GXoD0aDB7uofUoWAPDR02NqJO5kldqV
iWqn2fuklhms8UZhfP0gu003o4kk8prQ2jczgRWKvXo+lGfFBAY8ehtiJ0IEShPKc2dh
YS2w==
X-Gm-Message-State: AO0yUKUNzguFS9CMqVfX/2N+MZZTFiE6z7xGhw7L8cnH1YKxzCaVroja
Zxg/vWWfqb7zk/PFaqDLaO6DWv8zJQBWEw==
X-Google-Smtp-Source: AK7set8wTMm188DrK2t8cvB74PKLFFikrd9k3fZbSOmAloNCam7HwGKLiwRaGwgVLDrgAXYMGcmH7Q==
X-Received: by 2002:a05:600c:3150:b0:3eb:5990:aea4 with SMTP id
h16-20020a05600c315000b003eb5990aea4mr6137273wmo.12.1678920426373;
Wed, 15 Mar 2023 15:47:06 -0700 (PDT)
Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9])
by smtp.gmail.com with ESMTPSA id
az40-20020a05600c602800b003e2096da239sm3329426wmb.7.2023.03.15.15.47.05
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Wed, 15 Mar 2023 15:47:06 -0700 (PDT)
From: luca.boccassi@gmail.com
To: Kaiwen Deng <kaiwenx.deng@intel.com>
Cc: Song Jiale <songx.jiale@intel.com>,
dpdk stable <stable@dpdk.org>
Subject: patch 'net/ixgbe: fix IPv6 mask in flow director' has been queued to
stable release 20.11.8
Date: Wed, 15 Mar 2023 22:46:04 +0000
Message-Id: <20230315224631.1025649-13-luca.boccassi@gmail.com>
X-Mailer: git-send-email 2.39.2
In-Reply-To: <20230315224631.1025649-1-luca.boccassi@gmail.com>
References: <20230223093715.3926893-71-luca.boccassi@gmail.com>
<20230315224631.1025649-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 <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Hi,
FYI, your patch has been queued to stable release 20.11.8
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/17/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://github.com/bluca/dpdk-stable
This queued commit can be viewed at:
https://github.com/bluca/dpdk-stable/commit/a24c411c18a7601100e1263b85ec13d744e14de2
Thanks.
Luca Boccassi
---
>From a24c411c18a7601100e1263b85ec13d744e14de2 Mon Sep 17 00:00:00 2001
From: Kaiwen Deng <kaiwenx.deng@intel.com>
Date: Fri, 3 Mar 2023 12:52:26 +0800
Subject: [PATCH] net/ixgbe: fix IPv6 mask in flow director
[ upstream commit 444505f933f197bd064c7f801fa86e88d5edfce5 ]
Rules without addr mask cannot be created together in ixgbe
when setting IPv6 addr mask to default value as 0.
This commit is to change the default value of IPv6 addr mask as '0xFF'.
Fixes: cba954b7beda ("net/ixgbe: enable IPv6 mask in flow rules")
Fixes: 7d629cacedee ("net/ixgbe: enable IPv6 for consistent API")
Signed-off-by: Kaiwen Deng <kaiwenx.deng@intel.com>
Tested-by: Song Jiale <songx.jiale@intel.com>
---
drivers/net/ixgbe/ixgbe_flow.c | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/drivers/net/ixgbe/ixgbe_flow.c b/drivers/net/ixgbe/ixgbe_flow.c
index 6d75ff73ef..7e5b684c5a 100644
--- a/drivers/net/ixgbe/ixgbe_flow.c
+++ b/drivers/net/ixgbe/ixgbe_flow.c
@@ -1645,10 +1645,6 @@ ixgbe_parse_fdir_filter_normal(struct rte_eth_dev *dev,
memset(&rule->mask, 0xFF, sizeof(struct ixgbe_hw_fdir_mask));
rule->mask.vlan_tci_mask = 0;
rule->mask.flex_bytes_mask = 0;
- rule->mask.dst_port_mask = 0;
- rule->mask.src_port_mask = 0;
- rule->mask.src_ipv6_mask = 0;
- rule->mask.dst_ipv6_mask = 0;
/**
* The first not void item should be
@@ -1922,9 +1918,9 @@ ixgbe_parse_fdir_filter_normal(struct rte_eth_dev *dev,
/* check src addr mask */
for (j = 0; j < 16; j++) {
- if (ipv6_mask->hdr.src_addr[j] == UINT8_MAX) {
- rule->mask.src_ipv6_mask |= 1 << j;
- } else if (ipv6_mask->hdr.src_addr[j] != 0) {
+ if (ipv6_mask->hdr.src_addr[j] == 0) {
+ rule->mask.src_ipv6_mask &= ~(1 << j);
+ } else if (ipv6_mask->hdr.src_addr[j] != UINT8_MAX) {
memset(rule, 0, sizeof(struct ixgbe_fdir_rule));
rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_ITEM,
@@ -1935,9 +1931,9 @@ ixgbe_parse_fdir_filter_normal(struct rte_eth_dev *dev,
/* check dst addr mask */
for (j = 0; j < 16; j++) {
- if (ipv6_mask->hdr.dst_addr[j] == UINT8_MAX) {
- rule->mask.dst_ipv6_mask |= 1 << j;
- } else if (ipv6_mask->hdr.dst_addr[j] != 0) {
+ if (ipv6_mask->hdr.dst_addr[j] == 0) {
+ rule->mask.dst_ipv6_mask &= ~(1 << j);
+ } else if (ipv6_mask->hdr.dst_addr[j] != UINT8_MAX) {
memset(rule, 0, sizeof(struct ixgbe_fdir_rule));
rte_flow_error_set(error, EINVAL,
RTE_FLOW_ERROR_TYPE_ITEM,
--
2.39.2
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2023-03-15 22:44:50.370389227 +0000
+++ 0013-net-ixgbe-fix-IPv6-mask-in-flow-director.patch 2023-03-15 22:44:49.539849338 +0000
@@ -1 +1 @@
-From 444505f933f197bd064c7f801fa86e88d5edfce5 Mon Sep 17 00:00:00 2001
+From a24c411c18a7601100e1263b85ec13d744e14de2 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 444505f933f197bd064c7f801fa86e88d5edfce5 ]
+
@@ -13 +14,0 @@
-Cc: stable@dpdk.org
@@ -18 +18,0 @@
- .mailmap | 1 +
@@ -20 +20 @@
- 2 files changed, 7 insertions(+), 10 deletions(-)
+ 1 file changed, 6 insertions(+), 10 deletions(-)
@@ -22,12 +21,0 @@
-diff --git a/.mailmap b/.mailmap
-index 69b6f4de1d..5b42f87d1e 100644
---- a/.mailmap
-+++ b/.mailmap
-@@ -1253,6 +1253,7 @@ Smadar Fuks <smadarf@marvell.com>
- Solal Pirelli <solal.pirelli@gmail.com>
- Solganik Alexander <sashas@lightbitslabs.com>
- Somnath Kotur <somnath.kotur@broadcom.com>
-+Song Jiale <songx.jiale@intel.com>
- Song Zhu <song.zhu@arm.com>
- Sony Chacko <sony.chacko@qlogic.com>
- Sotiris Salloumis <sotiris.salloumis@ericsson.com>
@@ -35 +23 @@
-index 79c84044af..eac81ee489 100644
+index 6d75ff73ef..7e5b684c5a 100644