From: Vaibhav Nagarnaik <vnagarnaik@google.com>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: Michael Rubin <mrubin@google.com>,
David Sharp <dhsharp@google.com>,
linux-kernel@vger.kernel.org,
Vaibhav Nagarnaik <vnagarnaik@google.com>
Subject: [PATCH 2/4] trace-cmd: Handle invalid opcode parsing gracefully
Date: Fri, 15 Jul 2011 20:00:39 -0700 [thread overview]
Message-ID: <1310785241-3799-2-git-send-email-vnagarnaik@google.com> (raw)
In-Reply-To: <1310785241-3799-1-git-send-email-vnagarnaik@google.com>
If an invalid opcode is encountered, trace-cmd exits with an error.
Instead it can be treated as a soft error where the event's print format
is not parsed and its binary data is dumped out.
This patch adds a return value to arg_num_eval() function to indicate if
the parsing was successful. If not, then the error is considered soft
and the parsing of the offending event fails.
Signed-off-by: Vaibhav Nagarnaik <vnagarnaik@google.com>
---
parse-events.c | 125 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 83 insertions(+), 42 deletions(-)
diff --git a/parse-events.c b/parse-events.c
index d8f322a..58ffe51 100644
--- a/parse-events.c
+++ b/parse-events.c
@@ -1901,90 +1901,120 @@ eval_type(unsigned long long val, struct print_arg *arg, int pointer)
return eval_type_str(val, arg->typecast.type, pointer);
}
-static long long arg_num_eval(struct print_arg *arg)
+static int arg_num_eval(struct print_arg *arg, long long *val)
{
long long left, right;
- long long val = 0;
+ int ret = 1;
switch (arg->type) {
case PRINT_ATOM:
- val = strtoll(arg->atom.atom, NULL, 0);
+ *val = strtoll(arg->atom.atom, NULL, 0);
break;
case PRINT_TYPE:
- val = arg_num_eval(arg->typecast.item);
- val = eval_type(val, arg, 0);
+ ret = arg_num_eval(arg->typecast.item, val);
+ if (!ret)
+ break;
+ *val = eval_type(*val, arg, 0);
break;
case PRINT_OP:
switch (arg->op.op[0]) {
case '|':
- left = arg_num_eval(arg->op.left);
- right = arg_num_eval(arg->op.right);
+ ret = arg_num_eval(arg->op.left, &left);
+ if (!ret)
+ break;
+ ret = arg_num_eval(arg->op.right, &right);
+ if (!ret)
+ break;
if (arg->op.op[1])
- val = left || right;
+ *val = left || right;
else
- val = left | right;
+ *val = left | right;
break;
case '&':
- left = arg_num_eval(arg->op.left);
- right = arg_num_eval(arg->op.right);
+ ret = arg_num_eval(arg->op.left, &left);
+ if (!ret)
+ break;
+ ret = arg_num_eval(arg->op.right, &right);
+ if (!ret)
+ break;
if (arg->op.op[1])
- val = left && right;
+ *val = left && right;
else
- val = left & right;
+ *val = left & right;
break;
case '<':
- left = arg_num_eval(arg->op.left);
- right = arg_num_eval(arg->op.right);
+ ret = arg_num_eval(arg->op.left, &left);
+ if (!ret)
+ break;
+ ret = arg_num_eval(arg->op.right, &right);
+ if (!ret)
+ break;
switch (arg->op.op[1]) {
case 0:
- val = left < right;
+ *val = left < right;
break;
case '<':
- val = left << right;
+ *val = left << right;
break;
case '=':
- val = left <= right;
+ *val = left <= right;
break;
default:
- die("unknown op '%s'", arg->op.op);
+ do_warning("unknown op '%s'", arg->op.op);
+ ret = 0;
}
break;
case '>':
- left = arg_num_eval(arg->op.left);
- right = arg_num_eval(arg->op.right);
+ ret = arg_num_eval(arg->op.left, &left);
+ if (!ret)
+ break;
+ ret = arg_num_eval(arg->op.right, &right);
+ if (!ret)
+ break;
switch (arg->op.op[1]) {
case 0:
- val = left > right;
+ *val = left > right;
break;
case '>':
- val = left >> right;
+ *val = left >> right;
break;
case '=':
- val = left >= right;
+ *val = left >= right;
break;
default:
- die("unknown op '%s'", arg->op.op);
+ do_warning("unknown op '%s'", arg->op.op);
+ ret = 0;
}
break;
case '=':
- left = arg_num_eval(arg->op.left);
- right = arg_num_eval(arg->op.right);
-
- if (arg->op.op[1] != '=')
- die("unknown op '%s'", arg->op.op);
+ ret = arg_num_eval(arg->op.left, &left);
+ if (!ret)
+ break;
+ ret = arg_num_eval(arg->op.right, &right);
+ if (!ret)
+ break;
- val = left == right;
+ if (arg->op.op[1] != '=') {
+ do_warning("unknown op '%s'", arg->op.op);
+ ret = 0;
+ } else
+ *val = left == right;
break;
case '!':
- left = arg_num_eval(arg->op.left);
- right = arg_num_eval(arg->op.right);
+ ret = arg_num_eval(arg->op.left, &left);
+ if (!ret)
+ break;
+ ret = arg_num_eval(arg->op.right, &right);
+ if (!ret)
+ break;
switch (arg->op.op[1]) {
case '=':
- val = left != right;
+ *val = left != right;
break;
default:
- die("unknown op '%s'", arg->op.op);
+ do_warning("unknown op '%s'", arg->op.op);
+ ret = 0;
}
break;
case '-':
@@ -1992,12 +2022,17 @@ static long long arg_num_eval(struct print_arg *arg)
if (arg->op.left->type == PRINT_NULL)
left = 0;
else
- left = arg_num_eval(arg->op.left);
- right = arg_num_eval(arg->op.right);
- val = left - right;
+ ret = arg_num_eval(arg->op.left, &left);
+ if (!ret)
+ break;
+ ret = arg_num_eval(arg->op.right, &right);
+ if (!ret)
+ break;
+ *val = left - right;
break;
default:
- die("unknown op '%s'", arg->op.op);
+ do_warning("unknown op '%s'", arg->op.op);
+ ret = 0;
}
break;
@@ -2006,10 +2041,11 @@ static long long arg_num_eval(struct print_arg *arg)
case PRINT_STRING:
case PRINT_BSTRING:
default:
- die("invalid eval type %d", arg->type);
+ do_warning("invalid eval type %d", arg->type);
+ ret = 0;
}
- return val;
+ return ret;
}
static char *arg_eval (struct print_arg *arg)
@@ -2023,7 +2059,8 @@ static char *arg_eval (struct print_arg *arg)
case PRINT_TYPE:
return arg_eval(arg->typecast.item);
case PRINT_OP:
- val = arg_num_eval(arg);
+ if (!arg_num_eval(arg, &val))
+ break;
sprintf(buf, "%lld", val);
return buf;
@@ -2065,6 +2102,8 @@ process_fields(struct event_format *event, struct print_flag_sym **list, char **
memset(field, 0, sizeof(field));
value = arg_eval(arg);
+ if (value == NULL)
+ goto out_free;
field->value = strdup(value);
free_arg(arg);
@@ -2076,6 +2115,8 @@ process_fields(struct event_format *event, struct print_flag_sym **list, char **
goto out_free;
value = arg_eval(arg);
+ if (value == NULL)
+ goto out_free;
field->str = strdup(value);
free_arg(arg);
arg = NULL;
--
1.7.3.1
next prev parent reply other threads:[~2011-07-16 3:00 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-16 3:00 [PATCH 1/4] trace-cmd: Add parse error checking target Vaibhav Nagarnaik
2011-07-16 3:00 ` Vaibhav Nagarnaik [this message]
2011-07-25 14:03 ` [PATCH 2/4] trace-cmd: Handle invalid opcode parsing gracefully Steven Rostedt
2012-05-21 9:39 ` [tip:perf/core] parse-events: " tip-bot for Vaibhav Nagarnaik
2011-07-16 3:00 ` [PATCH 3/4] trace-cmd: Handle opcode parsing error Vaibhav Nagarnaik
2011-07-25 14:01 ` Steven Rostedt
2011-07-25 18:06 ` Vaibhav Nagarnaik
2011-07-25 18:40 ` Vaibhav Nagarnaik
2012-05-21 9:39 ` [tip:perf/core] parse-events: " tip-bot for Vaibhav Nagarnaik
2011-07-16 3:00 ` [PATCH 4/4] trace-cmd: Support '+' opcode in print format Vaibhav Nagarnaik
2011-07-25 14:02 ` Steven Rostedt
2012-05-21 9:41 ` [tip:perf/core] parse-events: " tip-bot for Vaibhav Nagarnaik
2011-07-25 13:32 ` [PATCH 1/4] trace-cmd: Add parse error checking target Steven Rostedt
2011-07-25 18:06 ` Vaibhav Nagarnaik
2011-07-25 18:39 ` [PATCH v2 " Vaibhav Nagarnaik
2011-07-29 14:19 ` Steven Rostedt
2011-07-29 17:41 ` Vaibhav Nagarnaik
2011-07-29 17:53 ` Steven Rostedt
2011-07-29 19:07 ` Vaibhav Nagarnaik
2011-07-30 1:33 ` Steven Rostedt
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=1310785241-3799-2-git-send-email-vnagarnaik@google.com \
--to=vnagarnaik@google.com \
--cc=dhsharp@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mrubin@google.com \
--cc=rostedt@goodmis.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
all inboxes | Powered by JetHome®