From: Peter Zijlstra <peterz@infradead.org>
To: bigeasy@linutronix.de
Cc: mark.rutland@arm.com, maz@kernel.org, catalin.marinas@arm.com,
will@kernel.org, chenhuacai@kernel.org, kernel@xen0n.name,
hca@linux.ibm.com, gor@linux.ibm.com, agordeev@linux.ibm.com,
borntraeger@linux.ibm.com, svens@linux.ibm.com,
pbonzini@redhat.com, wanpengli@tencent.com, vkuznets@redhat.com,
tglx@linutronix.de, mingo@redhat.com, bp@alien8.de,
dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com,
jgross@suse.com, boris.ostrovsky@oracle.com,
daniel.lezcano@linaro.org, kys@microsoft.com,
haiyangz@microsoft.com, wei.liu@kernel.org, decui@microsoft.com,
rafael@kernel.org, peterz@infradead.org, longman@redhat.com,
boqun.feng@gmail.com, pmladek@suse.com, senozhatsky@chromium.org,
rostedt@goodmis.org, john.ogness@linutronix.de,
juri.lelli@redhat.com, vincent.guittot@linaro.org,
dietmar.eggemann@arm.com, bsegall@google.com, mgorman@suse.de,
bristot@redhat.com, vschneid@redhat.com, jstultz@google.com,
sboyd@kernel.org, linux-kernel@vger.kernel.org,
loongarch@lists.linux.dev, linux-s390@vger.kernel.org,
kvm@vger.kernel.org, linux-hyperv@vger.kernel.org,
linux-pm@vger.kernel.org
Subject: [RFC][PATCH 0/9] local_clock() vs noinstr
Date: Mon, 08 May 2023 23:19:51 +0200 [thread overview]
Message-ID: <20230508211951.901961964@infradead.org> (raw)
Hi all!
A recent commit of mine marked local_clock() as noinstr.
776f22913b8e ("sched/clock: Make local_clock() noinstr")
Sadly both me and objtool missed the fact that this is subly broken; but
Sebastian tripped over it [*]:
| vmlinux.o: warning: objtool: native_sched_clock+0x97: call to preempt_schedule_notrace_thunk() leaves .noinstr.text section
| vmlinux.o: warning: objtool: kvm_clock_read+0x22: call to preempt_schedule_notrace_thunk() leaves .noinstr.text section
| vmlinux.o: warning: objtool: local_clock+0xb4: call to preempt_schedule_notrace_thunk() leaves .noinstr.text section
Specifically, local_clock() (and many of the sched_clock() implementation is
relies upon) use preempt_{dis,en}able_notrace() which obviously calls out to
schedule().
Now, noinstr code *should* never trigger this and already run in
non-preemptible code. Specifically entry code should have IRQs disabled while
__cpuidle code should have preemption disabled.
So while it is mostly harmless, I figured it wouldn't be too hard to clean this
up a little -- but that was ~10 patches. Anyway, here goes...
Compile tested only on x86_64/s390/arm64 -- I've just fed it to the
robots.
---
arch/arm64/include/asm/arch_timer.h | 8 +----
arch/arm64/include/asm/io.h | 12 +++----
arch/loongarch/include/asm/loongarch.h | 2 +-
arch/loongarch/kernel/time.c | 6 ++--
arch/s390/include/asm/timex.h | 13 +++++---
arch/s390/kernel/time.c | 11 ++++++-
arch/x86/kernel/kvmclock.c | 4 +--
arch/x86/kernel/tsc.c | 38 ++++++++++++++++-----
arch/x86/xen/time.c | 3 +-
drivers/clocksource/arm_arch_timer.c | 60 ++++++++++++++++++++++++++--------
drivers/clocksource/hyperv_timer.c | 4 +--
drivers/cpuidle/cpuidle.c | 8 ++---
drivers/cpuidle/poll_state.c | 4 +--
include/clocksource/hyperv_timer.h | 4 +--
include/linux/rbtree_latch.h | 2 +-
include/linux/sched/clock.h | 17 +++++++++-
include/linux/seqlock.h | 15 +++++----
kernel/printk/printk.c | 2 +-
kernel/sched/clock.c | 19 +++++++----
kernel/time/sched_clock.c | 24 ++++++++++----
kernel/time/timekeeping.c | 4 +--
21 files changed, 176 insertions(+), 84 deletions(-)
* https://lkml.kernel.org/r/20230309072724.3F6zRkvw@linutronix.de
TL;DR: PREEMPT_DYNAMIC=n PREEMPT=y DEBUG_ENTRY=y
next reply other threads:[~2023-05-08 21:35 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-08 21:19 Peter Zijlstra [this message]
2023-05-08 21:19 ` [RFC][PATCH 1/9] seqlock/latch: Provide raw_read_seqcount_latch_retry() Peter Zijlstra
2023-05-09 8:13 ` Thomas Gleixner
2023-05-10 7:58 ` Petr Mladek
2023-05-08 21:19 ` [RFC][PATCH 2/9] time/sched_clock: Provide sched_clock_noinstr() Peter Zijlstra
2023-05-08 21:19 ` [RFC][PATCH 3/9] arm64/io: Always inline all of __raw_{read,write}[bwlq]() Peter Zijlstra
2023-05-09 14:51 ` Mark Rutland
2023-05-08 21:19 ` [RFC][PATCH 4/9] arm64/arch_timer: Provide noinstr sched_clock_read() functions Peter Zijlstra
2023-05-08 21:19 ` [RFC][PATCH 5/9] loongarch: Provide noinstr sched_clock_read() Peter Zijlstra
2023-05-08 21:19 ` [RFC][PATCH 6/9] s390/time: Provide sched_clock_noinstr() Peter Zijlstra
2023-05-09 6:13 ` Heiko Carstens
2023-05-09 6:42 ` Peter Zijlstra
2023-05-08 21:19 ` [RFC][PATCH 7/9] x86/tsc: " Peter Zijlstra
2023-05-08 21:44 ` Peter Zijlstra
2023-05-08 23:30 ` Wei Liu
2023-05-11 20:23 ` Peter Zijlstra
2023-05-11 23:11 ` Michael Kelley (LINUX)
2023-05-12 6:00 ` Peter Zijlstra
2023-05-17 2:26 ` Michael Kelley (LINUX)
2023-05-17 11:13 ` Peter Zijlstra
2023-05-08 21:19 ` [RFC][PATCH 8/9] sched/clock: Provide local_clock_noinstr() Peter Zijlstra
2023-05-08 21:20 ` [RFC][PATCH 9/9] cpuidle: Use local_clock_noinstr() Peter Zijlstra
2023-05-09 16:18 ` Rafael J. Wysocki
2023-05-09 19:02 ` Peter Zijlstra
2023-05-10 13:43 ` [RFC][PATCH 0/9] local_clock() vs noinstr Sebastian Andrzej Siewior
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=20230508211951.901961964@infradead.org \
--to=peterz@infradead.org \
--cc=agordeev@linux.ibm.com \
--cc=bigeasy@linutronix.de \
--cc=boqun.feng@gmail.com \
--cc=boris.ostrovsky@oracle.com \
--cc=borntraeger@linux.ibm.com \
--cc=bp@alien8.de \
--cc=bristot@redhat.com \
--cc=bsegall@google.com \
--cc=catalin.marinas@arm.com \
--cc=chenhuacai@kernel.org \
--cc=daniel.lezcano@linaro.org \
--cc=dave.hansen@linux.intel.com \
--cc=decui@microsoft.com \
--cc=dietmar.eggemann@arm.com \
--cc=gor@linux.ibm.com \
--cc=haiyangz@microsoft.com \
--cc=hca@linux.ibm.com \
--cc=hpa@zytor.com \
--cc=jgross@suse.com \
--cc=john.ogness@linutronix.de \
--cc=jstultz@google.com \
--cc=juri.lelli@redhat.com \
--cc=kernel@xen0n.name \
--cc=kvm@vger.kernel.org \
--cc=kys@microsoft.com \
--cc=linux-hyperv@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=longman@redhat.com \
--cc=loongarch@lists.linux.dev \
--cc=mark.rutland@arm.com \
--cc=maz@kernel.org \
--cc=mgorman@suse.de \
--cc=mingo@redhat.com \
--cc=pbonzini@redhat.com \
--cc=pmladek@suse.com \
--cc=rafael@kernel.org \
--cc=rostedt@goodmis.org \
--cc=sboyd@kernel.org \
--cc=senozhatsky@chromium.org \
--cc=svens@linux.ibm.com \
--cc=tglx@linutronix.de \
--cc=vincent.guittot@linaro.org \
--cc=vkuznets@redhat.com \
--cc=vschneid@redhat.com \
--cc=wanpengli@tencent.com \
--cc=wei.liu@kernel.org \
--cc=will@kernel.org \
--cc=x86@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;
as well as URLs for NNTP newsgroup(s).