From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <luca.boccassi@gmail.com>
Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com
[209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 7F1482BD3
for <stable@dpdk.org>; Mon, 15 Oct 2018 13:52:06 +0200 (CEST)
Received: by mail-wr1-f66.google.com with SMTP id n11-v6so20874255wru.13
for <stable@dpdk.org>; Mon, 15 Oct 2018 04:52:06 -0700 (PDT)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20161025;
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
:references:mime-version:content-transfer-encoding;
bh=N0nzfSZEswGuXhTJk3YpXUZwPEqs6eGHP8bi1uW9rVg=;
b=U0BKmz8x76toaBNlvbiPNJ5ER5x2UT8cVhEHZhbq/RjcyWjKixSOF8nxhgviAt6gKX
BzTVGyAZU1h7iljIcxB8oeQEpSHuZ7y+/eErhoPOvSC0muI9LUuh2mhXH7S9KWXoTlmt
MwMuEsx5HWhN4QtTsIGCXI6qO1Kgu/+VlhV/QYMOQ7CfJjvXFkyIdSqiL3dyC8W9nzC4
6FA0UjecQnzbgOsrRYa9+GoZeqCchPVmcf5/0q5oFJbxlb2X3eVIaGwg/VYAVN0oGnAd
rBXUdA70RQECxjaw+De+jmkAzCYYYagQxzNSR5AJafv1s3RUnquPzo6CB4uHWRGEvu9h
UIGw==
X-Gm-Message-State: ABuFfoi/tqlK3ohflS5rCzVbOwbCo0jm951/EVlp7dS6Eq7X84QPHcx8
DoZvX2Xn+06PNI0rWEB819S9/FUC
X-Google-Smtp-Source: ACcGV61VmBZZ99H2WV1ONhsQ535/chJ6byEDJLP66XRtDtKMUjMzEkTyBeabFXO27OPYwERC8qjHQw==
X-Received: by 2002:adf:bf11:: with SMTP id
p17-v6mr1583708wrh.235.1539604326075;
Mon, 15 Oct 2018 04:52:06 -0700 (PDT)
Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556])
by smtp.gmail.com with ESMTPSA id e21-v6sm11362710wma.8.2018.10.15.04.52.04
(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);
Mon, 15 Oct 2018 04:52:05 -0700 (PDT)
From: Luca Boccassi <bluca@debian.org>
To: Alejandro Lucero <alejandro.lucero@netronome.com>
Cc: dpdk stable <stable@dpdk.org>
Date: Mon, 15 Oct 2018 12:51:29 +0100
Message-Id: <20181015115144.27626-9-bluca@debian.org>
X-Mailer: git-send-email 2.19.1
In-Reply-To: <20181015115144.27626-1-bluca@debian.org>
References: <20181003162121.16364-1-bluca@debian.org>
<20181015115144.27626-1-bluca@debian.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-stable] patch 'net/nfp: fix RSS' has been queued to LTS
release 16.11.9
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.15
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>
X-List-Received-Date: Mon, 15 Oct 2018 11:52:06 -0000
Hi,
FYI, your patch has been queued to LTS release 16.11.9
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 10/17/18. 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. If the code is different (ie: not only metadata diffs), due for example to
a change in context or macro names, please double check it.
Thanks.
Luca Boccassi
---
>>From 3e9b054d36acb0a84cc2ce8f1f6b92a7c0fdee8a Mon Sep 17 00:00:00 2001
From: Alejandro Lucero <alejandro.lucero@netronome.com>
Date: Wed, 26 Sep 2018 14:45:50 +0100
Subject: [PATCH] net/nfp: fix RSS
[ upstream commit f14a51689894dc226f6af4ab39f7439e4384a06b ]
Three problems are fixed in this patch:
- RSS capabilities not advertised properly
- RSS configuration just done for some RSS types
- RSS hash match reported for just some RSS types
Fixes: 934e4c60fbff ("nfp: add RSS")
Signed-off-by: Alejandro Lucero <alejandro.lucero@netronome.com>
---
drivers/net/nfp/nfp_net.c | 32 ++++++++++++++++++++++++++------
1 file changed, 26 insertions(+), 6 deletions(-)
diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c
index 9548d58af4..e5f6a883f9 100644
--- a/drivers/net/nfp/nfp_net.c
+++ b/drivers/net/nfp/nfp_net.c
@@ -1629,6 +1629,18 @@ nfp_net_set_hash(struct nfp_net_rxq *rxq, struct nfp_net_rx_desc *rxd,
case NFP_NET_RSS_IPV6_EX:
mbuf->packet_type |= RTE_PTYPE_INNER_L3_IPV6_EXT;
break;
+ case NFP_NET_RSS_IPV4_TCP:
+ mbuf->packet_type |= RTE_PTYPE_INNER_L3_IPV6_EXT;
+ break;
+ case NFP_NET_RSS_IPV6_TCP:
+ mbuf->packet_type |= RTE_PTYPE_INNER_L3_IPV6_EXT;
+ break;
+ case NFP_NET_RSS_IPV4_UDP:
+ mbuf->packet_type |= RTE_PTYPE_INNER_L3_IPV6_EXT;
+ break;
+ case NFP_NET_RSS_IPV6_UDP:
+ mbuf->packet_type |= RTE_PTYPE_INNER_L3_IPV6_EXT;
+ break;
default:
mbuf->packet_type |= RTE_PTYPE_INNER_L4_MASK;
}
@@ -2222,14 +2234,22 @@ nfp_net_rss_hash_update(struct rte_eth_dev *dev,
}
if (rss_hf & ETH_RSS_IPV4)
- cfg_rss_ctrl |= NFP_NET_CFG_RSS_IPV4 |
- NFP_NET_CFG_RSS_IPV4_TCP |
- NFP_NET_CFG_RSS_IPV4_UDP;
+ cfg_rss_ctrl |= NFP_NET_CFG_RSS_IPV4;
+
+ if (rss_hf & ETH_RSS_NONFRAG_IPV4_TCP)
+ cfg_rss_ctrl |= NFP_NET_CFG_RSS_IPV4_TCP;
+
+ if (rss_hf & ETH_RSS_NONFRAG_IPV4_UDP)
+ cfg_rss_ctrl |= NFP_NET_CFG_RSS_IPV4_UDP;
if (rss_hf & ETH_RSS_IPV6)
- cfg_rss_ctrl |= NFP_NET_CFG_RSS_IPV6 |
- NFP_NET_CFG_RSS_IPV6_TCP |
- NFP_NET_CFG_RSS_IPV6_UDP;
+ cfg_rss_ctrl |= NFP_NET_CFG_RSS_IPV6;
+
+ if (rss_hf & ETH_RSS_NONFRAG_IPV6_TCP)
+ cfg_rss_ctrl |= NFP_NET_CFG_RSS_IPV6_TCP;
+
+ if (rss_hf & ETH_RSS_NONFRAG_IPV6_UDP)
+ cfg_rss_ctrl |= NFP_NET_CFG_RSS_IPV6_UDP;
cfg_rss_ctrl |= NFP_NET_CFG_RSS_MASK;
cfg_rss_ctrl |= NFP_NET_CFG_RSS_TOEPLITZ;
--
2.19.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2018-10-15 12:48:34.829469772 +0100
+++ 0009-net-nfp-fix-RSS.patch 2018-10-15 12:48:34.517096017 +0100
@@ -1,8 +1,10 @@
-From f14a51689894dc226f6af4ab39f7439e4384a06b Mon Sep 17 00:00:00 2001
+From 3e9b054d36acb0a84cc2ce8f1f6b92a7c0fdee8a Mon Sep 17 00:00:00 2001
From: Alejandro Lucero <alejandro.lucero@netronome.com>
Date: Wed, 26 Sep 2018 14:45:50 +0100
Subject: [PATCH] net/nfp: fix RSS
+[ upstream commit f14a51689894dc226f6af4ab39f7439e4384a06b ]
+
Three problems are fixed in this patch:
- RSS capabilities not advertised properly
@@ -10,30 +12,17 @@
- RSS hash match reported for just some RSS types
Fixes: 934e4c60fbff ("nfp: add RSS")
-Cc: stable@dpdk.org
Signed-off-by: Alejandro Lucero <alejandro.lucero@netronome.com>
---
- drivers/net/nfp/nfp_net.c | 36 +++++++++++++++++++++++++++++-------
- 1 file changed, 29 insertions(+), 7 deletions(-)
+ drivers/net/nfp/nfp_net.c | 32 ++++++++++++++++++++++++++------
+ 1 file changed, 26 insertions(+), 6 deletions(-)
diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c
-index 170b5d611f..4d6a797b01 100644
+index 9548d58af4..e5f6a883f9 100644
--- a/drivers/net/nfp/nfp_net.c
+++ b/drivers/net/nfp/nfp_net.c
-@@ -1198,8 +1198,10 @@ nfp_net_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
- .tx_rs_thresh = DEFAULT_TX_RSBIT_THRESH,
- };
-
-- dev_info->flow_type_rss_offloads = ETH_RSS_NONFRAG_IPV4_TCP |
-+ dev_info->flow_type_rss_offloads = ETH_RSS_IPV4 |
-+ ETH_RSS_NONFRAG_IPV4_TCP |
- ETH_RSS_NONFRAG_IPV4_UDP |
-+ ETH_RSS_IPV6 |
- ETH_RSS_NONFRAG_IPV6_TCP |
- ETH_RSS_NONFRAG_IPV6_UDP;
-
-@@ -1876,6 +1878,18 @@ nfp_net_set_hash(struct nfp_net_rxq *rxq, struct nfp_net_rx_desc *rxd,
+@@ -1629,6 +1629,18 @@ nfp_net_set_hash(struct nfp_net_rxq *rxq, struct nfp_net_rx_desc *rxd,
case NFP_NET_RSS_IPV6_EX:
mbuf->packet_type |= RTE_PTYPE_INNER_L3_IPV6_EXT;
break;
@@ -52,8 +41,8 @@
default:
mbuf->packet_type |= RTE_PTYPE_INNER_L4_MASK;
}
-@@ -2457,14 +2471,22 @@ nfp_net_rss_hash_write(struct rte_eth_dev *dev,
- rss_hf = rss_conf->rss_hf;
+@@ -2222,14 +2234,22 @@ nfp_net_rss_hash_update(struct rte_eth_dev *dev,
+ }
if (rss_hf & ETH_RSS_IPV4)
- cfg_rss_ctrl |= NFP_NET_CFG_RSS_IPV4 |