Commit 4fe34d61 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:
 "A small set of x86 fixes:

   - Prevent a NULL pointer dereference in the X2APIC code in case of a
     CPU hotplug failure.

   - Prevent boot failures on HP superdome machines by invalidating the
     level2 kernel pagetable entries outside of the kernel area as
     invalid so BIOS reserved space won't be touched unintentionally.

     Also ensure that memory holes are rounded up to the next PMD
     boundary correctly.

   - Enable X2APIC support on Hyper-V to prevent boot failures.

   - Set the paravirt name when running on Hyper-V for consistency

   - Move a function under the appropriate ifdef guard to prevent build
     warnings"

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/boot/acpi: Move get_cmdline_acpi_rsdp() under #ifdef guard
  x86/hyperv: Set pv_info.name to "Hyper-V"
  x86/apic/x2apic: Fix a NULL pointer deref when handling a dying cpu
  x86/hyperv: Make vapic support x2apic mode
  x86/boot/64: Round memory hole size up to next PMD page
  x86/boot/64: Make level2_kernel_pgt pages invalid outside kernel area
parents 81c4bc31 228d1200

arch/x86/boot/compressed/acpi.c

+24 −24
Original line number Diff line number Diff line
@@ -20,30 +20,6 @@ 
 */

struct mem_vector immovable_mem[MAX_NUMNODES*2];



/*

 * Max length of 64-bit hex address string is 19, prefix "0x" + 16 hex

 * digits, and '\0' for termination.

 */

#define MAX_ADDR_LEN 19



static acpi_physical_address get_cmdline_acpi_rsdp(void)

{

	acpi_physical_address addr = 0;



#ifdef CONFIG_KEXEC

	char val[MAX_ADDR_LEN] = { };

	int ret;



	ret = cmdline_find_option("acpi_rsdp", val, MAX_ADDR_LEN);

	if (ret < 0)

		return 0;



	if (kstrtoull(val, 16, &addr))

		return 0;

#endif

	return addr;

}



/*

 * Search EFI system tables for RSDP.  If both ACPI_20_TABLE_GUID and

 * ACPI_TABLE_GUID are found, take the former, which has more features.
@@ -298,6 +274,30 @@ acpi_physical_address get_rsdp_addr(void) 
}



#if defined(CONFIG_RANDOMIZE_BASE) && defined(CONFIG_MEMORY_HOTREMOVE)

/*

 * Max length of 64-bit hex address string is 19, prefix "0x" + 16 hex

 * digits, and '\0' for termination.

 */

#define MAX_ADDR_LEN 19



static acpi_physical_address get_cmdline_acpi_rsdp(void)

{

	acpi_physical_address addr = 0;



#ifdef CONFIG_KEXEC

	char val[MAX_ADDR_LEN] = { };

	int ret;



	ret = cmdline_find_option("acpi_rsdp", val, MAX_ADDR_LEN);

	if (ret < 0)

		return 0;



	if (kstrtoull(val, 16, &addr))

		return 0;

#endif

	return addr;

}



/* Compute SRAT address from RSDP. */

static unsigned long get_acpi_srat_table(void)

{

arch/x86/boot/compressed/misc.c

+19 −6
Original line number Diff line number Diff line
@@ -345,6 +345,7 @@ asmlinkage __visible void *extract_kernel(void *rmode, memptr heap, 
{

	const unsigned long kernel_total_size = VO__end - VO__text;

	unsigned long virt_addr = LOAD_PHYSICAL_ADDR;

	unsigned long needed_size;



	/* Retain x86 boot parameters pointer passed from startup_32/64. */

	boot_params = rmode;
@@ -379,26 +380,38 @@ asmlinkage __visible void *extract_kernel(void *rmode, memptr heap, 
	free_mem_ptr     = heap;	/* Heap */

	free_mem_end_ptr = heap + BOOT_HEAP_SIZE;



	/*

	 * The memory hole needed for the kernel is the larger of either

	 * the entire decompressed kernel plus relocation table, or the

	 * entire decompressed kernel plus .bss and .brk sections.

	 *

	 * On X86_64, the memory is mapped with PMD pages. Round the

	 * size up so that the full extent of PMD pages mapped is

	 * included in the check against the valid memory table

	 * entries. This ensures the full mapped area is usable RAM

	 * and doesn't include any reserved areas.

	 */

	needed_size = max(output_len, kernel_total_size);

#ifdef CONFIG_X86_64

	needed_size = ALIGN(needed_size, MIN_KERNEL_ALIGN);

#endif



	/* Report initial kernel position details. */

	debug_putaddr(input_data);

	debug_putaddr(input_len);

	debug_putaddr(output);

	debug_putaddr(output_len);

	debug_putaddr(kernel_total_size);

	debug_putaddr(needed_size);



#ifdef CONFIG_X86_64

	/* Report address of 32-bit trampoline */

	debug_putaddr(trampoline_32bit);

#endif



	/*

	 * The memory hole needed for the kernel is the larger of either

	 * the entire decompressed kernel plus relocation table, or the

	 * entire decompressed kernel plus .bss and .brk sections.

	 */

	choose_random_location((unsigned long)input_data, input_len,

				(unsigned long *)&output,

				max(output_len, kernel_total_size),

				needed_size,

				&virt_addr);



	/* Validate memory location choices. */

arch/x86/hyperv/hv_apic.c

+15 −5
Original line number Diff line number Diff line
@@ -260,11 +260,21 @@ void __init hv_apic_init(void) 
	}



	if (ms_hyperv.hints & HV_X64_APIC_ACCESS_RECOMMENDED) {

		pr_info("Hyper-V: Using MSR based APIC access\n");

		pr_info("Hyper-V: Using enlightened APIC (%s mode)",

			x2apic_enabled() ? "x2apic" : "xapic");

		/*

		 * With x2apic, architectural x2apic MSRs are equivalent to the

		 * respective synthetic MSRs, so there's no need to override

		 * the apic accessors.  The only exception is

		 * hv_apic_eoi_write, because it benefits from lazy EOI when

		 * available, but it works for both xapic and x2apic modes.

		 */

		apic_set_eoi_write(hv_apic_eoi_write);

		if (!x2apic_enabled()) {

			apic->read      = hv_apic_read;

			apic->write     = hv_apic_write;

			apic->icr_write = hv_apic_icr_write;

			apic->icr_read  = hv_apic_icr_read;

		}

	}

}

arch/x86/kernel/apic/x2apic_cluster.c

+2 −1
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ static int x2apic_dead_cpu(unsigned int dead_cpu) 
{

	struct cluster_mask *cmsk = per_cpu(cluster_masks, dead_cpu);



	if (cmsk)

		cpumask_clear_cpu(dead_cpu, &cmsk->mask);

	free_cpumask_var(per_cpu(ipi_mask, dead_cpu));

	return 0;

arch/x86/kernel/cpu/mshyperv.c

+4 −0
Original line number Diff line number Diff line
@@ -216,6 +216,10 @@ static void __init ms_hyperv_init_platform(void) 
	int hv_host_info_ecx;

	int hv_host_info_edx;



#ifdef CONFIG_PARAVIRT

	pv_info.name = "Hyper-V";

#endif



	/*

	 * Extract the features and hints

	 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE