From: Olivier Matz <olivier.matz@6wind.com>
To: Adrien Mazarguil <adrien.mazarguil@6wind.com>
Cc: Bernard Iremonger <bernard.iremonger@intel.com>,
dev@dpdk.org, stable@dpdk.org
Subject: Re: [dpdk-stable] [PATCH v2] librte_cmdline: fix parsing initialisation
Date: Fri, 23 Jun 2017 11:04:19 +0200 [thread overview]
Message-ID: <20170623110419.43b9ac89@platinum> (raw)
In-Reply-To: <327b5be12221f51fbf3a6d8e9d155de786992388.1497521374.git.adrien.mazarguil@6wind.com>
Hi Adrien,
On Thu, 15 Jun 2017 12:15:48 +0200, Adrien Mazarguil <adrien.mazarguil@6wind.com> wrote:
> From: "Bernard.Iremonger" <Bernard.iremonger@intel.com>
>
> The dyn_tokens array is initialised at the beginning of the cmdline_parse
> function. However when the inst_num variable is incremented later in the
> function the dyn_tokens array is not reinitialised so the tokens from the
> previous command are used.
>
> The solution is to initialise the dyn_tokens array in all while (inst)
> loops, before calling match_inst().
>
> Fixes: 4fffc05a2b2c ("cmdline: support dynamic tokens")
>
> CC: stable@dpdk.org
> Signed-off-by: Bernard Iremonger <bernard.iremonger@intel.com>
> Signed-off-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>
>
> ---
>
> Nice catch Bernard. This issue can be seen when implementing several
> flow-like commands in testpmd.
>
> While testing your original patch though, it appeared that it did not fully
> address the issue, as completion remained partially broken. Actually all
> match_inst() calls should be preceded by a memset(), so here's an updated
> version instead of requesting you to do these changes.
> ---
> lib/librte_cmdline/cmdline_parse.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/lib/librte_cmdline/cmdline_parse.c b/lib/librte_cmdline/cmdline_parse.c
> index b814880..c1d9f23 100644
> --- a/lib/librte_cmdline/cmdline_parse.c
> +++ b/lib/librte_cmdline/cmdline_parse.c
> @@ -276,7 +276,6 @@ cmdline_parse(struct cmdline *cl, const char * buf)
> return CMDLINE_PARSE_BAD_ARGS;
>
> ctx = cl->ctx;
> - memset(&dyn_tokens, 0, sizeof(dyn_tokens));
>
> /*
> * - look if the buffer contains at least one line
> @@ -321,6 +320,7 @@ cmdline_parse(struct cmdline *cl, const char * buf)
> debug_printf("INST %d\n", inst_num);
>
> /* fully parsed */
> + memset(&dyn_tokens, 0, sizeof(dyn_tokens));
> tok = match_inst(inst, buf, 0, tmp_result.buf,
> sizeof(tmp_result.buf), &dyn_tokens);
>
> @@ -400,7 +400,6 @@ cmdline_complete(struct cmdline *cl, const char *buf, int *state,
>
> debug_printf("%s called\n", __func__);
> memset(&token_hdr, 0, sizeof(token_hdr));
> - memset(&dyn_tokens, 0, sizeof(dyn_tokens));
>
> /* count the number of complete token to parse */
> for (i=0 ; buf[i] ; i++) {
> @@ -423,6 +422,7 @@ cmdline_complete(struct cmdline *cl, const char *buf, int *state,
> inst = ctx[inst_num];
> while (inst) {
> /* parse the first tokens of the inst */
> + memset(&dyn_tokens, 0, sizeof(dyn_tokens));
> if (nb_token &&
> match_inst(inst, buf, nb_token, NULL, 0,
> &dyn_tokens))
> @@ -530,6 +530,7 @@ cmdline_complete(struct cmdline *cl, const char *buf, int *state,
> /* we need to redo it */
> inst = ctx[inst_num];
>
> + memset(&dyn_tokens, 0, sizeof(dyn_tokens));
> if (nb_token &&
> match_inst(inst, buf, nb_token, NULL, 0, &dyn_tokens))
> goto next2;
It looks you call memset() before each call to match_inst(). So, I
have 2 questions:
- why not putting this memset() at the beginning of match_inst()?
- does the following test at the beginning of match_inst() still make sense?
if (!token_p && dyn_tokens && inst->f) {
if (!(*dyn_tokens)[0]) /* <<<<<<<<< here */
inst->f(&(*dyn_tokens)[0], NULL, dyn_tokens);
token_p = (*dyn_tokens)[0];
}
Thanks,
Olivier
next prev parent reply other threads:[~2017-06-23 9:04 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-13 10:07 [dpdk-stable] [PATCH] " Bernard Iremonger
2017-06-15 10:15 ` [dpdk-stable] [PATCH v2] " Adrien Mazarguil
2017-06-23 9:04 ` Olivier Matz [this message]
[not found] ` <cover.1499687422.git.adrien.mazarguil@6wind.com>
2017-07-10 12:09 ` [dpdk-stable] [PATCH v3 1/3] cmdline: fix dynamic tokens initialization Adrien Mazarguil
2017-07-10 12:09 ` [dpdk-stable] [PATCH v3 2/3] cmdline: fix dynamic tokens interface Adrien Mazarguil
2017-07-10 12:09 ` [dpdk-stable] [PATCH v3 3/3] app/testpmd: fix token matching in flow command Adrien Mazarguil
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170623110419.43b9ac89@platinum \
--to=olivier.matz@6wind.com \
--cc=adrien.mazarguil@6wind.com \
--cc=bernard.iremonger@intel.com \
--cc=dev@dpdk.org \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).