net/hns3: unregister MP action on close for secondary

This patch fixes lack of unregistering MP action for secondary process
when PMD is closed.

Fixes: 9570b1fdbdad ("net/hns3: check multi-process action register result")
Fixes: 23d4b61fee5d ("net/hns3: support multiple process")

Signed-off-by: Huisong Li <lihuisong@huawei.com>
Signed-off-by: Min Hu (Connor) <humin29@huawei.com>

diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
index 874854d..88abbb8 100644 (file)
--- a/drivers/net/hns3/hns3_ethdev.c
+++ b/drivers/net/hns3/hns3_ethdev.c
@@ -5852,6 +5852,7 @@ hns3_dev_close(struct rte_eth_dev *eth_dev)
 
        if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
                __atomic_fetch_sub(&hw->secondary_cnt, 1, __ATOMIC_RELAXED);
+               hns3_mp_uninit();
                return 0;
        }
 
@@ -5868,7 +5869,7 @@ hns3_dev_close(struct rte_eth_dev *eth_dev)
        hns3_uninit_pf(eth_dev);
        hns3_free_all_queues(eth_dev);
        rte_free(hw->reset.wait_data);
-       hns3_mp_uninit_primary();
+       hns3_mp_uninit();
        hns3_warn(hw, "Close port %u finished", hw->data->port_id);
 
        return ret;
@@ -7463,7 +7464,7 @@ err_init_pf:
        rte_free(hw->reset.wait_data);
 
 err_init_reset:
-       hns3_mp_uninit_primary();
+       hns3_mp_uninit();
 
 err_mp_init_primary:
 err_mp_init_secondary:
@@ -7486,6 +7487,7 @@ hns3_dev_uninit(struct rte_eth_dev *eth_dev)
 
        if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
                __atomic_fetch_sub(&hw->secondary_cnt, 1, __ATOMIC_RELAXED);
+               hns3_mp_uninit();
                return 0;
        }
 

diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c
index 91acd1f..f7f615b 100644 (file)
--- a/drivers/net/hns3/hns3_ethdev_vf.c
+++ b/drivers/net/hns3/hns3_ethdev_vf.c
@@ -1895,6 +1895,7 @@ hns3vf_dev_close(struct rte_eth_dev *eth_dev)
 
        if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
                __atomic_fetch_sub(&hw->secondary_cnt, 1, __ATOMIC_RELAXED);
+               hns3_mp_uninit();
                return 0;
        }
 
@@ -1910,7 +1911,7 @@ hns3vf_dev_close(struct rte_eth_dev *eth_dev)
        hns3vf_uninit_vf(eth_dev);
        hns3_free_all_queues(eth_dev);
        rte_free(hw->reset.wait_data);
-       hns3_mp_uninit_primary();
+       hns3_mp_uninit();
        hns3_warn(hw, "Close port %u finished", hw->data->port_id);
 
        return ret;
@@ -2769,7 +2770,7 @@ err_init_vf:
        rte_free(hw->reset.wait_data);
 
 err_init_reset:
-       hns3_mp_uninit_primary();
+       hns3_mp_uninit();
 
 err_mp_init_primary:
 err_mp_init_secondary:
@@ -2793,6 +2794,7 @@ hns3vf_dev_uninit(struct rte_eth_dev *eth_dev)
 
        if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
                __atomic_fetch_sub(&hw->secondary_cnt, 1, __ATOMIC_RELAXED);
+               hns3_mp_uninit();
                return 0;
        }
 

diff --git a/drivers/net/hns3/hns3_mp.c b/drivers/net/hns3/hns3_mp.c
index 1a79d24..6d33bf4 100644 (file)
--- a/drivers/net/hns3/hns3_mp.c
+++ b/drivers/net/hns3/hns3_mp.c
@@ -244,10 +244,7 @@ int hns3_mp_init_primary(void)
        return 0;
 }
 
-/*
- * Un-initialize by primary process.
- */
-void hns3_mp_uninit_primary(void)
+void hns3_mp_uninit(void)
 {
        process_data.eth_dev_cnt--;
 

diff --git a/drivers/net/hns3/hns3_mp.h b/drivers/net/hns3/hns3_mp.h
index b49532f..5738ab7 100644 (file)
--- a/drivers/net/hns3/hns3_mp.h
+++ b/drivers/net/hns3/hns3_mp.h
@@ -18,7 +18,7 @@ void hns3_mp_req_start_tx(struct rte_eth_dev *dev);
 void hns3_mp_req_stop_tx(struct rte_eth_dev *dev);
 
 int hns3_mp_init_primary(void);
-void hns3_mp_uninit_primary(void);
+void hns3_mp_uninit(void);
 int hns3_mp_init_secondary(void);
 
 #endif /* _HNS3_MP_H_ */