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

Commit 1daa1cfb 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 Thomas Gleixner:

 - the high latency PIT detection fix, which slipped through the cracks
   for rc1

 - a regression fix for the early printk mechanism

 - the x86 part to plug irq/vector related hotplug races

 - move the allocation of the espfix pages on cpu hotplug to non atomic
   context.  The current code triggers a might_sleep() warning.

 - a series of KASAN fixes addressing boot crashes and usability

 - a trivial typo fix for Kconfig help text

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/kconfig: Fix typo in the CONFIG_CMDLINE_BOOL help text
  x86/irq: Retrieve irq data after locking irq_desc
  x86/irq: Use proper locking in check_irq_vectors_for_cpu_disable()
  x86/irq: Plug irq vector hotplug race
  x86/earlyprintk: Allow early_printk() to use console style parameters like '115200n8'
  x86/espfix: Init espfix on the boot CPU side
  x86/espfix: Add 'cpu' parameter to init_espfix_ap()
  x86/kasan: Move KASAN_SHADOW_OFFSET to the arch Kconfig
  x86/kasan: Add message about KASAN being initialized
  x86/kasan: Fix boot crash on AMD processors
  x86/kasan: Flush TLBs after switching CR3
  x86/kasan: Fix KASAN shadow region page tables
  x86/init: Clear 'init_level4_pgt' earlier
  x86/tsc: Let high latency PIT fail fast in quick_pit_calibrate()
parents 7b732169 69711ca1

arch/x86/Kconfig

+6 −1
Original line number Diff line number Diff line
@@ -254,6 +254,11 @@ config ARCH_SUPPORTS_OPTIMIZED_INLINING 
config ARCH_SUPPORTS_DEBUG_PAGEALLOC

	def_bool y



config KASAN_SHADOW_OFFSET

	hex

	depends on KASAN

	default 0xdffffc0000000000



config HAVE_INTEL_TXT

	def_bool y

	depends on INTEL_IOMMU && ACPI
@@ -2015,7 +2020,7 @@ config CMDLINE_BOOL 


	  To compile command line arguments into the kernel,

	  set this option to 'Y', then fill in the

	  the boot arguments in CONFIG_CMDLINE.

	  boot arguments in CONFIG_CMDLINE.



	  Systems with fully functional boot loaders (i.e. non-embedded)

	  should leave this option set to 'N'.

arch/x86/include/asm/espfix.h

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ DECLARE_PER_CPU_READ_MOSTLY(unsigned long, espfix_stack); 
DECLARE_PER_CPU_READ_MOSTLY(unsigned long, espfix_waddr);



extern void init_espfix_bsp(void);

extern void init_espfix_ap(void);

extern void init_espfix_ap(int cpu);



#endif /* CONFIG_X86_64 */

arch/x86/include/asm/kasan.h

+2 −6
Original line number Diff line number Diff line
@@ -14,15 +14,11 @@ 


#ifndef __ASSEMBLY__



extern pte_t kasan_zero_pte[];

extern pte_t kasan_zero_pmd[];

extern pte_t kasan_zero_pud[];



#ifdef CONFIG_KASAN

void __init kasan_map_early_shadow(pgd_t *pgd);

void __init kasan_early_init(void);

void __init kasan_init(void);

#else

static inline void kasan_map_early_shadow(pgd_t *pgd) { }

static inline void kasan_early_init(void) { }

static inline void kasan_init(void) { }

#endif

arch/x86/kernel/apic/vector.c

+2 −8
Original line number Diff line number Diff line
@@ -409,12 +409,6 @@ static void __setup_vector_irq(int cpu) 
	int irq, vector;

	struct apic_chip_data *data;



	/*

	 * vector_lock will make sure that we don't run into irq vector

	 * assignments that might be happening on another cpu in parallel,

	 * while we setup our initial vector to irq mappings.

	 */

	raw_spin_lock(&vector_lock);

	/* Mark the inuse vectors */

	for_each_active_irq(irq) {

		data = apic_chip_data(irq_get_irq_data(irq));
@@ -436,16 +430,16 @@ static void __setup_vector_irq(int cpu) 
		if (!cpumask_test_cpu(cpu, data->domain))

			per_cpu(vector_irq, cpu)[vector] = VECTOR_UNDEFINED;

	}

	raw_spin_unlock(&vector_lock);

}



/*

 * Setup the vector to irq mappings.

 * Setup the vector to irq mappings. Must be called with vector_lock held.

 */

void setup_vector_irq(int cpu)

{

	int irq;



	lockdep_assert_held(&vector_lock);

	/*

	 * On most of the platforms, legacy PIC delivers the interrupts on the

	 * boot cpu. But there are certain platforms where PIC interrupts are

arch/x86/kernel/early_printk.c

+3 −1
Original line number Diff line number Diff line
@@ -175,7 +175,9 @@ static __init void early_serial_init(char *s) 
	}



	if (*s) {

		if (kstrtoul(s, 0, &baud) < 0 || baud == 0)

		baud = simple_strtoull(s, &e, 0);



		if (baud == 0 || s == e)

			baud = DEFAULT_BAUD;

	}