From patchwork Tue Jul 11 07:54:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Ghiti X-Patchwork-Id: 13308218 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 738F7EB64DC for ; Tue, 11 Jul 2023 07:55:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 065C08E0002; Tue, 11 Jul 2023 03:55:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 015868D0001; Tue, 11 Jul 2023 03:55:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DFBEA8E0002; Tue, 11 Jul 2023 03:55:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id D0DC98D0001 for ; Tue, 11 Jul 2023 03:55:41 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 9E6B41A014C for ; Tue, 11 Jul 2023 07:55:41 +0000 (UTC) X-FDA: 80998571682.02.FBA1BED Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by imf06.hostedemail.com (Postfix) with ESMTP id BF151180017 for ; Tue, 11 Jul 2023 07:55:39 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=NCoKYaei; dmarc=none; spf=pass (imf06.hostedemail.com: domain of alexghiti@rivosinc.com designates 209.85.128.53 as permitted sender) smtp.mailfrom=alexghiti@rivosinc.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1689062139; 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=/EU/iMG6yg29uBo51A2iBmY9OZkda2o1/b9d0LOiq1U=; b=8TLCN6CR9aiQML3ZwCuZuF59/iFf5BwHcSYsFaXPEN4gKpEkUhrUygCFY4wlKI8bK5OAky NqF9BD9lIuQcEntiJoIuWEsC2s0YUVQYEuSGcLApG4mJTCKlBREYzZgj5V6fqivD6LLMLN OceAsFblPIWLm2RYAuFrLqmjKnrKCWQ= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=rivosinc-com.20221208.gappssmtp.com header.s=20221208 header.b=NCoKYaei; dmarc=none; spf=pass (imf06.hostedemail.com: domain of alexghiti@rivosinc.com designates 209.85.128.53 as permitted sender) smtp.mailfrom=alexghiti@rivosinc.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1689062139; a=rsa-sha256; cv=none; b=d1XhNBgl5/zhOi8MzXkspD2lSsB1beZhYcz+6mKfaVcH0UEzh2it4MlL8JZ9uE2tsWYqOx Nx/gl0O/kpBn9GLEwv9+JE0EXdqMuxKa4ez4cP2UbfWleOrTuoPcGl1af1aQm+gULqGVZT Ix1kKFPFhdoBs1AO62uRZJCcdUjHTjM= Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-3fbdfda88f4so55147255e9.1 for ; Tue, 11 Jul 2023 00:55:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc-com.20221208.gappssmtp.com; s=20221208; t=1689062138; x=1691654138; 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=/EU/iMG6yg29uBo51A2iBmY9OZkda2o1/b9d0LOiq1U=; b=NCoKYaeiv1nFsZu1kkN9IKONZ0ywf8MrhYyLoYAG7Q6i/1MQkq4oT+ftSJXO49RKyX ACt2ggo37pYi+8YgPL8PJ6dxHo9tA4/bLupo3TXiy9URZ4wDKkU28wB9BygUOld8z2e/ 3zc8DUiMdWOgQtJ0Ndn4UV5Li6hfcg8Kga3ZZhjNakNirjxP7y+vfmb9LrM9PCGhIPob Hdzs0ngha48Jpks5P0qe+0HhpMg4tmNZJB4wqnH4M1bv2Zwy3CCAuPi3okrxJTIKbojW InsOcPcSYd20w6iszei4mg1pDK4LCzlrLwfCY1fjznaJUncNDxte3J8oxZxhilbHxfFV 6g/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689062138; x=1691654138; 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=/EU/iMG6yg29uBo51A2iBmY9OZkda2o1/b9d0LOiq1U=; b=gmxVFyWOLDliOSF/06d6RmXH3AyDmrCenwqQlMWuQyrT5HG2e4qZfjO6r3UW/DkUhD 4lgGa5ubCVkBIfdo4SdN250/bVjvOJvH28qPd2avyph86ev8WKTnw2bCtku/wevgmxYv 03czzKpbOEroZnYKq2UPbvtSAbjxRRgsiZBXbmzA7d8qxfAWPtSLImHtKxwQMMp030Be mKkjlBNyi9hms3M+ZTRIo/axnLkVSwLkRuSU8NwKiwiGFxkfEu2laeuF41I8qYmCOc0R TTQZfG9C1JW/TE/SSzYnGSoEotCX/a69UjJAZB6qO+CeP/xVohxNvuaDCHMR1luY6JSy 1S5A== X-Gm-Message-State: ABy/qLYBDXFC2jiGWxkNGAgr97t8yq+2pD5ez6Y4J/uU7oM178CkOC0N dsnOhYn04hRFyD6Xmc6fagWfCQ== X-Google-Smtp-Source: APBJJlFW7UA1mVn1ZcXadTPXanJoND7bXUx+Kn681JHSgt5iPRc/xDSnmY7M3nrypuHmGJz4jg4M6g== X-Received: by 2002:a05:600c:b5a:b0:3fc:60:7dbf with SMTP id k26-20020a05600c0b5a00b003fc00607dbfmr9944380wmr.41.1689062138206; Tue, 11 Jul 2023 00:55:38 -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 f19-20020a7bcc13000000b003fa973e6612sm12317248wmh.44.2023.07.11.00.55.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Jul 2023 00:55:38 -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 Cc: Alexandre Ghiti Subject: [PATCH 1/4] riscv: Improve flush_tlb() Date: Tue, 11 Jul 2023 09:54:31 +0200 Message-Id: <20230711075434.10936-2-alexghiti@rivosinc.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230711075434.10936-1-alexghiti@rivosinc.com> References: <20230711075434.10936-1-alexghiti@rivosinc.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: BF151180017 X-Stat-Signature: krnjktrzg8mxfo9g9jnsbwjnpq9tibgc X-HE-Tag: 1689062139-43372 X-HE-Meta: U2FsdGVkX18djfXgbiS9CLTtIK3pQviyTx27jD8ZwSIkhdQqE20awggfX7AIGRa/zS0PSmXlO1vtRZsOhthrFqrcPcYq6lz6HJ9BDPk5wgA53/e+TMFDC/Xe7mq61wpzmuBvLkRMvkC6D43zVDAB3u3+dS8y2UrHxbgQ/qpw6AGK5bMILcECa3DFDGWCXFt93by3nx26l2S4YEsPaGuZ1wxI/DV3iYlFh4swQbJb5xwOEyMptD+yc8sppmtnxlUcOqiVVUe0JzsnyV9ER1sm7iPEtBnl+Gx1lQH+dQbG0qYtRxRRFGPhmzrelN/Qw/Cj/xXD8l6I7IAuKmLYPf3Dqw9qoFfBILnOxY6/kvuqjc5hgmi4PXgqBkReKHGQJh7vRd3TU5poJrHBvoAhIRybFEf79BFGUreEip43vweNe2JDHa/Q+FASiUoGZgp87z+x2L0mesXQ1GbxaKdFELh/TZ7ikdNdoZGjytd3d0r0kiRFZDzz7jlSghJ4yXvJpLeuaBPggiAMc0gqzzJb1i5eULwBm0JVac7rKaTpwnzrTY7B2HpVeW2Vg5K6cJXkbeUHp/HoK4qz8E6UvIWOZthRRuqQs92bPagKEy9vyTZiIh2HqokjdhL3Y3NdsJKDUm1g2abKq4KW/nLE6ozxfeHo8V0UGMhLanboHeAeYeGRntOhlw/574GSrWEv47qba8VoIZ7lQ7BWDlCICxYm1pAqMlaSW1tZEA8Pe41w8Gs8XDPPrbKlcX8r2pPx2hL/BOyxxnie/V4EggyCflTK+3k6KFAHJm1SIOaigJ/RGBodBblPE/Zx15rXaSsJoJr1QBdsZh2IBkQ1BumzGjOOkEXiVo7uqnrKi3eEHaaAejer9+Xrg5eAhp6/f/XvQMaBMKnzrXqb0sisIdX8qDRHJPm9p5UPsd2QAd0/e7rBjNL5b2fr7kbLQZXbdbAI74iN08FOnK7sn1DeDX8LDYlV3hb foH0Z0Ld u88ej3XiZyhU7NbJS49nHDxt1LfBpuZJWJTIbeeNAXfaz3TpPKY8ZZPVx21Vm51qLOd2wjqD5NGDnmbHfJWp3CQgeQHFB4PgVzGJvsYxaGrSZ/kyKM9BeuvWDtkTr+H/xPhNVVG9hk0NlzVt+wZEodInZDOxe7ySEgkqc/IRI0Vsn9d5HS7qmX5zOip4AqCfRdjSGJ139LhG1ScyrEclmTpJ8ADXteaRpfv6EBb66kf+nZk1NegKBfqAWaiYYQM5BjXJ1hzj3C+TSPc12bj6nHZIpXdGaATwiNG1baKeg/CoNlvP63lfy0J7t6dvzTq+rXuCN62XFYr3rTUyaf5Fiq3xUoptXwLuyHGohwFUAuaTaOKt7BZo4k1n6l+xSz0EmcUI/FEdq/zIup6u9/YckkASajOwdmTv0v7krdZZBH024jxtDIvPUxodBoauIy9DauuL0GbBzWoCKApsN/LadYQkPfcsQgJbgdV6s/gZmAQYUGpvR1YkYWgV+Mg== 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: For now, flush_tlb() simply calls flush_tlb_mm() which results in a flush of the whole TLB. So let's use mmu_gather fields to provide a more fine-grained flush of the TLB. Signed-off-by: Alexandre Ghiti --- arch/riscv/include/asm/tlb.h | 6 +++++- arch/riscv/include/asm/tlbflush.h | 3 +++ arch/riscv/mm/tlbflush.c | 7 +++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/arch/riscv/include/asm/tlb.h b/arch/riscv/include/asm/tlb.h index 120bcf2ed8a8..3373dcf0f413 100644 --- a/arch/riscv/include/asm/tlb.h +++ b/arch/riscv/include/asm/tlb.h @@ -15,7 +15,11 @@ static void tlb_flush(struct mmu_gather *tlb); static inline void tlb_flush(struct mmu_gather *tlb) { - flush_tlb_mm(tlb->mm); + if (tlb->fullmm || tlb->need_flush_all) + flush_tlb_mm(tlb->mm); + else + flush_tlb_mm_range(tlb->mm, tlb->start, tlb->end, + tlb_get_unmap_size(tlb)); } #endif /* _ASM_RISCV_TLB_H */ diff --git a/arch/riscv/include/asm/tlbflush.h b/arch/riscv/include/asm/tlbflush.h index a09196f8de68..f5c4fb0ae642 100644 --- a/arch/riscv/include/asm/tlbflush.h +++ b/arch/riscv/include/asm/tlbflush.h @@ -32,6 +32,8 @@ static inline void local_flush_tlb_page(unsigned long addr) #if defined(CONFIG_SMP) && defined(CONFIG_MMU) void flush_tlb_all(void); void flush_tlb_mm(struct mm_struct *mm); +void flush_tlb_mm_range(struct mm_struct *mm, unsigned long start, + unsigned long end, unsigned int page_size); 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); @@ -52,6 +54,7 @@ static inline void flush_tlb_range(struct vm_area_struct *vma, } #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 */ diff --git a/arch/riscv/mm/tlbflush.c b/arch/riscv/mm/tlbflush.c index 77be59aadc73..fa03289853d8 100644 --- a/arch/riscv/mm/tlbflush.c +++ b/arch/riscv/mm/tlbflush.c @@ -132,6 +132,13 @@ void flush_tlb_mm(struct mm_struct *mm) __flush_tlb_range(mm, 0, -1, PAGE_SIZE); } +void flush_tlb_mm_range(struct mm_struct *mm, + unsigned long start, unsigned long end, + unsigned int page_size) +{ + __flush_tlb_range(mm, start, end - start, page_size); +} + void flush_tlb_page(struct vm_area_struct *vma, unsigned long addr) { __flush_tlb_range(vma->vm_mm, addr, PAGE_SIZE, PAGE_SIZE);