Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88c15ec9 authored by Boris Ostrovsky's avatar Boris Ostrovsky Committed by Ingo Molnar
Browse files

x86/paravirt: Remove the unused irq_enable_sysexit pv op 



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: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
Reviewed-by: default avatarBorislav Petkov <bp@suse.de>
Acked-by: default avatarAndy Lutomirski <luto@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: david.vrabel@citrix.com
Cc: konrad.wilk@oracle.com
Cc: virtualization@lists.linux-foundation.org
Cc: xen-devel@lists.xenproject.org
Link: http://lkml.kernel.org/r/1447970147-1733-3-git-send-email-boris.ostrovsky@oracle.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 5fdf5d37

arch/x86/entry/entry_32.S

+2 −6
Original line number Diff line number Diff line
@@ -329,7 +329,8 @@ sysenter_past_esp: 
	 * Return back to the vDSO, which will pop ecx and edx.

	 * Don't bother with DS and ES (they already contain __USER_DS).

	 */

	ENABLE_INTERRUPTS_SYSEXIT

	sti

	sysexit



.pushsection .fixup, "ax"

2:	movl	$0, PT_FS(%esp)
@@ -552,11 +553,6 @@ ENTRY(native_iret) 
	iret

	_ASM_EXTABLE(native_iret, iret_exc)

END(native_iret)



ENTRY(native_irq_enable_sysexit)

	sti

	sysexit

END(native_irq_enable_sysexit)

#endif



ENTRY(overflow)

arch/x86/include/asm/paravirt.h

+0 −7
Original line number Diff line number Diff line
@@ -932,13 +932,6 @@ extern void default_banner(void); 
	push %ecx; push %edx;				\

	call PARA_INDIRECT(pv_cpu_ops+PV_CPU_read_cr0);	\

	pop %edx; pop %ecx



#define ENABLE_INTERRUPTS_SYSEXIT					\

	PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_irq_enable_sysexit),	\

		  CLBR_NONE,						\

		  jmp PARA_INDIRECT(pv_cpu_ops+PV_CPU_irq_enable_sysexit))





#else	/* !CONFIG_X86_32 */



/*

arch/x86/include/asm/paravirt_types.h

+0 −9
Original line number Diff line number Diff line
@@ -157,15 +157,6 @@ struct pv_cpu_ops { 


	u64 (*read_pmc)(int counter);



#ifdef CONFIG_X86_32

	/*

	 * Atomically enable interrupts and return to userspace.  This

	 * is only used in 32-bit kernels.  64-bit kernels use

	 * usergs_sysret32 instead.

	 */

	void (*irq_enable_sysexit)(void);

#endif



	/*

	 * Switch to usermode gs and return to 64-bit usermode using

	 * sysret.  Only used in 64-bit kernels to return to 64-bit

arch/x86/kernel/asm-offsets.c

+0 −3
Original line number Diff line number Diff line
@@ -65,9 +65,6 @@ void common(void) { 
	OFFSET(PV_IRQ_irq_disable, pv_irq_ops, irq_disable);

	OFFSET(PV_IRQ_irq_enable, pv_irq_ops, irq_enable);

	OFFSET(PV_CPU_iret, pv_cpu_ops, iret);

#ifdef CONFIG_X86_32

	OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);

#endif

	OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0);

	OFFSET(PV_MMU_read_cr2, pv_mmu_ops, read_cr2);

#endif

arch/x86/kernel/paravirt.c

+0 −7
Original line number Diff line number Diff line
@@ -162,9 +162,6 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf, 
		ret = paravirt_patch_ident_64(insnbuf, len);



	else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) ||

#ifdef CONFIG_X86_32

		 type == PARAVIRT_PATCH(pv_cpu_ops.irq_enable_sysexit) ||

#endif

		 type == PARAVIRT_PATCH(pv_cpu_ops.usergs_sysret32) ||

		 type == PARAVIRT_PATCH(pv_cpu_ops.usergs_sysret64))

		/* If operation requires a jmp, then jmp */
@@ -220,7 +217,6 @@ static u64 native_steal_clock(int cpu) 


/* These are in entry.S */

extern void native_iret(void);

extern void native_irq_enable_sysexit(void);

extern void native_usergs_sysret32(void);

extern void native_usergs_sysret64(void);
@@ -379,9 +375,6 @@ __visible struct pv_cpu_ops pv_cpu_ops = { 


	.load_sp0 = native_load_sp0,



#if defined(CONFIG_X86_32)

	.irq_enable_sysexit = native_irq_enable_sysexit,

#endif

#ifdef CONFIG_X86_64

#ifdef CONFIG_IA32_EMULATION

	.usergs_sysret32 = native_usergs_sysret32,