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

Commit 10a0c0f0 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 changes:
   - fix lguest bug
   - fix /proc/meminfo output on certain configs
   - fix pvclock bug
   - fix reboot on certain iMacs by adding new reboot quirk
   - fix bootup crash
   - fix FPU boot line option parsing
   - add more x86 self-tests
   - small cleanups, documentation improvements, etc"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/cpu/amd: Remove an unneeded condition in srat_detect_node()
  x86/vdso/pvclock: Protect STABLE check with the seqcount
  x86/mm: Improve switch_mm() barrier comments
  selftests/x86: Test __kernel_sigreturn and __kernel_rt_sigreturn
  x86/reboot/quirks: Add iMac10,1 to pci_reboot_dmi_table[]
  lguest: Map switcher text R/O
  x86/boot: Hide local labels in verify_cpu()
  x86/fpu: Disable AVX when eagerfpu is off
  x86/fpu: Disable MPX when eagerfpu is off
  x86/fpu: Disable XGETBV1 when no XSAVE
  x86/fpu: Fix early FPU command-line parsing
  x86/mm: Use PAGE_ALIGNED instead of IS_ALIGNED
  selftests/x86: Disable the ldt_gdt_64 test for now
  x86/mm/pat: Make split_page_count() check for empty levels to fix /proc/meminfo output
  x86/boot: Double BOOT_HEAP_SIZE to 64KB
  x86/mm: Add barriers and document switch_mm()-vs-flush synchronization
parents dcd1bfd5 7030a7e9

arch/x86/entry/vdso/vclock_gettime.c

+6 −6
Original line number Diff line number Diff line
@@ -126,23 +126,23 @@ static notrace cycle_t vread_pvclock(int *mode) 
	 *

	 * On Xen, we don't appear to have that guarantee, but Xen still

	 * supplies a valid seqlock using the version field.



	 *

	 * We only do pvclock vdso timing at all if

	 * PVCLOCK_TSC_STABLE_BIT is set, and we interpret that bit to

	 * mean that all vCPUs have matching pvti and that the TSC is

	 * synced, so we can just look at vCPU 0's pvti.

	 */



	if (unlikely(!(pvti->flags & PVCLOCK_TSC_STABLE_BIT))) {

		*mode = VCLOCK_NONE;

		return 0;

	}



	do {

		version = pvti->version;



		smp_rmb();



		if (unlikely(!(pvti->flags & PVCLOCK_TSC_STABLE_BIT))) {

			*mode = VCLOCK_NONE;

			return 0;

		}



		tsc = rdtsc_ordered();

		pvti_tsc_to_system_mul = pvti->tsc_to_system_mul;

		pvti_tsc_shift = pvti->tsc_shift;

arch/x86/include/asm/boot.h

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#define BOOT_HEAP_SIZE             0x400000

#else /* !CONFIG_KERNEL_BZIP2 */



#define BOOT_HEAP_SIZE	0x8000

#define BOOT_HEAP_SIZE	0x10000



#endif /* !CONFIG_KERNEL_BZIP2 */

arch/x86/include/asm/fpu/internal.h

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ extern void fpu__init_cpu_xstate(void); 
extern void fpu__init_system(struct cpuinfo_x86 *c);

extern void fpu__init_check_bugs(void);

extern void fpu__resume_cpu(void);

extern u64 fpu__get_supported_xfeatures_mask(void);



/*

 * Debugging facility:

arch/x86/include/asm/fpu/xstate.h

+6 −5
Original line number Diff line number Diff line
@@ -20,15 +20,16 @@ 


/* Supported features which support lazy state saving */

#define XFEATURE_MASK_LAZY	(XFEATURE_MASK_FP | \

				 XFEATURE_MASK_SSE | \

				 XFEATURE_MASK_SSE)



/* Supported features which require eager state saving */

#define XFEATURE_MASK_EAGER	(XFEATURE_MASK_BNDREGS | \

				 XFEATURE_MASK_BNDCSR | \

				 XFEATURE_MASK_YMM | \

				 XFEATURE_MASK_OPMASK | \

				 XFEATURE_MASK_ZMM_Hi256 | \

				 XFEATURE_MASK_Hi16_ZMM)



/* Supported features which require eager state saving */

#define XFEATURE_MASK_EAGER	(XFEATURE_MASK_BNDREGS | XFEATURE_MASK_BNDCSR)



/* All currently supported features */

#define XCNTXT_MASK	(XFEATURE_MASK_LAZY | XFEATURE_MASK_EAGER)

arch/x86/include/asm/lguest.h

+3 −1
Original line number Diff line number Diff line
@@ -12,7 +12,9 @@ 
#define GUEST_PL 1



/* Page for Switcher text itself, then two pages per cpu */

#define TOTAL_SWITCHER_PAGES (1 + 2 * nr_cpu_ids)

#define SWITCHER_TEXT_PAGES (1)

#define SWITCHER_STACK_PAGES (2 * nr_cpu_ids)

#define TOTAL_SWITCHER_PAGES (SWITCHER_TEXT_PAGES + SWITCHER_STACK_PAGES)



/* Where we map the Switcher, in both Host and Guest. */

extern unsigned long switcher_addr;