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

Commit 03867292 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: two KASAN fixes, two EFI boot fixes, two boot-delay
  optimization fixes, and a fix for a IRQ handling hang observed on
  virtual platforms"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mm, kasan: Silence KASAN warnings in get_wchan()
  compiler, atomics, kasan: Provide READ_ONCE_NOCHECK()
  x86, kasan: Fix build failure on KASAN=y && KMEMCHECK=y kernels
  x86/smpboot: Fix CPU #1 boot timeout
  x86/smpboot: Fix cpu_init_udelay=10000 corner case boot parameter misbehavior
  x86/ioapic: Disable interrupts when re-routing legacy IRQs
  x86/setup: Extend low identity map to cover whole kernel range
  x86/efi: Fix multiple GOP device support
parents df557936 f7d27c35

arch/x86/boot/compressed/eboot.c

+6 −2
Original line number Diff line number Diff line
@@ -667,6 +667,7 @@ setup_gop32(struct screen_info *si, efi_guid_t *proto, 
		bool conout_found = false;

		void *dummy = NULL;

		u32 h = handles[i];

		u32 current_fb_base;



		status = efi_call_early(handle_protocol, h,

					proto, (void **)&gop32);
@@ -678,7 +679,7 @@ setup_gop32(struct screen_info *si, efi_guid_t *proto, 
		if (status == EFI_SUCCESS)

			conout_found = true;



		status = __gop_query32(gop32, &info, &size, &fb_base);

		status = __gop_query32(gop32, &info, &size, &current_fb_base);

		if (status == EFI_SUCCESS && (!first_gop || conout_found)) {

			/*

			 * Systems that use the UEFI Console Splitter may
@@ -692,6 +693,7 @@ setup_gop32(struct screen_info *si, efi_guid_t *proto, 
			pixel_format = info->pixel_format;

			pixel_info = info->pixel_information;

			pixels_per_scan_line = info->pixels_per_scan_line;

			fb_base = current_fb_base;



			/*

			 * Once we've found a GOP supporting ConOut,
@@ -770,6 +772,7 @@ setup_gop64(struct screen_info *si, efi_guid_t *proto, 
		bool conout_found = false;

		void *dummy = NULL;

		u64 h = handles[i];

		u32 current_fb_base;



		status = efi_call_early(handle_protocol, h,

					proto, (void **)&gop64);
@@ -781,7 +784,7 @@ setup_gop64(struct screen_info *si, efi_guid_t *proto, 
		if (status == EFI_SUCCESS)

			conout_found = true;



		status = __gop_query64(gop64, &info, &size, &fb_base);

		status = __gop_query64(gop64, &info, &size, &current_fb_base);

		if (status == EFI_SUCCESS && (!first_gop || conout_found)) {

			/*

			 * Systems that use the UEFI Console Splitter may
@@ -795,6 +798,7 @@ setup_gop64(struct screen_info *si, efi_guid_t *proto, 
			pixel_format = info->pixel_format;

			pixel_info = info->pixel_information;

			pixels_per_scan_line = info->pixels_per_scan_line;

			fb_base = current_fb_base;



			/*

			 * Once we've found a GOP supporting ConOut,

arch/x86/include/asm/string_64.h

+2 −3
Original line number Diff line number Diff line
@@ -27,12 +27,11 @@ static __always_inline void *__inline_memcpy(void *to, const void *from, size_t 
   function. */



#define __HAVE_ARCH_MEMCPY 1

extern void *memcpy(void *to, const void *from, size_t len);

extern void *__memcpy(void *to, const void *from, size_t len);



#ifndef CONFIG_KMEMCHECK

#if (__GNUC__ == 4 && __GNUC_MINOR__ >= 3) || __GNUC__ > 4

extern void *memcpy(void *to, const void *from, size_t len);

#else

#if (__GNUC__ == 4 && __GNUC_MINOR__ < 3) || __GNUC__ < 4

#define memcpy(dst, src, len)					\

({								\

	size_t __len = (len);					\

arch/x86/kernel/apic/io_apic.c

+4 −0
Original line number Diff line number Diff line
@@ -2907,6 +2907,7 @@ int mp_irqdomain_alloc(struct irq_domain *domain, unsigned int virq, 
	struct irq_data *irq_data;

	struct mp_chip_data *data;

	struct irq_alloc_info *info = arg;

	unsigned long flags;



	if (!info || nr_irqs > 1)

		return -EINVAL;
@@ -2939,11 +2940,14 @@ int mp_irqdomain_alloc(struct irq_domain *domain, unsigned int virq, 


	cfg = irqd_cfg(irq_data);

	add_pin_to_irq_node(data, ioapic_alloc_attr_node(info), ioapic, pin);



	local_irq_save(flags);

	if (info->ioapic_entry)

		mp_setup_entry(cfg, data, info->ioapic_entry);

	mp_register_handler(virq, data->trigger);

	if (virq < nr_legacy_irqs())

		legacy_pic->mask(virq);

	local_irq_restore(flags);



	apic_printk(APIC_VERBOSE, KERN_DEBUG

		    "IOAPIC[%d]: Set routing entry (%d-%d -> 0x%x -> IRQ %d Mode:%i Active:%i Dest:%d)\n",

arch/x86/kernel/process.c

+3 −3
Original line number Diff line number Diff line
@@ -550,14 +550,14 @@ unsigned long get_wchan(struct task_struct *p) 
	if (sp < bottom || sp > top)

		return 0;



	fp = READ_ONCE(*(unsigned long *)sp);

	fp = READ_ONCE_NOCHECK(*(unsigned long *)sp);

	do {

		if (fp < bottom || fp > top)

			return 0;

		ip = READ_ONCE(*(unsigned long *)(fp + sizeof(unsigned long)));

		ip = READ_ONCE_NOCHECK(*(unsigned long *)(fp + sizeof(unsigned long)));

		if (!in_sched_functions(ip))

			return ip;

		fp = READ_ONCE(*(unsigned long *)fp);

		fp = READ_ONCE_NOCHECK(*(unsigned long *)fp);

	} while (count++ < 16 && p->state != TASK_RUNNING);

	return 0;

}

arch/x86/kernel/setup.c

+8 −0
Original line number Diff line number Diff line
@@ -1173,6 +1173,14 @@ void __init setup_arch(char **cmdline_p) 
	clone_pgd_range(initial_page_table + KERNEL_PGD_BOUNDARY,

			swapper_pg_dir     + KERNEL_PGD_BOUNDARY,

			KERNEL_PGD_PTRS);



	/*

	 * sync back low identity map too.  It is used for example

	 * in the 32-bit EFI stub.

	 */

	clone_pgd_range(initial_page_table,

			swapper_pg_dir     + KERNEL_PGD_BOUNDARY,

			KERNEL_PGD_PTRS);

#endif



	tboot_probe();