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

Commit 2f7c3a18 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: EFI, entry code, pkeys and MPX fixes, TASK_SIZE cleanups
  and a tsc frequency table fix"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mm: Switch from TASK_SIZE to TASK_SIZE_MAX in the page fault code
  x86/fsgsbase/64: Use TASK_SIZE_MAX for FSBASE/GSBASE upper limits
  x86/mm/mpx: Work around MPX erratum SKD046
  x86/entry/64: Fix stack return address retrieval in thunk
  x86/efi: Fix 7-parameter efi_call()s
  x86/cpufeature, x86/mm/pkeys: Fix broken compile-time disabling of pkeys
  x86/tsc: Add missing Cherrytrail frequency to the table
parents f89eae4e dc4fac84

arch/x86/entry/thunk_64.S

+5 −6
Original line number Diff line number Diff line
@@ -8,16 +8,15 @@ 
#include <linux/linkage.h>

#include "calling.h"

#include <asm/asm.h>

#include <asm/frame.h>



	/* rdi:	arg1 ... normal C conventions. rax is saved/restored. */

	.macro THUNK name, func, put_ret_addr_in_rdi=0

	.globl \name

	.type \name, @function

\name:

	FRAME_BEGIN

	pushq %rbp

	movq %rsp, %rbp



	/* this one pushes 9 elems, the next one would be %rIP */

	pushq %rdi

	pushq %rsi

	pushq %rdx
@@ -29,8 +28,8 @@ 
	pushq %r11



	.if \put_ret_addr_in_rdi

	/* 9*8(%rsp) is return addr on stack */

	movq 9*8(%rsp), %rdi

	/* 8(%rbp) is return addr on stack */

	movq 8(%rbp), %rdi

	.endif



	call \func
@@ -65,7 +64,7 @@ restore: 
	popq %rdx

	popq %rsi

	popq %rdi

	FRAME_END

	popq %rbp

	ret

	_ASM_NOKPROBE(restore)

#endif

arch/x86/include/asm/bugs.h

+8 −0
Original line number Diff line number Diff line 
#ifndef _ASM_X86_BUGS_H

#define _ASM_X86_BUGS_H



#include <asm/processor.h>



extern void check_bugs(void);



#if defined(CONFIG_CPU_SUP_INTEL)

void check_mpx_erratum(struct cpuinfo_x86 *c);

#else

static inline void check_mpx_erratum(struct cpuinfo_x86 *c) {}

#endif



#if defined(CONFIG_CPU_SUP_INTEL) && defined(CONFIG_X86_32)

int ppro_with_ram_bug(void);

#else

arch/x86/include/asm/cpufeature.h

+6 −6
Original line number Diff line number Diff line
@@ -64,9 +64,9 @@ extern const char * const x86_bug_flags[NBUGINTS*32]; 
	   (((bit)>>5)==11 && (1UL<<((bit)&31) & REQUIRED_MASK11)) ||	\

	   (((bit)>>5)==12 && (1UL<<((bit)&31) & REQUIRED_MASK12)) ||	\

	   (((bit)>>5)==13 && (1UL<<((bit)&31) & REQUIRED_MASK13)) ||	\

	   (((bit)>>5)==13 && (1UL<<((bit)&31) & REQUIRED_MASK14)) ||	\

	   (((bit)>>5)==13 && (1UL<<((bit)&31) & REQUIRED_MASK15)) ||	\

	   (((bit)>>5)==14 && (1UL<<((bit)&31) & REQUIRED_MASK16)) )

	   (((bit)>>5)==14 && (1UL<<((bit)&31) & REQUIRED_MASK14)) ||	\

	   (((bit)>>5)==15 && (1UL<<((bit)&31) & REQUIRED_MASK15)) ||	\

	   (((bit)>>5)==16 && (1UL<<((bit)&31) & REQUIRED_MASK16)) )



#define DISABLED_MASK_BIT_SET(bit)					\

	 ( (((bit)>>5)==0  && (1UL<<((bit)&31) & DISABLED_MASK0 )) ||	\
@@ -83,9 +83,9 @@ extern const char * const x86_bug_flags[NBUGINTS*32]; 
	   (((bit)>>5)==11 && (1UL<<((bit)&31) & DISABLED_MASK11)) ||	\

	   (((bit)>>5)==12 && (1UL<<((bit)&31) & DISABLED_MASK12)) ||	\

	   (((bit)>>5)==13 && (1UL<<((bit)&31) & DISABLED_MASK13)) ||	\

	   (((bit)>>5)==13 && (1UL<<((bit)&31) & DISABLED_MASK14)) ||	\

	   (((bit)>>5)==13 && (1UL<<((bit)&31) & DISABLED_MASK15)) ||	\

	   (((bit)>>5)==14 && (1UL<<((bit)&31) & DISABLED_MASK16)) )

	   (((bit)>>5)==14 && (1UL<<((bit)&31) & DISABLED_MASK14)) ||	\

	   (((bit)>>5)==15 && (1UL<<((bit)&31) & DISABLED_MASK15)) ||	\

	   (((bit)>>5)==16 && (1UL<<((bit)&31) & DISABLED_MASK16)) )



#define cpu_has(c, bit)							\

	(__builtin_constant_p(bit) && REQUIRED_MASK_BIT_SET(bit) ? 1 :	\

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

+3 −3
Original line number Diff line number Diff line
@@ -29,11 +29,11 @@ 
#endif /* CONFIG_X86_64 */



#ifdef CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS

# define DISABLE_PKU		(1<<(X86_FEATURE_PKU))

# define DISABLE_OSPKE		(1<<(X86_FEATURE_OSPKE))

#else

# define DISABLE_PKU		0

# define DISABLE_OSPKE		0

#else

# define DISABLE_PKU		(1<<(X86_FEATURE_PKU & 31))

# define DISABLE_OSPKE		(1<<(X86_FEATURE_OSPKE & 31))

#endif /* CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS */



/*

arch/x86/kernel/cpu/common.c

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

#include <linux/numa.h>

#include <asm/asm.h>

#include <asm/bugs.h>

#include <asm/cpu.h>

#include <asm/mce.h>

#include <asm/msr.h>
@@ -270,6 +271,8 @@ static inline void squash_the_stupid_serial_number(struct cpuinfo_x86 *c) 
static __init int setup_disable_smep(char *arg)

{

	setup_clear_cpu_cap(X86_FEATURE_SMEP);

	/* Check for things that depend on SMEP being enabled: */

	check_mpx_erratum(&boot_cpu_data);

	return 1;

}

__setup("nosmep", setup_disable_smep);
@@ -310,6 +313,10 @@ static bool pku_disabled; 


static __always_inline void setup_pku(struct cpuinfo_x86 *c)

{

	/* check the boot processor, plus compile options for PKU: */

	if (!cpu_feature_enabled(X86_FEATURE_PKU))

		return;

	/* checks the actual processor's cpuid bits: */

	if (!cpu_has(c, X86_FEATURE_PKU))

		return;

	if (pku_disabled)