[PATCH 19.11 4/4] net/hns3: unregister MP action on close for secondary

[Christian Ehrhardt]

On Sat, Dec 25, 2021 at 11:58 AM Huisong Li <lihuisong at huawei.com> wrote:
>
> [ upstream commit 443242212baeb67d298c54cc927553c92aa29bec ]
>

Thank you, queued for 19.11.12 (later this year)

> 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 at huawei.com>
> Signed-off-by: Min Hu (Connor) <humin29 at huawei.com>
> ---
>  drivers/net/hns3/hns3_ethdev.c    | 6 ++++--
>  drivers/net/hns3/hns3_ethdev_vf.c | 6 ++++--
>  drivers/net/hns3/hns3_mp.c        | 5 +----
>  drivers/net/hns3/hns3_mp.h        | 2 +-
>  4 files changed, 10 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
> index 122a2bc66c..df76dfce7f 100644
> --- a/drivers/net/hns3/hns3_ethdev.c
> +++ b/drivers/net/hns3/hns3_ethdev.c
> @@ -4750,6 +4750,7 @@ hns3_dev_close(struct rte_eth_dev *eth_dev)
>                 rte_free(eth_dev->process_private);
>                 eth_dev->process_private = NULL;
>                 __atomic_fetch_sub(&hw->secondary_cnt, 1, __ATOMIC_RELAXED);
> +               hns3_mp_uninit();
>                 return;
>         }
>
> @@ -4768,7 +4769,7 @@ hns3_dev_close(struct rte_eth_dev *eth_dev)
>         rte_free(hw->reset.wait_data);
>         rte_free(eth_dev->process_private);
>         eth_dev->process_private = NULL;
> -       hns3_mp_uninit_primary();
> +       hns3_mp_uninit();
>         hns3_warn(hw, "Close port %d finished", hw->data->port_id);
>  }
>
> @@ -5529,7 +5530,7 @@ hns3_dev_init(struct rte_eth_dev *eth_dev)
>         rte_free(hw->reset.wait_data);
>
>  err_init_reset:
> -       hns3_mp_uninit_primary();
> +       hns3_mp_uninit();
>
>  err_mp_init_primary:
>  err_mp_init_secondary:
> @@ -5554,6 +5555,7 @@ hns3_dev_uninit(struct rte_eth_dev *eth_dev)
>                 rte_free(eth_dev->process_private);
>                 eth_dev->process_private = NULL;
>                 __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 562f6f7662..dbd46cd278 100644
> --- a/drivers/net/hns3/hns3_ethdev_vf.c
> +++ b/drivers/net/hns3/hns3_ethdev_vf.c
> @@ -1655,6 +1655,7 @@ hns3vf_dev_close(struct rte_eth_dev *eth_dev)
>                 rte_free(eth_dev->process_private);
>                 eth_dev->process_private = NULL;
>                 __atomic_fetch_sub(&hw->secondary_cnt, 1, __ATOMIC_RELAXED);
> +               hns3_mp_uninit();
>                 return;
>      }
>
> @@ -1672,7 +1673,7 @@ hns3vf_dev_close(struct rte_eth_dev *eth_dev)
>         rte_free(hw->reset.wait_data);
>         rte_free(eth_dev->process_private);
>         eth_dev->process_private = NULL;
> -       hns3_mp_uninit_primary();
> +       hns3_mp_uninit();
>         hns3_warn(hw, "Close port %d finished", hw->data->port_id);
>  }
>
> @@ -2364,7 +2365,7 @@ hns3vf_dev_init(struct rte_eth_dev *eth_dev)
>         rte_free(hw->reset.wait_data);
>
>  err_init_reset:
> -       hns3_mp_uninit_primary();
> +       hns3_mp_uninit();
>
>  err_mp_init_primary:
>  err_mp_init_secondary:
> @@ -2390,6 +2391,7 @@ hns3vf_dev_uninit(struct rte_eth_dev *eth_dev)
>                 rte_free(eth_dev->process_private);
>                 eth_dev->process_private = NULL;
>                 __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 c7e49a798a..b017387efd 100644
> --- a/drivers/net/hns3/hns3_mp.c
> +++ b/drivers/net/hns3/hns3_mp.c
> @@ -213,10 +213,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 8ef432e763..ef334648ff 100644
> --- a/drivers/net/hns3/hns3_mp.h
> +++ b/drivers/net/hns3/hns3_mp.h
> @@ -15,7 +15,7 @@ extern struct hns3_process_local_data process_data;
>  void hns3_mp_req_start_rxtx(struct rte_eth_dev *dev);
>  void hns3_mp_req_stop_rxtx(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_ */
> --
> 2.33.0
>


-- 
Christian Ehrhardt
Staff Engineer, Ubuntu Server
Canonical Ltd