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 30DBF42EDA for ; Fri, 21 Jul 2023 15:35:42 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2E35F42D40; Fri, 21 Jul 2023 15:35:42 +0200 (CEST) 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 5089C40E2D for ; Fri, 21 Jul 2023 15:35:39 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689946538; 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=f0Lv7v71Gbs6u+w9R8fxDwYMWKSY6ftBiIlFlV6Km6o=; b=PnyO2yCmpzbsuAa3OSfGQIfeaD3g3BjApAGVnbdwoYFdQ8UNwm0IJ8oXH8tFbR1874utGB HoVzaONEiFlYDB+SKQxDwZk7yfB2QXga0NrYG4LJEpZaYgaWUXek/zRJx8s04+fu4+s106 wWuxpzmQPdxEeEsyNX37FMzlx12tAwc= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-271-vd9adcEAOfi30zwna6ZL-w-1; Fri, 21 Jul 2023 09:35:27 -0400 X-MC-Unique: vd9adcEAOfi30zwna6ZL-w-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4A1EE80123E; Fri, 21 Jul 2023 13:35:23 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 52903140E949; Fri, 21 Jul 2023 13:35:22 +0000 (UTC) From: Kevin Traynor To: Zhichao Zeng Cc: Bartosz Staszewski , Qi Zhang , dpdk stable Subject: patch 'net/iavf: fix stop ordering' has been queued to stable release 21.11.5 Date: Fri, 21 Jul 2023 14:34:58 +0100 Message-ID: <20230721133509.348959-3-ktraynor@redhat.com> In-Reply-To: <20230721133509.348959-1-ktraynor@redhat.com> References: <20230721133509.348959-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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.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 07/25/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/5a0e07583487a16021f43a1a740b26a925e5c656 Thanks. Kevin --- >From 5a0e07583487a16021f43a1a740b26a925e5c656 Mon Sep 17 00:00:00 2001 From: Zhichao Zeng Date: Wed, 12 Jul 2023 13:35:37 +0800 Subject: [PATCH] net/iavf: fix stop ordering [ upstream commit 87b2afdea3aae6095aa80956ae2e15f602594185 ] The current implementation stops queue before disabling the Rx interrupt, and when there are still unprocessed packets remaining in the queue, this may cause the Rx ring to timeout, leading to IOMMU fault. This patch disables the Rx interrupt before stopping the queue, ensuring that no packets received when disabling the queues. Fixes: 02d212ca3125 ("net/iavf: rename remaining avf strings") Signed-off-by: Bartosz Staszewski Signed-off-by: Zhichao Zeng Acked-by: Qi Zhang --- .mailmap | 1 + drivers/net/iavf/iavf_ethdev.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.mailmap b/.mailmap index 2b254e64ef..495f89e75d 100644 --- a/.mailmap +++ b/.mailmap @@ -145,4 +145,5 @@ Bao-Long Tran Barak Enat Barry Cao +Bartosz Staszewski Baruch Siach Bassam Zaid AlKilani diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c index 1afbc22d54..e40af1316d 100644 --- a/drivers/net/iavf/iavf_ethdev.c +++ b/drivers/net/iavf/iavf_ethdev.c @@ -1048,6 +1048,4 @@ iavf_dev_stop(struct rte_eth_dev *dev) return 0; - iavf_stop_queues(dev); - /* Disable the interrupt for Rx */ rte_intr_efd_disable(intr_handle); @@ -1062,4 +1060,6 @@ iavf_dev_stop(struct rte_eth_dev *dev) false); + iavf_stop_queues(dev); + adapter->stopped = 1; dev->data->dev_started = 0; -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-21 14:33:59.093677247 +0100 +++ 0003-net-iavf-fix-stop-ordering.patch 2023-07-21 14:33:59.001253204 +0100 @@ -1 +1 @@ -From 87b2afdea3aae6095aa80956ae2e15f602594185 Mon Sep 17 00:00:00 2001 +From 5a0e07583487a16021f43a1a740b26a925e5c656 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 87b2afdea3aae6095aa80956ae2e15f602594185 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index 670d312f84..9ce554451b 100644 +index 2b254e64ef..495f89e75d 100644 @@ -28 +29 @@ -@@ -152,4 +152,5 @@ Bar Neuman +@@ -145,4 +145,5 @@ Bao-Long Tran @@ -35 +36 @@ -index ac7154d720..f2fc5a5621 100644 +index 1afbc22d54..e40af1316d 100644 @@ -38 +39 @@ -@@ -1088,6 +1088,4 @@ iavf_dev_stop(struct rte_eth_dev *dev) +@@ -1048,6 +1048,4 @@ iavf_dev_stop(struct rte_eth_dev *dev) @@ -45 +46 @@ -@@ -1102,4 +1100,6 @@ iavf_dev_stop(struct rte_eth_dev *dev) +@@ -1062,4 +1060,6 @@ iavf_dev_stop(struct rte_eth_dev *dev)