[PATCH 19.11 2/4] net/hns3: fix secondary process reference count

[Christian Ehrhardt]

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

Thank you, queued for 19.11.12 (later this year)

> The "secondary_cnt" will be increased when a secondary process
> initialized. But the value of this variable is not decreased when the
> secondary process exits, which causes the primary process senses that
> the secondary process still exists. As a result, the primary process
> fails to send messages to the secondary process after the secondary
> process exits.
>
> 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    | 5 +++--
>  drivers/net/hns3/hns3_ethdev_vf.c | 6 ++++--
>  drivers/net/hns3/hns3_mp.c        | 3 ++-
>  3 files changed, 9 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c
> index a2676f84b0..d245c5db8b 100644
> --- a/drivers/net/hns3/hns3_ethdev.c
> +++ b/drivers/net/hns3/hns3_ethdev.c
> @@ -4749,6 +4749,7 @@ hns3_dev_close(struct rte_eth_dev *eth_dev)
>         if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
>                 rte_free(eth_dev->process_private);
>                 eth_dev->process_private = NULL;
> +               __atomic_fetch_sub(&hw->secondary_cnt, 1, __ATOMIC_RELAXED);
>                 return;
>         }
>
> @@ -5437,8 +5438,7 @@ hns3_dev_init(struct rte_eth_dev *eth_dev)
>                                      "process, ret = %d", ret);
>                         goto err_mp_init_secondary;
>                 }
> -
> -               hw->secondary_cnt++;
> +               __atomic_fetch_add(&hw->secondary_cnt, 1, __ATOMIC_RELAXED);
>                 return 0;
>         }
>
> @@ -5551,6 +5551,7 @@ hns3_dev_uninit(struct rte_eth_dev *eth_dev)
>         if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
>                 rte_free(eth_dev->process_private);
>                 eth_dev->process_private = NULL;
> +               __atomic_fetch_sub(&hw->secondary_cnt, 1, __ATOMIC_RELAXED);
>                 return 0;
>         }
>
> diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c
> index 790e76a0db..972a6f00e4 100644
> --- a/drivers/net/hns3/hns3_ethdev_vf.c
> +++ b/drivers/net/hns3/hns3_ethdev_vf.c
> @@ -1653,6 +1653,8 @@ hns3vf_dev_close(struct rte_eth_dev *eth_dev)
>
>         if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
>                 rte_free(eth_dev->process_private);
> +               eth_dev->process_private = NULL;
> +               __atomic_fetch_sub(&hw->secondary_cnt, 1, __ATOMIC_RELAXED);
>                 return;
>      }
>
> @@ -2291,8 +2293,7 @@ hns3vf_dev_init(struct rte_eth_dev *eth_dev)
>                                           "process, ret = %d", ret);
>                         goto err_mp_init_secondary;
>                 }
> -
> -               hw->secondary_cnt++;
> +               __atomic_fetch_add(&hw->secondary_cnt, 1, __ATOMIC_RELAXED);
>                 return 0;
>         }
>
> @@ -2386,6 +2387,7 @@ hns3vf_dev_uninit(struct rte_eth_dev *eth_dev)
>         if (rte_eal_process_type() != RTE_PROC_PRIMARY) {
>                 rte_free(eth_dev->process_private);
>                 eth_dev->process_private = NULL;
> +               __atomic_fetch_sub(&hw->secondary_cnt, 1, __ATOMIC_RELAXED);
>                 return 0;
>         }
>
> diff --git a/drivers/net/hns3/hns3_mp.c b/drivers/net/hns3/hns3_mp.c
> index a03f2cf13c..9b5ff475a9 100644
> --- a/drivers/net/hns3/hns3_mp.c
> +++ b/drivers/net/hns3/hns3_mp.c
> @@ -132,7 +132,8 @@ mp_req_on_rxtx(struct rte_eth_dev *dev, enum hns3_mp_req_type type)
>         int ret;
>         int i;
>
> -       if (rte_eal_process_type() == RTE_PROC_SECONDARY || !hw->secondary_cnt)
> +       if (rte_eal_process_type() == RTE_PROC_SECONDARY ||
> +               __atomic_load_n(&hw->secondary_cnt, __ATOMIC_RELAXED) == 0)
>                 return;
>         if (type != HNS3_MP_REQ_START_RXTX && type != HNS3_MP_REQ_STOP_RXTX) {
>                 hns3_err(hw, "port %u unknown request (req_type %d)",
> --
> 2.33.0
>


-- 
Christian Ehrhardt
Staff Engineer, Ubuntu Server
Canonical Ltd