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 62FFBA0350 for ; Mon, 21 Feb 2022 16:41:06 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5E2BF4013F; Mon, 21 Feb 2022 16:41:06 +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 631374013F for ; Mon, 21 Feb 2022 16:41:05 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645458064; 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=78liTfTUdT9uKj9/XLnQBEh3j1QlnIM6S8Tg4Gfgmy4=; b=iAhFnVdMZTfPUYnWxR4RZmYWpvbVAevXLbD0486TXLAJVY346htLeCzvSvLU3zd5kcH53r Hqr2PRpr8kWfOj0l2E+kP67hoQyNa4cyH5rFsQd03330HVGoNed6h+Sqbjcd/xLl4cJboP fHMQ2wHlLRwQ5lDovNcsZ/rovM1QQXM= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-77-7orPJ9PRMb--lmuShTcBxQ-1; Mon, 21 Feb 2022 10:41:00 -0500 X-MC-Unique: 7orPJ9PRMb--lmuShTcBxQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 96730343CB; Mon, 21 Feb 2022 15:40:59 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8A8807E131; Mon, 21 Feb 2022 15:40:58 +0000 (UTC) From: Kevin Traynor 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 21.11.1 Date: Mon, 21 Feb 2022 15:35:22 +0000 Message-Id: <20220221153625.152324-133-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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.1 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/26/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/2ae91ac6603c2230f7bae0890096e90d23f1d896 Thanks. Kevin --- >From 2ae91ac6603c2230f7bae0890096e90d23f1d896 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 209ec75eac..2de1325d4b 100644 --- a/drivers/net/hns3/hns3_ethdev.c +++ b/drivers/net/hns3/hns3_ethdev.c @@ -4406,4 +4406,8 @@ hns3_init_hardware(struct hns3_adapter *hns) int ret; + /* + * All queue-related HW operations must be performed after the TCAM + * table is configured. + */ ret = hns3_map_tqp(hw); if (ret) { @@ -5575,4 +5579,10 @@ hns3_reinit_dev(struct hns3_adapter *hns) } + 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) { @@ -5581,10 +5591,4 @@ hns3_reinit_dev(struct hns3_adapter *hns) } - 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) { -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:47.475939167 +0000 +++ 0133-net-hns3-fix-operating-queue-when-TCAM-table-is-inva.patch 2022-02-21 15:22:44.272704533 +0000 @@ -1 +1 @@ -From eae97230dc2ab9553cdb335ab9b287a18a1b0c97 Mon Sep 17 00:00:00 2001 +From 2ae91ac6603c2230f7bae0890096e90d23f1d896 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 209ec75eac..2de1325d4b 100644 @@ -24 +25 @@ -@@ -4379,4 +4379,8 @@ hns3_init_hardware(struct hns3_adapter *hns) +@@ -4406,4 +4406,8 @@ hns3_init_hardware(struct hns3_adapter *hns) @@ -33 +34 @@ -@@ -5548,4 +5552,10 @@ hns3_reinit_dev(struct hns3_adapter *hns) +@@ -5575,4 +5579,10 @@ hns3_reinit_dev(struct hns3_adapter *hns) @@ -44 +45 @@ -@@ -5554,10 +5564,4 @@ hns3_reinit_dev(struct hns3_adapter *hns) +@@ -5581,10 +5591,4 @@ hns3_reinit_dev(struct hns3_adapter *hns)