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

Commit 6cf78d4b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull x86 mm changes from Ingo Molnar:
 "The main changes in this cycle were:

   - reduce the x86/32 PAE per task PGD allocation overhead from 4K to
     0.032k (Fenghua Yu)

   - early_ioremap/memunmap() usage cleanups (Juergen Gross)

   - gbpages support cleanups (Luis R Rodriguez)

   - improve AMD Bulldozer (family 0x15) ASLR I$ aliasing workaround to
     increase randomization by 3 bits (per bootup) (Hector
     Marco-Gisbert)

   - misc fixlets"

* 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mm: Improve AMD Bulldozer ASLR workaround
  x86/mm/pat: Initialize __cachemode2pte_tbl[] and __pte2cachemode_tbl[] in a bit more readable fashion
  init.h: Clean up the __setup()/early_param() macros
  x86/mm: Simplify probe_page_size_mask()
  x86/mm: Further simplify 1 GB kernel linear mappings handling
  x86/mm: Use early_param_on_off() for direct_gbpages
  init.h: Add early_param_on_off()
  x86/mm: Simplify enabling direct_gbpages
  x86/mm: Use IS_ENABLED() for direct_gbpages
  x86/mm: Unexport set_memory_ro() and set_memory_rw()
  x86/mm, efi: Use early_ioremap() in arch/x86/platform/efi/efi-bgrt.c
  x86/mm: Use early_memunmap() instead of early_iounmap()
  x86/mm/pat: Ensure different messages in STRICT_DEVMEM and PAT cases
  x86/mm: Reduce PAE-mode per task pgd allocation overhead from 4K to 32 bytes
parents 0ad5c6b3 4e26d11f

arch/x86/Kconfig

+7 −7
Original line number Diff line number Diff line
@@ -1295,14 +1295,14 @@ config ARCH_DMA_ADDR_T_64BIT 
	def_bool y

	depends on X86_64 || HIGHMEM64G



config DIRECT_GBPAGES

	bool "Enable 1GB pages for kernel pagetables" if EXPERT

	default y

	depends on X86_64

config X86_DIRECT_GBPAGES

	def_bool y

	depends on X86_64 && !DEBUG_PAGEALLOC && !KMEMCHECK

	---help---

	  Allow the kernel linear mapping to use 1GB pages on CPUs that

	  support it. This can improve the kernel's performance a tiny bit by

	  reducing TLB pressure. If in doubt, say "Y".

	  Certain kernel features effectively disable kernel

	  linear 1 GB mappings (even if the CPU otherwise

	  supports them), so don't confuse the user by printing

	  that we have them enabled.



# Common NUMA Features

config NUMA

arch/x86/include/asm/elf.h

+1 −0
Original line number Diff line number Diff line
@@ -366,6 +366,7 @@ enum align_flags { 
struct va_alignment {

	int flags;

	unsigned long mask;

	unsigned long bits;

} ____cacheline_aligned;



extern struct va_alignment va_align;

arch/x86/kernel/cpu/amd.c

+4 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 


#include <linux/io.h>

#include <linux/sched.h>

#include <linux/random.h>

#include <asm/processor.h>

#include <asm/apic.h>

#include <asm/cpu.h>
@@ -488,6 +489,9 @@ static void bsp_init_amd(struct cpuinfo_x86 *c) 


		va_align.mask	  = (upperbit - 1) & PAGE_MASK;

		va_align.flags    = ALIGN_VA_32 | ALIGN_VA_64;



		/* A random value per boot for bit slice [12:upper_bit) */

		va_align.bits = get_random_int() & va_align.mask;

	}

}

arch/x86/kernel/devicetree.c

+2 −2
Original line number Diff line number Diff line
@@ -286,13 +286,13 @@ static void __init x86_flattree_get_config(void) 
	initial_boot_params = dt = early_memremap(initial_dtb, map_len);

	size = of_get_flat_dt_size();

	if (map_len < size) {

		early_iounmap(dt, map_len);

		early_memunmap(dt, map_len);

		initial_boot_params = dt = early_memremap(initial_dtb, size);

		map_len = size;

	}



	unflatten_and_copy_device_tree();

	early_iounmap(dt, map_len);

	early_memunmap(dt, map_len);

}

#else

static inline void x86_flattree_get_config(void) { }

arch/x86/kernel/e820.c

+1 −1
Original line number Diff line number Diff line
@@ -661,7 +661,7 @@ void __init parse_e820_ext(u64 phys_addr, u32 data_len) 
	extmap = (struct e820entry *)(sdata->data);

	__append_e820_map(extmap, entries);

	sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);

	early_iounmap(sdata, data_len);

	early_memunmap(sdata, data_len);

	printk(KERN_INFO "e820: extended physical RAM map:\n");

	e820_print_map("extended");

}