DPDK patches and discussions
 help / color / mirror / Atom feed
* [dpdk-dev] [PATCH 0/4] Fixes for txgbe
@ 2021-04-25  8:03 Jiawen Wu
  2021-04-25  8:03 ` [dpdk-dev] [PATCH 1/4] net/txgbe: fix RSS in double VALN Jiawen Wu
                   ` (3 more replies)
  0 siblings, 4 replies; 9+ messages in thread
From: Jiawen Wu @ 2021-04-25  8:03 UTC (permalink / raw)
  To: dev; +Cc: Jiawen Wu

Fix some bugs, remove redundant code, add copyright.

Jiawen Wu (4):
  net/txgbe: fix RSS in double VALN
  net/txgbe: fix VF MTU limit setting
  net/txgbe: remove port representor
  net/txgbe: add copyright owner

 doc/guides/nics/txgbe.rst             |  2 +-
 drivers/net/txgbe/base/meson.build    |  2 +-
 drivers/net/txgbe/base/txgbe.h        |  2 +-
 drivers/net/txgbe/base/txgbe_dcb.c    |  3 ++-
 drivers/net/txgbe/base/txgbe_dcb.h    |  3 ++-
 drivers/net/txgbe/base/txgbe_dcb_hw.c |  3 ++-
 drivers/net/txgbe/base/txgbe_dcb_hw.h |  3 ++-
 drivers/net/txgbe/base/txgbe_devids.h |  2 +-
 drivers/net/txgbe/base/txgbe_dummy.h  |  2 +-
 drivers/net/txgbe/base/txgbe_eeprom.c |  3 ++-
 drivers/net/txgbe/base/txgbe_eeprom.h |  3 ++-
 drivers/net/txgbe/base/txgbe_hw.c     |  3 ++-
 drivers/net/txgbe/base/txgbe_hw.h     |  3 ++-
 drivers/net/txgbe/base/txgbe_mbx.c    |  3 ++-
 drivers/net/txgbe/base/txgbe_mbx.h    |  3 ++-
 drivers/net/txgbe/base/txgbe_mng.c    |  3 ++-
 drivers/net/txgbe/base/txgbe_mng.h    |  3 ++-
 drivers/net/txgbe/base/txgbe_osdep.h  |  3 ++-
 drivers/net/txgbe/base/txgbe_phy.c    |  3 ++-
 drivers/net/txgbe/base/txgbe_phy.h    |  3 ++-
 drivers/net/txgbe/base/txgbe_regs.h   |  3 ++-
 drivers/net/txgbe/base/txgbe_status.h |  3 ++-
 drivers/net/txgbe/base/txgbe_type.h   |  3 ++-
 drivers/net/txgbe/base/txgbe_vf.c     |  3 ++-
 drivers/net/txgbe/base/txgbe_vf.h     |  3 ++-
 drivers/net/txgbe/meson.build         |  2 +-
 drivers/net/txgbe/rte_pmd_txgbe.h     |  3 ++-
 drivers/net/txgbe/txgbe_ethdev.c      | 36 ++++++---------------------
 drivers/net/txgbe/txgbe_ethdev.h      |  3 ++-
 drivers/net/txgbe/txgbe_ethdev_vf.c   | 15 ++++++-----
 drivers/net/txgbe/txgbe_fdir.c        |  3 ++-
 drivers/net/txgbe/txgbe_flow.c        |  3 ++-
 drivers/net/txgbe/txgbe_ipsec.c       |  3 ++-
 drivers/net/txgbe/txgbe_ipsec.h       |  3 ++-
 drivers/net/txgbe/txgbe_logs.h        |  3 ++-
 drivers/net/txgbe/txgbe_pf.c          |  3 ++-
 drivers/net/txgbe/txgbe_ptypes.c      |  2 +-
 drivers/net/txgbe/txgbe_ptypes.h      |  2 +-
 drivers/net/txgbe/txgbe_regs_group.h  |  3 ++-
 drivers/net/txgbe/txgbe_rxtx.c        |  3 ++-
 drivers/net/txgbe/txgbe_rxtx.h        |  3 ++-
 drivers/net/txgbe/txgbe_tm.c          |  3 ++-
 42 files changed, 89 insertions(+), 74 deletions(-)

-- 
2.21.0.windows.1




^ permalink raw reply	[flat|nested] 9+ messages in thread

* [dpdk-dev] [PATCH 1/4] net/txgbe: fix RSS in double VALN
  2021-04-25  8:03 [dpdk-dev] [PATCH 0/4] Fixes for txgbe Jiawen Wu
@ 2021-04-25  8:03 ` Jiawen Wu
  2021-04-27 16:42   ` [dpdk-dev] [dpdk-stable] " Ferruh Yigit
  2021-04-25  8:03 ` [dpdk-dev] [PATCH 2/4] net/txgbe: fix VF MTU limit setting Jiawen Wu
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 9+ messages in thread
From: Jiawen Wu @ 2021-04-25  8:03 UTC (permalink / raw)
  To: dev; +Cc: Jiawen Wu, stable

Regard QINQ as one case of extend VLAN, and always enable QINQ mode when
double VLAN is set, to avoid RSS does not work for QINQ packets.

Fixes: 220b0e49bc47 ("net/txgbe: support VLAN")
Cc: stable@dpdk.org

Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
---
 drivers/net/txgbe/txgbe_ethdev.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c
index 97796f040b..87c041c2ec 100644
--- a/drivers/net/txgbe/txgbe_ethdev.c
+++ b/drivers/net/txgbe/txgbe_ethdev.c
@@ -1217,17 +1217,12 @@ static void
 txgbe_vlan_hw_extend_enable(struct rte_eth_dev *dev)
 {
 	struct txgbe_hw *hw = TXGBE_DEV_HW(dev);
-	struct rte_eth_rxmode *rxmode = &dev->data->dev_conf.rxmode;
-	struct rte_eth_txmode *txmode = &dev->data->dev_conf.txmode;
 	uint32_t ctrl;
 
 	PMD_INIT_FUNC_TRACE();
 
 	ctrl  = rd32(hw, TXGBE_PORTCTL);
-	ctrl |= TXGBE_PORTCTL_VLANEXT;
-	if (rxmode->offloads & DEV_RX_OFFLOAD_QINQ_STRIP ||
-	    txmode->offloads & DEV_TX_OFFLOAD_QINQ_INSERT)
-		ctrl |= TXGBE_PORTCTL_QINQ;
+	ctrl |= TXGBE_PORTCTL_VLANEXT | TXGBE_PORTCTL_QINQ;
 	wr32(hw, TXGBE_PORTCTL, ctrl);
 }
 
@@ -1287,8 +1282,9 @@ txgbe_vlan_offload_config(struct rte_eth_dev *dev, int mask)
 			txgbe_vlan_hw_filter_disable(dev);
 	}
 
-	if (mask & ETH_VLAN_EXTEND_MASK) {
-		if (rxmode->offloads & DEV_RX_OFFLOAD_VLAN_EXTEND)
+	if (mask & (ETH_VLAN_EXTEND_MASK | ETH_QINQ_STRIP_MASK)) {
+		if (rxmode->offloads & DEV_RX_OFFLOAD_VLAN_EXTEND ||
+			rxmode->offloads & DEV_RX_OFFLOAD_QINQ_STRIP)
 			txgbe_vlan_hw_extend_enable(dev);
 		else
 			txgbe_vlan_hw_extend_disable(dev);
-- 
2.21.0.windows.1




^ permalink raw reply	[flat|nested] 9+ messages in thread

* [dpdk-dev] [PATCH 2/4] net/txgbe: fix VF MTU limit setting
  2021-04-25  8:03 [dpdk-dev] [PATCH 0/4] Fixes for txgbe Jiawen Wu
  2021-04-25  8:03 ` [dpdk-dev] [PATCH 1/4] net/txgbe: fix RSS in double VALN Jiawen Wu
@ 2021-04-25  8:03 ` Jiawen Wu
  2021-04-27 16:44   ` [dpdk-dev] [dpdk-stable] " Ferruh Yigit
  2021-04-25  8:03 ` [dpdk-dev] [PATCH 3/4] net/txgbe: remove port representor Jiawen Wu
  2021-04-25  8:03 ` [dpdk-dev] [PATCH 4/4] net/txgbe: add copyright owner Jiawen Wu
  3 siblings, 1 reply; 9+ messages in thread
From: Jiawen Wu @ 2021-04-25  8:03 UTC (permalink / raw)
  To: dev; +Cc: Jiawen Wu, stable

Fix to set MTU bigger than mbuf size when device is stopped, scattered
rx may be enabled in next starting, exempt from setting in EAL parameters.

Fixes: a2beaa4a769e ("net/txgbe: support VF MTU update")
Cc: stable@dpdk.org

Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
---
 drivers/net/txgbe/txgbe_ethdev_vf.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/drivers/net/txgbe/txgbe_ethdev_vf.c b/drivers/net/txgbe/txgbe_ethdev_vf.c
index 3a5123733e..5597968e18 100644
--- a/drivers/net/txgbe/txgbe_ethdev_vf.c
+++ b/drivers/net/txgbe/txgbe_ethdev_vf.c
@@ -1115,7 +1115,7 @@ txgbevf_dev_set_mtu(struct rte_eth_dev *dev, uint16_t mtu)
 {
 	struct txgbe_hw *hw;
 	uint32_t max_frame = mtu + RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN;
-	struct rte_eth_rxmode *rx_conf = &dev->data->dev_conf.rxmode;
+	struct rte_eth_dev_data *dev_data = dev->data;
 
 	hw = TXGBE_DEV_HW(dev);
 
@@ -1123,13 +1123,15 @@ txgbevf_dev_set_mtu(struct rte_eth_dev *dev, uint16_t mtu)
 			max_frame > RTE_ETHER_MAX_JUMBO_FRAME_LEN)
 		return -EINVAL;
 
-	/* refuse mtu that requires the support of scattered packets when this
-	 * feature has not been enabled before.
+	/* If device is started, refuse mtu that requires the support of
+	 * scattered packets when this feature has not been enabled before.
 	 */
-	if (!(rx_conf->offloads & DEV_RX_OFFLOAD_SCATTER) &&
+	if (dev_data->dev_started && !dev_data->scattered_rx &&
 	    (max_frame + 2 * TXGBE_VLAN_TAG_SIZE >
-	     dev->data->min_rx_buf_size - RTE_PKTMBUF_HEADROOM))
+	     dev->data->min_rx_buf_size - RTE_PKTMBUF_HEADROOM)) {
+		PMD_INIT_LOG(ERR, "Stop port first.");
 		return -EINVAL;
+	}
 
 	/*
 	 * When supported by the underlying PF driver, use the TXGBE_VF_SET_MTU
-- 
2.21.0.windows.1




^ permalink raw reply	[flat|nested] 9+ messages in thread

* [dpdk-dev] [PATCH 3/4] net/txgbe: remove port representor
  2021-04-25  8:03 [dpdk-dev] [PATCH 0/4] Fixes for txgbe Jiawen Wu
  2021-04-25  8:03 ` [dpdk-dev] [PATCH 1/4] net/txgbe: fix RSS in double VALN Jiawen Wu
  2021-04-25  8:03 ` [dpdk-dev] [PATCH 2/4] net/txgbe: fix VF MTU limit setting Jiawen Wu
@ 2021-04-25  8:03 ` Jiawen Wu
  2021-04-27 16:46   ` Ferruh Yigit
  2021-04-25  8:03 ` [dpdk-dev] [PATCH 4/4] net/txgbe: add copyright owner Jiawen Wu
  3 siblings, 1 reply; 9+ messages in thread
From: Jiawen Wu @ 2021-04-25  8:03 UTC (permalink / raw)
  To: dev; +Cc: Jiawen Wu

Remove port representor in device probe process.

Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
---
 drivers/net/txgbe/txgbe_ethdev.c | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c
index 87c041c2ec..afb25fb8a0 100644
--- a/drivers/net/txgbe/txgbe_ethdev.c
+++ b/drivers/net/txgbe/txgbe_ethdev.c
@@ -930,32 +930,15 @@ static int
 eth_txgbe_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
 		struct rte_pci_device *pci_dev)
 {
-	struct rte_eth_dev *pf_ethdev;
-	struct rte_eth_devargs eth_da;
 	int retval;
 
-	if (pci_dev->device.devargs) {
-		retval = rte_eth_devargs_parse(pci_dev->device.devargs->args,
-				&eth_da);
-		if (retval)
-			return retval;
-	} else {
-		memset(&eth_da, 0, sizeof(eth_da));
-	}
-
 	retval = rte_eth_dev_create(&pci_dev->device, pci_dev->device.name,
 			sizeof(struct txgbe_adapter),
 			eth_dev_pci_specific_init, pci_dev,
 			eth_txgbe_dev_init, NULL);
 
-	if (retval || eth_da.nb_representor_ports < 1)
+	if (retval)
 		return retval;
-	if (eth_da.type != RTE_ETH_REPRESENTOR_VF)
-		return -ENOTSUP;
-
-	pf_ethdev = rte_eth_dev_allocated(pci_dev->device.name);
-	if (pf_ethdev == NULL)
-		return -ENODEV;
 
 	return 0;
 }
@@ -966,7 +949,7 @@ static int eth_txgbe_pci_remove(struct rte_pci_device *pci_dev)
 
 	ethdev = rte_eth_dev_allocated(pci_dev->device.name);
 	if (!ethdev)
-		return -ENODEV;
+		return 0;
 
 	return rte_eth_dev_destroy(ethdev, eth_txgbe_dev_uninit);
 }
-- 
2.21.0.windows.1




^ permalink raw reply	[flat|nested] 9+ messages in thread

* [dpdk-dev] [PATCH 4/4] net/txgbe: add copyright owner
  2021-04-25  8:03 [dpdk-dev] [PATCH 0/4] Fixes for txgbe Jiawen Wu
                   ` (2 preceding siblings ...)
  2021-04-25  8:03 ` [dpdk-dev] [PATCH 3/4] net/txgbe: remove port representor Jiawen Wu
@ 2021-04-25  8:03 ` Jiawen Wu
  2021-04-27 16:50   ` Ferruh Yigit
  3 siblings, 1 reply; 9+ messages in thread
From: Jiawen Wu @ 2021-04-25  8:03 UTC (permalink / raw)
  To: dev; +Cc: Jiawen Wu

All rights reserved by Beijing Wangxun Technology Co., Ltd.
Part of the code references Intel.

Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
---
 doc/guides/nics/txgbe.rst             | 2 +-
 drivers/net/txgbe/base/meson.build    | 2 +-
 drivers/net/txgbe/base/txgbe.h        | 2 +-
 drivers/net/txgbe/base/txgbe_dcb.c    | 3 ++-
 drivers/net/txgbe/base/txgbe_dcb.h    | 3 ++-
 drivers/net/txgbe/base/txgbe_dcb_hw.c | 3 ++-
 drivers/net/txgbe/base/txgbe_dcb_hw.h | 3 ++-
 drivers/net/txgbe/base/txgbe_devids.h | 2 +-
 drivers/net/txgbe/base/txgbe_dummy.h  | 2 +-
 drivers/net/txgbe/base/txgbe_eeprom.c | 3 ++-
 drivers/net/txgbe/base/txgbe_eeprom.h | 3 ++-
 drivers/net/txgbe/base/txgbe_hw.c     | 3 ++-
 drivers/net/txgbe/base/txgbe_hw.h     | 3 ++-
 drivers/net/txgbe/base/txgbe_mbx.c    | 3 ++-
 drivers/net/txgbe/base/txgbe_mbx.h    | 3 ++-
 drivers/net/txgbe/base/txgbe_mng.c    | 3 ++-
 drivers/net/txgbe/base/txgbe_mng.h    | 3 ++-
 drivers/net/txgbe/base/txgbe_osdep.h  | 3 ++-
 drivers/net/txgbe/base/txgbe_phy.c    | 3 ++-
 drivers/net/txgbe/base/txgbe_phy.h    | 3 ++-
 drivers/net/txgbe/base/txgbe_regs.h   | 3 ++-
 drivers/net/txgbe/base/txgbe_status.h | 3 ++-
 drivers/net/txgbe/base/txgbe_type.h   | 3 ++-
 drivers/net/txgbe/base/txgbe_vf.c     | 3 ++-
 drivers/net/txgbe/base/txgbe_vf.h     | 3 ++-
 drivers/net/txgbe/meson.build         | 2 +-
 drivers/net/txgbe/rte_pmd_txgbe.h     | 3 ++-
 drivers/net/txgbe/txgbe_ethdev.c      | 3 ++-
 drivers/net/txgbe/txgbe_ethdev.h      | 3 ++-
 drivers/net/txgbe/txgbe_ethdev_vf.c   | 3 ++-
 drivers/net/txgbe/txgbe_fdir.c        | 3 ++-
 drivers/net/txgbe/txgbe_flow.c        | 3 ++-
 drivers/net/txgbe/txgbe_ipsec.c       | 3 ++-
 drivers/net/txgbe/txgbe_ipsec.h       | 3 ++-
 drivers/net/txgbe/txgbe_logs.h        | 3 ++-
 drivers/net/txgbe/txgbe_pf.c          | 3 ++-
 drivers/net/txgbe/txgbe_ptypes.c      | 2 +-
 drivers/net/txgbe/txgbe_ptypes.h      | 2 +-
 drivers/net/txgbe/txgbe_regs_group.h  | 3 ++-
 drivers/net/txgbe/txgbe_rxtx.c        | 3 ++-
 drivers/net/txgbe/txgbe_rxtx.h        | 3 ++-
 drivers/net/txgbe/txgbe_tm.c          | 3 ++-
 42 files changed, 76 insertions(+), 42 deletions(-)

diff --git a/doc/guides/nics/txgbe.rst b/doc/guides/nics/txgbe.rst
index 39a157eb87..2c2b6549f1 100644
--- a/doc/guides/nics/txgbe.rst
+++ b/doc/guides/nics/txgbe.rst
@@ -1,5 +1,5 @@
 ..  SPDX-License-Identifier: BSD-3-Clause
-    Copyright(c) 2015-2020.
+    Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd.
 
 TXGBE Poll Mode Driver
 ======================
diff --git a/drivers/net/txgbe/base/meson.build b/drivers/net/txgbe/base/meson.build
index 94db39ce2e..c6816b4279 100644
--- a/drivers/net/txgbe/base/meson.build
+++ b/drivers/net/txgbe/base/meson.build
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2015-2020
+# Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd.
 
 sources = [
         'txgbe_dcb_hw.c',
diff --git a/drivers/net/txgbe/base/txgbe.h b/drivers/net/txgbe/base/txgbe.h
index d7199512b8..673a299860 100644
--- a/drivers/net/txgbe/base/txgbe.h
+++ b/drivers/net/txgbe/base/txgbe.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2020
+ * Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd.
  */
 
 #ifndef _TXGBE_H_
diff --git a/drivers/net/txgbe/base/txgbe_dcb.c b/drivers/net/txgbe/base/txgbe_dcb.c
index 7e9a16cfe9..cb6fb76146 100644
--- a/drivers/net/txgbe/base/txgbe_dcb.c
+++ b/drivers/net/txgbe/base/txgbe_dcb.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2020
+ * Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd.
+ * Copyright(c) 2010-2017 Intel Corporation
  */
 
 #include "txgbe_type.h"
diff --git a/drivers/net/txgbe/base/txgbe_dcb.h b/drivers/net/txgbe/base/txgbe_dcb.h
index cd87cf305b..6aa575c30c 100644
--- a/drivers/net/txgbe/base/txgbe_dcb.h
+++ b/drivers/net/txgbe/base/txgbe_dcb.h
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2020
+ * Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd.
+ * Copyright(c) 2010-2017 Intel Corporation
  */
 
 #ifndef _TXGBE_DCB_H_
diff --git a/drivers/net/txgbe/base/txgbe_dcb_hw.c b/drivers/net/txgbe/base/txgbe_dcb_hw.c
index 42742d04f7..25273d2391 100644
--- a/drivers/net/txgbe/base/txgbe_dcb_hw.c
+++ b/drivers/net/txgbe/base/txgbe_dcb_hw.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2020
+ * Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd.
+ * Copyright(c) 2010-2017 Intel Corporation
  */
 
 #include "txgbe_type.h"
diff --git a/drivers/net/txgbe/base/txgbe_dcb_hw.h b/drivers/net/txgbe/base/txgbe_dcb_hw.h
index a365d596e3..ecdb38e1e8 100644
--- a/drivers/net/txgbe/base/txgbe_dcb_hw.h
+++ b/drivers/net/txgbe/base/txgbe_dcb_hw.h
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2020
+ * Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd.
+ * Copyright(c) 2010-2017 Intel Corporation
  */
 
 #ifndef _TXGBE_DCB_HW_H_
diff --git a/drivers/net/txgbe/base/txgbe_devids.h b/drivers/net/txgbe/base/txgbe_devids.h
index cb186170e6..a3f26eabf6 100644
--- a/drivers/net/txgbe/base/txgbe_devids.h
+++ b/drivers/net/txgbe/base/txgbe_devids.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2020
+ * Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd.
  */
 
 #ifndef _TXGBE_DEVIDS_H_
diff --git a/drivers/net/txgbe/base/txgbe_dummy.h b/drivers/net/txgbe/base/txgbe_dummy.h
index b62501d65c..dcabe66de1 100644
--- a/drivers/net/txgbe/base/txgbe_dummy.h
+++ b/drivers/net/txgbe/base/txgbe_dummy.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2020
+ * Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd.
  */
 
 #ifndef _TXGBE_TYPE_DUMMY_H_
diff --git a/drivers/net/txgbe/base/txgbe_eeprom.c b/drivers/net/txgbe/base/txgbe_eeprom.c
index bcbf3503c8..72901cd0b0 100644
--- a/drivers/net/txgbe/base/txgbe_eeprom.c
+++ b/drivers/net/txgbe/base/txgbe_eeprom.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2020
+ * Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd.
+ * Copyright(c) 2010-2017 Intel Corporation
  */
 
 #include "txgbe_hw.h"
diff --git a/drivers/net/txgbe/base/txgbe_eeprom.h b/drivers/net/txgbe/base/txgbe_eeprom.h
index 3a5d7c6215..0d89ca9ebf 100644
--- a/drivers/net/txgbe/base/txgbe_eeprom.h
+++ b/drivers/net/txgbe/base/txgbe_eeprom.h
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2020
+ * Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd.
+ * Copyright(c) 2010-2017 Intel Corporation
  */
 
 #ifndef _TXGBE_EEPROM_H_
diff --git a/drivers/net/txgbe/base/txgbe_hw.c b/drivers/net/txgbe/base/txgbe_hw.c
index 3e7f2f9a3f..00a8db78bf 100644
--- a/drivers/net/txgbe/base/txgbe_hw.c
+++ b/drivers/net/txgbe/base/txgbe_hw.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2020
+ * Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd.
+ * Copyright(c) 2010-2017 Intel Corporation
  */
 
 #include "txgbe_type.h"
diff --git a/drivers/net/txgbe/base/txgbe_hw.h b/drivers/net/txgbe/base/txgbe_hw.h
index a7473e7e5d..fd2f7d784c 100644
--- a/drivers/net/txgbe/base/txgbe_hw.h
+++ b/drivers/net/txgbe/base/txgbe_hw.h
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2020
+ * Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd.
+ * Copyright(c) 2010-2017 Intel Corporation
  */
 
 #ifndef _TXGBE_HW_H_
diff --git a/drivers/net/txgbe/base/txgbe_mbx.c b/drivers/net/txgbe/base/txgbe_mbx.c
index b308839e78..4d64c6c3e9 100644
--- a/drivers/net/txgbe/base/txgbe_mbx.c
+++ b/drivers/net/txgbe/base/txgbe_mbx.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2020
+ * Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd.
+ * Copyright(c) 2010-2017 Intel Corporation
  */
 
 #include "txgbe_type.h"
diff --git a/drivers/net/txgbe/base/txgbe_mbx.h b/drivers/net/txgbe/base/txgbe_mbx.h
index 786a355f7b..894ad6a2f7 100644
--- a/drivers/net/txgbe/base/txgbe_mbx.h
+++ b/drivers/net/txgbe/base/txgbe_mbx.h
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2020
+ * Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd.
+ * Copyright(c) 2010-2017 Intel Corporation
  */
 
 #ifndef _TXGBE_MBX_H_
diff --git a/drivers/net/txgbe/base/txgbe_mng.c b/drivers/net/txgbe/base/txgbe_mng.c
index 224e48f5e1..dbe512122c 100644
--- a/drivers/net/txgbe/base/txgbe_mng.c
+++ b/drivers/net/txgbe/base/txgbe_mng.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2020
+ * Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd.
+ * Copyright(c) 2010-2017 Intel Corporation
  */
 
 #include "txgbe_type.h"
diff --git a/drivers/net/txgbe/base/txgbe_mng.h b/drivers/net/txgbe/base/txgbe_mng.h
index 7514cc1e1e..1004f41c72 100644
--- a/drivers/net/txgbe/base/txgbe_mng.h
+++ b/drivers/net/txgbe/base/txgbe_mng.h
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2020
+ * Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd.
+ * Copyright(c) 2010-2017 Intel Corporation
  */
 
 #ifndef _TXGBE_MNG_H_
diff --git a/drivers/net/txgbe/base/txgbe_osdep.h b/drivers/net/txgbe/base/txgbe_osdep.h
index 074d7a3062..11fcf7e8fe 100644
--- a/drivers/net/txgbe/base/txgbe_osdep.h
+++ b/drivers/net/txgbe/base/txgbe_osdep.h
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2020
+ * Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd.
+ * Copyright(c) 2010-2017 Intel Corporation
  */
 
 #ifndef _TXGBE_OS_H_
diff --git a/drivers/net/txgbe/base/txgbe_phy.c b/drivers/net/txgbe/base/txgbe_phy.c
index dabc346f5f..3e9f507212 100644
--- a/drivers/net/txgbe/base/txgbe_phy.c
+++ b/drivers/net/txgbe/base/txgbe_phy.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2020
+ * Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd.
+ * Copyright(c) 2010-2017 Intel Corporation
  */
 
 #include "txgbe_hw.h"
diff --git a/drivers/net/txgbe/base/txgbe_phy.h b/drivers/net/txgbe/base/txgbe_phy.h
index 56531c4f87..5093d83b97 100644
--- a/drivers/net/txgbe/base/txgbe_phy.h
+++ b/drivers/net/txgbe/base/txgbe_phy.h
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2020
+ * Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd.
+ * Copyright(c) 2010-2017 Intel Corporation
  */
 
 #ifndef _TXGBE_PHY_H_
diff --git a/drivers/net/txgbe/base/txgbe_regs.h b/drivers/net/txgbe/base/txgbe_regs.h
index eb30c60a9e..990589b013 100644
--- a/drivers/net/txgbe/base/txgbe_regs.h
+++ b/drivers/net/txgbe/base/txgbe_regs.h
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2020
+ * Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd.
+ * Copyright(c) 2010-2017 Intel Corporation
  */
 
 #ifndef _TXGBE_REGS_H_
diff --git a/drivers/net/txgbe/base/txgbe_status.h b/drivers/net/txgbe/base/txgbe_status.h
index db5e521e45..5b022bf02d 100644
--- a/drivers/net/txgbe/base/txgbe_status.h
+++ b/drivers/net/txgbe/base/txgbe_status.h
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2020
+ * Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd.
+ * Copyright(c) 2010-2017 Intel Corporation
  */
 
 #ifndef _TXGBE_STATUS_H_
diff --git a/drivers/net/txgbe/base/txgbe_type.h b/drivers/net/txgbe/base/txgbe_type.h
index b69e7b85ba..823c6756e7 100644
--- a/drivers/net/txgbe/base/txgbe_type.h
+++ b/drivers/net/txgbe/base/txgbe_type.h
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2020
+ * Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd.
+ * Copyright(c) 2010-2017 Intel Corporation
  */
 
 #ifndef _TXGBE_TYPE_H_
diff --git a/drivers/net/txgbe/base/txgbe_vf.c b/drivers/net/txgbe/base/txgbe_vf.c
index 416c8964fc..fb6d6d90ea 100644
--- a/drivers/net/txgbe/base/txgbe_vf.c
+++ b/drivers/net/txgbe/base/txgbe_vf.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2020
+ * Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd.
+ * Copyright(c) 2010-2017 Intel Corporation
  */
 
 #include "txgbe_mbx.h"
diff --git a/drivers/net/txgbe/base/txgbe_vf.h b/drivers/net/txgbe/base/txgbe_vf.h
index 39714d1020..c3a90ab861 100644
--- a/drivers/net/txgbe/base/txgbe_vf.h
+++ b/drivers/net/txgbe/base/txgbe_vf.h
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2020
+ * Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd.
+ * Copyright(c) 2010-2017 Intel Corporation
  */
 
 #ifndef _TXGBE_VF_H_
diff --git a/drivers/net/txgbe/meson.build b/drivers/net/txgbe/meson.build
index 5fbbbd56f1..14729a6cf3 100644
--- a/drivers/net/txgbe/meson.build
+++ b/drivers/net/txgbe/meson.build
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: BSD-3-Clause
-# Copyright(c) 2015-2020
+# Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd.
 
 if is_windows
     build = false
diff --git a/drivers/net/txgbe/rte_pmd_txgbe.h b/drivers/net/txgbe/rte_pmd_txgbe.h
index 51a316f6f6..d222fc3537 100644
--- a/drivers/net/txgbe/rte_pmd_txgbe.h
+++ b/drivers/net/txgbe/rte_pmd_txgbe.h
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2020
+ * Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd.
+ * Copyright(c) 2010-2017 Intel Corporation
  */
 
 /**
diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c
index afb25fb8a0..19040ee8ee 100644
--- a/drivers/net/txgbe/txgbe_ethdev.c
+++ b/drivers/net/txgbe/txgbe_ethdev.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2020
+ * Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd.
+ * Copyright(c) 2010-2017 Intel Corporation
  */
 
 #include <stdio.h>
diff --git a/drivers/net/txgbe/txgbe_ethdev.h b/drivers/net/txgbe/txgbe_ethdev.h
index 8d46e6bb52..3021933965 100644
--- a/drivers/net/txgbe/txgbe_ethdev.h
+++ b/drivers/net/txgbe/txgbe_ethdev.h
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2020
+ * Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd.
+ * Copyright(c) 2010-2017 Intel Corporation
  */
 
 #ifndef _TXGBE_ETHDEV_H_
diff --git a/drivers/net/txgbe/txgbe_ethdev_vf.c b/drivers/net/txgbe/txgbe_ethdev_vf.c
index 5597968e18..6f577f4c80 100644
--- a/drivers/net/txgbe/txgbe_ethdev_vf.c
+++ b/drivers/net/txgbe/txgbe_ethdev_vf.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2020
+ * Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd.
+ * Copyright(c) 2010-2017 Intel Corporation
  */
 
 #include <sys/queue.h>
diff --git a/drivers/net/txgbe/txgbe_fdir.c b/drivers/net/txgbe/txgbe_fdir.c
index 6ddb023c09..c8ff4b142c 100644
--- a/drivers/net/txgbe/txgbe_fdir.c
+++ b/drivers/net/txgbe/txgbe_fdir.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2020
+ * Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd.
+ * Copyright(c) 2010-2017 Intel Corporation
  */
 
 #include <stdio.h>
diff --git a/drivers/net/txgbe/txgbe_flow.c b/drivers/net/txgbe/txgbe_flow.c
index 57a4f2e172..9a375adf45 100644
--- a/drivers/net/txgbe/txgbe_flow.c
+++ b/drivers/net/txgbe/txgbe_flow.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2020
+ * Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd.
+ * Copyright(c) 2010-2017 Intel Corporation
  */
 
 #include <sys/queue.h>
diff --git a/drivers/net/txgbe/txgbe_ipsec.c b/drivers/net/txgbe/txgbe_ipsec.c
index a43b95aa2b..ccd747973b 100644
--- a/drivers/net/txgbe/txgbe_ipsec.c
+++ b/drivers/net/txgbe/txgbe_ipsec.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2020
+ * Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd.
+ * Copyright(c) 2010-2017 Intel Corporation
  */
 
 #include <ethdev_pci.h>
diff --git a/drivers/net/txgbe/txgbe_ipsec.h b/drivers/net/txgbe/txgbe_ipsec.h
index 5edd6b5076..995e29eafa 100644
--- a/drivers/net/txgbe/txgbe_ipsec.h
+++ b/drivers/net/txgbe/txgbe_ipsec.h
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2020
+ * Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd.
+ * Copyright(c) 2010-2017 Intel Corporation
  */
 
 #ifndef TXGBE_IPSEC_H_
diff --git a/drivers/net/txgbe/txgbe_logs.h b/drivers/net/txgbe/txgbe_logs.h
index 6764466e21..67e9bfb3af 100644
--- a/drivers/net/txgbe/txgbe_logs.h
+++ b/drivers/net/txgbe/txgbe_logs.h
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2020
+ * Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd.
+ * Copyright(c) 2010-2017 Intel Corporation
  */
 
 #ifndef _TXGBE_LOGS_H_
diff --git a/drivers/net/txgbe/txgbe_pf.c b/drivers/net/txgbe/txgbe_pf.c
index e4bd990b96..494d779a3c 100644
--- a/drivers/net/txgbe/txgbe_pf.c
+++ b/drivers/net/txgbe/txgbe_pf.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2020
+ * Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd.
+ * Copyright(c) 2010-2017 Intel Corporation
  */
 
 #include <stdio.h>
diff --git a/drivers/net/txgbe/txgbe_ptypes.c b/drivers/net/txgbe/txgbe_ptypes.c
index 7009f20821..85241878a9 100644
--- a/drivers/net/txgbe/txgbe_ptypes.c
+++ b/drivers/net/txgbe/txgbe_ptypes.c
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2020
+ * Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd.
  */
 
 #include <rte_mbuf.h>
diff --git a/drivers/net/txgbe/txgbe_ptypes.h b/drivers/net/txgbe/txgbe_ptypes.h
index 6af4b0dedc..fa6c347d53 100644
--- a/drivers/net/txgbe/txgbe_ptypes.h
+++ b/drivers/net/txgbe/txgbe_ptypes.h
@@ -1,5 +1,5 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2020
+ * Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd.
  */
 
 #ifndef _TXGBE_PTYPE_H_
diff --git a/drivers/net/txgbe/txgbe_regs_group.h b/drivers/net/txgbe/txgbe_regs_group.h
index 6f8f0bc29f..a967eca3c6 100644
--- a/drivers/net/txgbe/txgbe_regs_group.h
+++ b/drivers/net/txgbe/txgbe_regs_group.h
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2020
+ * Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd.
+ * Copyright(c) 2010-2017 Intel Corporation
  */
 
 #ifndef _TXGBE_REGS_GROUP_H_
diff --git a/drivers/net/txgbe/txgbe_rxtx.c b/drivers/net/txgbe/txgbe_rxtx.c
index a70bf0b9c6..53977c2e5e 100644
--- a/drivers/net/txgbe/txgbe_rxtx.c
+++ b/drivers/net/txgbe/txgbe_rxtx.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2020
+ * Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd.
+ * Copyright(c) 2010-2017 Intel Corporation
  */
 
 #include <sys/queue.h>
diff --git a/drivers/net/txgbe/txgbe_rxtx.h b/drivers/net/txgbe/txgbe_rxtx.h
index 203bdeb882..b96f58a3f8 100644
--- a/drivers/net/txgbe/txgbe_rxtx.h
+++ b/drivers/net/txgbe/txgbe_rxtx.h
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2020
+ * Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd.
+ * Copyright(c) 2010-2017 Intel Corporation
  */
 
 #ifndef _TXGBE_RXTX_H_
diff --git a/drivers/net/txgbe/txgbe_tm.c b/drivers/net/txgbe/txgbe_tm.c
index b8edd78bf2..3abe3959eb 100644
--- a/drivers/net/txgbe/txgbe_tm.c
+++ b/drivers/net/txgbe/txgbe_tm.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2015-2020
+ * Copyright(c) 2015-2020 Beijing WangXun Technology Co., Ltd.
+ * Copyright(c) 2010-2017 Intel Corporation
  */
 
 #include <rte_malloc.h>
-- 
2.21.0.windows.1




^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [dpdk-dev] [dpdk-stable] [PATCH 1/4] net/txgbe: fix RSS in double VALN
  2021-04-25  8:03 ` [dpdk-dev] [PATCH 1/4] net/txgbe: fix RSS in double VALN Jiawen Wu
@ 2021-04-27 16:42   ` Ferruh Yigit
  0 siblings, 0 replies; 9+ messages in thread
From: Ferruh Yigit @ 2021-04-27 16:42 UTC (permalink / raw)
  To: Jiawen Wu, dev; +Cc: stable

On 4/25/2021 9:03 AM, Jiawen Wu wrote:
> Regard QINQ as one case of extend VLAN, and always enable QINQ mode when
> double VLAN is set, to avoid RSS does not work for QINQ packets.
> 

It is hard to understand above paragraph, can you please reword it?

Also in the patch title s/VALN/VLAN

VLAN_EXTEND mainly comes from ixgbe, it is different than QinQ, which one does
your device supports?

> Fixes: 220b0e49bc47 ("net/txgbe: support VLAN")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
> ---
>  drivers/net/txgbe/txgbe_ethdev.c | 12 ++++--------
>  1 file changed, 4 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c
> index 97796f040b..87c041c2ec 100644
> --- a/drivers/net/txgbe/txgbe_ethdev.c
> +++ b/drivers/net/txgbe/txgbe_ethdev.c
> @@ -1217,17 +1217,12 @@ static void
>  txgbe_vlan_hw_extend_enable(struct rte_eth_dev *dev)
>  {
>  	struct txgbe_hw *hw = TXGBE_DEV_HW(dev);
> -	struct rte_eth_rxmode *rxmode = &dev->data->dev_conf.rxmode;
> -	struct rte_eth_txmode *txmode = &dev->data->dev_conf.txmode;
>  	uint32_t ctrl;
>  
>  	PMD_INIT_FUNC_TRACE();
>  
>  	ctrl  = rd32(hw, TXGBE_PORTCTL);
> -	ctrl |= TXGBE_PORTCTL_VLANEXT;
> -	if (rxmode->offloads & DEV_RX_OFFLOAD_QINQ_STRIP ||
> -	    txmode->offloads & DEV_TX_OFFLOAD_QINQ_INSERT)
> -		ctrl |= TXGBE_PORTCTL_QINQ;
> +	ctrl |= TXGBE_PORTCTL_VLANEXT | TXGBE_PORTCTL_QINQ;
>  	wr32(hw, TXGBE_PORTCTL, ctrl);
>  }
>  
> @@ -1287,8 +1282,9 @@ txgbe_vlan_offload_config(struct rte_eth_dev *dev, int mask)
>  			txgbe_vlan_hw_filter_disable(dev);
>  	}
>  
> -	if (mask & ETH_VLAN_EXTEND_MASK) {
> -		if (rxmode->offloads & DEV_RX_OFFLOAD_VLAN_EXTEND)
> +	if (mask & (ETH_VLAN_EXTEND_MASK | ETH_QINQ_STRIP_MASK)) {
> +		if (rxmode->offloads & DEV_RX_OFFLOAD_VLAN_EXTEND ||
> +			rxmode->offloads & DEV_RX_OFFLOAD_QINQ_STRIP)
>  			txgbe_vlan_hw_extend_enable(dev);
>  		else
>  			txgbe_vlan_hw_extend_disable(dev);
> 


^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [dpdk-dev] [dpdk-stable] [PATCH 2/4] net/txgbe: fix VF MTU limit setting
  2021-04-25  8:03 ` [dpdk-dev] [PATCH 2/4] net/txgbe: fix VF MTU limit setting Jiawen Wu
@ 2021-04-27 16:44   ` Ferruh Yigit
  0 siblings, 0 replies; 9+ messages in thread
From: Ferruh Yigit @ 2021-04-27 16:44 UTC (permalink / raw)
  To: Jiawen Wu, dev; +Cc: stable

On 4/25/2021 9:03 AM, Jiawen Wu wrote:
> Fix to set MTU bigger than mbuf size when device is stopped, scattered
> rx may be enabled in next starting, exempt from setting in EAL parameters.
> 

The main change is 'dev_started' check, right? Can you please reword above
paragraph to clarify it?

> Fixes: a2beaa4a769e ("net/txgbe: support VF MTU update")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
> ---
>  drivers/net/txgbe/txgbe_ethdev_vf.c | 12 +++++++-----
>  1 file changed, 7 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/net/txgbe/txgbe_ethdev_vf.c b/drivers/net/txgbe/txgbe_ethdev_vf.c
> index 3a5123733e..5597968e18 100644
> --- a/drivers/net/txgbe/txgbe_ethdev_vf.c
> +++ b/drivers/net/txgbe/txgbe_ethdev_vf.c
> @@ -1115,7 +1115,7 @@ txgbevf_dev_set_mtu(struct rte_eth_dev *dev, uint16_t mtu)
>  {
>  	struct txgbe_hw *hw;
>  	uint32_t max_frame = mtu + RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN;
> -	struct rte_eth_rxmode *rx_conf = &dev->data->dev_conf.rxmode;
> +	struct rte_eth_dev_data *dev_data = dev->data;
>  
>  	hw = TXGBE_DEV_HW(dev);
>  
> @@ -1123,13 +1123,15 @@ txgbevf_dev_set_mtu(struct rte_eth_dev *dev, uint16_t mtu)
>  			max_frame > RTE_ETHER_MAX_JUMBO_FRAME_LEN)
>  		return -EINVAL;
>  
> -	/* refuse mtu that requires the support of scattered packets when this
> -	 * feature has not been enabled before.
> +	/* If device is started, refuse mtu that requires the support of
> +	 * scattered packets when this feature has not been enabled before.
>  	 */
> -	if (!(rx_conf->offloads & DEV_RX_OFFLOAD_SCATTER) &&
> +	if (dev_data->dev_started && !dev_data->scattered_rx &&
>  	    (max_frame + 2 * TXGBE_VLAN_TAG_SIZE >
> -	     dev->data->min_rx_buf_size - RTE_PKTMBUF_HEADROOM))
> +	     dev->data->min_rx_buf_size - RTE_PKTMBUF_HEADROOM)) {
> +		PMD_INIT_LOG(ERR, "Stop port first.");
>  		return -EINVAL;
> +	}
>  
>  	/*
>  	 * When supported by the underlying PF driver, use the TXGBE_VF_SET_MTU
> 


^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [dpdk-dev] [PATCH 3/4] net/txgbe: remove port representor
  2021-04-25  8:03 ` [dpdk-dev] [PATCH 3/4] net/txgbe: remove port representor Jiawen Wu
@ 2021-04-27 16:46   ` Ferruh Yigit
  0 siblings, 0 replies; 9+ messages in thread
From: Ferruh Yigit @ 2021-04-27 16:46 UTC (permalink / raw)
  To: Jiawen Wu, dev

On 4/25/2021 9:03 AM, Jiawen Wu wrote:
> Remove port representor in device probe process.
> 

It can be good to highlight that is because port representor is not supported by
the driver.

> Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>
> ---
>  drivers/net/txgbe/txgbe_ethdev.c | 21 ++-------------------
>  1 file changed, 2 insertions(+), 19 deletions(-)
> 
> diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c
> index 87c041c2ec..afb25fb8a0 100644
> --- a/drivers/net/txgbe/txgbe_ethdev.c
> +++ b/drivers/net/txgbe/txgbe_ethdev.c
> @@ -930,32 +930,15 @@ static int
>  eth_txgbe_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
>  		struct rte_pci_device *pci_dev)
>  {
> -	struct rte_eth_dev *pf_ethdev;
> -	struct rte_eth_devargs eth_da;
>  	int retval;
>  
> -	if (pci_dev->device.devargs) {
> -		retval = rte_eth_devargs_parse(pci_dev->device.devargs->args,
> -				&eth_da);
> -		if (retval)
> -			return retval;
> -	} else {
> -		memset(&eth_da, 0, sizeof(eth_da));
> -	}
> -
>  	retval = rte_eth_dev_create(&pci_dev->device, pci_dev->device.name,
>  			sizeof(struct txgbe_adapter),
>  			eth_dev_pci_specific_init, pci_dev,
>  			eth_txgbe_dev_init, NULL);
>  
> -	if (retval || eth_da.nb_representor_ports < 1)
> +	if (retval)
>  		return retval;
> -	if (eth_da.type != RTE_ETH_REPRESENTOR_VF)
> -		return -ENOTSUP;
> -
> -	pf_ethdev = rte_eth_dev_allocated(pci_dev->device.name);
> -	if (pf_ethdev == NULL)
> -		return -ENODEV;
>  

After patch it becomes:

if (retval)
	return retval;
return 0;

Why not just "return retval"? Or even can eliminate the 'retval' variable.


>  	return 0;
>  }
> @@ -966,7 +949,7 @@ static int eth_txgbe_pci_remove(struct rte_pci_device *pci_dev)
>  
>  	ethdev = rte_eth_dev_allocated(pci_dev->device.name);
>  	if (!ethdev)
> -		return -ENODEV;
> +		return 0;
>  
>  	return rte_eth_dev_destroy(ethdev, eth_txgbe_dev_uninit);
>  }
> 


^ permalink raw reply	[flat|nested] 9+ messages in thread

* Re: [dpdk-dev] [PATCH 4/4] net/txgbe: add copyright owner
  2021-04-25  8:03 ` [dpdk-dev] [PATCH 4/4] net/txgbe: add copyright owner Jiawen Wu
@ 2021-04-27 16:50   ` Ferruh Yigit
  0 siblings, 0 replies; 9+ messages in thread
From: Ferruh Yigit @ 2021-04-27 16:50 UTC (permalink / raw)
  To: Jiawen Wu, dev

On 4/25/2021 9:03 AM, Jiawen Wu wrote:
> All rights reserved by Beijing Wangxun Technology Co., Ltd.
> Part of the code references Intel.
> 
> Signed-off-by: Jiawen Wu <jiawenwu@trustnetic.com>

Looks good to me, thanks for the update.


^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2021-04-27 16:50 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-25  8:03 [dpdk-dev] [PATCH 0/4] Fixes for txgbe Jiawen Wu
2021-04-25  8:03 ` [dpdk-dev] [PATCH 1/4] net/txgbe: fix RSS in double VALN Jiawen Wu
2021-04-27 16:42   ` [dpdk-dev] [dpdk-stable] " Ferruh Yigit
2021-04-25  8:03 ` [dpdk-dev] [PATCH 2/4] net/txgbe: fix VF MTU limit setting Jiawen Wu
2021-04-27 16:44   ` [dpdk-dev] [dpdk-stable] " Ferruh Yigit
2021-04-25  8:03 ` [dpdk-dev] [PATCH 3/4] net/txgbe: remove port representor Jiawen Wu
2021-04-27 16:46   ` Ferruh Yigit
2021-04-25  8:03 ` [dpdk-dev] [PATCH 4/4] net/txgbe: add copyright owner Jiawen Wu
2021-04-27 16:50   ` Ferruh Yigit

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).