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 18B324301F for ; Thu, 10 Aug 2023 02:11:12 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0E745410FD; Thu, 10 Aug 2023 02:11:12 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2048.outbound.protection.outlook.com [40.107.243.48]) by mails.dpdk.org (Postfix) with ESMTP id 5775D406B6 for ; Thu, 10 Aug 2023 02:11:11 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZeHqIcWA3bOtY/RYXpX/Izb143udtpgRDJlrf+EO/lACeg3L1AEus7F2umnqHNgQAwS9KCiH3IdNpGy6N21YtmCrVZKSb5HkE7qmqCm7M0yPO4gtimF3S5T+iDWCbQwa1vKBsYwQ/ZPF+CnVYwugbhySGNbUnXLFTcp0uryTPRZQqpsn1uT3Wl7AwgNEjE/Lc7ioGru2MFHchEh2xAlEazY1zkUlOmd6wPTXG4KZmGtD7SspiYWwObScy8PlWvHRpTsextjvGiJe7xLRGd25JiADe3+oBXgVFDi88cqluJcfG8ZpgJt4iqbz6O4f1ViGfHXrJxjI7v7WgD18DNYBwg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=LLDx0vIK4F1QO5eGNKHciDG1O6I5I9YoN9xJj9A1H0M=; b=POcsjmZSw4qPoGijl0fqTlXyvObPJ1AWUGuz8MswE3880JOe+bDr17fMF9joRnBMzwHheHBvH+AqcceoufabXEsUUEPV/XoDCQ1IrEbhP6mop9KvO9xBSfkThh9f3ZlPgWIYrvplCtiZkfRCcicijOoJS1C51Z/chkOnBCJ/yQ09Sdj1gBalB8YcZ/NsilRVeuoMQ6+oMNSLi6gC410xuQY6coq+VZs8RA2uEus+NTwgu+cvIW39TX+5Gmn7yWVx9pCVNfuLZKa/XPHcjthiL41MyHtCcxwyPanreVcIj0cGMjLklj05dY435Z2DKa4cWl2sj5IAZb6yMN6rs0p2IA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=LLDx0vIK4F1QO5eGNKHciDG1O6I5I9YoN9xJj9A1H0M=; b=kf8VItHBglyu6rvXZspBrtOqEjfCYLty26uZSlJWy9mbODT1mIGFIWGDU5xB1geePXda7+I4N1qogD60aeu0ZoTiyfXXaApi7UZNuZ9J6LJnWnxvwgifoWhR08JOLbDkRKccYx3obHCc7yqLzCpYG0MDeCnxxaT7xqVxmmXccqlZ1gIRivfFslZBo41ADiKc+2zwXrrd/j4NgaPbOiv5snX6MTgdAWFnFv7F6eAym8SrdhU583Zf5JtP8lIgpLwAzbhWTanqizKQmv6pcpU2aS9DwYi/TouGepVx15sfo1DA18Rg3KhxoetiEAVVS5/G6oCoFZtW3LT6gQW0bPG/lA== Received: from BY5PR17CA0031.namprd17.prod.outlook.com (2603:10b6:a03:1b8::44) by CY8PR12MB8215.namprd12.prod.outlook.com (2603:10b6:930:77::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.28; Thu, 10 Aug 2023 00:11:09 +0000 Received: from CO1PEPF000044F1.namprd05.prod.outlook.com (2603:10b6:a03:1b8:cafe::3c) by BY5PR17CA0031.outlook.office365.com (2603:10b6:a03:1b8::44) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.28 via Frontend Transport; Thu, 10 Aug 2023 00:11:09 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CO1PEPF000044F1.mail.protection.outlook.com (10.167.241.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.19 via Frontend Transport; Thu, 10 Aug 2023 00:11:09 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Wed, 9 Aug 2023 17:10:59 -0700 Received: from nvidia.com (10.126.231.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Wed, 9 Aug 2023 17:10:57 -0700 From: Xueming Li To: Zhichao Zeng CC: Bartosz Staszewski , Qi Zhang , dpdk stable Subject: patch 'net/iavf: fix stop ordering' has been queued to stable release 22.11.3 Date: Thu, 10 Aug 2023 08:10:24 +0800 Message-ID: <20230810001045.2662-4-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230810001045.2662-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> <20230810001045.2662-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.37] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000044F1:EE_|CY8PR12MB8215:EE_ X-MS-Office365-Filtering-Correlation-Id: c8652b34-5636-46fe-b38b-08db99364c92 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Oy4zmpudltyaLUBX8f+Lm9+k0tLHlWxDohyJdt2eLQS83124pH+VsCePAfPV2mr7M1uKRYz2c/b4BHmDniG4nA6/1Gq3v1kR38Ue2liBec+C4e8cGck/ZjWuhxWZJDznjJjVFRF0brzu2+euWVvr0EOZ5zi59NLzYQCWoliUz+Dl0QZU/nyYkX5nWv51Y7aB03/3+WDd0gH2/ZzvUpIiDxnzcn9vZVyAiIeOXOBVWseBzYajCFdiFWPKUCBJCKtu0AzZKu/67rDS4CNJTDdAEyTyDOa6AwjaVkidz+GD3SbRmd8Nul9d/T13gE4T8HQK8Vm9bKb4/tW2SHy09W3fIKwnZ2ekaXZyVHA2FiDmGoM4mzvtRN/3ff5fLdfgo0yoMM/9mlG27L2BCv80JzyzaLlydAN+y+sV1ZdovZStvTtD+R1pKna5HxvZ4J/UfAzr47lFO7Vc1G96M5ahvEt5ptrfyreXMSNn2JjiP1KJ1d3yYkci9kg8aHbbC0WDxIKkr0MvZSWdvQz6TvRSFsiYGbrkJ9pYFzACoNRk7MOybO2UAT6UwsFMSGl/zzfVwSEySfQQPXek2YGYb2LbQFEPB2W3Up0ArIC23n6crXb5gr8CC0AGOy8FGQMlNWigTEgMEQyO6T/JWO3oxsSN6ulfcouWHqwO64jtEoRYPf/gob3x/n9Il+QgKqVPOJurFD37C9qRCV6/NeTVAYQxjCmn1aldVnqHpExwTbgCN6SZI8yc7aGNtZr09b+dICUIPcRZSV9VBvP7QQKkReOnXa35/A== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(346002)(136003)(396003)(39860400002)(376002)(82310400008)(1800799006)(451199021)(186006)(36840700001)(46966006)(40470700004)(8676002)(70206006)(478600001)(8936002)(4326008)(36756003)(70586007)(6916009)(86362001)(5660300002)(41300700001)(40460700003)(53546011)(55016003)(36860700001)(40480700001)(316002)(54906003)(2906002)(7636003)(356005)(7696005)(6666004)(82740400003)(6286002)(966005)(1076003)(336012)(16526019)(2616005)(47076005)(83380400001)(426003)(26005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Aug 2023 00:11:09.4086 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c8652b34-5636-46fe-b38b-08db99364c92 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1PEPF000044F1.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB8215 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 22.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/11/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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=eebdd516b374c17c622dc65a54f2acbe78218244 Thanks. Xueming Li --- >From eebdd516b374c17c622dc65a54f2acbe78218244 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 Cc: Xueming Li [ 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 e74bf83b77..f483c8cd69 100644 --- a/.mailmap +++ b/.mailmap @@ -144,6 +144,7 @@ Balazs Nemeth Bao-Long Tran Barak Enat Barry Cao +Bartosz Staszewski Baruch Siach Bassam Zaid AlKilani Beilei Xing diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c index 9b3cbee7d4..610547502b 100644 --- a/drivers/net/iavf/iavf_ethdev.c +++ b/drivers/net/iavf/iavf_ethdev.c @@ -1078,8 +1078,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 */ @@ -1092,6 +1090,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.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-08-09 21:51:20.907040800 +0800 +++ 0107-net-iavf-fix-stop-ordering.patch 2023-08-09 21:51:18.274352000 +0800 @@ -1 +1 @@ -From 87b2afdea3aae6095aa80956ae2e15f602594185 Mon Sep 17 00:00:00 2001 +From eebdd516b374c17c622dc65a54f2acbe78218244 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 87b2afdea3aae6095aa80956ae2e15f602594185 ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -25 +27 @@ -index 670d312f84..9ce554451b 100644 +index e74bf83b77..f483c8cd69 100644 @@ -28,2 +30,2 @@ -@@ -151,6 +151,7 @@ Bao-Long Tran - Bar Neuman +@@ -144,6 +144,7 @@ Balazs Nemeth + Bao-Long Tran @@ -37 +39 @@ -index ac7154d720..f2fc5a5621 100644 +index 9b3cbee7d4..610547502b 100644 @@ -40 +42 @@ -@@ -1087,8 +1087,6 @@ iavf_dev_stop(struct rte_eth_dev *dev) +@@ -1078,8 +1078,6 @@ iavf_dev_stop(struct rte_eth_dev *dev) @@ -49 +51 @@ -@@ -1101,6 +1099,8 @@ iavf_dev_stop(struct rte_eth_dev *dev) +@@ -1092,6 +1090,8 @@ iavf_dev_stop(struct rte_eth_dev *dev)