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 6E52842D83 for ; Wed, 28 Jun 2023 16:11:21 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 683BE40151; Wed, 28 Jun 2023 16:11:21 +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 E52C2400EF for ; Wed, 28 Jun 2023 16:11:19 +0200 (CEST) Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-313f61890fbso2973976f8f.3 for ; Wed, 28 Jun 2023 07:11:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687961479; x=1690553479; 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=CVPcodVfAIN/mXYrp/TcglTT8bY3AYACBYchnKY8sRE=; b=FlT6gQ1x3D4jDv8tDGxdiRiHS8jPqmNRC1AXdwIVmpIjGMAhwbr9dmFwR+iSjk6Fk/ 8gBhFpCzbtzwe7orLpsoaQ6RzHEoa6IJfuvRVYICGQTyqxiV6fAREtRIb8ymtll+78ZT VzLZTZJxYJSSTfElOz/qItn9EYnhqX+pYoGSVd/+ijaePNEOohCkYcGcJteFsq12KAkl yzp6kT4iMgIoSauBm9GCGZUcwFfE6SG/kg5I+2jat5710qJ6uOhEwN45CYI3141aP6dw LYYFcHBR3QYf7NsdH7v/DqrStGFChcnKSpeu3Ri3P/9TE9rLWgxp/xvpzdHqQZjs3jpH Iz7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687961479; x=1690553479; 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=CVPcodVfAIN/mXYrp/TcglTT8bY3AYACBYchnKY8sRE=; b=EfyqRRwH1m4bzt2CjGnBhsXa0AHe4yFvAcrCy1bXOK0kXKzNo/2yXhUxO6pd9zUO+O xzRYp0DLrOK12a3DyEfnIS3veWCi8hEvPILpCnVOxsPppYFObYSW0YY7A6n3ONyHutcE Ps/PTFAfDtm7vp87lHa4WVqb8XTK33CYBZGGKkfmcY1XxXkr747xsHw/5mv+iLJXMZgU MKwCMkPKybiloZ7N5XwmBMoLstgO80Nw9MDdjawL1OL+xV8rDFALxzSHGVmD7cNaXmxg cMhKdQyu627FuOHewzyaL01FOTQAtg0a7av6Hvd6wMxKu6amy8/VAmViaIfAqnqWz2yP Xs7A== X-Gm-Message-State: AC+VfDyTOfqR6cGp5T0SdGHAYHow1KgByPQm33jT3Q57uDePctCbu17x MhYYmDyD1txqhhVWwLdC+T0= X-Google-Smtp-Source: ACHHUZ5FHaIHZVJyGq5pDpypg/60S6YfI9YnK9Whm3vHq512ioe9AvH3bnZpHwKS8Pm3NhwO+SpA2w== X-Received: by 2002:adf:f7c2:0:b0:314:e16:3ca0 with SMTP id a2-20020adff7c2000000b003140e163ca0mr1158214wrq.53.1687961479378; Wed, 28 Jun 2023 07:11:19 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id a16-20020adfdd10000000b00313ef2150dcsm9707836wrm.45.2023.06.28.07.11.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Jun 2023 07:11:19 -0700 (PDT) From: luca.boccassi@gmail.com 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 20.11.9 Date: Wed, 28 Jun 2023 15:10:33 +0100 Message-Id: <20230628141046.2145871-9-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230628141046.2145871-1-luca.boccassi@gmail.com> References: <20230615013258.1439718-63-luca.boccassi@gmail.com> <20230628141046.2145871-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 06/30/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/789cc8dcb3de7e0bbec67b66040a9ddd7e0f5ca2 Thanks. Luca Boccassi --- >From 789cc8dcb3de7e0bbec67b66040a9ddd7e0f5ca2 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 [ 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 7925f35882..73d1795ed3 100644 --- a/drivers/net/bonding/rte_eth_bond_api.c +++ b/drivers/net/bonding/rte_eth_bond_api.c @@ -703,6 +703,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.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-28 11:40:08.456947624 +0100 +++ 0009-net-bonding-fix-destroy-dedicated-queues-flow.patch 2023-06-28 11:40:08.048027340 +0100 @@ -1 +1 @@ -From f7755321f3294e94c1f1b9e645cc997a3e39f999 Mon Sep 17 00:00:00 2001 +From 789cc8dcb3de7e0bbec67b66040a9ddd7e0f5ca2 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit f7755321f3294e94c1f1b9e645cc997a3e39f999 ] + @@ -22 +23,0 @@ -Cc: stable@dpdk.org @@ -33 +34 @@ -index c0178369b4..85d0528b7c 100644 +index 7925f35882..73d1795ed3 100644 @@ -36 +37 @@ -@@ -712,6 +712,16 @@ __eth_bond_slave_remove_lock_free(uint16_t bonded_port_id, +@@ -703,6 +703,16 @@ __eth_bond_slave_remove_lock_free(uint16_t bonded_port_id,