diff mbox series

[v3] app/testpmd: support the query of link flow ctrl info

Message ID 1618998091-36162-1-git-send-email-humin29@huawei.com (mailing list archive)
State Accepted, archived
Delegated to: Ferruh Yigit
Headers show
Series [v3] app/testpmd: support the query of link flow ctrl info | expand

Checks

Context Check Description
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-abi-testing success Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/intel-Testing success Testing PASS
ci/Intel-compilation success Compilation OK
ci/iol-testing fail Testing issues
ci/checkpatch success coding style OK

Commit Message

Min Hu (Connor) April 21, 2021, 9:41 a.m. UTC
From: Huisong Li <lihuisong@huawei.com>

This patch supports the query of the link flow control parameter
on a port.

The command format is as follows:
show port <port_id> flow_ctrl

Signed-off-by: Huisong Li <lihuisong@huawei.com>
Signed-off-by: Min Hu (Connor) <humin29@huawei.com>
---
v3:
* fixed the print format of link flow ctrl, and removes redundant
port number verification.

v2:
* fixed logging.
---
 app/test-pmd/cmdline.c                      | 78 +++++++++++++++++++++++++++++
 doc/guides/testpmd_app_ug/testpmd_funcs.rst |  7 +++
 2 files changed, 85 insertions(+)

Comments

Kevin Traynor April 21, 2021, 11:12 a.m. UTC | #1
On 21/04/2021 10:41, Min Hu (Connor) wrote:
> From: Huisong Li <lihuisong@huawei.com>
> 
> This patch supports the query of the link flow control parameter
> on a port.
> 
> The command format is as follows:
> show port <port_id> flow_ctrl
> 

Thanks Connor,
Acked-by: Kevin Traynor <ktraynor@redhat.com>

> Signed-off-by: Huisong Li <lihuisong@huawei.com>
> Signed-off-by: Min Hu (Connor) <humin29@huawei.com>
> ---
> v3:
> * fixed the print format of link flow ctrl, and removes redundant
> port number verification.
> 
> v2:
> * fixed logging.
> ---
>  app/test-pmd/cmdline.c                      | 78 +++++++++++++++++++++++++++++
>  doc/guides/testpmd_app_ug/testpmd_funcs.rst |  7 +++
>  2 files changed, 85 insertions(+)
> 
> diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
> index d282c7c..08da2b1 100644
> --- a/app/test-pmd/cmdline.c
> +++ b/app/test-pmd/cmdline.c
> @@ -258,6 +258,9 @@ static void cmd_help_long_parsed(void *parsed_result,
>  
>  			"show port (port_id) fec_mode"
>  			"	Show fec mode of a port.\n\n"
> +
> +			"show port <port_id> flow_ctrl"
> +			"	Show flow control info of a port.\n\n"
>  		);
>  	}
>  
> @@ -6863,6 +6866,80 @@ cmdline_parse_inst_t cmd_set_allmulti_mode_one = {
>  	},
>  };
>  
> +/* *** GET CURRENT ETHERNET LINK FLOW CONTROL *** */
> +struct cmd_link_flow_ctrl_show {
> +	cmdline_fixed_string_t show;
> +	cmdline_fixed_string_t port;
> +	portid_t port_id;
> +	cmdline_fixed_string_t flow_ctrl;
> +};
> +
> +cmdline_parse_token_string_t cmd_lfc_show_show =
> +	TOKEN_STRING_INITIALIZER(struct cmd_link_flow_ctrl_show,
> +				show, "show");
> +cmdline_parse_token_string_t cmd_lfc_show_port =
> +	TOKEN_STRING_INITIALIZER(struct cmd_link_flow_ctrl_show,
> +				port, "port");
> +cmdline_parse_token_num_t cmd_lfc_show_portid =
> +	TOKEN_NUM_INITIALIZER(struct cmd_link_flow_ctrl_show,
> +				port_id, RTE_UINT16);
> +cmdline_parse_token_string_t cmd_lfc_show_flow_ctrl =
> +	TOKEN_STRING_INITIALIZER(struct cmd_link_flow_ctrl_show,
> +				flow_ctrl, "flow_ctrl");
> +
> +static void
> +cmd_link_flow_ctrl_show_parsed(void *parsed_result,
> +			      __rte_unused struct cmdline *cl,
> +			      __rte_unused void *data)
> +{
> +	struct cmd_link_flow_ctrl_show *res = parsed_result;
> +	static const char *info_border = "*********************";
> +	struct rte_eth_fc_conf fc_conf;
> +	bool rx_fc_en = false;
> +	bool tx_fc_en = false;
> +	int ret;
> +
> +	ret = rte_eth_dev_flow_ctrl_get(res->port_id, &fc_conf);
> +	if (ret != 0) {
> +		printf("Failed to get current flow ctrl information: err = %d\n",
> +		       ret);
> +		return;
> +	}
> +
> +	if (fc_conf.mode == RTE_FC_RX_PAUSE || fc_conf.mode == RTE_FC_FULL)
> +		rx_fc_en = true;
> +	if (fc_conf.mode == RTE_FC_TX_PAUSE || fc_conf.mode == RTE_FC_FULL)
> +		tx_fc_en = true;
> +
> +	printf("\n%s Flow control infos for port %-2d %s\n",
> +		info_border, res->port_id, info_border);
> +	printf("FC mode:\n");
> +	printf("   Rx pause: %s\n", rx_fc_en ? "on" : "off");
> +	printf("   Tx pause: %s\n", tx_fc_en ? "on" : "off");
> +	printf("Autoneg: %s\n", fc_conf.autoneg ? "on" : "off");
> +	printf("Pause time: 0x%x\n", fc_conf.pause_time);
> +	printf("High waterline: 0x%x\n", fc_conf.high_water);
> +	printf("Low waterline: 0x%x\n", fc_conf.low_water);
> +	printf("Send XON: %s\n", fc_conf.send_xon ? "on" : "off");
> +	printf("Forward MAC control frames: %s\n",
> +		fc_conf.mac_ctrl_frame_fwd ? "on" : "off");
> +	printf("\n%s**************   End  ***********%s\n",
> +		info_border, info_border);
> +}
> +
> +cmdline_parse_inst_t cmd_link_flow_control_show = {
> +	.f = cmd_link_flow_ctrl_show_parsed,
> +	.data = NULL,
> +	.help_str = "show port <port_id> flow_ctrl",
> +	.tokens = {
> +		(void *)&cmd_lfc_show_show,
> +		(void *)&cmd_lfc_show_port,
> +		(void *)&cmd_lfc_show_portid,
> +		(void *)&cmd_lfc_show_flow_ctrl,
> +		NULL,
> +	},
> +};
> +
>  /* *** SETUP ETHERNET LINK FLOW CONTROL *** */
>  struct cmd_link_flow_ctrl_set_result {
>  	cmdline_fixed_string_t set;
> @@ -17354,6 +17431,7 @@ cmdline_parse_ctx_t main_ctx[] = {
>  	(cmdline_parse_inst_t *)&cmd_link_flow_control_set_xon,
>  	(cmdline_parse_inst_t *)&cmd_link_flow_control_set_macfwd,
>  	(cmdline_parse_inst_t *)&cmd_link_flow_control_set_autoneg,
> +	(cmdline_parse_inst_t *)&cmd_link_flow_control_show,
>  	(cmdline_parse_inst_t *)&cmd_priority_flow_control_set,
>  	(cmdline_parse_inst_t *)&cmd_config_dcb,
>  	(cmdline_parse_inst_t *)&cmd_read_reg,
> diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
> index c0cbc40..5dd98c2 100644
> --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
> +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
> @@ -1524,6 +1524,13 @@ Where:
>  
>  * ``autoneg``: Change the auto-negotiation parameter.
>  
> +show flow ctrl
> +~~~~~~~~~~~~~~
> +
> +show the link flow control parameter on a port::
> +
> +   testpmd> show port <port_id> flow_ctrl
> +
>  set pfc_ctrl rx
>  ~~~~~~~~~~~~~~~
>  
>
Ferruh Yigit April 21, 2021, 11:36 a.m. UTC | #2
On 4/21/2021 12:12 PM, Kevin Traynor wrote:
> On 21/04/2021 10:41, Min Hu (Connor) wrote:
>> From: Huisong Li <lihuisong@huawei.com>
>>
>> This patch supports the query of the link flow control parameter
>> on a port.
>>
>> The command format is as follows:
>> show port <port_id> flow_ctrl
>>
>> Signed-off-by: Huisong Li <lihuisong@huawei.com>
>> Signed-off-by: Min Hu (Connor) <humin29@huawei.com>
> 
 > Thanks Connor,
 > Acked-by: Kevin Traynor <ktraynor@redhat.com>
 >

Carrying Xiaoyun's ack from previous version:
Acked-by: Xiaoyun Li <xiaoyun.li@intel.com>

Applied to dpdk-next-net/main, thanks.


>> @@ -1524,6 +1524,13 @@ Where:
>>   
>>   * ``autoneg``: Change the auto-negotiation parameter.
>>   
>> +show flow ctrl
>> +~~~~~~~~~~~~~~
>> +

Expanded to "show flow control" while merging.
Ferruh Yigit April 21, 2021, 11:41 a.m. UTC | #3
On 4/21/2021 12:36 PM, Ferruh Yigit wrote:
> On 4/21/2021 12:12 PM, Kevin Traynor wrote:
>> On 21/04/2021 10:41, Min Hu (Connor) wrote:
>>> From: Huisong Li <lihuisong@huawei.com>
>>>
>>> This patch supports the query of the link flow control parameter
>>> on a port.
>>>
>>> The command format is as follows:
>>> show port <port_id> flow_ctrl
>>>
>>> Signed-off-by: Huisong Li <lihuisong@huawei.com>
>>> Signed-off-by: Min Hu (Connor) <humin29@huawei.com>
>>
>> Thanks Connor,
>> Acked-by: Kevin Traynor <ktraynor@redhat.com>
>>
> 
> Carrying Xiaoyun's ack from previous version:
> Acked-by: Xiaoyun Li <xiaoyun.li@intel.com>
> 
> Applied to dpdk-next-net/main, thanks.
> 
> 
>>> @@ -1524,6 +1524,13 @@ Where:
>>>   * ``autoneg``: Change the auto-negotiation parameter.
>>> +show flow ctrl
>>> +~~~~~~~~~~~~~~
>>> +
> 
> Expanded to "show flow control" while merging.
> 
> 
> 

Ahh, it seems the release notes update is missing, adding following while merging:

  diff --git a/doc/guides/rel_notes/release_21_05.rst 
b/doc/guides/rel_notes/release_21_05.rst
  index b13c76124169..b36c120e5e1d 100644
  --- a/doc/guides/rel_notes/release_21_05.rst
  +++ b/doc/guides/rel_notes/release_21_05.rst
  @@ -233,6 +233,8 @@ New Features
       item matching.
     * Added command to cleanup a Tx queue's mbuf on a port.
       ``port cleanup (port_id) txq (queue_id) (free_cnt)``
  +  * Added command to show link flow control info.
  +    ``show port (port_id) flow_ctrl``

   * **Updated ipsec-secgw sample application.**
Ferruh Yigit April 21, 2021, 11:42 a.m. UTC | #4
On 4/21/2021 10:41 AM, Min Hu (Connor) wrote:
> From: Huisong Li <lihuisong@huawei.com>
> 
> This patch supports the query of the link flow control parameter
> on a port.
> 
> The command format is as follows:
> show port <port_id> flow_ctrl
> 
> Signed-off-by: Huisong Li <lihuisong@huawei.com>
> Signed-off-by: Min Hu (Connor) <humin29@huawei.com>

<...>

> @@ -258,6 +258,9 @@ static void cmd_help_long_parsed(void *parsed_result,
>   
>   			"show port (port_id) fec_mode"
>   			"	Show fec mode of a port.\n\n"
> +
> +			"show port <port_id> flow_ctrl"

Fixing syntax as following, to be consistent, while merging:

show port (port_id) flow_ctrl
diff mbox series

Patch

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index d282c7c..08da2b1 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -258,6 +258,9 @@  static void cmd_help_long_parsed(void *parsed_result,
 
 			"show port (port_id) fec_mode"
 			"	Show fec mode of a port.\n\n"
+
+			"show port <port_id> flow_ctrl"
+			"	Show flow control info of a port.\n\n"
 		);
 	}
 
@@ -6863,6 +6866,80 @@  cmdline_parse_inst_t cmd_set_allmulti_mode_one = {
 	},
 };
 
+/* *** GET CURRENT ETHERNET LINK FLOW CONTROL *** */
+struct cmd_link_flow_ctrl_show {
+	cmdline_fixed_string_t show;
+	cmdline_fixed_string_t port;
+	portid_t port_id;
+	cmdline_fixed_string_t flow_ctrl;
+};
+
+cmdline_parse_token_string_t cmd_lfc_show_show =
+	TOKEN_STRING_INITIALIZER(struct cmd_link_flow_ctrl_show,
+				show, "show");
+cmdline_parse_token_string_t cmd_lfc_show_port =
+	TOKEN_STRING_INITIALIZER(struct cmd_link_flow_ctrl_show,
+				port, "port");
+cmdline_parse_token_num_t cmd_lfc_show_portid =
+	TOKEN_NUM_INITIALIZER(struct cmd_link_flow_ctrl_show,
+				port_id, RTE_UINT16);
+cmdline_parse_token_string_t cmd_lfc_show_flow_ctrl =
+	TOKEN_STRING_INITIALIZER(struct cmd_link_flow_ctrl_show,
+				flow_ctrl, "flow_ctrl");
+
+static void
+cmd_link_flow_ctrl_show_parsed(void *parsed_result,
+			      __rte_unused struct cmdline *cl,
+			      __rte_unused void *data)
+{
+	struct cmd_link_flow_ctrl_show *res = parsed_result;
+	static const char *info_border = "*********************";
+	struct rte_eth_fc_conf fc_conf;
+	bool rx_fc_en = false;
+	bool tx_fc_en = false;
+	int ret;
+
+	ret = rte_eth_dev_flow_ctrl_get(res->port_id, &fc_conf);
+	if (ret != 0) {
+		printf("Failed to get current flow ctrl information: err = %d\n",
+		       ret);
+		return;
+	}
+
+	if (fc_conf.mode == RTE_FC_RX_PAUSE || fc_conf.mode == RTE_FC_FULL)
+		rx_fc_en = true;
+	if (fc_conf.mode == RTE_FC_TX_PAUSE || fc_conf.mode == RTE_FC_FULL)
+		tx_fc_en = true;
+
+	printf("\n%s Flow control infos for port %-2d %s\n",
+		info_border, res->port_id, info_border);
+	printf("FC mode:\n");
+	printf("   Rx pause: %s\n", rx_fc_en ? "on" : "off");
+	printf("   Tx pause: %s\n", tx_fc_en ? "on" : "off");
+	printf("Autoneg: %s\n", fc_conf.autoneg ? "on" : "off");
+	printf("Pause time: 0x%x\n", fc_conf.pause_time);
+	printf("High waterline: 0x%x\n", fc_conf.high_water);
+	printf("Low waterline: 0x%x\n", fc_conf.low_water);
+	printf("Send XON: %s\n", fc_conf.send_xon ? "on" : "off");
+	printf("Forward MAC control frames: %s\n",
+		fc_conf.mac_ctrl_frame_fwd ? "on" : "off");
+	printf("\n%s**************   End  ***********%s\n",
+		info_border, info_border);
+}
+
+cmdline_parse_inst_t cmd_link_flow_control_show = {
+	.f = cmd_link_flow_ctrl_show_parsed,
+	.data = NULL,
+	.help_str = "show port <port_id> flow_ctrl",
+	.tokens = {
+		(void *)&cmd_lfc_show_show,
+		(void *)&cmd_lfc_show_port,
+		(void *)&cmd_lfc_show_portid,
+		(void *)&cmd_lfc_show_flow_ctrl,
+		NULL,
+	},
+};
+
 /* *** SETUP ETHERNET LINK FLOW CONTROL *** */
 struct cmd_link_flow_ctrl_set_result {
 	cmdline_fixed_string_t set;
@@ -17354,6 +17431,7 @@  cmdline_parse_ctx_t main_ctx[] = {
 	(cmdline_parse_inst_t *)&cmd_link_flow_control_set_xon,
 	(cmdline_parse_inst_t *)&cmd_link_flow_control_set_macfwd,
 	(cmdline_parse_inst_t *)&cmd_link_flow_control_set_autoneg,
+	(cmdline_parse_inst_t *)&cmd_link_flow_control_show,
 	(cmdline_parse_inst_t *)&cmd_priority_flow_control_set,
 	(cmdline_parse_inst_t *)&cmd_config_dcb,
 	(cmdline_parse_inst_t *)&cmd_read_reg,
diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index c0cbc40..5dd98c2 100644
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -1524,6 +1524,13 @@  Where:
 
 * ``autoneg``: Change the auto-negotiation parameter.
 
+show flow ctrl
+~~~~~~~~~~~~~~
+
+show the link flow control parameter on a port::
+
+   testpmd> show port <port_id> flow_ctrl
+
 set pfc_ctrl rx
 ~~~~~~~~~~~~~~~