From mboxrd@z Thu Jan 1 00:00:00 1970 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: 8bit 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/pgtable.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_fault *vmf, struct vm_area_struct *vma, unsigned long address, pte_t *ptep, unsigned int nr) { + unsigned long asid = 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_fault *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); } #define update_mmu_cache(vma, addr, ptep) \ diff --git a/arch/riscv/include/asm/tlbflush.h b/arch/riscv/include/asm/tlbflush.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) #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_ASID; +} + 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); } -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 void __flush_tlb_range(struct mm_struct *mm, const struct cpumask *cmask, unsigned long start, unsigned long size, -- 2.39.5