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 2FC9C4301E for ; Thu, 10 Aug 2023 01:52:01 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2997940DD8; Thu, 10 Aug 2023 01:52:01 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2040.outbound.protection.outlook.com [40.107.236.40]) by mails.dpdk.org (Postfix) with ESMTP id 42F46406B6 for ; Thu, 10 Aug 2023 01:51:59 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=H4OhkMzwEbj7yxdIL1UQc2cLGOimu+qv+jpTArwKemtOTO+DdtVnjYkGq5cjCgC7zsO0wrV3o6A6FEDJYK5ySKCe8j7VtJ2XgAIs+KAStpFx0aKN20PJva/2txxVQi9yajhcn6VkP/7QJUApEs+39g4Z13Jijco/epHRY3ElB9Y4dpfLifCjC/MZBtqgVd9fsSs8hWFj70pTbwqRDJPO3LzXAALjaCtgjIBSwewhjOyCtvtYd+aCW1cGmCSq2Awz3Y0NMZV2cskEm/brX2raSLnmaWEQgnQHrjCA+XE/IUyDojrWKessY5AtJXB60Rm7Ws0/gjIFzYzZzce1GHTayA== 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=MqxwMjNoTc2IpGdgUAjEU59rpMq9zDe0rz0nFQ+jTmE=; b=K+cfvRjhiYV2HgK0tdDFBYev/BB6Cnns7okXCg5WeneMgvnrdCXp42SzPz6jlyV5cLXXpqRg6sx5YuIhD+cCq105GRv6eNBouJmA4gD1NAa/LILH0+SdQVL+nyM5rG3mbU8xCt+b0f7Yd1XXZmW+lQb3LhHLiHqNfzwHuLZ6FS6kfzChn6ACA9dMf6L2AJbAo6gY4sK8Tj0SXMmbrjAHspGubq7LSt19KcMF49SW2p5sMlK49hm2KnMn+aGRc1dJ2xZjY4p0odYLHp/rO+qIZWEtxXYrlreJvUS8EQM/+fEqfU6fMZvHW2XbG395PjQprdTBNduAtXrpgf2Egtj/JQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=corigine.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=MqxwMjNoTc2IpGdgUAjEU59rpMq9zDe0rz0nFQ+jTmE=; b=LGWh/uLyM6T0pqUV3l7PKO7FDHh9as+2fSXYZNSN3jrB5LcuJTALOgqGu2H3yw9aNTSFZ5NAx3BFuPfPNXYVUSSMLVahc9MUoYFtHJInSKmkYGa0tv5yUtzFAilEDAEtY0DHxyQss0dhI00pmOlpKIgwsdCh4u1R+H/lD9yfrLdXmyjXPP4gbJ6fAWFkGqGNed1D/W8JlB1xAcx5tpzuxqo3fHNO4T1UptYuWEHV/E+CD2zY5rPpKhCweeKlh9SVoj0us/xtTYXN9Y2qeQvOipvDpkChL0DWGgdQ8/sZP0UhyiYMqnRkZWJ3GSxc+Ac0AuvifzsHQA++VqNPJiMFpQ== Received: from SN7P220CA0014.NAMP220.PROD.OUTLOOK.COM (2603:10b6:806:123::19) by SN7PR12MB8603.namprd12.prod.outlook.com (2603:10b6:806:260::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.27; Wed, 9 Aug 2023 23:51:57 +0000 Received: from SA2PEPF000015C9.namprd03.prod.outlook.com (2603:10b6:806:123:cafe::a7) by SN7P220CA0014.outlook.office365.com (2603:10b6:806:123::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.28 via Frontend Transport; Wed, 9 Aug 2023 23:51:57 +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 SA2PEPF000015C9.mail.protection.outlook.com (10.167.241.199) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.20 via Frontend Transport; Wed, 9 Aug 2023 23:51:57 +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 16:51:41 -0700 Received: from nvidia.com (10.126.230.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 16:51:38 -0700 From: Xueming Li To: Long Wu CC: =?UTF-8?q?Niklas=20S=C3=B6derlund?= , Chaoyong He , Min Hu , "dpdk stable" Subject: patch 'net/bonding: fix destroy dedicated queues flow' has been queued to stable release 22.11.3 Date: Thu, 10 Aug 2023 07:47:43 +0800 Message-ID: <20230809234930.32424-22-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230809234930.32424-1-xuemingl@nvidia.com> References: <20230625063544.11183-1-xuemingl@nvidia.com> <20230809234930.32424-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.126.230.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: SA2PEPF000015C9:EE_|SN7PR12MB8603:EE_ X-MS-Office365-Filtering-Correlation-Id: a1ab28af-1d56-4cea-984b-08db99339e11 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nCK2P7muVFGbqqZUZsNo0vzigPpxmUCSXKLdFw7LqRMQcLVpv+8TxaSmO0RyayEEHlp6j1Nky8WQMzuiksLcryE7gAuTulLFRtad++1vYgck1HKbhABlfT041sGpfl9hWMUhWNhCVO6RnTLiQLfsgJ/zLK5AeatbsY8a2yq9I1njsC4I+5BbLdMUv1Qurh3yqjB4C3ZyTHyt24dpABusAWhSWZbH3z8bJxNaw2b3DOKZPDOuOJmQ2obC3fEL4oIL6b7KwhkKmVPr3Z7h4GNxQCDKPj65rAiD3J37njVrZjj91bE2an6fgWFRLgx6jk5novlHtKx3vFRpIae4tveQzfC+ieMIO0Hl/50s6CS9QK2bmuGlKPdxbPReYt22Bq/aecrx2A/aoLz82j5jrR7DCgCojxyFcmZGp0Bea7E0wyS5ETAQ7Md6qPBZhGmNnVTnS3o/5pxYWJ4qix/TkjZCBrHDxx969JNV1seMh+5OYCCdw3leWJxJCepGZ9BvEG6C05JiqyGtMQgWHx9YxEnIesrgn7dRT+OKJGnJJ8uLR9ucencpnqgB/8fgILHV+7LNlDlFWYT4jW0+0Jau+t8z1/UlWYOfAjcrskDuFb+0pNoGdwWqrIZJODNTFnyCUlPEIVpb4oryiULqK7suAITqnpkpdn1GEUkmYxvWn5ZDPXH4s5h9hCrnJbdF3oVj1zIOKFXYpDdVLfR8L+uB6SyLC9d0cQJKvlqq+88IA6ziH4e9P5rdpxbGHtFdHTpFdvrOLa+9CjqHrKZfLAH2HFxHvw== 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)(396003)(376002)(136003)(346002)(39860400002)(82310400008)(1800799006)(451199021)(186006)(36840700001)(40470700004)(46966006)(83380400001)(426003)(2906002)(316002)(40480700001)(66574015)(47076005)(36860700001)(41300700001)(70586007)(40460700003)(4326008)(53546011)(70206006)(1076003)(5660300002)(26005)(6666004)(8676002)(8936002)(55016003)(7696005)(478600001)(54906003)(86362001)(966005)(16526019)(36756003)(2616005)(336012)(7636003)(356005)(6286002)(82740400003)(6916009); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Aug 2023 23:51:57.5829 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a1ab28af-1d56-4cea-984b-08db99339e11 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: SA2PEPF000015C9.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB8603 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=ff476852e7e2e627b01bf215e214799807921f6d Thanks. Xueming Li --- >From ff476852e7e2e627b01bf215e214799807921f6d Mon Sep 17 00:00:00 2001 From: Long Wu Date: Thu, 8 Jun 2023 10:59:03 +0800 Subject: [PATCH] net/bonding: fix destroy dedicated queues flow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit f7755321f3294e94c1f1b9e645cc997a3e39f999 ] Bonding port in mode 4 enables dedicated queues, we will create a flow for this feature. So we need to destroy this flow when we remove the member port. Furthermore if we don't destroy the flow that created for dedicated queues when we remove the member port, maybe we couldn't add the member port to a new bonding port that needed dedicated queues. We add the destroy action in removing member port function. Fixes: 49dad9028e2a ("net/bonding: support flow API") Signed-off-by: Long Wu Reviewed-by: Niklas Söderlund Reviewed-by: Chaoyong He Acked-by: Min Hu (Connor) --- drivers/net/bonding/rte_eth_bond_api.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/net/bonding/rte_eth_bond_api.c b/drivers/net/bonding/rte_eth_bond_api.c index c0178369b4..85d0528b7c 100644 --- a/drivers/net/bonding/rte_eth_bond_api.c +++ b/drivers/net/bonding/rte_eth_bond_api.c @@ -712,6 +712,16 @@ __eth_bond_slave_remove_lock_free(uint16_t bonded_port_id, } } + /* Remove the dedicated queues flow */ + if (internals->mode == BONDING_MODE_8023AD && + internals->mode4.dedicated_queues.enabled == 1 && + internals->mode4.dedicated_queues.flow[slave_port_id] != NULL) { + rte_flow_destroy(slave_port_id, + internals->mode4.dedicated_queues.flow[slave_port_id], + &flow_error); + internals->mode4.dedicated_queues.flow[slave_port_id] = NULL; + } + slave_eth_dev = &rte_eth_devices[slave_port_id]; slave_remove(internals, slave_eth_dev); slave_eth_dev->data->dev_flags &= (~RTE_ETH_DEV_BONDED_SLAVE); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-08-09 21:51:18.821637800 +0800 +++ 0021-net-bonding-fix-destroy-dedicated-queues-flow.patch 2023-08-09 21:51:18.144352000 +0800 @@ -1 +1 @@ -From f7755321f3294e94c1f1b9e645cc997a3e39f999 Mon Sep 17 00:00:00 2001 +From ff476852e7e2e627b01bf215e214799807921f6d Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit f7755321f3294e94c1f1b9e645cc997a3e39f999 ] @@ -22 +24,0 @@ -Cc: stable@dpdk.org