From: Mark-PK Tsai <mark-pk.tsai@mediatek.com>
To: <oliver.sang@intel.com>, <rostedt@goodmis.org>
Cc: <linux-arm-kernel@lists.infradead.org>,
<linux-kernel@vger.kernel.org>,
<linux-mediatek@lists.infradead.org>, <lkp@intel.com>,
<lkp@lists.01.org>, <mark-pk.tsai@mediatek.com>,
<matthias.bgg@gmail.com>, <mingo@redhat.com>,
<yj.chiang@mediatek.com>
Subject: [PATCH] tracing: Avoid adding duplicated tracer options when update_tracer_options is running in parallel
Date: Wed, 23 Mar 2022 11:24:42 +0800 [thread overview]
Message-ID: <20220323032442.22082-1-mark-pk.tsai@mediatek.com> (raw)
In-Reply-To: <20220322133339.GA32582@xsang-OptiPlex-9020>
When update_tracer_options is running in parallel,
tr->tops might be updated before the trace_types list traversal.
Let update_tracer_options traverse the trace_types list safely in
kernel init time and avoid the tr->tops update before it finish.
Link: https://lore.kernel.org/lkml/20220322133339.GA32582@xsang-OptiPlex-9020/
Reported-by: kernel test robot <oliver.sang@intel.com>
Signed-off-by: Mark-PK Tsai <mark-pk.tsai@mediatek.com>
---
kernel/trace/trace.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index adb37e437a05..2974ae056068 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -6317,12 +6317,18 @@ static void tracing_set_nop(struct trace_array *tr)
tr->current_trace = &nop_trace;
}
+static bool tracer_options_updated;
+
static void add_tracer_options(struct trace_array *tr, struct tracer *t)
{
/* Only enable if the directory has been created already. */
if (!tr->dir)
return;
+ /* Only create trace option files after update_tracer_options finish */
+ if (!tracer_options_updated)
+ return;
+
create_trace_option_files(tr, t);
}
@@ -9133,6 +9139,7 @@ static void update_tracer_options(struct trace_array *tr)
{
mutex_lock(&trace_types_lock);
__update_tracer_options(tr);
+ tracer_options_updated = true;
mutex_unlock(&trace_types_lock);
}
--
2.18.0
next prev parent reply other threads:[~2022-03-23 3:24 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-16 15:16 [PATCH v2] tracing: make tracer_init_tracefs initcall asynchronous Mark-PK Tsai
2022-03-22 13:33 ` [tracing] d9a641b3f5: WARNING:at_kernel/trace/trace.c:#create_trace_option_files kernel test robot
2022-03-23 3:24 ` Mark-PK Tsai [this message]
2022-03-23 13:30 ` [PATCH] tracing: Avoid adding duplicated tracer options when update_tracer_options is running in parallel Steven Rostedt
2022-03-23 14:21 ` Mark-PK Tsai
2022-03-23 14:28 ` Steven Rostedt
2022-03-23 14:45 ` Mark-PK Tsai
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=20220323032442.22082-1-mark-pk.tsai@mediatek.com \
--to=mark-pk.tsai@mediatek.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=lkp@intel.com \
--cc=lkp@lists.01.org \
--cc=matthias.bgg@gmail.com \
--cc=mingo@redhat.com \
--cc=oliver.sang@intel.com \
--cc=rostedt@goodmis.org \
--cc=yj.chiang@mediatek.com \
/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®