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 2B468A034F for ; Wed, 10 Nov 2021 07:57:10 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0EC1240142; Wed, 10 Nov 2021 07:57:10 +0100 (CET) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam08on2076.outbound.protection.outlook.com [40.107.102.76]) by mails.dpdk.org (Postfix) with ESMTP id 0D3BC41102 for ; Wed, 10 Nov 2021 07:57:08 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OMeBJbuPasESCC/jTLsDa4821VAuP38vv8K5cI6MGFHe27Gc20uZihZjy/LQwlqLZU8bCUIb9I1dRWGhsJelAO02URNbshQ3ijb/EHFCJjr7le8dXVnTITkT6CYzkYGedTucFFSkXb7joyqTIyP8BbWCaSHqE953rTyaxJ+K4YNym5UpCRu0dYA6SEqxs6wCuydFloZyEenxwp8ptZJ3DXoRdXmyfiyPwARMA8rcz2MtGryjxJd9T4pPL83aJHRMiT4/+revP2BevmS3qCFtrn1pkMtDrqWRvk7qDc2AHxWLnCpelFG8BY4ROv7EZZ02mXz7T0DuKxlh/7kEsPX0gw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=RfFq0wj25FK0OiKRQawkWky4NrZil/n6DHMzNPkFSvA=; b=RYuK4270lvDfKnz5bPfzYZkoTDs8ejJ57/35600ZQcGzqFykzoFpxgtjGoiaD2wCFsaTwLMcgRwQtBI2gKxVJcxEiKdIDCSSHPFfe36vdUEmtu+b2L7niLwV3b3TJVjYGPCFGOQ2sEEzM972cvzoOsgEo1IZLktKD7RFlhVW0/CoBLE/8DLQg3r49TpCGEDnD/B0FA9EaJKG5F45Nnv/ioL0O+8S1GUzGLEL6pGSoUpl7txG3dtQ1dHnMIj0PGpc2YvVMVNyYJ3j5yf4gaB9Rv34laOoirM6AfZ91dxOZVs1MdU2YA6WyS7TFbyFWAnrjXnbPPB4biTUqnw607MYtQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=huawei.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=RfFq0wj25FK0OiKRQawkWky4NrZil/n6DHMzNPkFSvA=; b=O+eDxvPiFSJObZOtHtSrk1c8ES+ZQBmdVI6FQTKFIj3+1Qu7NOx9A92W1G01c5dJszj3XZTEyzC+SenE0w9CPGtdiVExbHGC5HocLV9zCOg4OBq8BwaYy7Klq30BlhoLuD3qzPzbMt9nh09nVe2EDe/LD3oJSZ2DvGmnHDJdVOApiyVveF3R1fB57x//S6HIRdGuYNh+d+DXxmmjy3BhsoPn9t6xdnnTkRTIt6eAJ/dRWTz/ACJ8U3JGHBFUZ781BbmboFTJctf3rj8inJPD9hgPpT1/oB84Dp2ZQmjww4CZrdf4N+EA0bvmCY/5RuBslpfLu8ezm6V2h+XJ62FTnQ== Received: from DM6PR02CA0079.namprd02.prod.outlook.com (2603:10b6:5:1f4::20) by BN6PR1201MB0019.namprd12.prod.outlook.com (2603:10b6:405:4d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.16; Wed, 10 Nov 2021 06:57:06 +0000 Received: from DM6NAM11FT057.eop-nam11.prod.protection.outlook.com (2603:10b6:5:1f4:cafe::ea) by DM6PR02CA0079.outlook.office365.com (2603:10b6:5:1f4::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.15 via Frontend Transport; Wed, 10 Nov 2021 06:57:06 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT057.mail.protection.outlook.com (10.13.172.252) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4669.10 via Frontend Transport; Wed, 10 Nov 2021 06:57:05 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 10 Nov 2021 06:57:01 +0000 From: Xueming Li To: Huisong Li CC: Luca Boccassi , Min Hu , dpdk stable Date: Wed, 10 Nov 2021 14:31:48 +0800 Message-ID: <20211110063216.2744012-225-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211110063216.2744012-1-xuemingl@nvidia.com> References: <20211110063216.2744012-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fd2d8e8e-ed87-44c3-4c31-08d9a4174e62 X-MS-TrafficTypeDiagnostic: BN6PR1201MB0019: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6790; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 37xjWv4uz7oUtqnQvqpqeT+kpVfMkBPXKOQ7Na2cBvoixbsK40zlTW2u3Q6EYXlBxVFXHFSI2vTXclaMKl2BzeUvVk+uU8eosC465hvcWHzHPbyhv61nnp+QQ3GI6qDFuQApXC3Y3UP8GxU9BuuqKRu9TlMChGZcDBXKQR9+wW4vq5SXO3Pxl4+31NXseIQ99NyAFP67/w0VF8sIvL8O7t1PUjb/wb42m9O2tDqxM+XBhhTKzD7dGpwO8Y+puYpRHlI9VQTIl/+Rdwjy5I0gaDnpE2Mc7V28LYmfvRdLsi+wFjb1CB+ovgWTaUK0rYU2VHP47XrZgUKc2v6wgeOFXdmMQXWIeC/X5rb4ju4sSS87ld5lnJkTV7SPjV+MJWcDs3Jgf55m9lSeaXOBqRLO6rIxxuMs7KFHEikQe6x3b7AJXcNKnMAJ6gp11Eb9WpPc/K2auyJ38S0WiDO1mBu7XDL7D2PIEflzq/JNkrEyhCWKy2YxSw9FvNhVWjEk0Dw3HGwXYMW9dVdAi4GGsfKJ0HGoJPoD6lZu0nAHkIPNiDLbteDgPW9SMIsJbvcJKRLwJPCJ/JNCAZdZZHpiwyHRBKyqBnhVhHXQ1Lb1p9zlZKgbpYFF7CWSm66p7mE3RQmaK+yxku7yOFbRxBCDPryo7cwpQdOgZ1N9ZbKM0xmLrdisBOgWfreLpWFixqre6zFrQU90I1znveutlXmRL2iB7iZjm0yOWM6Nj/785V8DauMSaYfMQ4iLQJMIVZEWdRMCEapfz0M1XIsjhl9g3GcfxXGEKp6ax19VSbN6iFpNdIAhL9X5lr+0VlctNqNZ7iKCG4MSTUrLJDtzmxvTiruI3g== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(46966006)(36840700001)(6286002)(4001150100001)(2906002)(6916009)(6666004)(82310400003)(1076003)(86362001)(316002)(966005)(356005)(36906005)(36860700001)(26005)(186003)(336012)(7636003)(5660300002)(7696005)(508600001)(36756003)(54906003)(4326008)(426003)(83380400001)(70206006)(47076005)(53546011)(8676002)(70586007)(55016002)(8936002)(2616005)(16526019); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:57:05.4664 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fd2d8e8e-ed87-44c3-4c31-08d9a4174e62 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT057.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR1201MB0019 Subject: [dpdk-stable] patch 'net/hns3: fix secondary process reference count' has been queued to stable release 20.11.4 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/12/21. 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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/0718b6168476e30ebccc8ed73c1984b0615043ef Thanks. Xueming Li --- >From 0718b6168476e30ebccc8ed73c1984b0615043ef Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Tue, 2 Nov 2021 09:38:26 +0800 Subject: [PATCH] net/hns3: fix secondary process reference count Cc: Xueming Li [ 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 | 11 +++++++---- drivers/net/hns3/hns3_ethdev_vf.c | 11 +++++++---- drivers/net/hns3/hns3_mp.c | 4 +++- 3 files changed, 17 insertions(+), 9 deletions(-) diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index d318b9b7f7..8049573444 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -5199,8 +5199,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) { + __atomic_fetch_sub(&hw->secondary_cnt, 1, __ATOMIC_RELAXED); return 0; + } if (hw->adapter_state == HNS3_NIC_STARTED) ret = hns3_dev_stop(eth_dev); @@ -6287,8 +6289,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; } @@ -6387,8 +6388,10 @@ hns3_dev_uninit(struct rte_eth_dev *eth_dev) PMD_INIT_FUNC_TRACE(); - if (rte_eal_process_type() != RTE_PROC_PRIMARY) + if (rte_eal_process_type() != RTE_PROC_PRIMARY) { + __atomic_fetch_sub(&hw->secondary_cnt, 1, __ATOMIC_RELAXED); return 0; + } if (hw->adapter_state < HNS3_NIC_CLOSING) hns3_dev_close(eth_dev); diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c index 086828180b..0f8ffe0c32 100644 --- a/drivers/net/hns3/hns3_ethdev_vf.c +++ b/drivers/net/hns3/hns3_ethdev_vf.c @@ -1991,8 +1991,10 @@ hns3vf_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) { + __atomic_fetch_sub(&hw->secondary_cnt, 1, __ATOMIC_RELAXED); return 0; + } if (hw->adapter_state == HNS3_NIC_STARTED) ret = hns3vf_dev_stop(eth_dev); @@ -2764,8 +2766,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; } @@ -2863,8 +2864,10 @@ hns3vf_dev_uninit(struct rte_eth_dev *eth_dev) PMD_INIT_FUNC_TRACE(); - if (rte_eal_process_type() != RTE_PROC_PRIMARY) + if (rte_eal_process_type() != RTE_PROC_PRIMARY) { + __atomic_fetch_sub(&hw->secondary_cnt, 1, __ATOMIC_RELAXED); return 0; + } if (hw->adapter_state < HNS3_NIC_CLOSING) hns3vf_dev_close(eth_dev); diff --git a/drivers/net/hns3/hns3_mp.c b/drivers/net/hns3/hns3_mp.c index 2a7654d272..32046b7612 100644 --- a/drivers/net/hns3/hns3_mp.c +++ b/drivers/net/hns3/hns3_mp.c @@ -130,9 +130,11 @@ 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)", dev->data->port_id, type); return; -- 2.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:11.781254694 +0800 +++ 0224-net-hns3-fix-secondary-process-reference-count.patch 2021-11-10 14:17:02.044078006 +0800 @@ -1 +1 @@ -From 323263717774df318d8a6e64ac8bfe546e03b8f6 Mon Sep 17 00:00:00 2001 +From 0718b6168476e30ebccc8ed73c1984b0615043ef Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 323263717774df318d8a6e64ac8bfe546e03b8f6 ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -19,2 +21,2 @@ - drivers/net/hns3/hns3_ethdev.c | 10 +++++++--- - drivers/net/hns3/hns3_ethdev_vf.c | 10 +++++++--- + drivers/net/hns3/hns3_ethdev.c | 11 +++++++---- + drivers/net/hns3/hns3_ethdev_vf.c | 11 +++++++---- @@ -22 +24 @@ - 3 files changed, 17 insertions(+), 7 deletions(-) + 3 files changed, 17 insertions(+), 9 deletions(-) @@ -25 +27 @@ -index 03447c8d4a..dafaf31f65 100644 +index d318b9b7f7..8049573444 100644 @@ -28 +30 @@ -@@ -5850,8 +5850,10 @@ hns3_dev_close(struct rte_eth_dev *eth_dev) +@@ -5199,8 +5199,10 @@ hns3_dev_close(struct rte_eth_dev *eth_dev) @@ -40 +42 @@ -@@ -7377,7 +7379,7 @@ hns3_dev_init(struct rte_eth_dev *eth_dev) +@@ -6287,8 +6289,7 @@ hns3_dev_init(struct rte_eth_dev *eth_dev) @@ -43,0 +46 @@ +- @@ -46 +48,0 @@ - hns3_tx_push_init(eth_dev); @@ -49 +51,2 @@ -@@ -7480,8 +7482,10 @@ hns3_dev_uninit(struct rte_eth_dev *eth_dev) + +@@ -6387,8 +6388,10 @@ hns3_dev_uninit(struct rte_eth_dev *eth_dev) @@ -62 +65 @@ -index 4a0d73fc29..41d61a8160 100644 +index 086828180b..0f8ffe0c32 100644 @@ -65 +68 @@ -@@ -1893,8 +1893,10 @@ hns3vf_dev_close(struct rte_eth_dev *eth_dev) +@@ -1991,8 +1991,10 @@ hns3vf_dev_close(struct rte_eth_dev *eth_dev) @@ -77 +80 @@ -@@ -2685,7 +2687,7 @@ hns3vf_dev_init(struct rte_eth_dev *eth_dev) +@@ -2764,8 +2766,7 @@ hns3vf_dev_init(struct rte_eth_dev *eth_dev) @@ -80,0 +84 @@ +- @@ -83 +86,0 @@ - hns3_tx_push_init(eth_dev); @@ -86 +89,2 @@ -@@ -2787,8 +2789,10 @@ hns3vf_dev_uninit(struct rte_eth_dev *eth_dev) + +@@ -2863,8 +2864,10 @@ hns3vf_dev_uninit(struct rte_eth_dev *eth_dev) @@ -99 +103 @@ -index cd514ac29c..c28598a53a 100644 +index 2a7654d272..32046b7612 100644 @@ -102 +106 @@ -@@ -150,8 +150,10 @@ mp_req_on_rxtx(struct rte_eth_dev *dev, enum hns3_mp_req_type type) +@@ -130,9 +130,11 @@ mp_req_on_rxtx(struct rte_eth_dev *dev, enum hns3_mp_req_type type) @@ -109,0 +114 @@ + if (type != HNS3_MP_REQ_START_RXTX && type != HNS3_MP_REQ_STOP_RXTX) { @@ -111 +115,0 @@ - if (!mp_req_type_is_valid(type)) { @@ -113,0 +118 @@ + return;