From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4BD6644C672 for ; Wed, 15 Jul 2026 13:20:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784121634; cv=none; b=tQ/p+c2L+/espERg5DJd7h9VBLQrfByPkCDzlN3juLf0V+DyPL/99c5Q62TP6m/eSUUMEKFU3+taSE9j2ssS17XXZtscWHI6AsBLmcStf8AGidjtyIyyqPeZyVjr+uWorSmtIQYZOpY//sjFDbtybUJfpI00/drX5oYbfVxIA40= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784121634; c=relaxed/simple; bh=Xcw2wKK9rYFo/hw0fp1fZtROb/RU08YqEZ0iRUW+NDY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cCLciReN1WOCiMw3Qbhujf5OytpDpPAZiih0HS0F44sabmA7OQtkaY29AgYkdhHeZ8WCV1QDBq82kt0oIfVzXkGut0Tn0+lMSrY0sB7u7XrbH9mEgIg0QI7CTEE7vWfNVnDngRaHf7o1ESmOoN6N+LLnagimjWPFcVNim0euxRo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com; spf=pass smtp.mailfrom=bytedance.com; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b=RG9Av5y6; arc=none smtp.client-ip=209.85.214.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=bytedance.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=bytedance.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=bytedance.com header.i=@bytedance.com header.b="RG9Av5y6" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-2ce87c7e3bbso59826895ad.1 for ; Wed, 15 Jul 2026 06:20:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1784121624; x=1784726424; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=O0419pZYviwlgi7RrpR+vOHIO7im/1AWoluL/ZKMJxE=; b=RG9Av5y66vEHz0gJS1MyNaqbip9z+8VK/lty0nFWn96KwVvLxiLI74JYGlxTtpUoNN aHEp1wsuOL26thdm/T0fVEsXxnoOnSwJMmTGdOzx7n+HwGYLjNKHzYJBVBTGQg4eZwi0 1i7TJd96Wq/aTeWk4BHSUJSwGkhVLSzhdE/Z8FpZjgX2d0h3vxjDafnWzzpzrRnbgvn0 lT2wIuLHul5hlJkGoo6pfRdx9sv0flcxyRDF3d9FN4GdJpGtiDWmPNQkQFSl7TFjhvkZ fWKy4OKCQu0smNiNYnFaI76DsKWpSZ+w376tRoaB9wyBqEHaBVMBrXXBnX/SVw07VG0x Igcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784121624; x=1784726424; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=O0419pZYviwlgi7RrpR+vOHIO7im/1AWoluL/ZKMJxE=; b=qOGQlKdcVQicl7rniZQxAzMTeNlNd0vu7BBFfR3XmndAn/gtp1jZw6iEf1tofXCtAd HiBgc4J3bph3tmHIC0zrS0BnHrEiLtdWaf79I6FGrtpL1EXGFgNmrKaGViR/gIJpQhIv A82akWSeu4j6HEopIYXwBL3HLS4OC2iRbAsP7v6Ii5GAg4dJ5S2K4FFZH4P9QKCfTuqV PWHndV3y8LYXBJ0LsydKPwPfLDVrFYqz13Npoq2JvSxYDiilUcGIGJ462LnVASCihzO4 T8Yl/rk+7JtgeW8hI1LC68P2LXZIi31YCzLM5PtDFkOs7Ez2bRBcPslX3FuDRPgQW6il Cftg== X-Forwarded-Encrypted: i=1; AHgh+RrpayOftNO2qJ/ecQh/h57Ou3mlXouKJ6JgtQ++2bDsNCIXME3y28nNbnOeg1XmCLpVgF91tYgG0oLauoI=@vger.kernel.org X-Gm-Message-State: AOJu0Yw/NeX1lJ6qcDvQPrgq3d82oAV/WomR1gsZuBWFc/QeyuQP10nO pDfyq3cDzo7+EAQ+eM0tJ1dwEXPPQS8MTvpRvnLf6paWFVx+LPiTxlb5G9NQKU7rrG2CPYy1ays lAv1IDN0= X-Gm-Gg: AfdE7ckwSCid6KSGMSHVlk49V9dki8BxNt+IBdj4BFo7WyqDgAN8kOTXyz5OWFKxbAC fXbTkIZKWMzRLPQEx1E00d1G+5cZ7FP4TUKQ3dCU0ds0H3rh617sHTMZ8rMruvY7EKC2nAdfwzy NaSe+Vb3P6zb78P513h3wCXpTUkVXE/SdveGg+UkfT07/2imqvfgl20w9PkUVm3Oh2QM+njcvbv QAQOMF1KG+X1OoIPmHZ68taGfWcTbK4iytLHjoX9NnjhfSTbUt38ijYyw/31Tv5M2GJ9at1EO3J AVIeI9/wzDX07ghkxBIsn+3Mli59qw24yuibMarL4XwADHeGFSIF3Zy47ArF4uTPW9GxYujmkdJ YCQrM4OmlZnc7E7kevGQXgb/txCr+A5odj95vPFgac1Ju9Co3H5xJdMwK/qOQ93zLVsUDARcxYr xaXuIMLcmKDV6o25ALDvAehFuTiBoPhyPAgmXq1qzSDgLn1GzrncSObhgO6QxaKGrdI0MJ9icd8 LrExaAxGp99zeTHot3/ozVS3DZ72m7CCzg6nErqpROeuA== X-Received: by 2002:a17:903:1b25:b0:2cc:df15:91de with SMTP id d9443c01a7336-2cee9bb19b8mr80986835ad.42.1784121623726; Wed, 15 Jul 2026 06:20:23 -0700 (PDT) Received: from J9GPGXL7NT.bytedance.net ([61.213.176.55]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cf100e42c6sm2465085ad.9.2026.07.15.06.20.20 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 15 Jul 2026 06:20:22 -0700 (PDT) From: Xu Lu To: paul.walmsley@sifive.com, klarasmodin@gmail.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, alex@ghiti.fr Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, apw@canonical.com, joe@perches.com, Xu Lu Subject: [PATCH v2 2/3] riscv: mm: Apply Svinval in update_mmu_cache() Date: Wed, 15 Jul 2026 21:20:08 +0800 Message-ID: <20260715132009.10634-3-luxu.kernel@bytedance.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260715132009.10634-1-luxu.kernel@bytedance.com> References: <20260715132009.10634-1-luxu.kernel@bytedance.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Use Svinval in update_mmu_cache_range() when the extension is available. Signed-off-by: Xu Lu --- arch/riscv/include/asm/pgtable.h | 8 ++++++++ arch/riscv/include/asm/tlbflush.h | 18 ++++++++++++++++++ arch/riscv/mm/tlbflush.c | 18 ------------------ 3 files changed, 26 insertions(+), 18 deletions(-) diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index 9926556099ae..823805cc465a 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -578,6 +578,14 @@ static inline void update_mmu_cache_range(struct vm_fault *vmf, if (riscv_has_extension_unlikely(RISCV_ISA_EXT_SVVPTC)) return; + if (riscv_has_extension_unlikely(RISCV_ISA_EXT_SVINVAL)) { + local_sfence_w_inval(); + while (nr--) + local_sinval_vma(address + nr * PAGE_SIZE, asid); + local_sfence_inval_ir(); + return; + } + /* * The kernel assumes that TLBs don't cache invalid entries, but * in RISC-V, SFENCE.VMA specifies an ordering constraint, not a diff --git a/arch/riscv/include/asm/tlbflush.h b/arch/riscv/include/asm/tlbflush.h index 7c2cd5cc92d3..9636d07fe9ee 100644 --- a/arch/riscv/include/asm/tlbflush.h +++ b/arch/riscv/include/asm/tlbflush.h @@ -20,6 +20,24 @@ static inline unsigned long get_mm_asid(struct mm_struct *mm) return mm ? cntx2asid(atomic_long_read(&mm->context.id)) : FLUSH_TLB_NO_ASID; } +static inline void local_sfence_inval_ir(void) +{ + asm volatile(SFENCE_INVAL_IR() ::: "memory"); +} + +static inline void local_sfence_w_inval(void) +{ + asm volatile(SFENCE_W_INVAL() ::: "memory"); +} + +static inline void local_sinval_vma(unsigned long vma, unsigned long asid) +{ + if (asid != FLUSH_TLB_NO_ASID) + asm volatile(SINVAL_VMA(%0, %1) : : "r" (vma), "r" (asid) : "memory"); + else + asm volatile(SINVAL_VMA(%0, zero) : : "r" (vma) : "memory"); +} + static inline void local_flush_tlb_all(void) { __asm__ __volatile__ ("sfence.vma" : : : "memory"); diff --git a/arch/riscv/mm/tlbflush.c b/arch/riscv/mm/tlbflush.c index 73c226f719c7..962db300a166 100644 --- a/arch/riscv/mm/tlbflush.c +++ b/arch/riscv/mm/tlbflush.c @@ -11,24 +11,6 @@ #define has_svinval() riscv_has_extension_unlikely(RISCV_ISA_EXT_SVINVAL) -static inline void local_sfence_inval_ir(void) -{ - asm volatile(SFENCE_INVAL_IR() ::: "memory"); -} - -static inline void local_sfence_w_inval(void) -{ - asm volatile(SFENCE_W_INVAL() ::: "memory"); -} - -static inline void local_sinval_vma(unsigned long vma, unsigned long asid) -{ - if (asid != FLUSH_TLB_NO_ASID) - asm volatile(SINVAL_VMA(%0, %1) : : "r" (vma), "r" (asid) : "memory"); - else - asm volatile(SINVAL_VMA(%0, zero) : : "r" (vma) : "memory"); -} - /* * Flush entire TLB if number of entries to be flushed is greater * than the threshold below. -- 2.39.5