From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id D777CA034C for ; Fri, 25 Feb 2022 18:16:02 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BD0F34114D; Fri, 25 Feb 2022 18:16:02 +0100 (CET) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id E1E284114A for ; Fri, 25 Feb 2022 18:16:00 +0100 (CET) Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id BD14D3F1BC for ; Fri, 25 Feb 2022 17:16:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1645809360; bh=m8kB8d7iVLv3tSiOhNRP9FupsznH6XDshiqkJah/zgA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=vY1Xvpzlh429CDwmLnHawGmLWD59aN8hZoT0a1rMuz89ZORb1zKKFah0KvUO33piE RY0HHm9F+j7pjGyXKkVFiQ4L7F3g7hteHDc1sbjk4mPOCX1CqzpCCGHIVCPc2gFRid PcwFZejQNvcUvegpVsNLFcldmmCEuM5FPPYp4sdyyKQ7d0dOJ/JcTwiLvfD5iWTP8i bAXzT76g4ebbkOXjGZrIGR1jyVkAy9eV7hIT25MrD6Zp+x2z6pqJvVh1geNfs7V2ca ox59SPNR5eoY30/iTPR1sbhq4TPlBvHeil2pYec/LUw9ByUVfjkKPIFTcOJ3V15nlB Udlagfu2CppGQ== Received: by mail-wm1-f71.google.com with SMTP id t2-20020a7bc3c2000000b003528fe59cb9so1600403wmj.5 for ; Fri, 25 Feb 2022 09:16:00 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=m8kB8d7iVLv3tSiOhNRP9FupsznH6XDshiqkJah/zgA=; b=yZ0sw07F/8dAFdNCBTrVCAcmuL5FHPqCzBMmmVSth5obQISsCIOR2YCLvWQApBza3L Q7t7v4H3xtUw+TjsXszMUpHoQ56RVW5ekkQUB/cXLxHZyRgyf2EYnHbFSwdrPzOhb1AW K0FsyvwesYMr2qhGZ390F+b1+0bJIxgRXUSuZDoJJUI3bp4RfBHqcASE7jfbr7nkKopW lwHFpNaixQmU+eFrNxnIZOtLdh0kOkxagouWnnlm6CbYSM1K0WtchIF9ukOtpUk9VBZH mZkrOWoX7K5HoRTlElh7m/huKzaJ37XCJ39c1Uq8QPpJ9n0nKiDLZddcBK9GyohwfFDR 01Cw== X-Gm-Message-State: AOAM533rnFLFu72pUku+aapYy+c74kdnXTI17eXt7wiYgsaQVNP0xpqW 5hVpWCFV4RveNiWanGoPlch1oS9V1RzGYl+e+T16AhWEjZcWROJh0s1wiyK04JvVApVon7UEoDq CNNil2VXH4dGnCbmltqFkycGK X-Received: by 2002:a05:600c:1d1f:b0:381:4146:bcd9 with SMTP id l31-20020a05600c1d1f00b003814146bcd9mr855507wms.69.1645809358315; Fri, 25 Feb 2022 09:15:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJyZtFLBJpGlWSg2JQI20t0IL+PiSRiNNyys740VM7ebigswyu1n1c/VwzqYLB7PIHOEduSnrw== X-Received: by 2002:a05:600c:1d1f:b0:381:4146:bcd9 with SMTP id l31-20020a05600c1d1f00b003814146bcd9mr855485wms.69.1645809358027; Fri, 25 Feb 2022 09:15:58 -0800 (PST) Received: from Keschdeichel.fritz.box (068-133-067-156.ip-addr.inexio.net. [156.67.133.68]) by smtp.gmail.com with ESMTPSA id n8-20020a5d6608000000b001e73a0f21ffsm2706698wru.6.2022.02.25.09.15.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 25 Feb 2022 09:15:57 -0800 (PST) From: christian.ehrhardt@canonical.com To: Huisong Li Cc: Min Hu , dpdk stable Subject: patch 'net/hns3: fix secondary process reference count' has been queued to stable release 19.11.12 Date: Fri, 25 Feb 2022 18:14:55 +0100 Message-Id: <20220225171550.3499040-2-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.35.0 In-Reply-To: <20220225171550.3499040-1-christian.ehrhardt@canonical.com> References: <20220225171550.3499040-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 19.11.12 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/27/22. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/98389f055c357c035fdcbb8f409a99bbfd824328 Thanks. Christian Ehrhardt --- >From 98389f055c357c035fdcbb8f409a99bbfd824328 Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Sat, 25 Dec 2021 18:53:42 +0800 Subject: [PATCH] net/hns3: fix secondary process reference count [ upstream commit 323263717774df318d8a6e64ac8bfe546e03b8f6 ] 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 Signed-off-by: Min Hu (Connor) --- 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.35.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-25 16:58:44.379511481 +0100 +++ 0002-net-hns3-fix-secondary-process-reference-count.patch 2022-02-25 16:58:44.176990357 +0100 @@ -1 +1 @@ -From 323263717774df318d8a6e64ac8bfe546e03b8f6 Mon Sep 17 00:00:00 2001 +From 98389f055c357c035fdcbb8f409a99bbfd824328 Mon Sep 17 00:00:00 2001 @@ -3 +3 @@ -Date: Tue, 2 Nov 2021 09:38:26 +0800 +Date: Sat, 25 Dec 2021 18:53:42 +0800 @@ -5,0 +6,2 @@ +[ upstream commit 323263717774df318d8a6e64ac8bfe546e03b8f6 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -19,4 +20,4 @@ - drivers/net/hns3/hns3_ethdev.c | 10 +++++++--- - drivers/net/hns3/hns3_ethdev_vf.c | 10 +++++++--- - drivers/net/hns3/hns3_mp.c | 4 +++- - 3 files changed, 17 insertions(+), 7 deletions(-) + 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(-) @@ -25 +26 @@ -index 03447c8d4a..dafaf31f65 100644 +index a2676f84b0..d245c5db8b 100644 @@ -28,6 +29,4 @@ -@@ -5850,8 +5850,10 @@ hns3_dev_close(struct rte_eth_dev *eth_dev) - struct hns3_hw *hw = &hns->hw; - int ret = 0; - -- if (rte_eal_process_type() != RTE_PROC_PRIMARY) -+ if (rte_eal_process_type() != RTE_PROC_PRIMARY) { +@@ -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; @@ -35,2 +34,2 @@ - return 0; -+ } + return; + } @@ -38,3 +37 @@ - if (hw->adapter_state == HNS3_NIC_STARTED) - ret = hns3_dev_stop(eth_dev); -@@ -7377,7 +7379,7 @@ hns3_dev_init(struct rte_eth_dev *eth_dev) +@@ -5437,8 +5438,7 @@ hns3_dev_init(struct rte_eth_dev *eth_dev) @@ -43,0 +41 @@ +- @@ -46 +43,0 @@ - hns3_tx_push_init(eth_dev); @@ -49,3 +45,0 @@ -@@ -7480,8 +7482,10 @@ hns3_dev_uninit(struct rte_eth_dev *eth_dev) - - PMD_INIT_FUNC_TRACE(); @@ -53,2 +47,4 @@ -- if (rte_eal_process_type() != RTE_PROC_PRIMARY) -+ if (rte_eal_process_type() != RTE_PROC_PRIMARY) { +@@ -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; @@ -57 +53 @@ -+ } + } @@ -59,2 +54,0 @@ - if (hw->adapter_state < HNS3_NIC_CLOSING) - hns3_dev_close(eth_dev); @@ -62 +56 @@ -index 4a0d73fc29..41d61a8160 100644 +index 790e76a0db..972a6f00e4 100644 @@ -65,3 +59 @@ -@@ -1893,8 +1893,10 @@ hns3vf_dev_close(struct rte_eth_dev *eth_dev) - struct hns3_hw *hw = &hns->hw; - int ret = 0; +@@ -1653,6 +1653,8 @@ hns3vf_dev_close(struct rte_eth_dev *eth_dev) @@ -69,2 +61,3 @@ -- if (rte_eal_process_type() != RTE_PROC_PRIMARY) -+ if (rte_eal_process_type() != RTE_PROC_PRIMARY) { + if (rte_eal_process_type() != RTE_PROC_PRIMARY) { + rte_free(eth_dev->process_private); ++ eth_dev->process_private = NULL; @@ -72,2 +65,2 @@ - return 0; -+ } + return; + } @@ -75,3 +68 @@ - if (hw->adapter_state == HNS3_NIC_STARTED) - ret = hns3vf_dev_stop(eth_dev); -@@ -2685,7 +2687,7 @@ hns3vf_dev_init(struct rte_eth_dev *eth_dev) +@@ -2291,8 +2293,7 @@ hns3vf_dev_init(struct rte_eth_dev *eth_dev) @@ -80,0 +72 @@ +- @@ -83 +74,0 @@ - hns3_tx_push_init(eth_dev); @@ -86 +76,0 @@ -@@ -2787,8 +2789,10 @@ hns3vf_dev_uninit(struct rte_eth_dev *eth_dev) @@ -88,4 +78,4 @@ - PMD_INIT_FUNC_TRACE(); - -- if (rte_eal_process_type() != RTE_PROC_PRIMARY) -+ if (rte_eal_process_type() != RTE_PROC_PRIMARY) { +@@ -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; @@ -94 +84 @@ -+ } + } @@ -96,2 +85,0 @@ - if (hw->adapter_state < HNS3_NIC_CLOSING) - hns3vf_dev_close(eth_dev); @@ -99 +87 @@ -index cd514ac29c..c28598a53a 100644 +index a03f2cf13c..9b5ff475a9 100644 @@ -102 +90 @@ -@@ -150,8 +150,10 @@ mp_req_on_rxtx(struct rte_eth_dev *dev, enum hns3_mp_req_type type) +@@ -132,7 +132,8 @@ mp_req_on_rxtx(struct rte_eth_dev *dev, enum hns3_mp_req_type type) @@ -110,2 +98 @@ -+ - if (!mp_req_type_is_valid(type)) { + if (type != HNS3_MP_REQ_START_RXTX && type != HNS3_MP_REQ_STOP_RXTX) { @@ -113 +99,0 @@ - dev->data->port_id, type);