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 4C9A143345 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 47B9E40A4B; 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.129.124]) by mails.dpdk.org (Postfix) with ESMTP id C5348402C6 for ; Thu, 16 Nov 2023 14:24:20 +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=E8F+HnFMe2B0/jBtRZXZKLNPjA3iPjQdTHKsDKCL2eU=; b=TJAFi0gy5msth/B8oRbVGYoRanbH4qyCsZz4lpi4JqJuuXNp4F6oifb2nIRuqQz2cP/ycN CyYliw+zggaXBoRHjd0pH8u40ikaTOBBfTFb8jUgzzEx8yDYGF7MNUmhWn/kdTVQDDBrMp /NHyt7C3BbrM8Vl3bcxseIHf0ws4Yxg= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-311--iTzf2foNoWSCbE4ygqV1w-1; Thu, 16 Nov 2023 08:24:19 -0500 X-MC-Unique: -iTzf2foNoWSCbE4ygqV1w-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 B6ED138157A4; Thu, 16 Nov 2023 13:24:18 +0000 (UTC) Received: from rh.Home (unknown [10.39.194.169]) by smtp.corp.redhat.com (Postfix) with ESMTP id DFE172166B27; Thu, 16 Nov 2023 13:24:17 +0000 (UTC) From: Kevin Traynor To: Dengdui Huang Cc: dpdk stable Subject: patch 'net/hns3: fix multiple reset detected log' has been queued to stable release 21.11.6 Date: Thu, 16 Nov 2023 13:22:57 +0000 Message-ID: <20231116132348.557257-15-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/0bc0e51d06d5d2137675c4a28a1c18e73664d79f Thanks. Kevin --- >From 0bc0e51d06d5d2137675c4a28a1c18e73664d79f Mon Sep 17 00:00:00 2001 From: Dengdui Huang Date: Fri, 27 Oct 2023 14:09:44 +0800 Subject: [PATCH] net/hns3: fix multiple reset detected log [ upstream commit 5be38fc6c0fc7e54d0121bab2fe93a27b8e8f7ab ] Currently, the driver proactively checks whether interrupt exist (by checking reset registers), related reset delay task is scheduled. When a reset whose level is equal to or lower than the current level is detected, there is unnecessary to add delay task and print logs. This patch fix it. Fixes: 2790c6464725 ("net/hns3: support device reset") Signed-off-by: Dengdui Huang --- drivers/net/hns3/hns3_ethdev.c | 64 ++++++++++++++++++++-------------- 1 file changed, 37 insertions(+), 27 deletions(-) diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index 9712fbfe6f..90eec4a09b 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -129,6 +129,5 @@ hns3_pf_enable_irq0(struct hns3_hw *hw) static enum hns3_evt_cause -hns3_proc_imp_reset_event(struct hns3_adapter *hns, bool is_delay, - uint32_t *vec_val) +hns3_proc_imp_reset_event(struct hns3_adapter *hns, uint32_t *vec_val) { struct hns3_hw *hw = &hns->hw; @@ -137,11 +136,6 @@ hns3_proc_imp_reset_event(struct hns3_adapter *hns, bool is_delay, hns3_atomic_set_bit(HNS3_IMP_RESET, &hw->reset.pending); *vec_val = BIT(HNS3_VECTOR0_IMPRESET_INT_B); - if (!is_delay) { - hw->reset.stats.imp_cnt++; - hns3_warn(hw, "IMP reset detected, clear reset status"); - } else { - hns3_schedule_delayed_reset(hns); - hns3_warn(hw, "IMP reset detected, don't clear reset status"); - } + hw->reset.stats.imp_cnt++; + hns3_warn(hw, "IMP reset detected, clear reset status"); return HNS3_VECTOR0_EVENT_RST; @@ -149,6 +143,5 @@ hns3_proc_imp_reset_event(struct hns3_adapter *hns, bool is_delay, static enum hns3_evt_cause -hns3_proc_global_reset_event(struct hns3_adapter *hns, bool is_delay, - uint32_t *vec_val) +hns3_proc_global_reset_event(struct hns3_adapter *hns, uint32_t *vec_val) { struct hns3_hw *hw = &hns->hw; @@ -157,12 +150,6 @@ hns3_proc_global_reset_event(struct hns3_adapter *hns, bool is_delay, hns3_atomic_set_bit(HNS3_GLOBAL_RESET, &hw->reset.pending); *vec_val = BIT(HNS3_VECTOR0_GLOBALRESET_INT_B); - if (!is_delay) { - hw->reset.stats.global_cnt++; - hns3_warn(hw, "Global reset detected, clear reset status"); - } else { - hns3_schedule_delayed_reset(hns); - hns3_warn(hw, - "Global reset detected, don't clear reset status"); - } + hw->reset.stats.global_cnt++; + hns3_warn(hw, "Global reset detected, clear reset status"); return HNS3_VECTOR0_EVENT_RST; @@ -178,5 +165,4 @@ hns3_check_event_cause(struct hns3_adapter *hns, uint32_t *clearval) uint32_t val; enum hns3_evt_cause ret; - bool is_delay; /* fetch the events from their corresponding regs */ @@ -185,5 +171,4 @@ hns3_check_event_cause(struct hns3_adapter *hns, uint32_t *clearval) hw_err_src_reg = hns3_read_dev(hw, HNS3_RAS_PF_OTHER_INT_STS_REG); - is_delay = clearval == NULL ? true : false; /* * Assumption: If by any chance reset and mailbox events are reported @@ -194,5 +179,5 @@ hns3_check_event_cause(struct hns3_adapter *hns, uint32_t *clearval) */ if (BIT(HNS3_VECTOR0_IMPRESET_INT_B) & vector0_int_stats) { /* IMP */ - ret = hns3_proc_imp_reset_event(hns, is_delay, &val); + ret = hns3_proc_imp_reset_event(hns, &val); goto out; } @@ -200,5 +185,5 @@ hns3_check_event_cause(struct hns3_adapter *hns, uint32_t *clearval) /* Global reset */ if (BIT(HNS3_VECTOR0_GLOBALRESET_INT_B) & vector0_int_stats) { - ret = hns3_proc_global_reset_event(hns, is_delay, &val); + ret = hns3_proc_global_reset_event(hns, &val); goto out; } @@ -229,8 +214,7 @@ hns3_check_event_cause(struct hns3_adapter *hns, uint32_t *clearval) val = vector0_int_stats; ret = HNS3_VECTOR0_EVENT_OTHER; -out: - if (clearval) - *clearval = val; +out: + *clearval = val; return ret; } @@ -5566,4 +5550,30 @@ is_pf_reset_done(struct hns3_hw *hw) } +static void +hns3_detect_reset_event(struct hns3_hw *hw) +{ + struct hns3_adapter *hns = HNS3_DEV_HW_TO_ADAPTER(hw); + enum hns3_reset_level new_req = HNS3_NONE_RESET; + enum hns3_reset_level last_req; + uint32_t vector0_intr_state; + + last_req = hns3_get_reset_level(hns, &hw->reset.pending); + vector0_intr_state = hns3_read_dev(hw, HNS3_VECTOR0_OTHER_INT_STS_REG); + if (BIT(HNS3_VECTOR0_IMPRESET_INT_B) & vector0_intr_state) { + __atomic_store_n(&hw->reset.disable_cmd, 1, __ATOMIC_RELAXED); + hns3_atomic_set_bit(HNS3_IMP_RESET, &hw->reset.pending); + new_req = HNS3_IMP_RESET; + } else if (BIT(HNS3_VECTOR0_GLOBALRESET_INT_B) & vector0_intr_state) { + __atomic_store_n(&hw->reset.disable_cmd, 1, __ATOMIC_RELAXED); + hns3_atomic_set_bit(HNS3_GLOBAL_RESET, &hw->reset.pending); + new_req = HNS3_GLOBAL_RESET; + } + + if (new_req != HNS3_NONE_RESET && last_req < new_req) { + hns3_schedule_delayed_reset(hns); + hns3_warn(hw, "High level reset detected, delay do reset"); + } +} + bool hns3_is_reset_pending(struct hns3_adapter *hns) @@ -5579,5 +5589,5 @@ hns3_is_reset_pending(struct hns3_adapter *hns) return false; - hns3_check_event_cause(hns, NULL); + hns3_detect_reset_event(hw); reset = hns3_get_reset_level(hns, &hw->reset.pending); if (reset != HNS3_NONE_RESET && hw->reset.level != 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.935085160 +0000 +++ 0015-net-hns3-fix-multiple-reset-detected-log.patch 2023-11-16 13:21:52.426946305 +0000 @@ -1 +1 @@ -From 5be38fc6c0fc7e54d0121bab2fe93a27b8e8f7ab Mon Sep 17 00:00:00 2001 +From 0bc0e51d06d5d2137675c4a28a1c18e73664d79f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5be38fc6c0fc7e54d0121bab2fe93a27b8e8f7ab ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 3bdce1fa4b..18afc0fa0a 100644 +index 9712fbfe6f..90eec4a09b 100644 @@ -26 +27 @@ -@@ -125,6 +125,5 @@ hns3_pf_enable_irq0(struct hns3_hw *hw) +@@ -129,6 +129,5 @@ hns3_pf_enable_irq0(struct hns3_hw *hw) @@ -34 +35 @@ -@@ -133,11 +132,6 @@ hns3_proc_imp_reset_event(struct hns3_adapter *hns, bool is_delay, +@@ -137,11 +136,6 @@ hns3_proc_imp_reset_event(struct hns3_adapter *hns, bool is_delay, @@ -48 +49 @@ -@@ -145,6 +139,5 @@ hns3_proc_imp_reset_event(struct hns3_adapter *hns, bool is_delay, +@@ -149,6 +143,5 @@ hns3_proc_imp_reset_event(struct hns3_adapter *hns, bool is_delay, @@ -56 +57 @@ -@@ -153,12 +146,6 @@ hns3_proc_global_reset_event(struct hns3_adapter *hns, bool is_delay, +@@ -157,12 +150,6 @@ hns3_proc_global_reset_event(struct hns3_adapter *hns, bool is_delay, @@ -71 +72 @@ -@@ -174,5 +161,4 @@ hns3_check_event_cause(struct hns3_adapter *hns, uint32_t *clearval) +@@ -178,5 +165,4 @@ hns3_check_event_cause(struct hns3_adapter *hns, uint32_t *clearval) @@ -77 +78 @@ -@@ -181,5 +167,4 @@ hns3_check_event_cause(struct hns3_adapter *hns, uint32_t *clearval) +@@ -185,5 +171,4 @@ hns3_check_event_cause(struct hns3_adapter *hns, uint32_t *clearval) @@ -83 +84 @@ -@@ -190,5 +175,5 @@ hns3_check_event_cause(struct hns3_adapter *hns, uint32_t *clearval) +@@ -194,5 +179,5 @@ hns3_check_event_cause(struct hns3_adapter *hns, uint32_t *clearval) @@ -90 +91 @@ -@@ -196,5 +181,5 @@ hns3_check_event_cause(struct hns3_adapter *hns, uint32_t *clearval) +@@ -200,5 +185,5 @@ hns3_check_event_cause(struct hns3_adapter *hns, uint32_t *clearval) @@ -97 +98 @@ -@@ -225,8 +210,7 @@ hns3_check_event_cause(struct hns3_adapter *hns, uint32_t *clearval) +@@ -229,8 +214,7 @@ hns3_check_event_cause(struct hns3_adapter *hns, uint32_t *clearval) @@ -108 +109 @@ -@@ -5506,4 +5490,30 @@ is_pf_reset_done(struct hns3_hw *hw) +@@ -5566,4 +5550,30 @@ is_pf_reset_done(struct hns3_hw *hw) @@ -139 +140 @@ -@@ -5519,5 +5529,5 @@ hns3_is_reset_pending(struct hns3_adapter *hns) +@@ -5579,5 +5589,5 @@ hns3_is_reset_pending(struct hns3_adapter *hns)