lib/librte_meter: add RFC4115 trTCM meter support
v4 cover lib/librte_meter: add RFC4115 trTCM meter support
This patch adds support for RFC4115 trTCM meters.
v4:
- Fixed typo
- Cleaned up code to be aligned with RFC diagram
v3:
- Gave the rfc4115 meter it's own data structures
v2:
- Marked all functions with __rte_experimental, and added "EXPERIMENTAL:..." to doxygen comments.
- Removed library version change, and merged it with first patch
- Do not call rte_meter_trtcm_rfc4115_color_aware_check in rte_meter_trtcm_rfc4115_color_blind_check to avoid error with it being marked as experimental
Eelco Chaudron (2):
lib/librte_meter: add RFC4115 trTCM meter support test/test_meter: update meter test to include RFC4115 meters
lib/librte_meter/rte_meter.c | 42 ++++++ lib/librte_meter/rte_meter.h | 233 ++++++++++++++++++++++++++++++++ lib/librte_meter/rte_meter_version.map | 9 + test/test/test_meter.c | 212 +++++++++++++++++++++++++++++ 4 files changed, 494 insertions(+), 2 deletions(-)
PATCH v4 1/2 lib/librte_meter: add RFC4115 trTCM meter support
This patch adds support for RFC4115 trTCM meters.
--- lib/librte_meter/rte_meter.c | 42 ++++++ lib/librte_meter/rte_meter.h | 233 ++++++++++++++++++++++++++++++++ lib/librte_meter/rte_meter_version.map | 9 + 3 files changed, 282 insertions(+), 2 deletions(-)
lib/librte_meter/rte_meter.c +42 -0
@@ -110,3 +110,45 @@ rte_meter_trtcm_config(struct rte_meter_trtcm *m,return 0 ; } + +int __rte_experimental +rte_meter_trtcm_rfc4115_profile_config ( +struct rte_meter_trtcm_rfc4115_profile *p, +struct rte_meter_trtcm_rfc4115_params *params) +{ +uint64_t hz =rte_get_tsc_hz (); + +/* Check input parameters */ +if ((p ==NULL ) || + (params ==NULL ) || + (params->cir !=0 && params->cbs ==0 ) || + (params->eir !=0 && params->ebs ==0 )) +return -EINVAL ; + +/* Initialize trTCM run-time structure */ + p->cbs = params->cbs; + p->ebs = params->ebs; +rte_meter_get_tb_params (hz, params->cir, &p->cir_period, + &p->cir_bytes_per_period); +rte_meter_get_tb_params (hz, params->eir, &p->eir_period, + &p->eir_bytes_per_period); + +return 0 ; +} + +int __rte_experimental +rte_meter_trtcm_rfc4115_config ( +struct rte_meter_trtcm_rfc4115 *m, +struct rte_meter_trtcm_rfc4115_profile *p) +{ +/* Check input parameters */ +if ((m ==NULL ) || (p ==NULL )) +return -EINVAL ; + +/* Initialize trTCM run-time structure */ + m->time_tc = m->time_te =rte_get_tsc_cycles (); + m->tc = p->cbs; + m->te = p->ebs; + +return 0 ; +}
lib/librte_meter/rte_meter.h +231 -2
299 lines not on this page · raw message
lib/librte_meter/rte_meter_version.map +9 -0
@@ -17,3 +17,12 @@ DPDK_18.08 { rte_meter_srtcm_profile_config; rte_meter_trtcm_profile_config; }; + +EXPERIMENTAL { + global: + + rte_meter_trtcm_rfc4115_color_aware_check; + rte_meter_trtcm_rfc4115_color_blind_check; + rte_meter_trtcm_rfc4115_config; + rte_meter_trtcm_rfc4115_profile_config; +};
Quoted 3 lines · On Fri, 4 Jan 2019 13:59:42 +0000 Eelco Chaudron <[email protected]> wrote:
This patch adds support for RFC4115 trTCM meters.
Signed-off-by Eelco Chaudron <[email protected]>
Fix comment formatting.
### [dpdk-dev] [PATCH v4 1/2] lib/librte_meter: add RFC4115 trTCM meter support
WARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #172: FILE: lib/librte_meter/rte_meter.h:59:
+/** trTCM parameters per metered traffic flow. The CIR, EIR, CBS and EBS +parameters only count bytes of IP packets and do not include link specific
WARNING:BLOCK_COMMENT_STYLE: Block comments use a trailing */ on a separate line #174: FILE: lib/librte_meter/rte_meter.h:61:
+none-zero respectively.*/
WARNING:LONG_LINE_COMMENT: line over 80 characters #176: FILE: lib/librte_meter/rte_meter.h:63:
+ uint64_t cir; /**< Committed Information Rate (CIR). Measured in bytes per second. */
WARNING:LONG_LINE_COMMENT: line over 80 characters #177: FILE: lib/librte_meter/rte_meter.h:64:
+ uint64_t eir; /**< Excess Information Rate (EIR). Measured in bytes per second. */
WARNING:LONG_LINE_COMMENT: line over 80 characters #355: FILE: lib/librte_meter/rte_meter.h:406:
+ /**< Number of bytes currently available in the excess(E) token bucket */
total: 0 errors, 5 warnings, 356 lines checked
Quoted 10 lines · Stephen Hemminger
Quoted 3 lines · On Fri, 4 Jan 2019 13:59:42 +0000 Eelco Chaudron <[email protected]> wrote:
This patch adds support for RFC4115 trTCM meters.
Signed-off-by Eelco Chaudron <[email protected]>Fix comment formatting.
Hi Stephen, I left these warnings in on purpose, to match the existing comment style in the file.
These specific warnings are from a structure copied from one right above which also has the same style and line lengths.
As they are warning I though I should leave it as is, Christian what are your thoughts on this?
Quoted 30 lines
### [dpdk-dev] [PATCH v4 1/2]
lib/librte_meter: add RFC4115 trTCM meter supportWARNING:BLOCK_COMMENT_STYLE: Block comments use * on subsequent lines #172: FILE:
lib/librte_meter/rte_meter.h:59:
+/** trTCM parameters per metered traffic flow. The CIR, EIR, CBS and EBS
+parameters only count bytes of IP packets and do not include link specificWARNING:BLOCK_COMMENT_STYLE: Block comments use a trailing */ on a separate line #174: FILE:
lib/librte_meter/rte_meter.h:61:
+none-zero respectively.*/WARNING:LONG_LINE_COMMENT: line over 80 characters #176: FILE:
lib/librte_meter/rte_meter.h:63:(quoted diff) +1
-0+ uint64_t cir; /**< Committed Information Rate (CIR). Measured inbytes per second. */
WARNING:LONG_LINE_COMMENT: line over 80 characters #177: FILE:
lib/librte_meter/rte_meter.h:64:(quoted diff) +1
-0+ uint64_t eir; /**< Excess Information Rate (EIR). Measured in bytesper second. */
WARNING:LONG_LINE_COMMENT: line over 80 characters #355: FILE:
lib/librte_meter/rte_meter.h:406:(quoted diff) +1
-0+ /**< Number of bytes currently available in the excess(E) tokenbucket */
total: 0 errors, 5 warnings, 356 lines checked
Quoted 26 lines
-----Original Message-----
From: Eelco Chaudron [mailto:[email protected]]
Sent: Monday, January 7, 2019 7:42 AM
To: Stephen Hemminger <[email protected]>; Dumitrescu, Cristian <[email protected]>
Cc: [email protected]
Subject: Re: [dpdk-dev] [PATCH v4 1/2]lib/librte_meter: add RFC4115 trTCM meter supportQuoted 10 lines · Stephen Hemminger
Quoted 3 lines · On Fri, 4 Jan 2019 13:59:42 +0000 Eelco Chaudron <[email protected]> wrote:
This patch adds support for RFC4115 trTCM meters.
Signed-off-by Eelco Chaudron <[email protected]>Fix comment formatting.
Quoted 9 lines
Hi Stephen, I left these warnings in on purpose, to match the existing comment style in the file.
These specific warnings are from a structure copied from one right above which also has the same style and line lengths.
As they are warning I though I should leave it as is, Christian what are your thoughts on this?
I agree with Eelco, we can later on send a patch to adjust the whole file to the latest coding standard rather than change just a few lines inconsistently.
Quoted 33 lines
Quoted 5 lines
### [dpdk-dev] [PATCH v4 1/2]
lib/librte_meter: add RFC4115 trTCM meter supportWARNING:BLOCK_COMMENT_STYLE: Block comments use * on
subsequent lines
Quoted 27 lines
#172: FILE:
lib/librte_meter/rte_meter.h:59:
+/** trTCM parameters per metered traffic flow. The CIR, EIR, CBS and EBS
+parameters only count bytes of IP packets and do not include link specificWARNING:BLOCK_COMMENT_STYLE: Block comments use a trailing */ on a separate line
#174: FILE:lib/librte_meter/rte_meter.h:61:
+none-zero respectively.*/WARNING:LONG_LINE_COMMENT: line over 80 characters #176: FILE:
lib/librte_meter/rte_meter.h:63:(quoted diff) +1
-0+ uint64_t cir; /**< Committed Information Rate (CIR). Measured inbytes per second. */
WARNING:LONG_LINE_COMMENT: line over 80 characters #177: FILE:
lib/librte_meter/rte_meter.h:64:(quoted diff) +1
-0+ uint64_t eir; /**< Excess Information Rate (EIR). Measured in bytesper second. */
WARNING:LONG_LINE_COMMENT: line over 80 characters #355: FILE:
lib/librte_meter/rte_meter.h:406:(quoted diff) +1
-0+ /**< Number of bytes currently available in the excess(E) tokenbucket */
total: 0 errors, 5 warnings, 356 lines checked
PATCH v4 2/2 test/test_meter: update meter test to include RFC4115 meters
In reply to Eelco ChaudronAdd test cases for RFC4115 meters
--- test/test/test_meter.c | 212 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 212 insertions(+)
test/test/test_meter.c +212 -0
@@ -32,8 +32,10 @@#define TM_TEST_TRTCM_CIR_DF 46000000#define TM_TEST_TRTCM_PIR_DF 69000000 +#define TM_TEST_TRTCM_EIR_DF 69000000#define TM_TEST_TRTCM_CBS_DF 2048#define TM_TEST_TRTCM_PBS_DF 4096 +#define TM_TEST_TRTCM_EBS_DF 4096static struct rte_meter_srtcm_params sparams = {.cir =TM_TEST_SRTCM_CIR_DF ,
@@ -46,6 +48,12 @@ static struct rte_meter_trtcm_params tparams= .cbs = TM_TEST_TRTCM_CBS_DF, .pbs = TM_TEST_TRTCM_PBS_DF,}; +static struct rte_meter_trtcm_rfc4115_params rfc4115params = + {.cir =TM_TEST_TRTCM_CIR_DF , + .eir =TM_TEST_TRTCM_EIR_DF , + .cbs =TM_TEST_TRTCM_CBS_DF , + .ebs =TM_TEST_TRTCM_EBS_DF ,}; +/** * functional test for rte_meter_srtcm_config */
@@ -148,6 +156,45 @@ tm_test_trtcm_config(void)return 0 ; } +/** +* functional test for rte_meter_trtcm_rfc4115_config +*/ +static inline int +tm_test_trtcm_rfc4115_config (void ) +{ +struct rte_meter_trtcm_rfc4115_profile tp; +struct rte_meter_trtcm_rfc4115_params rfc4115params1; +#define TRTCM_RFC4115_CFG_MSG "trtcm_rfc4115_config" + +/* invalid parameter test */ +if (rte_meter_trtcm_rfc4115_profile_config (NULL ,NULL ) ==0 ) +melog (TRTCM_RFC4115_CFG_MSG ); +if (rte_meter_trtcm_rfc4115_profile_config (&tp,NULL ) ==0 ) +melog (TRTCM_RFC4115_CFG_MSG ); +if (rte_meter_trtcm_rfc4115_profile_config (NULL , &rfc4115params) ==0 ) +melog (TRTCM_RFC4115_CFG_MSG ); + +/* +* cbs and pbs should be none-zero if cir and eir are none-zero +* respectively +*/ + rfc4115params1 = rfc4115params; + rfc4115params1.cbs =0 ; +if (rte_meter_trtcm_rfc4115_profile_config (&tp, &rfc4115params1) ==0 ) +melog (TRTCM_RFC4115_CFG_MSG ); + + rfc4115params1 = rfc4115params; + rfc4115params1.ebs =0 ; +if (rte_meter_trtcm_rfc4115_profile_config (&tp, &rfc4115params1) ==0 ) +melog (TRTCM_RFC4115_CFG_MSG ); + +/* usual parameter, should be successful */ +if (rte_meter_trtcm_rfc4115_profile_config (&tp, &rfc4115params) !=0 ) +melog (TRTCM_RFC4115_CFG_MSG ); + +return 0 ; +} +/** * functional test for rte_meter_srtcm_color_blind_check */
@@ -265,6 +312,65 @@ tm_test_trtcm_color_blind_check(void)return 0 ; } +/** +* functional test for rte_meter_trtcm_rfc4115_color_blind_check +*/ +static inline int +tm_test_trtcm_rfc4115_color_blind_check (void ) +{ +#define TRTCM_RFC4115_BLIND_CHECK_MSG "trtcm_rfc4115_blind_check" + +uint64_t time; +struct rte_meter_trtcm_rfc4115_profile tp; +struct rte_meter_trtcm_rfc4115 tm; +uint64_t hz =rte_get_tsc_hz (); + +/* Test green */ +if (rte_meter_trtcm_rfc4115_profile_config (&tp, &rfc4115params) !=0 ) +melog (TRTCM_RFC4115_BLIND_CHECK_MSG ); +if (rte_meter_trtcm_rfc4115_config (&tm, &tp) !=0 ) +melog (TRTCM_RFC4115_BLIND_CHECK_MSG ); + time =rte_get_tsc_cycles () + hz; +if (rte_meter_trtcm_rfc4115_color_blind_check ( + &tm, &tp, time,TM_TEST_TRTCM_CBS_DF -1 ) + != e_RTE_METER_GREEN) +melog (TRTCM_RFC4115_BLIND_CHECK_MSG " GREEN" ); + +/* Test yellow */ +if (rte_meter_trtcm_rfc4115_profile_config (&tp, &rfc4115params) !=0 ) +melog (TRTCM_RFC4115_BLIND_CHECK_MSG ); +if (rte_meter_trtcm_rfc4115_config (&tm, &tp) !=0 ) +melog (TRTCM_RFC4115_BLIND_CHECK_MSG ); + time =rte_get_tsc_cycles () + hz; +if (rte_meter_trtcm_rfc4115_color_blind_check ( + &tm, &tp, time,TM_TEST_TRTCM_CBS_DF +1 ) + != e_RTE_METER_YELLOW) +melog (TRTCM_RFC4115_BLIND_CHECK_MSG " YELLOW" ); + +if (rte_meter_trtcm_rfc4115_profile_config (&tp, &rfc4115params) !=0 ) +melog (TRTCM_RFC4115_BLIND_CHECK_MSG ); +if (rte_meter_trtcm_rfc4115_config (&tm, &tp) !=0 ) +melog (TRTCM_RFC4115_BLIND_CHECK_MSG ); + time =rte_get_tsc_cycles () + hz; +if (rte_meter_trtcm_rfc4115_color_blind_check ( + &tm, &tp, time,TM_TEST_TRTCM_EBS_DF -1 ) + != e_RTE_METER_YELLOW) +melog (TRTCM_RFC4115_BLIND_CHECK_MSG " YELLOW" ); + +/* Test red */ +if (rte_meter_trtcm_rfc4115_profile_config (&tp, &rfc4115params) !=0 ) +melog (TRTCM_RFC4115_BLIND_CHECK_MSG ); +if (rte_meter_trtcm_rfc4115_config (&tm, &tp) !=0 ) +melog (TRTCM_RFC4115_BLIND_CHECK_MSG ); + time =rte_get_tsc_cycles () + hz; +if (rte_meter_trtcm_rfc4115_color_blind_check ( + &tm, &tp, time,TM_TEST_TRTCM_EBS_DF +1 ) + != e_RTE_METER_RED) +melog (TRTCM_RFC4115_BLIND_CHECK_MSG " RED" ); + +return 0 ; +} +/** * @in[4] : the flags packets carries.
@@ -473,6 +579,103 @@ tm_test_trtcm_color_aware_check(void)return 0 ; } +/** +* @in[4] : the flags packets carries. +* @in[4] : the flags function expect to return. +* It will do blind check at the time of 1 second from beginning. +* At the time, it will use packets length of cbs -1, cbs + 1, +* ebs -1 and ebs +1 with flag in[0], in[1], in[2] and in[3] to do +* aware check, expect flag out[0], out[1], out[2] and out[3] +*/ +static inline int +tm_test_trtcm_rfc4115_aware_check +(enum rte_meter_color in[4 ],enum rte_meter_color out[4 ]) +{ +#define TRTCM_RFC4115_AWARE_CHECK_MSG "trtcm_rfc4115_aware_check" +struct rte_meter_trtcm_rfc4115_profile tp; +struct rte_meter_trtcm_rfc4115 tm; +uint64_t time; +uint64_t hz =rte_get_tsc_hz (); + +if (rte_meter_trtcm_rfc4115_profile_config (&tp, &rfc4115params) !=0 ) +melog (TRTCM_AWARE_CHECK_MSG ); +if (rte_meter_trtcm_rfc4115_config (&tm, &tp) !=0 ) +melog (TRTCM_RFC4115_AWARE_CHECK_MSG ); + time =rte_get_tsc_cycles () + hz; +if (rte_meter_trtcm_rfc4115_color_aware_check ( + &tm, &tp, time,TM_TEST_TRTCM_CBS_DF -1 , in[0 ]) != out[0 ]) +melog (TRTCM_RFC4115_AWARE_CHECK_MSG " %u:%u" , in[0 ], out[0 ]); + +if (rte_meter_trtcm_rfc4115_profile_config (&tp, &rfc4115params) !=0 ) +melog (TRTCM_RFC4115_AWARE_CHECK_MSG ); +if (rte_meter_trtcm_rfc4115_config (&tm, &tp) !=0 ) +melog (TRTCM_RFC4115_AWARE_CHECK_MSG ); + time =rte_get_tsc_cycles () + hz; +if (rte_meter_trtcm_rfc4115_color_aware_check ( + &tm, &tp, time,TM_TEST_TRTCM_CBS_DF +1 , in[1 ]) != out[1 ]) +melog (TRTCM_RFC4115_AWARE_CHECK_MSG " %u:%u" , in[1 ], out[1 ]); + +if (rte_meter_trtcm_rfc4115_profile_config (&tp, &rfc4115params) !=0 ) +melog (TRTCM_RFC4115_AWARE_CHECK_MSG ); +if (rte_meter_trtcm_rfc4115_config (&tm, &tp) !=0 ) +melog (TRTCM_RFC4115_AWARE_CHECK_MSG ); + time =rte_get_tsc_cycles () + hz; +if (rte_meter_trtcm_rfc4115_color_aware_check ( + &tm, &tp, time,TM_TEST_TRTCM_EBS_DF -1 , in[2 ]) != out[2 ]) +melog (TRTCM_RFC4115_AWARE_CHECK_MSG " %u:%u" , in[2 ], out[2 ]); + +if (rte_meter_trtcm_rfc4115_profile_config (&tp, &rfc4115params) !=0 ) +melog (TRTCM_RFC4115_AWARE_CHECK_MSG ); +if (rte_meter_trtcm_rfc4115_config (&tm, &tp) !=0 ) +melog (TRTCM_RFC4115_AWARE_CHECK_MSG ); + time =rte_get_tsc_cycles () + hz; +if (rte_meter_trtcm_rfc4115_color_aware_check ( + &tm, &tp, time,TM_TEST_TRTCM_EBS_DF +1 , in[3 ]) != out[3 ]) +melog (TRTCM_RFC4115_AWARE_CHECK_MSG " %u:%u" , in[3 ], out[3 ]); + +return 0 ; +} + +/** +* functional test for rte_meter_trtcm_rfc4115_color_aware_check +*/ +static inline int +tm_test_trtcm_rfc4115_color_aware_check (void ) +{ +enum rte_meter_color in[4 ], out[4 ]; +/** +* test 4 points that will produce green, yellow, yellow, red flag +* if using blind check +*/ + +/* previouly have a green, test points should keep unchanged */ + in[0 ] = in[1 ] = in[2 ] = in[3 ] = e_RTE_METER_GREEN; + out[0 ] = e_RTE_METER_GREEN; + out[1 ] = e_RTE_METER_YELLOW; + out[2 ] = e_RTE_METER_YELLOW; + out[3 ] = e_RTE_METER_RED; +if (tm_test_trtcm_rfc4115_aware_check (in, out) !=0 ) +return -1 ; + + in[0 ] = in[1 ] = in[2 ] = in[3 ] = e_RTE_METER_YELLOW; + out[0 ] = e_RTE_METER_YELLOW; + out[1 ] = e_RTE_METER_YELLOW; + out[2 ] = e_RTE_METER_YELLOW; + out[3 ] = e_RTE_METER_RED; +if (tm_test_trtcm_rfc4115_aware_check (in, out) !=0 ) +return -1 ; + + in[0 ] = in[1 ] = in[2 ] = in[3 ] = e_RTE_METER_RED; + out[0 ] = e_RTE_METER_RED; + out[1 ] = e_RTE_METER_RED; + out[2 ] = e_RTE_METER_RED; + out[3 ] = e_RTE_METER_RED; +if (tm_test_trtcm_rfc4115_aware_check (in, out) !=0 ) +return -1 ; + +return 0 ; +} +/** * test main entrance for library meter */
@@ -485,18 +688,27 @@ test_meter(void)if (tm_test_trtcm_config () !=0 )return -1 ; +if (tm_test_trtcm_rfc4115_config () !=0 ) +return -1 ; +if (tm_test_srtcm_color_blind_check () !=0 )return -1 ;if (tm_test_trtcm_color_blind_check () !=0 )return -1 ; +if (tm_test_trtcm_rfc4115_color_blind_check () !=0 ) +return -1 ; +if (tm_test_srtcm_color_aware_check () !=0 )return -1 ;if (tm_test_trtcm_color_aware_check () !=0 )return -1 ; +if (tm_test_trtcm_rfc4115_color_aware_check () !=0 ) +return -1 ; +return 0 ; }
Dumitrescu, Cristian
AppliedQuoted 9 lines
-----Original Message-----
From: Eelco Chaudron [mailto:[email protected]]
Sent: Friday, January 4, 2019 2:00 PM
To: Dumitrescu, Cristian <[email protected]>
Cc: [email protected]
Subject: [PATCH v4 0/2]lib/librte_meter: add RFC4115 trTCM meter support
Quoted 9 lines
This patch adds support for RFC4115 trTCM meters.
Signed-off-by Eelco Chaudron <[email protected]>v4:
- Fixed typo
- Cleaned up code to be aligned with RFC diagram
Series Acked-by: Cristian Dumitrescu <[email protected]>
Applied to next-qos tree, thanks!
07/01/2019 16:58, Dumitrescu, Cristian:
Quoted 7 lines
From: Eelco Chaudron [mailto:[email protected]]
Quoted 6 lines
This patch adds support for RFC4115 trTCM meters.
Signed-off-by Eelco Chaudron <[email protected]>
Quoted 8 lines
Quoted 4 lines
v4:
- Fixed typo
- Cleaned up code to be aligned with RFC diagramSeries Acked-by: Cristian Dumitrescu <[email protected]>
Applied to next-qos tree, thanks!
#include "rte_compat.h" is missing.
Fixing in-tree
Thanks Thomas!
Quoted 19 lines · Thomas Monjalon
07/01/2019 16:58, Dumitrescu, Cristian:
Quoted 7 lines
From: Eelco Chaudron [mailto:[email protected]]
Quoted 6 lines
This patch adds support for RFC4115 trTCM meters.
Signed-off-by Eelco Chaudron <[email protected]>Quoted 8 lines
Quoted 4 lines
v4:
- Fixed typo
- Cleaned up code to be aligned with RFC diagramSeries Acked-by: Cristian Dumitrescu <[email protected]>
Applied to next-qos tree, thanks!
#include "
rte_compat.h" is missing.
Fixing in-tree