From: Huisong Li <lihuisong@huawei.com>
To: <lihuisong@huawei.com>, <humin29@huawei.com>
Cc: <stable@dpdk.org>
Subject: [dpdk-stable] [PATCH V2 2/7] app/testpmd: fix DCB forwarding configuration
Date: Tue, 20 Apr 2021 14:54:26 +0800 [thread overview]
Message-ID: <1618901671-64742-3-git-send-email-lihuisong@huawei.com> (raw)
In-Reply-To: <1618901671-64742-1-git-send-email-lihuisong@huawei.com>
After DCB mode is configured, the operations of port stop and port start
change the value of the global variable "dcb_test", As a result, the
forwarding configuration from DCB to RSS mode, namely,
“dcb_fwd_config_setup()” to "rss_fwd_config_setup()".
Currently, the 'dcb_flag' field in struct 'rte_port' indicates whether
the port is configured with DCB. And it is sufficient to have 'dcb_config'
as a global variable to control the DCB test status. So this patch deletes
the "dcb_test".
In addition, the 'dcb_config' is first set to 1 first in
init_port_dcb_config(), but the function may fail.
So it should be moved to the end.
Fixes: 900550de04a7 ("app/testpmd: add dcb support")
Fixes: ce8d561418d4 ("app/testpmd: add port configuration settings")
Fixes: 7741e4cf16c0 ("app/testpmd: VMDq and DCB updates")
Cc: stable@dpdk.org
Signed-off-by: Huisong Li <lihuisong@huawei.com>
---
app/test-pmd/testpmd.c | 18 ++++--------------
app/test-pmd/testpmd.h | 1 -
2 files changed, 4 insertions(+), 15 deletions(-)
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index d4be23f..a076b1d 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -246,9 +246,6 @@ uint16_t mb_mempool_cache = DEF_MBUF_CACHE; /**< Size of mbuf mempool cache. */
/* current configuration is in DCB or not,0 means it is not in DCB mode */
uint8_t dcb_config = 0;
-/* Whether the dcb is in testing status */
-uint8_t dcb_test = 0;
-
/*
* Configurable number of RX/TX queues.
*/
@@ -2167,8 +2164,7 @@ start_packet_forwarding(int with_tx_first)
return;
}
-
- if(dcb_test) {
+ if (dcb_config) {
for (i = 0; i < nb_fwd_ports; i++) {
pt_id = fwd_ports_ids[i];
port = &ports[pt_id];
@@ -2476,8 +2472,6 @@ start_port(portid_t pid)
if (port_id_is_invalid(pid, ENABLED_WARN))
return 0;
- if(dcb_config)
- dcb_test = 1;
RTE_ETH_FOREACH_DEV(pi) {
if (pid != pi && pid != (portid_t)RTE_PORT_ALL)
continue;
@@ -2717,11 +2711,6 @@ stop_port(portid_t pid)
portid_t peer_pl[RTE_MAX_ETHPORTS];
int peer_pi;
- if (dcb_test) {
- dcb_test = 0;
- dcb_config = 0;
- }
-
if (port_id_is_invalid(pid, ENABLED_WARN))
return;
@@ -3625,8 +3614,6 @@ init_port_dcb_config(portid_t pid,
rte_port = &ports[pid];
memset(&port_conf, 0, sizeof(struct rte_eth_conf));
- /* Enter DCB configuration status */
- dcb_config = 1;
port_conf.rxmode = rte_port->dev_conf.rxmode;
port_conf.txmode = rte_port->dev_conf.txmode;
@@ -3694,6 +3681,9 @@ init_port_dcb_config(portid_t pid,
rte_port->dcb_flag = 1;
+ /* Enter DCB configuration status */
+ dcb_config = 1;
+
return 0;
}
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index 9530ec5..432c66d 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -425,7 +425,6 @@ extern uint64_t noisy_lkup_num_reads;
extern uint64_t noisy_lkup_num_reads_writes;
extern uint8_t dcb_config;
-extern uint8_t dcb_test;
extern uint32_t mbuf_data_size_n;
extern uint16_t mbuf_data_size[MAX_SEGS_BUFFER_SPLIT];
--
2.7.4
next prev parent reply other threads:[~2021-04-20 6:54 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1618901671-64742-1-git-send-email-lihuisong@huawei.com>
2021-04-20 6:54 ` [dpdk-stable] [PATCH V2 1/7] app/testpmd: fix forward lcores number when DCB test Huisong Li
2021-04-20 6:54 ` Huisong Li [this message]
2021-04-20 6:54 ` [dpdk-stable] [PATCH V2 3/7] app/testpmd: fix a segment fault " Huisong Li
[not found] <1618903835-17444-1-git-send-email-lihuisong@huawei.com>
2021-04-20 7:30 ` [dpdk-stable] [PATCH V2 2/7] app/testpmd: fix DCB forwarding configuration Huisong Li
[not found] <1618886007-19567-1-git-send-email-lihuisong@huawei.com>
2021-04-20 2:33 ` Huisong Li
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=1618901671-64742-3-git-send-email-lihuisong@huawei.com \
--to=lihuisong@huawei.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).