Commit 4f292c4d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86_mm_for_6.2_v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 mm updates from Dave Hansen:
 "New Feature:

   - Randomize the per-cpu entry areas

  Cleanups:

   - Have CR3_ADDR_MASK use PHYSICAL_PAGE_MASK instead of open coding it

   - Move to "native" set_memory_rox() helper

   - Clean up pmd_get_atomic() and i386-PAE

   - Remove some unused page table size macros"

* tag 'x86_mm_for_6.2_v2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (35 commits)
  x86/mm: Ensure forced page table splitting
  x86/kasan: Populate shadow for shared chunk of the CPU entry area
  x86/kasan: Add helpers to align shadow addresses up and down
  x86/kasan: Rename local CPU_ENTRY_AREA variables to shorten names
  x86/mm: Populate KASAN shadow for entire per-CPU range of CPU entry area
  x86/mm: Recompute physical address for every page of per-CPU CEA mapping
  x86/mm: Rename __change_page_attr_set_clr(.checkalias)
  x86/mm: Inhibit _PAGE_NX changes from cpa_process_alias()
  x86/mm: Untangle __change_page_attr_set_clr(.checkalias)
  x86/mm: Add a few comments
  x86/mm: Fix CR3_ADDR_MASK
  x86/mm: Remove P*D_PAGE_MASK and P*D_PAGE_SIZE macros
  mm: Convert __HAVE_ARCH_P..P_GET to the new style
  mm: Remove pointless barrier() after pmdp_get_lockless()
  x86/mm/pae: Get rid of set_64bit()
  x86_64: Remove pointless set_64bit() usage
  x86/mm/pae: Be consistent with pXXp_get_and_clear()
  x86/mm/pae: Use WRITE_ONCE()
  x86/mm/pae: Don't (ab)use atomic64
  mm/gup: Fix the lockless PMD access
  ...
parents 03d84bd6 3e844d84

arch/arm/mach-omap1/sram-init.c

+3 −5
Original line number Diff line number Diff line
@@ -10,11 +10,11 @@ 
#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/io.h>

#include <linux/set_memory.h>



#include <asm/fncpy.h>

#include <asm/tlb.h>

#include <asm/cacheflush.h>

#include <asm/set_memory.h>



#include <asm/mach/map.h>
@@ -74,8 +74,7 @@ void *omap_sram_push(void *funcp, unsigned long size) 


	dst = fncpy(sram, funcp, size);



	set_memory_ro(base, pages);

	set_memory_x(base, pages);

	set_memory_rox(base, pages);



	return dst;

}
@@ -126,8 +125,7 @@ static void __init omap_detect_and_map_sram(void) 
	base = (unsigned long)omap_sram_base;

	pages = PAGE_ALIGN(omap_sram_size) / PAGE_SIZE;



	set_memory_ro(base, pages);

	set_memory_x(base, pages);

	set_memory_rox(base, pages);

}



static void (*_omap_sram_reprogram_clock)(u32 dpllctl, u32 ckctl);

arch/arm/mach-omap2/sram.c

+3 −5
Original line number Diff line number Diff line
@@ -14,11 +14,11 @@ 
#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/io.h>

#include <linux/set_memory.h>



#include <asm/fncpy.h>

#include <asm/tlb.h>

#include <asm/cacheflush.h>

#include <asm/set_memory.h>



#include <asm/mach/map.h>
@@ -96,8 +96,7 @@ void *omap_sram_push(void *funcp, unsigned long size) 


	dst = fncpy(sram, funcp, size);



	set_memory_ro(base, pages);

	set_memory_x(base, pages);

	set_memory_rox(base, pages);



	return dst;

}
@@ -217,8 +216,7 @@ static void __init omap2_map_sram(void) 
	base = (unsigned long)omap_sram_base;

	pages = PAGE_ALIGN(omap_sram_size) / PAGE_SIZE;



	set_memory_ro(base, pages);

	set_memory_x(base, pages);

	set_memory_rox(base, pages);

}



static void (*_omap2_sram_ddr_init)(u32 *slow_dll_ctrl, u32 fast_dll_ctrl,

arch/mips/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ config MIPS 
	select GENERIC_SCHED_CLOCK if !CAVIUM_OCTEON_SOC

	select GENERIC_SMP_IDLE_THREAD

	select GENERIC_TIME_VSYSCALL

	select GUP_GET_PTE_LOW_HIGH if CPU_MIPS32 && PHYS_ADDR_T_64BIT

	select GUP_GET_PXX_LOW_HIGH if CPU_MIPS32 && PHYS_ADDR_T_64BIT

	select HAVE_ARCH_COMPILER_H

	select HAVE_ARCH_JUMP_LABEL

	select HAVE_ARCH_KGDB if MIPS_FP_SUPPORT

arch/powerpc/include/asm/nohash/32/pgtable.h

+1 −1
Original line number Diff line number Diff line
@@ -263,7 +263,7 @@ static inline pte_basic_t pte_update(struct mm_struct *mm, unsigned long addr, p 
}



#ifdef CONFIG_PPC_16K_PAGES

#define __HAVE_ARCH_PTEP_GET

#define ptep_get ptep_get

static inline pte_t ptep_get(pte_t *ptep)

{

	pte_basic_t val = READ_ONCE(ptep->pte);

arch/powerpc/kernel/kprobes.c

+4 −5
Original line number Diff line number Diff line
@@ -20,12 +20,12 @@ 
#include <linux/kdebug.h>

#include <linux/slab.h>

#include <linux/moduleloader.h>

#include <linux/set_memory.h>

#include <asm/code-patching.h>

#include <asm/cacheflush.h>

#include <asm/sstep.h>

#include <asm/sections.h>

#include <asm/inst.h>

#include <asm/set_memory.h>

#include <linux/uaccess.h>



DEFINE_PER_CPU(struct kprobe *, current_kprobe) = NULL;
@@ -134,10 +134,9 @@ void *alloc_insn_page(void) 
	if (!page)

		return NULL;



	if (strict_module_rwx_enabled()) {

		set_memory_ro((unsigned long)page, 1);

		set_memory_x((unsigned long)page, 1);

	}

	if (strict_module_rwx_enabled())

		set_memory_rox((unsigned long)page, 1);



	return page;

}