[PATCH 0/3] testpmd support stop specify lcore

[PATCH 0/3] testpmd support stop specify lcore

[Chengwen Feng]

This patch support stop specify lcore for testpmd, and also include
two bugfix which found when test DCB function.

Chengwen Feng (3):
  app/testpmd: fix invalid txp when setup DCB forward
  app/testpmd: fix wrong Rx queues when setup DCB forward
  app/testpmd: support stop specify lcore

 app/test-pmd/cmdline.c                      | 63 +++++++++++++++++++++
 app/test-pmd/config.c                       |  9 +--
 doc/guides/testpmd_app_ug/testpmd_funcs.rst |  7 +++
 3 files changed, 73 insertions(+), 6 deletions(-)

-- 
2.17.1

[PATCH 1/3] app/testpmd: fix invalid txp when setup DCB forward

[Chengwen Feng]

The txp maybe invalid (e.g. start with only one port but set with 1),
this commit fix it by get txp from fwd_topology_tx_port_get() function.

An added benefit is that the DCB test also supports '--port-topology'
parameter.

Fixes: 1a572499beb6 ("app/testpmd: setup DCB forwarding based on traffic class")
Cc: stable@dpdk.org

Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
 app/test-pmd/config.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 3ce2a14a1b..0f687018c7 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -5187,7 +5187,7 @@ dcb_fwd_config_setup(void)
 	/* reinitialize forwarding streams */
 	init_fwd_streams();
 	sm_id = 0;
-	txp = 1;
+	txp = fwd_topology_tx_port_get(rxp);
 	/* get the dcb info on the first RX and TX ports */
 	(void)rte_eth_dev_get_dcb_info(fwd_ports_ids[rxp], &rxp_dcb_info);
 	(void)rte_eth_dev_get_dcb_info(fwd_ports_ids[txp], &txp_dcb_info);
@@ -5235,11 +5235,8 @@ dcb_fwd_config_setup(void)
 			rxp++;
 		if (rxp >= nb_fwd_ports)
 			return;
+		txp = fwd_topology_tx_port_get(rxp);
 		/* get the dcb information on next RX and TX ports */
-		if ((rxp & 0x1) == 0)
-			txp = (portid_t) (rxp + 1);
-		else
-			txp = (portid_t) (rxp - 1);
 		rte_eth_dev_get_dcb_info(fwd_ports_ids[rxp], &rxp_dcb_info);
 		rte_eth_dev_get_dcb_info(fwd_ports_ids[txp], &txp_dcb_info);
 	}
-- 
2.17.1

[PATCH 2/3] app/testpmd: fix wrong Rx queues when setup DCB forward

[Chengwen Feng]

The nb_rx_queue should get from rxp_dcb_info not txp_dcb_info, this
commit fix it.

Fixes: 1a572499beb6 ("app/testpmd: setup DCB forwarding based on traffic class")
Cc: stable@dpdk.org

Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
 app/test-pmd/config.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 0f687018c7..8557371488 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -5205,7 +5205,7 @@ dcb_fwd_config_setup(void)
 				fwd_lcores[lc_id]->stream_idx;
 			rxq = rxp_dcb_info.tc_queue.tc_rxq[i][tc].base;
 			txq = txp_dcb_info.tc_queue.tc_txq[i][tc].base;
-			nb_rx_queue = txp_dcb_info.tc_queue.tc_rxq[i][tc].nb_queue;
+			nb_rx_queue = rxp_dcb_info.tc_queue.tc_rxq[i][tc].nb_queue;
 			nb_tx_queue = txp_dcb_info.tc_queue.tc_txq[i][tc].nb_queue;
 			for (j = 0; j < nb_rx_queue; j++) {
 				struct fwd_stream *fs;
-- 
2.17.1

[PATCH 3/3] app/testpmd: support stop specify lcore

[Chengwen Feng]

This commit supports stop specify lcore, the command:

  stop fwd_core (lcore_id)

The background of this command:
1. Only some TCs are expected to generate traffic when the DCB function
   is tested based on txonly forwarding.
2. Because each lcore will process all the traffic of one TC, therefore,
   we could stop the lcores which process unexpected TCs by this
   command.

Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
 app/test-pmd/cmdline.c                      | 63 +++++++++++++++++++++
 doc/guides/testpmd_app_ug/testpmd_funcs.rst |  7 +++
 2 files changed, 70 insertions(+)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 22afbdbad3..e03f6e6181 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -150,6 +150,9 @@ static void cmd_help_long_parsed(void *parsed_result,
 			"    Stop packet forwarding, and display accumulated"
 			" statistics.\n\n"
 
+			"stop fwd_core (lcore_id)\n"
+			"    Stop specify lcore's forwarding.\n\n"
+
 			"quit\n"
 			"    Quit to prompt.\n\n"
 		);
@@ -3975,6 +3978,65 @@ static cmdline_parse_inst_t cmd_stop = {
 	},
 };
 
+/* *** stop specify forward core *** */
+struct cmd_stop_fwd_core_result {
+	cmdline_fixed_string_t stop;
+	cmdline_fixed_string_t fwd_core;
+	uint32_t lcore_id;
+};
+
+static void
+cmd_stop_fwd_core_parsed(void *parsed_result,
+			 __rte_unused struct cmdline *cl,
+			 __rte_unused void *data)
+{
+	struct cmd_stop_fwd_core_result *res = parsed_result;
+	struct fwd_lcore *fc = lcore_to_fwd_lcore(res->lcore_id);
+
+	if (test_done) {
+		fprintf(stderr, "Packet forwarding not started\n");
+		return;
+	}
+
+	if (fc == NULL) {
+		fprintf(stderr, "core: %u not in the forward corelist.\n", res->lcore_id);
+		return;
+	}
+
+	if (fc->stopped) {
+		fprintf(stderr, "core: %u already stopped!\n", res->lcore_id);
+		return;
+	}
+
+	printf("Telling core: %u to stop...", res->lcore_id);
+	fc->stopped = 1;
+	printf("\nWaiting for core: %u to finish...\n", res->lcore_id);
+	rte_eal_wait_lcore(res->lcore_id);
+	printf("Done.\n");
+}
+
+static cmdline_parse_token_string_t cmd_stop_fwd_core_stop =
+	TOKEN_STRING_INITIALIZER(struct cmd_stop_fwd_core_result,
+			stop, "stop");
+static cmdline_parse_token_string_t cmd_stop_fwd_core_fwd_core =
+	TOKEN_STRING_INITIALIZER(struct cmd_stop_fwd_core_result,
+			fwd_core, "fwd_core");
+static cmdline_parse_token_num_t cmd_stop_fwd_core_lcore_id =
+	TOKEN_NUM_INITIALIZER(struct cmd_stop_fwd_core_result,
+			lcore_id, RTE_UINT32);
+
+static cmdline_parse_inst_t cmd_stop_fwd_core = {
+	.f = cmd_stop_fwd_core_parsed,
+	.data = NULL,
+	.help_str = "stop fwd_core <lcore_id>: stop specify lcore's forwarding.",
+	.tokens = {
+		(void *)&cmd_stop_fwd_core_stop,
+		(void *)&cmd_stop_fwd_core_fwd_core,
+		(void *)&cmd_stop_fwd_core_lcore_id,
+		NULL,
+	},
+};
+
 static unsigned int
 get_ptype(char *value)
 {
@@ -14051,6 +14113,7 @@ static cmdline_parse_ctx_t builtin_ctx[] = {
 	&cmd_config_dcb,
 	&cmd_read_rxd_txd,
 	&cmd_stop,
+	&cmd_stop_fwd_core,
 	&cmd_mac_addr,
 	&cmd_set_fwd_eth_peer,
 	&cmd_set_xstats_hide_zero,
diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index e423abd40e..0a362d06b8 100644
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -143,6 +143,13 @@ Stop packet forwarding, and display accumulated statistics::
 
    testpmd> stop
 
+stop fwd_core
+~~~~~~~~~~~~~
+
+Stop specify lcore's forwarding::
+
+   testpmd> stop fwd_core (lcore_id)
+
 quit
 ~~~~
 
-- 
2.17.1

Re: [PATCH 0/3] testpmd support stop specify lcore

[Stephen Hemminger]

On Tue, 4 Nov 2025 12:09:13 +0800
Chengwen Feng <fengchengwen@huawei.com> wrote:

> This patch support stop specify lcore for testpmd, and also include
> two bugfix which found when test DCB function.
> 
> Chengwen Feng (3):
>   app/testpmd: fix invalid txp when setup DCB forward
>   app/testpmd: fix wrong Rx queues when setup DCB forward
>   app/testpmd: support stop specify lcore
> 
>  app/test-pmd/cmdline.c                      | 63 +++++++++++++++++++++
>  app/test-pmd/config.c                       |  9 +--
>  doc/guides/testpmd_app_ug/testpmd_funcs.rst |  7 +++
>  3 files changed, 73 insertions(+), 6 deletions(-)
> 

If there is a stop lcore, why is there not a command to restart the lcore?
Looks like this just an optimization for DCB.
Could it be handled better by having testpmd not spawn lcores that
have no queues? 

Re: [PATCH 0/3] testpmd support stop specify lcore

[fengchengwen]

On 11/5/2025 8:21 AM, Stephen Hemminger wrote:
> On Tue, 4 Nov 2025 12:09:13 +0800
> Chengwen Feng <fengchengwen@huawei.com> wrote:
> 
>> This patch support stop specify lcore for testpmd, and also include
>> two bugfix which found when test DCB function.
>>
>> Chengwen Feng (3):
>>   app/testpmd: fix invalid txp when setup DCB forward
>>   app/testpmd: fix wrong Rx queues when setup DCB forward
>>   app/testpmd: support stop specify lcore
>>
>>  app/test-pmd/cmdline.c                      | 63 +++++++++++++++++++++
>>  app/test-pmd/config.c                       |  9 +--
>>  doc/guides/testpmd_app_ug/testpmd_funcs.rst |  7 +++
>>  3 files changed, 73 insertions(+), 6 deletions(-)
>>
> 
> If there is a stop lcore, why is there not a command to restart the lcore?

The restart lcore is more complex which include data prepare (init).

But I think could impl such pause / restart function by config fc->stopped a special value:

Current:
	run_pkt_fwd_on_lcore(struct fwd_lcore *fc, packet_fwd_t pkt_fwd)
	{
		do {
			forwarding logic
		} while(!fc->stopped);
	}

We could adjust the logic to support pause / restart function:
	run_pkt_fwd_on_lcore(struct fwd_lcore *fc, packet_fwd_t pkt_fwd)
	{
	_restart:
		do {
			forwarding logic
		} while(!fc->stopped);
 		while (fc->stopped == 2) {
			nop
		}
		if (fc->stopped == 1)
			return;
		if (fc->stopped == 0)
			// means restart
			goto _restart;
	}
So we could configure fc->stopped = 2 to pause forwarding, and config it to 0 to restart forwarding.

> Looks like this just an optimization for DCB.

Yes, mainly for test the Tx direction's DCB function.

> Could it be handled better by having testpmd not spawn lcores that
> have no queues? 

The lcore spawned by testpmd always has queues. In this patchset, we just stop some queue's forwarding.

> 

[PATCH v2 0/3] testpmd support pause/resume specify lcore's fwd

[Chengwen Feng]

This patch support pause/resume specify lcore's forwarding for testpmd,
and also include two bugfix which found when test DCB function.

Chengwen Feng (3):
  app/testpmd: fix invalid txp when setup DCB forward
  app/testpmd: fix wrong Rx queues when setup DCB forward
  app/testpmd: support pause/resume specify lcore

 app/test-pmd/cmdline.c                      | 126 ++++++++++++++++++++
 app/test-pmd/config.c                       |   9 +-
 app/test-pmd/testpmd.c                      |   5 +
 app/test-pmd/testpmd.h                      |   2 +-
 doc/guides/testpmd_app_ug/testpmd_funcs.rst |  14 +++
 5 files changed, 149 insertions(+), 7 deletions(-)

-- 
2.17.1

[PATCH v2 1/3] app/testpmd: fix invalid txp when setup DCB forward

[Chengwen Feng]

The txp maybe invalid (e.g. start with only one port but set with 1),
this commit fix it by get txp from fwd_topology_tx_port_get() function.

An added benefit is that the DCB test also supports '--port-topology'
parameter.

Fixes: 1a572499beb6 ("app/testpmd: setup DCB forwarding based on traffic class")
Cc: stable@dpdk.org

Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
 app/test-pmd/config.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 3ce2a14a1b..0f687018c7 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -5187,7 +5187,7 @@ dcb_fwd_config_setup(void)
 	/* reinitialize forwarding streams */
 	init_fwd_streams();
 	sm_id = 0;
-	txp = 1;
+	txp = fwd_topology_tx_port_get(rxp);
 	/* get the dcb info on the first RX and TX ports */
 	(void)rte_eth_dev_get_dcb_info(fwd_ports_ids[rxp], &rxp_dcb_info);
 	(void)rte_eth_dev_get_dcb_info(fwd_ports_ids[txp], &txp_dcb_info);
@@ -5235,11 +5235,8 @@ dcb_fwd_config_setup(void)
 			rxp++;
 		if (rxp >= nb_fwd_ports)
 			return;
+		txp = fwd_topology_tx_port_get(rxp);
 		/* get the dcb information on next RX and TX ports */
-		if ((rxp & 0x1) == 0)
-			txp = (portid_t) (rxp + 1);
-		else
-			txp = (portid_t) (rxp - 1);
 		rte_eth_dev_get_dcb_info(fwd_ports_ids[rxp], &rxp_dcb_info);
 		rte_eth_dev_get_dcb_info(fwd_ports_ids[txp], &txp_dcb_info);
 	}
-- 
2.17.1

[PATCH v2 2/3] app/testpmd: fix wrong Rx queues when setup DCB forward

[Chengwen Feng]

The nb_rx_queue should get from rxp_dcb_info not txp_dcb_info, this
commit fix it.

Fixes: 1a572499beb6 ("app/testpmd: setup DCB forwarding based on traffic class")
Cc: stable@dpdk.org

Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
 app/test-pmd/config.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 0f687018c7..8557371488 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -5205,7 +5205,7 @@ dcb_fwd_config_setup(void)
 				fwd_lcores[lc_id]->stream_idx;
 			rxq = rxp_dcb_info.tc_queue.tc_rxq[i][tc].base;
 			txq = txp_dcb_info.tc_queue.tc_txq[i][tc].base;
-			nb_rx_queue = txp_dcb_info.tc_queue.tc_rxq[i][tc].nb_queue;
+			nb_rx_queue = rxp_dcb_info.tc_queue.tc_rxq[i][tc].nb_queue;
 			nb_tx_queue = txp_dcb_info.tc_queue.tc_txq[i][tc].nb_queue;
 			for (j = 0; j < nb_rx_queue; j++) {
 				struct fwd_stream *fs;
-- 
2.17.1

[PATCH v2 3/3] app/testpmd: support pause/resume specify lcore

[Chengwen Feng]

This commit supports pause/resume specify lcore, the command:

  pause  fwd_core (lcore_id)
  resume fwd_core (lcore_id)

The background of this command:
1. Only some TCs are expected to generate traffic when the DCB function
   is tested based on txonly forwarding.
2. Because each lcore will process all the traffic of one TC, therefore,
   we could pause the lcores which process unexpected TCs by this
   command.

Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
 app/test-pmd/cmdline.c                      | 126 ++++++++++++++++++++
 app/test-pmd/testpmd.c                      |   5 +
 app/test-pmd/testpmd.h                      |   2 +-
 doc/guides/testpmd_app_ug/testpmd_funcs.rst |  14 +++
 4 files changed, 146 insertions(+), 1 deletion(-)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 22afbdbad3..dacc1921bd 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -150,6 +150,12 @@ static void cmd_help_long_parsed(void *parsed_result,
 			"    Stop packet forwarding, and display accumulated"
 			" statistics.\n\n"
 
+			"pause fwd_core (lcore_id)\n"
+			"    Pause specify lcore's forwarding.\n\n"
+
+			"resume fwd_core (lcore_id)\n"
+			"    Resume specify lcore's forwarding.\n\n"
+
 			"quit\n"
 			"    Quit to prompt.\n\n"
 		);
@@ -3975,6 +3981,124 @@ static cmdline_parse_inst_t cmd_stop = {
 	},
 };
 
+/* *** pause specify forward core *** */
+struct cmd_pause_fwd_core_result {
+	cmdline_fixed_string_t pause;
+	cmdline_fixed_string_t fwd_core;
+	uint32_t lcore_id;
+};
+
+static void
+cmd_pause_fwd_core_parsed(void *parsed_result,
+			  __rte_unused struct cmdline *cl,
+			  __rte_unused void *data)
+{
+	struct cmd_pause_fwd_core_result *res = parsed_result;
+	struct fwd_lcore *fc = lcore_to_fwd_lcore(res->lcore_id);
+
+	if (test_done) {
+		fprintf(stderr, "Packet forwarding not started\n");
+		return;
+	}
+
+	if (fc == NULL) {
+		fprintf(stderr, "core: %u not in the forward corelist.\n", res->lcore_id);
+		return;
+	}
+
+	if (fc->stopped == 2) {
+		fprintf(stderr, "core: %u already paused!\n", res->lcore_id);
+		return;
+	}
+
+	printf("Telling core: %u to pause...", res->lcore_id);
+	fc->stopped = 2;
+	printf("\nWaiting for core: %u to finish...\n", res->lcore_id);
+	rte_delay_ms(10);
+	printf("Done.\n");
+}
+
+static cmdline_parse_token_string_t cmd_pause_fwd_core_pause =
+	TOKEN_STRING_INITIALIZER(struct cmd_pause_fwd_core_result,
+			pause, "pause");
+static cmdline_parse_token_string_t cmd_pause_fwd_core_fwd_core =
+	TOKEN_STRING_INITIALIZER(struct cmd_pause_fwd_core_result,
+			fwd_core, "fwd_core");
+static cmdline_parse_token_num_t cmd_pause_fwd_core_lcore_id =
+	TOKEN_NUM_INITIALIZER(struct cmd_pause_fwd_core_result,
+			lcore_id, RTE_UINT32);
+
+static cmdline_parse_inst_t cmd_pause_fwd_core = {
+	.f = cmd_pause_fwd_core_parsed,
+	.data = NULL,
+	.help_str = "pause fwd_core <lcore_id>: pause specify lcore's forwarding.",
+	.tokens = {
+		(void *)&cmd_pause_fwd_core_pause,
+		(void *)&cmd_pause_fwd_core_fwd_core,
+		(void *)&cmd_pause_fwd_core_lcore_id,
+		NULL,
+	},
+};
+
+/* *** resume specify forward core *** */
+struct cmd_resume_fwd_core_result {
+	cmdline_fixed_string_t resume;
+	cmdline_fixed_string_t fwd_core;
+	uint32_t lcore_id;
+};
+
+static void
+cmd_resume_fwd_core_parsed(void *parsed_result,
+			   __rte_unused struct cmdline *cl,
+			   __rte_unused void *data)
+{
+	struct cmd_resume_fwd_core_result *res = parsed_result;
+	struct fwd_lcore *fc = lcore_to_fwd_lcore(res->lcore_id);
+
+	if (test_done) {
+		fprintf(stderr, "Packet forwarding not started\n");
+		return;
+	}
+
+	if (fc == NULL) {
+		fprintf(stderr, "core: %u not in the forward corelist.\n", res->lcore_id);
+		return;
+	}
+
+	if (fc->stopped != 2) {
+		fprintf(stderr, "core: %u not in pause state!\n", res->lcore_id);
+		return;
+	}
+
+	printf("Telling core: %u to resume...", res->lcore_id);
+	fc->stopped = 0;
+	printf("\nWaiting for core: %u to resume...\n", res->lcore_id);
+	rte_delay_ms(10);
+	printf("Done.\n");
+}
+
+static cmdline_parse_token_string_t cmd_resume_fwd_core_resume =
+	TOKEN_STRING_INITIALIZER(struct cmd_resume_fwd_core_result,
+			resume, "resume");
+static cmdline_parse_token_string_t cmd_resume_fwd_core_fwd_core =
+	TOKEN_STRING_INITIALIZER(struct cmd_resume_fwd_core_result,
+			fwd_core, "fwd_core");
+static cmdline_parse_token_num_t cmd_resume_fwd_core_lcore_id =
+	TOKEN_NUM_INITIALIZER(struct cmd_resume_fwd_core_result,
+			lcore_id, RTE_UINT32);
+
+static cmdline_parse_inst_t cmd_resume_fwd_core = {
+	.f = cmd_resume_fwd_core_parsed,
+	.data = NULL,
+	.help_str = "resume fwd_core <lcore_id>: resume specify lcore's forwarding.",
+	.tokens = {
+		(void *)&cmd_resume_fwd_core_resume,
+		(void *)&cmd_resume_fwd_core_fwd_core,
+		(void *)&cmd_resume_fwd_core_lcore_id,
+		NULL,
+	},
+};
+
 static unsigned int
 get_ptype(char *value)
 {
@@ -14051,6 +14175,8 @@ static cmdline_parse_ctx_t builtin_ctx[] = {
 	&cmd_config_dcb,
 	&cmd_read_rxd_txd,
 	&cmd_stop,
+	&cmd_pause_fwd_core,
+	&cmd_resume_fwd_core,
 	&cmd_mac_addr,
 	&cmd_set_fwd_eth_peer,
 	&cmd_set_xstats_hide_zero,
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 2360da3a48..05549be1c5 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -2247,6 +2247,7 @@ run_pkt_fwd_on_lcore(struct fwd_lcore *fc, packet_fwd_t pkt_fwd)
 #endif
 	fsm = &fwd_streams[fc->stream_idx];
 	nb_fs = fc->stream_nb;
+_resume:
 	prev_tsc = rte_rdtsc();
 	do {
 		for (sm_id = 0; sm_id < nb_fs; sm_id++) {
@@ -2287,6 +2288,10 @@ run_pkt_fwd_on_lcore(struct fwd_lcore *fc, packet_fwd_t pkt_fwd)
 			prev_tsc = tsc;
 		}
 	} while (! fc->stopped);
+	while (fc->stopped == 2)
+		rte_pause();
+	if (fc->stopped == 0)
+		goto _resume;
 }
 
 static int
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index fa46865c67..c3c4373af7 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -399,7 +399,7 @@ struct fwd_lcore {
 	streamid_t stream_idx;   /**< index of 1st stream in "fwd_streams" */
 	streamid_t stream_nb;    /**< number of streams in "fwd_streams" */
 	lcoreid_t  cpuid_idx;    /**< index of logical core in CPU id table */
-	volatile char stopped;   /**< stop forwarding when set */
+	volatile char stopped;   /**< stop forwarding when set to 1, pause when set to 2 */
 	uint64_t total_cycles;   /**< used with --record-core-cycles */
 };
 
diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index e423abd40e..be125ff35c 100644
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -143,6 +143,20 @@ Stop packet forwarding, and display accumulated statistics::
 
    testpmd> stop
 
+pause fwd_core
+~~~~~~~~~~~~~~
+
+Pause specify lcore's forwarding::
+
+   testpmd> pause fwd_core (lcore_id)
+
+resume fwd_core
+~~~~~~~~~~~~~~~
+
+Resume specify lcore's forwarding::
+
+   testpmd> resume fwd_core (lcore_id)
+
 quit
 ~~~~
 
-- 
2.17.1

Re: [PATCH v2 0/3] testpmd support pause/resume specify lcore's fwd

[Stephen Hemminger]

On Wed, 5 Nov 2025 17:47:45 +0800
Chengwen Feng <fengchengwen@huawei.com> wrote:

> This patch support pause/resume specify lcore's forwarding for testpmd,
> and also include two bugfix which found when test DCB function.
> 
> Chengwen Feng (3):
>   app/testpmd: fix invalid txp when setup DCB forward
>   app/testpmd: fix wrong Rx queues when setup DCB forward
>   app/testpmd: support pause/resume specify lcore
> 
>  app/test-pmd/cmdline.c                      | 126 ++++++++++++++++++++
>  app/test-pmd/config.c                       |   9 +-
>  app/test-pmd/testpmd.c                      |   5 +
>  app/test-pmd/testpmd.h                      |   2 +-
>  doc/guides/testpmd_app_ug/testpmd_funcs.rst |  14 +++
>  5 files changed, 149 insertions(+), 7 deletions(-)
> 

Please split bug fix from enhancements.

The whole scheme looks like an optimization for power usage in testpmd.
Since testpmd is solely focused on performance, I don't think you have
provided enough justification to add the new feature.

With DCB if there are TC's that could receive packets, it is better
not to never poll those queues. 

That said, longer term it would make sense to bring of the power
saving logic that is in examples into testpmd.

Re: [PATCH v2 0/3] testpmd support pause/resume specify lcore's fwd

[fengchengwen]

On 11/6/2025 2:59 AM, Stephen Hemminger wrote:
> On Wed, 5 Nov 2025 17:47:45 +0800
> Chengwen Feng <fengchengwen@huawei.com> wrote:
> 
>> This patch support pause/resume specify lcore's forwarding for testpmd,
>> and also include two bugfix which found when test DCB function.
>>
>> Chengwen Feng (3):
>>   app/testpmd: fix invalid txp when setup DCB forward
>>   app/testpmd: fix wrong Rx queues when setup DCB forward
>>   app/testpmd: support pause/resume specify lcore
>>
>>  app/test-pmd/cmdline.c                      | 126 ++++++++++++++++++++
>>  app/test-pmd/config.c                       |   9 +-
>>  app/test-pmd/testpmd.c                      |   5 +
>>  app/test-pmd/testpmd.h                      |   2 +-
>>  doc/guides/testpmd_app_ug/testpmd_funcs.rst |  14 +++
>>  5 files changed, 149 insertions(+), 7 deletions(-)
>>
> 
> Please split bug fix from enhancements.

done

> 
> The whole scheme looks like an optimization for power usage in testpmd.
> Since testpmd is solely focused on performance, I don't think you have
> provided enough justification to add the new feature.

I know your worry, especial in this cycles.

> 
> With DCB if there are TC's that could receive packets, it is better
> not to never poll those queues. 
> 
> That said, longer term it would make sense to bring of the power
> saving logic that is in examples into testpmd.

I will try to another way to meet the usage of specify TC.

Thanks

[PATCH v3] app/testpmd: support specify TCs when DCB forward

[Chengwen Feng]

This commit supports specify TCs when DCB forwarding, the command:

  set dcb fwd_tc (tc_mask)

The background of this command: only some TCs are expected to generate
traffic when the DCB function is tested based on txonly forwarding, we
could use this command to specify TCs to be used.

Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
Depends-on: series-2682 ("two bugfix for testpmd DCB")
---
v3: use new way to impl and fix comment from Stephen.
v2: introduce pause/resume lcore's forwarding.

---
 app/test-pmd/cmdline.c                      | 57 +++++++++++++++++++++
 app/test-pmd/config.c                       | 50 +++++++++++++++++-
 app/test-pmd/testpmd.c                      |  6 +++
 app/test-pmd/testpmd.h                      |  3 ++
 doc/guides/testpmd_app_ug/testpmd_funcs.rst |  7 +++
 5 files changed, 121 insertions(+), 2 deletions(-)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 22afbdbad3..0400c8356e 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -511,6 +511,9 @@ static void cmd_help_long_parsed(void *parsed_result,
 			"set fwd (%s)\n"
 			"    Set packet forwarding mode.\n\n"
 
+			"set dcb fwd_tc (tc_mask)\n"
+			"    Set dcb forwarding on specify TCs, if bit-n in tc-mask is 1, then TC-n's forwarding is enabled\n\n"
+
 			"mac_addr add (port_id) (XX:XX:XX:XX:XX:XX)\n"
 			"    Add a MAC address on port_id.\n\n"
 
@@ -6224,6 +6227,59 @@ static void cmd_set_fwd_retry_mode_init(void)
 	token_struct->string_data.str = token;
 }
 
+/* *** set dcb forward TCs *** */
+struct cmd_set_dcb_fwd_tc_result {
+	cmdline_fixed_string_t set;
+	cmdline_fixed_string_t dcb;
+	cmdline_fixed_string_t fwd_tc;
+	uint8_t                tc_mask;
+};
+
+static void cmd_set_dcb_fwd_tc_parsed(void *parsed_result,
+				      __rte_unused struct cmdline *cl,
+				      __rte_unused void *data)
+{
+	struct cmd_set_dcb_fwd_tc_result *res = parsed_result;
+	int i;
+	if (res->tc_mask == 0) {
+		fprintf(stderr, "TC mask should not be zero!\n");
+		return;
+	}
+	printf("Enabled DCB forwarding TC list:");
+	dcb_fwd_tc_mask = res->tc_mask;
+	for (i = 0; i < RTE_ETH_8_TCS; i++) {
+		if (dcb_fwd_tc_mask & (1u << i))
+			printf(" %d", i);
+	}
+	printf("\n");
+}
+
+static cmdline_parse_token_string_t cmd_set_dcb_fwd_tc_set =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_dcb_fwd_tc_result,
+			set, "set");
+static cmdline_parse_token_string_t cmd_set_dcb_fwd_tc_dcb =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_dcb_fwd_tc_result,
+			dcb, "dcb");
+static cmdline_parse_token_string_t cmd_set_dcb_fwd_tc_fwdtc =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_dcb_fwd_tc_result,
+			fwd_tc, "fwd_tc");
+static cmdline_parse_token_string_t cmd_set_dcb_fwd_tc_tcmask =
+	TOKEN_NUM_INITIALIZER(struct cmd_set_dcb_fwd_tc_result,
+			tc_mask, RTE_UINT8);
+
+static cmdline_parse_inst_t cmd_set_dcb_fwd_tc = {
+	.f = cmd_set_dcb_fwd_tc_parsed,
+	.data = NULL,
+	.help_str = "config DCB forwarding on specify TCs, if bit-n in tc-mask is 1, then TC-n's forwarding is enabled, and vice versa.",
+	.tokens = {
+		(void *)&cmd_set_dcb_fwd_tc_set,
+		(void *)&cmd_set_dcb_fwd_tc_dcb,
+		(void *)&cmd_set_dcb_fwd_tc_fwdtc,
+		(void *)&cmd_set_dcb_fwd_tc_tcmask,
+		NULL,
+	},
+};
+
 /* *** SET BURST TX DELAY TIME RETRY NUMBER *** */
 struct cmd_set_burst_tx_retry_result {
 	cmdline_fixed_string_t set;
@@ -14003,6 +14059,7 @@ static cmdline_parse_ctx_t builtin_ctx[] = {
 	&cmd_set_fwd_mask,
 	&cmd_set_fwd_mode,
 	&cmd_set_fwd_retry_mode,
+	&cmd_set_dcb_fwd_tc,
 	&cmd_set_burst_tx_retry,
 	&cmd_set_promisc_mode_one,
 	&cmd_set_promisc_mode_all,
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 8557371488..ca40a03b40 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -5121,12 +5121,48 @@ get_fwd_port_total_tc_num(void)
 
 	for (i = 0; i < nb_fwd_ports; i++) {
 		(void)rte_eth_dev_get_dcb_info(fwd_ports_ids[i], &dcb_info);
-		total_tc_num += dcb_info.nb_tcs;
+		total_tc_num += rte_popcount32(dcb_fwd_tc_mask & ((1u << dcb_info.nb_tcs) - 1));
 	}
 
 	return total_tc_num;
 }
 
+static void
+dcb_forward_tc_update_dcb_info(struct rte_eth_dcb_info *org_dcb_info)
+{
+	struct rte_eth_dcb_info dcb_info = {0};
+	uint32_t i, vmdq_idx;
+	uint32_t tc = 0;
+
+	if (dcb_fwd_tc_mask == DEFAULT_DCB_FWD_TC_MASK)
+		return;
+
+	/*
+	 * Use compress scheme to update dcb-info.
+	 * E.g. If org_dcb_info->nb_tcs is 4 and dcb_fwd_tc_mask is 0x8, it
+	 *      means only enable TC3, then the new dcb-info's nb_tcs is set to
+	 *      1, and also move corresponding tc_rxq and tc_txq info to new
+	 *      index.
+	 */
+	for (i = 0; i < org_dcb_info->nb_tcs; i++) {
+		if (!(dcb_fwd_tc_mask & (1u << i)))
+			continue;
+		for (vmdq_idx = 0; vmdq_idx < RTE_ETH_MAX_VMDQ_POOL; vmdq_idx++) {
+			dcb_info.tc_queue.tc_rxq[vmdq_idx][tc].base =
+				org_dcb_info->tc_queue.tc_rxq[vmdq_idx][i].base;
+			dcb_info.tc_queue.tc_rxq[vmdq_idx][tc].nb_queue =
+				org_dcb_info->tc_queue.tc_rxq[vmdq_idx][i].nb_queue;
+			dcb_info.tc_queue.tc_txq[vmdq_idx][tc].base =
+				org_dcb_info->tc_queue.tc_txq[vmdq_idx][i].base;
+			dcb_info.tc_queue.tc_txq[vmdq_idx][tc].nb_queue =
+				org_dcb_info->tc_queue.tc_txq[vmdq_idx][i].nb_queue;
+		}
+		tc++;
+	}
+	dcb_info.nb_tcs = tc;
+	memcpy(org_dcb_info, &dcb_info, sizeof(struct rte_eth_dcb_info));
+}
+
 /**
  * For the DCB forwarding test, each core is assigned on each traffic class.
  *
@@ -5176,11 +5212,17 @@ dcb_fwd_config_setup(void)
 		}
 	}
 
+	total_tc_num = get_fwd_port_total_tc_num();
+	if (total_tc_num == 0) {
+		fprintf(stderr, "Error: total forwarding TC num is zero!\n");
+		cur_fwd_config.nb_fwd_lcores = 0;
+		return;
+	}
+
 	cur_fwd_config.nb_fwd_lcores = (lcoreid_t) nb_fwd_lcores;
 	cur_fwd_config.nb_fwd_ports = nb_fwd_ports;
 	cur_fwd_config.nb_fwd_streams =
 		(streamid_t) (nb_rxq * cur_fwd_config.nb_fwd_ports);
-	total_tc_num = get_fwd_port_total_tc_num();
 	if (cur_fwd_config.nb_fwd_lcores > total_tc_num)
 		cur_fwd_config.nb_fwd_lcores = total_tc_num;
 
@@ -5190,7 +5232,9 @@ dcb_fwd_config_setup(void)
 	txp = fwd_topology_tx_port_get(rxp);
 	/* get the dcb info on the first RX and TX ports */
 	(void)rte_eth_dev_get_dcb_info(fwd_ports_ids[rxp], &rxp_dcb_info);
+	dcb_forward_tc_update_dcb_info(&rxp_dcb_info);
 	(void)rte_eth_dev_get_dcb_info(fwd_ports_ids[txp], &txp_dcb_info);
+	dcb_forward_tc_update_dcb_info(&txp_dcb_info);
 
 	for (lc_id = 0; lc_id < cur_fwd_config.nb_fwd_lcores; lc_id++) {
 		fwd_lcores[lc_id]->stream_nb = 0;
@@ -5238,7 +5282,9 @@ dcb_fwd_config_setup(void)
 		txp = fwd_topology_tx_port_get(rxp);
 		/* get the dcb information on next RX and TX ports */
 		rte_eth_dev_get_dcb_info(fwd_ports_ids[rxp], &rxp_dcb_info);
+		dcb_forward_tc_update_dcb_info(&rxp_dcb_info);
 		rte_eth_dev_get_dcb_info(fwd_ports_ids[txp], &txp_dcb_info);
+		dcb_forward_tc_update_dcb_info(&txp_dcb_info);
 	}
 }
 
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 2360da3a48..9d0ce5660c 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -211,6 +211,12 @@ struct fwd_engine * fwd_engines[] = {
 	NULL,
 };
 
+/*
+ * Bitmask for control DCB forwarding for TCs.
+ * If bit-n in tc-mask is 1, then TC-n's forwarding is enabled, and vice versa.
+ */
+uint8_t dcb_fwd_tc_mask = DEFAULT_DCB_FWD_TC_MASK;
+
 struct rte_mempool *mempools[RTE_MAX_NUMA_NODES * MAX_SEGS_BUFFER_SPLIT];
 uint16_t mempool_flags;
 
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index fa46865c67..1ada0de450 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -484,6 +484,9 @@ extern cmdline_parse_inst_t cmd_show_set_raw_all;
 extern cmdline_parse_inst_t cmd_set_flex_is_pattern;
 extern cmdline_parse_inst_t cmd_set_flex_spec_pattern;
 
+#define DEFAULT_DCB_FWD_TC_MASK	0xFF
+extern uint8_t dcb_fwd_tc_mask;
+
 extern uint16_t mempool_flags;
 
 /**
diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index e423abd40e..d263734a11 100644
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -1877,6 +1877,13 @@ Set a controllable LED associated with a certain port on or off::
 
    testpmd> set port (port_id) led (on|off)
 
+set dcb fwd_tc
+~~~~~~~~~~~~~~
+
+Config DCB forwarding on specify TCs, if bit-n in tc-mask is 1, then TC-n's forwarding is enabled, and vice versa::
+
+   testpmd> set dcb fwd_tc (tc_mask)
+
 Port Functions
 --------------
 
-- 
2.17.1

Re: [PATCH v3] app/testpmd: support specify TCs when DCB forward

[Stephen Hemminger]

On Thu, 6 Nov 2025 20:49:59 +0800
Chengwen Feng <fengchengwen@huawei.com> wrote:

> +static void
> +dcb_forward_tc_update_dcb_info(struct rte_eth_dcb_info *org_dcb_info)
> +{
> +	struct rte_eth_dcb_info dcb_info = {0};
> +	uint32_t i, vmdq_idx;
> +	uint32_t tc = 0;
> +
> +	if (dcb_fwd_tc_mask == DEFAULT_DCB_FWD_TC_MASK)
> +		return;
> +
> +	/*
> +	 * Use compress scheme to update dcb-info.
> +	 * E.g. If org_dcb_info->nb_tcs is 4 and dcb_fwd_tc_mask is 0x8, it
> +	 *      means only enable TC3, then the new dcb-info's nb_tcs is set to
> +	 *      1, and also move corresponding tc_rxq and tc_txq info to new
> +	 *      index.
> +	 */
> +	for (i = 0; i < org_dcb_info->nb_tcs; i++) {
> +		if (!(dcb_fwd_tc_mask & (1u << i)))
> +			continue;
> +		for (vmdq_idx = 0; vmdq_idx < RTE_ETH_MAX_VMDQ_POOL; vmdq_idx++) {
> +			dcb_info.tc_queue.tc_rxq[vmdq_idx][tc].base =
> +				org_dcb_info->tc_queue.tc_rxq[vmdq_idx][i].base;
> +			dcb_info.tc_queue.tc_rxq[vmdq_idx][tc].nb_queue =
> +				org_dcb_info->tc_queue.tc_rxq[vmdq_idx][i].nb_queue;
> +			dcb_info.tc_queue.tc_txq[vmdq_idx][tc].base =
> +				org_dcb_info->tc_queue.tc_txq[vmdq_idx][i].base;
> +			dcb_info.tc_queue.tc_txq[vmdq_idx][tc].nb_queue =
> +				org_dcb_info->tc_queue.tc_txq[vmdq_idx][i].nb_queue;
> +		}
> +		tc++;
> +	}
> +	dcb_info.nb_tcs = tc;
> +	memcpy(org_dcb_info, &dcb_info, sizeof(struct rte_eth_dcb_info));

Prefer direct structure assignment over memcpy() here.
	*org_dcb_info = dcb_info;

This makes sure types are the same, and compiler generates same code.

Re: [PATCH v3] app/testpmd: support specify TCs when DCB forward

[fengchengwen]

On 11/7/2025 3:24 AM, Stephen Hemminger wrote:
> On Thu, 6 Nov 2025 20:49:59 +0800
> Chengwen Feng <fengchengwen@huawei.com> wrote:
> 
>> +static void
>> +dcb_forward_tc_update_dcb_info(struct rte_eth_dcb_info *org_dcb_info)
>> +{
>> +	struct rte_eth_dcb_info dcb_info = {0};
>> +	uint32_t i, vmdq_idx;
>> +	uint32_t tc = 0;
>> +
>> +	if (dcb_fwd_tc_mask == DEFAULT_DCB_FWD_TC_MASK)
>> +		return;
>> +
>> +	/*
>> +	 * Use compress scheme to update dcb-info.
>> +	 * E.g. If org_dcb_info->nb_tcs is 4 and dcb_fwd_tc_mask is 0x8, it
>> +	 *      means only enable TC3, then the new dcb-info's nb_tcs is set to
>> +	 *      1, and also move corresponding tc_rxq and tc_txq info to new
>> +	 *      index.
>> +	 */
>> +	for (i = 0; i < org_dcb_info->nb_tcs; i++) {
>> +		if (!(dcb_fwd_tc_mask & (1u << i)))
>> +			continue;
>> +		for (vmdq_idx = 0; vmdq_idx < RTE_ETH_MAX_VMDQ_POOL; vmdq_idx++) {
>> +			dcb_info.tc_queue.tc_rxq[vmdq_idx][tc].base =
>> +				org_dcb_info->tc_queue.tc_rxq[vmdq_idx][i].base;
>> +			dcb_info.tc_queue.tc_rxq[vmdq_idx][tc].nb_queue =
>> +				org_dcb_info->tc_queue.tc_rxq[vmdq_idx][i].nb_queue;
>> +			dcb_info.tc_queue.tc_txq[vmdq_idx][tc].base =
>> +				org_dcb_info->tc_queue.tc_txq[vmdq_idx][i].base;
>> +			dcb_info.tc_queue.tc_txq[vmdq_idx][tc].nb_queue =
>> +				org_dcb_info->tc_queue.tc_txq[vmdq_idx][i].nb_queue;
>> +		}
>> +		tc++;
>> +	}
>> +	dcb_info.nb_tcs = tc;
>> +	memcpy(org_dcb_info, &dcb_info, sizeof(struct rte_eth_dcb_info));
> 
> Prefer direct structure assignment over memcpy() here.
> 	*org_dcb_info = dcb_info;
> 
> This makes sure types are the same, and compiler generates same code.

Thanks Stephen, the V4 already sent to fix it.

[PATCH v4] app/testpmd: support specify TCs when DCB forward

[Chengwen Feng]

This commit supports specify TCs when DCB forwarding, the command:

  set dcb fwd_tc (tc_mask)

The background of this command: only some TCs are expected to generate
traffic when the DCB function is tested based on txonly forwarding, we
could use this command to specify TCs to be used.

Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
Depends-on: series-2682 ("two bugfix for testpmd DCB")
---
v4: use direct assign of dcb-info according comment from Stephen.
    fix CI llvm compiler error.
v3: use new way to impl and fix comment from Stephen.
v2: introduce pause/resume lcore's forwarding.

---
 app/test-pmd/cmdline.c                      | 57 +++++++++++++++++++++
 app/test-pmd/config.c                       | 50 +++++++++++++++++-
 app/test-pmd/testpmd.c                      |  6 +++
 app/test-pmd/testpmd.h                      |  3 ++
 doc/guides/testpmd_app_ug/testpmd_funcs.rst |  7 +++
 5 files changed, 121 insertions(+), 2 deletions(-)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 22afbdbad3..cbd6020bc6 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -511,6 +511,9 @@ static void cmd_help_long_parsed(void *parsed_result,
 			"set fwd (%s)\n"
 			"    Set packet forwarding mode.\n\n"
 
+			"set dcb fwd_tc (tc_mask)\n"
+			"    Set dcb forwarding on specify TCs, if bit-n in tc-mask is 1, then TC-n's forwarding is enabled\n\n"
+
 			"mac_addr add (port_id) (XX:XX:XX:XX:XX:XX)\n"
 			"    Add a MAC address on port_id.\n\n"
 
@@ -6224,6 +6227,59 @@ static void cmd_set_fwd_retry_mode_init(void)
 	token_struct->string_data.str = token;
 }
 
+/* *** set dcb forward TCs *** */
+struct cmd_set_dcb_fwd_tc_result {
+	cmdline_fixed_string_t set;
+	cmdline_fixed_string_t dcb;
+	cmdline_fixed_string_t fwd_tc;
+	uint8_t                tc_mask;
+};
+
+static void cmd_set_dcb_fwd_tc_parsed(void *parsed_result,
+				      __rte_unused struct cmdline *cl,
+				      __rte_unused void *data)
+{
+	struct cmd_set_dcb_fwd_tc_result *res = parsed_result;
+	int i;
+	if (res->tc_mask == 0) {
+		fprintf(stderr, "TC mask should not be zero!\n");
+		return;
+	}
+	printf("Enabled DCB forwarding TC list:");
+	dcb_fwd_tc_mask = res->tc_mask;
+	for (i = 0; i < RTE_ETH_8_TCS; i++) {
+		if (dcb_fwd_tc_mask & (1u << i))
+			printf(" %d", i);
+	}
+	printf("\n");
+}
+
+static cmdline_parse_token_string_t cmd_set_dcb_fwd_tc_set =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_dcb_fwd_tc_result,
+			set, "set");
+static cmdline_parse_token_string_t cmd_set_dcb_fwd_tc_dcb =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_dcb_fwd_tc_result,
+			dcb, "dcb");
+static cmdline_parse_token_string_t cmd_set_dcb_fwd_tc_fwdtc =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_dcb_fwd_tc_result,
+			fwd_tc, "fwd_tc");
+static cmdline_parse_token_num_t cmd_set_dcb_fwd_tc_tcmask =
+	TOKEN_NUM_INITIALIZER(struct cmd_set_dcb_fwd_tc_result,
+			tc_mask, RTE_UINT8);
+
+static cmdline_parse_inst_t cmd_set_dcb_fwd_tc = {
+	.f = cmd_set_dcb_fwd_tc_parsed,
+	.data = NULL,
+	.help_str = "config DCB forwarding on specify TCs, if bit-n in tc-mask is 1, then TC-n's forwarding is enabled, and vice versa.",
+	.tokens = {
+		(void *)&cmd_set_dcb_fwd_tc_set,
+		(void *)&cmd_set_dcb_fwd_tc_dcb,
+		(void *)&cmd_set_dcb_fwd_tc_fwdtc,
+		(void *)&cmd_set_dcb_fwd_tc_tcmask,
+		NULL,
+	},
+};
+
 /* *** SET BURST TX DELAY TIME RETRY NUMBER *** */
 struct cmd_set_burst_tx_retry_result {
 	cmdline_fixed_string_t set;
@@ -14003,6 +14059,7 @@ static cmdline_parse_ctx_t builtin_ctx[] = {
 	&cmd_set_fwd_mask,
 	&cmd_set_fwd_mode,
 	&cmd_set_fwd_retry_mode,
+	&cmd_set_dcb_fwd_tc,
 	&cmd_set_burst_tx_retry,
 	&cmd_set_promisc_mode_one,
 	&cmd_set_promisc_mode_all,
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 8557371488..a53ba8bc7c 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -5121,12 +5121,48 @@ get_fwd_port_total_tc_num(void)
 
 	for (i = 0; i < nb_fwd_ports; i++) {
 		(void)rte_eth_dev_get_dcb_info(fwd_ports_ids[i], &dcb_info);
-		total_tc_num += dcb_info.nb_tcs;
+		total_tc_num += rte_popcount32(dcb_fwd_tc_mask & ((1u << dcb_info.nb_tcs) - 1));
 	}
 
 	return total_tc_num;
 }
 
+static void
+dcb_forward_tc_update_dcb_info(struct rte_eth_dcb_info *org_dcb_info)
+{
+	struct rte_eth_dcb_info dcb_info = {0};
+	uint32_t i, vmdq_idx;
+	uint32_t tc = 0;
+
+	if (dcb_fwd_tc_mask == DEFAULT_DCB_FWD_TC_MASK)
+		return;
+
+	/*
+	 * Use compress scheme to update dcb-info.
+	 * E.g. If org_dcb_info->nb_tcs is 4 and dcb_fwd_tc_mask is 0x8, it
+	 *      means only enable TC3, then the new dcb-info's nb_tcs is set to
+	 *      1, and also move corresponding tc_rxq and tc_txq info to new
+	 *      index.
+	 */
+	for (i = 0; i < org_dcb_info->nb_tcs; i++) {
+		if (!(dcb_fwd_tc_mask & (1u << i)))
+			continue;
+		for (vmdq_idx = 0; vmdq_idx < RTE_ETH_MAX_VMDQ_POOL; vmdq_idx++) {
+			dcb_info.tc_queue.tc_rxq[vmdq_idx][tc].base =
+				org_dcb_info->tc_queue.tc_rxq[vmdq_idx][i].base;
+			dcb_info.tc_queue.tc_rxq[vmdq_idx][tc].nb_queue =
+				org_dcb_info->tc_queue.tc_rxq[vmdq_idx][i].nb_queue;
+			dcb_info.tc_queue.tc_txq[vmdq_idx][tc].base =
+				org_dcb_info->tc_queue.tc_txq[vmdq_idx][i].base;
+			dcb_info.tc_queue.tc_txq[vmdq_idx][tc].nb_queue =
+				org_dcb_info->tc_queue.tc_txq[vmdq_idx][i].nb_queue;
+		}
+		tc++;
+	}
+	dcb_info.nb_tcs = tc;
+	*org_dcb_info = dcb_info;
+}
+
 /**
  * For the DCB forwarding test, each core is assigned on each traffic class.
  *
@@ -5176,11 +5212,17 @@ dcb_fwd_config_setup(void)
 		}
 	}
 
+	total_tc_num = get_fwd_port_total_tc_num();
+	if (total_tc_num == 0) {
+		fprintf(stderr, "Error: total forwarding TC num is zero!\n");
+		cur_fwd_config.nb_fwd_lcores = 0;
+		return;
+	}
+
 	cur_fwd_config.nb_fwd_lcores = (lcoreid_t) nb_fwd_lcores;
 	cur_fwd_config.nb_fwd_ports = nb_fwd_ports;
 	cur_fwd_config.nb_fwd_streams =
 		(streamid_t) (nb_rxq * cur_fwd_config.nb_fwd_ports);
-	total_tc_num = get_fwd_port_total_tc_num();
 	if (cur_fwd_config.nb_fwd_lcores > total_tc_num)
 		cur_fwd_config.nb_fwd_lcores = total_tc_num;
 
@@ -5190,7 +5232,9 @@ dcb_fwd_config_setup(void)
 	txp = fwd_topology_tx_port_get(rxp);
 	/* get the dcb info on the first RX and TX ports */
 	(void)rte_eth_dev_get_dcb_info(fwd_ports_ids[rxp], &rxp_dcb_info);
+	dcb_forward_tc_update_dcb_info(&rxp_dcb_info);
 	(void)rte_eth_dev_get_dcb_info(fwd_ports_ids[txp], &txp_dcb_info);
+	dcb_forward_tc_update_dcb_info(&txp_dcb_info);
 
 	for (lc_id = 0; lc_id < cur_fwd_config.nb_fwd_lcores; lc_id++) {
 		fwd_lcores[lc_id]->stream_nb = 0;
@@ -5238,7 +5282,9 @@ dcb_fwd_config_setup(void)
 		txp = fwd_topology_tx_port_get(rxp);
 		/* get the dcb information on next RX and TX ports */
 		rte_eth_dev_get_dcb_info(fwd_ports_ids[rxp], &rxp_dcb_info);
+		dcb_forward_tc_update_dcb_info(&rxp_dcb_info);
 		rte_eth_dev_get_dcb_info(fwd_ports_ids[txp], &txp_dcb_info);
+		dcb_forward_tc_update_dcb_info(&txp_dcb_info);
 	}
 }
 
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 2360da3a48..9d0ce5660c 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -211,6 +211,12 @@ struct fwd_engine * fwd_engines[] = {
 	NULL,
 };
 
+/*
+ * Bitmask for control DCB forwarding for TCs.
+ * If bit-n in tc-mask is 1, then TC-n's forwarding is enabled, and vice versa.
+ */
+uint8_t dcb_fwd_tc_mask = DEFAULT_DCB_FWD_TC_MASK;
+
 struct rte_mempool *mempools[RTE_MAX_NUMA_NODES * MAX_SEGS_BUFFER_SPLIT];
 uint16_t mempool_flags;
 
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index fa46865c67..1ada0de450 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -484,6 +484,9 @@ extern cmdline_parse_inst_t cmd_show_set_raw_all;
 extern cmdline_parse_inst_t cmd_set_flex_is_pattern;
 extern cmdline_parse_inst_t cmd_set_flex_spec_pattern;
 
+#define DEFAULT_DCB_FWD_TC_MASK	0xFF
+extern uint8_t dcb_fwd_tc_mask;
+
 extern uint16_t mempool_flags;
 
 /**
diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index e423abd40e..d263734a11 100644
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -1877,6 +1877,13 @@ Set a controllable LED associated with a certain port on or off::
 
    testpmd> set port (port_id) led (on|off)
 
+set dcb fwd_tc
+~~~~~~~~~~~~~~
+
+Config DCB forwarding on specify TCs, if bit-n in tc-mask is 1, then TC-n's forwarding is enabled, and vice versa::
+
+   testpmd> set dcb fwd_tc (tc_mask)
+
 Port Functions
 --------------
 
-- 
2.17.1

[PATCH v5 0/2] two enhance for testpmd DCB test

[Chengwen Feng]

This patchset contains two enhancement for testpmd DCB test.

Chengwen Feng (2):
  app/testpmd: support specify TCs when DCB forward
  app/testpmd: support multi-cores process one TC

---
Depends-on: series-2682 ("two bugfix for testpmd DCB")
---
v5: optimize naming and add line breaks for first commit.
    add second commit "support multi-cores process one TC".
v4: use direct assign of dcb-info according comment from Stephen.
    fix CI llvm compiler error.
v3: use new way to impl and fix comment from Stephen.
v2: introduce pause/resume lcore's forwarding.

 app/test-pmd/cmdline.c                      | 105 ++++++++++++++++
 app/test-pmd/config.c                       | 132 +++++++++++++++++---
 app/test-pmd/testpmd.c                      |  15 +++
 app/test-pmd/testpmd.h                      |   4 +
 doc/guides/testpmd_app_ug/testpmd_funcs.rst |  16 +++
 5 files changed, 254 insertions(+), 18 deletions(-)

-- 
2.17.1

[PATCH v5 1/2] app/testpmd: support specify TCs when DCB forward

[Chengwen Feng]

This commit supports specify TCs when DCB forwarding, the command:

  set dcb fwd_tc (tc_mask)

The background of this command: only some TCs are expected to generate
traffic when the DCB function is tested based on txonly forwarding, we
could use this command to specify TCs to be used.

Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
 app/test-pmd/cmdline.c                      | 57 +++++++++++++++++++++
 app/test-pmd/config.c                       | 50 +++++++++++++++++-
 app/test-pmd/testpmd.c                      |  6 +++
 app/test-pmd/testpmd.h                      |  3 ++
 doc/guides/testpmd_app_ug/testpmd_funcs.rst |  8 +++
 5 files changed, 122 insertions(+), 2 deletions(-)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 22afbdbad3..cbd6020bc6 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -511,6 +511,9 @@ static void cmd_help_long_parsed(void *parsed_result,
 			"set fwd (%s)\n"
 			"    Set packet forwarding mode.\n\n"
 
+			"set dcb fwd_tc (tc_mask)\n"
+			"    Set dcb forwarding on specify TCs, if bit-n in tc-mask is 1, then TC-n's forwarding is enabled\n\n"
+
 			"mac_addr add (port_id) (XX:XX:XX:XX:XX:XX)\n"
 			"    Add a MAC address on port_id.\n\n"
 
@@ -6224,6 +6227,59 @@ static void cmd_set_fwd_retry_mode_init(void)
 	token_struct->string_data.str = token;
 }
 
+/* *** set dcb forward TCs *** */
+struct cmd_set_dcb_fwd_tc_result {
+	cmdline_fixed_string_t set;
+	cmdline_fixed_string_t dcb;
+	cmdline_fixed_string_t fwd_tc;
+	uint8_t                tc_mask;
+};
+
+static void cmd_set_dcb_fwd_tc_parsed(void *parsed_result,
+				      __rte_unused struct cmdline *cl,
+				      __rte_unused void *data)
+{
+	struct cmd_set_dcb_fwd_tc_result *res = parsed_result;
+	int i;
+	if (res->tc_mask == 0) {
+		fprintf(stderr, "TC mask should not be zero!\n");
+		return;
+	}
+	printf("Enabled DCB forwarding TC list:");
+	dcb_fwd_tc_mask = res->tc_mask;
+	for (i = 0; i < RTE_ETH_8_TCS; i++) {
+		if (dcb_fwd_tc_mask & (1u << i))
+			printf(" %d", i);
+	}
+	printf("\n");
+}
+
+static cmdline_parse_token_string_t cmd_set_dcb_fwd_tc_set =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_dcb_fwd_tc_result,
+			set, "set");
+static cmdline_parse_token_string_t cmd_set_dcb_fwd_tc_dcb =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_dcb_fwd_tc_result,
+			dcb, "dcb");
+static cmdline_parse_token_string_t cmd_set_dcb_fwd_tc_fwdtc =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_dcb_fwd_tc_result,
+			fwd_tc, "fwd_tc");
+static cmdline_parse_token_num_t cmd_set_dcb_fwd_tc_tcmask =
+	TOKEN_NUM_INITIALIZER(struct cmd_set_dcb_fwd_tc_result,
+			tc_mask, RTE_UINT8);
+
+static cmdline_parse_inst_t cmd_set_dcb_fwd_tc = {
+	.f = cmd_set_dcb_fwd_tc_parsed,
+	.data = NULL,
+	.help_str = "config DCB forwarding on specify TCs, if bit-n in tc-mask is 1, then TC-n's forwarding is enabled, and vice versa.",
+	.tokens = {
+		(void *)&cmd_set_dcb_fwd_tc_set,
+		(void *)&cmd_set_dcb_fwd_tc_dcb,
+		(void *)&cmd_set_dcb_fwd_tc_fwdtc,
+		(void *)&cmd_set_dcb_fwd_tc_tcmask,
+		NULL,
+	},
+};
+
 /* *** SET BURST TX DELAY TIME RETRY NUMBER *** */
 struct cmd_set_burst_tx_retry_result {
 	cmdline_fixed_string_t set;
@@ -14003,6 +14059,7 @@ static cmdline_parse_ctx_t builtin_ctx[] = {
 	&cmd_set_fwd_mask,
 	&cmd_set_fwd_mode,
 	&cmd_set_fwd_retry_mode,
+	&cmd_set_dcb_fwd_tc,
 	&cmd_set_burst_tx_retry,
 	&cmd_set_promisc_mode_one,
 	&cmd_set_promisc_mode_all,
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 8557371488..88c1e99c5e 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -5121,12 +5121,48 @@ get_fwd_port_total_tc_num(void)
 
 	for (i = 0; i < nb_fwd_ports; i++) {
 		(void)rte_eth_dev_get_dcb_info(fwd_ports_ids[i], &dcb_info);
-		total_tc_num += dcb_info.nb_tcs;
+		total_tc_num += rte_popcount32(dcb_fwd_tc_mask & ((1u << dcb_info.nb_tcs) - 1));
 	}
 
 	return total_tc_num;
 }
 
+static void
+dcb_fwd_tc_update_dcb_info(struct rte_eth_dcb_info *org_dcb_info)
+{
+	struct rte_eth_dcb_info dcb_info = {0};
+	uint32_t i, vmdq_idx;
+	uint32_t tc = 0;
+
+	if (dcb_fwd_tc_mask == DEFAULT_DCB_FWD_TC_MASK)
+		return;
+
+	/*
+	 * Use compress scheme to update dcb-info.
+	 * E.g. If org_dcb_info->nb_tcs is 4 and dcb_fwd_tc_mask is 0x8, it
+	 *      means only enable TC3, then the new dcb-info's nb_tcs is set to
+	 *      1, and also move corresponding tc_rxq and tc_txq info to new
+	 *      index.
+	 */
+	for (i = 0; i < org_dcb_info->nb_tcs; i++) {
+		if (!(dcb_fwd_tc_mask & (1u << i)))
+			continue;
+		for (vmdq_idx = 0; vmdq_idx < RTE_ETH_MAX_VMDQ_POOL; vmdq_idx++) {
+			dcb_info.tc_queue.tc_rxq[vmdq_idx][tc].base =
+				org_dcb_info->tc_queue.tc_rxq[vmdq_idx][i].base;
+			dcb_info.tc_queue.tc_rxq[vmdq_idx][tc].nb_queue =
+				org_dcb_info->tc_queue.tc_rxq[vmdq_idx][i].nb_queue;
+			dcb_info.tc_queue.tc_txq[vmdq_idx][tc].base =
+				org_dcb_info->tc_queue.tc_txq[vmdq_idx][i].base;
+			dcb_info.tc_queue.tc_txq[vmdq_idx][tc].nb_queue =
+				org_dcb_info->tc_queue.tc_txq[vmdq_idx][i].nb_queue;
+		}
+		tc++;
+	}
+	dcb_info.nb_tcs = tc;
+	*org_dcb_info = dcb_info;
+}
+
 /**
  * For the DCB forwarding test, each core is assigned on each traffic class.
  *
@@ -5176,11 +5212,17 @@ dcb_fwd_config_setup(void)
 		}
 	}
 
+	total_tc_num = get_fwd_port_total_tc_num();
+	if (total_tc_num == 0) {
+		fprintf(stderr, "Error: total forwarding TC num is zero!\n");
+		cur_fwd_config.nb_fwd_lcores = 0;
+		return;
+	}
+
 	cur_fwd_config.nb_fwd_lcores = (lcoreid_t) nb_fwd_lcores;
 	cur_fwd_config.nb_fwd_ports = nb_fwd_ports;
 	cur_fwd_config.nb_fwd_streams =
 		(streamid_t) (nb_rxq * cur_fwd_config.nb_fwd_ports);
-	total_tc_num = get_fwd_port_total_tc_num();
 	if (cur_fwd_config.nb_fwd_lcores > total_tc_num)
 		cur_fwd_config.nb_fwd_lcores = total_tc_num;
 
@@ -5190,7 +5232,9 @@ dcb_fwd_config_setup(void)
 	txp = fwd_topology_tx_port_get(rxp);
 	/* get the dcb info on the first RX and TX ports */
 	(void)rte_eth_dev_get_dcb_info(fwd_ports_ids[rxp], &rxp_dcb_info);
+	dcb_fwd_tc_update_dcb_info(&rxp_dcb_info);
 	(void)rte_eth_dev_get_dcb_info(fwd_ports_ids[txp], &txp_dcb_info);
+	dcb_fwd_tc_update_dcb_info(&txp_dcb_info);
 
 	for (lc_id = 0; lc_id < cur_fwd_config.nb_fwd_lcores; lc_id++) {
 		fwd_lcores[lc_id]->stream_nb = 0;
@@ -5238,7 +5282,9 @@ dcb_fwd_config_setup(void)
 		txp = fwd_topology_tx_port_get(rxp);
 		/* get the dcb information on next RX and TX ports */
 		rte_eth_dev_get_dcb_info(fwd_ports_ids[rxp], &rxp_dcb_info);
+		dcb_fwd_tc_update_dcb_info(&rxp_dcb_info);
 		rte_eth_dev_get_dcb_info(fwd_ports_ids[txp], &txp_dcb_info);
+		dcb_fwd_tc_update_dcb_info(&txp_dcb_info);
 	}
 }
 
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 2360da3a48..9d0ce5660c 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -211,6 +211,12 @@ struct fwd_engine * fwd_engines[] = {
 	NULL,
 };
 
+/*
+ * Bitmask for control DCB forwarding for TCs.
+ * If bit-n in tc-mask is 1, then TC-n's forwarding is enabled, and vice versa.
+ */
+uint8_t dcb_fwd_tc_mask = DEFAULT_DCB_FWD_TC_MASK;
+
 struct rte_mempool *mempools[RTE_MAX_NUMA_NODES * MAX_SEGS_BUFFER_SPLIT];
 uint16_t mempool_flags;
 
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index fa46865c67..1ada0de450 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -484,6 +484,9 @@ extern cmdline_parse_inst_t cmd_show_set_raw_all;
 extern cmdline_parse_inst_t cmd_set_flex_is_pattern;
 extern cmdline_parse_inst_t cmd_set_flex_spec_pattern;
 
+#define DEFAULT_DCB_FWD_TC_MASK	0xFF
+extern uint8_t dcb_fwd_tc_mask;
+
 extern uint16_t mempool_flags;
 
 /**
diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index e423abd40e..628f17fed7 100644
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -1877,6 +1877,14 @@ Set a controllable LED associated with a certain port on or off::
 
    testpmd> set port (port_id) led (on|off)
 
+set dcb fwd_tc
+~~~~~~~~~~~~~~
+
+Config DCB forwarding on specify TCs, if bit-n in tc-mask is 1, then TC-n's
+forwarding is enabled, and vice versa::
+
+   testpmd> set dcb fwd_tc (tc_mask)
+
 Port Functions
 --------------
 
-- 
2.17.1

[PATCH v5 2/2] app/testpmd: support multi-cores process one TC

[Chengwen Feng]

Currently, one TC can be processed by only one core, when there are a
large number of small packets, this core becomes a bottleneck.

This commit supports multi-cores process one TC, the command:

  set dcb fwd_tc_cores (tc_cores)

Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
 app/test-pmd/cmdline.c                      | 48 ++++++++++++
 app/test-pmd/config.c                       | 82 +++++++++++++++++----
 app/test-pmd/testpmd.c                      |  9 +++
 app/test-pmd/testpmd.h                      |  1 +
 doc/guides/testpmd_app_ug/testpmd_funcs.rst |  8 ++
 5 files changed, 132 insertions(+), 16 deletions(-)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index cbd6020bc6..97dbc008af 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -6280,6 +6280,53 @@ static cmdline_parse_inst_t cmd_set_dcb_fwd_tc = {
 	},
 };
 
+/* *** set dcb forward cores per TC *** */
+struct cmd_set_dcb_fwd_tc_cores_result {
+	cmdline_fixed_string_t set;
+	cmdline_fixed_string_t dcb;
+	cmdline_fixed_string_t fwd_tc_cores;
+	uint8_t                tc_cores;
+};
+
+static void cmd_set_dcb_fwd_tc_cores_parsed(void *parsed_result,
+					    __rte_unused struct cmdline *cl,
+					    __rte_unused void *data)
+{
+	struct cmd_set_dcb_fwd_tc_cores_result *res = parsed_result;
+	if (res->tc_cores == 0) {
+		fprintf(stderr, "Cores per-TC should not be zero!\n");
+		return;
+	}
+	dcb_fwd_tc_cores = res->tc_cores;
+	printf("Set cores-per-TC: %u\n", dcb_fwd_tc_cores);
+}
+
+static cmdline_parse_token_string_t cmd_set_dcb_fwd_tc_cores_set =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_dcb_fwd_tc_cores_result,
+			set, "set");
+static cmdline_parse_token_string_t cmd_set_dcb_fwd_tc_cores_dcb =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_dcb_fwd_tc_cores_result,
+			dcb, "dcb");
+static cmdline_parse_token_string_t cmd_set_dcb_fwd_tc_cores_fwdtccores =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_dcb_fwd_tc_cores_result,
+			fwd_tc_cores, "fwd_tc_cores");
+static cmdline_parse_token_num_t cmd_set_dcb_fwd_tc_cores_tccores =
+	TOKEN_NUM_INITIALIZER(struct cmd_set_dcb_fwd_tc_cores_result,
+			tc_cores, RTE_UINT8);
+
+static cmdline_parse_inst_t cmd_set_dcb_fwd_tc_cores = {
+	.f = cmd_set_dcb_fwd_tc_cores_parsed,
+	.data = NULL,
+	.help_str = "config DCB forwarding cores per-TC, 1-means one core process all queues of a TC.",
+	.tokens = {
+		(void *)&cmd_set_dcb_fwd_tc_cores_set,
+		(void *)&cmd_set_dcb_fwd_tc_cores_dcb,
+		(void *)&cmd_set_dcb_fwd_tc_cores_fwdtccores,
+		(void *)&cmd_set_dcb_fwd_tc_cores_tccores,
+		NULL,
+	},
+};
+
 /* *** SET BURST TX DELAY TIME RETRY NUMBER *** */
 struct cmd_set_burst_tx_retry_result {
 	cmdline_fixed_string_t set;
@@ -14060,6 +14107,7 @@ static cmdline_parse_ctx_t builtin_ctx[] = {
 	&cmd_set_fwd_mode,
 	&cmd_set_fwd_retry_mode,
 	&cmd_set_dcb_fwd_tc,
+	&cmd_set_dcb_fwd_tc_cores,
 	&cmd_set_burst_tx_retry,
 	&cmd_set_promisc_mode_one,
 	&cmd_set_promisc_mode_all,
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 88c1e99c5e..b5dc90fe05 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -5112,6 +5112,36 @@ rss_fwd_config_setup(void)
 	}
 }
 
+static int
+dcb_fwd_check_cores_per_tc(void)
+{
+	struct rte_eth_dcb_info dcb_info = {0};
+	uint32_t port, tc, vmdq_idx;
+
+	if (dcb_fwd_tc_cores == 1)
+		return 0;
+
+	for (port = 0; port < nb_fwd_ports; port++) {
+		(void)rte_eth_dev_get_dcb_info(fwd_ports_ids[port], &dcb_info);
+		for (tc = 0; tc < dcb_info.nb_tcs; tc++) {
+			for (vmdq_idx = 0; vmdq_idx < RTE_ETH_MAX_VMDQ_POOL; vmdq_idx++) {
+				if (dcb_info.tc_queue.tc_rxq[vmdq_idx][tc].nb_queue == 0)
+					break;
+				/* make sure nb_rx_queue can be divisible. */
+				if (dcb_info.tc_queue.tc_rxq[vmdq_idx][tc].nb_queue %
+					dcb_fwd_tc_cores)
+					return -1;
+				/* make sure nb_tx_queue can be divisible. */
+				if (dcb_info.tc_queue.tc_txq[vmdq_idx][tc].nb_queue %
+					dcb_fwd_tc_cores)
+					return -1;
+			}
+		}
+	}
+
+	return 0;
+}
+
 static uint16_t
 get_fwd_port_total_tc_num(void)
 {
@@ -5164,14 +5194,17 @@ dcb_fwd_tc_update_dcb_info(struct rte_eth_dcb_info *org_dcb_info)
 }
 
 /**
- * For the DCB forwarding test, each core is assigned on each traffic class.
+ * For the DCB forwarding test, each core is assigned on each traffic class
+ * defaultly:
+ *   Each core is assigned a multi-stream, each stream being composed of
+ *   a RX queue to poll on a RX port for input messages, associated with
+ *   a TX queue of a TX port where to send forwarded packets. All RX and
+ *   TX queues are mapping to the same traffic class.
+ *   If VMDQ and DCB co-exist, each traffic class on different POOLs share
+ *   the same core.
  *
- * Each core is assigned a multi-stream, each stream being composed of
- * a RX queue to poll on a RX port for input messages, associated with
- * a TX queue of a TX port where to send forwarded packets. All RX and
- * TX queues are mapping to the same traffic class.
- * If VMDQ and DCB co-exist, each traffic class on different POOLs share
- * the same core
+ * If user set cores-per-TC to other value (e.g. 2), then there will multiple
+ * cores to process one TC.
  */
 static void
 dcb_fwd_config_setup(void)
@@ -5182,6 +5215,7 @@ dcb_fwd_config_setup(void)
 	lcoreid_t  lc_id;
 	uint16_t nb_rx_queue, nb_tx_queue;
 	uint16_t i, j, k, sm_id = 0;
+	uint16_t sub_core_idx = 0;
 	uint16_t total_tc_num;
 	struct rte_port *port;
 	uint8_t tc = 0;
@@ -5212,6 +5246,13 @@ dcb_fwd_config_setup(void)
 		}
 	}
 
+	ret = dcb_fwd_check_cores_per_tc();
+	if (ret != 0) {
+		fprintf(stderr, "Error: check forwarding cores-per-TC failed!\n");
+		cur_fwd_config.nb_fwd_lcores = 0;
+		return;
+	}
+
 	total_tc_num = get_fwd_port_total_tc_num();
 	if (total_tc_num == 0) {
 		fprintf(stderr, "Error: total forwarding TC num is zero!\n");
@@ -5219,12 +5260,16 @@ dcb_fwd_config_setup(void)
 		return;
 	}
 
-	cur_fwd_config.nb_fwd_lcores = (lcoreid_t) nb_fwd_lcores;
+	if (nb_fwd_lcores < total_tc_num * dcb_fwd_tc_cores) {
+		fprintf(stderr, "Error: the number of forwarding cores is insufficient!\n");
+		cur_fwd_config.nb_fwd_lcores = 0;
+		return;
+	}
+
+	cur_fwd_config.nb_fwd_lcores = total_tc_num * dcb_fwd_tc_cores;
 	cur_fwd_config.nb_fwd_ports = nb_fwd_ports;
 	cur_fwd_config.nb_fwd_streams =
 		(streamid_t) (nb_rxq * cur_fwd_config.nb_fwd_ports);
-	if (cur_fwd_config.nb_fwd_lcores > total_tc_num)
-		cur_fwd_config.nb_fwd_lcores = total_tc_num;
 
 	/* reinitialize forwarding streams */
 	init_fwd_streams();
@@ -5247,10 +5292,12 @@ dcb_fwd_config_setup(void)
 				break;
 			k = fwd_lcores[lc_id]->stream_nb +
 				fwd_lcores[lc_id]->stream_idx;
-			rxq = rxp_dcb_info.tc_queue.tc_rxq[i][tc].base;
-			txq = txp_dcb_info.tc_queue.tc_txq[i][tc].base;
-			nb_rx_queue = rxp_dcb_info.tc_queue.tc_rxq[i][tc].nb_queue;
-			nb_tx_queue = txp_dcb_info.tc_queue.tc_txq[i][tc].nb_queue;
+			nb_rx_queue = rxp_dcb_info.tc_queue.tc_rxq[i][tc].nb_queue /
+						dcb_fwd_tc_cores;
+			nb_tx_queue = txp_dcb_info.tc_queue.tc_txq[i][tc].nb_queue /
+						dcb_fwd_tc_cores;
+			rxq = rxp_dcb_info.tc_queue.tc_rxq[i][tc].base + nb_rx_queue * sub_core_idx;
+			txq = txp_dcb_info.tc_queue.tc_txq[i][tc].base + nb_tx_queue * sub_core_idx;
 			for (j = 0; j < nb_rx_queue; j++) {
 				struct fwd_stream *fs;
 
@@ -5262,11 +5309,14 @@ dcb_fwd_config_setup(void)
 				fs->peer_addr = fs->tx_port;
 				fs->retry_enabled = retry_enabled;
 			}
-			fwd_lcores[lc_id]->stream_nb +=
-				rxp_dcb_info.tc_queue.tc_rxq[i][tc].nb_queue;
+			sub_core_idx++;
+			fwd_lcores[lc_id]->stream_nb += nb_rx_queue;
 		}
 		sm_id = (streamid_t) (sm_id + fwd_lcores[lc_id]->stream_nb);
+		if (sub_core_idx < dcb_fwd_tc_cores)
+			continue;
 
+		sub_core_idx = 0;
 		tc++;
 		if (tc < rxp_dcb_info.nb_tcs)
 			continue;
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 9d0ce5660c..8cfb570da2 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -216,6 +216,15 @@ struct fwd_engine * fwd_engines[] = {
  * If bit-n in tc-mask is 1, then TC-n's forwarding is enabled, and vice versa.
  */
 uint8_t dcb_fwd_tc_mask = DEFAULT_DCB_FWD_TC_MASK;
+/*
+ * Poll cores per TC when DCB forwarding.
+ * E.g. 1 indicates that one core process all queues of a TC.
+ *      2 indicates that two cores process all queues of a TC. If there
+ *        is a TC with 8 queues, then [0, 3] belong to first core, and
+ *        [4, 7] belong to second core.
+ *      ...
+ */
+uint8_t dcb_fwd_tc_cores = 1;
 
 struct rte_mempool *mempools[RTE_MAX_NUMA_NODES * MAX_SEGS_BUFFER_SPLIT];
 uint16_t mempool_flags;
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index 1ada0de450..492b5757f1 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -486,6 +486,7 @@ extern cmdline_parse_inst_t cmd_set_flex_spec_pattern;
 
 #define DEFAULT_DCB_FWD_TC_MASK	0xFF
 extern uint8_t dcb_fwd_tc_mask;
+extern uint8_t dcb_fwd_tc_cores;
 
 extern uint16_t mempool_flags;
 
diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index 628f17fed7..209e88d531 100644
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -1885,6 +1885,14 @@ forwarding is enabled, and vice versa::
 
    testpmd> set dcb fwd_tc (tc_mask)
 
+set dcb fwd_tc_cores
+~~~~~~~~~~~~~~~~~~~~
+
+Config DCB forwarding cores per-TC, 1-means one core process all queues of a TC,
+2-means two cores process all queues of a TC, and so on::
+
+   testpmd> set dcb fwd_tc_cores (tc_cores)
+
 Port Functions
 --------------
 
-- 
2.17.1

[PATCH v6 0/2] two enhance for testpmd DCB test

[Chengwen Feng]

This patchset contains two enhancement for testpmd DCB test.

Chengwen Feng (2):
  app/testpmd: support specify TCs when DCB forward
  app/testpmd: support multi-cores process one TC

---
Depends-on: series-2682 ("two bugfix for testpmd DCB")
---
v6: try to fix CI windows 2022 compile error:
    ../app/test-pmd/config.c(5263): warning C4018: '<': signed/unsigned mismatch
v5: optimize naming and add line breaks for first commit.
    add second commit "support multi-cores process one TC".
v4: use direct assign of dcb-info according comment from Stephen.
    fix CI llvm compiler error.
v3: use new way to impl and fix comment from Stephen.
v2: introduce pause/resume lcore's forwarding.

 app/test-pmd/cmdline.c                      | 105 +++++++++++++++
 app/test-pmd/config.c                       | 135 +++++++++++++++++---
 app/test-pmd/testpmd.c                      |  15 +++
 app/test-pmd/testpmd.h                      |   4 +
 doc/guides/testpmd_app_ug/testpmd_funcs.rst |  16 +++
 5 files changed, 256 insertions(+), 19 deletions(-)

-- 
2.17.1

[PATCH v6 1/2] app/testpmd: support specify TCs when DCB forward

[Chengwen Feng]

This commit supports specify TCs when DCB forwarding, the command:

  set dcb fwd_tc (tc_mask)

The background of this command: only some TCs are expected to generate
traffic when the DCB function is tested based on txonly forwarding, we
could use this command to specify TCs to be used.

Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
 app/test-pmd/cmdline.c                      | 57 +++++++++++++++++++++
 app/test-pmd/config.c                       | 50 +++++++++++++++++-
 app/test-pmd/testpmd.c                      |  6 +++
 app/test-pmd/testpmd.h                      |  3 ++
 doc/guides/testpmd_app_ug/testpmd_funcs.rst |  8 +++
 5 files changed, 122 insertions(+), 2 deletions(-)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 22afbdbad3..cbd6020bc6 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -511,6 +511,9 @@ static void cmd_help_long_parsed(void *parsed_result,
 			"set fwd (%s)\n"
 			"    Set packet forwarding mode.\n\n"
 
+			"set dcb fwd_tc (tc_mask)\n"
+			"    Set dcb forwarding on specify TCs, if bit-n in tc-mask is 1, then TC-n's forwarding is enabled\n\n"
+
 			"mac_addr add (port_id) (XX:XX:XX:XX:XX:XX)\n"
 			"    Add a MAC address on port_id.\n\n"
 
@@ -6224,6 +6227,59 @@ static void cmd_set_fwd_retry_mode_init(void)
 	token_struct->string_data.str = token;
 }
 
+/* *** set dcb forward TCs *** */
+struct cmd_set_dcb_fwd_tc_result {
+	cmdline_fixed_string_t set;
+	cmdline_fixed_string_t dcb;
+	cmdline_fixed_string_t fwd_tc;
+	uint8_t                tc_mask;
+};
+
+static void cmd_set_dcb_fwd_tc_parsed(void *parsed_result,
+				      __rte_unused struct cmdline *cl,
+				      __rte_unused void *data)
+{
+	struct cmd_set_dcb_fwd_tc_result *res = parsed_result;
+	int i;
+	if (res->tc_mask == 0) {
+		fprintf(stderr, "TC mask should not be zero!\n");
+		return;
+	}
+	printf("Enabled DCB forwarding TC list:");
+	dcb_fwd_tc_mask = res->tc_mask;
+	for (i = 0; i < RTE_ETH_8_TCS; i++) {
+		if (dcb_fwd_tc_mask & (1u << i))
+			printf(" %d", i);
+	}
+	printf("\n");
+}
+
+static cmdline_parse_token_string_t cmd_set_dcb_fwd_tc_set =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_dcb_fwd_tc_result,
+			set, "set");
+static cmdline_parse_token_string_t cmd_set_dcb_fwd_tc_dcb =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_dcb_fwd_tc_result,
+			dcb, "dcb");
+static cmdline_parse_token_string_t cmd_set_dcb_fwd_tc_fwdtc =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_dcb_fwd_tc_result,
+			fwd_tc, "fwd_tc");
+static cmdline_parse_token_num_t cmd_set_dcb_fwd_tc_tcmask =
+	TOKEN_NUM_INITIALIZER(struct cmd_set_dcb_fwd_tc_result,
+			tc_mask, RTE_UINT8);
+
+static cmdline_parse_inst_t cmd_set_dcb_fwd_tc = {
+	.f = cmd_set_dcb_fwd_tc_parsed,
+	.data = NULL,
+	.help_str = "config DCB forwarding on specify TCs, if bit-n in tc-mask is 1, then TC-n's forwarding is enabled, and vice versa.",
+	.tokens = {
+		(void *)&cmd_set_dcb_fwd_tc_set,
+		(void *)&cmd_set_dcb_fwd_tc_dcb,
+		(void *)&cmd_set_dcb_fwd_tc_fwdtc,
+		(void *)&cmd_set_dcb_fwd_tc_tcmask,
+		NULL,
+	},
+};
+
 /* *** SET BURST TX DELAY TIME RETRY NUMBER *** */
 struct cmd_set_burst_tx_retry_result {
 	cmdline_fixed_string_t set;
@@ -14003,6 +14059,7 @@ static cmdline_parse_ctx_t builtin_ctx[] = {
 	&cmd_set_fwd_mask,
 	&cmd_set_fwd_mode,
 	&cmd_set_fwd_retry_mode,
+	&cmd_set_dcb_fwd_tc,
 	&cmd_set_burst_tx_retry,
 	&cmd_set_promisc_mode_one,
 	&cmd_set_promisc_mode_all,
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 8557371488..88c1e99c5e 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -5121,12 +5121,48 @@ get_fwd_port_total_tc_num(void)
 
 	for (i = 0; i < nb_fwd_ports; i++) {
 		(void)rte_eth_dev_get_dcb_info(fwd_ports_ids[i], &dcb_info);
-		total_tc_num += dcb_info.nb_tcs;
+		total_tc_num += rte_popcount32(dcb_fwd_tc_mask & ((1u << dcb_info.nb_tcs) - 1));
 	}
 
 	return total_tc_num;
 }
 
+static void
+dcb_fwd_tc_update_dcb_info(struct rte_eth_dcb_info *org_dcb_info)
+{
+	struct rte_eth_dcb_info dcb_info = {0};
+	uint32_t i, vmdq_idx;
+	uint32_t tc = 0;
+
+	if (dcb_fwd_tc_mask == DEFAULT_DCB_FWD_TC_MASK)
+		return;
+
+	/*
+	 * Use compress scheme to update dcb-info.
+	 * E.g. If org_dcb_info->nb_tcs is 4 and dcb_fwd_tc_mask is 0x8, it
+	 *      means only enable TC3, then the new dcb-info's nb_tcs is set to
+	 *      1, and also move corresponding tc_rxq and tc_txq info to new
+	 *      index.
+	 */
+	for (i = 0; i < org_dcb_info->nb_tcs; i++) {
+		if (!(dcb_fwd_tc_mask & (1u << i)))
+			continue;
+		for (vmdq_idx = 0; vmdq_idx < RTE_ETH_MAX_VMDQ_POOL; vmdq_idx++) {
+			dcb_info.tc_queue.tc_rxq[vmdq_idx][tc].base =
+				org_dcb_info->tc_queue.tc_rxq[vmdq_idx][i].base;
+			dcb_info.tc_queue.tc_rxq[vmdq_idx][tc].nb_queue =
+				org_dcb_info->tc_queue.tc_rxq[vmdq_idx][i].nb_queue;
+			dcb_info.tc_queue.tc_txq[vmdq_idx][tc].base =
+				org_dcb_info->tc_queue.tc_txq[vmdq_idx][i].base;
+			dcb_info.tc_queue.tc_txq[vmdq_idx][tc].nb_queue =
+				org_dcb_info->tc_queue.tc_txq[vmdq_idx][i].nb_queue;
+		}
+		tc++;
+	}
+	dcb_info.nb_tcs = tc;
+	*org_dcb_info = dcb_info;
+}
+
 /**
  * For the DCB forwarding test, each core is assigned on each traffic class.
  *
@@ -5176,11 +5212,17 @@ dcb_fwd_config_setup(void)
 		}
 	}
 
+	total_tc_num = get_fwd_port_total_tc_num();
+	if (total_tc_num == 0) {
+		fprintf(stderr, "Error: total forwarding TC num is zero!\n");
+		cur_fwd_config.nb_fwd_lcores = 0;
+		return;
+	}
+
 	cur_fwd_config.nb_fwd_lcores = (lcoreid_t) nb_fwd_lcores;
 	cur_fwd_config.nb_fwd_ports = nb_fwd_ports;
 	cur_fwd_config.nb_fwd_streams =
 		(streamid_t) (nb_rxq * cur_fwd_config.nb_fwd_ports);
-	total_tc_num = get_fwd_port_total_tc_num();
 	if (cur_fwd_config.nb_fwd_lcores > total_tc_num)
 		cur_fwd_config.nb_fwd_lcores = total_tc_num;
 
@@ -5190,7 +5232,9 @@ dcb_fwd_config_setup(void)
 	txp = fwd_topology_tx_port_get(rxp);
 	/* get the dcb info on the first RX and TX ports */
 	(void)rte_eth_dev_get_dcb_info(fwd_ports_ids[rxp], &rxp_dcb_info);
+	dcb_fwd_tc_update_dcb_info(&rxp_dcb_info);
 	(void)rte_eth_dev_get_dcb_info(fwd_ports_ids[txp], &txp_dcb_info);
+	dcb_fwd_tc_update_dcb_info(&txp_dcb_info);
 
 	for (lc_id = 0; lc_id < cur_fwd_config.nb_fwd_lcores; lc_id++) {
 		fwd_lcores[lc_id]->stream_nb = 0;
@@ -5238,7 +5282,9 @@ dcb_fwd_config_setup(void)
 		txp = fwd_topology_tx_port_get(rxp);
 		/* get the dcb information on next RX and TX ports */
 		rte_eth_dev_get_dcb_info(fwd_ports_ids[rxp], &rxp_dcb_info);
+		dcb_fwd_tc_update_dcb_info(&rxp_dcb_info);
 		rte_eth_dev_get_dcb_info(fwd_ports_ids[txp], &txp_dcb_info);
+		dcb_fwd_tc_update_dcb_info(&txp_dcb_info);
 	}
 }
 
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 2360da3a48..9d0ce5660c 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -211,6 +211,12 @@ struct fwd_engine * fwd_engines[] = {
 	NULL,
 };
 
+/*
+ * Bitmask for control DCB forwarding for TCs.
+ * If bit-n in tc-mask is 1, then TC-n's forwarding is enabled, and vice versa.
+ */
+uint8_t dcb_fwd_tc_mask = DEFAULT_DCB_FWD_TC_MASK;
+
 struct rte_mempool *mempools[RTE_MAX_NUMA_NODES * MAX_SEGS_BUFFER_SPLIT];
 uint16_t mempool_flags;
 
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index fa46865c67..1ada0de450 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -484,6 +484,9 @@ extern cmdline_parse_inst_t cmd_show_set_raw_all;
 extern cmdline_parse_inst_t cmd_set_flex_is_pattern;
 extern cmdline_parse_inst_t cmd_set_flex_spec_pattern;
 
+#define DEFAULT_DCB_FWD_TC_MASK	0xFF
+extern uint8_t dcb_fwd_tc_mask;
+
 extern uint16_t mempool_flags;
 
 /**
diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index e423abd40e..628f17fed7 100644
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -1877,6 +1877,14 @@ Set a controllable LED associated with a certain port on or off::
 
    testpmd> set port (port_id) led (on|off)
 
+set dcb fwd_tc
+~~~~~~~~~~~~~~
+
+Config DCB forwarding on specify TCs, if bit-n in tc-mask is 1, then TC-n's
+forwarding is enabled, and vice versa::
+
+   testpmd> set dcb fwd_tc (tc_mask)
+
 Port Functions
 --------------
 
-- 
2.17.1

[PATCH v6 2/2] app/testpmd: support multi-cores process one TC

[Chengwen Feng]

Currently, one TC can be processed by only one core, when there are a
large number of small packets, this core becomes a bottleneck.

This commit supports multi-cores process one TC, the command:

  set dcb fwd_tc_cores (tc_cores)

Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
 app/test-pmd/cmdline.c                      | 48 ++++++++++++
 app/test-pmd/config.c                       | 85 ++++++++++++++++-----
 app/test-pmd/testpmd.c                      |  9 +++
 app/test-pmd/testpmd.h                      |  1 +
 doc/guides/testpmd_app_ug/testpmd_funcs.rst |  8 ++
 5 files changed, 134 insertions(+), 17 deletions(-)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index cbd6020bc6..97dbc008af 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -6280,6 +6280,53 @@ static cmdline_parse_inst_t cmd_set_dcb_fwd_tc = {
 	},
 };
 
+/* *** set dcb forward cores per TC *** */
+struct cmd_set_dcb_fwd_tc_cores_result {
+	cmdline_fixed_string_t set;
+	cmdline_fixed_string_t dcb;
+	cmdline_fixed_string_t fwd_tc_cores;
+	uint8_t                tc_cores;
+};
+
+static void cmd_set_dcb_fwd_tc_cores_parsed(void *parsed_result,
+					    __rte_unused struct cmdline *cl,
+					    __rte_unused void *data)
+{
+	struct cmd_set_dcb_fwd_tc_cores_result *res = parsed_result;
+	if (res->tc_cores == 0) {
+		fprintf(stderr, "Cores per-TC should not be zero!\n");
+		return;
+	}
+	dcb_fwd_tc_cores = res->tc_cores;
+	printf("Set cores-per-TC: %u\n", dcb_fwd_tc_cores);
+}
+
+static cmdline_parse_token_string_t cmd_set_dcb_fwd_tc_cores_set =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_dcb_fwd_tc_cores_result,
+			set, "set");
+static cmdline_parse_token_string_t cmd_set_dcb_fwd_tc_cores_dcb =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_dcb_fwd_tc_cores_result,
+			dcb, "dcb");
+static cmdline_parse_token_string_t cmd_set_dcb_fwd_tc_cores_fwdtccores =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_dcb_fwd_tc_cores_result,
+			fwd_tc_cores, "fwd_tc_cores");
+static cmdline_parse_token_num_t cmd_set_dcb_fwd_tc_cores_tccores =
+	TOKEN_NUM_INITIALIZER(struct cmd_set_dcb_fwd_tc_cores_result,
+			tc_cores, RTE_UINT8);
+
+static cmdline_parse_inst_t cmd_set_dcb_fwd_tc_cores = {
+	.f = cmd_set_dcb_fwd_tc_cores_parsed,
+	.data = NULL,
+	.help_str = "config DCB forwarding cores per-TC, 1-means one core process all queues of a TC.",
+	.tokens = {
+		(void *)&cmd_set_dcb_fwd_tc_cores_set,
+		(void *)&cmd_set_dcb_fwd_tc_cores_dcb,
+		(void *)&cmd_set_dcb_fwd_tc_cores_fwdtccores,
+		(void *)&cmd_set_dcb_fwd_tc_cores_tccores,
+		NULL,
+	},
+};
+
 /* *** SET BURST TX DELAY TIME RETRY NUMBER *** */
 struct cmd_set_burst_tx_retry_result {
 	cmdline_fixed_string_t set;
@@ -14060,6 +14107,7 @@ static cmdline_parse_ctx_t builtin_ctx[] = {
 	&cmd_set_fwd_mode,
 	&cmd_set_fwd_retry_mode,
 	&cmd_set_dcb_fwd_tc,
+	&cmd_set_dcb_fwd_tc_cores,
 	&cmd_set_burst_tx_retry,
 	&cmd_set_promisc_mode_one,
 	&cmd_set_promisc_mode_all,
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 88c1e99c5e..6ea506254b 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -5112,6 +5112,36 @@ rss_fwd_config_setup(void)
 	}
 }
 
+static int
+dcb_fwd_check_cores_per_tc(void)
+{
+	struct rte_eth_dcb_info dcb_info = {0};
+	uint32_t port, tc, vmdq_idx;
+
+	if (dcb_fwd_tc_cores == 1)
+		return 0;
+
+	for (port = 0; port < nb_fwd_ports; port++) {
+		(void)rte_eth_dev_get_dcb_info(fwd_ports_ids[port], &dcb_info);
+		for (tc = 0; tc < dcb_info.nb_tcs; tc++) {
+			for (vmdq_idx = 0; vmdq_idx < RTE_ETH_MAX_VMDQ_POOL; vmdq_idx++) {
+				if (dcb_info.tc_queue.tc_rxq[vmdq_idx][tc].nb_queue == 0)
+					break;
+				/* make sure nb_rx_queue can be divisible. */
+				if (dcb_info.tc_queue.tc_rxq[vmdq_idx][tc].nb_queue %
+					dcb_fwd_tc_cores)
+					return -1;
+				/* make sure nb_tx_queue can be divisible. */
+				if (dcb_info.tc_queue.tc_txq[vmdq_idx][tc].nb_queue %
+					dcb_fwd_tc_cores)
+					return -1;
+			}
+		}
+	}
+
+	return 0;
+}
+
 static uint16_t
 get_fwd_port_total_tc_num(void)
 {
@@ -5164,14 +5194,17 @@ dcb_fwd_tc_update_dcb_info(struct rte_eth_dcb_info *org_dcb_info)
 }
 
 /**
- * For the DCB forwarding test, each core is assigned on each traffic class.
+ * For the DCB forwarding test, each core is assigned on each traffic class
+ * defaultly:
+ *   Each core is assigned a multi-stream, each stream being composed of
+ *   a RX queue to poll on a RX port for input messages, associated with
+ *   a TX queue of a TX port where to send forwarded packets. All RX and
+ *   TX queues are mapping to the same traffic class.
+ *   If VMDQ and DCB co-exist, each traffic class on different POOLs share
+ *   the same core.
  *
- * Each core is assigned a multi-stream, each stream being composed of
- * a RX queue to poll on a RX port for input messages, associated with
- * a TX queue of a TX port where to send forwarded packets. All RX and
- * TX queues are mapping to the same traffic class.
- * If VMDQ and DCB co-exist, each traffic class on different POOLs share
- * the same core
+ * If user set cores-per-TC to other value (e.g. 2), then there will multiple
+ * cores to process one TC.
  */
 static void
 dcb_fwd_config_setup(void)
@@ -5179,9 +5212,10 @@ dcb_fwd_config_setup(void)
 	struct rte_eth_dcb_info rxp_dcb_info, txp_dcb_info;
 	portid_t txp, rxp = 0;
 	queueid_t txq, rxq = 0;
-	lcoreid_t  lc_id;
+	lcoreid_t  lc_id, target_lcores;
 	uint16_t nb_rx_queue, nb_tx_queue;
 	uint16_t i, j, k, sm_id = 0;
+	uint16_t sub_core_idx = 0;
 	uint16_t total_tc_num;
 	struct rte_port *port;
 	uint8_t tc = 0;
@@ -5212,6 +5246,13 @@ dcb_fwd_config_setup(void)
 		}
 	}
 
+	ret = dcb_fwd_check_cores_per_tc();
+	if (ret != 0) {
+		fprintf(stderr, "Error: check forwarding cores-per-TC failed!\n");
+		cur_fwd_config.nb_fwd_lcores = 0;
+		return;
+	}
+
 	total_tc_num = get_fwd_port_total_tc_num();
 	if (total_tc_num == 0) {
 		fprintf(stderr, "Error: total forwarding TC num is zero!\n");
@@ -5219,12 +5260,17 @@ dcb_fwd_config_setup(void)
 		return;
 	}
 
-	cur_fwd_config.nb_fwd_lcores = (lcoreid_t) nb_fwd_lcores;
+	target_lcores = (lcoreid_t)total_tc_num * (lcoreid_t)dcb_fwd_tc_cores;
+	if (nb_fwd_lcores < target_lcores) {
+		fprintf(stderr, "Error: the number of forwarding cores is insufficient!\n");
+		cur_fwd_config.nb_fwd_lcores = 0;
+		return;
+	}
+
+	cur_fwd_config.nb_fwd_lcores = target_lcores;
 	cur_fwd_config.nb_fwd_ports = nb_fwd_ports;
 	cur_fwd_config.nb_fwd_streams =
 		(streamid_t) (nb_rxq * cur_fwd_config.nb_fwd_ports);
-	if (cur_fwd_config.nb_fwd_lcores > total_tc_num)
-		cur_fwd_config.nb_fwd_lcores = total_tc_num;
 
 	/* reinitialize forwarding streams */
 	init_fwd_streams();
@@ -5247,10 +5293,12 @@ dcb_fwd_config_setup(void)
 				break;
 			k = fwd_lcores[lc_id]->stream_nb +
 				fwd_lcores[lc_id]->stream_idx;
-			rxq = rxp_dcb_info.tc_queue.tc_rxq[i][tc].base;
-			txq = txp_dcb_info.tc_queue.tc_txq[i][tc].base;
-			nb_rx_queue = rxp_dcb_info.tc_queue.tc_rxq[i][tc].nb_queue;
-			nb_tx_queue = txp_dcb_info.tc_queue.tc_txq[i][tc].nb_queue;
+			nb_rx_queue = rxp_dcb_info.tc_queue.tc_rxq[i][tc].nb_queue /
+						dcb_fwd_tc_cores;
+			nb_tx_queue = txp_dcb_info.tc_queue.tc_txq[i][tc].nb_queue /
+						dcb_fwd_tc_cores;
+			rxq = rxp_dcb_info.tc_queue.tc_rxq[i][tc].base + nb_rx_queue * sub_core_idx;
+			txq = txp_dcb_info.tc_queue.tc_txq[i][tc].base + nb_tx_queue * sub_core_idx;
 			for (j = 0; j < nb_rx_queue; j++) {
 				struct fwd_stream *fs;
 
@@ -5262,11 +5310,14 @@ dcb_fwd_config_setup(void)
 				fs->peer_addr = fs->tx_port;
 				fs->retry_enabled = retry_enabled;
 			}
-			fwd_lcores[lc_id]->stream_nb +=
-				rxp_dcb_info.tc_queue.tc_rxq[i][tc].nb_queue;
+			sub_core_idx++;
+			fwd_lcores[lc_id]->stream_nb += nb_rx_queue;
 		}
 		sm_id = (streamid_t) (sm_id + fwd_lcores[lc_id]->stream_nb);
+		if (sub_core_idx < dcb_fwd_tc_cores)
+			continue;
 
+		sub_core_idx = 0;
 		tc++;
 		if (tc < rxp_dcb_info.nb_tcs)
 			continue;
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 9d0ce5660c..8cfb570da2 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -216,6 +216,15 @@ struct fwd_engine * fwd_engines[] = {
  * If bit-n in tc-mask is 1, then TC-n's forwarding is enabled, and vice versa.
  */
 uint8_t dcb_fwd_tc_mask = DEFAULT_DCB_FWD_TC_MASK;
+/*
+ * Poll cores per TC when DCB forwarding.
+ * E.g. 1 indicates that one core process all queues of a TC.
+ *      2 indicates that two cores process all queues of a TC. If there
+ *        is a TC with 8 queues, then [0, 3] belong to first core, and
+ *        [4, 7] belong to second core.
+ *      ...
+ */
+uint8_t dcb_fwd_tc_cores = 1;
 
 struct rte_mempool *mempools[RTE_MAX_NUMA_NODES * MAX_SEGS_BUFFER_SPLIT];
 uint16_t mempool_flags;
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index 1ada0de450..492b5757f1 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -486,6 +486,7 @@ extern cmdline_parse_inst_t cmd_set_flex_spec_pattern;
 
 #define DEFAULT_DCB_FWD_TC_MASK	0xFF
 extern uint8_t dcb_fwd_tc_mask;
+extern uint8_t dcb_fwd_tc_cores;
 
 extern uint16_t mempool_flags;
 
diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index 628f17fed7..209e88d531 100644
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -1885,6 +1885,14 @@ forwarding is enabled, and vice versa::
 
    testpmd> set dcb fwd_tc (tc_mask)
 
+set dcb fwd_tc_cores
+~~~~~~~~~~~~~~~~~~~~
+
+Config DCB forwarding cores per-TC, 1-means one core process all queues of a TC,
+2-means two cores process all queues of a TC, and so on::
+
+   testpmd> set dcb fwd_tc_cores (tc_cores)
+
 Port Functions
 --------------
 
-- 
2.17.1

[PATCH v7 0/2] two enhance for testpmd DCB test

[Chengwen Feng]

This patchset contains two enhancement for testpmd DCB test.

Chengwen Feng (2):
  app/testpmd: support specify TCs when DCB forward
  app/testpmd: support multi-cores process one TC

---
v7: rebase to main branch.
v6: try to fix CI windows 2022 compile error:
    ../app/test-pmd/config.c(5263): warning C4018: '<': signed/unsigned mismatch
v5: optimize naming and add line breaks for first commit.
    add second commit "support multi-cores process one TC".
v4: use direct assign of dcb-info according comment from Stephen.
    fix CI llvm compiler error.
v3: use new way to impl and fix comment from Stephen.
v2: introduce pause/resume lcore's forwarding.

 app/test-pmd/cmdline.c                      | 105 +++++++++++++++
 app/test-pmd/config.c                       | 135 +++++++++++++++++---
 app/test-pmd/testpmd.c                      |  15 +++
 app/test-pmd/testpmd.h                      |   4 +
 doc/guides/testpmd_app_ug/testpmd_funcs.rst |  16 +++
 5 files changed, 256 insertions(+), 19 deletions(-)

-- 
2.17.1

[PATCH v7 1/2] app/testpmd: support specify TCs when DCB forward

[Chengwen Feng]

This commit supports specify TCs when DCB forwarding, the command:

  set dcb fwd_tc (tc_mask)

The background of this command: only some TCs are expected to generate
traffic when the DCB function is tested based on txonly forwarding, we
could use this command to specify TCs to be used.

Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
 app/test-pmd/cmdline.c                      | 57 +++++++++++++++++++++
 app/test-pmd/config.c                       | 50 +++++++++++++++++-
 app/test-pmd/testpmd.c                      |  6 +++
 app/test-pmd/testpmd.h                      |  3 ++
 doc/guides/testpmd_app_ug/testpmd_funcs.rst |  8 +++
 5 files changed, 122 insertions(+), 2 deletions(-)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 22afbdbad3..cbd6020bc6 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -511,6 +511,9 @@ static void cmd_help_long_parsed(void *parsed_result,
 			"set fwd (%s)\n"
 			"    Set packet forwarding mode.\n\n"
 
+			"set dcb fwd_tc (tc_mask)\n"
+			"    Set dcb forwarding on specify TCs, if bit-n in tc-mask is 1, then TC-n's forwarding is enabled\n\n"
+
 			"mac_addr add (port_id) (XX:XX:XX:XX:XX:XX)\n"
 			"    Add a MAC address on port_id.\n\n"
 
@@ -6224,6 +6227,59 @@ static void cmd_set_fwd_retry_mode_init(void)
 	token_struct->string_data.str = token;
 }
 
+/* *** set dcb forward TCs *** */
+struct cmd_set_dcb_fwd_tc_result {
+	cmdline_fixed_string_t set;
+	cmdline_fixed_string_t dcb;
+	cmdline_fixed_string_t fwd_tc;
+	uint8_t                tc_mask;
+};
+
+static void cmd_set_dcb_fwd_tc_parsed(void *parsed_result,
+				      __rte_unused struct cmdline *cl,
+				      __rte_unused void *data)
+{
+	struct cmd_set_dcb_fwd_tc_result *res = parsed_result;
+	int i;
+	if (res->tc_mask == 0) {
+		fprintf(stderr, "TC mask should not be zero!\n");
+		return;
+	}
+	printf("Enabled DCB forwarding TC list:");
+	dcb_fwd_tc_mask = res->tc_mask;
+	for (i = 0; i < RTE_ETH_8_TCS; i++) {
+		if (dcb_fwd_tc_mask & (1u << i))
+			printf(" %d", i);
+	}
+	printf("\n");
+}
+
+static cmdline_parse_token_string_t cmd_set_dcb_fwd_tc_set =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_dcb_fwd_tc_result,
+			set, "set");
+static cmdline_parse_token_string_t cmd_set_dcb_fwd_tc_dcb =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_dcb_fwd_tc_result,
+			dcb, "dcb");
+static cmdline_parse_token_string_t cmd_set_dcb_fwd_tc_fwdtc =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_dcb_fwd_tc_result,
+			fwd_tc, "fwd_tc");
+static cmdline_parse_token_num_t cmd_set_dcb_fwd_tc_tcmask =
+	TOKEN_NUM_INITIALIZER(struct cmd_set_dcb_fwd_tc_result,
+			tc_mask, RTE_UINT8);
+
+static cmdline_parse_inst_t cmd_set_dcb_fwd_tc = {
+	.f = cmd_set_dcb_fwd_tc_parsed,
+	.data = NULL,
+	.help_str = "config DCB forwarding on specify TCs, if bit-n in tc-mask is 1, then TC-n's forwarding is enabled, and vice versa.",
+	.tokens = {
+		(void *)&cmd_set_dcb_fwd_tc_set,
+		(void *)&cmd_set_dcb_fwd_tc_dcb,
+		(void *)&cmd_set_dcb_fwd_tc_fwdtc,
+		(void *)&cmd_set_dcb_fwd_tc_tcmask,
+		NULL,
+	},
+};
+
 /* *** SET BURST TX DELAY TIME RETRY NUMBER *** */
 struct cmd_set_burst_tx_retry_result {
 	cmdline_fixed_string_t set;
@@ -14003,6 +14059,7 @@ static cmdline_parse_ctx_t builtin_ctx[] = {
 	&cmd_set_fwd_mask,
 	&cmd_set_fwd_mode,
 	&cmd_set_fwd_retry_mode,
+	&cmd_set_dcb_fwd_tc,
 	&cmd_set_burst_tx_retry,
 	&cmd_set_promisc_mode_one,
 	&cmd_set_promisc_mode_all,
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 8557371488..88c1e99c5e 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -5121,12 +5121,48 @@ get_fwd_port_total_tc_num(void)
 
 	for (i = 0; i < nb_fwd_ports; i++) {
 		(void)rte_eth_dev_get_dcb_info(fwd_ports_ids[i], &dcb_info);
-		total_tc_num += dcb_info.nb_tcs;
+		total_tc_num += rte_popcount32(dcb_fwd_tc_mask & ((1u << dcb_info.nb_tcs) - 1));
 	}
 
 	return total_tc_num;
 }
 
+static void
+dcb_fwd_tc_update_dcb_info(struct rte_eth_dcb_info *org_dcb_info)
+{
+	struct rte_eth_dcb_info dcb_info = {0};
+	uint32_t i, vmdq_idx;
+	uint32_t tc = 0;
+
+	if (dcb_fwd_tc_mask == DEFAULT_DCB_FWD_TC_MASK)
+		return;
+
+	/*
+	 * Use compress scheme to update dcb-info.
+	 * E.g. If org_dcb_info->nb_tcs is 4 and dcb_fwd_tc_mask is 0x8, it
+	 *      means only enable TC3, then the new dcb-info's nb_tcs is set to
+	 *      1, and also move corresponding tc_rxq and tc_txq info to new
+	 *      index.
+	 */
+	for (i = 0; i < org_dcb_info->nb_tcs; i++) {
+		if (!(dcb_fwd_tc_mask & (1u << i)))
+			continue;
+		for (vmdq_idx = 0; vmdq_idx < RTE_ETH_MAX_VMDQ_POOL; vmdq_idx++) {
+			dcb_info.tc_queue.tc_rxq[vmdq_idx][tc].base =
+				org_dcb_info->tc_queue.tc_rxq[vmdq_idx][i].base;
+			dcb_info.tc_queue.tc_rxq[vmdq_idx][tc].nb_queue =
+				org_dcb_info->tc_queue.tc_rxq[vmdq_idx][i].nb_queue;
+			dcb_info.tc_queue.tc_txq[vmdq_idx][tc].base =
+				org_dcb_info->tc_queue.tc_txq[vmdq_idx][i].base;
+			dcb_info.tc_queue.tc_txq[vmdq_idx][tc].nb_queue =
+				org_dcb_info->tc_queue.tc_txq[vmdq_idx][i].nb_queue;
+		}
+		tc++;
+	}
+	dcb_info.nb_tcs = tc;
+	*org_dcb_info = dcb_info;
+}
+
 /**
  * For the DCB forwarding test, each core is assigned on each traffic class.
  *
@@ -5176,11 +5212,17 @@ dcb_fwd_config_setup(void)
 		}
 	}
 
+	total_tc_num = get_fwd_port_total_tc_num();
+	if (total_tc_num == 0) {
+		fprintf(stderr, "Error: total forwarding TC num is zero!\n");
+		cur_fwd_config.nb_fwd_lcores = 0;
+		return;
+	}
+
 	cur_fwd_config.nb_fwd_lcores = (lcoreid_t) nb_fwd_lcores;
 	cur_fwd_config.nb_fwd_ports = nb_fwd_ports;
 	cur_fwd_config.nb_fwd_streams =
 		(streamid_t) (nb_rxq * cur_fwd_config.nb_fwd_ports);
-	total_tc_num = get_fwd_port_total_tc_num();
 	if (cur_fwd_config.nb_fwd_lcores > total_tc_num)
 		cur_fwd_config.nb_fwd_lcores = total_tc_num;
 
@@ -5190,7 +5232,9 @@ dcb_fwd_config_setup(void)
 	txp = fwd_topology_tx_port_get(rxp);
 	/* get the dcb info on the first RX and TX ports */
 	(void)rte_eth_dev_get_dcb_info(fwd_ports_ids[rxp], &rxp_dcb_info);
+	dcb_fwd_tc_update_dcb_info(&rxp_dcb_info);
 	(void)rte_eth_dev_get_dcb_info(fwd_ports_ids[txp], &txp_dcb_info);
+	dcb_fwd_tc_update_dcb_info(&txp_dcb_info);
 
 	for (lc_id = 0; lc_id < cur_fwd_config.nb_fwd_lcores; lc_id++) {
 		fwd_lcores[lc_id]->stream_nb = 0;
@@ -5238,7 +5282,9 @@ dcb_fwd_config_setup(void)
 		txp = fwd_topology_tx_port_get(rxp);
 		/* get the dcb information on next RX and TX ports */
 		rte_eth_dev_get_dcb_info(fwd_ports_ids[rxp], &rxp_dcb_info);
+		dcb_fwd_tc_update_dcb_info(&rxp_dcb_info);
 		rte_eth_dev_get_dcb_info(fwd_ports_ids[txp], &txp_dcb_info);
+		dcb_fwd_tc_update_dcb_info(&txp_dcb_info);
 	}
 }
 
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index b10f6baee2..04a4727b88 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -211,6 +211,12 @@ struct fwd_engine * fwd_engines[] = {
 	NULL,
 };
 
+/*
+ * Bitmask for control DCB forwarding for TCs.
+ * If bit-n in tc-mask is 1, then TC-n's forwarding is enabled, and vice versa.
+ */
+uint8_t dcb_fwd_tc_mask = DEFAULT_DCB_FWD_TC_MASK;
+
 struct rte_mempool *mempools[RTE_MAX_NUMA_NODES * MAX_SEGS_BUFFER_SPLIT];
 uint16_t mempool_flags;
 
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index fa46865c67..1ada0de450 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -484,6 +484,9 @@ extern cmdline_parse_inst_t cmd_show_set_raw_all;
 extern cmdline_parse_inst_t cmd_set_flex_is_pattern;
 extern cmdline_parse_inst_t cmd_set_flex_spec_pattern;
 
+#define DEFAULT_DCB_FWD_TC_MASK	0xFF
+extern uint8_t dcb_fwd_tc_mask;
+
 extern uint16_t mempool_flags;
 
 /**
diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index e423abd40e..628f17fed7 100644
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -1877,6 +1877,14 @@ Set a controllable LED associated with a certain port on or off::
 
    testpmd> set port (port_id) led (on|off)
 
+set dcb fwd_tc
+~~~~~~~~~~~~~~
+
+Config DCB forwarding on specify TCs, if bit-n in tc-mask is 1, then TC-n's
+forwarding is enabled, and vice versa::
+
+   testpmd> set dcb fwd_tc (tc_mask)
+
 Port Functions
 --------------
 
-- 
2.17.1

Re: [PATCH v7 1/2] app/testpmd: support specify TCs when DCB forward

[lihuisong (C)]

在 2025/11/11 17:13, Chengwen Feng 写道:
> This commit supports specify TCs when DCB forwarding, the command:
>
>    set dcb fwd_tc (tc_mask)
>
> The background of this command: only some TCs are expected to generate
> traffic when the DCB function is tested based on txonly forwarding, we
> could use this command to specify TCs to be used.
>
> Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
LGTM,
Acked-by: lihuisong@huawei.com
>   

Re: [PATCH v7 1/2] app/testpmd: support specify TCs when DCB forward

[Medvedkin, Vladimir]

Reviewed-by: Vladimir Medvedkin <vladimir.medvedkin@intel.com>

On 11/11/2025 9:13 AM, Chengwen Feng wrote:
> This commit supports specify TCs when DCB forwarding, the command:
>
>    set dcb fwd_tc (tc_mask)
>
> The background of this command: only some TCs are expected to generate
> traffic when the DCB function is tested based on txonly forwarding, we
> could use this command to specify TCs to be used.
>
> Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
> ---
>   app/test-pmd/cmdline.c                      | 57 +++++++++++++++++++++
>   app/test-pmd/config.c                       | 50 +++++++++++++++++-
>   app/test-pmd/testpmd.c                      |  6 +++
>   app/test-pmd/testpmd.h                      |  3 ++
>   doc/guides/testpmd_app_ug/testpmd_funcs.rst |  8 +++
>   5 files changed, 122 insertions(+), 2 deletions(-)
>
<snip>

-- 
Regards,
Vladimir

[PATCH v7 2/2] app/testpmd: support multi-cores process one TC

[Chengwen Feng]

Currently, one TC can be processed by only one core, when there are a
large number of small packets, this core becomes a bottleneck.

This commit supports multi-cores process one TC, the command:

  set dcb fwd_tc_cores (tc_cores)

Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
---
 app/test-pmd/cmdline.c                      | 48 ++++++++++++
 app/test-pmd/config.c                       | 85 ++++++++++++++++-----
 app/test-pmd/testpmd.c                      |  9 +++
 app/test-pmd/testpmd.h                      |  1 +
 doc/guides/testpmd_app_ug/testpmd_funcs.rst |  8 ++
 5 files changed, 134 insertions(+), 17 deletions(-)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index cbd6020bc6..97dbc008af 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -6280,6 +6280,53 @@ static cmdline_parse_inst_t cmd_set_dcb_fwd_tc = {
 	},
 };
 
+/* *** set dcb forward cores per TC *** */
+struct cmd_set_dcb_fwd_tc_cores_result {
+	cmdline_fixed_string_t set;
+	cmdline_fixed_string_t dcb;
+	cmdline_fixed_string_t fwd_tc_cores;
+	uint8_t                tc_cores;
+};
+
+static void cmd_set_dcb_fwd_tc_cores_parsed(void *parsed_result,
+					    __rte_unused struct cmdline *cl,
+					    __rte_unused void *data)
+{
+	struct cmd_set_dcb_fwd_tc_cores_result *res = parsed_result;
+	if (res->tc_cores == 0) {
+		fprintf(stderr, "Cores per-TC should not be zero!\n");
+		return;
+	}
+	dcb_fwd_tc_cores = res->tc_cores;
+	printf("Set cores-per-TC: %u\n", dcb_fwd_tc_cores);
+}
+
+static cmdline_parse_token_string_t cmd_set_dcb_fwd_tc_cores_set =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_dcb_fwd_tc_cores_result,
+			set, "set");
+static cmdline_parse_token_string_t cmd_set_dcb_fwd_tc_cores_dcb =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_dcb_fwd_tc_cores_result,
+			dcb, "dcb");
+static cmdline_parse_token_string_t cmd_set_dcb_fwd_tc_cores_fwdtccores =
+	TOKEN_STRING_INITIALIZER(struct cmd_set_dcb_fwd_tc_cores_result,
+			fwd_tc_cores, "fwd_tc_cores");
+static cmdline_parse_token_num_t cmd_set_dcb_fwd_tc_cores_tccores =
+	TOKEN_NUM_INITIALIZER(struct cmd_set_dcb_fwd_tc_cores_result,
+			tc_cores, RTE_UINT8);
+
+static cmdline_parse_inst_t cmd_set_dcb_fwd_tc_cores = {
+	.f = cmd_set_dcb_fwd_tc_cores_parsed,
+	.data = NULL,
+	.help_str = "config DCB forwarding cores per-TC, 1-means one core process all queues of a TC.",
+	.tokens = {
+		(void *)&cmd_set_dcb_fwd_tc_cores_set,
+		(void *)&cmd_set_dcb_fwd_tc_cores_dcb,
+		(void *)&cmd_set_dcb_fwd_tc_cores_fwdtccores,
+		(void *)&cmd_set_dcb_fwd_tc_cores_tccores,
+		NULL,
+	},
+};
+
 /* *** SET BURST TX DELAY TIME RETRY NUMBER *** */
 struct cmd_set_burst_tx_retry_result {
 	cmdline_fixed_string_t set;
@@ -14060,6 +14107,7 @@ static cmdline_parse_ctx_t builtin_ctx[] = {
 	&cmd_set_fwd_mode,
 	&cmd_set_fwd_retry_mode,
 	&cmd_set_dcb_fwd_tc,
+	&cmd_set_dcb_fwd_tc_cores,
 	&cmd_set_burst_tx_retry,
 	&cmd_set_promisc_mode_one,
 	&cmd_set_promisc_mode_all,
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 88c1e99c5e..6ea506254b 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -5112,6 +5112,36 @@ rss_fwd_config_setup(void)
 	}
 }
 
+static int
+dcb_fwd_check_cores_per_tc(void)
+{
+	struct rte_eth_dcb_info dcb_info = {0};
+	uint32_t port, tc, vmdq_idx;
+
+	if (dcb_fwd_tc_cores == 1)
+		return 0;
+
+	for (port = 0; port < nb_fwd_ports; port++) {
+		(void)rte_eth_dev_get_dcb_info(fwd_ports_ids[port], &dcb_info);
+		for (tc = 0; tc < dcb_info.nb_tcs; tc++) {
+			for (vmdq_idx = 0; vmdq_idx < RTE_ETH_MAX_VMDQ_POOL; vmdq_idx++) {
+				if (dcb_info.tc_queue.tc_rxq[vmdq_idx][tc].nb_queue == 0)
+					break;
+				/* make sure nb_rx_queue can be divisible. */
+				if (dcb_info.tc_queue.tc_rxq[vmdq_idx][tc].nb_queue %
+					dcb_fwd_tc_cores)
+					return -1;
+				/* make sure nb_tx_queue can be divisible. */
+				if (dcb_info.tc_queue.tc_txq[vmdq_idx][tc].nb_queue %
+					dcb_fwd_tc_cores)
+					return -1;
+			}
+		}
+	}
+
+	return 0;
+}
+
 static uint16_t
 get_fwd_port_total_tc_num(void)
 {
@@ -5164,14 +5194,17 @@ dcb_fwd_tc_update_dcb_info(struct rte_eth_dcb_info *org_dcb_info)
 }
 
 /**
- * For the DCB forwarding test, each core is assigned on each traffic class.
+ * For the DCB forwarding test, each core is assigned on each traffic class
+ * defaultly:
+ *   Each core is assigned a multi-stream, each stream being composed of
+ *   a RX queue to poll on a RX port for input messages, associated with
+ *   a TX queue of a TX port where to send forwarded packets. All RX and
+ *   TX queues are mapping to the same traffic class.
+ *   If VMDQ and DCB co-exist, each traffic class on different POOLs share
+ *   the same core.
  *
- * Each core is assigned a multi-stream, each stream being composed of
- * a RX queue to poll on a RX port for input messages, associated with
- * a TX queue of a TX port where to send forwarded packets. All RX and
- * TX queues are mapping to the same traffic class.
- * If VMDQ and DCB co-exist, each traffic class on different POOLs share
- * the same core
+ * If user set cores-per-TC to other value (e.g. 2), then there will multiple
+ * cores to process one TC.
  */
 static void
 dcb_fwd_config_setup(void)
@@ -5179,9 +5212,10 @@ dcb_fwd_config_setup(void)
 	struct rte_eth_dcb_info rxp_dcb_info, txp_dcb_info;
 	portid_t txp, rxp = 0;
 	queueid_t txq, rxq = 0;
-	lcoreid_t  lc_id;
+	lcoreid_t  lc_id, target_lcores;
 	uint16_t nb_rx_queue, nb_tx_queue;
 	uint16_t i, j, k, sm_id = 0;
+	uint16_t sub_core_idx = 0;
 	uint16_t total_tc_num;
 	struct rte_port *port;
 	uint8_t tc = 0;
@@ -5212,6 +5246,13 @@ dcb_fwd_config_setup(void)
 		}
 	}
 
+	ret = dcb_fwd_check_cores_per_tc();
+	if (ret != 0) {
+		fprintf(stderr, "Error: check forwarding cores-per-TC failed!\n");
+		cur_fwd_config.nb_fwd_lcores = 0;
+		return;
+	}
+
 	total_tc_num = get_fwd_port_total_tc_num();
 	if (total_tc_num == 0) {
 		fprintf(stderr, "Error: total forwarding TC num is zero!\n");
@@ -5219,12 +5260,17 @@ dcb_fwd_config_setup(void)
 		return;
 	}
 
-	cur_fwd_config.nb_fwd_lcores = (lcoreid_t) nb_fwd_lcores;
+	target_lcores = (lcoreid_t)total_tc_num * (lcoreid_t)dcb_fwd_tc_cores;
+	if (nb_fwd_lcores < target_lcores) {
+		fprintf(stderr, "Error: the number of forwarding cores is insufficient!\n");
+		cur_fwd_config.nb_fwd_lcores = 0;
+		return;
+	}
+
+	cur_fwd_config.nb_fwd_lcores = target_lcores;
 	cur_fwd_config.nb_fwd_ports = nb_fwd_ports;
 	cur_fwd_config.nb_fwd_streams =
 		(streamid_t) (nb_rxq * cur_fwd_config.nb_fwd_ports);
-	if (cur_fwd_config.nb_fwd_lcores > total_tc_num)
-		cur_fwd_config.nb_fwd_lcores = total_tc_num;
 
 	/* reinitialize forwarding streams */
 	init_fwd_streams();
@@ -5247,10 +5293,12 @@ dcb_fwd_config_setup(void)
 				break;
 			k = fwd_lcores[lc_id]->stream_nb +
 				fwd_lcores[lc_id]->stream_idx;
-			rxq = rxp_dcb_info.tc_queue.tc_rxq[i][tc].base;
-			txq = txp_dcb_info.tc_queue.tc_txq[i][tc].base;
-			nb_rx_queue = rxp_dcb_info.tc_queue.tc_rxq[i][tc].nb_queue;
-			nb_tx_queue = txp_dcb_info.tc_queue.tc_txq[i][tc].nb_queue;
+			nb_rx_queue = rxp_dcb_info.tc_queue.tc_rxq[i][tc].nb_queue /
+						dcb_fwd_tc_cores;
+			nb_tx_queue = txp_dcb_info.tc_queue.tc_txq[i][tc].nb_queue /
+						dcb_fwd_tc_cores;
+			rxq = rxp_dcb_info.tc_queue.tc_rxq[i][tc].base + nb_rx_queue * sub_core_idx;
+			txq = txp_dcb_info.tc_queue.tc_txq[i][tc].base + nb_tx_queue * sub_core_idx;
 			for (j = 0; j < nb_rx_queue; j++) {
 				struct fwd_stream *fs;
 
@@ -5262,11 +5310,14 @@ dcb_fwd_config_setup(void)
 				fs->peer_addr = fs->tx_port;
 				fs->retry_enabled = retry_enabled;
 			}
-			fwd_lcores[lc_id]->stream_nb +=
-				rxp_dcb_info.tc_queue.tc_rxq[i][tc].nb_queue;
+			sub_core_idx++;
+			fwd_lcores[lc_id]->stream_nb += nb_rx_queue;
 		}
 		sm_id = (streamid_t) (sm_id + fwd_lcores[lc_id]->stream_nb);
+		if (sub_core_idx < dcb_fwd_tc_cores)
+			continue;
 
+		sub_core_idx = 0;
 		tc++;
 		if (tc < rxp_dcb_info.nb_tcs)
 			continue;
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 04a4727b88..1fe41d852a 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -216,6 +216,15 @@ struct fwd_engine * fwd_engines[] = {
  * If bit-n in tc-mask is 1, then TC-n's forwarding is enabled, and vice versa.
  */
 uint8_t dcb_fwd_tc_mask = DEFAULT_DCB_FWD_TC_MASK;
+/*
+ * Poll cores per TC when DCB forwarding.
+ * E.g. 1 indicates that one core process all queues of a TC.
+ *      2 indicates that two cores process all queues of a TC. If there
+ *        is a TC with 8 queues, then [0, 3] belong to first core, and
+ *        [4, 7] belong to second core.
+ *      ...
+ */
+uint8_t dcb_fwd_tc_cores = 1;
 
 struct rte_mempool *mempools[RTE_MAX_NUMA_NODES * MAX_SEGS_BUFFER_SPLIT];
 uint16_t mempool_flags;
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index 1ada0de450..492b5757f1 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -486,6 +486,7 @@ extern cmdline_parse_inst_t cmd_set_flex_spec_pattern;
 
 #define DEFAULT_DCB_FWD_TC_MASK	0xFF
 extern uint8_t dcb_fwd_tc_mask;
+extern uint8_t dcb_fwd_tc_cores;
 
 extern uint16_t mempool_flags;
 
diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index 628f17fed7..209e88d531 100644
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -1885,6 +1885,14 @@ forwarding is enabled, and vice versa::
 
    testpmd> set dcb fwd_tc (tc_mask)
 
+set dcb fwd_tc_cores
+~~~~~~~~~~~~~~~~~~~~
+
+Config DCB forwarding cores per-TC, 1-means one core process all queues of a TC,
+2-means two cores process all queues of a TC, and so on::
+
+   testpmd> set dcb fwd_tc_cores (tc_cores)
+
 Port Functions
 --------------
 
-- 
2.17.1

Re: [PATCH v7 2/2] app/testpmd: support multi-cores process one TC

[lihuisong (C)]

在 2025/11/11 17:13, Chengwen Feng 写道:
> Currently, one TC can be processed by only one core, when there are a
> large number of small packets, this core becomes a bottleneck.
>
> This commit supports multi-cores process one TC, the command:
>
>    set dcb fwd_tc_cores (tc_cores)
>
> Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
> ---
It's very useful to test DCB ETS on different size packet. Thanks.
Acked-by: lihuisong@huawei.com

Re: [PATCH v7 2/2] app/testpmd: support multi-cores process one TC

[Medvedkin, Vladimir]

Reviewed-by: Vladimir Medvedkin <vladimir.medvedkin@intel.com>

On 11/11/2025 9:13 AM, Chengwen Feng wrote:
> Currently, one TC can be processed by only one core, when there are a
> large number of small packets, this core becomes a bottleneck.
>
> This commit supports multi-cores process one TC, the command:
>
>    set dcb fwd_tc_cores (tc_cores)
>
> Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
> ---
>   app/test-pmd/cmdline.c                      | 48 ++++++++++++
>   app/test-pmd/config.c                       | 85 ++++++++++++++++-----
>   app/test-pmd/testpmd.c                      |  9 +++
>   app/test-pmd/testpmd.h                      |  1 +
>   doc/guides/testpmd_app_ug/testpmd_funcs.rst |  8 ++
>   5 files changed, 134 insertions(+), 17 deletions(-)
>
<snip>
>   

-- 
Regards,
Vladimir

Re: [PATCH v7 0/2] two enhance for testpmd DCB test

[fengchengwen]

Hi Stephen,

Can this patchset be merged into 25.11?

This patchset introduce two commands, behave the same as before if user
don't execute these two commands.

Thanks

On 11/11/2025 5:13 PM, Chengwen Feng wrote:
> This patchset contains two enhancement for testpmd DCB test.
> 
> Chengwen Feng (2):
>   app/testpmd: support specify TCs when DCB forward
>   app/testpmd: support multi-cores process one TC
> 
> ---
> v7: rebase to main branch.
> v6: try to fix CI windows 2022 compile error:
>     ../app/test-pmd/config.c(5263): warning C4018: '<': signed/unsigned mismatch
> v5: optimize naming and add line breaks for first commit.
>     add second commit "support multi-cores process one TC".
> v4: use direct assign of dcb-info according comment from Stephen.
>     fix CI llvm compiler error.
> v3: use new way to impl and fix comment from Stephen.
> v2: introduce pause/resume lcore's forwarding.
> 
>  app/test-pmd/cmdline.c                      | 105 +++++++++++++++
>  app/test-pmd/config.c                       | 135 +++++++++++++++++---
>  app/test-pmd/testpmd.c                      |  15 +++
>  app/test-pmd/testpmd.h                      |   4 +
>  doc/guides/testpmd_app_ug/testpmd_funcs.rst |  16 +++
>  5 files changed, 256 insertions(+), 19 deletions(-)
>