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

Commit 8eab6cd0 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 Peter Anvin:
 "This is a collection of minor fixes for x86, plus the IRET information
  leak fix (forbid the use of 16-bit segments in 64-bit mode)"

NOTE! We may have to relax the "forbid the use of 16-bit segments in
64-bit mode" part, since there may be people who still run and depend on
16-bit Windows binaries under Wine.

But I'm taking this in the current unconditional form for now to see who
(if anybody) screams bloody murder.  Maybe nobody cares.  And maybe
we'll have to update it with some kind of runtime enablement (like our
vm.mmap_min_addr tunable that people who run dosemu/qemu/wine already
need to tweak).

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86-64, modify_ldt: Ban 16-bit segments on 64-bit kernels
  efi: Pass correct file handle to efi_file_{read,close}
  x86/efi: Correct EFI boot stub use of code32_start
  x86/efi: Fix boot failure with EFI stub
  x86/platform/hyperv: Handle VMBUS driver being a module
  x86/apic: Reinstate error IRQ Pentium erratum 3AP workaround
  x86, CMCI: Add proper detection of end of CMCI storms
parents ede1d63f b3b42ac2

arch/x86/boot/compressed/eboot.c

+10 −9
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ __file_size64(void *__fh, efi_char16_t *filename_16, 
	efi_file_info_t *info;

	efi_status_t status;

	efi_guid_t info_guid = EFI_FILE_INFO_ID;

	u32 info_sz;

	u64 info_sz;



	status = efi_early->call((unsigned long)fh->open, fh, &h, filename_16,

				 EFI_FILE_MODE_READ, (u64)0);
@@ -167,31 +167,31 @@ efi_file_size(efi_system_table_t *sys_table, void *__fh, 
}



static inline efi_status_t

efi_file_read(void *__fh, void *handle, unsigned long *size, void *addr)

efi_file_read(void *handle, unsigned long *size, void *addr)

{

	unsigned long func;



	if (efi_early->is64) {

		efi_file_handle_64_t *fh = __fh;

		efi_file_handle_64_t *fh = handle;



		func = (unsigned long)fh->read;

		return efi_early->call(func, handle, size, addr);

	} else {

		efi_file_handle_32_t *fh = __fh;

		efi_file_handle_32_t *fh = handle;



		func = (unsigned long)fh->read;

		return efi_early->call(func, handle, size, addr);

	}

}



static inline efi_status_t efi_file_close(void *__fh, void *handle)

static inline efi_status_t efi_file_close(void *handle)

{

	if (efi_early->is64) {

		efi_file_handle_64_t *fh = __fh;

		efi_file_handle_64_t *fh = handle;



		return efi_early->call((unsigned long)fh->close, handle);

	} else {

		efi_file_handle_32_t *fh = __fh;

		efi_file_handle_32_t *fh = handle;



		return efi_early->call((unsigned long)fh->close, handle);

	}
@@ -1016,6 +1016,9 @@ void setup_graphics(struct boot_params *boot_params) 
 * Because the x86 boot code expects to be passed a boot_params we

 * need to create one ourselves (usually the bootloader would create

 * one for us).

 *

 * The caller is responsible for filling out ->code32_start in the

 * returned boot_params.

 */

struct boot_params *make_boot_params(struct efi_config *c)

{
@@ -1081,8 +1084,6 @@ struct boot_params *make_boot_params(struct efi_config *c) 
	hdr->vid_mode = 0xffff;

	hdr->boot_flag = 0xAA55;



	hdr->code32_start = (__u64)(unsigned long)image->image_base;



	hdr->type_of_loader = 0x21;



	/* Convert unicode cmdline to ascii */

arch/x86/boot/compressed/head_32.S

+2 −6
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ ENTRY(efi_pe_entry) 
	call	make_boot_params

	cmpl	$0, %eax

	je	fail

	movl	%esi, BP_code32_start(%eax)

	popl	%ecx

	pushl	%eax

	pushl	%ecx
@@ -90,12 +91,7 @@ fail: 
	hlt

	jmp	fail

2:

	call	3f

3:

	popl	%eax

	subl	$3b, %eax

	subl	BP_pref_address(%esi), %eax

	add	BP_code32_start(%esi), %eax

	movl	BP_code32_start(%esi), %eax

	leal	preferred_addr(%eax), %eax

	jmp	*%eax

arch/x86/boot/compressed/head_64.S

+3 −6
Original line number Diff line number Diff line
@@ -261,6 +261,8 @@ ENTRY(efi_pe_entry) 
	cmpq	$0,%rax

	je	fail

	mov	%rax, %rsi

	leaq	startup_32(%rip), %rax

	movl	%eax, BP_code32_start(%rsi)

	jmp	2f		/* Skip the relocation */



handover_entry:
@@ -284,12 +286,7 @@ fail: 
	hlt

	jmp	fail

2:

	call	3f

3:

	popq	%rax

	subq	$3b, %rax

	subq	BP_pref_address(%rsi), %rax

	add	BP_code32_start(%esi), %eax

	movl	BP_code32_start(%esi), %eax

	leaq	preferred_addr(%rax), %rax

	jmp	*%rax

arch/x86/kernel/apic/apic.c

+2 −1
Original line number Diff line number Diff line
@@ -1996,6 +1996,7 @@ static inline void __smp_error_interrupt(struct pt_regs *regs) 
	};



	/* First tickle the hardware, only then report what went on. -- REW */

	if (lapic_get_maxlvt() > 3)	/* Due to the Pentium erratum 3AP. */

		apic_write(APIC_ESR, 0);

	v = apic_read(APIC_ESR);

	ack_APIC_irq();

arch/x86/kernel/cpu/mcheck/mce.c

+17 −1
Original line number Diff line number Diff line
@@ -89,6 +89,9 @@ static DECLARE_WAIT_QUEUE_HEAD(mce_chrdev_wait); 
static DEFINE_PER_CPU(struct mce, mces_seen);

static int			cpu_missing;



/* CMCI storm detection filter */

static DEFINE_PER_CPU(unsigned long, mce_polled_error);



/*

 * MCA banks polled by the period polling timer for corrected events.

 * With Intel CMCI, this only has MCA banks which do not support CMCI (if any).
@@ -595,6 +598,7 @@ void machine_check_poll(enum mcp_flags flags, mce_banks_t *b) 
{

	struct mce m;

	int i;

	unsigned long *v;



	this_cpu_inc(mce_poll_count);
@@ -614,6 +618,8 @@ void machine_check_poll(enum mcp_flags flags, mce_banks_t *b) 
		if (!(m.status & MCI_STATUS_VAL))

			continue;



		v = &get_cpu_var(mce_polled_error);

		set_bit(0, v);

		/*

		 * Uncorrected or signalled events are handled by the exception

		 * handler when it is enabled, so don't process those here.
@@ -1278,10 +1284,18 @@ static unsigned long mce_adjust_timer_default(unsigned long interval) 
static unsigned long (*mce_adjust_timer)(unsigned long interval) =

	mce_adjust_timer_default;



static int cmc_error_seen(void)

{

	unsigned long *v = &__get_cpu_var(mce_polled_error);



	return test_and_clear_bit(0, v);

}



static void mce_timer_fn(unsigned long data)

{

	struct timer_list *t = &__get_cpu_var(mce_timer);

	unsigned long iv;

	int notify;



	WARN_ON(smp_processor_id() != data);
@@ -1296,7 +1310,9 @@ static void mce_timer_fn(unsigned long data) 
	 * polling interval, otherwise increase the polling interval.

	 */

	iv = __this_cpu_read(mce_next_interval);

	if (mce_notify_irq()) {

	notify = mce_notify_irq();

	notify |= cmc_error_seen();

	if (notify) {

		iv = max(iv / 2, (unsigned long) HZ/100);

	} else {

		iv = min(iv * 2, round_jiffies_relative(check_interval * HZ));