From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id CCA98C4167B for ; Mon, 30 Oct 2023 13:35:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6F1976B01FA; Mon, 30 Oct 2023 09:35:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6A2046B01FB; Mon, 30 Oct 2023 09:35:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 56A3A6B01FC; Mon, 30 Oct 2023 09:35:11 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 43C9C6B01FA for ; Mon, 30 Oct 2023 09:35:11 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 2B2F4B5538 for ; Mon, 30 Oct 2023 13:35:11 +0000 (UTC) X-FDA: 81402224022.03.9A9C1AB Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by imf01.hostedemail.com (Postfix) with ESMTP id 32A0140006 for ; Mon, 30 Oct 2023 13:35:08 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=N93X7x4H; spf=pass (imf01.hostedemail.com: domain of alexghiti@rivosinc.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=alexghiti@rivosinc.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1698672909; a=rsa-sha256; cv=none; b=bjU/s8yNHSwyCWWDnigIf0qsvB5pNOeCpJJ7ROewEuyy0pjKhLzCw3W2xNYWTIVHHwHiXk 8JVA9P4HsCk4V60tPCaYTgxDHYZXJ9lFQfPWsVZ1Dp00zk4vPdioI6Yni6L3CgFweUZhOc H2c4WIDgvmp+Gg96D+LpAtPtkNPbKAs= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=rivosinc-com.20230601.gappssmtp.com header.s=20230601 header.b=N93X7x4H; spf=pass (imf01.hostedemail.com: domain of alexghiti@rivosinc.com designates 209.85.221.47 as permitted sender) smtp.mailfrom=alexghiti@rivosinc.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1698672909; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Z+Voqb64JUu/S+my4bjKiePrsxn/AGTGcWHZA6URcLY=; b=7sKBr8+vCSrPCSR1LgRBikOvQH/BprOZeSzGa9uRIVRXw+7NEbikVA8/CGdYHicguPw+WZ Z5veZn5N/XXvxnw07XKEleD90OwfnmCFOBBA4SCKNr2u8RpHGWz0hMCj5dCtVSsWrRDzM1 0w3EH+7gbnHSRFDnjCdP2LtblJ5G2p4= Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-32f5b83f254so3087610f8f.3 for ; Mon, 30 Oct 2023 06:35:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20230601.gappssmtp.com; s=20230601; t=1698672908; x=1699277708; darn=kvack.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; bh=Z+Voqb64JUu/S+my4bjKiePrsxn/AGTGcWHZA6URcLY=; b=N93X7x4HCIBDVnzfy1AB7Bp+oMg7f9xpnPm6M4xF/hAAsiD93dAWqID0XD08AXP2cM FAQZbcCNXwljho0wPM9EEHQabuNJSgqz+z2CkYGCY85nu55lmGDtdHB/pTLZEZBYEAfp LMpUMudXZSxnnt8r8T1CPUP0f10/RQPb5cVq0i+76g4r4ty7lqP9cG1UfbIeGDZiLp4p jdfAnP9Vpp/PZk7CG2uwcsswW0zD5XMn+eJ2R9irGPBT4E8KW+HRKGtS3PXYVLRg3L09 Qoz91d0Xy2JFdSdX203ALNJ1n+yRQQ8mCkFIcMzEV4BS7vzMiPzPEhdF4E3ppEJ22rFf OqCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698672908; x=1699277708; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Z+Voqb64JUu/S+my4bjKiePrsxn/AGTGcWHZA6URcLY=; b=bAbtzsUw4CuAPoSiQ2SqfXBB3zBZPQ90iDK98c99SzFV6bBsT7Ss5CSvnjnt2fUVNC QRH7HalaI9cQtXc07EdDNwwcDVC7UqiSWJuySYYY9LUeRGOkbAguuhrAvScUf6ohChsi XTP7+RB3JLpwH+dLhBDRuiMhDz68h7CMMmpPUmrdolVakMTE6Z/SvMsqRj7NZW9yBQ7Q 7ljl9B7lkdW0tG7/ft3JGZSKtZn50qb2A5tSSVpBDEodkfeV+RZvZwumdZBb31TVs8ex KXWK9UFIxUYzWnWAVzcMwV1T2hOWHm9HiQgwpgiJJjLn70rRwtvI5F1XeASSeEmYLVUK k4rg== X-Gm-Message-State: AOJu0YwBfUTD/wNDIDcAYeZOhLtVMULSESwFm1W2HdG8Pzih2bUEPPn5 Cov0G1OMeI3tUMqhjC/CdLUgLQ== X-Google-Smtp-Source: AGHT+IHEw6T+OK2cXmEQUaFlVp9JTsP+3ENAfV/VP4H/l3hIJec/QWwZbGuNwmLLAlaAsmBtrNDznA== X-Received: by 2002:a05:6000:1882:b0:32f:7f03:9a with SMTP id a2-20020a056000188200b0032f7f03009amr4279324wri.55.1698672907709; Mon, 30 Oct 2023 06:35:07 -0700 (PDT) Received: from alex-rivos.ba.rivosinc.com (amontpellier-656-1-456-62.w92-145.abo.wanadoo.fr. [92.145.124.62]) by smtp.gmail.com with ESMTPSA id o12-20020a056000010c00b003232f167df5sm8252241wrx.108.2023.10.30.06.35.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Oct 2023 06:35:07 -0700 (PDT) From: Alexandre Ghiti To: Will Deacon , "Aneesh Kumar K . V" , Andrew Morton , Nick Piggin , Peter Zijlstra , Mayuresh Chitale , Vincent Chen , Paul Walmsley , Palmer Dabbelt , Albert Ou , linux-arch@vger.kernel.org, linux-mm@kvack.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Samuel Holland , Lad Prabhakar Cc: Alexandre Ghiti , Andrew Jones , Lad Prabhakar , Samuel Holland Subject: [PATCH v6 4/4] riscv: Improve flush_tlb_kernel_range() Date: Mon, 30 Oct 2023 14:30:28 +0100 Message-Id: <20231030133027.19542-5-alexghiti@rivosinc.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231030133027.19542-1-alexghiti@rivosinc.com> References: <20231030133027.19542-1-alexghiti@rivosinc.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 32A0140006 X-Stat-Signature: aqmn347i1h564rfhbcattsq71op1456x X-Rspam-User: X-HE-Tag: 1698672908-207394 X-HE-Meta: U2FsdGVkX185+QeSO2PF3uyW2RVARmuOYyPLanArGb9gXuMViluvMxFmUfPYkrYYUzSzCtQn1tt40oENNHROd+yqSLgMbqKXhCjGRtwW4XztS6JqNkBBGpK2eC1x0UNiSyZhl4YyonW4mBN+4fRv3WKj7pzLqJNnOgt/MUDos4jYsiUyCTrroptFI4YqyjINaA6hYBgk+ySJ49tdLpAYNGJGnC1upVNPKTalNUs1Ezz6IiNHRtZwKMERBPr/elmUB4+Qkg0FYPhEBw4izzE/5WkxeRNCcexl3izyVPI9T4jla1uK46YKGXXrfqobqr0K+/VQ+Hymx6hHedQicOVQ9CpWGA9kxoXcGA3Vh9HboPq62fVZnk6NUHfqp2YUz2kYY/8tYsf7CVxpGVOH09CznXuN6zI4xgcX7ma0Ovs9eIZPFzfSCk8UknuVRGLY1SgSNAgPa0N/w9zm93ilDGfOQuWmvlG7roy6S1nVA8UGyiJ8Ibco9JGH+xfFWrEUwSlkUM8h4xE8YjD96hlbUi+1wC88cG+JnGCCdJRJzjXZ9ubZTQg6dLcNQw8uuav45ecfIQ+VMHV6RLof07zIrBk33qYKwxO20Chr319J7N/InxoQPAXjbSGVFeT8aiGu07j1W0PNP1r1fwJC6T9YqFT9omwHJtXtR2jTaN6sTe/XzalfZ3SBrvHC3y24AapYHZgTTSKx6iK1eOBZWNg6sLK7na1hxsTaEM7whDt2beYQaqmKbNp4wnXnJl5zcbvOX9k2mVc5iPOlrkkvldRzmr77drPWP/mr4FkptZ+2plVQRpw1Zrd0H0wzjEJ07NRAKUc3kFRmmPsXpagNSPnVVUeFtPAVoyO7+1mGeXPTeIEynwPnCYHjlMcBmiyd0PSgi/Crgbe/ixRfl+t9n+azxTm1p4NpBl6QiJ3JbX6Dfz+1m9nAERVUMthqQPoS9+P8LlJXAWToZgMzOPcdj44wK1L gS/J/ML3 0DBobtTD8VChOhmPKm9LEGojjqNmhrE4jwWX16b5otrUr2DBhCJl5Sxd4lLQXJFtS01q3X255BcrmjXabaH22dWxJhT6RCUZAuMl1JhWnWX4iZADvBwOhHGG+qh+LxNYTBRZ8njJHlm8lIoEkY6MCi9Gu+BW9h8UWpQk6MZDzD8Qe4JpNAaKQkk5tCpD1BELwMN+a18N2lWphDknL/WtNqgcz+pa/tolhyzt2ETHNOVgiabQ2zGGlACB0twcto9PZB8794EWD1aDgFMkheZsSvnH0wgcLfF4X5iT9LuhvSKysGYYKSoJkD8VQQvKBoGXOoI4MIxFwXmbVyVAQXglbDcbZ+W47aLmVm1/I2HiLxUa7hZNPzdxg5GW9Q+pLFwg6J8mja5XhRKExiINJVqq1G8sI+EuUmOIvEA1wXrfQv2CfIx+4RZiMj5C/oqmHFe3PYUyJfVxQbd3q94lokzhopN3caujJFObxsLiqm+mzZzfmcY7EVQl6+OjVZ9L0Dzm5xGlNrkFGT/vs4wDEOkSOCdTFiY125NRzUMtIysdLVZGML14R3GCZGj8GWMC2Lb/6Yoww/IYduhEC2txjQdyiD02oUwZ3h/XhiM/d7LERW3wDDzWjHI6wznpEiKcIyCIgPqlkE3zsnnCp7KB6UYSER6X2BkT5CNwztSTVKMXBSBOFP9X4FlaIiVF8PjBIZRieS3IEhnmb774PhzQ= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: This function used to simply flush the whole tlb of all harts, be more subtile and try to only flush the range. The problem is that we can only use PAGE_SIZE as stride since we don't know the size of the underlying mapping and then this function will be improved only if the size of the region to flush is < threshold * PAGE_SIZE. Signed-off-by: Alexandre Ghiti Reviewed-by: Andrew Jones Tested-by: Lad Prabhakar # On RZ/Five SMARC Reviewed-by: Samuel Holland Tested-by: Samuel Holland --- arch/riscv/include/asm/tlbflush.h | 11 +++++----- arch/riscv/mm/tlbflush.c | 34 ++++++++++++++++++++++--------- 2 files changed, 30 insertions(+), 15 deletions(-) diff --git a/arch/riscv/include/asm/tlbflush.h b/arch/riscv/include/asm/tlbflush.h index 170a49c531c6..8f3418c5f172 100644 --- a/arch/riscv/include/asm/tlbflush.h +++ b/arch/riscv/include/asm/tlbflush.h @@ -40,6 +40,7 @@ void flush_tlb_mm_range(struct mm_struct *mm, unsigned long start, void flush_tlb_page(struct vm_area_struct *vma, unsigned long addr); void flush_tlb_range(struct vm_area_struct *vma, unsigned long start, unsigned long end); +void flush_tlb_kernel_range(unsigned long start, unsigned long end); #ifdef CONFIG_TRANSPARENT_HUGEPAGE #define __HAVE_ARCH_FLUSH_PMD_TLB_RANGE void flush_pmd_tlb_range(struct vm_area_struct *vma, unsigned long start, @@ -56,15 +57,15 @@ static inline void flush_tlb_range(struct vm_area_struct *vma, local_flush_tlb_all(); } -#define flush_tlb_mm(mm) flush_tlb_all() -#define flush_tlb_mm_range(mm, start, end, page_size) flush_tlb_all() -#endif /* !CONFIG_SMP || !CONFIG_MMU */ - /* Flush a range of kernel pages */ static inline void flush_tlb_kernel_range(unsigned long start, unsigned long end) { - flush_tlb_all(); + local_flush_tlb_all(); } +#define flush_tlb_mm(mm) flush_tlb_all() +#define flush_tlb_mm_range(mm, start, end, page_size) flush_tlb_all() +#endif /* !CONFIG_SMP || !CONFIG_MMU */ + #endif /* _ASM_RISCV_TLBFLUSH_H */ diff --git a/arch/riscv/mm/tlbflush.c b/arch/riscv/mm/tlbflush.c index e46fefc70927..e6659d7368b3 100644 --- a/arch/riscv/mm/tlbflush.c +++ b/arch/riscv/mm/tlbflush.c @@ -97,20 +97,27 @@ static void __flush_tlb_range(struct mm_struct *mm, unsigned long start, unsigned long size, unsigned long stride) { struct flush_tlb_range_data ftd; - struct cpumask *cmask = mm_cpumask(mm); + const struct cpumask *cmask; unsigned long asid = FLUSH_TLB_NO_ASID; - unsigned int cpuid; bool broadcast; - if (cpumask_empty(cmask)) - return; + if (mm) { + unsigned int cpuid; + + cmask = mm_cpumask(mm); + if (cpumask_empty(cmask)) + return; - cpuid = get_cpu(); - /* check if the tlbflush needs to be sent to other CPUs */ - broadcast = cpumask_any_but(cmask, cpuid) < nr_cpu_ids; + cpuid = get_cpu(); + /* check if the tlbflush needs to be sent to other CPUs */ + broadcast = cpumask_any_but(cmask, cpuid) < nr_cpu_ids; - if (static_branch_unlikely(&use_asid_allocator)) - asid = atomic_long_read(&mm->context.id) & asid_mask; + if (static_branch_unlikely(&use_asid_allocator)) + asid = atomic_long_read(&mm->context.id) & asid_mask; + } else { + cmask = cpu_online_mask; + broadcast = true; + } if (broadcast) { if (riscv_use_ipi_for_rfence()) { @@ -128,7 +135,8 @@ static void __flush_tlb_range(struct mm_struct *mm, unsigned long start, local_flush_tlb_range_asid(start, size, stride, asid); } - put_cpu(); + if (mm) + put_cpu(); } void flush_tlb_mm(struct mm_struct *mm) @@ -179,6 +187,12 @@ void flush_tlb_range(struct vm_area_struct *vma, unsigned long start, __flush_tlb_range(vma->vm_mm, start, end - start, stride_size); } + +void flush_tlb_kernel_range(unsigned long start, unsigned long end) +{ + __flush_tlb_range(NULL, start, end - start, PAGE_SIZE); +} + #ifdef CONFIG_TRANSPARENT_HUGEPAGE void flush_pmd_tlb_range(struct vm_area_struct *vma, unsigned long start, unsigned long end) -- 2.39.2