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 CA3D842EC5 for ; Thu, 20 Jul 2023 12:59:08 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C6FA941144; Thu, 20 Jul 2023 12:59:08 +0200 (CEST) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) by mails.dpdk.org (Postfix) with ESMTP id 0549240DF5 for ; Thu, 20 Jul 2023 12:59:07 +0200 (CEST) Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-3144098df56so580235f8f.2 for ; Thu, 20 Jul 2023 03:59:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689850746; x=1690455546; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=shTKyFakraEzHp3GQuZwQURSN/HQvawBjBIw4uO5oDA=; b=Cwf1YRoyp5vxpTEDo1KC4+2wODwzbz+vgHEGh7ORzYYlNY5Zl1ddVUnTKq/8mogdu1 H1ZInTk4cRfL+P41o8skoaHDLLsfEIPYaW3Q97JS5hhWZpCONNFGXwgdJ6dmX8OzHwND Pw6GibBrLMOOuwd6sOIG2q0rvSRnCnbdpDdIPR2PNsHiUuiX4Psik7LLLDU0DJhn3EiL lKlWSmN+28sNLou9z+2JkmYoI/RPzUfCDU80a6gXiExFCh3hOVPVb2KnaUIbn0/rlWGQ nhI+AIpzC4QmO818ZJvuIXXo23scpaLxfou02UGh01OXOM+WrEiVY90gkLJUxEnNU5h9 vomQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689850746; x=1690455546; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=shTKyFakraEzHp3GQuZwQURSN/HQvawBjBIw4uO5oDA=; b=hnQNGi83nu/ykLontQ1+vvt/K7WviQEJQcSEUnYiYQ7zDDXimPTYkJ4IbP+ng7wmL1 Xl8UmPju4gydnCXHnmrfvhiFN/N1M7Rw5LhatOrw9B2BI+8qnB1BAARdln/IQnbjvIKs GZ8cbYU9IOAmtkZOkbZlKw7XDFv/0gXb7m3YuJ6wWoFbbWLxPZHAGjeqTQhxMtVDExXJ uU2I/9I9vZHa7nHRHISK9aTBxBD8QQwJdybCkaq59/pfJUq0yTE9aYaWdlZdsDNuJy3N ctG6MlL8knE21aw/yCFQ0L3cvBvWHNSCpZZ2SOiq/nUu5LzoEBIGDt0TU20Ft1JKWttU GA4A== X-Gm-Message-State: ABy/qLZ/bzsWB/izDZqJrZGTVfdLT3FyXPtasvOiHPhq0BLMAE35akg6 HsA9HLZBkZT1aCPCplLIqm4= X-Google-Smtp-Source: APBJJlEwKM1ENf5NMU+nWSFxn6EPp6MxqOpBNg0GYhw2xV6Cis7OXlWK1ydefltpjG367OzA/+2Lug== X-Received: by 2002:a05:6000:1042:b0:315:adee:1297 with SMTP id c2-20020a056000104200b00315adee1297mr2025411wrx.10.1689850746657; Thu, 20 Jul 2023 03:59:06 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id u1-20020adfdb81000000b0030e5bd253aasm1002787wri.39.2023.07.20.03.59.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jul 2023 03:59:06 -0700 (PDT) From: luca.boccassi@gmail.com To: Zhichao Zeng Cc: Bartosz Staszewski , Qi Zhang , dpdk stable Subject: patch 'net/iavf: fix stop ordering' has been queued to stable release 20.11.9 Date: Thu, 20 Jul 2023 11:58:52 +0100 Message-Id: <20230720105859.2537307-3-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230720105859.2537307-1-luca.boccassi@gmail.com> References: <20230714223447.1092828-18-luca.boccassi@gmail.com> <20230720105859.2537307-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.9 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/22/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/566d11fdc503b961109423c07973347ba7ce9bce Thanks. Luca Boccassi --- >From 566d11fdc503b961109423c07973347ba7ce9bce 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 --- drivers/net/iavf/iavf_ethdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c index ddd877724a..127d79318d 100644 --- a/drivers/net/iavf/iavf_ethdev.c +++ b/drivers/net/iavf/iavf_ethdev.c @@ -756,8 +756,6 @@ iavf_dev_stop(struct rte_eth_dev *dev) if (adapter->stopped == 1) return 0; - iavf_stop_queues(dev); - /* Disable the interrupt for Rx */ rte_intr_efd_disable(intr_handle); /* Rx interrupt vector mapping free */ @@ -773,6 +771,8 @@ iavf_dev_stop(struct rte_eth_dev *dev) iavf_add_del_mc_addr_list(adapter, vf->mc_addrs, vf->mc_addrs_num, false); + iavf_stop_queues(dev); + adapter->stopped = 1; dev->data->dev_started = 0; -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 11:54:24.365898201 +0100 +++ 0003-net-iavf-fix-stop-ordering.patch 2023-07-20 11:54:24.229504431 +0100 @@ -1 +1 @@ -From 87b2afdea3aae6095aa80956ae2e15f602594185 Mon Sep 17 00:00:00 2001 +From 566d11fdc503b961109423c07973347ba7ce9bce Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 87b2afdea3aae6095aa80956ae2e15f602594185 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -20 +20,0 @@ - .mailmap | 1 + @@ -22 +22 @@ - 2 files changed, 3 insertions(+), 2 deletions(-) + 1 file changed, 2 insertions(+), 2 deletions(-) @@ -24,12 +23,0 @@ -diff --git a/.mailmap b/.mailmap -index 670d312f84..9ce554451b 100644 ---- a/.mailmap -+++ b/.mailmap -@@ -151,6 +151,7 @@ Bao-Long Tran - Bar Neuman - Barak Enat - Barry Cao -+Bartosz Staszewski - Baruch Siach - Bassam Zaid AlKilani - Beilei Xing @@ -37 +25 @@ -index ac7154d720..f2fc5a5621 100644 +index ddd877724a..127d79318d 100644 @@ -40 +28 @@ -@@ -1087,8 +1087,6 @@ iavf_dev_stop(struct rte_eth_dev *dev) +@@ -756,8 +756,6 @@ iavf_dev_stop(struct rte_eth_dev *dev) @@ -49 +37 @@ -@@ -1101,6 +1099,8 @@ iavf_dev_stop(struct rte_eth_dev *dev) +@@ -773,6 +771,8 @@ iavf_dev_stop(struct rte_eth_dev *dev)