7d8194517a
Sync some patches for hns3 PMD, telemetry and testpmd. And main modifications are as follows: - backport some bugfixes for hns3 - revert Tx performance optimization for hns3 - add Rx/Tx descriptor dump feature for hns3 - refactor some RSS commands for testpmd - add ethdev telemetry private dump - add dmadev telemetry - sync telemetry lib Signed-off-by: Huisong Li <lihuisong@huawei.com> (cherry picked from commit 4f06d27eff9aa99c2e2073ac74328893990ed8ed)
61 lines
2.2 KiB
Diff
61 lines
2.2 KiB
Diff
From 7ec0325f9c2bfe2ea961e66588f8ba9e22bb6483 Mon Sep 17 00:00:00 2001
|
|
From: Yunjian Wang <wangyunjian@huawei.com>
|
|
Date: Fri, 21 Oct 2022 15:36:47 +0800
|
|
Subject: [PATCH 171/189] net/bonding: fix double slave link status query
|
|
|
|
When link status polling mode is used, the slave link status is
|
|
queried twice, which may be inconsistent. To fix this, we can keep
|
|
the latest queried link state.
|
|
|
|
Fixes: a45b288ef21a ("bond: support link status polling")
|
|
Cc: stable@dpdk.org
|
|
|
|
Signed-off-by: Yunjian Wang <wangyunjian@huawei.com>
|
|
Acked-by: Min Hu (Connor) <humin29@huawei.com>
|
|
---
|
|
drivers/net/bonding/rte_eth_bond_pmd.c | 7 +++----
|
|
1 file changed, 3 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
|
|
index 828fb5f96d..3be2b08128 100644
|
|
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
|
|
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
|
|
@@ -2400,9 +2400,6 @@ bond_ethdev_slave_link_status_change_monitor(void *cb_arg)
|
|
* event callback */
|
|
if (slave_ethdev->data->dev_link.link_status !=
|
|
internals->slaves[i].last_link_status) {
|
|
- internals->slaves[i].last_link_status =
|
|
- slave_ethdev->data->dev_link.link_status;
|
|
-
|
|
bond_ethdev_lsc_event_callback(internals->slaves[i].port_id,
|
|
RTE_ETH_EVENT_INTR_LSC,
|
|
&bonded_ethdev->data->port_id,
|
|
@@ -2901,7 +2898,7 @@ bond_ethdev_lsc_event_callback(uint16_t port_id, enum rte_eth_event_type type,
|
|
|
|
uint8_t lsc_flag = 0;
|
|
int valid_slave = 0;
|
|
- uint16_t active_pos;
|
|
+ uint16_t active_pos, slave_idx;
|
|
uint16_t i;
|
|
|
|
if (type != RTE_ETH_EVENT_INTR_LSC || param == NULL)
|
|
@@ -2922,6 +2919,7 @@ bond_ethdev_lsc_event_callback(uint16_t port_id, enum rte_eth_event_type type,
|
|
for (i = 0; i < internals->slave_count; i++) {
|
|
if (internals->slaves[i].port_id == port_id) {
|
|
valid_slave = 1;
|
|
+ slave_idx = i;
|
|
break;
|
|
}
|
|
}
|
|
@@ -3010,6 +3008,7 @@ bond_ethdev_lsc_event_callback(uint16_t port_id, enum rte_eth_event_type type,
|
|
* slaves
|
|
*/
|
|
bond_ethdev_link_update(bonded_eth_dev, 0);
|
|
+ internals->slaves[slave_idx].last_link_status = link.link_status;
|
|
|
|
if (lsc_flag) {
|
|
/* Cancel any possible outstanding interrupts if delays are enabled */
|
|
--
|
|
2.23.0
|
|
|