From: Masami Hiramatsu <mhiramat@kernel.org>
To: Tom Zanussi <zanussi@kernel.org>
Cc: rostedt@goodmis.org, tglx@linutronix.de, mhiramat@kernel.org,
namhyung@kernel.org, vedang.patel@intel.com,
bigeasy@linutronix.de, joel@joelfernandes.org,
mathieu.desnoyers@efficios.com, julia@ni.com,
linux-kernel@vger.kernel.org, linux-rt-users@vger.kernel.org
Subject: Re: [PATCH v8 20/22] tracing: Use hist trigger's var_ref array to destroy var_refs
Date: Sat, 15 Dec 2018 01:31:19 +0900 [thread overview]
Message-ID: <20181215013119.dc796fd4d2d21535adb4cf6c@kernel.org> (raw)
In-Reply-To: <4d6103ab7b4fdef81a82e2977b4005a26212a726.1544483273.git.tom.zanussi@linux.intel.com>
On Mon, 10 Dec 2018 18:01:34 -0600
Tom Zanussi <zanussi@kernel.org> wrote:
> From: Tom Zanussi <tom.zanussi@linux.intel.com>
>
> Since every var ref for a trigger has an entry in the var_ref[] array,
> use that to destroy the var_refs, instead of piecemeal via the field
> expressions.
>
> This allows us to avoid having to keep and treat differently separate
> lists for the action-related references, which future patches will
> remove.
I'm not so sure, but this seems a bugfix... if so, please move this at
the top of this series.
Thank you,
>
> Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
> ---
> kernel/trace/trace_events_hist.c | 24 +++++++++++++++++++-----
> 1 file changed, 19 insertions(+), 5 deletions(-)
>
> diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c
> index d07bb2d75e18..da4800c3f745 100644
> --- a/kernel/trace/trace_events_hist.c
> +++ b/kernel/trace/trace_events_hist.c
> @@ -2312,6 +2312,15 @@ static int contains_operator(char *str)
> return field_op;
> }
>
> +static void __destroy_hist_field(struct hist_field *hist_field)
> +{
> + kfree(hist_field->var.name);
> + kfree(hist_field->name);
> + kfree(hist_field->type);
> +
> + kfree(hist_field);
> +}
> +
> static void destroy_hist_field(struct hist_field *hist_field,
> unsigned int level)
> {
> @@ -2323,14 +2332,13 @@ static void destroy_hist_field(struct hist_field *hist_field,
> if (!hist_field)
> return;
>
> + if (hist_field->flags & HIST_FIELD_FL_VAR_REF)
> + return; /* var refs will be destroyed separately */
> +
> for (i = 0; i < HIST_FIELD_OPERANDS_MAX; i++)
> destroy_hist_field(hist_field->operands[i], level + 1);
>
> - kfree(hist_field->var.name);
> - kfree(hist_field->name);
> - kfree(hist_field->type);
> -
> - kfree(hist_field);
> + __destroy_hist_field(hist_field);
> }
>
> static struct hist_field *create_hist_field(struct hist_trigger_data *hist_data,
> @@ -2457,6 +2465,12 @@ static void destroy_hist_fields(struct hist_trigger_data *hist_data)
> hist_data->fields[i] = NULL;
> }
> }
> +
> + for (i = 0; i < hist_data->n_var_refs; i++) {
> + WARN_ON(!(hist_data->var_refs[i]->flags & HIST_FIELD_FL_VAR_REF));
> + __destroy_hist_field(hist_data->var_refs[i]);
> + hist_data->var_refs[i] = NULL;
> + }
> }
>
> static int init_var_ref(struct hist_field *ref_field,
> --
> 2.14.1
>
--
Masami Hiramatsu <mhiramat@kernel.org>
next prev parent reply other threads:[~2018-12-14 16:31 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-11 0:01 [PATCH v8 00/22] tracing: Hist trigger snapshot and onchange additions Tom Zanussi
2018-12-11 0:01 ` [PATCH v8 01/22] tracing: Refactor hist trigger action code Tom Zanussi
2018-12-11 0:01 ` [PATCH v8 02/22] tracing: Make hist trigger Documentation better reflect actions/handlers Tom Zanussi
2018-12-11 0:01 ` [PATCH v8 03/22] tracing: Add hist trigger handler.action documentation to README Tom Zanussi
2018-12-14 13:11 ` Masami Hiramatsu
2018-12-14 17:16 ` Tom Zanussi
2018-12-11 0:01 ` [PATCH v8 04/22] tracing: Split up onmatch action data Tom Zanussi
2018-12-11 0:01 ` [PATCH v8 05/22] tracing: Generalize hist trigger onmax and save action Tom Zanussi
2018-12-11 0:01 ` [PATCH v8 06/22] tracing: Add conditional snapshot Tom Zanussi
2018-12-11 0:01 ` [PATCH v8 07/22] tracing: Add hist trigger snapshot() action Tom Zanussi
2018-12-11 0:01 ` [PATCH v8 08/22] tracing: Add hist trigger snapshot() action Documentation Tom Zanussi
2018-12-11 0:01 ` [PATCH v8 09/22] tracing: Add hist trigger snapshot() action test case Tom Zanussi
2018-12-14 16:14 ` Masami Hiramatsu
2018-12-11 0:01 ` [PATCH v8 10/22] tracing: Add hist trigger onchange() handler Tom Zanussi
2018-12-14 16:09 ` Masami Hiramatsu
2018-12-11 0:01 ` [PATCH v8 11/22] tracing: Add hist trigger onchange() handler Documentation Tom Zanussi
2018-12-11 0:01 ` [PATCH v8 12/22] tracing: Add hist trigger onchange() handler test case Tom Zanussi
2018-12-14 16:18 ` Masami Hiramatsu
2018-12-14 17:17 ` Tom Zanussi
2018-12-11 0:01 ` [PATCH v8 13/22] tracing: Add alternative synthetic event trace action syntax Tom Zanussi
2018-12-11 0:01 ` [PATCH v8 14/22] tracing: Add alternative synthetic event trace action test case Tom Zanussi
2018-12-11 0:01 ` [PATCH v8 15/22] tracing: Add hist trigger action 'expected fail' " Tom Zanussi
2018-12-11 0:01 ` [PATCH v8 16/22] tracing: Add SPDX license GPL-2.0 license identifier to inter-event testcases Tom Zanussi
2018-12-11 0:01 ` [PATCH v8 17/22] tracing: Remove unnecessary hist trigger struct fields Tom Zanussi
2018-12-11 0:01 ` [PATCH v8 18/22] tracing: Use var_refs[] for hist trigger reference checking Tom Zanussi
2018-12-11 0:01 ` [PATCH v8 19/22] tracing: Remove open-coding of hist trigger var_ref management Tom Zanussi
2018-12-11 0:01 ` [PATCH v8 20/22] tracing: Use hist trigger's var_ref array to destroy var_refs Tom Zanussi
2018-12-14 16:31 ` Masami Hiramatsu [this message]
2018-12-14 17:29 ` Tom Zanussi
2018-12-15 6:50 ` Namhyung Kim
2018-12-15 21:01 ` Tom Zanussi
2018-12-11 0:01 ` [PATCH v8 21/22] tracing: Remove hist trigger synth_var_refs Tom Zanussi
2018-12-11 0:01 ` [PATCH v8 22/22] tracing: Add hist trigger comments for variable-related fields Tom Zanussi
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=20181215013119.dc796fd4d2d21535adb4cf6c@kernel.org \
--to=mhiramat@kernel.org \
--cc=bigeasy@linutronix.de \
--cc=joel@joelfernandes.org \
--cc=julia@ni.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-rt-users@vger.kernel.org \
--cc=mathieu.desnoyers@efficios.com \
--cc=namhyung@kernel.org \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
--cc=vedang.patel@intel.com \
--cc=zanussi@kernel.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