riscv: move the TLB flush logic out of line (95594cb4) · Commits · 戴 / test

arch/riscv/include/asm/tlbflush.h

+7 −30

Original line number	Diff line number	Diff line
		@@ -25,8 +25,13 @@ static inline void local_flush_tlb_page(unsigned long addr)
		__asm__ __volatile__ ("sfence.vma %0" : : "r" (addr) : "memory");
		}

		#ifndef CONFIG_SMP

		#ifdef CONFIG_SMP
		void flush_tlb_all(void);
		void flush_tlb_mm(struct mm_struct *mm);
		void flush_tlb_page(struct vm_area_struct *vma, unsigned long addr);
		void flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
		unsigned long end);
		#else /* CONFIG_SMP */
		#define flush_tlb_all() local_flush_tlb_all()
		#define flush_tlb_page(vma, addr) local_flush_tlb_page(addr)

		@@ -37,34 +42,6 @@ static inline void flush_tlb_range(struct vm_area_struct *vma,
		}

		#define flush_tlb_mm(mm) flush_tlb_all()

		#else /* CONFIG_SMP */

		#include <asm/sbi.h>

		static inline void remote_sfence_vma(struct cpumask *cmask, unsigned long start,
		unsigned long size)
		{
		struct cpumask hmask;

		riscv_cpuid_to_hartid_mask(cmask, &hmask);
		sbi_remote_sfence_vma(hmask.bits, start, size);
		}

		#define flush_tlb_all() sbi_remote_sfence_vma(NULL, 0, -1)

		#define flush_tlb_range(vma, start, end) \
		remote_sfence_vma(mm_cpumask((vma)->vm_mm), start, (end) - (start))

		static inline void flush_tlb_page(struct vm_area_struct *vma,
		unsigned long addr)
		{
		flush_tlb_range(vma, addr, addr + PAGE_SIZE);
		}

		#define flush_tlb_mm(mm) \
		remote_sfence_vma(mm_cpumask(mm), 0, -1)

		#endif /* CONFIG_SMP */

		/* Flush a range of kernel pages */

+3 −0

Original line number	Diff line number	Diff line
		@@ -13,4 +13,7 @@ obj-y += cacheflush.o
		obj-y += context.o
		obj-y += sifive_l2_cache.o

		ifeq ($(CONFIG_MMU),y)
		obj-$(CONFIG_SMP) += tlbflush.o
		endif
		obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o

0 → 100644

+35 −0

Original line number	Diff line number	Diff line
		// SPDX-License-Identifier: GPL-2.0

		#include <linux/mm.h>
		#include <linux/smp.h>
		#include <asm/sbi.h>

		void flush_tlb_all(void)
		{
		sbi_remote_sfence_vma(NULL, 0, -1);
		}

		static void __sbi_tlb_flush_range(struct cpumask *cmask, unsigned long start,
		unsigned long size)
		{
		struct cpumask hmask;

		riscv_cpuid_to_hartid_mask(cmask, &hmask);
		sbi_remote_sfence_vma(hmask.bits, start, size);
		}

		void flush_tlb_mm(struct mm_struct *mm)
		{
		__sbi_tlb_flush_range(mm_cpumask(mm), 0, -1);
		}

		void flush_tlb_page(struct vm_area_struct *vma, unsigned long addr)
		{
		__sbi_tlb_flush_range(mm_cpumask(vma->vm_mm), addr, PAGE_SIZE);
		}

		void flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
		unsigned long end)
		{
		__sbi_tlb_flush_range(mm_cpumask(vma->vm_mm), start, end - start);
		}