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

Commit 6c4c4d4b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 fixes from Ingo Molnar:
 "Misc fixes"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mm: Flush lazy MMU when DEBUG_PAGEALLOC is set
  x86/mm/cpa/selftest: Fix false positive in CPA self test
  x86/mm/cpa: Convert noop to functional fix
  x86, mm: Patch out arch_flush_lazy_mmu_mode() when running on bare metal
  x86, mm, paravirt: Fix vmalloc_fault oops during lazy MMU updates
parents af788e35 26564600

arch/x86/include/asm/paravirt.h

+4 −1
Original line number Diff line number Diff line
@@ -703,7 +703,10 @@ static inline void arch_leave_lazy_mmu_mode(void) 
	PVOP_VCALL0(pv_mmu_ops.lazy_mode.leave);

}



void arch_flush_lazy_mmu_mode(void);

static inline void arch_flush_lazy_mmu_mode(void)

{

	PVOP_VCALL0(pv_mmu_ops.lazy_mode.flush);

}



static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx,

				phys_addr_t phys, pgprot_t flags)

arch/x86/include/asm/paravirt_types.h

+2 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ struct pv_lazy_ops { 
	/* Set deferred update mode, used for batching operations. */

	void (*enter)(void);

	void (*leave)(void);

	void (*flush)(void);

};



struct pv_time_ops {
@@ -679,6 +680,7 @@ void paravirt_end_context_switch(struct task_struct *next); 


void paravirt_enter_lazy_mmu(void);

void paravirt_leave_lazy_mmu(void);

void paravirt_flush_lazy_mmu(void);



void _paravirt_nop(void);

u32 _paravirt_ident_32(u32);

arch/x86/kernel/paravirt.c

+13 −12
Original line number Diff line number Diff line
@@ -263,6 +263,18 @@ void paravirt_leave_lazy_mmu(void) 
	leave_lazy(PARAVIRT_LAZY_MMU);

}



void paravirt_flush_lazy_mmu(void)

{

	preempt_disable();



	if (paravirt_get_lazy_mode() == PARAVIRT_LAZY_MMU) {

		arch_leave_lazy_mmu_mode();

		arch_enter_lazy_mmu_mode();

	}



	preempt_enable();

}



void paravirt_start_context_switch(struct task_struct *prev)

{

	BUG_ON(preemptible());
@@ -292,18 +304,6 @@ enum paravirt_lazy_mode paravirt_get_lazy_mode(void) 
	return this_cpu_read(paravirt_lazy_mode);

}



void arch_flush_lazy_mmu_mode(void)

{

	preempt_disable();



	if (paravirt_get_lazy_mode() == PARAVIRT_LAZY_MMU) {

		arch_leave_lazy_mmu_mode();

		arch_enter_lazy_mmu_mode();

	}



	preempt_enable();

}



struct pv_info pv_info = {

	.name = "bare hardware",

	.paravirt_enabled = 0,
@@ -475,6 +475,7 @@ struct pv_mmu_ops pv_mmu_ops = { 
	.lazy_mode = {

		.enter = paravirt_nop,

		.leave = paravirt_nop,

		.flush = paravirt_nop,

	},



	.set_fixmap = native_set_fixmap,

arch/x86/lguest/boot.c

+1 −0
Original line number Diff line number Diff line
@@ -1334,6 +1334,7 @@ __init void lguest_init(void) 
	pv_mmu_ops.read_cr3 = lguest_read_cr3;

	pv_mmu_ops.lazy_mode.enter = paravirt_enter_lazy_mmu;

	pv_mmu_ops.lazy_mode.leave = lguest_leave_lazy_mmu_mode;

	pv_mmu_ops.lazy_mode.flush = paravirt_flush_lazy_mmu;

	pv_mmu_ops.pte_update = lguest_pte_update;

	pv_mmu_ops.pte_update_defer = lguest_pte_update;

arch/x86/mm/fault.c

+4 −2
Original line number Diff line number Diff line
@@ -378,10 +378,12 @@ static noinline __kprobes int vmalloc_fault(unsigned long address) 
	if (pgd_none(*pgd_ref))

		return -1;



	if (pgd_none(*pgd))

	if (pgd_none(*pgd)) {

		set_pgd(pgd, *pgd_ref);

	else

		arch_flush_lazy_mmu_mode();

	} else {

		BUG_ON(pgd_page_vaddr(*pgd) != pgd_page_vaddr(*pgd_ref));

	}



	/*

	 * Below here mismatches are bugs because these lower tables