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 6FF0643345 for ; Thu, 16 Nov 2023 14:24:22 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 69A2840A6D; Thu, 16 Nov 2023 14:24:22 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 5F16B402C6 for ; Thu, 16 Nov 2023 14:24:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700141060; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2G6WZTyPkHsqbpMcDAkgDi4bcypldrblhlwNlVGTD3Q=; b=b374FKi/6gC9uIEZotsBzL2pVxId0pR8vgBR5U6B3J5aR6RT8148r1oq9o0mFjtZGtWt33 mPKGWHKZWIqAzUR+/yy1Tpqc3uBqlueLDFFUfYW+zoUxUcYqfKLXNk12uMytC10yclQ/Vf MTmGVIgPgPb1L/nuV6xrEvNHhxPKve4= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-218-_nuqW_VMPXOmYsqM6YTHAg-1; Thu, 16 Nov 2023 08:24:17 -0500 X-MC-Unique: _nuqW_VMPXOmYsqM6YTHAg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7F2B4185A780; Thu, 16 Nov 2023 13:24:17 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.169]) by smtp.corp.redhat.com (Postfix) with ESMTP id A755C2166B27; Thu, 16 Nov 2023 13:24:16 +0000 (UTC) From: Kevin Traynor To: Dengdui Huang Cc: dpdk stable Subject: patch 'net/hns3: remove reset log in secondary' has been queued to stable release 21.11.6 Date: Thu, 16 Nov 2023 13:22:56 +0000 Message-ID: <20231116132348.557257-14-ktraynor@redhat.com> In-Reply-To: <20231116132348.557257-1-ktraynor@redhat.com> References: <20231116132348.557257-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.6 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/21/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://github.com/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/b28a338b6bfbbe1b80923389b21c85208e5373d3 Thanks. Kevin --- >From b28a338b6bfbbe1b80923389b21c85208e5373d3 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 [ 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 ed85caa7bd..9712fbfe6f 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -5573,12 +5573,11 @@ hns3_is_reset_pending(struct hns3_adapter *hns) /* - * 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 && diff --git a/drivers/net/hns3/hns3_ethdev_vf.c b/drivers/net/hns3/hns3_ethdev_vf.c index a125cfbeb9..f4a37f433b 100644 --- a/drivers/net/hns3/hns3_ethdev_vf.c +++ b/drivers/net/hns3/hns3_ethdev_vf.c @@ -1844,12 +1844,11 @@ hns3vf_is_reset_pending(struct hns3_adapter *hns) /* - * 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 && -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-11-16 13:21:52.909948521 +0000 +++ 0014-net-hns3-remove-reset-log-in-secondary.patch 2023-11-16 13:21:52.421946291 +0000 @@ -1 +1 @@ -From 5394df455749f60614a19d791d1d73c26b74dea1 Mon Sep 17 00:00:00 2001 +From b28a338b6bfbbe1b80923389b21c85208e5373d3 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5394df455749f60614a19d791d1d73c26b74dea1 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 964f47f164..3bdce1fa4b 100644 +index ed85caa7bd..9712fbfe6f 100644 @@ -26 +27 @@ -@@ -5513,12 +5513,11 @@ hns3_is_reset_pending(struct hns3_adapter *hns) +@@ -5573,12 +5573,11 @@ hns3_is_reset_pending(struct hns3_adapter *hns) @@ -45 +46 @@ -index 007f5d619f..5f3422d14e 100644 +index a125cfbeb9..f4a37f433b 100644 @@ -48 +49 @@ -@@ -1716,12 +1716,11 @@ hns3vf_is_reset_pending(struct hns3_adapter *hns) +@@ -1844,12 +1844,11 @@ hns3vf_is_reset_pending(struct hns3_adapter *hns)