| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Mon, 13 Jun 2022 20:48:49 +0200
From: "Srivatsa S. Bhat" <srivatsa@...il.mit.edu>
To: Peter Zijlstra <peterz@...radead.org>
Cc: rth@...ddle.net, ink@...assic.park.msu.ru, mattst88@...il.com,
vgupta@...nel.org, linux@...linux.org.uk,
ulli.kroll@...glemail.com, linus.walleij@...aro.org,
shawnguo@...nel.org, Sascha Hauer <s.hauer@...gutronix.de>,
kernel@...gutronix.de, festevam@...il.com, linux-imx@....com,
tony@...mide.com, khilman@...nel.org, catalin.marinas@....com,
will@...nel.org, guoren@...nel.org, bcain@...cinc.com,
chenhuacai@...nel.org, kernel@...0n.name, geert@...ux-m68k.org,
sammy@...my.net, monstr@...str.eu, tsbogend@...ha.franken.de,
dinguyen@...nel.org, jonas@...thpole.se,
stefan.kristiansson@...nalahti.fi, shorne@...il.com,
James.Bottomley@...senPartnership.com, deller@....de,
mpe@...erman.id.au, benh@...nel.crashing.org, paulus@...ba.org,
paul.walmsley@...ive.com, palmer@...belt.com,
aou@...s.berkeley.edu, hca@...ux.ibm.com, gor@...ux.ibm.com,
agordeev@...ux.ibm.com, borntraeger@...ux.ibm.com,
svens@...ux.ibm.com, ysato@...rs.sourceforge.jp, dalias@...c.org,
davem@...emloft.net, richard@....at,
anton.ivanov@...bridgegreys.com, johannes@...solutions.net,
tglx@...utronix.de, mingo@...hat.com, bp@...en8.de,
dave.hansen@...ux.intel.com, x86@...nel.org, hpa@...or.com,
acme@...nel.org, mark.rutland@....com,
alexander.shishkin@...ux.intel.com, jolsa@...nel.org,
namhyung@...nel.org, jgross@...e.com, amakhalov@...are.com,
pv-drivers@...are.com, boris.ostrovsky@...cle.com,
chris@...kel.net, jcmvbkbc@...il.com, rafael@...nel.org,
lenb@...nel.org, pavel@....cz, gregkh@...uxfoundation.org,
mturquette@...libre.com, sboyd@...nel.org,
daniel.lezcano@...aro.org, lpieralisi@...nel.org,
sudeep.holla@....com, agross@...nel.org,
bjorn.andersson@...aro.org, anup@...infault.org,
thierry.reding@...il.com, jonathanh@...dia.com,
jacob.jun.pan@...ux.intel.com, Arnd Bergmann <arnd@...db.de>,
yury.norov@...il.com, andriy.shevchenko@...ux.intel.com,
linux@...musvillemoes.dk, rostedt@...dmis.org, pmladek@...e.com,
senozhatsky@...omium.org, john.ogness@...utronix.de,
paulmck@...nel.org, frederic@...nel.org, quic_neeraju@...cinc.com,
josh@...htriplett.org, mathieu.desnoyers@...icios.com,
jiangshanlai@...il.com, joel@...lfernandes.org,
juri.lelli@...hat.com, vincent.guittot@...aro.org,
dietmar.eggemann@....com, bsegall@...gle.com, mgorman@...e.de,
bristot@...hat.com, vschneid@...hat.com, jpoimboe@...nel.org,
linux-alpha@...r.kernel.org, linux-kernel@...r.kernel.org,
linux-snps-arc@...ts.infradead.org,
linux-arm-kernel@...ts.infradead.org, linux-omap@...r.kernel.org,
linux-csky@...r.kernel.org, linux-hexagon@...r.kernel.org,
linux-ia64@...r.kernel.org, linux-m68k@...ts.linux-m68k.org,
linux-mips@...r.kernel.org, openrisc@...ts.librecores.org,
linux-parisc@...r.kernel.org, linuxppc-dev@...ts.ozlabs.org,
linux-riscv@...ts.infradead.org, linux-s390@...r.kernel.org,
linux-sh@...r.kernel.org, sparclinux@...r.kernel.org,
linux-um@...ts.infradead.org, linux-perf-users@...r.kernel.org,
virtualization@...ts.linux-foundation.org,
xen-devel@...ts.xenproject.org, linux-xtensa@...ux-xtensa.org,
linux-acpi@...r.kernel.org, linux-pm@...r.kernel.org,
linux-clk@...r.kernel.org, linux-arm-msm@...r.kernel.org,
linux-tegra@...r.kernel.org, linux-arch@...r.kernel.org,
rcu@...r.kernel.org
Subject: Re: [PATCH 29/36] cpuidle,xenpv: Make more PARAVIRT_XXL noinstr clean
On 6/8/22 4:27 PM, Peter Zijlstra wrote:
> vmlinux.o: warning: objtool: acpi_idle_enter_s2idle+0xde: call to wbinvd() leaves .noinstr.text section
> vmlinux.o: warning: objtool: default_idle+0x4: call to arch_safe_halt() leaves .noinstr.text section
> vmlinux.o: warning: objtool: xen_safe_halt+0xa: call to HYPERVISOR_sched_op.constprop.0() leaves .noinstr.text section
>
> Signed-off-by: Peter Zijlstra (Intel) <peterz@...radead.org>
Reviewed-by: Srivatsa S. Bhat (VMware) <srivatsa@...il.mit.edu>
Regards,
Srivatsa
VMware Photon OS
> ---
> arch/x86/include/asm/paravirt.h | 6 ++++--
> arch/x86/include/asm/special_insns.h | 4 ++--
> arch/x86/include/asm/xen/hypercall.h | 2 +-
> arch/x86/kernel/paravirt.c | 14 ++++++++++++--
> arch/x86/xen/enlighten_pv.c | 2 +-
> arch/x86/xen/irq.c | 2 +-
> 6 files changed, 21 insertions(+), 9 deletions(-)
>
> --- a/arch/x86/include/asm/paravirt.h
> +++ b/arch/x86/include/asm/paravirt.h
> @@ -168,7 +168,7 @@ static inline void __write_cr4(unsigned
> PVOP_VCALL1(cpu.write_cr4, x);
> }
>
> -static inline void arch_safe_halt(void)
> +static __always_inline void arch_safe_halt(void)
> {
> PVOP_VCALL0(irq.safe_halt);
> }
> @@ -178,7 +178,9 @@ static inline void halt(void)
> PVOP_VCALL0(irq.halt);
> }
>
> -static inline void wbinvd(void)
> +extern noinstr void pv_native_wbinvd(void);
> +
> +static __always_inline void wbinvd(void)
> {
> PVOP_ALT_VCALL0(cpu.wbinvd, "wbinvd", ALT_NOT(X86_FEATURE_XENPV));
> }
> --- a/arch/x86/include/asm/special_insns.h
> +++ b/arch/x86/include/asm/special_insns.h
> @@ -115,7 +115,7 @@ static inline void wrpkru(u32 pkru)
> }
> #endif
>
> -static inline void native_wbinvd(void)
> +static __always_inline void native_wbinvd(void)
> {
> asm volatile("wbinvd": : :"memory");
> }
> @@ -179,7 +179,7 @@ static inline void __write_cr4(unsigned
> native_write_cr4(x);
> }
>
> -static inline void wbinvd(void)
> +static __always_inline void wbinvd(void)
> {
> native_wbinvd();
> }
> --- a/arch/x86/include/asm/xen/hypercall.h
> +++ b/arch/x86/include/asm/xen/hypercall.h
> @@ -382,7 +382,7 @@ MULTI_stack_switch(struct multicall_entr
> }
> #endif
>
> -static inline int
> +static __always_inline int
> HYPERVISOR_sched_op(int cmd, void *arg)
> {
> return _hypercall2(int, sched_op, cmd, arg);
> --- a/arch/x86/kernel/paravirt.c
> +++ b/arch/x86/kernel/paravirt.c
> @@ -233,6 +233,11 @@ static noinstr void pv_native_set_debugr
> native_set_debugreg(regno, val);
> }
>
> +noinstr void pv_native_wbinvd(void)
> +{
> + native_wbinvd();
> +}
> +
> static noinstr void pv_native_irq_enable(void)
> {
> native_irq_enable();
> @@ -242,6 +247,11 @@ static noinstr void pv_native_irq_disabl
> {
> native_irq_disable();
> }
> +
> +static noinstr void pv_native_safe_halt(void)
> +{
> + native_safe_halt();
> +}
> #endif
>
> enum paravirt_lazy_mode paravirt_get_lazy_mode(void)
> @@ -273,7 +283,7 @@ struct paravirt_patch_template pv_ops =
> .cpu.read_cr0 = native_read_cr0,
> .cpu.write_cr0 = native_write_cr0,
> .cpu.write_cr4 = native_write_cr4,
> - .cpu.wbinvd = native_wbinvd,
> + .cpu.wbinvd = pv_native_wbinvd,
> .cpu.read_msr = native_read_msr,
> .cpu.write_msr = native_write_msr,
> .cpu.read_msr_safe = native_read_msr_safe,
> @@ -307,7 +317,7 @@ struct paravirt_patch_template pv_ops =
> .irq.save_fl = __PV_IS_CALLEE_SAVE(native_save_fl),
> .irq.irq_disable = __PV_IS_CALLEE_SAVE(pv_native_irq_disable),
> .irq.irq_enable = __PV_IS_CALLEE_SAVE(pv_native_irq_enable),
> - .irq.safe_halt = native_safe_halt,
> + .irq.safe_halt = pv_native_safe_halt,
> .irq.halt = native_halt,
> #endif /* CONFIG_PARAVIRT_XXL */
>
> --- a/arch/x86/xen/enlighten_pv.c
> +++ b/arch/x86/xen/enlighten_pv.c
> @@ -1019,7 +1019,7 @@ static const typeof(pv_ops) xen_cpu_ops
>
> .write_cr4 = xen_write_cr4,
>
> - .wbinvd = native_wbinvd,
> + .wbinvd = pv_native_wbinvd,
>
> .read_msr = xen_read_msr,
> .write_msr = xen_write_msr,
> --- a/arch/x86/xen/irq.c
> +++ b/arch/x86/xen/irq.c
> @@ -24,7 +24,7 @@ noinstr void xen_force_evtchn_callback(v
> (void)HYPERVISOR_xen_version(0, NULL);
> }
>
> -static void xen_safe_halt(void)
> +static noinstr void xen_safe_halt(void)
> {
> /* Blocking includes an implicit local_irq_enable(). */
> if (HYPERVISOR_sched_op(SCHEDOP_block, NULL) != 0)
>
>
Powered by blists - more mailing lists