Commit 6bfbf574 authored by Catalin Marinas's avatar Catalin Marinas
Browse files

arm64: tlb: Introduce __tlbi_sync_s1ish_{kernel,batch}() for TLB maintenance 



Add __tlbi_sync_s1ish_kernel() similar to __tlbi_sync_s1ish() and use it
for kernel TLB maintenance. Also use this function in flush_tlb_all()
which is only used in relation to kernel mappings. Subsequent patches
can differentiate between workarounds that apply to user only or both
user and kernel.

A subsequent patch will add mm_struct to __tlbi_sync_s1ish(). Since
arch_tlbbatch_flush() is not specific to an mm, add a corresponding
__tlbi_sync_s1ish_batch() helper.

Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Cc: Will Deacon <will@kernel.org>
Reviewed-by: default avatarWill Deacon <will@kernel.org>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 1f318b96

arch/arm64/include/asm/tlbflush.h

+16 −4
Original line number Diff line number Diff line
@@ -191,6 +191,18 @@ static inline void __tlbi_sync_s1ish(void) 
	__repeat_tlbi_sync(vale1is, 0);

}



static inline void __tlbi_sync_s1ish_batch(void)

{

	dsb(ish);

	__repeat_tlbi_sync(vale1is, 0);

}



static inline void __tlbi_sync_s1ish_kernel(void)

{

	dsb(ish);

	__repeat_tlbi_sync(vale1is, 0);

}



/*

 * Complete broadcast TLB maintenance issued by hyp code which invalidates

 * stage 1 translation information in any translation regime.
@@ -299,7 +311,7 @@ static inline void flush_tlb_all(void) 
{

	dsb(ishst);

	__tlbi(vmalle1is);

	__tlbi_sync_s1ish();

	__tlbi_sync_s1ish_kernel();

	isb();

}
@@ -385,7 +397,7 @@ static inline bool arch_tlbbatch_should_defer(struct mm_struct *mm) 
 */

static inline void arch_tlbbatch_flush(struct arch_tlbflush_unmap_batch *batch)

{

	__tlbi_sync_s1ish();

	__tlbi_sync_s1ish_batch();

}



/*
@@ -568,7 +580,7 @@ static inline void flush_tlb_kernel_range(unsigned long start, unsigned long end 
	dsb(ishst);

	__flush_tlb_range_op(vaale1is, start, pages, stride, 0,

			     TLBI_TTL_UNKNOWN, false, lpa2_is_enabled());

	__tlbi_sync_s1ish();

	__tlbi_sync_s1ish_kernel();

	isb();

}
@@ -582,7 +594,7 @@ static inline void __flush_tlb_kernel_pgtable(unsigned long kaddr) 


	dsb(ishst);

	__tlbi(vaae1is, addr);

	__tlbi_sync_s1ish();

	__tlbi_sync_s1ish_kernel();

	isb();

}