From: Nathan Chancellor <nathan@kernel.org> To: Marc Zyngier <maz@kernel.org> Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel-team@android.com, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Mark Rutland <mark.rutland@arm.com>, Daniel Lezcano <daniel.lezcano@linaro.org>, Sami Tolvanen <samitolvanen@google.com>, Nick Desaulniers <ndesaulniers@google.com> Subject: Re: [PATCH] clocksource/drivers/arm_arch_timer: Force inlining of erratum_set_next_event_generic() Date: Wed, 17 Nov 2021 12:24:43 -0700 [thread overview] Message-ID: <YZVW+/4nbDtcU85h@archlinux-ax161> (raw) In-Reply-To: <20211117113532.3895208-1-maz@kernel.org> On Wed, Nov 17, 2021 at 11:35:32AM +0000, Marc Zyngier wrote: > With some specific kernel configuration and Clang, the kernel fails > to like with something like: Specifically, CONFIG_CFI_CLANG=y from what I could tell from looking into this: https://github.com/ClangBuiltLinux/linux/issues/1503 > ld.lld: error: undefined symbol: __compiletime_assert_200 > >>> referenced by arch_timer.h:156 (./arch/arm64/include/asm/arch_timer.h:156) > >>> clocksource/arm_arch_timer.o:(erratum_set_next_event_generic) in archive drivers/built-in.a > > ld.lld: error: undefined symbol: __compiletime_assert_197 > >>> referenced by arch_timer.h:133 (./arch/arm64/include/asm/arch_timer.h:133) > >>> clocksource/arm_arch_timer.o:(erratum_set_next_event_generic) in archive drivers/built-in.a > make: *** [Makefile:1161: vmlinux] Error 1 > > These are due to the BUILD_BUG() macros contained in the low-level > accessors (arch_timer_reg_{write,read}_cp15) being emitted, as the > access type wasn't known at compile time. > > Fix this by making erratum_set_next_event_generic() __force_inline, > resulting in the 'access' parameter to be resolved at compile time, > similarly to what is already done for set_next_event(). > > Fixes: 4775bc63f880 ("Add build-time guards for unhandled register accesses") It looks like the prefix was removed? Shouldn't it be: Fixes: 4775bc63f880 ("clocksource/arm_arch_timer: Add build-time guards for unhandled register accesses") > Reported-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Signed-off-by: Marc Zyngier <maz@kernel.org> > Cc: Mark Rutland <mark.rutland@arm.com> > Cc: Daniel Lezcano <daniel.lezcano@linaro.org> > Cc: Sami Tolvanen <samitolvanen@google.com> > Cc: Nick Desaulniers <ndesaulniers@google.com> Reviewed-by: Nathan Chancellor <nathan@kernel.org> Tested-by: Nathan Chancellor <nathan@kernel.org> > --- > drivers/clocksource/arm_arch_timer.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c > index 9a04eacc4412..1ecd52f903b8 100644 > --- a/drivers/clocksource/arm_arch_timer.c > +++ b/drivers/clocksource/arm_arch_timer.c > @@ -394,8 +394,13 @@ EXPORT_SYMBOL_GPL(timer_unstable_counter_workaround); > > static atomic_t timer_unstable_counter_workaround_in_use = ATOMIC_INIT(0); > > -static void erratum_set_next_event_generic(const int access, unsigned long evt, > - struct clock_event_device *clk) > +/* > + * Force the inlining of this function so that the register accesses > + * can be themselves correctly inlined. > + */ > +static __always_inline > +void erratum_set_next_event_generic(const int access, unsigned long evt, > + struct clock_event_device *clk) > { > unsigned long ctrl; > u64 cval; > -- > 2.30.2 >
WARNING: multiple messages have this Message-ID (diff)
From: Nathan Chancellor <nathan@kernel.org> To: Marc Zyngier <maz@kernel.org> Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kernel-team@android.com, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, Mark Rutland <mark.rutland@arm.com>, Daniel Lezcano <daniel.lezcano@linaro.org>, Sami Tolvanen <samitolvanen@google.com>, Nick Desaulniers <ndesaulniers@google.com> Subject: Re: [PATCH] clocksource/drivers/arm_arch_timer: Force inlining of erratum_set_next_event_generic() Date: Wed, 17 Nov 2021 12:24:43 -0700 [thread overview] Message-ID: <YZVW+/4nbDtcU85h@archlinux-ax161> (raw) In-Reply-To: <20211117113532.3895208-1-maz@kernel.org> On Wed, Nov 17, 2021 at 11:35:32AM +0000, Marc Zyngier wrote: > With some specific kernel configuration and Clang, the kernel fails > to like with something like: Specifically, CONFIG_CFI_CLANG=y from what I could tell from looking into this: https://github.com/ClangBuiltLinux/linux/issues/1503 > ld.lld: error: undefined symbol: __compiletime_assert_200 > >>> referenced by arch_timer.h:156 (./arch/arm64/include/asm/arch_timer.h:156) > >>> clocksource/arm_arch_timer.o:(erratum_set_next_event_generic) in archive drivers/built-in.a > > ld.lld: error: undefined symbol: __compiletime_assert_197 > >>> referenced by arch_timer.h:133 (./arch/arm64/include/asm/arch_timer.h:133) > >>> clocksource/arm_arch_timer.o:(erratum_set_next_event_generic) in archive drivers/built-in.a > make: *** [Makefile:1161: vmlinux] Error 1 > > These are due to the BUILD_BUG() macros contained in the low-level > accessors (arch_timer_reg_{write,read}_cp15) being emitted, as the > access type wasn't known at compile time. > > Fix this by making erratum_set_next_event_generic() __force_inline, > resulting in the 'access' parameter to be resolved at compile time, > similarly to what is already done for set_next_event(). > > Fixes: 4775bc63f880 ("Add build-time guards for unhandled register accesses") It looks like the prefix was removed? Shouldn't it be: Fixes: 4775bc63f880 ("clocksource/arm_arch_timer: Add build-time guards for unhandled register accesses") > Reported-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Signed-off-by: Marc Zyngier <maz@kernel.org> > Cc: Mark Rutland <mark.rutland@arm.com> > Cc: Daniel Lezcano <daniel.lezcano@linaro.org> > Cc: Sami Tolvanen <samitolvanen@google.com> > Cc: Nick Desaulniers <ndesaulniers@google.com> Reviewed-by: Nathan Chancellor <nathan@kernel.org> Tested-by: Nathan Chancellor <nathan@kernel.org> > --- > drivers/clocksource/arm_arch_timer.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c > index 9a04eacc4412..1ecd52f903b8 100644 > --- a/drivers/clocksource/arm_arch_timer.c > +++ b/drivers/clocksource/arm_arch_timer.c > @@ -394,8 +394,13 @@ EXPORT_SYMBOL_GPL(timer_unstable_counter_workaround); > > static atomic_t timer_unstable_counter_workaround_in_use = ATOMIC_INIT(0); > > -static void erratum_set_next_event_generic(const int access, unsigned long evt, > - struct clock_event_device *clk) > +/* > + * Force the inlining of this function so that the register accesses > + * can be themselves correctly inlined. > + */ > +static __always_inline > +void erratum_set_next_event_generic(const int access, unsigned long evt, > + struct clock_event_device *clk) > { > unsigned long ctrl; > u64 cval; > -- > 2.30.2 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-11-17 19:24 UTC|newest] Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-11-17 11:35 [PATCH] clocksource/drivers/arm_arch_timer: Force inlining of erratum_set_next_event_generic() Marc Zyngier 2021-11-17 11:35 ` Marc Zyngier 2021-11-17 16:40 ` Sami Tolvanen 2021-11-17 16:40 ` Sami Tolvanen 2021-11-17 19:24 ` Nathan Chancellor [this message] 2021-11-17 19:24 ` Nathan Chancellor 2021-12-11 13:05 ` [tip: timers/urgent] " tip-bot2 for Marc Zyngier
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=YZVW+/4nbDtcU85h@archlinux-ax161 \ --to=nathan@kernel.org \ --cc=daniel.lezcano@linaro.org \ --cc=gregkh@linuxfoundation.org \ --cc=kernel-team@android.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mark.rutland@arm.com \ --cc=maz@kernel.org \ --cc=ndesaulniers@google.com \ --cc=samitolvanen@google.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: 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.