From nobody Fri Dec 19 17:58:11 2025 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (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 EC0D71FC7C2 for ; Wed, 8 Jan 2025 15:49:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736351354; cv=none; b=MaB258JZP5nhF/cY/Y3XfmCb9ySSwu+RHeC+yTEFEv5DIZgzWEOwg1j8Rzmu7KEXKNtJtVgFmukNIaDodY/rpyv/A1yB+QzmW9V3iudWDCzeaTbVRHf3SzxcuwgaXh6swg6t4ZrNxjUA8NUFWA2yP35oAAlvpOqC9SP0zgPNiUs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736351354; c=relaxed/simple; bh=VfIEAQMEE3FzHzcyf+VU/+lZvzX8aDNf0zd4rdSA8tk=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Content-Type; b=dXVZSTRLOZkpa0c5bi8TDz0jv9jwHs4zw96HSUCujUWgT2ZcHk64MfNnHqNAOTj2p0iLnFXGB0iK0DWSoHwaKy4D1IoaOnN6sgBPOVZB+oZeL4yjkaQigE0AkvqWh/9jwiv95zgFEqD4cinxyx2NaA/bLSr9WLEneWq+IT7NCZs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com; spf=pass smtp.mailfrom=rivosinc.com; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b=R0esNCAa; arc=none smtp.client-ip=209.85.128.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rivosinc-com.20230601.gappssmtp.com header.i=@rivosinc-com.20230601.gappssmtp.com header.b="R0esNCAa" Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-43618283d48so122953155e9.1 for ; Wed, 08 Jan 2025 07:49:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1736351350; x=1736956150; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=vgsjKbIw/Qtp7jQ5AD1ITXyk1buirQCSu+JWGBt/Rxw=; b=R0esNCAaplKTsYNn8c4fa1JpAeIyMxKlUNByOSl93iICCYWOKFu4A+juMS1pfLMrZW l1YaaZENQ7GvmWE9geDeBcb/IZTRndKAVT+h5z6n+W2nu3AIuZSzuVnzeQ1gDVW0BhMA zSkUwSZIa34w1GhfbFnHNs/Wh9sk3b1+Mg8Tr7bc7xaXTVHsayJmsJaXW37FMBdnKbbx Cfu6Fm1E+fvNvXPUV/vuBlsmPbe3B0IBjcbnmLuX50G7QYDwNNHGdeOgu8L7xJ7TB0Lf WD9U3ZTP6Dzdd42JIuJ9wq8kCC06wwgCNiXqxr+NaAPk0PmXvxvtsee0jlTuDc7WcSs8 ahiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736351350; x=1736956150; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=vgsjKbIw/Qtp7jQ5AD1ITXyk1buirQCSu+JWGBt/Rxw=; b=fCTsb0EgzkOlHAeglx5IL95NOKbZAM310UtKecpYDMSduxv3GL1tpRvgGzLYNYaHgQ C5cQQkqcjD6vH0MLeQnmybUfiYoqzjqiPT/NvOVoWeQzEDBZh7MclyNnNpvYoKxNJeXt b10e+pybfeKLWpHQ7r1msoxHOVhHKH9w1Ld5ziXWQguQcQn/wEsQ+s2BxKvJgJfSxY3l TP5u0xdjxUcT2sCwSP8N1hwjrtbBtH4xy1dMHXyZvnVO1iv4FBuFAeENfExX8yycO/cc wyQ84SHB1mlhvPXhv5gFvPhi88SC9gQ0gKtY/EAcfEkSVeHD3E0Qp3V96DAA5RoJ2F88 H0Bg== X-Forwarded-Encrypted: i=1; AJvYcCUceQikdT7P3VW5LQjq/HTWXyjWXe8TbCGgXw/GYoM+jx4WJFFCuOJLfXmiOdhfkQFVOmtpqcPMn0LZ2ts=@vger.kernel.org X-Gm-Message-State: AOJu0YxYzyvOSGSn/76gQosYCLVcE3lWTDrUFO/LOjRXqQsiewhJGlnZ G+gumbU/SJWSDVXtALG6ebCDu1dCGuOJRI2aGfxFA84rt6k/hlR7zWPZLf36RZM= X-Gm-Gg: ASbGncvj7Pyn1LfvHgV7QuXUTZNE9iV8eLE+EtMtlFd1dZgCksF4OJx82dzJ1FnDyjE TwZAb3zRTcsd5hyInakqjuNI2nZXLFwIOKvsJUhuchM/0A9hgeMPn7blgR3A47OR+Uh+COcHUMu 6WVkUUU50l3entHAaf434O4XCe+ZEsbwX/bcz4T5Oe8KVFdp/tttiW12UsPNW60di4IqeNygdlN aSXOvxIOAWtJgwD9TnoE3qN8xQwhp+hT6tlwDxky5vF7vWkrXqrx/hDlmbD0P0Ou17zJdCSjRfM FGJeHSKhWF+Yb4V7goXho7If X-Google-Smtp-Source: AGHT+IGOypGQLh3BUcPGq2oqFr1ZK/Glm85bEtHFzrrEmZJ9NzY1G2pqFasac+LFgi7mTjPivTeA+g== X-Received: by 2002:a05:6000:18ab:b0:385:f349:ffe7 with SMTP id ffacd0b85a97d-38a872f6d5fmr2989417f8f.2.1736351350106; Wed, 08 Jan 2025 07:49:10 -0800 (PST) Received: from alex-rivos.home (lfbn-lyo-1-472-36.w2-7.abo.wanadoo.fr. [2.7.62.36]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38a1c8475cesm52898915f8f.57.2025.01.08.07.49.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2025 07:49:09 -0800 (PST) From: Alexandre Ghiti To: Paul Walmsley , Palmer Dabbelt , Samuel Holland , Andrew Jones , Albert Ou , linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Alexandre Ghiti , =?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?= Subject: [PATCH v3] riscv: Call secondary mmu notifier when flushing the tlb Date: Wed, 8 Jan 2025 16:49:07 +0100 Message-Id: <20250108154907.132863-1-alexghiti@rivosinc.com> X-Mailer: git-send-email 2.39.2 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable This is required to allow the IOMMU driver to correctly flush its own TLB. Signed-off-by: Alexandre Ghiti Reviewed-by: Cl=C3=A9ment L=C3=A9ger --- Changes in v3: - Rebase on top of 6.13-rc3 Changes in v2: - Rebase on top of 6.9-rc1 arch/riscv/mm/tlbflush.c | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/arch/riscv/mm/tlbflush.c b/arch/riscv/mm/tlbflush.c index 9b6e86ce3867..f5f8bc6d1c61 100644 --- a/arch/riscv/mm/tlbflush.c +++ b/arch/riscv/mm/tlbflush.c @@ -4,6 +4,7 @@ #include #include #include +#include #include #include =20 @@ -78,10 +79,19 @@ static void __ipi_flush_tlb_range_asid(void *info) local_flush_tlb_range_asid(d->start, d->size, d->stride, d->asid); } =20 -static void __flush_tlb_range(const struct cpumask *cmask, unsigned long a= sid, +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, unsigned long stride) { + struct flush_tlb_range_data ftd; + unsigned long asid =3D get_mm_asid(mm); + bool broadcast; unsigned int cpu; =20 if (cpumask_empty(cmask)) @@ -105,30 +115,26 @@ static void __flush_tlb_range(const struct cpumask *c= mask, unsigned long asid, } =20 put_cpu(); -} =20 -static inline unsigned long get_mm_asid(struct mm_struct *mm) -{ - return cntx2asid(atomic_long_read(&mm->context.id)); + if (mm) + mmu_notifier_arch_invalidate_secondary_tlbs(mm, start, start + size); } =20 void flush_tlb_mm(struct mm_struct *mm) { - __flush_tlb_range(mm_cpumask(mm), get_mm_asid(mm), - 0, FLUSH_TLB_MAX_SIZE, PAGE_SIZE); + __flush_tlb_range(mm, mm_cpumask(mm), 0, FLUSH_TLB_MAX_SIZE, PAGE_SIZE); } =20 void flush_tlb_mm_range(struct mm_struct *mm, unsigned long start, unsigned long end, unsigned int page_size) { - __flush_tlb_range(mm_cpumask(mm), get_mm_asid(mm), - start, end - start, page_size); + __flush_tlb_range(mm, mm_cpumask(mm), start, end - start, page_size); } =20 void flush_tlb_page(struct vm_area_struct *vma, unsigned long addr) { - __flush_tlb_range(mm_cpumask(vma->vm_mm), get_mm_asid(vma->vm_mm), + __flush_tlb_range(vma->vm_mm, mm_cpumask(vma->vm_mm), addr, PAGE_SIZE, PAGE_SIZE); } =20 @@ -161,13 +167,13 @@ void flush_tlb_range(struct vm_area_struct *vma, unsi= gned long start, } } =20 - __flush_tlb_range(mm_cpumask(vma->vm_mm), get_mm_asid(vma->vm_mm), + __flush_tlb_range(vma->vm_mm, mm_cpumask(vma->vm_mm), start, end - start, stride_size); } =20 void flush_tlb_kernel_range(unsigned long start, unsigned long end) { - __flush_tlb_range(cpu_online_mask, FLUSH_TLB_NO_ASID, + __flush_tlb_range(NULL, cpu_online_mask, start, end - start, PAGE_SIZE); } =20 @@ -175,7 +181,7 @@ void flush_tlb_kernel_range(unsigned long start, unsign= ed long end) void flush_pmd_tlb_range(struct vm_area_struct *vma, unsigned long start, unsigned long end) { - __flush_tlb_range(mm_cpumask(vma->vm_mm), get_mm_asid(vma->vm_mm), + __flush_tlb_range(vma->vm_mm, mm_cpumask(vma->vm_mm), start, end - start, PMD_SIZE); } #endif @@ -189,7 +195,10 @@ void arch_tlbbatch_add_pending(struct arch_tlbflush_un= map_batch *batch, struct mm_struct *mm, unsigned long uaddr) { + unsigned long start =3D uaddr & PAGE_MASK; + cpumask_or(&batch->cpumask, &batch->cpumask, mm_cpumask(mm)); + mmu_notifier_arch_invalidate_secondary_tlbs(mm, start, start + PAGE_SIZE); } =20 void arch_flush_tlb_batched_pending(struct mm_struct *mm) @@ -199,7 +208,7 @@ void arch_flush_tlb_batched_pending(struct mm_struct *m= m) =20 void arch_tlbbatch_flush(struct arch_tlbflush_unmap_batch *batch) { - __flush_tlb_range(&batch->cpumask, FLUSH_TLB_NO_ASID, 0, - FLUSH_TLB_MAX_SIZE, PAGE_SIZE); + __flush_tlb_range(NULL, &batch->cpumask, + 0, FLUSH_TLB_MAX_SIZE, PAGE_SIZE); cpumask_clear(&batch->cpumask); } --=20 2.39.2