From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 684A2A0096 for ; Tue, 9 Apr 2019 10:44:56 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 17A165B12; Tue, 9 Apr 2019 10:44:56 +0200 (CEST) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by dpdk.org (Postfix) with ESMTP id D756E5911; Tue, 9 Apr 2019 10:44:50 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Apr 2019 01:44:49 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,328,1549958400"; d="scan'208";a="132694965" Received: from fyigit-mobl.ger.corp.intel.com (HELO [10.237.221.46]) ([10.237.221.46]) by orsmga008.jf.intel.com with ESMTP; 09 Apr 2019 01:44:48 -0700 To: "Zhao1, Wei" , "dev@dpdk.org" Cc: "stable@dpdk.org" , "stephen@networkplumber.org" , "Ananyev, Konstantin" References: <1552896961-33681-1-git-send-email-wei.zhao1@intel.com> <1553224548-37749-1-git-send-email-wei.zhao1@intel.com> From: Ferruh Yigit Openpgp: preference=signencrypt Autocrypt: addr=ferruh.yigit@intel.com; prefer-encrypt=mutual; keydata= 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 vM8= Message-ID: <5cf9b3b8-c615-0554-409e-d161b4245cac@intel.com> Date: Tue, 9 Apr 2019 09:44:47 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Subject: Re: [dpdk-stable] [PATCH v3] app/testpmd: fix support of hex string parser for flow API X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" On 4/9/2019 8:38 AM, Zhao1, Wei wrote: > Hi, Ferruh > >> -----Original Message----- >> From: Yigit, Ferruh >> Sent: Friday, March 22, 2019 10:56 PM >> To: Zhao1, Wei ; dev@dpdk.org >> Cc: stable@dpdk.org; stephen@networkplumber.org; Ananyev, Konstantin >> >> Subject: Re: [dpdk-stable] [PATCH v3] app/testpmd: fix support of hex string >> parser for flow API >> >> On 3/22/2019 3:15 AM, Wei Zhao wrote: >>> 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: stable@dpdk.org >>> >>> Signed-off-by: Wei Zhao >>> Tested-by: Peng Yuan >> >> <...> >> >>> @@ -4475,6 +4486,138 @@ 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 (isxdigit(*c)) >>> + continue; >>> + else >>> + 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; >>> +} >> >> I can see this has been discussed already but what would you think updating >> the 'parse_hex_string' something like following, it is less code to maintain: >> >> static int >> parse_hex_string(const char *src, uint8_t *dst, uint32_t *size) { >> int len; >> int i >> for (i = 0, len = 0; i < *size; i += 2) { >> char tmp[3]; >> snprintf(tmp, 3, src + i); >> dst[len++] = strtoul(tmp, NULL, 16); >> } >> dst[len] = 0; >> *size = len; >> return 0; >> } >> >> (indeed with better error checking on strtoul ;) ) >> >> <...> > > > > I have change code style as your guide as bellow, > but strtoul() seems do not work, it return c with a none-null every time. > you can have a try yourself. Hi Wei, Yes it return 'c' none-null, which is OK/expected. According man page: " If endptr is not NULL, strtol() stores the address of the first invalid character in *endptr. If there were no digits at all, strtol() stores the original value of nptr in *endptr (and returns 0). In particular, if *nptr is not '\0' but **endptr is '\0' on return, the entire string is valid. " First invalid char in below is 'tmp[2]', which is '0', so 'strtol' returns '&tmp[2]', this is aligned with what described above. It says, "if *nptr is not '\0' but **endptr is '\0' on return, the entire string is valid.", beware it says "**endptr is '\0'", so following check should work: if (*c != 0) { len--; dst[len] = 0; *size = len; return -1; } > > > static int > parse_hex_string(const char *src, uint8_t *dst, uint32_t *size) > { > char *c = NULL; > uint32_t i, len; > char tmp[3]; > > /* Check input parameters */ > if ((src == NULL) || > (dst == NULL) || > (size == NULL) || > (*size == 0)) > return -1; > > /* Convert chars to bytes */ > for (i = 0, len = 0; i < *size; i += 2) { > snprintf(tmp, 3, "%s" ,src + i); > dst[len++] = strtoul(tmp, &c, 16); > if(c) > return -1; > } > dst[len] = 0; > *size = len; > > return 0; > } > >> >>> + /* Output buffer is not necessarily NUL-terminated. */ >>> + memcpy(buf, hex_tmp, hexlen); >>> + memset((uint8_t *)buf + len, 0x00, size - hexlen); >> >> Can't this overflow the 'buf'? since "len = 2 * hexlen" >> I guess intention is "buf + hexlen"