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

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

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

Pull x86 pti updates from Thomas Gleixner:
 "Another series of PTI related changes:

   - Remove the manual stack switch for user entries from the idtentry
     code. This debloats entry by 5k+ bytes of text.

   - Use the proper types for the asm/bootparam.h defines to prevent
     user space compile errors.

   - Use PAGE_GLOBAL for !PCID systems to gain back performance

   - Prevent setting of huge PUD/PMD entries when the entries are not
     leaf entries otherwise the entries to which the PUD/PMD points to
     and are populated get lost"

* 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/pgtable: Don't set huge PUD/PMD on non-leaf entries
  x86/pti: Leave kernel text global for !PCID
  x86/pti: Never implicitly clear _PAGE_GLOBAL for kernel image
  x86/pti: Enable global pages for shared areas
  x86/mm: Do not forbid _PAGE_RW before init for __ro_after_init
  x86/mm: Comment _PAGE_GLOBAL mystery
  x86/mm: Remove extra filtering in pageattr code
  x86/mm: Do not auto-massage page protections
  x86/espfix: Document use of _PAGE_GLOBAL
  x86/mm: Introduce "default" kernel PTE mask
  x86/mm: Undo double _PAGE_PSE clearing
  x86/mm: Factor out pageattr _PAGE_GLOBAL setting
  x86/entry/64: Drop idtentry's manual stack switch for user entries
  x86/uapi: Fix asm/bootparam.h userspace compilation errors
parents 71b8ebbf e3e28812

arch/x86/boot/compressed/kaslr.c

+3 −0
Original line number Diff line number Diff line
@@ -54,6 +54,9 @@ unsigned int ptrs_per_p4d __ro_after_init = 1; 


extern unsigned long get_cmd_line_ptr(void);



/* Used by PAGE_KERN* macros: */

pteval_t __default_kernel_pte_mask __read_mostly = ~0;



/* Simplified build-specific string for starting entropy. */

static const char build_str[] = UTS_RELEASE " (" LINUX_COMPILE_BY "@"

		LINUX_COMPILE_HOST ") (" LINUX_COMPILER ") " UTS_VERSION;

arch/x86/entry/entry_64.S

+2 −2
Original line number Diff line number Diff line
@@ -913,7 +913,7 @@ ENTRY(\sym) 
	pushq	$-1				/* ORIG_RAX: no syscall to restart */

	.endif



	.if \paranoid < 2

	.if \paranoid == 1

	testb	$3, CS-ORIG_RAX(%rsp)		/* If coming from userspace, switch stacks */

	jnz	.Lfrom_usermode_switch_stack_\@

	.endif
@@ -960,7 +960,7 @@ ENTRY(\sym) 
	jmp	error_exit

	.endif



	.if \paranoid < 2

	.if \paranoid == 1

	/*

	 * Entry from userspace.  Switch stacks and treat it

	 * as a normal entry.  This means that paranoid handlers

arch/x86/include/asm/pgtable.h

+22 −5
Original line number Diff line number Diff line
@@ -526,22 +526,39 @@ static inline pgprotval_t massage_pgprot(pgprot_t pgprot) 
	return protval;

}



static inline pgprotval_t check_pgprot(pgprot_t pgprot)

{

	pgprotval_t massaged_val = massage_pgprot(pgprot);



	/* mmdebug.h can not be included here because of dependencies */

#ifdef CONFIG_DEBUG_VM

	WARN_ONCE(pgprot_val(pgprot) != massaged_val,

		  "attempted to set unsupported pgprot: %016llx "

		  "bits: %016llx supported: %016llx\n",

		  (u64)pgprot_val(pgprot),

		  (u64)pgprot_val(pgprot) ^ massaged_val,

		  (u64)__supported_pte_mask);

#endif



	return massaged_val;

}



static inline pte_t pfn_pte(unsigned long page_nr, pgprot_t pgprot)

{

	return __pte(((phys_addr_t)page_nr << PAGE_SHIFT) |

		     massage_pgprot(pgprot));

		     check_pgprot(pgprot));

}



static inline pmd_t pfn_pmd(unsigned long page_nr, pgprot_t pgprot)

{

	return __pmd(((phys_addr_t)page_nr << PAGE_SHIFT) |

		     massage_pgprot(pgprot));

		     check_pgprot(pgprot));

}



static inline pud_t pfn_pud(unsigned long page_nr, pgprot_t pgprot)

{

	return __pud(((phys_addr_t)page_nr << PAGE_SHIFT) |

		     massage_pgprot(pgprot));

		     check_pgprot(pgprot));

}



static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
@@ -553,7 +570,7 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot) 
	 * the newprot (if present):

	 */

	val &= _PAGE_CHG_MASK;

	val |= massage_pgprot(newprot) & ~_PAGE_CHG_MASK;

	val |= check_pgprot(newprot) & ~_PAGE_CHG_MASK;



	return __pte(val);

}
@@ -563,7 +580,7 @@ static inline pmd_t pmd_modify(pmd_t pmd, pgprot_t newprot) 
	pmdval_t val = pmd_val(pmd);



	val &= _HPAGE_CHG_MASK;

	val |= massage_pgprot(newprot) & ~_HPAGE_CHG_MASK;

	val |= check_pgprot(newprot) & ~_HPAGE_CHG_MASK;



	return __pmd(val);

}

arch/x86/include/asm/pgtable_types.h

+16 −13
Original line number Diff line number Diff line
@@ -196,19 +196,21 @@ enum page_cache_mode { 
#define __PAGE_KERNEL_NOENC	(__PAGE_KERNEL)

#define __PAGE_KERNEL_NOENC_WP	(__PAGE_KERNEL_WP)



#define PAGE_KERNEL		__pgprot(__PAGE_KERNEL | _PAGE_ENC)

#define PAGE_KERNEL_NOENC	__pgprot(__PAGE_KERNEL)

#define PAGE_KERNEL_RO		__pgprot(__PAGE_KERNEL_RO | _PAGE_ENC)

#define PAGE_KERNEL_EXEC	__pgprot(__PAGE_KERNEL_EXEC | _PAGE_ENC)

#define PAGE_KERNEL_EXEC_NOENC	__pgprot(__PAGE_KERNEL_EXEC)

#define PAGE_KERNEL_RX		__pgprot(__PAGE_KERNEL_RX | _PAGE_ENC)

#define PAGE_KERNEL_NOCACHE	__pgprot(__PAGE_KERNEL_NOCACHE | _PAGE_ENC)

#define PAGE_KERNEL_LARGE	__pgprot(__PAGE_KERNEL_LARGE | _PAGE_ENC)

#define PAGE_KERNEL_LARGE_EXEC	__pgprot(__PAGE_KERNEL_LARGE_EXEC | _PAGE_ENC)

#define PAGE_KERNEL_VVAR	__pgprot(__PAGE_KERNEL_VVAR | _PAGE_ENC)



#define PAGE_KERNEL_IO		__pgprot(__PAGE_KERNEL_IO)

#define PAGE_KERNEL_IO_NOCACHE	__pgprot(__PAGE_KERNEL_IO_NOCACHE)

#define default_pgprot(x)	__pgprot((x) & __default_kernel_pte_mask)



#define PAGE_KERNEL		default_pgprot(__PAGE_KERNEL | _PAGE_ENC)

#define PAGE_KERNEL_NOENC	default_pgprot(__PAGE_KERNEL)

#define PAGE_KERNEL_RO		default_pgprot(__PAGE_KERNEL_RO | _PAGE_ENC)

#define PAGE_KERNEL_EXEC	default_pgprot(__PAGE_KERNEL_EXEC | _PAGE_ENC)

#define PAGE_KERNEL_EXEC_NOENC	default_pgprot(__PAGE_KERNEL_EXEC)

#define PAGE_KERNEL_RX		default_pgprot(__PAGE_KERNEL_RX | _PAGE_ENC)

#define PAGE_KERNEL_NOCACHE	default_pgprot(__PAGE_KERNEL_NOCACHE | _PAGE_ENC)

#define PAGE_KERNEL_LARGE	default_pgprot(__PAGE_KERNEL_LARGE | _PAGE_ENC)

#define PAGE_KERNEL_LARGE_EXEC	default_pgprot(__PAGE_KERNEL_LARGE_EXEC | _PAGE_ENC)

#define PAGE_KERNEL_VVAR	default_pgprot(__PAGE_KERNEL_VVAR | _PAGE_ENC)



#define PAGE_KERNEL_IO		default_pgprot(__PAGE_KERNEL_IO)

#define PAGE_KERNEL_IO_NOCACHE	default_pgprot(__PAGE_KERNEL_IO_NOCACHE)



#endif	/* __ASSEMBLY__ */
@@ -483,6 +485,7 @@ static inline pgprot_t pgprot_large_2_4k(pgprot_t pgprot) 
typedef struct page *pgtable_t;



extern pteval_t __supported_pte_mask;

extern pteval_t __default_kernel_pte_mask;

extern void set_nx(void);

extern int nx_enabled;

arch/x86/include/asm/pti.h

+2 −0
Original line number Diff line number Diff line
@@ -6,8 +6,10 @@ 
#ifdef CONFIG_PAGE_TABLE_ISOLATION

extern void pti_init(void);

extern void pti_check_boottime_disable(void);

extern void pti_clone_kernel_text(void);

#else

static inline void pti_check_boottime_disable(void) { }

static inline void pti_clone_kernel_text(void) { }

#endif



#endif /* __ASSEMBLY__ */