leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

powerpc/mm: add helpers to get/set mm.context->pte_frag

Browse Source 
In order to handle pte_fragment functions with single fragment
without adding pte_frag in all mm_context_t, this patch creates
two helpers which do nothing on platforms using a single fragment.

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
This commit is contained in:
Christophe Leroy 2018-11-29 14:06:59 +00:00 committed by Michael Ellerman
parent d09780f3a8
commit a74791dd98
2 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
arch/powerpc/include/asm/pgtable.h
View File

@ -110,6 +110,31 @@ void mark_initmem_nx(void);
static inline void mark_initmem_nx(void) { } static inline void mark_initmem_nx(void) { }
#endif #endif
/*
* When used, PTE_FRAG_NR is defined in subarch pgtable.h
* so we are sure it is included when arriving here.
*/
#ifdef PTE_FRAG_NR
static inline void *pte_frag_get(mm_context_t *ctx)
{
return ctx->pte_frag;
}
static inline void pte_frag_set(mm_context_t *ctx, void *p)
{
ctx->pte_frag = p;
}
#else
static inline void *pte_frag_get(mm_context_t *ctx)
{
return NULL;
}
static inline void pte_frag_set(mm_context_t *ctx, void *p)
{
}
#endif
#endif /* __ASSEMBLY__ */ #endif /* __ASSEMBLY__ */
#endif /* _ASM_POWERPC_PGTABLE_H */ #endif /* _ASM_POWERPC_PGTABLE_H */

8
arch/powerpc/mm/pgtable-frag.c
View File

@ -38,7 +38,7 @@ static pte_t *get_pte_from_cache(struct mm_struct *mm)
return NULL; return NULL;
spin_lock(&mm->page_table_lock); spin_lock(&mm->page_table_lock);
ret = mm->context.pte_frag; ret = pte_frag_get(&mm->context);
if (ret) { if (ret) {
pte_frag = ret + PTE_FRAG_SIZE; pte_frag = ret + PTE_FRAG_SIZE;
/* /*
@ -46,7 +46,7 @@ static pte_t *get_pte_from_cache(struct mm_struct *mm)
*/ */
if (((unsigned long)pte_frag & ~PAGE_MASK) == 0) if (((unsigned long)pte_frag & ~PAGE_MASK) == 0)
pte_frag = NULL; pte_frag = NULL;
mm->context.pte_frag = pte_frag; pte_frag_set(&mm->context, pte_frag);
} }
spin_unlock(&mm->page_table_lock); spin_unlock(&mm->page_table_lock);
return (pte_t *)ret; return (pte_t *)ret;
@ -86,9 +86,9 @@ static pte_t *__alloc_for_ptecache(struct mm_struct *mm, int kernel)
* the allocated page with single fragement * the allocated page with single fragement
* count. * count.
*/ */
if (likely(!mm->context.pte_frag)) { if (likely(!pte_frag_get(&mm->context))) {
atomic_set(&page->pt_frag_refcount, PTE_FRAG_NR); atomic_set(&page->pt_frag_refcount, PTE_FRAG_NR);
mm->context.pte_frag = ret + PTE_FRAG_SIZE; pte_frag_set(&mm->context, ret + PTE_FRAG_SIZE);
} }
spin_unlock(&mm->page_table_lock); spin_unlock(&mm->page_table_lock);