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

Commit 0ffedcda 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 updates from Ingo Molnar:
 "The main changes in this cycle were:

   - make the debugfs 'kernel_page_tables' file read-only, as it only
     has read ops.  (Borislav Petkov)

   - micro-optimize clflush_cache_range() (Chris Wilson)

   - swiotlb enhancements, which fixes certain KVM emulated devices
     (Igor Mammedov)

   - fix an LDT related debug message (Jan Beulich)

   - modularize CONFIG_X86_PTDUMP (Kees Cook)

   - tone down an overly alarming warning (Laura Abbott)

   - Mark variable __initdata (Rasmus Villemoes)

   - PAT additions (Toshi Kani)"

* 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mm: Micro-optimise clflush_cache_range()
  x86/mm/pat: Change free_memtype() to support shrinking case
  x86/mm/pat: Add untrack_pfn_moved for mremap
  x86/mm: Drop WARN from multi-BAR check
  x86/LDT: Print the real LDT base address
  x86/mm/64: Enable SWIOTLB if system has SRAT memory regions above MAX_DMA32_PFN
  x86/mm: Introduce max_possible_pfn
  x86/mm/ptdump: Make (debugfs)/kernel_page_tables read-only
  x86/mm/mtrr: Mark the 'range_new' static variable in mtrr_calc_range_state() as __initdata
  x86/mm: Turn CONFIG_X86_PTDUMP into a module
parents 6896d9f7 1f1a89ac

arch/x86/Kconfig.debug

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ config X86_PTDUMP_CORE 
	def_bool n



config X86_PTDUMP

	bool "Export kernel pagetable layout to userspace via debugfs"

	tristate "Export kernel pagetable layout to userspace via debugfs"

	depends on DEBUG_KERNEL

	select DEBUG_FS

	select X86_PTDUMP_CORE

arch/x86/kernel/cpu/mtrr/cleanup.c

+9 −2
Original line number Diff line number Diff line
@@ -593,9 +593,16 @@ mtrr_calc_range_state(u64 chunk_size, u64 gran_size, 
		      unsigned long x_remove_base,

		      unsigned long x_remove_size, int i)

{

	static struct range range_new[RANGE_NUM];

	/*

	 * range_new should really be an automatic variable, but

	 * putting 4096 bytes on the stack is frowned upon, to put it

	 * mildly. It is safe to make it a static __initdata variable,

	 * since mtrr_calc_range_state is only called during init and

	 * there's no way it will call itself recursively.

	 */

	static struct range range_new[RANGE_NUM] __initdata;

	unsigned long range_sums_new;

	static int nr_range_new;

	int nr_range_new;

	int num_reg;



	/* Convert ranges to var ranges state: */

arch/x86/kernel/pci-swiotlb.c

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ int __init pci_swiotlb_detect_4gb(void) 
{

	/* don't initialize swiotlb if iommu=off (no_iommu=1) */

#ifdef CONFIG_X86_64

	if (!no_iommu && max_pfn > MAX_DMA32_PFN)

	if (!no_iommu && max_possible_pfn > MAX_DMA32_PFN)

		swiotlb = 1;

#endif

	return swiotlb;

arch/x86/kernel/process_64.c

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ void release_thread(struct task_struct *dead_task) 
		if (dead_task->mm->context.ldt) {

			pr_warn("WARNING: dead process %s still has LDT? <%p/%d>\n",

				dead_task->comm,

				dead_task->mm->context.ldt,

				dead_task->mm->context.ldt->entries,

				dead_task->mm->context.ldt->size);

			BUG();

		}

arch/x86/kernel/setup.c

+2 −0
Original line number Diff line number Diff line
@@ -1048,6 +1048,8 @@ void __init setup_arch(char **cmdline_p) 
	if (mtrr_trim_uncached_memory(max_pfn))

		max_pfn = e820_end_of_ram_pfn();



	max_possible_pfn = max_pfn;



#ifdef CONFIG_X86_32

	/* max_low_pfn get updated here */

	find_low_pfn_range();