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

Commit aac82d31 authored by Andy Lutomirski's avatar Andy Lutomirski Committed by Ingo Molnar
Browse files

x86, paravirt, xen: Remove the 64-bit ->irq_enable_sysexit() pvop 



We don't use irq_enable_sysexit on 64-bit kernels any more.
Remove all the paravirt and Xen machinery to support it on
64-bit kernels.

Tested-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
Signed-off-by: default avatarAndy Lutomirski <luto@kernel.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: Denys Vlasenko <vda.linux@googlemail.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/8a03355698fe5b94194e9e7360f19f91c1b2cf1f.1428100853.git.luto@kernel.org


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

arch/x86/ia32/ia32entry.S

+0 −6
Original line number Diff line number Diff line
@@ -77,12 +77,6 @@ ENTRY(native_usergs_sysret32) 
	swapgs

	sysretl

ENDPROC(native_usergs_sysret32)



ENTRY(native_irq_enable_sysexit)

	swapgs

	sti

	sysexit

ENDPROC(native_irq_enable_sysexit)

#endif



/*

arch/x86/include/asm/paravirt_types.h

+4 −3
Original line number Diff line number Diff line
@@ -160,13 +160,14 @@ struct pv_cpu_ops { 
	u64 (*read_pmc)(int counter);

	unsigned long long (*read_tscp)(unsigned int *aux);



#ifdef CONFIG_X86_32

	/*

	 * Atomically enable interrupts and return to userspace.  This

	 * is only ever used to return to 32-bit processes; in a

	 * 64-bit kernel, it's used for 32-on-64 compat processes, but

	 * never native 64-bit processes.  (Jump, not call.)

	 * 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

arch/x86/kernel/asm-offsets.c

+2 −0
Original line number Diff line number Diff line
@@ -68,7 +68,9 @@ 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

+3 −1
Original line number Diff line number Diff line
@@ -154,7 +154,9 @@ 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 */
@@ -371,7 +373,7 @@ __visible struct pv_cpu_ops pv_cpu_ops = { 


	.load_sp0 = native_load_sp0,



#if defined(CONFIG_X86_32) || defined(CONFIG_IA32_EMULATION)

#if defined(CONFIG_X86_32)

	.irq_enable_sysexit = native_irq_enable_sysexit,

#endif

#ifdef CONFIG_X86_64

arch/x86/kernel/paravirt_patch_64.c

+0 −1
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ unsigned native_patch(u8 type, u16 clobbers, void *ibuf, 
		PATCH_SITE(pv_irq_ops, save_fl);

		PATCH_SITE(pv_irq_ops, irq_enable);

		PATCH_SITE(pv_irq_ops, irq_disable);

		PATCH_SITE(pv_cpu_ops, irq_enable_sysexit);

		PATCH_SITE(pv_cpu_ops, usergs_sysret32);

		PATCH_SITE(pv_cpu_ops, usergs_sysret64);

		PATCH_SITE(pv_cpu_ops, swapgs);