patches for DPDK stable branches
 help / color / mirror / Atom feed
From: christian.ehrhardt@canonical.com
To: "Min Hu (Connor)" <humin29@huawei.com>
Cc: Ferruh Yigit <ferruh.yigit@intel.com>, dpdk stable <stable@dpdk.org>
Subject: patch 'app/testpmd: fix bonding mode set' has been queued to stable release 19.11.12
Date: Fri, 25 Feb 2022 18:15:36 +0100	[thread overview]
Message-ID: <20220225171550.3499040-43-christian.ehrhardt@canonical.com> (raw)
In-Reply-To: <20220225171550.3499040-1-christian.ehrhardt@canonical.com>

Hi,

FYI, your patch has been queued to stable release 19.11.12

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/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/cpaelzer/dpdk-stable-queue

This queued commit can be viewed at:
https://github.com/cpaelzer/dpdk-stable-queue/commit/81decddb44d9da3a9d3571e26008b80408b62375

Thanks.

Christian Ehrhardt <christian.ehrhardt@canonical.com>

---
From 81decddb44d9da3a9d3571e26008b80408b62375 Mon Sep 17 00:00:00 2001
From: "Min Hu (Connor)" <humin29@huawei.com>
Date: Fri, 28 Jan 2022 10:35:19 +0800
Subject: [PATCH] app/testpmd: fix bonding mode set

[ upstream commit 39ddd5d1895e72ba2bc974eddbc12a3135639ed1 ]

when start testpmd, and type command like this, it will lead to
Segmentation fault, like:

testpmd> create bonded device 4 0
testpmd> add bonding slave 0 2
testpmd> add bonding slave 1 2
testpmd> port start 2
testpmd> set bonding mode 0 2
testpmd> quit
Stopping port 0...
Stopping ports...
...
Bye...
Segmentation fault

The reason to the bug is that rte timer do not be cancelled when quit.
That is, in 'bond_ethdev_start', resources are allocated according to
different bonding mode. In 'bond_ethdev_stop', resources are free by
the corresponding mode.

For example, 'bond_ethdev_start' start bond_mode_8023ad_ext_periodic_cb
timer for bonding mode 4. and 'bond_ethdev_stop' cancel the timer only
when the current bonding mode is 4. If the bonding mode is changed,
and directly quit the process, the timer will still on, and freed memory
will be accessed, then segmentation fault.

'bonding mode' changed means resources changed, reallocate resources for
different mode should be done, that is, device should be restarted.

Fixes: 2950a769315e ("bond: testpmd support")

Signed-off-by: Min Hu (Connor) <humin29@huawei.com>
Tested-by: Ferruh Yigit <ferruh.yigit@intel.com>
---
 app/test-pmd/cmdline.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 1e44a998fc..a3b991ea1b 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -5672,6 +5672,19 @@ static void cmd_set_bonding_mode_parsed(void *parsed_result,
 {
 	struct cmd_set_bonding_mode_result *res = parsed_result;
 	portid_t port_id = res->port_id;
+	struct rte_port *port = &ports[port_id];
+
+	/*
+	 * Bonding mode changed means resources of device changed, like whether
+	 * started rte timer or not. Device should be restarted when resources
+	 * of device changed.
+	 */
+	if (port->port_status != RTE_PORT_STOPPED) {
+		fprintf(stderr,
+			"\t Error: Can't set bonding mode when port %d is not stopped\n",
+			port_id);
+		return;
+	}
 
 	/* Set the bonding mode for the relevant port. */
 	if (0 != rte_eth_bond_mode_set(port_id, res->value))
-- 
2.35.0

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-02-25 16:58:45.890479958 +0100
+++ 0043-app-testpmd-fix-bonding-mode-set.patch	2022-02-25 16:58:44.288990455 +0100
@@ -1 +1 @@
-From 39ddd5d1895e72ba2bc974eddbc12a3135639ed1 Mon Sep 17 00:00:00 2001
+From 81decddb44d9da3a9d3571e26008b80408b62375 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 39ddd5d1895e72ba2bc974eddbc12a3135639ed1 ]
+
@@ -36 +37,0 @@
-Cc: stable@dpdk.org
@@ -45 +46 @@
-index e626b1c7d9..16ad4be005 100644
+index 1e44a998fc..a3b991ea1b 100644
@@ -48 +49 @@
-@@ -5915,6 +5915,19 @@ static void cmd_set_bonding_mode_parsed(void *parsed_result,
+@@ -5672,6 +5672,19 @@ static void cmd_set_bonding_mode_parsed(void *parsed_result,

  parent reply	other threads:[~2022-02-25 17:17 UTC|newest]

Thread overview: 57+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-25 17:14 patch 'net/hns3: fix residual MAC after setting default MAC' " christian.ehrhardt
2022-02-25 17:14 ` patch 'net/hns3: fix secondary process reference count' " christian.ehrhardt
2022-02-25 17:14 ` patch 'net/hns3: fix multi-process action register and unregister' " christian.ehrhardt
2022-02-25 17:14 ` patch 'net/hns3: unregister MP action on close for secondary' " christian.ehrhardt
2022-02-25 17:14 ` patch 'net/ice: build failure with make and GCC > 11' " christian.ehrhardt
2022-02-25 17:14 ` patch 'config/ppc: fix build with GCC >= 10' " christian.ehrhardt
2022-02-25 17:15 ` patch 'maintainers: update for stable branches' " christian.ehrhardt
2022-02-25 17:15 ` patch 'bus/ifpga: remove useless check while browsing devices' " christian.ehrhardt
2022-02-25 17:15 ` patch 'eal/linux: log hugepage create errors with filename' " christian.ehrhardt
2022-02-25 17:15 ` patch 'devtools: fix comment detection in forbidden token check' " christian.ehrhardt
2022-02-25 17:15 ` patch 'net/ixgbe: add vector Rx parameter " christian.ehrhardt
2022-02-25 17:15 ` patch 'net/bnxt: fix xstats query' " christian.ehrhardt
2022-02-25 17:15 ` patch 'net/bonding: fix mode type mismatch' " christian.ehrhardt
2022-02-25 17:15 ` patch 'app/testpmd: fix dereference before null check' " christian.ehrhardt
2022-02-25 17:15 ` patch 'net/cxgbe: fix dangling pointer by mailbox access rework' " christian.ehrhardt
2022-02-25 17:15 ` patch 'net/mlx5: fix maximum packet headers size for TSO' " christian.ehrhardt
2022-02-25 17:15 ` patch 'net/nfp: remove useless range checks' " christian.ehrhardt
2022-02-25 17:15 ` patch 'net/sfc: validate queue span when parsing flow action RSS' " christian.ehrhardt
2022-02-25 17:15 ` patch 'raw/ifpga/base: fix SPI transaction' " christian.ehrhardt
2022-02-25 17:15 ` patch 'net/ice: fix link up when starting device' " christian.ehrhardt
2022-02-25 17:15 ` patch 'net/bnxt: handle ring cleanup in case of error' " christian.ehrhardt
2022-02-25 17:15 ` patch 'raw/ifpga/base: fix port feature ID' " christian.ehrhardt
2022-02-25 17:15 ` patch 'net/memif: remove unnecessary Rx interrupt stub' " christian.ehrhardt
2022-02-25 17:15 ` patch 'net/bonding: fix RSS with early configure' " christian.ehrhardt
2022-02-25 17:15 ` patch 'net/hns3: fix using enum as boolean' " christian.ehrhardt
2022-02-25 17:15 ` patch 'net/virtio: fix Tx queue 0 overriden by queue 128' " christian.ehrhardt
2022-02-25 17:15 ` patch 'vdpa/ifc: fix log info mismatch' " christian.ehrhardt
2022-02-25 17:15 ` patch 'net/virtio-user: check FD flags getting failure' " christian.ehrhardt
2022-02-25 17:15 ` patch 'net/mlx5: reject jump to root table' " christian.ehrhardt
2022-02-25 17:15 ` patch 'build: fix warning about using -Wextra flag' " christian.ehrhardt
2022-02-25 17:15 ` patch 'kni: fix ioctl signature' " christian.ehrhardt
2022-02-25 17:15 ` patch 'doc: fix KNI PMD name typo' " christian.ehrhardt
2022-02-25 17:15 ` patch 'ring: fix error code when creating ring' " christian.ehrhardt
2022-02-25 17:15 ` patch 'test/mem: fix error check' " christian.ehrhardt
2022-02-25 17:15 ` patch 'bus/dpaa: fix C++ include guard' " christian.ehrhardt
2022-02-25 17:15 ` patch 'net/cxgbe: remove useless " christian.ehrhardt
2022-02-25 17:15 ` patch 'net/dpaa2: " christian.ehrhardt
2022-02-25 17:15 ` patch 'net/hns3: fix max packet size rollback in PF' " christian.ehrhardt
2022-02-25 17:15 ` patch 'net/hns3: fix RSS key with null' " christian.ehrhardt
2022-02-25 17:15 ` patch 'net/ixgbe: check filter init failure' " christian.ehrhardt
2022-02-25 17:15 ` patch 'net/bonding: fix promiscuous and allmulticast state' " christian.ehrhardt
2022-02-25 17:15 ` patch 'net/bonding: fix reference count on mbufs' " christian.ehrhardt
2022-02-25 17:15 ` christian.ehrhardt [this message]
2022-02-25 17:15 ` patch 'stack: fix stubs header export' " christian.ehrhardt
2022-02-25 17:15 ` patch 'ipsec: fix C++ include' " christian.ehrhardt
2022-02-25 17:15 ` patch 'table: " christian.ehrhardt
2022-02-25 17:15 ` patch 'vhost: " christian.ehrhardt
2022-02-25 17:15 ` patch 'test/mbuf: fix mbuf data content check' " christian.ehrhardt
2022-02-25 17:15 ` patch 'ipc: end multiprocess thread during cleanup' " christian.ehrhardt
2022-02-25 17:15 ` patch 'vfio: cleanup the multiprocess sync handle' " christian.ehrhardt
2022-02-25 17:15 ` patch 'net/memif: remove pointer deference before null check' " christian.ehrhardt
2022-02-25 17:15 ` patch 'net/sfc: do not push fast free offload to default TxQ config' " christian.ehrhardt
2022-02-25 17:15 ` patch 'net/sfc: demand Tx fast free offload on EF10 simple datapath' " christian.ehrhardt
2022-02-25 17:15 ` patch 'net/iavf: count continuous DD bits for Arm' " christian.ehrhardt
2022-02-25 17:15 ` patch 'net/mlx5: fix committed bucket size' " christian.ehrhardt
2022-02-25 17:15 ` patch 'compress/octeontx: fix null pointer dereference' " christian.ehrhardt
2022-02-25 17:15 ` patch 'raw/ntb: clear all valid doorbell bits on init' " christian.ehrhardt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220225171550.3499040-43-christian.ehrhardt@canonical.com \
    --to=christian.ehrhardt@canonical.com \
    --cc=ferruh.yigit@intel.com \
    --cc=humin29@huawei.com \
    --cc=stable@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).