Send on behalf of pengyuan
Tested-by: Peng Yuan <yuan.p...@intel.com>
- Tested Branch: master
- Tested Commit: 239912fa798e6e671072ca7ff987afd74c1e506c
- OS: 4.13.9-300.fc27.x86_64
- GCC: gcc (GCC) 7.3.1 20180303 (Red Hat 7.3.1-5)
- CPU: Intel(R) Xeon(R) CPU E5-2699 v4 @ 2.20GHz
- NIC: Intel Corporation Device Fortville [8086:1583]
- Default x86_64-native-linuxapp-gcc configuration
- Prerequisites:
- Total 1 case1, 1 passed, 0 failed
- Case steps:
1. Bind the pf port to dpdk driver:
./usertools/dpdk-devbind.py -b igb_uio 05:00.0 05:00.1
2. start testpmd:
./x86_64-native-linuxapp-gcc/app/testpmd -c 1ffff -n 4 - -i --nb-cores=8
--rxq=4 --txq=4 --port-topology=chained
3. testpmd> flow create 0 ingress pattern end actions rss types ipv4-udp end
key
1234567890123456789012345678901234567890FFFFFFFFFFFF1234567890123456789012345678901234567890FFFFFFFFFFFF
/ end
testpmd> show port 0 rss-hash key
RSS functions:
ipv4-udp udp
RSS key:
1234567890123456789012345678901234567890FFFFFFFFFFFF1234567890123456789012345678901234567890FFFFFFFFFFFF
52bytes key can be set successfully.
> -----Original Message-----
> From: Zhao1, Wei
> Sent: Monday, March 18, 2019 4:16 PM
> To: dev@dpdk.org
> Cc: sta...@dpdk.org; Zhang, Qi Z <qi.z.zh...@intel.com>; Lu, Wenzhuo
> <wenzhuo...@intel.com>; Ananyev, Konstantin
> <konstantin.anan...@intel.com>; Zhao1, Wei <wei.zh...@intel.com>
> Subject: [PATCH v2] app/testpmd: fix support of hex string parser for flow
> API
>
> There is need for users to set configuration of HEX number for RSS key. The
> key byte should be pass down as hex number not as char string. This patch
> enable cmdline flow parse HEX number, in order to not using string which
> pass ASIC number.
>
> Fixes: f4d623f96119 ("app/testpmd: fix missing RSS fields in flow action")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Wei Zhao <wei.zh...@intel.com>
>
> ---
>
> v2:
> fix bug of string length limite.
> ---
> app/test-pmd/cmdline_flow.c | 146
> +++++++++++++++++++++++++++++++++++++++++++-
> 1 file changed, 145 insertions(+), 1 deletion(-)
>
> diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c
> index 36659a6..7d263c6 100644
> --- a/app/test-pmd/cmdline_flow.c
> +++ b/app/test-pmd/cmdline_flow.c
> @@ -35,6 +35,7 @@ enum index {
> PREFIX,
> BOOLEAN,
> STRING,
> + HEX,
> MAC_ADDR,
> IPV4_ADDR,
> IPV6_ADDR,
> @@ -1122,6 +1123,9 @@ static int parse_boolean(struct context *, const
> struct token *, static int parse_string(struct context *, const struct token
> *,
> const char *, unsigned int,
> void *, unsigned int);
> +static int parse_hex(struct context *ctx, const struct token *token,
> + const char *str, unsigned int len,
> + void *buf, unsigned int size);
> static int parse_mac_addr(struct context *, const struct token *,
> const char *, unsigned int,
> void *, unsigned int);
> @@ -1198,6 +1202,13 @@ static const struct token token_list[] = {
> .call = parse_string,
> .comp = comp_none,
> },
> + [HEX] = {
> + .name = "{hex}",
> + .type = "HEX",
> + .help = "fixed string",
> + .call = parse_hex,
> + .comp = comp_none,
> + },
> [MAC_ADDR] = {
> .name = "{MAC address}",
> .type = "MAC-48",
> @@ -2306,7 +2317,7 @@ static const struct token token_list[] = {
> [ACTION_RSS_KEY] = {
> .name = "key",
> .help = "RSS hash key",
> - .next = NEXT(action_rss, NEXT_ENTRY(STRING)),
> + .next = NEXT(action_rss, NEXT_ENTRY(HEX)),
> .args = ARGS(ARGS_ENTRY_ARB(0, 0),
> ARGS_ENTRY_ARB
> (offsetof(struct action_rss_data, conf) + @@ -
> 4475,6 +4486,139 @@ parse_string(struct context *ctx, const struct token
> *token,
> return -1;
> }
>
> +static uint32_t
> +get_hex_val(char c)
> +{
> + switch (c) {
> + case '0': case '1': case '2': case '3': case '4': case '5':
> + case '6': case '7': case '8': case '9':
> + return c - '0';
> + case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
> + return c - 'A' + 10;
> + case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
> + return c - 'a' + 10;
> + default:
> + return 0;
> + }
> +}
> +
> +static int
> +parse_hex_string(const char *src, uint8_t *dst, uint32_t *size) {
> + const char *c;
> + uint32_t i;
> +
> + /* Check input parameters */
> + if ((src == NULL) ||
> + (dst == NULL) ||
> + (size == NULL) ||
> + (*size == 0))
> + return -1;
> + if ((*size & 1) != 0)
> + return -1;
> +
> + for (c = src, i = 0; i < *size; c++, i++) {
> + if ((((*c) >= '0') && ((*c) <= '9')) ||
> + (((*c) >= 'A') && ((*c) <= 'F')) ||
> + (((*c) >= 'a') && ((*c) <= 'f')))
> + continue;
> +
> + return -1;
> + }
> + *size = *size / 2;
> +
> + /* Convert chars to bytes */
> + for (i = 0; i < *size; i++)
> + dst[i] = get_hex_val(src[2 * i]) * 16 +
> + get_hex_val(src[2 * i + 1]);
> +
> + return 0;
> +}
> +
> +static int
> +parse_hex(struct context *ctx, const struct token *token,
> + const char *str, unsigned int len,
> + void *buf, unsigned int size)
> +{
> + const struct arg *arg_data = pop_args(ctx);
> + const struct arg *arg_len = pop_args(ctx);
> + const struct arg *arg_addr = pop_args(ctx);
> + char tmp[16]; /* Ought to be enough. */
> + int ret;
> + unsigned int hexlen = len;
> + unsigned int length = 256;
> + uint8_t hex_tmp[length];
> +
> + /* Arguments are expected. */
> + if (!arg_data)
> + return -1;
> + if (!arg_len) {
> + push_args(ctx, arg_data);
> + return -1;
> + }
> + if (!arg_addr) {
> + push_args(ctx, arg_len);
> + push_args(ctx, arg_data);
> + return -1;
> + }
> + size = arg_data->size;
> + /* Bit-mask fill is not supported. */
> + if (arg_data->mask)
> + goto error;
> + if (!ctx->object)
> + return len;
> +
> + /* translate bytes string to array. */
> + if (str[0] == '0' && ((str[1] == 'x') ||
> + (str[1] == 'X'))) {
> + str += 2;
> + hexlen -= 2;
> + }
> + if (hexlen > length)
> + return -1;
> + ret = parse_hex_string(str, hex_tmp, &hexlen);
> + if (ret < 0)
> + goto error;
> + /* Let parse_int() fill length information first. */
> + ret = snprintf(tmp, sizeof(tmp), "%u", hexlen);
> + if (ret < 0)
> + goto error;
> + push_args(ctx, arg_len);
> + ret = parse_int(ctx, token, tmp, ret, NULL, 0);
> + if (ret < 0) {
> + pop_args(ctx);
> + goto error;
> + }
> + buf = (uint8_t *)ctx->object + arg_data->offset;
> + /* Output buffer is not necessarily NUL-terminated. */
> + memcpy(buf, hex_tmp, hexlen);
> + memset((uint8_t *)buf + len, 0x00, size - hexlen);
> + if (ctx->objmask)
> + memset((uint8_t *)ctx->objmask + arg_data->offset,
> + 0xff, hexlen);
> + /* Save address if requested. */
> + if (arg_addr->size) {
> + memcpy((uint8_t *)ctx->object + arg_addr->offset,
> + (void *[]){
> + (uint8_t *)ctx->object + arg_data->offset
> + },
> + arg_addr->size);
> + if (ctx->objmask)
> + memcpy((uint8_t *)ctx->objmask + arg_addr->offset,
> + (void *[]){
> + (uint8_t *)ctx->objmask + arg_data->offset
> + },
> + arg_addr->size);
> + }
> + return len;
> +error:
> + push_args(ctx, arg_addr);
> + push_args(ctx, arg_len);
> + push_args(ctx, arg_data);
> + return -1;
> +
> +}
> +
> /**
> * Parse a MAC address.
> *
> --
> 2.7.5
