On Wed, 2017-05-03 at 16:29 +0200, Frederic Barrat wrote:
> Introduce a new 'flags' attribute per context and define its first bit
> to be a marker requiring all TLBIs for that context to be broadcasted
> globally. Once that marker is set on a context, it cannot be removed.
>
> Such a marker is useful for memory contexts used by devices behind the
> NPU and CAPP/PSL. The NPU and the PSL keep their own
> translation cache so they need to see all the TLBIs for those
> contexts.
>
> Signed-off-by: Frederic Barrat <fbar...@linux.vnet.ibm.com>
> ---
> arch/powerpc/include/asm/book3s/64/mmu.h | 9 +++++++++
> arch/powerpc/include/asm/tlb.h | 10 ++++++++--
> arch/powerpc/mm/mmu_context_book3s64.c | 1 +
> 3 files changed, 18 insertions(+), 2 deletions(-)
>
> diff --git a/arch/powerpc/include/asm/book3s/64/mmu.h
> b/arch/powerpc/include/asm/book3s/64/mmu.h
> index 77529a3e3811..7b640ab1cbeb 100644
> --- a/arch/powerpc/include/asm/book3s/64/mmu.h
> +++ b/arch/powerpc/include/asm/book3s/64/mmu.h
> @@ -78,8 +78,12 @@ struct spinlock;
> /* Maximum possible number of NPUs in a system. */
> #define NV_MAX_NPUS 8
>
> +/* Bits definition for the context flags */
> +#define MM_CONTEXT_GLOBAL_TLBI 1 /* TLBI must be global */
> +
> typedef struct {
> mm_context_id_t id;
> + unsigned long flags;
Should these flags be under #ifdef PPC_BOOK3S_64 as well? Not sure.
> u16 user_psize; /* page size index */
>
> /* NPU NMMU context */
> @@ -164,5 +168,10 @@ extern void radix_init_pseries(void);
> static inline void radix_init_pseries(void) { };
> #endif
>
> +static inline void mm_context_set_global_tlbi(mm_context_t *ctx)
> +{
> + set_bit(MM_CONTEXT_GLOBAL_TLBI, &ctx->flags);
> +}
> +
> #endif /* __ASSEMBLY__ */
> #endif /* _ASM_POWERPC_BOOK3S_64_MMU_H_ */
> diff --git a/arch/powerpc/include/asm/tlb.h b/arch/powerpc/include/asm/tlb.h
> index 609557569f65..bd18ed083011 100644
> --- a/arch/powerpc/include/asm/tlb.h
> +++ b/arch/powerpc/include/asm/tlb.h
> @@ -71,8 +71,14 @@ static inline int mm_is_core_local(struct mm_struct *mm)
>
> static inline int mm_is_thread_local(struct mm_struct *mm)
> {
> - return cpumask_equal(mm_cpumask(mm),
> - cpumask_of(smp_processor_id()));
> + int rc;
> +
> + rc = cpumask_equal(mm_cpumask(mm),
> + cpumask_of(smp_processor_id()));
> +#ifdef CONFIG_PPC_BOOK3S_64
> + rc = rc && !test_bit(MM_CONTEXT_GLOBAL_TLBI, &mm->context.flags);
> +#endif
Acked-by: Balbir Singh <bsinghar...@gmail.com>
