From nobody Sat Jul 25 17:33:42 2026 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) (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 8249640EBA3 for ; Wed, 15 Jul 2026 13:20:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784121630; cv=none; b=R/oX7XpyCgk13WBwGvHff2i43IFxRkcmBlQFbLRPb0/cqIhOABy3jOpZQ8edTH+eKPWmG95wYI0gO8F3KpRblotuDVaUP+aWVdvVBf7Cce2zY3SXQDUmX2OQQKW4Zvsir/rRGwWy4JrUqTrkcJDUwdcGKy0/wO7iYgm7Lz2U+3Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784121630; c=relaxed/simple; bh=8ZIF6JuxZqn4Txv95sC6rxky+kDavPJHbS/P+OHPMzM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=LnrRJ32XvV6eTZbzUyAuFyDfq21BUQivYwuLezcEflhR0DO2I3x9hcZU/GmAPDWQSf0M0C5YjXftaLQdn94Y5US/egAQLwwDMbUfYedDJ3ml3P1146QP3wrk/+PWw/tmoYaMDSPOgYMktVbwhZeEqHb3C4SB8oA6zJSbQJah7zo= 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=hZbXtEpz; arc=none smtp.client-ip=209.85.214.175 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="hZbXtEpz" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-2ceb096e675so45351255ad.0 for ; Wed, 15 Jul 2026 06:20:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1784121621; x=1784726421; 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=M5Al+sJZCP/A2YqMMRE5O11m7TbG/oT9KeekulTJ1Xs=; b=hZbXtEpzBq1jX9OkV2wDiYwZQfCrCxao7BE2DCcKhfontYl5c7oqV9kOAlh0sqVwEz G+31nTHsrBPm3X7Or4mQcm2dmcjxkMpzltl225L64noRsdsMnxqN93ZBw9SoO8tAQ5zI 28o6uxOWC33GCwhpfaziHeuCUP3P2cDgqTY2XpdBm5v7CG4Sl7es22MosUZibjfaY/n5 LlaoAzkaJogB5+7lMdFxuR1yHC/58cYjfYxKvFoywv818GH6AnGBHqddvRNR2Vh2qamp EZLprRBwKENGC4nvimOOk34uRxNAYPr/8jZOPSeiMk1jYJR0flmVt5uUV8IclEizVatS 4GEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784121621; x=1784726421; 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=M5Al+sJZCP/A2YqMMRE5O11m7TbG/oT9KeekulTJ1Xs=; b=tHScTru8GgkuKpQoG9/c51W5aJDhRHbp8cMWJ/zjpYAKfrU5s1aQX4VlJSXoHI8jt2 /6dKXCwMcLmsnEUskaXrXaQrN2qej5xTzeZK6fjSLsKMTks3XZqVuodWGc+aCjbsR1C3 C4BUjAMADTas0/Dy0CugL6z1r6ZhXXeNzlv4qjS02hRsaxGBTnXAUl6mKt3Yux6K4IXN Am21gSYuYic0KcW7Y7vVkw/jOIWaJZe05Zb/YWSk714gihsmiRbdeAPc4d4sIiWITj9M Uhi5dv0erjiDzuldNdyJhuHX7F8op6ZA7BePh+FNry0oIoR0j0YDZD3qIdlSf5qAgNWK Z7eg== X-Forwarded-Encrypted: i=1; AHgh+RoEDqDxdE5Em+tgSY96s0DG1eAcJz/i2EHXk2x6YfKG22SM6lqbMKsXqxATK9M+3jnpR0QUCxVe7iUuscg=@vger.kernel.org X-Gm-Message-State: AOJu0Yxt2CcZ+jc5VtaIZksCpoExGC/rpDC8tM+44L6yIAlhWmuVacmI 1IbzB3tDbZEfy1cXWfmASp0Ono/w0D7nLu392UDI1RbnfRCEtCTOnjXwBF9faJrhMlU= X-Gm-Gg: AfdE7cl3SJ9HhcrDnYudba1rcSlpNef16EuKI+N0TH7EJk6nF++IYGHB3PL21BjRE1q FucJJXp3znF47lKPopsrMFSBFhe6Jr/nnL6DtOO3iskD4RkhbvNNQxscAgpLH7iMBnfFM1qJD2I MGj/WTVD7OLHi2Z/daofUowV6Eb5dHAMzr6MBu/XcIDDSnSOBZfGt9mc0jft1RPn9j68bW/lUwp 4h59XAstp6ZTHiAJLDOARNZzJNy4JBplOJ4O3D6GZmKlD9c3gqAZMwzRIp40HEI+0/Nc/LrjXD1 DhHcIVdK64G+fgqevWXlhZBUXfuSBLEcddAyjF345bDreHji8PeDYthWBf5Bd4b3osmtp/YaLnx hiBXiBdGJ9T/eJ4DMrZvKqlE8npr6cbRXCIyLnq6++gCcQFzaKzQ3LSS4NcSJSusqu1tD7SvZZu gI62NyD9AAaJsWJu58n+O1Qpnc5HsmTPGjqt25oTQwnbD5/qXEDgzDVpEWjB6cxAXE16izzDr+c 6ux0X72bM8Dsl9a6liprN2OPTufInpzUeI= X-Received: by 2002:a17:903:41cd:b0:2cc:a977:4260 with SMTP id d9443c01a7336-2cf03c40414mr25734955ad.21.1784121620466; Wed, 15 Jul 2026 06:20:20 -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.17 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 15 Jul 2026 06:20:20 -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 1/3] riscv: mm: Use ASID in update_mmu_cache() Date: Wed, 15 Jul 2026 21:20:07 +0800 Message-ID: <20260715132009.10634-2-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: quoted-printable Content-Type: text/plain; charset="utf-8" Only flush TLB entries for the specified mm in update_mmu_cache_range(). Signed-off-by: Xu Lu --- arch/riscv/include/asm/pgtable.h | 4 +++- arch/riscv/include/asm/tlbflush.h | 5 +++++ arch/riscv/mm/tlbflush.c | 5 ----- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgta= ble.h index 5d5756bda82e..9926556099ae 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -568,6 +568,8 @@ static inline void update_mmu_cache_range(struct vm_fau= lt *vmf, struct vm_area_struct *vma, unsigned long address, pte_t *ptep, unsigned int nr) { + unsigned long asid =3D get_mm_asid(vma->vm_mm); + /* * Svvptc guarantees that the new valid pte will be visible within * a bounded timeframe, so when the uarch does not cache invalid @@ -584,7 +586,7 @@ static inline void update_mmu_cache_range(struct vm_fau= lt *vmf, * the extra traps reduce performance. So, eagerly SFENCE.VMA. */ while (nr--) - local_flush_tlb_page(address + nr * PAGE_SIZE); + local_flush_tlb_page_asid(address + nr * PAGE_SIZE, asid); =20 } #define update_mmu_cache(vma, addr, ptep) \ diff --git a/arch/riscv/include/asm/tlbflush.h b/arch/riscv/include/asm/tlb= flush.h index eed0abc40514..7c2cd5cc92d3 100644 --- a/arch/riscv/include/asm/tlbflush.h +++ b/arch/riscv/include/asm/tlbflush.h @@ -15,6 +15,11 @@ #define FLUSH_TLB_NO_ASID ((unsigned long)-1) =20 #ifdef CONFIG_MMU +static inline unsigned long get_mm_asid(struct mm_struct *mm) +{ + return mm ? cntx2asid(atomic_long_read(&mm->context.id)) : FLUSH_TLB_NO_A= SID; +} + 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 8404530ec00f..73c226f719c7 100644 --- a/arch/riscv/mm/tlbflush.c +++ b/arch/riscv/mm/tlbflush.c @@ -110,11 +110,6 @@ static void __ipi_flush_tlb_range_asid(void *info) local_flush_tlb_range_asid(d->start, d->size, d->stride, d->asid); } =20 -static inline unsigned long get_mm_asid(struct mm_struct *mm) -{ - return mm ? cntx2asid(atomic_long_read(&mm->context.id)) : FLUSH_TLB_NO_A= SID; -} - static void __flush_tlb_range(struct mm_struct *mm, const struct cpumask *cmask, unsigned long start, unsigned long size, --=20 2.39.5 From nobody Sat Jul 25 17:33:42 2026 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: quoted-printable Content-Type: text/plain; charset="utf-8" Use Svinval in update_mmu_cache_range() when the extension is available. Signed-off-by: Xu Lu Tested-by: Klara Modin --- 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/pgta= ble.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_fa= ult *vmf, if (riscv_has_extension_unlikely(RISCV_ISA_EXT_SVVPTC)) return; =20 + 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/tlb= flush.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_A= SID; } =20 +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 !=3D 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 @@ =20 #define has_svinval() riscv_has_extension_unlikely(RISCV_ISA_EXT_SVINVAL) =20 -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 !=3D 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. --=20 2.39.5 From nobody Sat Jul 25 17:33:42 2026 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) (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 81ACB41D63C for ; Wed, 15 Jul 2026 13:20:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784121639; cv=none; b=lHWWyEUHMJAssWJj9d61ZmbdTgYWIlOoMm4vg+aJgQAPcw/jvhVlxAWuT5T91ZFtTRxoFx1A4cNipiC+0v1wj2Eyuqshnvwtz8cP7jkob/nx1Cu1EiTwDOsF2atKwmiV4CBM4uYPnpRiXFkPpVqGeoZvZqBVJD94ni9sHxgO4t8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784121639; c=relaxed/simple; bh=oa56GFNI7dlgUKCaK0m7Hw6SF/PRdX2X3uryGwxn/Nk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dbuviCYs5M2hdK6XpGxuE4KRjAqOBgM2MxVjzwAo4GaRNbtwZBt4ml9WG/d0cVpt+YwlJ+yBH2TA2dhp77Y6PSPuhmKoI47w2KP3HEJ22qESIy12JVM25ix45Wb+oVfK255g2iWyouMGVE9w/Yh2RvPWv4W4+VUJZ8hXaD/ctIo= 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=faV40GYs; arc=none smtp.client-ip=209.85.214.175 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="faV40GYs" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-2cacf197759so33902195ad.2 for ; Wed, 15 Jul 2026 06:20:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1784121627; x=1784726427; 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=Ls7fw2fiB7Zvr+LqQASlN6vhjFF7oWi5zE1mfIWRWyE=; b=faV40GYsblbQTRfz7oPXgPKGHFkOciZKXfO8128hSs6R/oRQzuoGnPa3QfjmJAlonw eyXfcNBc6tn6z3d/u1bnV3xHjuT8nsMjir7g9zg4p6NJHKk1peujWw1bgtv1Y8b8ZBr+ dSyGpy0uXAKq3wf0IFKY4kEjyAYuG9kO1cnS1vDCh1l8v+F/rzRfH8QyW7kkQnqqKGma NTWqdJoiZ3Jw9xtCYmzyNDMjQnXlMF31DpcAC4Eyb3mCn+N5kCcREqLVZQ5w1DST/ZSL s3K/wHwd7L2YxB11YOKLTz57MmosTfN82F0LPcKiU7U2P0dTaDyEhKTw3ZsDGsYp4nJS Gpww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784121627; x=1784726427; 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=Ls7fw2fiB7Zvr+LqQASlN6vhjFF7oWi5zE1mfIWRWyE=; b=goFXIzWLDcEotb7Y+SjyW7QfezW8woYCJzgAl6NhAo1IrdkXcyA8bqrfExA5mmeY4m LWmRBVsJK4FOVFkcVhjGGdgmcHp/ul5DYYGfePaar8Tuk2Qp91fQ/v1CqEUilkBjHtxY y8oGR0ddR1GMuNrYwIhZBuvgxZOREloUX1k4EkGfAG+ZmjrJgKkg8wT1sFzaLYCmDHyC sm9selXFQqJuH1mmF5aFFH6t7EwWm8qWROd04G0DbQ0aiknyy+YzkEHPnII8WVyPN74p n7TsSoiFAV2hihG3YEsyk4HkGGZTB94lRvScAIcAfhZbBASE/hgi13zku4kEvdZmWWwh gZAg== X-Forwarded-Encrypted: i=1; AHgh+RqYdWPlyslUiWJFdBcXoOsBxdZfynbvF2onU+4IqGokY3BvsXVa9S+WPX+K3C1kyQxWJsRnNRZfcCsneaY=@vger.kernel.org X-Gm-Message-State: AOJu0Yy7JKsGIgpbsxodWfTbhbjQd8QzrBdvNHn32XeiAwmieIa5/The H5IYE1DVscv2kA65JyLzSyEsqdILgQRh5xTeBda/hGOs51HG2Nd+50upVYG7ywJwlV8= X-Gm-Gg: AfdE7cloFbaACBwMipqTE+ki3r2IXsQlz82z+c8X84tlhOT7PtMDJrRb76cQTobXuHe VRKVhZP4YCnn2J/wid7wvMEdJFhYpozDK3o2AJ9CkXGymai3Hj/87wVLAUsHJSOKVmDfKSW7npU oON7Oni5ZTh9N0ZTYBuZ4TbDznR0YYVukXLzjNBesVnjpVEo2uLTy3hqEDDpCtwISZStSALsCVg 3Zq8w4DG+MlXMnY7xXxfO4uLQeWn6rmNi7xkYx8mQGDJTrQJpryG8Mgy80cb+Nifq1cOutzq1U8 MpHBB3Ka5CAiN+sip5H4QFwJD/eT+xb2CieWJBIPolne6Zy4wOUaOTzrK8OmuV3HdjuCWLV9XrS Nor16Sm5QgniJNYox+YH8F5tmPiFPPYF1k1Wr1+xzyrEA1lneqWz+cxTEwE6HUAt7SJbNXwwlx7 fzVwlfAKruTZ0OqKxHdKO4oErciXKr3sFvRf2raiRXHUyrG2txw8LoPgh/szKzwMYUbl+/BRqrh lo7xvNC+5IfIQs+n7eTxHZA4G83JBR66eaU+WUaKwHHFw== X-Received: by 2002:a17:903:240c:b0:2c8:1c05:16bb with SMTP id d9443c01a7336-2ce9ec0f108mr163542875ad.24.1784121626921; Wed, 15 Jul 2026 06:20:26 -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.24 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 15 Jul 2026 06:20:26 -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 3/3] riscv: mm: Clear cpu in mm_cpumask after local_flush_tlb_all_asid Date: Wed, 15 Jul 2026 21:20:09 +0800 Message-ID: <20260715132009.10634-4-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: quoted-printable Content-Type: text/plain; charset="utf-8" Clear corresponding bit of current cpu in mm_cpumask after executing local_flush_tlb_all_asid(). Signed-off-by: Xu Lu --- arch/riscv/mm/tlbflush.c | 41 ++++++++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/arch/riscv/mm/tlbflush.c b/arch/riscv/mm/tlbflush.c index 962db300a166..571358f38587 100644 --- a/arch/riscv/mm/tlbflush.c +++ b/arch/riscv/mm/tlbflush.c @@ -17,7 +17,8 @@ */ unsigned long tlb_flush_all_threshold __read_mostly =3D 64; =20 -static void local_flush_tlb_range_threshold_asid(unsigned long start, +static void local_flush_tlb_range_threshold_asid(struct mm_struct *mm, + unsigned long start, unsigned long size, unsigned long stride, unsigned long asid) @@ -27,6 +28,8 @@ static void local_flush_tlb_range_threshold_asid(unsigned= long start, =20 if (nr_ptes_in_range > tlb_flush_all_threshold) { local_flush_tlb_all_asid(asid); + if (mm && mm !=3D current->active_mm) + cpumask_clear_cpu(raw_smp_processor_id(), mm_cpumask(mm)); return; } =20 @@ -46,21 +49,28 @@ static void local_flush_tlb_range_threshold_asid(unsign= ed long start, } } =20 -static inline void local_flush_tlb_range_asid(unsigned long start, - unsigned long size, unsigned long stride, unsigned long asid) +static inline void local_flush_tlb_range_mm(struct mm_struct *mm, + unsigned long start, + unsigned long size, + unsigned long stride) { - if (size <=3D stride) + unsigned long asid =3D get_mm_asid(mm); + + if (size <=3D stride) { local_flush_tlb_page_asid(start, asid); - else if (size =3D=3D FLUSH_TLB_MAX_SIZE) + } else if (size =3D=3D FLUSH_TLB_MAX_SIZE) { local_flush_tlb_all_asid(asid); - else - local_flush_tlb_range_threshold_asid(start, size, stride, asid); + if (mm && mm !=3D current->active_mm) + cpumask_clear_cpu(raw_smp_processor_id(), mm_cpumask(mm)); + } else { + local_flush_tlb_range_threshold_asid(mm, start, size, stride, asid); + } } =20 /* Flush a range of kernel pages without broadcasting */ void local_flush_tlb_kernel_range(unsigned long start, unsigned long end) { - local_flush_tlb_range_asid(start, end - start, PAGE_SIZE, FLUSH_TLB_NO_AS= ID); + local_flush_tlb_range_mm(NULL, start, end - start, PAGE_SIZE); } =20 static void __ipi_flush_tlb_all(void *info) @@ -79,17 +89,17 @@ void flush_tlb_all(void) } =20 struct flush_tlb_range_data { - unsigned long asid; + struct mm_struct *mm; unsigned long start; unsigned long size; unsigned long stride; }; =20 -static void __ipi_flush_tlb_range_asid(void *info) +static void __ipi_flush_tlb_range_mm(void *info) { struct flush_tlb_range_data *d =3D info; =20 - local_flush_tlb_range_asid(d->start, d->size, d->stride, d->asid); + local_flush_tlb_range_mm(d->mm, d->start, d->size, d->stride); } =20 static void __flush_tlb_range(struct mm_struct *mm, @@ -97,7 +107,6 @@ static void __flush_tlb_range(struct mm_struct *mm, unsigned long start, unsigned long size, unsigned long stride) { - unsigned long asid =3D get_mm_asid(mm); unsigned int cpu; =20 if (cpumask_empty(cmask)) @@ -107,17 +116,17 @@ static void __flush_tlb_range(struct mm_struct *mm, =20 /* Check if the TLB flush needs to be sent to other CPUs. */ if (cpumask_any_but(cmask, cpu) >=3D nr_cpu_ids) { - local_flush_tlb_range_asid(start, size, stride, asid); + local_flush_tlb_range_mm(mm, start, size, stride); } else if (riscv_use_sbi_for_rfence()) { - sbi_remote_sfence_vma_asid(cmask, start, size, asid); + sbi_remote_sfence_vma_asid(cmask, start, size, get_mm_asid(mm)); } else { struct flush_tlb_range_data ftd; =20 - ftd.asid =3D asid; + ftd.mm =3D mm; ftd.start =3D start; ftd.size =3D size; ftd.stride =3D stride; - on_each_cpu_mask(cmask, __ipi_flush_tlb_range_asid, &ftd, 1); + on_each_cpu_mask(cmask, __ipi_flush_tlb_range_mm, &ftd, 1); } =20 put_cpu(); --=20 2.39.5