similar to: [PATCH] arch: x86: kernel: fixed unused label issue

While chasing a regression I noticed we potentially patch the wrong code in native_patch(). If we do not select the native code sequence, we must use the default patcher, not fall-through the switch case. Fixes: 3cded4179481 ("x86/paravirt: Optimize native pv_lock_ops.vcpu_is_preempted()") Signed-off-by: Peter Zijlstra (Intel) <peterz at infradead.org> ---

? 2016/11/15 23:47, Peter Zijlstra ??: > On Wed, Nov 02, 2016 at 05:08:33AM -0400, Pan Xinhui wrote: >> diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h >> index 0f400c0..38c3bb7 100644 >> --- a/arch/x86/include/asm/paravirt_types.h >> +++ b/arch/x86/include/asm/paravirt_types.h >> @@ -310,6 +310,8 @@ struct pv_lock_ops {

Xen PV guests have been the only ones using it and now they don't. Signed-off-by: Boris Ostrovsky <boris.ostrovsky at oracle.com> --- arch/x86/entry/entry_32.S | 8 ++------ arch/x86/include/asm/paravirt.h | 7 ------- arch/x86/include/asm/paravirt_types.h | 9 --------- arch/x86/kernel/asm-offsets.c | 3 --- arch/x86/kernel/paravirt.c | 7

On Wed, Nov 02, 2016 at 05:08:33AM -0400, Pan Xinhui wrote: > diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h > index 0f400c0..38c3bb7 100644 > --- a/arch/x86/include/asm/paravirt_types.h > +++ b/arch/x86/include/asm/paravirt_types.h > @@ -310,6 +310,8 @@ struct pv_lock_ops { > > void (*wait)(u8 *ptr, u8 val); > void

On Wed, Nov 02, 2016 at 05:08:33AM -0400, Pan Xinhui wrote: > diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h > index 0f400c0..38c3bb7 100644 > --- a/arch/x86/include/asm/paravirt_types.h > +++ b/arch/x86/include/asm/paravirt_types.h > @@ -310,6 +310,8 @@ struct pv_lock_ops { > > void (*wait)(u8 *ptr, u8 val); > void

From: Boris Ostrovsky <boris.ostrovsky at oracle.com> commit 88c15ec90ff16880efab92b519436ee17b198477 upstream. As result of commit "x86/xen: Avoid fast syscall path for Xen PV guests", the irq_enable_sysexit pv op is not called by Xen PV guests anymore and since they were the only ones who used it we can safely remove it. Signed-off-by: Boris Ostrovsky <boris.ostrovsky at

This is a note to let you know that I've just added the patch titled x86/paravirt: Remove the unused irq_enable_sysexit pv op to the 4.4-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: x86-paravirt-remove-the-unused-irq_enable_sysexit-pv-op.patch and it can be found in the queue-4.4

When CONFIG_PARAVIRT_SPINLOCKS=n, it fires arch/x86/kernel/paravirt_patch_64.c: In function ?native_patch?: arch/x86/kernel/paravirt_patch_64.c:89:1: warning: label ?patch_site? defined but not used [-Wunused-label] patch_site: but those labels can simply be removed by directly calling the respective functions there. Get rid of local variables too, while at it. Also, simplify function

Xen PV guests have been the only ones using it and now they don't. Signed-off-by: Boris Ostrovsky <boris.ostrovsky at oracle.com> --- arch/x86/entry/entry_64_compat.S | 10 ++-------- arch/x86/include/asm/paravirt.h | 5 ----- arch/x86/include/asm/paravirt_types.h | 8 -------- arch/x86/kernel/asm-offsets_64.c | 1 - arch/x86/kernel/paravirt.c | 5 -----

When CONFIG_PARAVIRT_SPINLOCKS=n, it fires arch/x86/kernel/paravirt_patch_64.c: In function ?native_patch?: arch/x86/kernel/paravirt_patch_64.c:89:1: warning: label ?patch_site? defined but not used [-Wunused-label] patch_site: but those labels can simply be removed by directly calling the respective functions there. Get rid of local variables too, while at it. Signed-off-by: Borislav

When CONFIG_PARAVIRT_SPINLOCKS=n, it fires arch/x86/kernel/paravirt_patch_64.c: In function ?native_patch?: arch/x86/kernel/paravirt_patch_64.c:89:1: warning: label ?patch_site? defined but not used [-Wunused-label] patch_site: but those labels can simply be removed by directly calling the respective functions there. Get rid of local variables too, while at it. Signed-off-by: Borislav

On 07/09/18 22:10, Borislav Petkov wrote: > On Fri, Sep 07, 2018 at 12:51:12PM +0200, Borislav Petkov wrote: >> Whoops, no, it is still being used. Lemme see if I can remove all the >> labels in that function. > > Ok, I think I've gotten rid of them all, in both 32- and 64-bit > versions. It boots here and a bunch of all*config builds pass. > > --- > From:

The clobbers parameter from paravirt_patch_default() et al isn't used any longer. Remove it. Signed-off-by: Juergen Gross <jgross at suse.com> --- arch/x86/include/asm/paravirt_types.h | 7 +++---- arch/x86/kernel/alternative.c | 2 +- arch/x86/kernel/paravirt.c | 14 +++++--------- arch/x86/kernel/paravirt_patch_32.c | 5 ++---

On Fri, Sep 07, 2018 at 12:51:12PM +0200, Borislav Petkov wrote: > Whoops, no, it is still being used. Lemme see if I can remove all the > labels in that function. Ok, I think I've gotten rid of them all, in both 32- and 64-bit versions. It boots here and a bunch of all*config builds pass. --- From: Borislav Petkov <bp at suse.de> Date: Fri, 7 Sep 2018 12:47:10 +0200

On Fri, Sep 07, 2018 at 12:51:12PM +0200, Borislav Petkov wrote: > Whoops, no, it is still being used. Lemme see if I can remove all the > labels in that function. Ok, I think I've gotten rid of them all, in both 32- and 64-bit versions. It boots here and a bunch of all*config builds pass. --- From: Borislav Petkov <bp at suse.de> Date: Fri, 7 Sep 2018 12:47:10 +0200

On 08/09/18 17:28, Borislav Petkov wrote: > When CONFIG_PARAVIRT_SPINLOCKS=n, it fires > > arch/x86/kernel/paravirt_patch_64.c: In function ?native_patch?: > arch/x86/kernel/paravirt_patch_64.c:89:1: warning: label ?patch_site? defined but not used [-Wunused-label] > patch_site: > > but those labels can simply be removed by directly calling the > respective

Since lguest was removed, only the native version of wbinvd() is used. The paravirt interface is no longer needed. Signed-off-by: Josh Poimboeuf <jpoimboe at redhat.com> --- arch/x86/include/asm/paravirt.h | 5 ----- arch/x86/include/asm/paravirt_types.h | 1 - arch/x86/include/asm/special_insns.h | 7 +------ arch/x86/kernel/paravirt.c | 1 -

On Wed, Dec 14, 2016 at 11:15:13AM +0000, Piotr Gregor wrote: > The patch_default label is only used from within > case PARAVIRT_PATCH(pv_lock_ops.queued_spin_unlock) > and > case PARAVIRT_PATCH(pv_lock_ops.vcpu_is_preempted) > i.e. when #if defined(CONFIG_PARAVIRT_SPINLOCKS) is true. > Therefore no code jumps to this label in case CONFIG_PARAVIRT_SPINLOCKS > is not defined

From: Borislav Petkov <bp at suse.de> When CONFIG_PARAVIRT_SPINLOCKS=n, it fires arch/x86/kernel/paravirt_patch_64.c: In function ?native_patch?: arch/x86/kernel/paravirt_patch_64.c:89:1: warning: label ?patch_site? defined but not used [-Wunused-label] patch_site: but that label can simply be removed by directly calling paravirt_patch_insns() there. Signed-off-by: Borislav Petkov

From: Borislav Petkov <bp at suse.de> When CONFIG_PARAVIRT_SPINLOCKS=n, it fires arch/x86/kernel/paravirt_patch_64.c: In function ?native_patch?: arch/x86/kernel/paravirt_patch_64.c:89:1: warning: label ?patch_site? defined but not used [-Wunused-label] patch_site: but that label can simply be removed by directly calling paravirt_patch_insns() there. Signed-off-by: Borislav Petkov