From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0A118C433EF for ; Mon, 13 Jun 2022 18:50:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 818A160BA1; Mon, 13 Jun 2022 18:50:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dl1IDs8-T6gw; Mon, 13 Jun 2022 18:50:12 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [IPv6:2605:bc80:3010:104::8cd3:938]) by smtp3.osuosl.org (Postfix) with ESMTPS id 0C9A560E21; Mon, 13 Jun 2022 18:50:12 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id CAA58C0032; Mon, 13 Jun 2022 18:50:11 +0000 (UTC) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) by lists.linuxfoundation.org (Postfix) with ESMTP id 8E83BC002D for ; Mon, 13 Jun 2022 18:50:10 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 5EEF660B2B for ; Mon, 13 Jun 2022 18:50:10 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YgJZ0zord076 for ; Mon, 13 Jun 2022 18:50:09 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.8.0 Received: from outgoing-stata.csail.mit.edu (outgoing-stata.csail.mit.edu [128.30.2.210]) by smtp3.osuosl.org (Postfix) with ESMTPS id 5A1C060BA1 for ; Mon, 13 Jun 2022 18:50:09 +0000 (UTC) Received: from [77.23.249.31] (helo=srivatsab-a02.vmware.com) by outgoing-stata.csail.mit.edu with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1o0p7j-0002lx-0j; Mon, 13 Jun 2022 14:49:15 -0400 Subject: Re: [PATCH 29/36] cpuidle, xenpv: Make more PARAVIRT_XXL noinstr clean To: Peter Zijlstra References: <20220608142723.103523089@infradead.org> <20220608144517.759631860@infradead.org> From: "Srivatsa S. Bhat" Message-ID: <510b9b68-7d53-7d4d-5a05-37fbd199eb4b@csail.mit.edu> Date: Mon, 13 Jun 2022 20:48:49 +0200 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 MIME-Version: 1.0 In-Reply-To: <20220608144517.759631860@infradead.org> Content-Language: en-US Cc: juri.lelli@redhat.com, rafael@kernel.org, benh@kernel.crashing.org, linus.walleij@linaro.org, bsegall@google.com, guoren@kernel.org, pavel@ucw.cz, agordeev@linux.ibm.com, linux-clk@vger.kernel.org, linux-arch@vger.kernel.org, vincent.guittot@linaro.org, mpe@ellerman.id.au, chenhuacai@kernel.org, linux-acpi@vger.kernel.org, agross@kernel.org, geert@linux-m68k.org, linux-imx@nxp.com, catalin.marinas@arm.com, xen-devel@lists.xenproject.org, mattst88@gmail.com, mturquette@baylibre.com, sammy@sammy.net, pmladek@suse.com, linux-pm@vger.kernel.org, jiangshanlai@gmail.com, Sascha Hauer , linux-um@lists.infradead.org, acme@kernel.org, tglx@linutronix.de, linux-omap@vger.kernel.org, dietmar.eggemann@arm.com, rth@twiddle.net, gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, senozhatsky@chromium.org, svens@linux.ibm.com, jolsa@kernel.org, paulus@samba.org, mark.rutland@arm.com, linux-ia64@vger.kernel.org, dave.hansen@linux.intel.com, virtualization@lists.linux-foundation.org, James.Bottomley@HansenPartnership.com, jcmvbkbc@gmail.com, thierry.reding@gmail.com, kernel@xen0n.name, quic_neeraju@quicinc.com, linux-s390@vger.kernel.org, vschneid@redhat.com, john.ogness@linutronix.de, ysato@users.sourceforge.jp, linux-sh@vger.kernel.org, festevam@gmail.com, deller@gmx.de, daniel.lezcano@linaro.org, jonathanh@nvidia.com, mathieu.desnoyers@efficios.com, frederic@kernel.org, lenb@kernel.org, linux-xtensa@linux-xtensa.org, kernel@pengutronix.de, gor@linux.ibm.com, linux-arm-msm@vger.kernel.org, linux-alpha@vger.kernel.org, linux-m68k@lists.linux-m68k.org, shorne@gmail.com, linux-arm-kernel@lists.infradead.org, chris@zankel.net, sboyd@kernel.org, dinguyen@kernel.org, bristot@redhat.com, alexander.shishkin@linux.intel.com, lpieralisi@kernel.org, linux@rasmusvillemoes.dk, joel@joelfernandes.org, will@kernel.org, boris.ostrovsky@oracle.com, khilman@kernel.org, linux-csky@vger.kernel.org, pv-drivers@vmware.com, linux-snps-arc@lists.infradead.org, mgorman@suse.de, jacob.jun.pan@linux.intel.com, Arnd Bergmann , ulli.kroll@googlemail.com, vgupta@kernel.org, josh@joshtriplett.org, rostedt@goodmis.org, rcu@vger.kernel.org, bp@alien8.de, bcain@quicinc.com, tsbogend@alpha.franken.de, linux-parisc@vger.kernel.org, sudeep.holla@arm.com, shawnguo@kernel.org, davem@davemloft.net, dalias@libc.org, tony@atomide.com, amakhalov@vmware.com, bjorn.andersson@linaro.org, hpa@zytor.com, sparclinux@vger.kernel.org, linux-hexagon@vger.kernel.org, linux-riscv@lists.infradead.org, anton.ivanov@cambridgegreys.com, jonas@southpole.se, yury.norov@gmail.com, richard@nod.at, x86@kernel.org, linux@armlinux.org.uk, mingo@redhat.com, aou@eecs.berkeley.edu, paulmck@kernel.org, hca@linux.ibm.com, stefan.kristiansson@saunalahti.fi, openrisc@lists.librecores.org, paul.walmsley@sifive.com, linux-tegra@vger.kernel.org, namhyung@kernel.org, andriy.shevchenko@linux.intel.com, jpoimboe@kernel.org, jgross@suse.com, monstr@monstr.eu, linux-mips@vger.kernel.org, palmer@dabbelt.com, anup@brainfault.org, ink@jurassic.park.msu.ru, johannes@sipsolutions.net, linuxppc-dev@lists.ozlabs.org X-BeenThere: virtualization@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Linux virtualization List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: virtualization-bounces@lists.linux-foundation.org Sender: "Virtualization" 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) Reviewed-by: Srivatsa S. Bhat (VMware) 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) > > _______________________________________________ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization