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 640B6A0032 for ; Fri, 18 Feb 2022 13:44:05 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5F6A440141; Fri, 18 Feb 2022 13:44:05 +0100 (CET) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by mails.dpdk.org (Postfix) with ESMTP id 67D5340141 for ; Fri, 18 Feb 2022 13:44:04 +0100 (CET) Received: by mail-wm1-f49.google.com with SMTP id az26-20020a05600c601a00b0037c078db59cso6318559wmb.4 for ; Fri, 18 Feb 2022 04:44:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4OST2f+WG6klI7o8xjYZ4wZU9+r94b1TZ4EUc8naZAE=; b=f08INemhVLrUClddQR1c5o52kNL24XfysphRE6+EoQM79e/5Js795ow8+CDvw4NnVI ND6eiF06qv3ipKHXnhxd8hzqgQ6a6HJ+5uO6zyT7/G8XNKZzR5XXRne+LgP2rct1PUUR 6+eWGPkQKCW6nAbRtPpa2hB9IROYa5sYa6Q1GCZH0ziFOzPbnjneL8n8FcuZkAFz+kua AqaJPr/vSWW1GcQT6/ZwMZnUUp2O7hF7rl3QlcJw/djRKtiKQQbwoahn7KbZFGpui0mY 4IrY+iabcQryNoBxT57BI0AMPGTaswtD4i0o/nfLLRy8QGyuarzU+22zCAs8Z8m9G2F7 GstQ== 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=4OST2f+WG6klI7o8xjYZ4wZU9+r94b1TZ4EUc8naZAE=; b=l7thhF+mkB/jrPx4ulhFZl5fjk3MtTote2SbtG7KV38ZmYG/WoQlbZuRRjAeXEkTET RriMl90mT7EK1rhLlf8xhweJrzx9nyrIIK1D+FuRiw4ogjXWLYp71ktUIBZWCzJV8MTV OSjOHQTsUBC0G5pAdfAsfkTSrZ3PvCOHvBSy/eX7Geah4GmuMZi6+BhzOvKzb/LdNTYY xKP8Z/vPihm1V6kyVWScSdSVasCZWy+7//4gf2cxaL3x3s4lWaQYT7yTQJV72tn49A/R ZYUHVjbX4VR81LuoaIoP0zKK7a5LQtgjVSuTYOk9Lw5QsL61bZSK0GrPfpoH3DrmD6vQ bLYQ== X-Gm-Message-State: AOAM533TS26k0jIcsM6QAlDyYTGFLWdiw7vBMIXHww+lpEeZhin45zZK vdGIAcCKqdjYHLpTwOdVVQPIpEVrS4OBh1wU X-Google-Smtp-Source: ABdhPJwY+R9DCsGhXEvLaG3/WC8E4n/j+CB2K9TFLC3HOhKtOukxhlYGwa0GmaF/O8zv5b9+mge0Dw== X-Received: by 2002:a1c:7712:0:b0:37c:9455:b3fa with SMTP id t18-20020a1c7712000000b0037c9455b3famr10704303wmi.188.1645188244135; Fri, 18 Feb 2022 04:44:04 -0800 (PST) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id i2sm5247166wmq.45.2022.02.18.04.44.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Feb 2022 04:44:03 -0800 (PST) From: luca.boccassi@gmail.com To: Huisong Li Cc: Min Hu , dpdk stable Subject: patch 'net/hns3: fix operating queue when TCAM table is invalid' has been queued to stable release 20.11.5 Date: Fri, 18 Feb 2022 12:38:55 +0000 Message-Id: <20220218123931.1749595-86-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220218123931.1749595-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-1-luca.boccassi@gmail.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 20.11.5 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/20/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/3f03bc5d20d519f118a2b105cd877b26103ffecb Thanks. Luca Boccassi --- >From 3f03bc5d20d519f118a2b105cd877b26103ffecb Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Fri, 28 Jan 2022 10:07:07 +0800 Subject: [PATCH] net/hns3: fix operating queue when TCAM table is invalid [ upstream commit eae97230dc2ab9553cdb335ab9b287a18a1b0c97 ] Reset queues will query the TCAM table. The table is cleared after global or imp reset. Currently, PF driver first resets Rx/Tx queues and then restore the table during the reset recovery process, which will fail to query the table and trigger a RAS error. Fixes: fa29fe45a7b4 ("net/hns3: support queue start and stop") Signed-off-by: Huisong Li Signed-off-by: Min Hu (Connor) --- drivers/net/hns3/hns3_ethdev.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/drivers/net/hns3/hns3_ethdev.c b/drivers/net/hns3/hns3_ethdev.c index 3c8d41c6c8..b2ff59ef62 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -4598,6 +4598,10 @@ hns3_init_hardware(struct hns3_adapter *hns) struct hns3_hw *hw = &hns->hw; int ret; + /* + * All queue-related HW operations must be performed after the TCAM + * table is configured. + */ ret = hns3_map_tqp(hw); if (ret) { PMD_INIT_LOG(ERR, "Failed to map tqp: %d", ret); @@ -5374,18 +5378,18 @@ hns3_reinit_dev(struct hns3_adapter *hns) return ret; } + ret = hns3_init_hardware(hns); + if (ret) { + hns3_err(hw, "Failed to init hardware: %d", ret); + return ret; + } + ret = hns3_reset_all_tqps(hns); if (ret) { hns3_err(hw, "Failed to reset all queues: %d", ret); return ret; } - ret = hns3_init_hardware(hns); - if (ret) { - hns3_err(hw, "Failed to init hardware: %d", ret); - return ret; - } - ret = hns3_enable_hw_error_intr(hns, true); if (ret) { hns3_err(hw, "fail to enable hw error interrupts: %d", -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-18 12:37:41.189256761 +0000 +++ 0086-net-hns3-fix-operating-queue-when-TCAM-table-is-inva.patch 2022-02-18 12:37:37.782793975 +0000 @@ -1 +1 @@ -From eae97230dc2ab9553cdb335ab9b287a18a1b0c97 Mon Sep 17 00:00:00 2001 +From 3f03bc5d20d519f118a2b105cd877b26103ffecb Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit eae97230dc2ab9553cdb335ab9b287a18a1b0c97 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 57f1572340..2641b6f79b 100644 +index 3c8d41c6c8..b2ff59ef62 100644 @@ -24 +25 @@ -@@ -4378,6 +4378,10 @@ hns3_init_hardware(struct hns3_adapter *hns) +@@ -4598,6 +4598,10 @@ hns3_init_hardware(struct hns3_adapter *hns) @@ -35 +36 @@ -@@ -5547,18 +5551,18 @@ hns3_reinit_dev(struct hns3_adapter *hns) +@@ -5374,18 +5378,18 @@ hns3_reinit_dev(struct hns3_adapter *hns)