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 71110A0032 for ; Fri, 24 Jun 2022 17:02:48 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6B196400EF; Fri, 24 Jun 2022 17:02:48 +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 A8F9D400EF for ; Fri, 24 Jun 2022 17:02:46 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1656082966; 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=AjShBed7GMds+iz7lx/BqXJ8pNu/2KLUcjKEbZkQUXM=; b=AK6LnKuO18s8OnjkRHIXWR9OI1/h3bok58E7AeECXAtPQXwXDL2IsgUqggVLH5O7Eh1nye EbYbhnSNDwVl1RNLgNNLWRu9aY6AADvhceLnoAlWtyJUovTive+RzlbaE1bHM1NfRz7KRE bI8GQDlCcozWUJL470nJxwnpfK/lWD8= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [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-189-fyfxntIFP2OlcUvJnruduQ-1; Fri, 24 Jun 2022 11:02:43 -0400 X-MC-Unique: fyfxntIFP2OlcUvJnruduQ-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C730C380115F; Fri, 24 Jun 2022 15:02:42 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.217]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4C5F810725; Fri, 24 Jun 2022 15:02:41 +0000 (UTC) From: Kevin Traynor To: Huisong Li Cc: Min Hu , Dongdong Liu , Ferruh Yigit , dpdk stable Subject: patch 'app/testpmd: fix bonding slave devices not released' has been queued to stable release 21.11.2 Date: Fri, 24 Jun 2022 16:01:41 +0100 Message-Id: <20220624150148.1855580-33-ktraynor@redhat.com> In-Reply-To: <20220624150148.1855580-1-ktraynor@redhat.com> References: <20220624150148.1855580-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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.2 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/27/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/f48795dea1590363dad8681291fda4af8c0d7653 Thanks. Kevin --- >From f48795dea1590363dad8681291fda4af8c0d7653 Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Thu, 9 Jun 2022 19:49:21 +0800 Subject: [PATCH] app/testpmd: fix bonding slave devices not released [ upstream commit 3889a3220c9b93f07dfdf95e30b2661e6e3f698f ] Currently, some eth devices are added to bond device, these devices are not released when the quit command is executed in testpmd. This patch adds the release operation for all active slaves under a bond device. Fixes: 0e545d3047fe ("app/testpmd: check stopping port is not in bonding") Signed-off-by: Huisong Li Signed-off-by: Min Hu (Connor) Signed-off-by: Dongdong Liu Acked-by: Ferruh Yigit --- app/test-pmd/cmdline.c | 1 + app/test-pmd/testpmd.c | 41 +++++++++++++++++++++++++++++++++++++++++ app/test-pmd/testpmd.h | 2 ++ 3 files changed, 44 insertions(+) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 35da020129..d9bf0eb3b3 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -8774,4 +8774,5 @@ static void cmd_quit_parsed(__rte_unused void *parsed_result, { cmdline_quit(cl); + cl_quit = 1; } diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index 214763d65b..389b7c3c69 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -230,4 +230,5 @@ unsigned int xstats_display_num; /**< Size of extended statistics to show */ */ uint8_t f_quit; +uint8_t cl_quit; /* Quit testpmd from cmdline. */ /* @@ -3203,4 +3204,30 @@ remove_invalid_ports(void) } +static void +clear_bonding_slave_device(portid_t *slave_pids, uint16_t num_slaves) +{ + struct rte_port *port; + portid_t slave_pid; + uint16_t i; + + for (i = 0; i < num_slaves; i++) { + slave_pid = slave_pids[i]; + if (port_is_started(slave_pid) == 1) { + if (rte_eth_dev_stop(slave_pid) != 0) + fprintf(stderr, "rte_eth_dev_stop failed for port %u\n", + slave_pid); + + port = &ports[slave_pid]; + port->port_status = RTE_PORT_STOPPED; + } + + clear_port_slave_flag(slave_pid); + + /* Close slave device when testpmd quit or is killed. */ + if (cl_quit == 1 || f_quit == 1) + rte_eth_dev_close(slave_pid); + } +} + void close_port(portid_t pid) @@ -3208,4 +3235,6 @@ close_port(portid_t pid) portid_t pi; struct rte_port *port; + portid_t slave_pids[RTE_MAX_ETHPORTS]; + int num_slaves = 0; if (port_id_is_invalid(pid, ENABLED_WARN)) @@ -3243,5 +3272,17 @@ close_port(portid_t pid) port_flex_item_flush(pi); port_action_handle_flush(pi); +#ifdef RTE_NET_BOND + if (port->bond_flag == 1) + num_slaves = rte_eth_bond_slaves_get(pi, + slave_pids, RTE_MAX_ETHPORTS); +#endif rte_eth_dev_close(pi); + /* + * If this port is bonded device, all slaves under the + * device need to be removed or closed. + */ + if (port->bond_flag == 1 && num_slaves > 0) + clear_bonding_slave_device(slave_pids, + num_slaves); } diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index 04bc7ffbc2..8fb3c3a3af 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -33,4 +33,6 @@ #define RTE_PORT_HANDLING (uint16_t)3 +extern uint8_t cl_quit; + /* * It is used to allocate the memory for hash key. -- 2.34.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-06-24 15:51:09.921618766 +0100 +++ 0038-app-testpmd-fix-bonding-slave-devices-not-released.patch 2022-06-24 15:51:08.926984230 +0100 @@ -1 +1 @@ -From 3889a3220c9b93f07dfdf95e30b2661e6e3f698f Mon Sep 17 00:00:00 2001 +From f48795dea1590363dad8681291fda4af8c0d7653 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 3889a3220c9b93f07dfdf95e30b2661e6e3f698f ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index 56a369e104..a59e6166d5 100644 +index 35da020129..d9bf0eb3b3 100644 @@ -27 +28 @@ -@@ -8919,4 +8919,5 @@ static void cmd_quit_parsed(__rte_unused void *parsed_result, +@@ -8774,4 +8774,5 @@ static void cmd_quit_parsed(__rte_unused void *parsed_result, @@ -34 +35 @@ -index 04c39adc21..205d98ee3d 100644 +index 214763d65b..389b7c3c69 100644 @@ -100 +101 @@ -index b90bba659a..ab333c7324 100644 +index 04bc7ffbc2..8fb3c3a3af 100644 @@ -103 +104 @@ -@@ -39,4 +39,6 @@ +@@ -33,4 +33,6 @@