Unverified Commit 9a801afd authored by Dylan Jhong's avatar Dylan Jhong Committed by Palmer Dabbelt
Browse files

riscv: mm: Fix incorrect ASID argument when flushing TLB 



Currently, we pass the CONTEXTID instead of the ASID to the TLB flush
function. We should only take the ASID field to prevent from touching
the reserved bit field.

Fixes: 3f1e7829 ("riscv: add ASID-based tlbflushing methods")
Signed-off-by: default avatarDylan Jhong <dylan@andestech.com>
Reviewed-by: default avatarSergey Matyukevich <sergey.matyukevich@syntacore.com>
Link: https://lore.kernel.org/r/20230313034906.2401730-1-dylan@andestech.com


Cc: stable@vger.kernel.org
Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent 47dd902a

arch/riscv/include/asm/tlbflush.h

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ 
#include <asm/errata_list.h>



#ifdef CONFIG_MMU

extern unsigned long asid_mask;



static inline void local_flush_tlb_all(void)

{

	__asm__ __volatile__ ("sfence.vma" : : : "memory");

arch/riscv/mm/context.c

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ DEFINE_STATIC_KEY_FALSE(use_asid_allocator); 


static unsigned long asid_bits;

static unsigned long num_asids;

static unsigned long asid_mask;

unsigned long asid_mask;



static atomic_long_t current_version;

arch/riscv/mm/tlbflush.c

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ static void __sbi_tlb_flush_range(struct mm_struct *mm, unsigned long start, 
	/* check if the tlbflush needs to be sent to other CPUs */

	broadcast = cpumask_any_but(cmask, cpuid) < nr_cpu_ids;

	if (static_branch_unlikely(&use_asid_allocator)) {

		unsigned long asid = atomic_long_read(&mm->context.id);

		unsigned long asid = atomic_long_read(&mm->context.id) & asid_mask;



		if (broadcast) {

			sbi_remote_sfence_vma_asid(cmask, start, size, asid);