* [PATCH] net/bonding: fix slave device Rx/Tx offload configuration
@ 2022-10-28 2:36 Huisong Li
2022-11-01 2:34 ` humin (Q)
0 siblings, 1 reply; 3+ messages in thread
From: Huisong Li @ 2022-10-28 2:36 UTC (permalink / raw)
To: dev; +Cc: ferruh.yigit, andrew.rybchenko, liudongdong3, huangdaode, lihuisong
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")
Cc: stable@dpdk.org
Signed-off-by: Huisong Li <lihuisong@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 dc74852137..ca87490065 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -1741,20 +1741,11 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev,
slave_eth_dev->data->dev_conf.link_speeds =
bonded_eth_dev->data->dev_conf.link_speeds;
- 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;
nb_tx_queues = bonded_eth_dev->data->nb_tx_queues;
--
2.33.0
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] net/bonding: fix slave device Rx/Tx offload configuration
2022-10-28 2:36 [PATCH] net/bonding: fix slave device Rx/Tx offload configuration Huisong Li
@ 2022-11-01 2:34 ` humin (Q)
2022-11-06 9:45 ` Andrew Rybchenko
0 siblings, 1 reply; 3+ messages in thread
From: humin (Q) @ 2022-11-01 2:34 UTC (permalink / raw)
To: Huisong Li, dev; +Cc: ferruh.yigit, andrew.rybchenko, liudongdong3, huangdaode
Acked-by: Min Hu (Connor) <humin29@huawei.com>
在 2022/10/28 10:36, Huisong Li 写道:
> 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")
> Cc: stable@dpdk.org
>
> Signed-off-by: Huisong Li <lihuisong@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 dc74852137..ca87490065 100644
> --- a/drivers/net/bonding/rte_eth_bond_pmd.c
> +++ b/drivers/net/bonding/rte_eth_bond_pmd.c
> @@ -1741,20 +1741,11 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev,
> slave_eth_dev->data->dev_conf.link_speeds =
> bonded_eth_dev->data->dev_conf.link_speeds;
>
> - 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;
> nb_tx_queues = bonded_eth_dev->data->nb_tx_queues;
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] net/bonding: fix slave device Rx/Tx offload configuration
2022-11-01 2:34 ` humin (Q)
@ 2022-11-06 9:45 ` Andrew Rybchenko
0 siblings, 0 replies; 3+ messages in thread
From: Andrew Rybchenko @ 2022-11-06 9:45 UTC (permalink / raw)
To: humin (Q), Huisong Li, dev; +Cc: ferruh.yigit, liudongdong3, huangdaode
On 11/1/22 05:34, humin (Q) wrote:
> 在 2022/10/28 10:36, Huisong Li 写道:
>> 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")
>> Cc: stable@dpdk.org
>>
>> Signed-off-by: Huisong Li <lihuisong@huawei.com>
>
> Acked-by: Min Hu (Connor) <humin29@huawei.com>
Applied to dpdk-next-net/main, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-11-06 9:45 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-28 2:36 [PATCH] net/bonding: fix slave device Rx/Tx offload configuration Huisong Li
2022-11-01 2:34 ` humin (Q)
2022-11-06 9:45 ` Andrew Rybchenko
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).