Commit ac51667b 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:

 - Make cpumask_of_node() more robust against invalid node IDs

 - Simplify and speed up load_mm_cr4()

 - Unexport and remove various unused set_memory_*() APIs

 - Misc cleanups

* 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/mm: Fix cpumask_of_node() error condition
  x86/mm: Remove the unused set_memory_wt() function
  x86/mm: Remove set_pages_x() and set_pages_nx()
  x86/mm: Remove the unused set_memory_array_*() functions
  x86/mm: Unexport set_memory_x() and set_memory_nx()
  x86/fixmap: Cleanup outdated comments
  x86/kconfig: Remove X86_DIRECT_GBPAGES dependency on !DEBUG_PAGEALLOC
  x86/mm: Avoid redundant interrupt disable in load_mm_cr4()
parents e0d60a1e bc04a049

arch/x86/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -1503,7 +1503,7 @@ config X86_5LEVEL 


config X86_DIRECT_GBPAGES

	def_bool y

	depends on X86_64 && !DEBUG_PAGEALLOC

	depends on X86_64

	---help---

	  Certain kernel features effectively disable kernel

	  linear 1 GB mappings (even if the CPU otherwise

arch/x86/events/core.c

+1 −1
Original line number Diff line number Diff line
@@ -2108,7 +2108,7 @@ static int x86_pmu_event_init(struct perf_event *event) 


static void refresh_pce(void *ignored)

{

	load_mm_cr4(this_cpu_read(cpu_tlbstate.loaded_mm));

	load_mm_cr4_irqsoff(this_cpu_read(cpu_tlbstate.loaded_mm));

}



static void x86_pmu_event_mapped(struct perf_event *event, struct mm_struct *mm)

arch/x86/include/asm/fixmap.h

+2 −3
Original line number Diff line number Diff line
@@ -42,8 +42,7 @@ 
 * Because of this, FIXADDR_TOP x86 integration was left as later work.

 */

#ifdef CONFIG_X86_32

/* used by vmalloc.c, vsyscall.lds.S.

 *

/*

 * Leave one empty page between vmalloc'ed areas and

 * the start of the fixmap.

 */
@@ -120,7 +119,7 @@ enum fixed_addresses { 
	 * before ioremap() is functional.

	 *

	 * If necessary we round it up to the next 512 pages boundary so

	 * that we can have a single pgd entry and a single pte table:

	 * that we can have a single pmd entry and a single pte table:

	 */

#define NR_FIX_BTMAPS		64

#define FIX_BTMAPS_SLOTS	8

arch/x86/include/asm/mmu_context.h

+4 −4
Original line number Diff line number Diff line
@@ -28,16 +28,16 @@ static inline void paravirt_activate_mm(struct mm_struct *prev, 


DECLARE_STATIC_KEY_FALSE(rdpmc_always_available_key);



static inline void load_mm_cr4(struct mm_struct *mm)

static inline void load_mm_cr4_irqsoff(struct mm_struct *mm)

{

	if (static_branch_unlikely(&rdpmc_always_available_key) ||

	    atomic_read(&mm->context.perf_rdpmc_allowed))

		cr4_set_bits(X86_CR4_PCE);

		cr4_set_bits_irqsoff(X86_CR4_PCE);

	else

		cr4_clear_bits(X86_CR4_PCE);

		cr4_clear_bits_irqsoff(X86_CR4_PCE);

}

#else

static inline void load_mm_cr4(struct mm_struct *mm) {}

static inline void load_mm_cr4_irqsoff(struct mm_struct *mm) {}

#endif



#ifdef CONFIG_MODIFY_LDT_SYSCALL

arch/x86/include/asm/set_memory.h

+0 −8
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ int _set_memory_wt(unsigned long addr, int numpages); 
int _set_memory_wb(unsigned long addr, int numpages);

int set_memory_uc(unsigned long addr, int numpages);

int set_memory_wc(unsigned long addr, int numpages);

int set_memory_wt(unsigned long addr, int numpages);

int set_memory_wb(unsigned long addr, int numpages);

int set_memory_np(unsigned long addr, int numpages);

int set_memory_4k(unsigned long addr, int numpages);
@@ -48,11 +47,6 @@ int set_memory_encrypted(unsigned long addr, int numpages); 
int set_memory_decrypted(unsigned long addr, int numpages);

int set_memory_np_noalias(unsigned long addr, int numpages);



int set_memory_array_uc(unsigned long *addr, int addrinarray);

int set_memory_array_wc(unsigned long *addr, int addrinarray);

int set_memory_array_wt(unsigned long *addr, int addrinarray);

int set_memory_array_wb(unsigned long *addr, int addrinarray);



int set_pages_array_uc(struct page **pages, int addrinarray);

int set_pages_array_wc(struct page **pages, int addrinarray);

int set_pages_array_wt(struct page **pages, int addrinarray);
@@ -80,8 +74,6 @@ int set_pages_array_wb(struct page **pages, int addrinarray); 


int set_pages_uc(struct page *page, int numpages);

int set_pages_wb(struct page *page, int numpages);

int set_pages_x(struct page *page, int numpages);

int set_pages_nx(struct page *page, int numpages);

int set_pages_ro(struct page *page, int numpages);

int set_pages_rw(struct page *page, int numpages);

CRA Git | Maintained and supported by SUSTech CRA and CCSE