From: Valentin Schneider <valentin.schneider@arm.com>
To: linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com,
linux-kbuild@vger.kernel.org
Cc: Steven Rostedt <rostedt@goodmis.org>,
Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@kernel.org>,
Frederic Weisbecker <frederic@kernel.org>,
Mike Galbraith <efault@gmx.de>, Marco Elver <elver@google.com>,
Dmitry Vyukov <dvyukov@google.com>,
Masahiro Yamada <masahiroy@kernel.org>,
Michal Marek <michal.lkml@markovi.net>,
Nick Desaulniers <ndesaulniers@google.com>
Subject: [PATCH v3 4/4] ftrace: Use preemption model accessors for trace header printout
Date: Fri, 12 Nov 2021 18:52:03 +0000 [thread overview]
Message-ID: <20211112185203.280040-5-valentin.schneider@arm.com> (raw)
In-Reply-To: <20211112185203.280040-1-valentin.schneider@arm.com>
Per PREEMPT_DYNAMIC, checking CONFIG_PREEMPT doesn't tell you the actual
preemption model of the live kernel. Use the newly-introduced accessors
instead.
Signed-off-by: Valentin Schneider <valentin.schneider@arm.com>
Reviewed-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
kernel/trace/trace.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 7896d30d90f7..749f66f96cee 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -4271,17 +4271,11 @@ print_trace_header(struct seq_file *m, struct trace_iterator *iter)
entries,
total,
buf->cpu,
-#if defined(CONFIG_PREEMPT_NONE)
- "server",
-#elif defined(CONFIG_PREEMPT_VOLUNTARY)
- "desktop",
-#elif defined(CONFIG_PREEMPT)
- "preempt",
-#elif defined(CONFIG_PREEMPT_RT)
- "preempt_rt",
-#else
+ preempt_model_none() ? "server" :
+ preempt_model_voluntary() ? "desktop" :
+ preempt_model_full() ? "preempt" :
+ preempt_model_rt() ? "preempt_rt" :
"unknown",
-#endif
/* These are reserved for later use */
0, 0, 0, 0);
#ifdef CONFIG_SMP
--
2.25.1
next prev parent reply other threads:[~2021-11-12 18:52 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-12 18:51 [PATCH v3 0/4] preempt: PREEMPT vs PREEMPT_DYNAMIC configs fixup Valentin Schneider
2021-11-12 18:52 ` [PATCH v3 1/4] preempt: Restore preemption model selection configs Valentin Schneider
2021-11-12 18:52 ` [PATCH v3 2/4] preempt/dynamic: Introduce preemption model accessors Valentin Schneider
2021-11-15 7:00 ` Marco Elver
2022-04-05 8:29 ` [tip: sched/core] " tip-bot2 for Valentin Schneider
2021-11-12 18:52 ` [PATCH v3 3/4] kcsan: Use " Valentin Schneider
2022-04-05 8:29 ` [tip: sched/core] " tip-bot2 for Valentin Schneider
2021-11-12 18:52 ` Valentin Schneider [this message]
2022-04-05 8:29 ` [tip: sched/core] ftrace: Use preemption model accessors for trace header printout tip-bot2 for Valentin Schneider
2022-03-14 22:42 ` [PATCH v3 0/4] preempt: PREEMPT vs PREEMPT_DYNAMIC configs fixup Frederic Weisbecker
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=20211112185203.280040-5-valentin.schneider@arm.com \
--to=valentin.schneider@arm.com \
--cc=dvyukov@google.com \
--cc=efault@gmx.de \
--cc=elver@google.com \
--cc=frederic@kernel.org \
--cc=kasan-dev@googlegroups.com \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=masahiroy@kernel.org \
--cc=michal.lkml@markovi.net \
--cc=mingo@kernel.org \
--cc=ndesaulniers@google.com \
--cc=peterz@infradead.org \
--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;
as well as URLs for NNTP newsgroup(s).