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 0920BA0543 for ; Tue, 21 Jun 2022 10:06:25 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0374840151; Tue, 21 Jun 2022 10:06:25 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2079.outbound.protection.outlook.com [40.107.94.79]) by mails.dpdk.org (Postfix) with ESMTP id 7D03B4280B for ; Tue, 21 Jun 2022 10:06:23 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Pn0/zc0fNZLyvZdTbJz8UGf6K79izTLWzpF8nQROcgboZmyxrmshgaepnAKuGFv4jTcQujPfFGipnxIk/RrdhOXZHDjWrBtE4/CwVjuHxr87BhMmZDvK8Inb5knNp4df7WXv2r1KyQ7xL4izCDyFlPNl78JOi+PL1IAyOv/2i58JNd4qx6QfnzKP0EwYYsq9tOaCNbVfyGfvpfkyTLBTT2PlmN5GkNa/uEW+XCfZy21zMON82qvgFvDVOh7k3RF9RkyaSdTDwbttRpBYgdAT+3KSNjdmau/MW0ZM7NERiN70dBSunB/sVI6rOXX9fdlB5qB9F+Y26Q3Ui3TEqElbkw== 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=OFUNYQ3TUiwaWr+OxOzQwSo6KIGiFiDAxHJJGg0X6nc=; b=GVPaLoc+GLvqgZRyxaRzW9MenSZfslEnNsvF5PEGkE0nOelgE5K5CdWaiLfssgOMrLtgwFZJbC4bAVPNbdirQ0C7ov/duELFVXB+rbab5xPfsMDB0kW7mg+CgXGpdUX1K7U4RyjjIn2EcTWwzDoXZrRUq7jrwPJtb4IcqlpGGQ9Z/CBIUgxEzK1c/q6xkV/0sfIgEoYW9DfjM4enw51wqKhw3TfuD1iIc0tJLMsdIeWDoF2NjxDy2FSQJhYbOdCqVRp20XJMLJM/90k0wzkl3UUuHKgYTWXVr5IwfFZZd6MW/ZFK+cGz07MQpi94kQ8VD75BMamsE53yX1HzyI9rGA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.238) 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=OFUNYQ3TUiwaWr+OxOzQwSo6KIGiFiDAxHJJGg0X6nc=; b=W+04OmIbotHiynbl5skrQMGsmkoR0RPcdLbKwiLehUneH3F62DYMs8PwKbQRwBTkb/AZeZ0oHcpogeoJ+DFeiZnGRCeAd+7gRSE7CZa58ZqQX0lVn++VMy0uGV0S/r/+aaUaEDAAkWCR82kSAwbsT/Y7ohr/IsZC3eUEjByVy8Oqah41yLJMgKPC9izK0jw/niIIWTX1mNqCCJkrGvVeZVItnyFeaaLiM5g9WT48kRgSRqn08+SvCGKDeTvzqvUuNuxTkcf3xbUSenL7+Dt9V9mBDHuDkwVQWhD3d6MUY0yFn6Uq6uB6zDY7IUFsN4QgZ95Icx/g7jrBDI0g7uz28w== Received: from DM5PR07CA0136.namprd07.prod.outlook.com (2603:10b6:3:13e::26) by BL1PR12MB5047.namprd12.prod.outlook.com (2603:10b6:208:31a::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.16; Tue, 21 Jun 2022 08:06:21 +0000 Received: from DM6NAM11FT031.eop-nam11.prod.protection.outlook.com (2603:10b6:3:13e:cafe::b) by DM5PR07CA0136.outlook.office365.com (2603:10b6:3:13e::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5353.14 via Frontend Transport; Tue, 21 Jun 2022 08:06:21 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.238) 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.238 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.238; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (12.22.5.238) by DM6NAM11FT031.mail.protection.outlook.com (10.13.172.203) 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:06:20 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL105.nvidia.com (10.27.9.14) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Tue, 21 Jun 2022 08:06:20 +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:06:18 -0700 From: Xueming Li To: Huisong Li CC: Min Hu , dpdk stable Subject: patch 'net/bonding: fix slave stop and remove on port close' has been queued to stable release 20.11.6 Date: Tue, 21 Jun 2022 11:01:42 +0300 Message-ID: <20220621080301.2315720-37-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: 2b30b539-c84e-4e40-0755-08da535ced46 X-MS-TrafficTypeDiagnostic: BL1PR12MB5047: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: ep1ItNsimYnGfr0dl06ioFo4Ov8pHlNNmY2AYZ5vPHHpWCKJKwJsL+v/btbNZ7g7OIPpBDu/r8PGgvA1EDV+QR/yEHNrFDFixMfemgcv66o/+05l508GoYa2ssbiO8MYt5vdhY9rO+3Lw45l16gMbd12UsNb8K/YLydyxA0TyyNNwAhF5as12tTWFjB4hMPZE/k/rK4VuZxSVMf0wgFghINauR6wmFF7VECSCOKlIXboLHQbgCXv5WEkInIgFIZDL4EzGJqrsuZiQBe7d9uAVIgW5Vj6hNbWevNcc5OqaHbmjf+AluBG5YrBe2PKEyt0kzCfL4rbxzoTRMD6/E0qxjCZUs2QDRDFq+2Kw44Uuj1b6w6oMq6VgNIjxjlOUHmXu0/OX4OeduozMCjh0dBCWS0j8SJEhMFGCvpJlHY5v/JCDcpjz2EaYc3NQqJyp6wL65wrO0PlnPc6ZsphAUvWqASAM/HxskVxyV7w92l/deOXlllR/AEszDL7H1xAsqVeiD0sKLnW5MBzzRKV2U8bzeQk7o3HUFtbvweA1jPEfYZIbCsN51uNq2dz754vUnogNK1cTT8O04dyBHjFakwaDLqcS9AXFOw9yY/S6butkJCYwrNo04rMyjP8LYH/IhqDgL25HFd5tpmUvHv6FXmNmsjsH/qOQrKjOQlLzLmaOb8fqAu98qOfGSuavYY3sr+KihuTwvm21CxHInFWctoF8jnIq1m1ifnuupCRl+JOVkgFjo1uuWjFuxqcOyJ/QUsblkkqQE7Pq/CTlxxt8kb3hYxnaEbHZ4f6cA86RxwqJUR494RyE5KhijyLhFbkLjWhrhuTBUVFvolNuRhI92FG6xPmJM+pcY4Oi5ea94epHZo= X-Forefront-Antispam-Report: CIP:12.22.5.238; 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:06:20.7982 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2b30b539-c84e-4e40-0755-08da535ced46 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.238]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT031.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5047 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/4997f02390d39b1e5867fa6257fdcd7eb9e8c3f9 Thanks. Xueming Li --- >From 4997f02390d39b1e5867fa6257fdcd7eb9e8c3f9 Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Tue, 3 May 2022 18:02:14 +0800 Subject: [PATCH] net/bonding: fix slave stop and remove on port close Cc: Xueming Li [ upstream commit 1c5c6cd85f8cab2af92d265b6c7671df0b82e6fb ] All slaves will be stopped and removed when closing a bonded port. But the while loop can not end if both rte_eth_dev_stop and rte_eth_bond_slave_remove fails, runs infinitely. This is because the skipped slave port counted in both function failures but it should be counted only one. Fixing by not continue to process in the loop after first failure. Fixes: fb0379bc5db3 ("net/bonding: check stop call status") Signed-off-by: Huisong Li Signed-off-by: Min Hu (Connor) --- drivers/net/bonding/rte_eth_bond_pmd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index bda69c9e4f..259651a0c5 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -2138,6 +2138,7 @@ bond_ethdev_close(struct rte_eth_dev *dev) RTE_BOND_LOG(ERR, "Failed to stop device on port %u", port_id); skipped++; + continue; } if (rte_eth_bond_slave_remove(bond_port_id, port_id) != 0) { -- 2.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-21 15:37:50.955349523 +0800 +++ 0036-net-bonding-fix-slave-stop-and-remove-on-port-close.patch 2022-06-21 15:37:49.017784514 +0800 @@ -1 +1 @@ -From 1c5c6cd85f8cab2af92d265b6c7671df0b82e6fb Mon Sep 17 00:00:00 2001 +From 4997f02390d39b1e5867fa6257fdcd7eb9e8c3f9 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 1c5c6cd85f8cab2af92d265b6c7671df0b82e6fb ] @@ -15 +17,0 @@ -Cc: stable@dpdk.org @@ -24 +26 @@ -index 605fc2ffb5..f0668a636f 100644 +index bda69c9e4f..259651a0c5 100644 @@ -27 +29 @@ -@@ -2156,6 +2156,7 @@ bond_ethdev_close(struct rte_eth_dev *dev) +@@ -2138,6 +2138,7 @@ bond_ethdev_close(struct rte_eth_dev *dev)