Commit-ID: 9eb42dee2b11635174c74a7996934b6ca18f2179 Gitweb: http://git.kernel.org/tip/9eb42dee2b11635174c74a7996934b6ca18f2179 Author: Steven Rostedt <rost...@goodmis.org> AuthorDate: Fri, 26 Feb 2016 18:13:28 -0500 Committer: Arnaldo Carvalho de Melo <a...@redhat.com> CommitDate: Thu, 10 Mar 2016 16:27:41 -0300
tools lib traceevent: Add '~' operation within arg_num_eval() When evaluating values for print flags, if the value included a '~' operator, the parsing would fail. This broke kmalloc's parsing of: __print_flags(REC->gfp_flags, "|", {(unsigned long)((((((( gfp_t)(0x400000u|0x2000000u)) | (( gfp_t)0x40u) | (( gfp_t)0x80u) | (( gfp_t)0x20000u)) | (( gfp_t)0x02u)) | (( gfp_t)0x08u)) | (( gfp_t)0x4000u) | (( gfp_t)0x10000u) | (( gfp_t)0x1000u) | (( gfp_t)0x200u)) & ~(( gfp_t)0x2000000u)) ^ | here Signed-off-by: Steven Rostedt <rost...@goodmis.org> Reported-by: Arnaldo Carvalho de Melo <a...@redhat.com> Tested-by: David Ahern <dsah...@gmail.com> Cc: Andi Kleen <a...@firstfloor.org> Cc: Jiri Olsa <jo...@kernel.org> Cc: Namhyung Kim <namhy...@kernel.org> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Stephane Eranian <eran...@google.com> Cc: Wang Nan <wangn...@huawei.com> Link: http://lkml.kernel.org/r/20160226181328.22f47...@gandalf.local.home Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com> --- tools/lib/traceevent/event-parse.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c index 865dea5..190cc88 100644 --- a/tools/lib/traceevent/event-parse.c +++ b/tools/lib/traceevent/event-parse.c @@ -2398,6 +2398,12 @@ static int arg_num_eval(struct print_arg *arg, long long *val) break; *val = left + right; break; + case '~': + ret = arg_num_eval(arg->op.right, &right); + if (!ret) + break; + *val = ~right; + break; default: do_warning("unknown op '%s'", arg->op.op); ret = 0;