From: Valentin Schneider <valentin.schneider@arm.com> To: linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, linuxppc-dev@lists.ozlabs.org, linux-kbuild@vger.kernel.org Cc: 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>, Michael Ellerman <mpe@ellerman.id.au>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, Paul Mackerras <paulus@samba.org>, Steven Rostedt <rostedt@goodmis.org>, Masahiro Yamada <masahiroy@kernel.org>, Michal Marek <michal.lkml@markovi.net>, Nick Desaulniers <ndesaulniers@google.com> Subject: [PATCH v2 5/5] ftrace: Use preemption model accessors for trace header printout Date: Wed, 10 Nov 2021 20:24:48 +0000 [thread overview] Message-ID: <20211110202448.4054153-6-valentin.schneider@arm.com> (raw) In-Reply-To: <20211110202448.4054153-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> --- 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..71f293569ed0 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 + is_preempt_none() ? "server" : + is_preempt_voluntary() ? "desktop" : + is_preempt_full() ? "preempt" : + is_preempt_rt() ? "preempt_rt" : "unknown", -#endif /* These are reserved for later use */ 0, 0, 0, 0); #ifdef CONFIG_SMP -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Valentin Schneider <valentin.schneider@arm.com> To: linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, linuxppc-dev@lists.ozlabs.org, linux-kbuild@vger.kernel.org Cc: Marco Elver <elver@google.com>, Michal Marek <michal.lkml@markovi.net>, Peter Zijlstra <peterz@infradead.org>, Frederic Weisbecker <frederic@kernel.org>, Mike Galbraith <efault@gmx.de>, Nick Desaulniers <ndesaulniers@google.com>, Steven Rostedt <rostedt@goodmis.org>, Paul Mackerras <paulus@samba.org>, Masahiro Yamada <masahiroy@kernel.org>, Ingo Molnar <mingo@kernel.org>, Dmitry Vyukov <dvyukov@google.com> Subject: [PATCH v2 5/5] ftrace: Use preemption model accessors for trace header printout Date: Wed, 10 Nov 2021 20:24:48 +0000 [thread overview] Message-ID: <20211110202448.4054153-6-valentin.schneider@arm.com> (raw) In-Reply-To: <20211110202448.4054153-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> --- 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..71f293569ed0 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 + is_preempt_none() ? "server" : + is_preempt_voluntary() ? "desktop" : + is_preempt_full() ? "preempt" : + is_preempt_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-10 20:25 UTC|newest] Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-11-10 20:24 [PATCH v2 0/5] preempt: PREEMPT vs PREEMPT_DYNAMIC configs fixup Valentin Schneider 2021-11-10 20:24 ` Valentin Schneider 2021-11-10 20:24 ` [PATCH v2 1/5] preempt: Restore preemption model selection configs Valentin Schneider 2021-11-10 20:24 ` Valentin Schneider 2021-11-11 8:58 ` Marco Elver 2021-11-11 8:58 ` Marco Elver 2021-11-11 12:22 ` [tip: sched/urgent] " tip-bot2 for Valentin Schneider 2021-11-10 20:24 ` [PATCH v2 2/5] preempt/dynamic: Introduce preempt mode accessors Valentin Schneider 2021-11-10 20:24 ` Valentin Schneider 2021-11-11 3:16 ` Mike Galbraith 2021-11-11 3:16 ` Mike Galbraith 2021-11-11 3:35 ` Mike Galbraith 2021-11-11 3:35 ` Mike Galbraith 2021-11-11 3:47 ` Mike Galbraith 2021-11-11 3:47 ` Mike Galbraith 2021-11-11 3:55 ` Mike Galbraith 2021-11-11 3:55 ` Mike Galbraith 2021-11-11 9:36 ` Marco Elver 2021-11-11 9:36 ` Marco Elver 2021-11-11 10:32 ` Mike Galbraith 2021-11-11 10:32 ` Mike Galbraith 2021-11-11 10:56 ` Valentin Schneider 2021-11-11 10:56 ` Valentin Schneider 2021-11-11 11:09 ` Mike Galbraith 2021-11-11 11:09 ` Mike Galbraith 2021-11-11 8:54 ` Marco Elver 2021-11-11 8:54 ` Marco Elver 2021-11-11 10:56 ` Valentin Schneider 2021-11-11 10:56 ` Valentin Schneider 2021-11-16 13:29 ` Christophe Leroy 2021-11-16 13:29 ` Christophe Leroy 2021-11-22 16:37 ` Valentin Schneider 2021-11-22 16:37 ` Valentin Schneider 2021-11-10 20:24 ` [PATCH v2 3/5] powerpc: Use preemption model accessors Valentin Schneider 2021-11-10 20:24 ` Valentin Schneider 2021-11-11 4:55 ` Michael Ellerman 2021-11-11 4:55 ` Michael Ellerman 2021-11-15 15:29 ` Valentin Schneider 2021-11-15 15:29 ` Valentin Schneider 2021-11-16 13:41 ` Christophe Leroy 2021-11-16 13:41 ` Christophe Leroy 2021-11-22 16:44 ` Valentin Schneider 2021-11-22 16:44 ` Valentin Schneider 2021-11-10 20:24 ` [PATCH v2 4/5] kscan: " Valentin Schneider 2021-11-10 20:24 ` Valentin Schneider 2021-11-11 9:11 ` Marco Elver 2021-11-11 9:11 ` Marco Elver 2021-11-11 9:39 ` Marco Elver 2021-11-11 9:39 ` Marco Elver 2021-11-11 10:57 ` Valentin Schneider 2021-11-11 10:57 ` Valentin Schneider 2021-11-10 20:24 ` Valentin Schneider [this message] 2021-11-10 20:24 ` [PATCH v2 5/5] ftrace: Use preemption model accessors for trace header printout Valentin Schneider 2021-11-10 20:36 ` Steven Rostedt 2021-11-10 20:36 ` Steven Rostedt
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=20211110202448.4054153-6-valentin.schneider@arm.com \ --to=valentin.schneider@arm.com \ --cc=benh@kernel.crashing.org \ --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=linuxppc-dev@lists.ozlabs.org \ --cc=masahiroy@kernel.org \ --cc=michal.lkml@markovi.net \ --cc=mingo@kernel.org \ --cc=mpe@ellerman.id.au \ --cc=ndesaulniers@google.com \ --cc=paulus@samba.org \ --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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.