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 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: 8bit 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 = 64; -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, if (nr_ptes_in_range > tlb_flush_all_threshold) { local_flush_tlb_all_asid(asid); + if (mm && mm != current->active_mm) + cpumask_clear_cpu(raw_smp_processor_id(), mm_cpumask(mm)); return; } @@ -46,21 +49,28 @@ static void local_flush_tlb_range_threshold_asid(unsigned long start, } } -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 <= stride) + unsigned long asid = get_mm_asid(mm); + + if (size <= stride) { local_flush_tlb_page_asid(start, asid); - else if (size == FLUSH_TLB_MAX_SIZE) + } else if (size == FLUSH_TLB_MAX_SIZE) { local_flush_tlb_all_asid(asid); - else - local_flush_tlb_range_threshold_asid(start, size, stride, asid); + if (mm && mm != 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); + } } /* 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_ASID); + local_flush_tlb_range_mm(NULL, start, end - start, PAGE_SIZE); } static void __ipi_flush_tlb_all(void *info) @@ -79,17 +89,17 @@ void flush_tlb_all(void) } struct flush_tlb_range_data { - unsigned long asid; + struct mm_struct *mm; unsigned long start; unsigned long size; unsigned long stride; }; -static void __ipi_flush_tlb_range_asid(void *info) +static void __ipi_flush_tlb_range_mm(void *info) { struct flush_tlb_range_data *d = info; - 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); } 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 = get_mm_asid(mm); unsigned int cpu; if (cpumask_empty(cmask)) @@ -107,17 +116,17 @@ static void __flush_tlb_range(struct mm_struct *mm, /* Check if the TLB flush needs to be sent to other CPUs. */ if (cpumask_any_but(cmask, cpu) >= 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; - ftd.asid = asid; + ftd.mm = mm; ftd.start = start; ftd.size = size; ftd.stride = 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); } put_cpu(); -- 2.39.5