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

Commit fb2af071 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar
Browse files

x86/paravirt: Unify the 32/64 bit paravirt patching code 



Large parts of these two files are identical. Merge them together.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rik van Riel <riel@surriel.com>
Link: http://lkml.kernel.org/r/20190424134223.603491680@linutronix.de


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

arch/x86/kernel/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ KASAN_SANITIZE_paravirt.o := n 


OBJECT_FILES_NON_STANDARD_relocate_kernel_$(BITS).o	:= y

OBJECT_FILES_NON_STANDARD_test_nx.o			:= y

OBJECT_FILES_NON_STANDARD_paravirt_patch_$(BITS).o	:= y

OBJECT_FILES_NON_STANDARD_paravirt_patch.o		:= y



ifdef CONFIG_FRAME_POINTER

OBJECT_FILES_NON_STANDARD_ftrace_$(BITS).o		:= y
@@ -112,7 +112,7 @@ obj-$(CONFIG_AMD_NB) += amd_nb.o 
obj-$(CONFIG_DEBUG_NMI_SELFTEST) += nmi_selftest.o



obj-$(CONFIG_KVM_GUEST)		+= kvm.o kvmclock.o

obj-$(CONFIG_PARAVIRT)		+= paravirt.o paravirt_patch_$(BITS).o

obj-$(CONFIG_PARAVIRT)		+= paravirt.o paravirt_patch.o

obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= paravirt-spinlocks.o

obj-$(CONFIG_PARAVIRT_CLOCK)	+= pvclock.o

obj-$(CONFIG_X86_PMEM_LEGACY_DEVICE) += pmem.o

arch/x86/kernel/paravirt_patch_64.c→arch/x86/kernel/paravirt_patch.c

+48 −14
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include <linux/stringify.h>



#include <asm/paravirt.h>

#include <asm/asm-offsets.h>

#include <linux/stringify.h>



#ifdef CONFIG_X86_64

# ifdef CONFIG_PARAVIRT_XXL

DEF_NATIVE(irq, irq_disable, "cli");

DEF_NATIVE(irq, irq_enable, "sti");
@@ -12,24 +14,49 @@ DEF_NATIVE(mmu, read_cr2, "movq %cr2, %rax"); 
DEF_NATIVE(mmu, read_cr3, "movq %cr3, %rax");

DEF_NATIVE(mmu, write_cr3, "movq %rdi, %cr3");

DEF_NATIVE(cpu, wbinvd, "wbinvd");



DEF_NATIVE(cpu, usergs_sysret64, "swapgs; sysretq");

DEF_NATIVE(cpu, swapgs, "swapgs");

DEF_NATIVE(, mov64, "mov %rdi, %rax");



unsigned paravirt_patch_ident_64(void *insnbuf, unsigned len)

unsigned int paravirt_patch_ident_64(void *insnbuf, unsigned int len)

{

	return paravirt_patch_insns(insnbuf, len,

				    start__mov64, end__mov64);

	return paravirt_patch_insns(insnbuf, len, start__mov64, end__mov64);

}

#endif

# endif /* CONFIG_PARAVIRT_XXL */



#if defined(CONFIG_PARAVIRT_SPINLOCKS)

# ifdef CONFIG_PARAVIRT_SPINLOCKS

DEF_NATIVE(lock, queued_spin_unlock, "movb $0, (%rdi)");

DEF_NATIVE(lock, vcpu_is_preempted, "xor %eax, %eax");

# endif



unsigned native_patch(u8 type, void *ibuf, unsigned long addr, unsigned len)

#else /* CONFIG_X86_64 */



# ifdef CONFIG_PARAVIRT_XXL

DEF_NATIVE(irq, irq_disable, "cli");

DEF_NATIVE(irq, irq_enable, "sti");

DEF_NATIVE(irq, restore_fl, "push %eax; popf");

DEF_NATIVE(irq, save_fl, "pushf; pop %eax");

DEF_NATIVE(cpu, iret, "iret");

DEF_NATIVE(mmu, read_cr2, "mov %cr2, %eax");

DEF_NATIVE(mmu, write_cr3, "mov %eax, %cr3");

DEF_NATIVE(mmu, read_cr3, "mov %cr3, %eax");



unsigned int paravirt_patch_ident_64(void *insnbuf, unsigned int len)

{

	/* arg in %edx:%eax, return in %edx:%eax */

	return 0;

}

# endif /* CONFIG_PARAVIRT_XXL */



# ifdef CONFIG_PARAVIRT_SPINLOCKS

DEF_NATIVE(lock, queued_spin_unlock, "movb $0, (%eax)");

DEF_NATIVE(lock, vcpu_is_preempted, "xor %eax, %eax");

# endif



#endif /* !CONFIG_X86_64 */



unsigned int native_patch(u8 type, void *ibuf, unsigned long addr,

			  unsigned int len)

{

#define PATCH_SITE(ops, x)					\

	case PARAVIRT_PATCH(ops.x):				\
@@ -41,14 +68,21 @@ unsigned native_patch(u8 type, void *ibuf, unsigned long addr, unsigned len) 
		PATCH_SITE(irq, save_fl);

		PATCH_SITE(irq, irq_enable);

		PATCH_SITE(irq, irq_disable);

		PATCH_SITE(cpu, usergs_sysret64);

		PATCH_SITE(cpu, swapgs);

		PATCH_SITE(cpu, wbinvd);



		PATCH_SITE(mmu, read_cr2);

		PATCH_SITE(mmu, read_cr3);

		PATCH_SITE(mmu, write_cr3);



# ifdef CONFIG_X86_64

		PATCH_SITE(cpu, usergs_sysret64);

		PATCH_SITE(cpu, swapgs);

		PATCH_SITE(cpu, wbinvd);

# else

		PATCH_SITE(cpu, iret);

# endif

#endif

#if defined(CONFIG_PARAVIRT_SPINLOCKS)



#ifdef CONFIG_PARAVIRT_SPINLOCKS

	case PARAVIRT_PATCH(lock.queued_spin_unlock):

		if (pv_is_native_spin_unlock())

			return paravirt_patch_insns(ibuf, len,

arch/x86/kernel/paravirt_patch_32.c

deleted100644 → 0
+0 −64
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include <asm/paravirt.h>



#ifdef CONFIG_PARAVIRT_XXL

DEF_NATIVE(irq, irq_disable, "cli");

DEF_NATIVE(irq, irq_enable, "sti");

DEF_NATIVE(irq, restore_fl, "push %eax; popf");

DEF_NATIVE(irq, save_fl, "pushf; pop %eax");

DEF_NATIVE(cpu, iret, "iret");

DEF_NATIVE(mmu, read_cr2, "mov %cr2, %eax");

DEF_NATIVE(mmu, write_cr3, "mov %eax, %cr3");

DEF_NATIVE(mmu, read_cr3, "mov %cr3, %eax");



unsigned paravirt_patch_ident_64(void *insnbuf, unsigned len)

{

	/* arg in %edx:%eax, return in %edx:%eax */

	return 0;

}

#endif



#if defined(CONFIG_PARAVIRT_SPINLOCKS)

DEF_NATIVE(lock, queued_spin_unlock, "movb $0, (%eax)");

DEF_NATIVE(lock, vcpu_is_preempted, "xor %eax, %eax");

#endif



unsigned native_patch(u8 type, void *ibuf, unsigned long addr, unsigned len)

{

#define PATCH_SITE(ops, x)					\

	case PARAVIRT_PATCH(ops.x):				\

		return paravirt_patch_insns(ibuf, len, start_##ops##_##x, end_##ops##_##x)



	switch (type) {

#ifdef CONFIG_PARAVIRT_XXL

		PATCH_SITE(irq, irq_disable);

		PATCH_SITE(irq, irq_enable);

		PATCH_SITE(irq, restore_fl);

		PATCH_SITE(irq, save_fl);

		PATCH_SITE(cpu, iret);

		PATCH_SITE(mmu, read_cr2);

		PATCH_SITE(mmu, read_cr3);

		PATCH_SITE(mmu, write_cr3);

#endif

#if defined(CONFIG_PARAVIRT_SPINLOCKS)

	case PARAVIRT_PATCH(lock.queued_spin_unlock):

		if (pv_is_native_spin_unlock())

			return paravirt_patch_insns(ibuf, len,

						    start_lock_queued_spin_unlock,

						    end_lock_queued_spin_unlock);

		break;



	case PARAVIRT_PATCH(lock.vcpu_is_preempted):

		if (pv_is_native_vcpu_is_preempted())

			return paravirt_patch_insns(ibuf, len,

						    start_lock_vcpu_is_preempted,

						    end_lock_vcpu_is_preempted);

		break;

#endif



	default:

		break;

	}

#undef PATCH_SITE

	return paravirt_patch_default(type, ibuf, addr, len);

}