Commit 2873dc25 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: a pkeys fix for a bug that triggers with weird BIOS
  settings, and two Xen PV fixes: a paravirt interface fix, and
  pagetable dumping fix"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mm: Fix dump_pagetables with Xen PV
  x86/ioperm: Add new paravirt function update_io_bitmap()
  x86/pkeys: Manually set X86_FEATURE_OSPKE to preserve existing changes
parents c105df5d bba42aff

arch/x86/include/asm/io_bitmap.h

+8 −1
Original line number Diff line number Diff line
@@ -19,7 +19,14 @@ struct task_struct; 
void io_bitmap_share(struct task_struct *tsk);

void io_bitmap_exit(void);



void tss_update_io_bitmap(void);

void native_tss_update_io_bitmap(void);



#ifdef CONFIG_PARAVIRT_XXL

#include <asm/paravirt.h>

#else

#define tss_update_io_bitmap native_tss_update_io_bitmap

#endif



#else

static inline void io_bitmap_share(struct task_struct *tsk) { }

static inline void io_bitmap_exit(void) { }

arch/x86/include/asm/paravirt.h

+7 −0
Original line number Diff line number Diff line
@@ -295,6 +295,13 @@ static inline void write_idt_entry(gate_desc *dt, int entry, const gate_desc *g) 
	PVOP_VCALL3(cpu.write_idt_entry, dt, entry, g);

}



#ifdef CONFIG_X86_IOPL_IOPERM

static inline void tss_update_io_bitmap(void)

{

	PVOP_VCALL0(cpu.update_io_bitmap);

}

#endif



static inline void paravirt_activate_mm(struct mm_struct *prev,

					struct mm_struct *next)

{

arch/x86/include/asm/paravirt_types.h

+4 −0
Original line number Diff line number Diff line
@@ -140,6 +140,10 @@ struct pv_cpu_ops { 


	void (*load_sp0)(unsigned long sp0);



#ifdef CONFIG_X86_IOPL_IOPERM

	void (*update_io_bitmap)(void);

#endif



	void (*wbinvd)(void);



	/* cpuid emulation, mostly so that caps bits can be disabled */

arch/x86/kernel/cpu/common.c

+1 −1
Original line number Diff line number Diff line
@@ -445,7 +445,7 @@ static __always_inline void setup_pku(struct cpuinfo_x86 *c) 
	 * cpuid bit to be set.  We need to ensure that we

	 * update that bit in this CPU's "cpu_info".

	 */

	get_cpu_cap(c);

	set_cpu_cap(c, X86_FEATURE_OSPKE);

}



#ifdef CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS

arch/x86/kernel/paravirt.c

+5 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
#include <asm/timer.h>

#include <asm/special_insns.h>

#include <asm/tlb.h>

#include <asm/io_bitmap.h>



/*

 * nop stub, which must not clobber anything *including the stack* to
@@ -341,6 +342,10 @@ struct paravirt_patch_template pv_ops = { 
	.cpu.iret		= native_iret,

	.cpu.swapgs		= native_swapgs,



#ifdef CONFIG_X86_IOPL_IOPERM

	.cpu.update_io_bitmap	= native_tss_update_io_bitmap,

#endif



	.cpu.start_context_switch	= paravirt_nop,

	.cpu.end_context_switch		= paravirt_nop,

CRA Git | Maintained and supported by SUSTech CRA and CCSE