[dpdk-dev] [PATCH] app/test-pmd: add and identify shaper profile parameters

[dpdk-dev] [PATCH] app/test-pmd: add and identify shaper profile parameters

[Rosen Xu]

As struct rte_tm_shaper_params defined, the command line of
test-pmd should include committed and peak parameters, but
right now the command line doesn't identify whether it's
committed or peak parameter. This patch identifies and
adds the clarify definition

Signed-off-by: Rosen Xu <rosen.xu@intel.com>
Fixes: bddc2f40b594 ("app/testpmd: add commands for shaper and wred profiles")
Cc: jasvinder.singh@intel.com
---
 app/test-pmd/cmdline_tm.c | 34 ++++++++++++++++++++++++----------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/app/test-pmd/cmdline_tm.c b/app/test-pmd/cmdline_tm.c
index 631f179..8ee2785 100644
--- a/app/test-pmd/cmdline_tm.c
+++ b/app/test-pmd/cmdline_tm.c
@@ -771,8 +771,10 @@ struct cmd_add_port_tm_node_shaper_profile_result {
 	cmdline_fixed_string_t profile;
 	uint16_t port_id;
 	uint32_t shaper_id;
-	uint64_t tb_rate;
-	uint64_t tb_size;
+	uint64_t cmit_tb_rate;
+	uint64_t cmit_tb_size;
+	uint64_t peak_tb_rate;
+	uint64_t peak_tb_size;
 	uint32_t pktlen_adjust;
 };
 
@@ -807,14 +809,22 @@ struct cmd_add_port_tm_node_shaper_profile_result {
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_shaper_profile_result,
 			shaper_id, UINT32);
-cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_tb_rate =
+cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_cmit_tb_rate =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_shaper_profile_result,
-			tb_rate, UINT64);
-cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_tb_size =
+			cmit_tb_rate, UINT64);
+cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_cmit_tb_size =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_shaper_profile_result,
-			tb_size, UINT64);
+			cmit_tb_size, UINT64);
+cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_peak_tb_rate =
+	TOKEN_NUM_INITIALIZER(
+		struct cmd_add_port_tm_node_shaper_profile_result,
+			peak_tb_rate, UINT64);
+cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_peak_tb_size =
+	TOKEN_NUM_INITIALIZER(
+		struct cmd_add_port_tm_node_shaper_profile_result,
+			peak_tb_size, UINT64);
 cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_pktlen_adjust =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_shaper_profile_result,
@@ -838,8 +848,10 @@ static void cmd_add_port_tm_node_shaper_profile_parsed(void *parsed_result,
 	/* Private shaper profile params */
 	memset(&sp, 0, sizeof(struct rte_tm_shaper_params));
 	memset(&error, 0, sizeof(struct rte_tm_error));
-	sp.peak.rate = res->tb_rate;
-	sp.peak.size = res->tb_size;
+	sp.committed.rate = res->cmit_tb_rate;
+	sp.committed.size = res->cmit_tb_size;
+	sp.peak.rate = res->peak_tb_rate;
+	sp.peak.size = res->peak_tb_size;
 	sp.pkt_length_adjust = pkt_len_adjust;
 
 	ret = rte_tm_shaper_profile_add(port_id, shaper_id, &sp, &error);
@@ -862,8 +874,10 @@ static void cmd_add_port_tm_node_shaper_profile_parsed(void *parsed_result,
 		(void *)&cmd_add_port_tm_node_shaper_profile_profile,
 		(void *)&cmd_add_port_tm_node_shaper_profile_port_id,
 		(void *)&cmd_add_port_tm_node_shaper_profile_shaper_id,
-		(void *)&cmd_add_port_tm_node_shaper_profile_tb_rate,
-		(void *)&cmd_add_port_tm_node_shaper_profile_tb_size,
+		(void *)&cmd_add_port_tm_node_shaper_profile_cmit_tb_rate,
+		(void *)&cmd_add_port_tm_node_shaper_profile_cmit_tb_size,
+		(void *)&cmd_add_port_tm_node_shaper_profile_peak_tb_rate,
+		(void *)&cmd_add_port_tm_node_shaper_profile_peak_tb_size,
 		(void *)&cmd_add_port_tm_node_shaper_profile_pktlen_adjust,
 		NULL,
 	},
-- 
1.8.3.1

Re: [dpdk-dev] [PATCH] app/test-pmd: add and identify shaper profile parameters

[Singh, Jasvinder]

> -----Original Message-----
> From: Xu, Rosen
> Sent: Monday, August 13, 2018 11:35 AM
> To: dev@dpdk.org
> Cc: Dumitrescu, Cristian <cristian.dumitrescu@intel.com>; Lu, Wenzhuo
> <wenzhuo.lu@intel.com>; Singh, Jasvinder <jasvinder.singh@intel.com>; Xu,
> Rosen <rosen.xu@intel.com>; Yigit, Ferruh <ferruh.yigit@intel.com>
> Subject: [PATCH] app/test-pmd: add and identify shaper profile parameters
> 
> As struct rte_tm_shaper_params defined, the command line of test-pmd should
> include committed and peak parameters, but right now the command line
> doesn't identify whether it's committed or peak parameter. This patch
> identifies and adds the clarify definition
> 
> Signed-off-by: Rosen Xu <rosen.xu@intel.com>
> Fixes: bddc2f40b594 ("app/testpmd: add commands for shaper and wred
> profiles")
> Cc: jasvinder.singh@intel.com
> ---
>  app/test-pmd/cmdline_tm.c | 34 ++++++++++++++++++++++++----------
>  1 file changed, 24 insertions(+), 10 deletions(-)
> 
> diff --git a/app/test-pmd/cmdline_tm.c b/app/test-pmd/cmdline_tm.c index
> 631f179..8ee2785 100644
> --- a/app/test-pmd/cmdline_tm.c
> +++ b/app/test-pmd/cmdline_tm.c
> @@ -771,8 +771,10 @@ struct cmd_add_port_tm_node_shaper_profile_result
> {
>  	cmdline_fixed_string_t profile;
>  	uint16_t port_id;
>  	uint32_t shaper_id;
> -	uint64_t tb_rate;
> -	uint64_t tb_size;
> +	uint64_t cmit_tb_rate;
> +	uint64_t cmit_tb_size;
> +	uint64_t peak_tb_rate;
> +	uint64_t peak_tb_size;
>  	uint32_t pktlen_adjust;
>  };
> 
> @@ -807,14 +809,22 @@ struct
> cmd_add_port_tm_node_shaper_profile_result {
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_add_port_tm_node_shaper_profile_result,
>  			shaper_id, UINT32);
> -cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_tb_rate
> =
> +cmdline_parse_token_num_t
> +cmd_add_port_tm_node_shaper_profile_cmit_tb_rate =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_add_port_tm_node_shaper_profile_result,
> -			tb_rate, UINT64);
> -cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_tb_size
> =
> +			cmit_tb_rate, UINT64);
> +cmdline_parse_token_num_t
> +cmd_add_port_tm_node_shaper_profile_cmit_tb_size =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_add_port_tm_node_shaper_profile_result,
> -			tb_size, UINT64);
> +			cmit_tb_size, UINT64);
> +cmdline_parse_token_num_t
> cmd_add_port_tm_node_shaper_profile_peak_tb_rate =
> +	TOKEN_NUM_INITIALIZER(
> +		struct cmd_add_port_tm_node_shaper_profile_result,
> +			peak_tb_rate, UINT64);
> +cmdline_parse_token_num_t
> cmd_add_port_tm_node_shaper_profile_peak_tb_size =
> +	TOKEN_NUM_INITIALIZER(
> +		struct cmd_add_port_tm_node_shaper_profile_result,
> +			peak_tb_size, UINT64);
>  cmdline_parse_token_num_t
> cmd_add_port_tm_node_shaper_profile_pktlen_adjust =
>  	TOKEN_NUM_INITIALIZER(
>  		struct cmd_add_port_tm_node_shaper_profile_result,
> @@ -838,8 +848,10 @@ static void
> cmd_add_port_tm_node_shaper_profile_parsed(void *parsed_result,
>  	/* Private shaper profile params */
>  	memset(&sp, 0, sizeof(struct rte_tm_shaper_params));
>  	memset(&error, 0, sizeof(struct rte_tm_error));
> -	sp.peak.rate = res->tb_rate;
> -	sp.peak.size = res->tb_size;
> +	sp.committed.rate = res->cmit_tb_rate;
> +	sp.committed.size = res->cmit_tb_size;
> +	sp.peak.rate = res->peak_tb_rate;
> +	sp.peak.size = res->peak_tb_size;
>  	sp.pkt_length_adjust = pkt_len_adjust;
> 
>  	ret = rte_tm_shaper_profile_add(port_id, shaper_id, &sp, &error); @@
> -862,8 +874,10 @@ static void
> cmd_add_port_tm_node_shaper_profile_parsed(void *parsed_result,
>  		(void *)&cmd_add_port_tm_node_shaper_profile_profile,
>  		(void *)&cmd_add_port_tm_node_shaper_profile_port_id,
>  		(void *)&cmd_add_port_tm_node_shaper_profile_shaper_id,
> -		(void *)&cmd_add_port_tm_node_shaper_profile_tb_rate,
> -		(void *)&cmd_add_port_tm_node_shaper_profile_tb_size,
> +		(void
> *)&cmd_add_port_tm_node_shaper_profile_cmit_tb_rate,
> +		(void
> *)&cmd_add_port_tm_node_shaper_profile_cmit_tb_size,
> +		(void
> *)&cmd_add_port_tm_node_shaper_profile_peak_tb_rate,
> +		(void
> *)&cmd_add_port_tm_node_shaper_profile_peak_tb_size,
>  		(void
> *)&cmd_add_port_tm_node_shaper_profile_pktlen_adjust,
>  		NULL,
>  	},
> --

Can you also update the help command section (test-pmd/cmdline.c) as well as the documentation (doc/guides/testpmd_app_ug) for these changes. Thanks!

Re: [dpdk-dev] [PATCH] app/test-pmd: add and identify shaper profile parameters

[Dumitrescu, Cristian]

> 
> Can you also update the help command section (test-pmd/cmdline.c) as well
> as the documentation (doc/guides/testpmd_app_ug) for these changes.
> Thanks!

Rosen, any update on this request? This is required in order to merge this patch.

Thanks,
Cristian

Re: [dpdk-dev] [PATCH] app/test-pmd: add and identify shaper profile parameters

[Xu, Rosen]

> -----Original Message-----
> From: Dumitrescu, Cristian
> Sent: Tuesday, October 16, 2018 23:01
> To: Xu, Rosen <rosen.xu@intel.com>
> Cc: Lu, Wenzhuo <wenzhuo.lu@intel.com>; Yigit, Ferruh
> <ferruh.yigit@intel.com>; Singh, Jasvinder <jasvinder.singh@intel.com>;
> dev@dpdk.org
> Subject: RE: [PATCH] app/test-pmd: add and identify shaper profile
> parameters
> 
> >
> > Can you also update the help command section (test-pmd/cmdline.c) as
> > well as the documentation (doc/guides/testpmd_app_ug) for these
> changes.
> > Thanks!
> 
> Rosen, any update on this request? This is required in order to merge this
> patch.
I will update it in these days. 
> Thanks,
> Cristian

Re: [dpdk-dev] [PATCH] app/test-pmd: add and identify shaper profile parameters

[Xu, Rosen]

> -----Original Message-----
> From: Dumitrescu, Cristian
> Sent: Tuesday, October 16, 2018 23:01
> To: Xu, Rosen <rosen.xu@intel.com>
> Cc: Lu, Wenzhuo <wenzhuo.lu@intel.com>; Yigit, Ferruh
> <ferruh.yigit@intel.com>; Singh, Jasvinder <jasvinder.singh@intel.com>;
> dev@dpdk.org
> Subject: RE: [PATCH] app/test-pmd: add and identify shaper profile
> parameters
> 
> >
> > Can you also update the help command section (test-pmd/cmdline.c) as
> > well as the documentation (doc/guides/testpmd_app_ug) for these
> changes.
> > Thanks!
> 
> Rosen, any update on this request? This is required in order to merge this
> patch.

Cristian and Jasvinder, the newest patch set is sent.
 
> Thanks,
> Cristian

Re: [dpdk-dev] [PATCH] app/test-pmd: add and identify shaper profile parameters

[Xu, Rosen]

> -----Original Message-----
> From: Singh, Jasvinder
> Sent: Tuesday, September 25, 2018 19:56
> To: Xu, Rosen <rosen.xu@intel.com>; dev@dpdk.org
> Cc: Dumitrescu, Cristian <cristian.dumitrescu@intel.com>; Lu, Wenzhuo
> <wenzhuo.lu@intel.com>; Yigit, Ferruh <ferruh.yigit@intel.com>
> Subject: RE: [PATCH] app/test-pmd: add and identify shaper profile
> parameters
> 
> 
> 
> > -----Original Message-----
> > From: Xu, Rosen
> > Sent: Monday, August 13, 2018 11:35 AM
> > To: dev@dpdk.org
> > Cc: Dumitrescu, Cristian <cristian.dumitrescu@intel.com>; Lu, Wenzhuo
> > <wenzhuo.lu@intel.com>; Singh, Jasvinder <jasvinder.singh@intel.com>;
> > Xu, Rosen <rosen.xu@intel.com>; Yigit, Ferruh <ferruh.yigit@intel.com>
> > Subject: [PATCH] app/test-pmd: add and identify shaper profile
> > parameters
> >
> > As struct rte_tm_shaper_params defined, the command line of test-pmd
> > should include committed and peak parameters, but right now the
> > command line doesn't identify whether it's committed or peak
> > parameter. This patch identifies and adds the clarify definition
> >
> > Signed-off-by: Rosen Xu <rosen.xu@intel.com>
> > Fixes: bddc2f40b594 ("app/testpmd: add commands for shaper and wred
> > profiles")
> > Cc: jasvinder.singh@intel.com
> > ---
> >  app/test-pmd/cmdline_tm.c | 34 ++++++++++++++++++++++++----------
> >  1 file changed, 24 insertions(+), 10 deletions(-)
> >
> > diff --git a/app/test-pmd/cmdline_tm.c b/app/test-pmd/cmdline_tm.c
> > index
> > 631f179..8ee2785 100644
> > --- a/app/test-pmd/cmdline_tm.c
> > +++ b/app/test-pmd/cmdline_tm.c
> > @@ -771,8 +771,10 @@ struct
> cmd_add_port_tm_node_shaper_profile_result
> > {
> >  	cmdline_fixed_string_t profile;
> >  	uint16_t port_id;
> >  	uint32_t shaper_id;
> > -	uint64_t tb_rate;
> > -	uint64_t tb_size;
> > +	uint64_t cmit_tb_rate;
> > +	uint64_t cmit_tb_size;
> > +	uint64_t peak_tb_rate;
> > +	uint64_t peak_tb_size;
> >  	uint32_t pktlen_adjust;
> >  };
> >
> > @@ -807,14 +809,22 @@ struct
> > cmd_add_port_tm_node_shaper_profile_result {
> >  	TOKEN_NUM_INITIALIZER(
> >  		struct cmd_add_port_tm_node_shaper_profile_result,
> >  			shaper_id, UINT32);
> > -cmdline_parse_token_num_t
> cmd_add_port_tm_node_shaper_profile_tb_rate
> > =
> > +cmdline_parse_token_num_t
> > +cmd_add_port_tm_node_shaper_profile_cmit_tb_rate =
> >  	TOKEN_NUM_INITIALIZER(
> >  		struct cmd_add_port_tm_node_shaper_profile_result,
> > -			tb_rate, UINT64);
> > -cmdline_parse_token_num_t
> cmd_add_port_tm_node_shaper_profile_tb_size
> > =
> > +			cmit_tb_rate, UINT64);
> > +cmdline_parse_token_num_t
> > +cmd_add_port_tm_node_shaper_profile_cmit_tb_size =
> >  	TOKEN_NUM_INITIALIZER(
> >  		struct cmd_add_port_tm_node_shaper_profile_result,
> > -			tb_size, UINT64);
> > +			cmit_tb_size, UINT64);
> > +cmdline_parse_token_num_t
> > cmd_add_port_tm_node_shaper_profile_peak_tb_rate =
> > +	TOKEN_NUM_INITIALIZER(
> > +		struct cmd_add_port_tm_node_shaper_profile_result,
> > +			peak_tb_rate, UINT64);
> > +cmdline_parse_token_num_t
> > cmd_add_port_tm_node_shaper_profile_peak_tb_size =
> > +	TOKEN_NUM_INITIALIZER(
> > +		struct cmd_add_port_tm_node_shaper_profile_result,
> > +			peak_tb_size, UINT64);
> >  cmdline_parse_token_num_t
> > cmd_add_port_tm_node_shaper_profile_pktlen_adjust =
> >  	TOKEN_NUM_INITIALIZER(
> >  		struct cmd_add_port_tm_node_shaper_profile_result,
> > @@ -838,8 +848,10 @@ static void
> > cmd_add_port_tm_node_shaper_profile_parsed(void *parsed_result,
> >  	/* Private shaper profile params */
> >  	memset(&sp, 0, sizeof(struct rte_tm_shaper_params));
> >  	memset(&error, 0, sizeof(struct rte_tm_error));
> > -	sp.peak.rate = res->tb_rate;
> > -	sp.peak.size = res->tb_size;
> > +	sp.committed.rate = res->cmit_tb_rate;
> > +	sp.committed.size = res->cmit_tb_size;
> > +	sp.peak.rate = res->peak_tb_rate;
> > +	sp.peak.size = res->peak_tb_size;
> >  	sp.pkt_length_adjust = pkt_len_adjust;
> >
> >  	ret = rte_tm_shaper_profile_add(port_id, shaper_id, &sp, &error);
> @@
> > -862,8 +874,10 @@ static void
> > cmd_add_port_tm_node_shaper_profile_parsed(void *parsed_result,
> >  		(void *)&cmd_add_port_tm_node_shaper_profile_profile,
> >  		(void *)&cmd_add_port_tm_node_shaper_profile_port_id,
> >  		(void *)&cmd_add_port_tm_node_shaper_profile_shaper_id,
> > -		(void *)&cmd_add_port_tm_node_shaper_profile_tb_rate,
> > -		(void *)&cmd_add_port_tm_node_shaper_profile_tb_size,
> > +		(void
> > *)&cmd_add_port_tm_node_shaper_profile_cmit_tb_rate,
> > +		(void
> > *)&cmd_add_port_tm_node_shaper_profile_cmit_tb_size,
> > +		(void
> > *)&cmd_add_port_tm_node_shaper_profile_peak_tb_rate,
> > +		(void
> > *)&cmd_add_port_tm_node_shaper_profile_peak_tb_size,
> >  		(void
> > *)&cmd_add_port_tm_node_shaper_profile_pktlen_adjust,
> >  		NULL,
> >  	},
> > --
> 
> Can you also update the help command section (test-pmd/cmdline.c) as well
> as the documentation (doc/guides/testpmd_app_ug) for these changes.
> Thanks!

It's done, thanks.

[dpdk-dev] [PATCH v2 0/2] Add and identify shaper profile parameters

[Rosen Xu]

v2 updates:
==========
 - Updated commmand section
 - Updated the documentation

v1 updates:
==========
 - Added committed and peak parameters

As struct rte_tm_shaper_params defined, the command line of
test-pmd should include committed and peak parameters, but
right now the command line doesn't identify whether it's
committed or peak parameter. This patch identifies and
adds the clarify definition. This patch also update command
section and the documentation.


Rosen Xu (2):
  app/test-pmd: add and identify shaper profile parameters
  doc/guides/testpmd_app_ug: update documentation for added shaper
    profile parameters

 app/test-pmd/cmdline.c                      |  3 ++-
 app/test-pmd/cmdline_tm.c                   | 34 ++++++++++++++++++++---------
 doc/guides/testpmd_app_ug/testpmd_funcs.rst |  9 +++++---
 3 files changed, 32 insertions(+), 14 deletions(-)

-- 
1.8.3.1

[dpdk-dev] [PATCH v2 1/2] [PATCH v2 1/2] app/test-pmd: add and identify shaper profile parameters

[Rosen Xu]

As struct rte_tm_shaper_params defined, the command line of
test-pmd should include committed and peak parameters, but
right now the command line doesn't identify whether it's
committed or peak parameter. This patch identifies and
adds the clarify definition

Signed-off-by: Rosen Xu <rosen.xu@intel.com>
iFixes: bddc2f40b594 ("app/testpmd: add commands for shaper and wred profiles")
Cc: jasvinder.singh@intel.com
---
 app/test-pmd/cmdline.c    |  3 ++-
 app/test-pmd/cmdline_tm.c | 34 ++++++++++++++++++++++++----------
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 3b469ac..eda13fa 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -725,7 +725,8 @@ static void cmd_help_long_parsed(void *parsed_result,
 			"    show all queue region related configuration info\n\n"
 
 			"add port tm node shaper profile (port_id) (shaper_profile_id)"
-			" (tb_rate) (tb_size) (packet_length_adjust)\n"
+			" (cmit_tb_rate) (cmit_tb_size) (peak_tb_rate) (peak_tb_size)"
+			" (packet_length_adjust)\n"
 			"	Add port tm node private shaper profile.\n\n"
 
 			"del port tm node shaper profile (port_id) (shaper_profile_id)\n"
diff --git a/app/test-pmd/cmdline_tm.c b/app/test-pmd/cmdline_tm.c
index b430797..4c76348 100644
--- a/app/test-pmd/cmdline_tm.c
+++ b/app/test-pmd/cmdline_tm.c
@@ -771,8 +771,10 @@ struct cmd_add_port_tm_node_shaper_profile_result {
 	cmdline_fixed_string_t profile;
 	uint16_t port_id;
 	uint32_t shaper_id;
-	uint64_t tb_rate;
-	uint64_t tb_size;
+	uint64_t cmit_tb_rate;
+	uint64_t cmit_tb_size;
+	uint64_t peak_tb_rate;
+	uint64_t peak_tb_size;
 	uint32_t pktlen_adjust;
 };
 
@@ -807,14 +809,22 @@ struct cmd_add_port_tm_node_shaper_profile_result {
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_shaper_profile_result,
 			shaper_id, UINT32);
-cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_tb_rate =
+cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_cmit_tb_rate =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_shaper_profile_result,
-			tb_rate, UINT64);
-cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_tb_size =
+			cmit_tb_rate, UINT64);
+cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_cmit_tb_size =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_shaper_profile_result,
-			tb_size, UINT64);
+			cmit_tb_size, UINT64);
+cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_peak_tb_rate =
+	TOKEN_NUM_INITIALIZER(
+		struct cmd_add_port_tm_node_shaper_profile_result,
+			peak_tb_rate, UINT64);
+cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_peak_tb_size =
+	TOKEN_NUM_INITIALIZER(
+		struct cmd_add_port_tm_node_shaper_profile_result,
+			peak_tb_size, UINT64);
 cmdline_parse_token_num_t cmd_add_port_tm_node_shaper_profile_pktlen_adjust =
 	TOKEN_NUM_INITIALIZER(
 		struct cmd_add_port_tm_node_shaper_profile_result,
@@ -838,8 +848,10 @@ static void cmd_add_port_tm_node_shaper_profile_parsed(void *parsed_result,
 	/* Private shaper profile params */
 	memset(&sp, 0, sizeof(struct rte_tm_shaper_params));
 	memset(&error, 0, sizeof(struct rte_tm_error));
-	sp.peak.rate = res->tb_rate;
-	sp.peak.size = res->tb_size;
+	sp.committed.rate = res->cmit_tb_rate;
+	sp.committed.size = res->cmit_tb_size;
+	sp.peak.rate = res->peak_tb_rate;
+	sp.peak.size = res->peak_tb_size;
 	sp.pkt_length_adjust = pkt_len_adjust;
 
 	ret = rte_tm_shaper_profile_add(port_id, shaper_id, &sp, &error);
@@ -862,8 +874,10 @@ static void cmd_add_port_tm_node_shaper_profile_parsed(void *parsed_result,
 		(void *)&cmd_add_port_tm_node_shaper_profile_profile,
 		(void *)&cmd_add_port_tm_node_shaper_profile_port_id,
 		(void *)&cmd_add_port_tm_node_shaper_profile_shaper_id,
-		(void *)&cmd_add_port_tm_node_shaper_profile_tb_rate,
-		(void *)&cmd_add_port_tm_node_shaper_profile_tb_size,
+		(void *)&cmd_add_port_tm_node_shaper_profile_cmit_tb_rate,
+		(void *)&cmd_add_port_tm_node_shaper_profile_cmit_tb_size,
+		(void *)&cmd_add_port_tm_node_shaper_profile_peak_tb_rate,
+		(void *)&cmd_add_port_tm_node_shaper_profile_peak_tb_size,
 		(void *)&cmd_add_port_tm_node_shaper_profile_pktlen_adjust,
 		NULL,
 	},
-- 
1.8.3.1

[dpdk-dev] [PATCH v2 2/2] [PATCH v2 2/2] doc/guides/testpmd_app_ug: update documentation for added shaper profile parameters

[Rosen Xu]

Update documentation for committed and peak parameters of shaper profile

Signed-off-by: Rosen Xu <rosen.xu@intel.com>
---
 doc/guides/testpmd_app_ug/testpmd_funcs.rst | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
index d712bb6..3d07efc 100644
--- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst
+++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst
@@ -2473,13 +2473,16 @@ Add port traffic management private shaper profile
 Add the port traffic management private shaper profile::
 
    testpmd> add port tm node shaper profile (port_id) (shaper_profile_id) \
-   (tb_rate) (tb_size) (packet_length_adjust)
+   (cmit_tb_rate) (cmit_tb_size) (peak_tb_rate) (peak_tb_size) \
+   (packet_length_adjust)
 
 where:
 
 * ``shaper_profile id``: Shaper profile ID for the new profile.
-* ``tb_rate``: Token bucket rate (bytes per second).
-* ``tb_size``: Token bucket size (bytes).
+* ``cmit_tb_rate``: Committed token bucket rate (bytes per second).
+* ``cmit_tb_size``: Committed token bucket size (bytes).
+* ``peak_tb_rate``: Peak token bucket rate (bytes per second).
+* ``peak_tb_size``: Peak token bucket size (bytes).
 * ``packet_length_adjust``: The value (bytes) to be added to the length of
   each packet for the purpose of shaping. This parameter value can be used to
   correct the packet length with the framing overhead bytes that are consumed
-- 
1.8.3.1

Re: [dpdk-dev] [PATCH v2 2/2] [PATCH v2 2/2] doc/guides/testpmd_app_ug: update documentation for added shaper profile parameters

[Kovacevic, Marko]

> Update documentation for committed and peak parameters of shaper
> profile
> 
> Signed-off-by: Rosen Xu <rosen.xu@intel.com>
> ---
>  doc/guides/testpmd_app_ug/testpmd_funcs.rst | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)

Doc patch is ok just the commit heading is a but long 

Running git log check: 47112
Headline too long:
        doc/guides/testpmd_app_ug: update documentation for added shaper profile parameters

Reviewed-by: Marko Kovacevic <marko.kovacevic@intel.com>

Re: [dpdk-dev] [PATCH v2 0/2] Add and identify shaper profile parameters

[Singh, Jasvinder]

> -----Original Message-----
> From: Xu, Rosen
> Sent: Monday, October 22, 2018 9:47 AM
> To: dev@dpdk.org
> Cc: Dumitrescu, Cristian <cristian.dumitrescu@intel.com>; Lu, Wenzhuo
> <wenzhuo.lu@intel.com>; Singh, Jasvinder <jasvinder.singh@intel.com>; Xu,
> Rosen <rosen.xu@intel.com>; Yigit, Ferruh <ferruh.yigit@intel.com>
> Subject: [PATCH v2 0/2] Add and identify shaper profile parameters
> 
> v2 updates:
> ==========
>  - Updated commmand section
>  - Updated the documentation
> 
> v1 updates:
> ==========
>  - Added committed and peak parameters
> 
> As struct rte_tm_shaper_params defined, the command line of test-pmd should
> include committed and peak parameters, but right now the command line
> doesn't identify whether it's committed or peak parameter. This patch
> identifies and adds the clarify definition. This patch also update command
> section and the documentation.
> 
> 
> Rosen Xu (2):
>   app/test-pmd: add and identify shaper profile parameters
>   doc/guides/testpmd_app_ug: update documentation for added shaper
>     profile parameters
> 
>  app/test-pmd/cmdline.c                      |  3 ++-
>  app/test-pmd/cmdline_tm.c                   | 34 ++++++++++++++++++++---------
>  doc/guides/testpmd_app_ug/testpmd_funcs.rst |  9 +++++---
>  3 files changed, 32 insertions(+), 14 deletions(-)
> 
> --
> 1.8.3.1


Series-Acked-by: Jasvinder Singh <jasvinder.singh@intel.com>