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 42E5AA0543 for ; Tue, 21 Jun 2022 10:12:13 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 46D64427E9; Tue, 21 Jun 2022 10:11:45 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2049.outbound.protection.outlook.com [40.107.223.49]) by mails.dpdk.org (Postfix) with ESMTP id CB5DB42B92 for ; Tue, 21 Jun 2022 10:11:43 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Q5kqGz69iWMzNwsCyTdGPjUcyTbrH1YU22GDK6LTlCQ5zvrK1XheSxcnbZbf00th9+N58Tt/S4u4Gk+Yw5xiAJHQwJDSKUcyk1WP8O3wCYQcY0P9shHWFFRBuYQ/42rolZ5RK4u2dZ+HXvCHMHxYDrxfZSwkGXKVPcigji+UjJm2jncFEvKM7OJQcy3hmtTa3x+vx5/KmdssxB3XKymxTP25W9yYTXcnCZ5HsfUbqRT6i6heKMrXPYde5qJdwICsiMQP8SGb3aoxYqux9pmf7LL1QpRUltnd6FhE1bIPCME83ub2t2TXeRCCNRXT9kvlkUaP/LPTWA4Az6fS/OHB+w== 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=n7cz+EMdv8TJPPCEiXriyqHDLRQlfl/Y/X000WRE1h0=; b=FkwDx+WJHp7ghDKthS8T2bvNiT6TOFP3AZu0/0U4E+xNimKmt9RLeOiRhGMhoCZLfIEQ1RaX/4cMWZZo8otwcZs1g/sv9SjRgt93OmTNSYKr1pV/SibcyGVkYOHPV69rUoOZKast2etcxs8VexbqtDuHpvbUy95UlnPOa9BsAjwYOxtKqOWrw9BwATX73oouMKTPZDOiM8PxcyrY0xYLQKejMdUEB5WzTEBgyfei4UlvjjyHzEVMfrv+O5WVYEKR4YhgNxIn4TxRY5A5H8MceReXiSXraVL/z0V1f1aYzlEjf2X6nsQul0U88rCCoT+wClV2YREzIsTyCGdTH34vPw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.235) smtp.rcpttodomain=dpdk.org 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=n7cz+EMdv8TJPPCEiXriyqHDLRQlfl/Y/X000WRE1h0=; b=ZZeMvHy8CsAVZ+KZP0nZMhpCmClsXChpFKf6PDz7bTnn58m/je9aycih83RefB0JBfBf/J2M18ulIJH6qxcpvIZOLbDpiLX+3+sypZAGMpRDndRGbmKnX13SEZURnU3zevdbpGuh4ybUGJc7PmgwwvhKMyE/p/0VFmTXTLIvfasyX9FT570uYFDkFZPXpk2mI9UfWLNy/49zlB98+WvLgiXZjy5CLiF0dN8VQO5G3FzSASWvjsvj5tjp8uJo1N0uUptGuqjLLFkOW25Jl0IcOlgombtuoeIz9u5iSBMoi3AXfEHRnBoKFXYkx+UtPPSHl+TGHC7nMCt1XQNMM7y0IQ== Received: from MWHPR19CA0093.namprd19.prod.outlook.com (2603:10b6:320:1f::31) by DM6PR12MB4058.namprd12.prod.outlook.com (2603:10b6:5:21d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.15; Tue, 21 Jun 2022 08:11:42 +0000 Received: from CO1NAM11FT056.eop-nam11.prod.protection.outlook.com (2603:10b6:320:1f:cafe::e9) by MWHPR19CA0093.outlook.office365.com (2603:10b6:320:1f::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.22 via Frontend Transport; Tue, 21 Jun 2022 08:11:42 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.235) 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 12.22.5.235 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.235; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (12.22.5.235) by CO1NAM11FT056.mail.protection.outlook.com (10.13.175.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5353.14 via Frontend Transport; Tue, 21 Jun 2022 08:11:41 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL107.nvidia.com (10.27.9.16) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Tue, 21 Jun 2022 08:11:41 +0000 Received: from nvidia.com (10.126.230.35) 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.22; Tue, 21 Jun 2022 01:11:39 -0700 From: Xueming Li To: Qiming Yang CC: Qi Zhang , dpdk stable Subject: patch 'net/iavf: fix queue start exception handling' has been queued to stable release 20.11.6 Date: Tue, 21 Jun 2022 11:02:44 +0300 Message-ID: <20220621080301.2315720-99-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220621080301.2315720-1-xuemingl@nvidia.com> References: <20220621080301.2315720-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] 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-Office365-Filtering-Correlation-Id: 0225015c-b438-4e7f-940d-08da535dacae X-MS-TrafficTypeDiagnostic: DM6PR12MB4058:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: o1tswSS07twQ5TuIRC+QhH94fDq2BSFRnMVa91WO+u1z0BSXmGQJjKRy97OnkBGdRrMYBhztug5t6TzCkaCpdjUDTLoppGVV4lY/tZuLcjzUdnAUK19KfeIEVA3dJxk4CZ9z8kbz7F2EGGnrqFhYvXuoC+70UxXrulpmrync9JXx7SZrCPgCmV98TUh1iaovhOdmkYJPQBU8ahWqC5L777j8ufOGxyHnBkYMnAy0YxYgLBe2G4hsgoYw0PclNGHYRReCC5YH33rRJa3+waU64hnZstEC1dplXHb07h/lD/5HAla6viYgcRERQ2h7un0/kACXPEO2jCnzNqcLWwuSDWJujChQA8uc/D2rs+7nKonbE1qiovXkdsICOiInc/cpckVo1WBzw2n7BE0nZ2+UefUQpkfdbs3kiYwSknUzVYf7OQ0R9dJ5XROR7xoMfrv6nt6VC7wWFQQ32CtrW82s+HwN8dWtJAOwSxC/dJqbA7XGRh+JhLJY8s00JcqYpOVW1AuRP6Xd6qum74FWPnwZd4Dfljm6U2D7wTpBame46F4xwDAdRXWM6bWyxLuLp/UzBIpJ0gQVig7Dxs2ASBONuYU4yomG0rCryePGu99GcTg1kE3tFIdS2i2APfAmsOBoUFbOPdgO2Fo6/6QYruhKLDTXnxuKI3bDGOWJajrKxCovekfpz+qQRO2rHlvdgQNGydD1KIZup7ScLY16KdXdFzBbbD8nHOrV/1064T1NF/KGX+O3K3ZfyGmTNi6tmMzQSOvmxPgyov4Jgp5s0IDHKGezz86M5wVcoUumt/6yVdtMYP+WnfWDhLPy/l8rwU3kq03sOKjTU4qUggtQBA6FteeAGa86CdKShXWAbagduZk= X-Forefront-Antispam-Report: CIP:12.22.5.235; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(13230016)(4636009)(346002)(376002)(39860400002)(396003)(136003)(36840700001)(46966006)(40470700004)(966005)(478600001)(316002)(4326008)(2906002)(54906003)(6916009)(6286002)(26005)(7696005)(8936002)(86362001)(53546011)(70586007)(36756003)(2616005)(41300700001)(8676002)(70206006)(336012)(83380400001)(426003)(81166007)(5660300002)(40460700003)(1076003)(82740400003)(47076005)(16526019)(40480700001)(55016003)(356005)(6666004)(36860700001)(186003)(82310400005)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jun 2022 08:11:41.9282 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0225015c-b438-4e7f-940d-08da535dacae X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[12.22.5.235]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT056.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4058 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/23/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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/755ea301dbaa6a3b50d3c64407483f716538358e Thanks. Xueming Li --- >From 755ea301dbaa6a3b50d3c64407483f716538358e Mon Sep 17 00:00:00 2001 From: Qiming Yang Date: Thu, 19 May 2022 05:01:56 +0000 Subject: [PATCH] net/iavf: fix queue start exception handling Cc: Xueming Li [ upstream commit 1fa739c3f2b3876d21e506c024a3c6bee6562943 ] If any queue start fail during dev_start, all started queues should be stopped. Fixes: 69dd4c3d0898 ("net/avf: enable queue and device") Signed-off-by: Qiming Yang Acked-by: Qi Zhang --- drivers/net/iavf/iavf_ethdev.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c index 3397d87e8a..bbbd7e84a4 100644 --- a/drivers/net/iavf/iavf_ethdev.c +++ b/drivers/net/iavf/iavf_ethdev.c @@ -634,28 +634,38 @@ iavf_start_queues(struct rte_eth_dev *dev) struct iavf_rx_queue *rxq; struct iavf_tx_queue *txq; int i; + uint16_t nb_txq, nb_rxq; - for (i = 0; i < dev->data->nb_tx_queues; i++) { - txq = dev->data->tx_queues[i]; + for (nb_txq = 0; nb_txq < dev->data->nb_tx_queues; nb_txq++) { + txq = dev->data->tx_queues[nb_txq]; if (txq->tx_deferred_start) continue; - if (iavf_dev_tx_queue_start(dev, i) != 0) { - PMD_DRV_LOG(ERR, "Fail to start queue %u", i); - return -1; + if (iavf_dev_tx_queue_start(dev, nb_txq) != 0) { + PMD_DRV_LOG(ERR, "Fail to start tx queue %u", nb_txq); + goto tx_err; } } - for (i = 0; i < dev->data->nb_rx_queues; i++) { - rxq = dev->data->rx_queues[i]; + for (nb_rxq = 0; nb_rxq < dev->data->nb_rx_queues; nb_rxq++) { + rxq = dev->data->rx_queues[nb_rxq]; if (rxq->rx_deferred_start) continue; - if (iavf_dev_rx_queue_start(dev, i) != 0) { - PMD_DRV_LOG(ERR, "Fail to start queue %u", i); - return -1; + if (iavf_dev_rx_queue_start(dev, nb_rxq) != 0) { + PMD_DRV_LOG(ERR, "Fail to start rx queue %u", nb_rxq); + goto rx_err; } } return 0; + +rx_err: + for (i = 0; i < nb_rxq; i++) + iavf_dev_rx_queue_stop(dev, i); +tx_err: + for (i = 0; i < nb_txq; i++) + iavf_dev_tx_queue_stop(dev, i); + + return -1; } static int -- 2.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-21 15:37:53.616390842 +0800 +++ 0098-net-iavf-fix-queue-start-exception-handling.patch 2022-06-21 15:37:49.207785188 +0800 @@ -1 +1 @@ -From 1fa739c3f2b3876d21e506c024a3c6bee6562943 Mon Sep 17 00:00:00 2001 +From 755ea301dbaa6a3b50d3c64407483f716538358e Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 1fa739c3f2b3876d21e506c024a3c6bee6562943 ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ -index 198d8299af..315ab15aad 100644 +index 3397d87e8a..bbbd7e84a4 100644 @@ -22 +24 @@ -@@ -926,28 +926,38 @@ iavf_start_queues(struct rte_eth_dev *dev) +@@ -634,28 +634,38 @@ iavf_start_queues(struct rte_eth_dev *dev)