Commit 15780712 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'asm-generic-mmu-context-5.11' of... 

Merge tag 'asm-generic-mmu-context-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic

Pull asm-generic mmu-context cleanup from Arnd Bergmann:
 "This is a cleanup series from Nicholas Piggin, preparing for later
  changes. The asm/mmu_context.h header are generalized and common code
  moved to asm-gneneric/mmu_context.h.

  This saves a bit of code and makes it easier to change in the future"

* tag 'asm-generic-mmu-context-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic: (25 commits)
  h8300: Fix generic mmu_context build
  m68k: mmu_context: Fix Sun-3 build
  xtensa: use asm-generic/mmu_context.h for no-op implementations
  x86: use asm-generic/mmu_context.h for no-op implementations
  um: use asm-generic/mmu_context.h for no-op implementations
  sparc: use asm-generic/mmu_context.h for no-op implementations
  sh: use asm-generic/mmu_context.h for no-op implementations
  s390: use asm-generic/mmu_context.h for no-op implementations
  riscv: use asm-generic/mmu_context.h for no-op implementations
  powerpc: use asm-generic/mmu_context.h for no-op implementations
  parisc: use asm-generic/mmu_context.h for no-op implementations
  openrisc: use asm-generic/mmu_context.h for no-op implementations
  nios2: use asm-generic/mmu_context.h for no-op implementations
  nds32: use asm-generic/mmu_context.h for no-op implementations
  mips: use asm-generic/mmu_context.h for no-op implementations
  microblaze: use asm-generic/mmu_context.h for no-op implementations
  m68k: use asm-generic/mmu_context.h for no-op implementations
  ia64: use asm-generic/mmu_context.h for no-op implementations
  hexagon: use asm-generic/mmu_context.h for no-op implementations
  csky: use asm-generic/mmu_context.h for no-op implementations
  ...
parents e2dc4957 c3634425

arch/alpha/include/asm/mmu_context.h

+4 −8
Original line number Diff line number Diff line
@@ -214,8 +214,6 @@ ev4_activate_mm(struct mm_struct *prev_mm, struct mm_struct *next_mm) 
	tbiap();

}



#define deactivate_mm(tsk,mm)	do { } while (0)



#ifdef CONFIG_ALPHA_GENERIC

# define switch_mm(a,b,c)	alpha_mv.mv_switch_mm((a),(b),(c))

# define activate_mm(x,y)	alpha_mv.mv_activate_mm((x),(y))
@@ -229,6 +227,7 @@ ev4_activate_mm(struct mm_struct *prev_mm, struct mm_struct *next_mm) 
# endif

#endif



#define init_new_context init_new_context

static inline int

init_new_context(struct task_struct *tsk, struct mm_struct *mm)

{
@@ -242,12 +241,7 @@ init_new_context(struct task_struct *tsk, struct mm_struct *mm) 
	return 0;

}



extern inline void

destroy_context(struct mm_struct *mm)

{

	/* Nothing to do.  */

}



#define enter_lazy_tlb enter_lazy_tlb

static inline void

enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)

{
@@ -255,6 +249,8 @@ enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk) 
	  = ((unsigned long)mm->pgd - IDENT_ADDR) >> PAGE_SHIFT;

}



#include <asm-generic/mmu_context.h>



#ifdef __MMU_EXTERN_INLINE

#undef __EXTERN_INLINE

#undef __MMU_EXTERN_INLINE

arch/arc/include/asm/mmu_context.h

+9 −8
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ set_hw: 
 * Initialize the context related info for a new mm_struct

 * instance.

 */

#define init_new_context init_new_context

static inline int

init_new_context(struct task_struct *tsk, struct mm_struct *mm)

{
@@ -113,6 +114,7 @@ init_new_context(struct task_struct *tsk, struct mm_struct *mm) 
	return 0;

}



#define destroy_context destroy_context

static inline void destroy_context(struct mm_struct *mm)

{

	unsigned long flags;
@@ -153,13 +155,13 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, 
}



/*

 * Called at the time of execve() to get a new ASID

 * Note the subtlety here: get_new_mmu_context() behaves differently here

 * vs. in switch_mm(). Here it always returns a new ASID, because mm has

 * an unallocated "initial" value, while in latter, it moves to a new ASID,

 * only if it was unallocated

 * activate_mm defaults (in asm-generic) to switch_mm and is called at the

 * time of execve() to get a new ASID Note the subtlety here:

 * get_new_mmu_context() behaves differently here vs. in switch_mm(). Here

 * it always returns a new ASID, because mm has an unallocated "initial"

 * value, while in latter, it moves to a new ASID, only if it was

 * unallocated

 */

#define activate_mm(prev, next)		switch_mm(prev, next, NULL)



/* it seemed that deactivate_mm( ) is a reasonable place to do book-keeping

 * for retiring-mm. However destroy_context( ) still needs to do that because
@@ -168,8 +170,7 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, 
 * there is a good chance that task gets sched-out/in, making it's ASID valid

 * again (this teased me for a whole day).

 */

#define deactivate_mm(tsk, mm)   do { } while (0)



#define enter_lazy_tlb(mm, tsk)

#include <asm-generic/mmu_context.h>



#endif /* __ASM_ARC_MMU_CONTEXT_H */

arch/arm/include/asm/mmu_context.h

+3 −23
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ void __check_vmalloc_seq(struct mm_struct *mm); 
#ifdef CONFIG_CPU_HAS_ASID



void check_and_switch_context(struct mm_struct *mm, struct task_struct *tsk);



#define init_new_context init_new_context

static inline int

init_new_context(struct task_struct *tsk, struct mm_struct *mm)

{
@@ -92,32 +94,10 @@ static inline void finish_arch_post_lock_switch(void) 


#endif	/* CONFIG_MMU */



static inline int

init_new_context(struct task_struct *tsk, struct mm_struct *mm)

{

	return 0;

}





#endif	/* CONFIG_CPU_HAS_ASID */



#define destroy_context(mm)		do { } while(0)

#define activate_mm(prev,next)		switch_mm(prev, next, NULL)



/*

 * This is called when "tsk" is about to enter lazy TLB mode.

 *

 * mm:  describes the currently active mm context

 * tsk: task which is entering lazy tlb

 * cpu: cpu number which is entering lazy tlb

 *

 * tsk->mm will be NULL

 */

static inline void

enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)

{

}



/*

 * This is the actual mm switch as far as the scheduler

 * is concerned.  No registers are touched.  We avoid
@@ -149,6 +129,6 @@ switch_mm(struct mm_struct *prev, struct mm_struct *next, 
#endif

}



#define deactivate_mm(tsk,mm)	do { } while (0)

#include <asm-generic/mmu_context.h>



#endif

arch/arm64/include/asm/mmu_context.h

+4 −4
Original line number Diff line number Diff line
@@ -174,9 +174,9 @@ static inline void cpu_replace_ttbr1(pgd_t *pgdp) 
 * Setting a reserved TTBR0 or EPD0 would work, but it all gets ugly when you

 * take CPU migration into account.

 */

#define destroy_context(mm)		do { } while(0)

void check_and_switch_context(struct mm_struct *mm);



#define init_new_context(tsk, mm) init_new_context(tsk, mm)

static inline int

init_new_context(struct task_struct *tsk, struct mm_struct *mm)

{
@@ -208,6 +208,7 @@ static inline void update_saved_ttbr0(struct task_struct *tsk, 
}

#endif



#define enter_lazy_tlb enter_lazy_tlb

static inline void

enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)

{
@@ -248,15 +249,14 @@ switch_mm(struct mm_struct *prev, struct mm_struct *next, 
	update_saved_ttbr0(tsk, next);

}



#define deactivate_mm(tsk,mm)	do { } while (0)

#define activate_mm(prev,next)	switch_mm(prev, next, current)



void verify_cpu_asid_bits(void);

void post_ttbr_update_workaround(void);



unsigned long arm64_mm_context_get(struct mm_struct *mm);

void arm64_mm_context_put(struct mm_struct *mm);



#include <asm-generic/mmu_context.h>



#endif /* !__ASSEMBLY__ */



#endif /* !__ASM_MMU_CONTEXT_H */

arch/c6x/include/asm/mmu_context.h

0 → 100644
+6 −0
Original line number Diff line number Diff line 
#ifndef _ASM_C6X_MMU_CONTEXT_H

#define _ASM_C6X_MMU_CONTEXT_H



#include <asm-generic/nommu_context.h>



#endif /* _ASM_C6X_MMU_CONTEXT_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE