summaryrefslogtreecommitdiff
path: root/kernel/trace/trace_dynevent.c
diff options
context:
space:
mode:
authorTom Zanussi <zanussi@kernel.org>2020-01-31 15:55:34 -0600
committerSteven Rostedt (VMware) <rostedt@goodmis.org>2020-02-01 13:10:15 -0500
commit2b90927c77c973771cc658d639724d5b247a83eb (patch)
treecb8f7ed5df619a5b003ca5f5959c716145ac22d4 /kernel/trace/trace_dynevent.c
parente9260f6257efa6a6293507696e875b6494ee3744 (diff)
tracing: Use seq_buf for building dynevent_cmd string
The dynevent_cmd commands that build up the command string don't need to do that themselves - there's a seq_buf facility that does pretty much the same thing those command are doing manually, so use it instead. Link: http://lkml.kernel.org/r/eb8a6e835c964d0ab8a38cbf5ffa60746b54a465.1580506712.git.zanussi@kernel.org Reviewed-by: Masami Hiramatsu <mhiramat@kernel.org> Signed-off-by: Tom Zanussi <zanussi@kernel.org> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace/trace_dynevent.c')
-rw-r--r--kernel/trace/trace_dynevent.c48
1 files changed, 13 insertions, 35 deletions
diff --git a/kernel/trace/trace_dynevent.c b/kernel/trace/trace_dynevent.c
index 204275ec8d71..9f2e8520b748 100644
--- a/kernel/trace/trace_dynevent.c
+++ b/kernel/trace/trace_dynevent.c
@@ -247,8 +247,6 @@ int dynevent_arg_add(struct dynevent_cmd *cmd,
dynevent_check_arg_fn_t check_arg)
{
int ret = 0;
- int delta;
- char *q;
if (check_arg) {
ret = check_arg(arg);
@@ -256,14 +254,11 @@ int dynevent_arg_add(struct dynevent_cmd *cmd,
return ret;
}
- q = cmd->buf + (cmd->maxlen - cmd->remaining);
-
- delta = snprintf(q, cmd->remaining, " %s%c", arg->str, arg->separator);
- if (delta >= cmd->remaining) {
- pr_err("String is too long: %s\n", arg->str);
+ ret = seq_buf_printf(&cmd->seq, " %s%c", arg->str, arg->separator);
+ if (ret) {
+ pr_err("String is too long: %s%c\n", arg->str, arg->separator);
return -E2BIG;
}
- cmd->remaining -= delta;
return ret;
}
@@ -297,8 +292,6 @@ int dynevent_arg_pair_add(struct dynevent_cmd *cmd,
dynevent_check_arg_fn_t check_arg)
{
int ret = 0;
- int delta;
- char *q;
if (check_arg) {
ret = check_arg(arg_pair);
@@ -306,23 +299,15 @@ int dynevent_arg_pair_add(struct dynevent_cmd *cmd,
return ret;
}
- q = cmd->buf + (cmd->maxlen - cmd->remaining);
-
- delta = snprintf(q, cmd->remaining, " %s%c", arg_pair->lhs,
- arg_pair->operator);
- if (delta >= cmd->remaining) {
- pr_err("field string is too long: %s\n", arg_pair->lhs);
- return -E2BIG;
- }
- cmd->remaining -= delta; q += delta;
-
- delta = snprintf(q, cmd->remaining, "%s%c", arg_pair->rhs,
- arg_pair->separator);
- if (delta >= cmd->remaining) {
- pr_err("field string is too long: %s\n", arg_pair->rhs);
+ ret = seq_buf_printf(&cmd->seq, " %s%c%s%c", arg_pair->lhs,
+ arg_pair->operator, arg_pair->rhs,
+ arg_pair->separator);
+ if (ret) {
+ pr_err("field string is too long: %s%c%s%c\n", arg_pair->lhs,
+ arg_pair->operator, arg_pair->rhs,
+ arg_pair->separator);
return -E2BIG;
}
- cmd->remaining -= delta;
return ret;
}
@@ -340,17 +325,12 @@ int dynevent_arg_pair_add(struct dynevent_cmd *cmd,
int dynevent_str_add(struct dynevent_cmd *cmd, const char *str)
{
int ret = 0;
- int delta;
- char *q;
-
- q = cmd->buf + (cmd->maxlen - cmd->remaining);
- delta = snprintf(q, cmd->remaining, "%s", str);
- if (delta >= cmd->remaining) {
+ ret = seq_buf_puts(&cmd->seq, str);
+ if (ret) {
pr_err("String is too long: %s\n", str);
return -E2BIG;
}
- cmd->remaining -= delta;
return ret;
}
@@ -381,9 +361,7 @@ void dynevent_cmd_init(struct dynevent_cmd *cmd, char *buf, int maxlen,
{
memset(cmd, '\0', sizeof(*cmd));
- cmd->buf = buf;
- cmd->maxlen = maxlen;
- cmd->remaining = cmd->maxlen;
+ seq_buf_init(&cmd->seq, buf, maxlen);
cmd->type = type;
cmd->run_command = run_command;
}