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 738BB433D8 for ; Mon, 11 Dec 2023 11:14:47 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6E4304113C; Mon, 11 Dec 2023 11:14:47 +0100 (CET) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2066.outbound.protection.outlook.com [40.107.212.66]) by mails.dpdk.org (Postfix) with ESMTP id 75B8D40E0F for ; Mon, 11 Dec 2023 11:14:45 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=H3C+jXftsHkcIQZj4X9hmMeJpYmhNsjl6DIewEU6coBF3To8cRcNPHpQq2zTmC0zluTn/G0rmIWIriQg7y3zqqgyyjm3jF2j0YsHTpaPc9WBrlKqsaFRXykH92iPAzn9QL0dBX555voX8T5VSVCQ3rsh9GOrHalLWKwGxylweBfnlpxcfU8zzwhjclOAjIusAgai5b4M1+nLxhSfBpx7ObUWTgGGndlHINyBA3J/Lvj0CCmV9IkEl/CMqemH2vHO4of8N54kaO89VOi6BGiAp/5G84X9cYX7oDVvX06hY27xp9BgI8gKUdRF0wZLSFQjHsBkGxJ+Qj/X8YJs7ZCnZA== 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=gl68tgXhToSmy9fRZmrDcavW839rb8ysgeMpurh6jTk=; b=VxykK4yfH4d9c3Sb5JRFJayr3rh2bXylIJ5mbn5vhCT6x1XJEvoKsMRwgAq9asf/Qf1iIeuUufVPWUEpL7QAOUwF2pZ1TLbk7mAGK55aECpOvsduNEHjIZI3N+afCIkO+MSEangmBt9i4H5gXzSftY4JY//+DKT/EyXteDXFqzqOsdOliy+MF9R0MLpuER0cISr03Z5G55E9S1An8wzDIfYxwWYBbQbyBHdnX2g1zWvIjDmL54WNGQ3TD/NL0oKfs//Fzy1VxBlxdip70Ix9iTXewljLIbS5iIB8t9bqt8oyF7y7GsqeHvFqtbWL61mOgQDmLRT8AUbXbZTQbA7cJQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=huawei.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) 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=gl68tgXhToSmy9fRZmrDcavW839rb8ysgeMpurh6jTk=; b=slEs6yvAdiArspL2cZCYoC8JpI0iXA+WG98hYwEGiV+L0YKdWZO7IMvCKmJSLy3SmDcEHhIx1TqfsQsrg2yXtqQqGupFL3CmtVcZtM84vyF1+Bp4o+4kPw7spS7aeW4q3wXxu2uaVO8NPfIUPcFvEUrIUWvwYbtuFidTTH6I+jKvHURlb4c/Y/61rpkFFkaGsqhmhoqOKKUsT0xQX3pRmS7bu6D7DqAKT7qufuHlntb2U7PI8dbBBFuMPpe0JJFSl7PUxrJLWYTA57O8KX36jzMiEDg7ipmtmB/BfnJVQHgDyG1qOc4Kiubw2wCwgH790oS5VrdDg8LTFHp1kPMbVA== Received: from MN2PR20CA0054.namprd20.prod.outlook.com (2603:10b6:208:235::23) by DM6PR12MB4074.namprd12.prod.outlook.com (2603:10b6:5:218::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32; Mon, 11 Dec 2023 10:14:43 +0000 Received: from MN1PEPF0000ECD4.namprd02.prod.outlook.com (2603:10b6:208:235:cafe::c5) by MN2PR20CA0054.outlook.office365.com (2603:10b6:208:235::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7068.32 via Frontend Transport; Mon, 11 Dec 2023 10:14:43 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) 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.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by MN1PEPF0000ECD4.mail.protection.outlook.com (10.167.242.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7091.18 via Frontend Transport; Mon, 11 Dec 2023 10:14:42 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 11 Dec 2023 02:14:28 -0800 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Mon, 11 Dec 2023 02:14:26 -0800 From: Xueming Li To: Dengdui Huang CC: dpdk stable Subject: patch 'net/hns3: remove reset log in secondary' has been queued to stable release 22.11.4 Date: Mon, 11 Dec 2023 18:10:47 +0800 Message-ID: <20231211101226.2122-23-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231211101226.2122-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> <20231211101226.2122-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MN1PEPF0000ECD4:EE_|DM6PR12MB4074:EE_ X-MS-Office365-Filtering-Correlation-Id: 7a5be947-8987-4a25-7a0f-08dbfa31fe42 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: u2QeIeEuKu8qaD3z4/Ch8GYZ7q0jPbm486ZYsyKxSu9asIJlDsWsbfJAolHiPyN9R01AmHl6VTpOFVYyygTvWkwSZsQFhJLJ/v7cLhKVxpdlCv+9twpYmD+pkcBX6ONfkhfhTwwmCEnXdQnxXKHbmO0ARgOJdjvCWr9IOjJ/mWOLUGlMxWxE5HACxJgOxazT38KB+5xZC0LdIjHaoqqrzvcx1qOj/qmKQmTvHylNb9ACtkCgJMAc+w8vPo2Q+vNvV3E9vZ9FeDufl4lXntvLwtEKSx7SMb+gb1xKu1lRxvtigUt6kMLaPhzORbb7Pw3PKgp6gQNMEZEj0oriqDiqN7Za/N6bhWwfZ2yJ4LGB90n0ahgu/d+2KLFOBKtN6BLM/8fvtcvUn5ZmRv5q/d19ilaXx/nU1v46vEOCqNhktPQtwt//NFbJp1u5OdybWe4NfN6wvkSLneg7Q0kdnO+KBBCC7ubc41uBIezpSMlKC2gEZBJpIIXmRe1LGpoIlhembI2AINQICMfjc3J5y273Wg0bRpJ72VDRwFdBhe/kl/fBSH67wgfSADh4EMuXbxldT45w+3wD7rd1TeK3D/5KCgGhbNc6XJInfPnKF84kFYel2JrbrZiTManDhQAucGRJNKdyIce4sAmXeD/5/MZBY3TQxhM/pos3Ma3oA5pEJfUOJNNF6JSYjPZxEv6EeR+K69G+++81UzUPY+pEQeb3jjM3XTX2vI8PNXwrXFj/csAMmjNQLatVhfPNXSlh2NNVw05ZJhJCMod1vcBqp/z6QwXi2UyPhIEviFNbvUVImPA= X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230031)(4636009)(136003)(346002)(376002)(39860400002)(396003)(230922051799003)(64100799003)(451199024)(186009)(1800799012)(82310400011)(46966006)(36840700001)(40470700004)(40460700003)(40480700001)(55016003)(53546011)(1076003)(336012)(16526019)(6286002)(26005)(2616005)(7696005)(6666004)(47076005)(966005)(478600001)(7636003)(82740400003)(356005)(86362001)(36756003)(5660300002)(2906002)(70586007)(70206006)(6916009)(426003)(36860700001)(83380400001)(4001150100001)(41300700001)(8936002)(316002)(8676002)(4326008); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2023 10:14:42.7293 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7a5be947-8987-4a25-7a0f-08dbfa31fe42 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: MN1PEPF0000ECD4.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4074 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 22.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 12/13/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=290166c239c0d88a2cf77bce9e58543ed98bb7a7 Thanks. Xueming Li --- >From 290166c239c0d88a2cf77bce9e58543ed98bb7a7 Mon Sep 17 00:00:00 2001 From: Dengdui Huang Date: Fri, 27 Oct 2023 14:09:43 +0800 Subject: [PATCH] net/hns3: remove reset log in secondary Cc: Xueming Li [ upstream commit 5394df455749f60614a19d791d1d73c26b74dea1 ] The reset event is checked and done in primary. And the secondary doesn't check and display reset log. There is a patch to remove the check code for secondary. please see commit a8f1f7cf1b42 ("net/hns3: fix crash when secondary process access FW") This patch removes the redundant log print of reset. Fixes: a8f1f7cf1b42 ("net/hns3: fix crash when secondary process access FW") Signed-off-by: Dengdui Huang --- drivers/net/hns3/hns3_ethdev.c | 11 +++++------ drivers/net/hns3/hns3_ethdev_vf.c | 11 +++++------ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index b9a848540b..feabedc458 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -5546,14 +5546,13 @@ hns3_is_reset_pending(struct hns3_adapter *hns) enum hns3_reset_level reset; /* - * Check the registers to confirm whether there is reset pending. - * Note: This check may lead to schedule reset task, but only primary - * process can process the reset event. Therefore, limit the - * checking under only primary process. + * Only primary can process can process the reset event, + * so don't check reset event in secondary. */ - if (rte_eal_process_type() == RTE_PROC_PRIMARY) - hns3_check_event_cause(hns, NULL); + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return false; + hns3_check_event_cause(hns, NULL); reset = hns3_get_reset_level(hns, &hw->reset.pending); if (reset != HNS3_NONE_RESET && hw->reset.level != HNS3_NONE_RESET && hw->reset.level < reset) { diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c index ad0ccb82fe..3874148815 100644 --- a/drivers/net/hns3/hns3_ethdev_vf.c +++ b/drivers/net/hns3/hns3_ethdev_vf.c @@ -1796,14 +1796,13 @@ hns3vf_is_reset_pending(struct hns3_adapter *hns) return false; /* - * Check the registers to confirm whether there is reset pending. - * Note: This check may lead to schedule reset task, but only primary - * process can process the reset event. Therefore, limit the - * checking under only primary process. + * Only primary can process can process the reset event, + * so don't check reset event in secondary. */ - if (rte_eal_process_type() == RTE_PROC_PRIMARY) - hns3vf_check_event_cause(hns, NULL); + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return false; + hns3vf_check_event_cause(hns, NULL); reset = hns3vf_get_reset_level(hw, &hw->reset.pending); if (hw->reset.level != HNS3_NONE_RESET && reset != HNS3_NONE_RESET && hw->reset.level < reset) { -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-12-11 17:56:23.896839400 +0800 +++ 0022-net-hns3-remove-reset-log-in-secondary.patch 2023-12-11 17:56:22.917652300 +0800 @@ -1 +1 @@ -From 5394df455749f60614a19d791d1d73c26b74dea1 Mon Sep 17 00:00:00 2001 +From 290166c239c0d88a2cf77bce9e58543ed98bb7a7 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 5394df455749f60614a19d791d1d73c26b74dea1 ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -23 +25 @@ -index 964f47f164..3bdce1fa4b 100644 +index b9a848540b..feabedc458 100644 @@ -26 +28 @@ -@@ -5512,14 +5512,13 @@ hns3_is_reset_pending(struct hns3_adapter *hns) +@@ -5546,14 +5546,13 @@ hns3_is_reset_pending(struct hns3_adapter *hns) @@ -47 +49 @@ -index 007f5d619f..5f3422d14e 100644 +index ad0ccb82fe..3874148815 100644 @@ -50 +52 @@ -@@ -1715,14 +1715,13 @@ hns3vf_is_reset_pending(struct hns3_adapter *hns) +@@ -1796,14 +1796,13 @@ hns3vf_is_reset_pending(struct hns3_adapter *hns)