patches for DPDK stable branches
 help / color / mirror / Atom feed
* patch 'net/bonding: fix slave device Rx/Tx offload configuration' has been queued to stable release 21.11.3
@ 2022-11-23 18:03 Kevin Traynor
  2022-11-23 18:03 ` patch 'app/testpmd: fix MAC header in checksum forward engine' " Kevin Traynor
                   ` (58 more replies)
  0 siblings, 59 replies; 60+ messages in thread
From: Kevin Traynor @ 2022-11-23 18:03 UTC (permalink / raw)
  To: Huisong Li; +Cc: Min Hu, dpdk stable

Hi,

FYI, your patch has been queued to stable release 21.11.3

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 11/28/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/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/8bdb61a66fb9c9e8f93722939fec63c7f593299f

Thanks.

Kevin

---
From 8bdb61a66fb9c9e8f93722939fec63c7f593299f Mon Sep 17 00:00:00 2001
From: Huisong Li <lihuisong@huawei.com>
Date: Fri, 28 Oct 2022 10:36:46 +0800
Subject: [PATCH] net/bonding: fix slave device Rx/Tx offload configuration

[ upstream commit b5145667785e8954077c593480ddfb2bdd708eac ]

Normally, the Rx/Tx offload capability of bonding interface is
the intersection of the capability of all slave devices. And
Rx/Tx offloads configuration of slave device comes from bonding
interface. But now there is a risk that slave device retains its
previous offload configurations which is not within the offload
configurations of bond interface.

Fixes: 57b156540f51 ("net/bonding: fix offloading configuration")

Signed-off-by: Huisong Li <lihuisong@huawei.com>
Acked-by: Min Hu (Connor) <humin29@huawei.com>
---
 drivers/net/bonding/rte_eth_bond_pmd.c | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
index 707c22a7a4..c25fa9df24 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -1719,18 +1719,9 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev,
 			bonded_eth_dev->data->dev_conf.rxmode.mtu;
 
-	slave_eth_dev->data->dev_conf.txmode.offloads |=
-		bonded_eth_dev->data->dev_conf.txmode.offloads;
-
-	slave_eth_dev->data->dev_conf.txmode.offloads &=
-		(bonded_eth_dev->data->dev_conf.txmode.offloads |
-		~internals->tx_offload_capa);
-
-	slave_eth_dev->data->dev_conf.rxmode.offloads |=
-		bonded_eth_dev->data->dev_conf.rxmode.offloads;
-
-	slave_eth_dev->data->dev_conf.rxmode.offloads &=
-		(bonded_eth_dev->data->dev_conf.rxmode.offloads |
-		~internals->rx_offload_capa);
+	slave_eth_dev->data->dev_conf.txmode.offloads =
+			bonded_eth_dev->data->dev_conf.txmode.offloads;
 
+	slave_eth_dev->data->dev_conf.rxmode.offloads =
+			bonded_eth_dev->data->dev_conf.rxmode.offloads;
 
 	nb_rx_queues = bonded_eth_dev->data->nb_rx_queues;
-- 
2.38.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-11-23 09:55:57.146163339 +0000
+++ 0001-net-bonding-fix-slave-device-Rx-Tx-offload-configura.patch	2022-11-23 09:55:56.983149090 +0000
@@ -1 +1 @@
-From b5145667785e8954077c593480ddfb2bdd708eac Mon Sep 17 00:00:00 2001
+From 8bdb61a66fb9c9e8f93722939fec63c7f593299f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit b5145667785e8954077c593480ddfb2bdd708eac ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -23 +24 @@
-index e0da1fa7c9..006e13838a 100644
+index 707c22a7a4..c25fa9df24 100644
@@ -26,2 +27,2 @@
-@@ -1742,18 +1742,9 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev,
- 			bonded_eth_dev->data->dev_conf.link_speeds;
+@@ -1719,18 +1719,9 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev,
+ 			bonded_eth_dev->data->dev_conf.rxmode.mtu;


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

end of thread, other threads:[~2022-11-23 18:05 UTC | newest]

Thread overview: 60+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-23 18:03 patch 'net/bonding: fix slave device Rx/Tx offload configuration' has been queued to stable release 21.11.3 Kevin Traynor
2022-11-23 18:03 ` patch 'app/testpmd: fix MAC header in checksum forward engine' " Kevin Traynor
2022-11-23 18:03 ` patch 'net/bonding: fix dropping valid MAC packets' " Kevin Traynor
2022-11-23 18:03 ` patch 'app/testpmd: make quit flag volatile' " Kevin Traynor
2022-11-23 18:03 ` patch 'net/bonding: fix mbuf fast free handling' " Kevin Traynor
2022-11-23 18:03 ` patch 'eal: fix doxygen comments for UUID' " Kevin Traynor
2022-11-23 18:03 ` patch 'power: fix some doxygen comments' " Kevin Traynor
2022-11-23 18:03 ` patch 'hash: fix RCU configuration memory leak' " Kevin Traynor
2022-11-23 18:03 ` patch 'test/hash: remove dead code in extendable bucket test' " Kevin Traynor
2022-11-23 18:03 ` patch 'test/hash: fix bulk lookup check' " Kevin Traynor
2022-11-23 18:03 ` patch 'bus/auxiliary: prevent device from being probed again' " Kevin Traynor
2022-11-23 18:03 ` patch 'net/mlx5: fix action flag data type' " Kevin Traynor
2022-11-23 18:03 ` patch 'common/mlx5: fix shared mempool subscription' " Kevin Traynor
2022-11-23 18:03 ` patch 'net/mlx5: fix shared Rx queue config reuse' " Kevin Traynor
2022-11-23 18:03 ` patch 'net/mlx5: fix hairpin split with set VLAN VID action' " Kevin Traynor
2022-11-23 18:03 ` patch 'net/mlx5: fix first segment inline length' " Kevin Traynor
2022-11-23 18:03 ` patch 'net/mlx5: fix indexed pool local cache crash' " Kevin Traynor
2022-11-23 18:03 ` patch 'net/mlx5: fix port initialization with small LRO' " Kevin Traynor
2022-11-23 18:03 ` patch 'net/mlx5: fix drop action validation' " Kevin Traynor
2022-11-23 18:03 ` patch 'net/ice/base: fix duplicate flow rules' " Kevin Traynor
2022-11-23 18:03 ` patch 'net/iavf: fix VLAN offload' " Kevin Traynor
2022-11-23 18:03 ` patch 'net/i40e: fix pctype configuration for X722' " Kevin Traynor
2022-11-23 18:03 ` patch 'net/ice: fix scalar Rx path segment' " Kevin Traynor
2022-11-23 18:03 ` patch 'net/ice: fix scalar Tx " Kevin Traynor
2022-11-23 18:03 ` patch 'net/ice: fix interrupt handler unregister' " Kevin Traynor
2022-11-23 18:03 ` patch 'ci: bump versions of actions in GHA' " Kevin Traynor
2022-11-23 18:03 ` patch 'ci: update to new API for step outputs " Kevin Traynor
2022-11-23 18:03 ` patch 'doc: fix event timer adapter guide' " Kevin Traynor
2022-11-23 18:03 ` patch 'event/cnxk: fix mbuf offset calculation' " Kevin Traynor
2022-11-23 18:03 ` patch 'app/eventdev: fix limits in error message' " Kevin Traynor
2022-11-23 18:03 ` patch 'event/cnxk: fix missing mempool cookie marking' " Kevin Traynor
2022-11-23 18:03 ` patch 'examples/fips_validation: fix typo in error log' " Kevin Traynor
2022-11-23 18:03 ` patch 'mempool/cnxk: fix destroying empty pool' " Kevin Traynor
2022-11-23 18:03 ` patch 'doc: fix application name in procinfo guide' " Kevin Traynor
2022-11-23 18:03 ` patch 'doc: document device dump " Kevin Traynor
2022-11-23 18:03 ` patch 'test/crypto: fix bitwise operator in a SNOW3G case' " Kevin Traynor
2022-11-23 18:03 ` patch 'doc: fix typo depreciated instead of deprecated' " Kevin Traynor
2022-11-23 18:03 ` patch 'drivers: fix typos found by Lintian' " Kevin Traynor
2022-11-23 18:03 ` patch 'ring: fix description' " Kevin Traynor
2022-11-23 18:03 ` patch 'ring: remove leftover comment about watermark' " Kevin Traynor
2022-11-23 18:03 ` patch 'vdpa/ifc: handle data path update failure' " Kevin Traynor
2022-11-23 18:03 ` patch 'service: fix build with clang 15' " Kevin Traynor
2022-11-23 18:03 ` patch 'vhost: " Kevin Traynor
2022-11-23 18:03 ` patch 'bus/dpaa: " Kevin Traynor
2022-11-23 18:03 ` patch 'net/atlantic: " Kevin Traynor
2022-11-23 18:03 ` patch 'net/dpaa2: " Kevin Traynor
2022-11-23 18:04 ` patch 'app/testpmd: " Kevin Traynor
2022-11-23 18:04 ` patch 'app/testpmd: fix build with clang 15 in flow code' " Kevin Traynor
2022-11-23 18:04 ` patch 'test/efd: fix build with clang 15' " Kevin Traynor
2022-11-23 18:04 ` patch 'test/member: " Kevin Traynor
2022-11-23 18:04 ` patch 'test/event: " Kevin Traynor
2022-11-23 18:04 ` patch 'net/ixgbevf: fix promiscuous and allmulti' " Kevin Traynor
2022-11-23 18:04 ` patch 'net/mlx5: fix maximum LRO message size' " Kevin Traynor
2022-11-23 18:04 ` patch 'doc: add LRO size limitation in mlx5 guide' " Kevin Traynor
2022-11-23 18:04 ` patch 'doc: fix underlines in testpmd " Kevin Traynor
2022-11-23 18:04 ` patch 'doc: fix colons in testpmd aged flow rules' " Kevin Traynor
2022-11-23 18:04 ` patch 'net/nfp: fix Rx descriptor DMA address' " Kevin Traynor
2022-11-23 18:04 ` patch 'drivers: remove unused build variable' " Kevin Traynor
2022-11-23 18:04 ` patch 'doc: fix maximum packet size of virtio driver' " Kevin Traynor
2022-11-23 18:04 ` patch 'doc: avoid meson deprecation in setup' " Kevin Traynor

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).