lkml.org 
[lkml]   [2021]   [Sep]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 089/122] tracing/boot: Fix a hist trigger dependency for boot time tracing
    Date
    From: Masami Hiramatsu <mhiramat@kernel.org>

    [ Upstream commit 6fe7c745f2acb73e4cc961d7f91125eef5a8861f ]

    Fixes a build error when CONFIG_HIST_TRIGGERS=n with boot-time
    tracing. Since the trigger_process_regex() is defined only
    when CONFIG_HIST_TRIGGERS=y, if it is disabled, the 'actions'
    event option also must be disabled.

    Link: https://lkml.kernel.org/r/162856123376.203126.582144262622247352.stgit@devnote2

    Fixes: 81a59555ff15 ("tracing/boot: Add per-event settings")
    Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
    Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    kernel/trace/trace_boot.c | 15 +++++++++------
    1 file changed, 9 insertions(+), 6 deletions(-)

    diff --git a/kernel/trace/trace_boot.c b/kernel/trace/trace_boot.c
    index a82f03f385f8..0996d59750ff 100644
    --- a/kernel/trace/trace_boot.c
    +++ b/kernel/trace/trace_boot.c
    @@ -205,12 +205,15 @@ trace_boot_init_one_event(struct trace_array *tr, struct xbc_node *gnode,
    pr_err("Failed to apply filter: %s\n", buf);
    }

    - xbc_node_for_each_array_value(enode, "actions", anode, p) {
    - if (strlcpy(buf, p, ARRAY_SIZE(buf)) >= ARRAY_SIZE(buf))
    - pr_err("action string is too long: %s\n", p);
    - else if (trigger_process_regex(file, buf) < 0)
    - pr_err("Failed to apply an action: %s\n", buf);
    - }
    + if (IS_ENABLED(CONFIG_HIST_TRIGGERS)) {
    + xbc_node_for_each_array_value(enode, "actions", anode, p) {
    + if (strlcpy(buf, p, ARRAY_SIZE(buf)) >= ARRAY_SIZE(buf))
    + pr_err("action string is too long: %s\n", p);
    + else if (trigger_process_regex(file, buf) < 0)
    + pr_err("Failed to apply an action: %s\n", buf);
    + }
    + } else if (xbc_node_find_value(enode, "actions", NULL))
    + pr_err("Failed to apply event actions because CONFIG_HIST_TRIGGERS is not set.\n");

    if (xbc_node_find_value(enode, "enable", NULL)) {
    if (trace_event_enable_disable(file, 1, 0) < 0)
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-09-20 21:07    [W:4.578 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site