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

Commit e57d9f63 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull x86 mm updates from Ingo Molnar:
 "The main changes in this cycle were:

   - Update and clean up x86 fault handling, by Andy Lutomirski.

   - Drop usage of __flush_tlb_all() in kernel_physical_mapping_init()
     and related fallout, by Dan Williams.

   - CPA cleanups and reorganization by Peter Zijlstra: simplify the
     flow and remove a few warts.

   - Other misc cleanups"

* 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (29 commits)
  x86/mm/dump_pagetables: Use DEFINE_SHOW_ATTRIBUTE()
  x86/mm/cpa: Rename @addrinarray to @numpages
  x86/mm/cpa: Better use CLFLUSHOPT
  x86/mm/cpa: Fold cpa_flush_range() and cpa_flush_array() into a single cpa_flush() function
  x86/mm/cpa: Make cpa_data::numpages invariant
  x86/mm/cpa: Optimize cpa_flush_array() TLB invalidation
  x86/mm/cpa: Simplify the code after making cpa->vaddr invariant
  x86/mm/cpa: Make cpa_data::vaddr invariant
  x86/mm/cpa: Add __cpa_addr() helper
  x86/mm/cpa: Add ARRAY and PAGES_ARRAY selftests
  x86/mm: Drop usage of __flush_tlb_all() in kernel_physical_mapping_init()
  x86/mm: Validate kernel_physical_mapping_init() PTE population
  generic/pgtable: Introduce set_pte_safe()
  generic/pgtable: Introduce {p4d,pgd}_same()
  generic/pgtable: Make {pmd, pud}_same() unconditionally available
  x86/fault: Clean up the page fault oops decoder a bit
  x86/fault: Decode page fault OOPSes better
  x86/vsyscall/64: Use X86_PF constants in the simulated #PF error code
  x86/oops: Show the correct CS value in show_regs()
  x86/fault: Don't try to recover from an implicit supervisor access
  ...
parents d6e867a6 6848ac7c

arch/x86/entry/vsyscall/vsyscall_64.c

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static bool write_ok_or_segv(unsigned long ptr, size_t size) 
	if (!access_ok(VERIFY_WRITE, (void __user *)ptr, size)) {

		struct thread_struct *thread = &current->thread;



		thread->error_code	= 6;  /* user fault, no page, write */

		thread->error_code	= X86_PF_USER | X86_PF_WRITE;

		thread->cr2		= ptr;

		thread->trap_nr		= X86_TRAP_PF;

arch/x86/include/asm/disabled-features.h

+7 −1
Original line number Diff line number Diff line
@@ -16,6 +16,12 @@ 
# define DISABLE_MPX	(1<<(X86_FEATURE_MPX & 31))

#endif



#ifdef CONFIG_X86_SMAP

# define DISABLE_SMAP	0

#else

# define DISABLE_SMAP	(1<<(X86_FEATURE_SMAP & 31))

#endif



#ifdef CONFIG_X86_INTEL_UMIP

# define DISABLE_UMIP	0

#else
@@ -68,7 +74,7 @@ 
#define DISABLED_MASK6	0

#define DISABLED_MASK7	(DISABLE_PTI)

#define DISABLED_MASK8	0

#define DISABLED_MASK9	(DISABLE_MPX)

#define DISABLED_MASK9	(DISABLE_MPX|DISABLE_SMAP)

#define DISABLED_MASK10	0

#define DISABLED_MASK11	0

#define DISABLED_MASK12	0

arch/x86/include/asm/pgalloc.h

+27 −0
Original line number Diff line number Diff line
@@ -80,6 +80,13 @@ static inline void pmd_populate_kernel(struct mm_struct *mm, 
	set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));

}



static inline void pmd_populate_kernel_safe(struct mm_struct *mm,

				       pmd_t *pmd, pte_t *pte)

{

	paravirt_alloc_pte(mm, __pa(pte) >> PAGE_SHIFT);

	set_pmd_safe(pmd, __pmd(__pa(pte) | _PAGE_TABLE));

}



static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd,

				struct page *pte)

{
@@ -132,6 +139,12 @@ static inline void pud_populate(struct mm_struct *mm, pud_t *pud, pmd_t *pmd) 
	paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);

	set_pud(pud, __pud(_PAGE_TABLE | __pa(pmd)));

}



static inline void pud_populate_safe(struct mm_struct *mm, pud_t *pud, pmd_t *pmd)

{

	paravirt_alloc_pmd(mm, __pa(pmd) >> PAGE_SHIFT);

	set_pud_safe(pud, __pud(_PAGE_TABLE | __pa(pmd)));

}

#endif	/* CONFIG_X86_PAE */



#if CONFIG_PGTABLE_LEVELS > 3
@@ -141,6 +154,12 @@ static inline void p4d_populate(struct mm_struct *mm, p4d_t *p4d, pud_t *pud) 
	set_p4d(p4d, __p4d(_PAGE_TABLE | __pa(pud)));

}



static inline void p4d_populate_safe(struct mm_struct *mm, p4d_t *p4d, pud_t *pud)

{

	paravirt_alloc_pud(mm, __pa(pud) >> PAGE_SHIFT);

	set_p4d_safe(p4d, __p4d(_PAGE_TABLE | __pa(pud)));

}



static inline pud_t *pud_alloc_one(struct mm_struct *mm, unsigned long addr)

{

	gfp_t gfp = GFP_KERNEL_ACCOUNT;
@@ -173,6 +192,14 @@ static inline void pgd_populate(struct mm_struct *mm, pgd_t *pgd, p4d_t *p4d) 
	set_pgd(pgd, __pgd(_PAGE_TABLE | __pa(p4d)));

}



static inline void pgd_populate_safe(struct mm_struct *mm, pgd_t *pgd, p4d_t *p4d)

{

	if (!pgtable_l5_enabled())

		return;

	paravirt_alloc_p4d(mm, __pa(p4d) >> PAGE_SHIFT);

	set_pgd_safe(pgd, __pgd(_PAGE_TABLE | __pa(p4d)));

}



static inline p4d_t *p4d_alloc_one(struct mm_struct *mm, unsigned long addr)

{

	gfp_t gfp = GFP_KERNEL_ACCOUNT;

arch/x86/kernel/process_64.c

+2 −3
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ void __show_regs(struct pt_regs *regs, enum show_regs_mode mode) 
	unsigned long cr0 = 0L, cr2 = 0L, cr3 = 0L, cr4 = 0L, fs, gs, shadowgs;

	unsigned long d0, d1, d2, d3, d6, d7;

	unsigned int fsindex, gsindex;

	unsigned int ds, cs, es;

	unsigned int ds, es;



	show_iret_regs(regs);
@@ -100,7 +100,6 @@ void __show_regs(struct pt_regs *regs, enum show_regs_mode mode) 
	}



	asm("movl %%ds,%0" : "=r" (ds));

	asm("movl %%cs,%0" : "=r" (cs));

	asm("movl %%es,%0" : "=r" (es));

	asm("movl %%fs,%0" : "=r" (fsindex));

	asm("movl %%gs,%0" : "=r" (gsindex));
@@ -116,7 +115,7 @@ void __show_regs(struct pt_regs *regs, enum show_regs_mode mode) 


	printk(KERN_DEFAULT "FS:  %016lx(%04x) GS:%016lx(%04x) knlGS:%016lx\n",

	       fs, fsindex, gs, gsindex, shadowgs);

	printk(KERN_DEFAULT "CS:  %04x DS: %04x ES: %04x CR0: %016lx\n", cs, ds,

	printk(KERN_DEFAULT "CS:  %04lx DS: %04x ES: %04x CR0: %016lx\n", regs->cs, ds,

			es, cr0);

	printk(KERN_DEFAULT "CR2: %016lx CR3: %016lx CR4: %016lx\n", cr2, cr3,

			cr4);

arch/x86/mm/debug_pagetables.c

+7 −51
Original line number Diff line number Diff line
@@ -10,20 +10,9 @@ static int ptdump_show(struct seq_file *m, void *v) 
	return 0;

}



static int ptdump_open(struct inode *inode, struct file *filp)

{

	return single_open(filp, ptdump_show, NULL);

}



static const struct file_operations ptdump_fops = {

	.owner		= THIS_MODULE,

	.open		= ptdump_open,

	.read		= seq_read,

	.llseek		= seq_lseek,

	.release	= single_release,

};

DEFINE_SHOW_ATTRIBUTE(ptdump);



static int ptdump_show_curknl(struct seq_file *m, void *v)

static int ptdump_curknl_show(struct seq_file *m, void *v)

{

	if (current->mm->pgd) {

		down_read(&current->mm->mmap_sem);
@@ -33,23 +22,12 @@ static int ptdump_show_curknl(struct seq_file *m, void *v) 
	return 0;

}



static int ptdump_open_curknl(struct inode *inode, struct file *filp)

{

	return single_open(filp, ptdump_show_curknl, NULL);

}



static const struct file_operations ptdump_curknl_fops = {

	.owner		= THIS_MODULE,

	.open		= ptdump_open_curknl,

	.read		= seq_read,

	.llseek		= seq_lseek,

	.release	= single_release,

};

DEFINE_SHOW_ATTRIBUTE(ptdump_curknl);



#ifdef CONFIG_PAGE_TABLE_ISOLATION

static struct dentry *pe_curusr;



static int ptdump_show_curusr(struct seq_file *m, void *v)

static int ptdump_curusr_show(struct seq_file *m, void *v)

{

	if (current->mm->pgd) {

		down_read(&current->mm->mmap_sem);
@@ -59,42 +37,20 @@ static int ptdump_show_curusr(struct seq_file *m, void *v) 
	return 0;

}



static int ptdump_open_curusr(struct inode *inode, struct file *filp)

{

	return single_open(filp, ptdump_show_curusr, NULL);

}



static const struct file_operations ptdump_curusr_fops = {

	.owner		= THIS_MODULE,

	.open		= ptdump_open_curusr,

	.read		= seq_read,

	.llseek		= seq_lseek,

	.release	= single_release,

};

DEFINE_SHOW_ATTRIBUTE(ptdump_curusr);

#endif



#if defined(CONFIG_EFI) && defined(CONFIG_X86_64)

static struct dentry *pe_efi;



static int ptdump_show_efi(struct seq_file *m, void *v)

static int ptdump_efi_show(struct seq_file *m, void *v)

{

	if (efi_mm.pgd)

		ptdump_walk_pgd_level_debugfs(m, efi_mm.pgd, false);

	return 0;

}



static int ptdump_open_efi(struct inode *inode, struct file *filp)

{

	return single_open(filp, ptdump_show_efi, NULL);

}



static const struct file_operations ptdump_efi_fops = {

	.owner		= THIS_MODULE,

	.open		= ptdump_open_efi,

	.read		= seq_read,

	.llseek		= seq_lseek,

	.release	= single_release,

};

DEFINE_SHOW_ATTRIBUTE(ptdump_efi);

#endif



static struct dentry *dir, *pe_knl, *pe_curknl;