| Message ID | 20200826145249.745432-11-npiggin@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Use asm-generic for mmu_context no-op functions | expand |
On 26. 08. 20 16:52, Nicholas Piggin wrote: > Cc: Michal Simek <monstr@monstr.eu> > Signed-off-by: Nicholas Piggin <npiggin@gmail.com> > --- > arch/microblaze/include/asm/mmu_context_mm.h | 8 ++++---- > arch/microblaze/include/asm/processor.h | 3 --- > 2 files changed, 4 insertions(+), 7 deletions(-) > > diff --git a/arch/microblaze/include/asm/mmu_context_mm.h b/arch/microblaze/include/asm/mmu_context_mm.h > index a1c7dd48454c..c2c77f708455 100644 > --- a/arch/microblaze/include/asm/mmu_context_mm.h > +++ b/arch/microblaze/include/asm/mmu_context_mm.h > @@ -33,10 +33,6 @@ > to represent all kernel pages as shared among all contexts. > */ > > -static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk) > -{ > -} > - > # define NO_CONTEXT 256 > # define LAST_CONTEXT 255 > # define FIRST_CONTEXT 1 > @@ -105,6 +101,7 @@ static inline void get_mmu_context(struct mm_struct *mm) > /* > * We're finished using the context for an address space. > */ > +#define destroy_context destroy_context > static inline void destroy_context(struct mm_struct *mm) > { > if (mm->context != NO_CONTEXT) { > @@ -126,6 +123,7 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, > * After we have set current->mm to a new value, this activates > * the context for the new mm so we see the new mappings. > */ > +#define activate_mm activate_mm > static inline void activate_mm(struct mm_struct *active_mm, > struct mm_struct *mm) > { > @@ -136,5 +134,7 @@ static inline void activate_mm(struct mm_struct *active_mm, > > extern void mmu_context_init(void); > > +#include <asm-generic/mmu_context.h> > + > # endif /* __KERNEL__ */ > #endif /* _ASM_MICROBLAZE_MMU_CONTEXT_H */ > diff --git a/arch/microblaze/include/asm/processor.h b/arch/microblaze/include/asm/processor.h > index 1ff5a82b76b6..616211871a6e 100644 > --- a/arch/microblaze/include/asm/processor.h > +++ b/arch/microblaze/include/asm/processor.h > @@ -122,9 +122,6 @@ unsigned long get_wchan(struct task_struct *p); > # define KSTK_EIP(task) (task_pc(task)) > # define KSTK_ESP(task) (task_sp(task)) > > -/* FIXME */ > -# define deactivate_mm(tsk, mm) do { } while (0) > - > # define STACK_TOP TASK_SIZE > # define STACK_TOP_MAX STACK_TOP > > I am fine with the patch but I pretty much don't like that commit message is empty and there is only subject. With fixing that you can add my: Acked-by: Michal Simek <monstr@monstr.eu> Thanks, Michal
Excerpts from Michal Simek's message of September 1, 2020 12:15 am: > > > On 26. 08. 20 16:52, Nicholas Piggin wrote: >> Cc: Michal Simek <monstr@monstr.eu> >> Signed-off-by: Nicholas Piggin <npiggin@gmail.com> >> --- >> arch/microblaze/include/asm/mmu_context_mm.h | 8 ++++---- >> arch/microblaze/include/asm/processor.h | 3 --- >> 2 files changed, 4 insertions(+), 7 deletions(-) >> >> diff --git a/arch/microblaze/include/asm/mmu_context_mm.h b/arch/microblaze/include/asm/mmu_context_mm.h >> index a1c7dd48454c..c2c77f708455 100644 >> --- a/arch/microblaze/include/asm/mmu_context_mm.h >> +++ b/arch/microblaze/include/asm/mmu_context_mm.h >> @@ -33,10 +33,6 @@ >> to represent all kernel pages as shared among all contexts. >> */ >> >> -static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk) >> -{ >> -} >> - >> # define NO_CONTEXT 256 >> # define LAST_CONTEXT 255 >> # define FIRST_CONTEXT 1 >> @@ -105,6 +101,7 @@ static inline void get_mmu_context(struct mm_struct *mm) >> /* >> * We're finished using the context for an address space. >> */ >> +#define destroy_context destroy_context >> static inline void destroy_context(struct mm_struct *mm) >> { >> if (mm->context != NO_CONTEXT) { >> @@ -126,6 +123,7 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, >> * After we have set current->mm to a new value, this activates >> * the context for the new mm so we see the new mappings. >> */ >> +#define activate_mm activate_mm >> static inline void activate_mm(struct mm_struct *active_mm, >> struct mm_struct *mm) >> { >> @@ -136,5 +134,7 @@ static inline void activate_mm(struct mm_struct *active_mm, >> >> extern void mmu_context_init(void); >> >> +#include <asm-generic/mmu_context.h> >> + >> # endif /* __KERNEL__ */ >> #endif /* _ASM_MICROBLAZE_MMU_CONTEXT_H */ >> diff --git a/arch/microblaze/include/asm/processor.h b/arch/microblaze/include/asm/processor.h >> index 1ff5a82b76b6..616211871a6e 100644 >> --- a/arch/microblaze/include/asm/processor.h >> +++ b/arch/microblaze/include/asm/processor.h >> @@ -122,9 +122,6 @@ unsigned long get_wchan(struct task_struct *p); >> # define KSTK_EIP(task) (task_pc(task)) >> # define KSTK_ESP(task) (task_sp(task)) >> >> -/* FIXME */ >> -# define deactivate_mm(tsk, mm) do { } while (0) >> - >> # define STACK_TOP TASK_SIZE >> # define STACK_TOP_MAX STACK_TOP >> >> > > I am fine with the patch but I pretty much don't like that commit > message is empty and there is only subject. > With fixing that you can add my: > Acked-by: Michal Simek <monstr@monstr.eu> Thanks for the review, will do. Any suggestion for a useful commit message? Thanks, Nick
On 01. 09. 20 8:15, Nicholas Piggin wrote: > Excerpts from Michal Simek's message of September 1, 2020 12:15 am: >> >> >> On 26. 08. 20 16:52, Nicholas Piggin wrote: >>> Cc: Michal Simek <monstr@monstr.eu> >>> Signed-off-by: Nicholas Piggin <npiggin@gmail.com> >>> --- >>> arch/microblaze/include/asm/mmu_context_mm.h | 8 ++++---- >>> arch/microblaze/include/asm/processor.h | 3 --- >>> 2 files changed, 4 insertions(+), 7 deletions(-) >>> >>> diff --git a/arch/microblaze/include/asm/mmu_context_mm.h b/arch/microblaze/include/asm/mmu_context_mm.h >>> index a1c7dd48454c..c2c77f708455 100644 >>> --- a/arch/microblaze/include/asm/mmu_context_mm.h >>> +++ b/arch/microblaze/include/asm/mmu_context_mm.h >>> @@ -33,10 +33,6 @@ >>> to represent all kernel pages as shared among all contexts. >>> */ >>> >>> -static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk) >>> -{ >>> -} >>> - >>> # define NO_CONTEXT 256 >>> # define LAST_CONTEXT 255 >>> # define FIRST_CONTEXT 1 >>> @@ -105,6 +101,7 @@ static inline void get_mmu_context(struct mm_struct *mm) >>> /* >>> * We're finished using the context for an address space. >>> */ >>> +#define destroy_context destroy_context >>> static inline void destroy_context(struct mm_struct *mm) >>> { >>> if (mm->context != NO_CONTEXT) { >>> @@ -126,6 +123,7 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, >>> * After we have set current->mm to a new value, this activates >>> * the context for the new mm so we see the new mappings. >>> */ >>> +#define activate_mm activate_mm >>> static inline void activate_mm(struct mm_struct *active_mm, >>> struct mm_struct *mm) >>> { >>> @@ -136,5 +134,7 @@ static inline void activate_mm(struct mm_struct *active_mm, >>> >>> extern void mmu_context_init(void); >>> >>> +#include <asm-generic/mmu_context.h> >>> + >>> # endif /* __KERNEL__ */ >>> #endif /* _ASM_MICROBLAZE_MMU_CONTEXT_H */ >>> diff --git a/arch/microblaze/include/asm/processor.h b/arch/microblaze/include/asm/processor.h >>> index 1ff5a82b76b6..616211871a6e 100644 >>> --- a/arch/microblaze/include/asm/processor.h >>> +++ b/arch/microblaze/include/asm/processor.h >>> @@ -122,9 +122,6 @@ unsigned long get_wchan(struct task_struct *p); >>> # define KSTK_EIP(task) (task_pc(task)) >>> # define KSTK_ESP(task) (task_sp(task)) >>> >>> -/* FIXME */ >>> -# define deactivate_mm(tsk, mm) do { } while (0) >>> - >>> # define STACK_TOP TASK_SIZE >>> # define STACK_TOP_MAX STACK_TOP >>> >>> >> >> I am fine with the patch but I pretty much don't like that commit >> message is empty and there is only subject. >> With fixing that you can add my: >> Acked-by: Michal Simek <monstr@monstr.eu> > > Thanks for the review, will do. Any suggestion for a useful commit message? What about? Wire asm-generic/mmu_context.h to provide generic empty hooks for arch code simplification. Thanks, Michal
Excerpts from Michal Simek's message of September 1, 2020 4:41 pm: > > > On 01. 09. 20 8:15, Nicholas Piggin wrote: >> Excerpts from Michal Simek's message of September 1, 2020 12:15 am: >>> >>> >>> On 26. 08. 20 16:52, Nicholas Piggin wrote: >>>> Cc: Michal Simek <monstr@monstr.eu> >>>> Signed-off-by: Nicholas Piggin <npiggin@gmail.com> >>>> --- >>>> arch/microblaze/include/asm/mmu_context_mm.h | 8 ++++---- >>>> arch/microblaze/include/asm/processor.h | 3 --- >>>> 2 files changed, 4 insertions(+), 7 deletions(-) >>>> >>>> diff --git a/arch/microblaze/include/asm/mmu_context_mm.h b/arch/microblaze/include/asm/mmu_context_mm.h >>>> index a1c7dd48454c..c2c77f708455 100644 >>>> --- a/arch/microblaze/include/asm/mmu_context_mm.h >>>> +++ b/arch/microblaze/include/asm/mmu_context_mm.h >>>> @@ -33,10 +33,6 @@ >>>> to represent all kernel pages as shared among all contexts. >>>> */ >>>> >>>> -static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk) >>>> -{ >>>> -} >>>> - >>>> # define NO_CONTEXT 256 >>>> # define LAST_CONTEXT 255 >>>> # define FIRST_CONTEXT 1 >>>> @@ -105,6 +101,7 @@ static inline void get_mmu_context(struct mm_struct *mm) >>>> /* >>>> * We're finished using the context for an address space. >>>> */ >>>> +#define destroy_context destroy_context >>>> static inline void destroy_context(struct mm_struct *mm) >>>> { >>>> if (mm->context != NO_CONTEXT) { >>>> @@ -126,6 +123,7 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, >>>> * After we have set current->mm to a new value, this activates >>>> * the context for the new mm so we see the new mappings. >>>> */ >>>> +#define activate_mm activate_mm >>>> static inline void activate_mm(struct mm_struct *active_mm, >>>> struct mm_struct *mm) >>>> { >>>> @@ -136,5 +134,7 @@ static inline void activate_mm(struct mm_struct *active_mm, >>>> >>>> extern void mmu_context_init(void); >>>> >>>> +#include <asm-generic/mmu_context.h> >>>> + >>>> # endif /* __KERNEL__ */ >>>> #endif /* _ASM_MICROBLAZE_MMU_CONTEXT_H */ >>>> diff --git a/arch/microblaze/include/asm/processor.h b/arch/microblaze/include/asm/processor.h >>>> index 1ff5a82b76b6..616211871a6e 100644 >>>> --- a/arch/microblaze/include/asm/processor.h >>>> +++ b/arch/microblaze/include/asm/processor.h >>>> @@ -122,9 +122,6 @@ unsigned long get_wchan(struct task_struct *p); >>>> # define KSTK_EIP(task) (task_pc(task)) >>>> # define KSTK_ESP(task) (task_sp(task)) >>>> >>>> -/* FIXME */ >>>> -# define deactivate_mm(tsk, mm) do { } while (0) >>>> - >>>> # define STACK_TOP TASK_SIZE >>>> # define STACK_TOP_MAX STACK_TOP >>>> >>>> >>> >>> I am fine with the patch but I pretty much don't like that commit >>> message is empty and there is only subject. >>> With fixing that you can add my: >>> Acked-by: Michal Simek <monstr@monstr.eu> >> >> Thanks for the review, will do. Any suggestion for a useful commit message? > > What about? > Wire asm-generic/mmu_context.h to provide generic empty hooks for arch > code simplification. Sure I'll add it. Thanks, Nick
diff --git a/arch/microblaze/include/asm/mmu_context_mm.h b/arch/microblaze/include/asm/mmu_context_mm.h index a1c7dd48454c..c2c77f708455 100644 --- a/arch/microblaze/include/asm/mmu_context_mm.h +++ b/arch/microblaze/include/asm/mmu_context_mm.h @@ -33,10 +33,6 @@ to represent all kernel pages as shared among all contexts. */ -static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk) -{ -} - # define NO_CONTEXT 256 # define LAST_CONTEXT 255 # define FIRST_CONTEXT 1 @@ -105,6 +101,7 @@ static inline void get_mmu_context(struct mm_struct *mm) /* * We're finished using the context for an address space. */ +#define destroy_context destroy_context static inline void destroy_context(struct mm_struct *mm) { if (mm->context != NO_CONTEXT) { @@ -126,6 +123,7 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, * After we have set current->mm to a new value, this activates * the context for the new mm so we see the new mappings. */ +#define activate_mm activate_mm static inline void activate_mm(struct mm_struct *active_mm, struct mm_struct *mm) { @@ -136,5 +134,7 @@ static inline void activate_mm(struct mm_struct *active_mm, extern void mmu_context_init(void); +#include <asm-generic/mmu_context.h> + # endif /* __KERNEL__ */ #endif /* _ASM_MICROBLAZE_MMU_CONTEXT_H */ diff --git a/arch/microblaze/include/asm/processor.h b/arch/microblaze/include/asm/processor.h index 1ff5a82b76b6..616211871a6e 100644 --- a/arch/microblaze/include/asm/processor.h +++ b/arch/microblaze/include/asm/processor.h @@ -122,9 +122,6 @@ unsigned long get_wchan(struct task_struct *p); # define KSTK_EIP(task) (task_pc(task)) # define KSTK_ESP(task) (task_sp(task)) -/* FIXME */ -# define deactivate_mm(tsk, mm) do { } while (0) - # define STACK_TOP TASK_SIZE # define STACK_TOP_MAX STACK_TOP
Cc: Michal Simek <monstr@monstr.eu> Signed-off-by: Nicholas Piggin <npiggin@gmail.com> --- arch/microblaze/include/asm/mmu_context_mm.h | 8 ++++---- arch/microblaze/include/asm/processor.h | 3 --- 2 files changed, 4 insertions(+), 7 deletions(-)