[dpdk-stable] patch 'net/hns3: fix queue offload capability' has been queued to stable release 19.11.6

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.6

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/30/20. 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.

Thanks.

Luca Boccassi

---
>From facb61edd4157bc718534cf5ed5c4d2e3603a7d8 Mon Sep 17 00:00:00 2001
From: "Wei Hu (Xavier)" <xavier.huwei at huawei.com>
Date: Tue, 8 Sep 2020 20:28:07 +0800
Subject: [PATCH] net/hns3: fix queue offload capability

[ upstream commit c533b0ef1375724acd8625e2d5205475d472855c ]

Currently, offload capabilities are only enabled for all Rx/Tx queues in
hns3 PF/VF PMD driver, and offload capability only applied in a Rx/Tx
queue is not supported.
So this patch moves 'DEV_TX_OFFLOAD_MBUF_FAST_FREE' from
tx_queue_offload_capa to tx_offload_capa.

Fixes: 1f5ca0b460cd ("net/hns3: support some device operations")
Fixes: a5475d61fa34 ("net/hns3: support VF")

Signed-off-by: Huisong Li <lihuisong at huawei.com>
Signed-off-by: Wei Hu (Xavier) <xavier.huwei at huawei.com>
---
 drivers/net/hns3/hns3_ethdev.c    | 3 +--
 drivers/net/hns3/hns3_ethdev_vf.c | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index cd828202ee..27c89abfab 100644
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -2468,7 +2468,6 @@ hns3_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info)
 				 DEV_RX_OFFLOAD_VLAN_FILTER |
 				 DEV_RX_OFFLOAD_JUMBO_FRAME |
 				 DEV_RX_OFFLOAD_RSS_HASH);
-	info->tx_queue_offload_capa = DEV_TX_OFFLOAD_MBUF_FAST_FREE;
 	info->tx_offload_capa = (DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM |
 				 DEV_TX_OFFLOAD_IPV4_CKSUM |
 				 DEV_TX_OFFLOAD_TCP_CKSUM |
@@ -2477,7 +2476,7 @@ hns3_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info)
 				 DEV_TX_OFFLOAD_VLAN_INSERT |
 				 DEV_TX_OFFLOAD_QINQ_INSERT |
 				 DEV_TX_OFFLOAD_MULTI_SEGS |
-				 info->tx_queue_offload_capa);
+				 DEV_TX_OFFLOAD_MBUF_FAST_FREE);
 
 	info->rx_desc_lim = (struct rte_eth_desc_lim) {
 		.nb_max = HNS3_MAX_RING_DESC,
diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c
index 7acc679e9b..e30e9f65c4 100644
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -805,7 +805,6 @@ hns3vf_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info)
 				 DEV_RX_OFFLOAD_VLAN_FILTER |
 				 DEV_RX_OFFLOAD_JUMBO_FRAME |
 				 DEV_RX_OFFLOAD_RSS_HASH);
-	info->tx_queue_offload_capa = DEV_TX_OFFLOAD_MBUF_FAST_FREE;
 	info->tx_offload_capa = (DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM |
 				 DEV_TX_OFFLOAD_IPV4_CKSUM |
 				 DEV_TX_OFFLOAD_TCP_CKSUM |
@@ -814,7 +813,7 @@ hns3vf_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info)
 				 DEV_TX_OFFLOAD_VLAN_INSERT |
 				 DEV_TX_OFFLOAD_QINQ_INSERT |
 				 DEV_TX_OFFLOAD_MULTI_SEGS |
-				 info->tx_queue_offload_capa);
+				 DEV_TX_OFFLOAD_MBUF_FAST_FREE);
 
 	info->rx_desc_lim = (struct rte_eth_desc_lim) {
 		.nb_max = HNS3_MAX_RING_DESC,
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-10-28 10:35:13.007153387 +0000
+++ 0039-net-hns3-fix-queue-offload-capability.patch	2020-10-28 10:35:11.496829906 +0000
@@ -1,8 +1,10 @@
-From c533b0ef1375724acd8625e2d5205475d472855c Mon Sep 17 00:00:00 2001
+From facb61edd4157bc718534cf5ed5c4d2e3603a7d8 Mon Sep 17 00:00:00 2001
 From: "Wei Hu (Xavier)" <xavier.huwei at huawei.com>
 Date: Tue, 8 Sep 2020 20:28:07 +0800
 Subject: [PATCH] net/hns3: fix queue offload capability
 
+[ upstream commit c533b0ef1375724acd8625e2d5205475d472855c ]
+
 Currently, offload capabilities are only enabled for all Rx/Tx queues in
 hns3 PF/VF PMD driver, and offload capability only applied in a Rx/Tx
 queue is not supported.
@@ -11,7 +13,6 @@
 
 Fixes: 1f5ca0b460cd ("net/hns3: support some device operations")
 Fixes: a5475d61fa34 ("net/hns3: support VF")
-Cc: stable at dpdk.org
 
 Signed-off-by: Huisong Li <lihuisong at huawei.com>
 Signed-off-by: Wei Hu (Xavier) <xavier.huwei at huawei.com>
@@ -21,47 +22,47 @@
  2 files changed, 2 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
-index 9dd0d9cbf1..b6ae69ff1f 100644
+index cd828202ee..27c89abfab 100644
 --- a/drivers/net/hns3/hns3_ethdev.c
 +++ b/drivers/net/hns3/hns3_ethdev.c
-@@ -2472,7 +2472,6 @@ hns3_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info)
+@@ -2468,7 +2468,6 @@ hns3_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info)
+ 				 DEV_RX_OFFLOAD_VLAN_FILTER |
  				 DEV_RX_OFFLOAD_JUMBO_FRAME |
- 				 DEV_RX_OFFLOAD_RSS_HASH |
- 				 DEV_RX_OFFLOAD_TCP_LRO);
+ 				 DEV_RX_OFFLOAD_RSS_HASH);
 -	info->tx_queue_offload_capa = DEV_TX_OFFLOAD_MBUF_FAST_FREE;
  	info->tx_offload_capa = (DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM |
  				 DEV_TX_OFFLOAD_IPV4_CKSUM |
  				 DEV_TX_OFFLOAD_TCP_CKSUM |
-@@ -2483,7 +2482,7 @@ hns3_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info)
- 				 DEV_TX_OFFLOAD_VXLAN_TNL_TSO |
- 				 DEV_TX_OFFLOAD_GRE_TNL_TSO |
- 				 DEV_TX_OFFLOAD_GENEVE_TNL_TSO |
--				 info->tx_queue_offload_capa |
-+				 DEV_TX_OFFLOAD_MBUF_FAST_FREE |
- 				 hns3_txvlan_cap_get(hw));
+@@ -2477,7 +2476,7 @@ hns3_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info)
+ 				 DEV_TX_OFFLOAD_VLAN_INSERT |
+ 				 DEV_TX_OFFLOAD_QINQ_INSERT |
+ 				 DEV_TX_OFFLOAD_MULTI_SEGS |
+-				 info->tx_queue_offload_capa);
++				 DEV_TX_OFFLOAD_MBUF_FAST_FREE);
  
  	info->rx_desc_lim = (struct rte_eth_desc_lim) {
+ 		.nb_max = HNS3_MAX_RING_DESC,
 diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c
-index 1d8eef78ed..bea3695ce2 100644
+index 7acc679e9b..e30e9f65c4 100644
 --- a/drivers/net/hns3/hns3_ethdev_vf.c
 +++ b/drivers/net/hns3/hns3_ethdev_vf.c
-@@ -915,7 +915,6 @@ hns3vf_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info)
+@@ -805,7 +805,6 @@ hns3vf_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info)
+ 				 DEV_RX_OFFLOAD_VLAN_FILTER |
  				 DEV_RX_OFFLOAD_JUMBO_FRAME |
- 				 DEV_RX_OFFLOAD_RSS_HASH |
- 				 DEV_RX_OFFLOAD_TCP_LRO);
+ 				 DEV_RX_OFFLOAD_RSS_HASH);
 -	info->tx_queue_offload_capa = DEV_TX_OFFLOAD_MBUF_FAST_FREE;
  	info->tx_offload_capa = (DEV_TX_OFFLOAD_OUTER_IPV4_CKSUM |
  				 DEV_TX_OFFLOAD_IPV4_CKSUM |
  				 DEV_TX_OFFLOAD_TCP_CKSUM |
-@@ -926,7 +925,7 @@ hns3vf_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info)
- 				 DEV_TX_OFFLOAD_VXLAN_TNL_TSO |
- 				 DEV_TX_OFFLOAD_GRE_TNL_TSO |
- 				 DEV_TX_OFFLOAD_GENEVE_TNL_TSO |
--				 info->tx_queue_offload_capa |
-+				 DEV_TX_OFFLOAD_MBUF_FAST_FREE |
- 				 hns3_txvlan_cap_get(hw));
+@@ -814,7 +813,7 @@ hns3vf_dev_infos_get(struct rte_eth_dev *eth_dev, struct rte_eth_dev_info *info)
+ 				 DEV_TX_OFFLOAD_VLAN_INSERT |
+ 				 DEV_TX_OFFLOAD_QINQ_INSERT |
+ 				 DEV_TX_OFFLOAD_MULTI_SEGS |
+-				 info->tx_queue_offload_capa);
++				 DEV_TX_OFFLOAD_MBUF_FAST_FREE);
  
  	info->rx_desc_lim = (struct rte_eth_desc_lim) {
+ 		.nb_max = HNS3_MAX_RING_DESC,
 -- 
 2.20.1