Commit 16b76293 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 boot updates from Ingo Molnar:
 "The biggest changes in this cycle were:

   - reworking of the e820 code: separate in-kernel and boot-ABI data
     structures and apply a whole range of cleanups to the kernel side.

     No change in functionality.

   - enable KASLR by default: it's used by all major distros and it's
     out of the experimental stage as well.

   - ... misc fixes and cleanups"

* 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (63 commits)
  x86/KASLR: Fix kexec kernel boot crash when KASLR randomization fails
  x86/reboot: Turn off KVM when halting a CPU
  x86/boot: Fix BSS corruption/overwrite bug in early x86 kernel startup
  x86: Enable KASLR by default
  boot/param: Move next_arg() function to lib/cmdline.c for later reuse
  x86/boot: Fix Sparse warning by including required header file
  x86/boot/64: Rename start_cpu()
  x86/xen: Update e820 table handling to the new core x86 E820 code
  x86/boot: Fix pr_debug() API braindamage
  xen, x86/headers: Add <linux/device.h> dependency to <asm/xen/page.h>
  x86/boot/e820: Simplify e820__update_table()
  x86/boot/e820: Separate the E820 ABI structures from the in-kernel structures
  x86/boot/e820: Fix and clean up e820_type switch() statements
  x86/boot/e820: Rename the remaining E820 APIs to the e820__*() prefix
  x86/boot/e820: Remove unnecessary #include's
  x86/boot/e820: Rename e820_mark_nosave_regions() to e820__register_nosave_regions()
  x86/boot/e820: Rename e820_reserve_resources*() to e820__reserve_resources*()
  x86/boot/e820: Use bool in query APIs
  x86/boot/e820: Document e820__reserve_setup_data()
  x86/boot/e820: Clean up __e820__update_table() et al
  ...
parents 3dee9fb2 da63b6b2

Documentation/x86/zero-page.txt

+3 −3
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ Offset Proto Name Meaning 
1C0/020	ALL	efi_info	EFI 32 information (struct efi_info)

1E0/004	ALL	alk_mem_k	Alternative mem check, in KB

1E4/004	ALL	scratch		Scratch field for the kernel setup code

1E8/001	ALL	e820_entries	Number of entries in e820_map (below)

1E8/001	ALL	e820_entries	Number of entries in e820_table (below)

1E9/001	ALL	eddbuf_entries	Number of entries in eddbuf (below)

1EA/001	ALL	edd_mbr_sig_buf_entries	Number of entries in edd_mbr_sig_buffer

				(below)
@@ -35,6 +35,6 @@ Offset Proto Name Meaning 
1EC/001	ALL     secure_boot	Secure boot is enabled in the firmware

1EF/001	ALL	sentinel	Used to detect broken bootloaders

290/040	ALL	edd_mbr_sig_buffer EDD MBR signatures

2D0/A00	ALL	e820_map	E820 memory map table

				(array of struct e820entry)

2D0/A00	ALL	e820_table	E820 memory map table

				(array of struct e820_entry)

D00/1EC	ALL	eddbuf		EDD data (array of struct edd_info)

arch/x86/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -1973,7 +1973,7 @@ config RELOCATABLE 
config RANDOMIZE_BASE

	bool "Randomize the address of the kernel image (KASLR)"

	depends on RELOCATABLE

	default n

	default y

	---help---

	  In support of Kernel Address Space Layout Randomization (KASLR),

	  this randomizes the physical address at which the kernel image
@@ -2003,7 +2003,7 @@ config RANDOMIZE_BASE 
	  theoretically possible, but the implementations are further

	  limited due to memory layouts.



	  If unsure, say N.

	  If unsure, say Y.



# Relocation on x86 needs some additional build support

config X86_NEED_RELOCS
@@ -2052,7 +2052,7 @@ config RANDOMIZE_MEMORY 
	   configuration have in average 30,000 different possible virtual

	   addresses for each memory section.



	   If unsure, say N.

	   If unsure, say Y.



config RANDOMIZE_MEMORY_PHYSICAL_PADDING

	hex "Physical memory mapping padding" if EXPERT

arch/x86/boot/boot.h

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#ifndef BOOT_BOOT_H

#define BOOT_BOOT_H



#define STACK_SIZE	512	/* Minimum number of bytes for stack */

#define STACK_SIZE	1024	/* Minimum number of bytes for stack */



#ifndef __ASSEMBLY__

arch/x86/boot/compressed/eboot.c

+23 −21
Original line number Diff line number Diff line
@@ -9,7 +9,9 @@ 


#include <linux/efi.h>

#include <linux/pci.h>



#include <asm/efi.h>

#include <asm/e820/types.h>

#include <asm/setup.h>

#include <asm/desc.h>
@@ -729,7 +731,7 @@ static void add_e820ext(struct boot_params *params, 
	unsigned long size;



	e820ext->type = SETUP_E820_EXT;

	e820ext->len = nr_entries * sizeof(struct e820entry);

	e820ext->len = nr_entries * sizeof(struct boot_e820_entry);

	e820ext->next = 0;



	data = (struct setup_data *)(unsigned long)params->hdr.setup_data;
@@ -746,9 +748,9 @@ static void add_e820ext(struct boot_params *params, 
static efi_status_t setup_e820(struct boot_params *params,

			       struct setup_data *e820ext, u32 e820ext_size)

{

	struct e820entry *e820_map = &params->e820_map[0];

	struct boot_e820_entry *entry = params->e820_table;

	struct efi_info *efi = &params->efi_info;

	struct e820entry *prev = NULL;

	struct boot_e820_entry *prev = NULL;

	u32 nr_entries;

	u32 nr_desc;

	int i;
@@ -773,15 +775,15 @@ static efi_status_t setup_e820(struct boot_params *params, 
		case EFI_MEMORY_MAPPED_IO:

		case EFI_MEMORY_MAPPED_IO_PORT_SPACE:

		case EFI_PAL_CODE:

			e820_type = E820_RESERVED;

			e820_type = E820_TYPE_RESERVED;

			break;



		case EFI_UNUSABLE_MEMORY:

			e820_type = E820_UNUSABLE;

			e820_type = E820_TYPE_UNUSABLE;

			break;



		case EFI_ACPI_RECLAIM_MEMORY:

			e820_type = E820_ACPI;

			e820_type = E820_TYPE_ACPI;

			break;



		case EFI_LOADER_CODE:
@@ -789,15 +791,15 @@ static efi_status_t setup_e820(struct boot_params *params, 
		case EFI_BOOT_SERVICES_CODE:

		case EFI_BOOT_SERVICES_DATA:

		case EFI_CONVENTIONAL_MEMORY:

			e820_type = E820_RAM;

			e820_type = E820_TYPE_RAM;

			break;



		case EFI_ACPI_MEMORY_NVS:

			e820_type = E820_NVS;

			e820_type = E820_TYPE_NVS;

			break;



		case EFI_PERSISTENT_MEMORY:

			e820_type = E820_PMEM;

			e820_type = E820_TYPE_PMEM;

			break;



		default:
@@ -811,26 +813,26 @@ static efi_status_t setup_e820(struct boot_params *params, 
			continue;

		}



		if (nr_entries == ARRAY_SIZE(params->e820_map)) {

			u32 need = (nr_desc - i) * sizeof(struct e820entry) +

		if (nr_entries == ARRAY_SIZE(params->e820_table)) {

			u32 need = (nr_desc - i) * sizeof(struct e820_entry) +

				   sizeof(struct setup_data);



			if (!e820ext || e820ext_size < need)

				return EFI_BUFFER_TOO_SMALL;



			/* boot_params map full, switch to e820 extended */

			e820_map = (struct e820entry *)e820ext->data;

			entry = (struct boot_e820_entry *)e820ext->data;

		}



		e820_map->addr = d->phys_addr;

		e820_map->size = d->num_pages << PAGE_SHIFT;

		e820_map->type = e820_type;

		prev = e820_map++;

		entry->addr = d->phys_addr;

		entry->size = d->num_pages << PAGE_SHIFT;

		entry->type = e820_type;

		prev = entry++;

		nr_entries++;

	}



	if (nr_entries > ARRAY_SIZE(params->e820_map)) {

		u32 nr_e820ext = nr_entries - ARRAY_SIZE(params->e820_map);

	if (nr_entries > ARRAY_SIZE(params->e820_table)) {

		u32 nr_e820ext = nr_entries - ARRAY_SIZE(params->e820_table);



		add_e820ext(params, e820ext, nr_e820ext);

		nr_entries -= nr_e820ext;
@@ -848,7 +850,7 @@ static efi_status_t alloc_e820ext(u32 nr_desc, struct setup_data **e820ext, 
	unsigned long size;



	size = sizeof(struct setup_data) +

		sizeof(struct e820entry) * nr_desc;

		sizeof(struct e820_entry) * nr_desc;



	if (*e820ext) {

		efi_call_early(free_pool, *e820ext);
@@ -884,9 +886,9 @@ static efi_status_t exit_boot_func(efi_system_table_t *sys_table_arg, 


	if (first) {

		nr_desc = *map->buff_size / *map->desc_size;

		if (nr_desc > ARRAY_SIZE(p->boot_params->e820_map)) {

		if (nr_desc > ARRAY_SIZE(p->boot_params->e820_table)) {

			u32 nr_e820ext = nr_desc -

					ARRAY_SIZE(p->boot_params->e820_map);

					ARRAY_SIZE(p->boot_params->e820_table);



			status = alloc_e820ext(nr_e820ext, &p->e820ext,

					       &p->e820ext_size);

arch/x86/boot/compressed/kaslr.c

+12 −5
Original line number Diff line number Diff line
@@ -426,7 +426,7 @@ static unsigned long slots_fetch_random(void) 
	return 0;

}



static void process_e820_entry(struct e820entry *entry,

static void process_e820_entry(struct boot_e820_entry *entry,

			       unsigned long minimum,

			       unsigned long image_size)

{
@@ -435,7 +435,7 @@ static void process_e820_entry(struct e820entry *entry, 
	unsigned long start_orig;



	/* Skip non-RAM entries. */

	if (entry->type != E820_RAM)

	if (entry->type != E820_TYPE_RAM)

		return;



	/* On 32-bit, ignore entries entirely above our maximum. */
@@ -518,7 +518,7 @@ static unsigned long find_random_phys_addr(unsigned long minimum, 


	/* Verify potential e820 positions, appending to slots list. */

	for (i = 0; i < boot_params->e820_entries; i++) {

		process_e820_entry(&boot_params->e820_map[i], minimum,

		process_e820_entry(&boot_params->e820_table[i], minimum,

				   image_size);

		if (slot_area_index == MAX_SLOT_AREA) {

			debug_putstr("Aborted e820 scan (slot_areas full)!\n");
@@ -597,10 +597,17 @@ void choose_random_location(unsigned long input, 
			add_identity_map(random_addr, output_size);

			*output = random_addr;

		}

	}



	/* This actually loads the identity pagetable on x86_64. */

		/*

		 * This loads the identity mapping page table.

		 * This should only be done if a new physical address

		 * is found for the kernel, otherwise we should keep

		 * the old page table to make it be like the "nokaslr"

		 * case.

		 */

		finalize_identity_maps();

	}





	/* Pick random virtual address starting from LOAD_PHYSICAL_ADDR. */

	if (IS_ENABLED(CONFIG_X86_64))

CRA Git | Maintained and supported by SUSTech CRA and CCSE