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 6C53642ECF for ; Thu, 20 Jul 2023 17:26:28 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 683E240685; Thu, 20 Jul 2023 17:26:28 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 06539400D6 for ; Thu, 20 Jul 2023 17:26:25 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689866785; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ufDZVd8X1EhWtkM1Of1gTYA8d3CPxP0AdDx9sB4pI0E=; b=VQ4J1CNxU45SHlqTD8nBseTP37LffBZxzYQ2ucDPTpj52YxIuC5WD2I9THyKxUPc2Dz2QG TyP9QBcnUKe6eUOckABCG5GwUUNG/ZI/dlKxf0LopiXsTyHHI9kNQTyO6GaGF9E6g6r4Pl Tw0xS1v4wlDrpIIDIjijL5FL948XubM= Received: from mimecast-mx02.redhat.com (66.187.233.73 [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-465-8_p9k0BcMVOJ46hn1XBblQ-1; Thu, 20 Jul 2023 11:22:41 -0400 X-MC-Unique: 8_p9k0BcMVOJ46hn1XBblQ-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DEB2A1C172D5; Thu, 20 Jul 2023 15:22:15 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 702194A9004; Thu, 20 Jul 2023 15:22:14 +0000 (UTC) From: Kevin Traynor 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 21.11.5 Date: Thu, 20 Jul 2023 16:18:40 +0100 Message-ID: <20230720151942.262154-89-ktraynor@redhat.com> In-Reply-To: <20230720151942.262154-1-ktraynor@redhat.com> References: <20230720151942.262154-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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 21.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/25/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/d98f67c3a32b2d15c4cbbf4a8551ce95c3aa1d6f Thanks. Kevin --- >From d98f67c3a32b2d15c4cbbf4a8551ce95c3aa1d6f 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 14dfd2059f..6cdef1cd2d 100644 --- a/drivers/net/bonding/rte_eth_bond_api.c +++ b/drivers/net/bonding/rte_eth_bond_api.c @@ -710,4 +710,14 @@ __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); -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:18:05.759341450 +0100 +++ 0089-net-bonding-fix-destroy-dedicated-queues-flow.patch 2023-07-20 16:17:54.969751766 +0100 @@ -1 +1 @@ -From f7755321f3294e94c1f1b9e645cc997a3e39f999 Mon Sep 17 00:00:00 2001 +From d98f67c3a32b2d15c4cbbf4a8551ce95c3aa1d6f 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 14dfd2059f..6cdef1cd2d 100644 @@ -36 +37 @@ -@@ -713,4 +713,14 @@ __eth_bond_slave_remove_lock_free(uint16_t bonded_port_id, +@@ -710,4 +710,14 @@ __eth_bond_slave_remove_lock_free(uint16_t bonded_port_id,