From patchwork Sat May 18 07:49:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bang Li X-Patchwork-Id: 13667504 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 ECDDDC25B79 for ; Sat, 18 May 2024 07:51:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 33E976B0092; Sat, 18 May 2024 03:51:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2A15E6B0093; Sat, 18 May 2024 03:51:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 053E16B0095; Sat, 18 May 2024 03:51:42 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id DCA986B0092 for ; Sat, 18 May 2024 03:51:42 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 6F48BC0608 for ; Sat, 18 May 2024 07:51:42 +0000 (UTC) X-FDA: 82130747244.11.D2C7551 Received: from out0-222.mail.aliyun.com (out0-222.mail.aliyun.com [140.205.0.222]) by imf24.hostedemail.com (Postfix) with ESMTP id 606E8180012 for ; Sat, 18 May 2024 07:51:40 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=antgroup.com header.s=default header.b=AzLk0Rnp; spf=pass (imf24.hostedemail.com: domain of libang.li@antgroup.com designates 140.205.0.222 as permitted sender) smtp.mailfrom=libang.li@antgroup.com; dmarc=pass (policy=quarantine) header.from=antgroup.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1716018700; 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=+bO7c6Fed9Mvc6QZ6EoE0oDQLTarOYB8F6MuXkDP9CA=; b=dv2L4GlnNhR3nfqYM4B9WH8LJ3Un9+d6gI8eiXMf+YJHlroo+TteD0uExTVD8KrraK8QBA RVjNp8fQqPm6CsF7dXB+VTnom+rhdqCI1VmK6vlwoIZozcKh3KIV5TKuhET4Q0dyVefxOg SnQmKGdn3ob2kOFzhIvluqRrk5S1x0Q= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=antgroup.com header.s=default header.b=AzLk0Rnp; spf=pass (imf24.hostedemail.com: domain of libang.li@antgroup.com designates 140.205.0.222 as permitted sender) smtp.mailfrom=libang.li@antgroup.com; dmarc=pass (policy=quarantine) header.from=antgroup.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1716018700; a=rsa-sha256; cv=none; b=ykWtuXInAtbzmpNR6PgZhfoONKt3pppAF0DnPouExS+znPAXHqNDq8QcLWTHVAC5GuCN1E /jciv2/alvLifnzNhtTXKsKBW8nFe7rqhvbBsaV7yS1MwLhE3Kxa32JWiYuBHC8XvQlrIP hxyjJRPtNtdi+Qvg/2NTtPbi5+F1K08= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=antgroup.com; s=default; t=1716018697; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=+bO7c6Fed9Mvc6QZ6EoE0oDQLTarOYB8F6MuXkDP9CA=; b=AzLk0RnprnZBHaKRrVrIKGKWZ3zjnjh95w7mg6XVEdf0WyROrrm3pKgR55nGOxhPPIvLDJn51z1oNxNsBXsqACYyPYz1TskobQoTXmOe/9lf9e2wTYZIL+T0FqwqKEqkKqJlKLUvZTcILxQrPcWhjpRiq5ye3lYXSyF/Vye//Ko= X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R111e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018047207;MF=libang.li@antgroup.com;NM=1;PH=DS;RN=16;SR=0;TI=SMTPD_---.Xg92GHN_1716018694; Received: from localhost(mailfrom:libang.li@antgroup.com fp:SMTPD_---.Xg92GHN_1716018694) by smtp.aliyun-inc.com; Sat, 18 May 2024 15:51:35 +0800 From: "Bang Li" To: akpm@linux-foundation.org, chenhuacai@kernel.org, tsbogend@alpha.franken.de, paul.walmsley@sifive.com, palmer@dabbelt.com, chris@zankel.net, jcmvbkbc@gmail.com Cc: , , , , , , , , "Bang Li" Subject: [PATCH v3 1/3] mm: Add update_mmu_tlb_range() Date: Sat, 18 May 2024 15:49:12 +0800 Message-Id: <20240518074914.52170-2-libang.li@antgroup.com> X-Mailer: git-send-email 2.19.1.6.gb485710b In-Reply-To: <20240518074914.52170-1-libang.li@antgroup.com> References: <20240518074914.52170-1-libang.li@antgroup.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 606E8180012 X-Stat-Signature: tddpu8q6399pwyjfafbt6m5byntrbfnc X-HE-Tag: 1716018700-401951 X-HE-Meta: U2FsdGVkX197qD8YcbfrxKes0CqphC/AXcQG1TAKb9MDdDyhjxysSViVy7NcMoVFw8nhXw/8shzEHCbeVfRxmcMEASM7Z/q4PrTlJIDbC3gd7TNpj5daYefE1WWR4WL2s6ucG+BOpzPKr7pBzBPs6ipYNDauShb6jfpFSbQ5BUK2U5JYI4THdHaavOi9JU4L1lUrN3YL2dUEdRydf4d8ynQYJmKoE4LY+UnD6mYYQPdDVjq6qHySVbhjqMFTGXjRs2dM0YD/xxOh5bEcz+08GOuCZ2TLhVfvdeO6u6Av/97t0PGWhDCwiCRdWB7EVMKJdvsF+g3tbY6sodi+pysHwch59jwNr+BQ79NNcfXtaf0eHyP32sSmK6m2z4W3qRofifp4KJbWd9QEgwV3MXmvCI0GTLJcbPyQGYsJEi6pihaKc/u6ct/BSvSJOeHVN8/EzyNv2NoD51CnV+dKLBtMeiIn9fBxlY/NCb68A3g1XD95XtiSfQ9SpvZ9OrsSKEGvJMDWMVFUwXoa74QzF80bO4uYFMMYbzCdYLMJq0sI7FdGR/Q8gJ2RkSPlijsZj1CivmyVKDAd4BQPZIl2G9dRZZew47/29sXuwiK2vPPKkaXntuv7SckPRqlZ+Ip2q+NVv8R9JM+PF8DaKIfqNrphX2v59Tb8UdLahcG9386/WjkCr9Lo+aGf2jG3annwRZgIEiuhM8rzs0T6O/FjbNhwC63/i26f8GVN+qj7882gw/5Eu2hxD746RT9MTeeDE/YYCSE2/jQFYyny1iKuvlyWHEi0RqoxEvdL6sclXqLV+YcKrqRQz6O1UUVzFbfMAb6Cw7c8yPvx6sHCI37dgAECSwl++FWEy0wTMl2zRiA0HK6xxHUQ7Dl5kszZzypicyZG6Tre7MSIBAId+N1Lh57pRmIXEPV9tstAiJTmMLVIX48xynv44ZbpaoI90gRj5Zxntis1svj/Q8XzOJoc83n IOfW7Xj5 FoeYUGHIEBzSeMhJVa/tU9+1yD4/6jFFsXfyOBYxQ9iXh8YBhYNBKO9uymBqbz3To8I8m+F+JY8IqnsEkeq87lE2LDXEI5ctpN4S7FgroQmzAxUbxKYh5F/Z9SQrOEwa8CO2f7SJ/1N304uXPPyZuNE1Ig4ccBUGqeUjzx5aBZN3mCYw0Cg1O5B01ibyFU8BeotXvI2/wIvztpOtDbypt1kLDw1wC7XvqfK73jK3ffv09ZLLDdiVeBPx4BQiTafFK9aFcavYIrw7EHRN+rmesAclumiQDNfFRrWK1N5YzNGL/paIMywjWovU9CxNqek6+fQeMgIWM3hXN+E7XyVH92BJ5CpBWepSx4Lfdxxdq+z214Nh3hCenO1cMTA== 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: Added update_mmu_tlb_range(), we can batch update tlb of an address range. Signed-off-by: Bang Li --- arch/loongarch/include/asm/pgtable.h | 2 ++ arch/mips/include/asm/pgtable.h | 2 ++ arch/riscv/include/asm/pgtable.h | 2 ++ arch/xtensa/include/asm/pgtable.h | 3 +++ arch/xtensa/mm/tlb.c | 6 ++++++ 5 files changed, 15 insertions(+) diff --git a/arch/loongarch/include/asm/pgtable.h b/arch/loongarch/include/asm/pgtable.h index af3acdf3481a..5ccc2a3a6f7a 100644 --- a/arch/loongarch/include/asm/pgtable.h +++ b/arch/loongarch/include/asm/pgtable.h @@ -469,6 +469,8 @@ static inline void update_mmu_cache_range(struct vm_fault *vmf, #define __HAVE_ARCH_UPDATE_MMU_TLB #define update_mmu_tlb update_mmu_cache +#define update_mmu_tlb_range(vma, addr, ptep, nr) \ + update_mmu_cache_range(NULL, vma, addr, ptep, nr) static inline void update_mmu_cache_pmd(struct vm_area_struct *vma, unsigned long address, pmd_t *pmdp) diff --git a/arch/mips/include/asm/pgtable.h b/arch/mips/include/asm/pgtable.h index e27a4c83c548..0891ad7d43b6 100644 --- a/arch/mips/include/asm/pgtable.h +++ b/arch/mips/include/asm/pgtable.h @@ -596,6 +596,8 @@ static inline void update_mmu_cache_range(struct vm_fault *vmf, #define __HAVE_ARCH_UPDATE_MMU_TLB #define update_mmu_tlb update_mmu_cache +#define update_mmu_tlb_range(vma, address, ptep, nr) \ + update_mmu_cache_range(NULL, vma, address, ptep, nr) static inline void update_mmu_cache_pmd(struct vm_area_struct *vma, unsigned long address, pmd_t *pmdp) diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index 661b2b4fe758..fc07b829ac4a 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -488,6 +488,8 @@ static inline void update_mmu_cache_range(struct vm_fault *vmf, #define __HAVE_ARCH_UPDATE_MMU_TLB #define update_mmu_tlb update_mmu_cache +#define update_mmu_tlb_range(vma, addr, ptep, nr) \ + update_mmu_cache_range(NULL, vma, addr, ptep, nr) static inline void update_mmu_cache_pmd(struct vm_area_struct *vma, unsigned long address, pmd_t *pmdp) diff --git a/arch/xtensa/include/asm/pgtable.h b/arch/xtensa/include/asm/pgtable.h index 9a7e5e57ee9a..436158bd9030 100644 --- a/arch/xtensa/include/asm/pgtable.h +++ b/arch/xtensa/include/asm/pgtable.h @@ -413,6 +413,9 @@ typedef pte_t *pte_addr_t; void update_mmu_tlb(struct vm_area_struct *vma, unsigned long address, pte_t *ptep); #define __HAVE_ARCH_UPDATE_MMU_TLB +void update_mmu_tlb_range(struct vm_area_struct *vma, + unsigned long address, pte_t *ptep, unsigned int nr); +#define update_mmu_tlb_range update_mmu_tlb_range #endif /* !defined (__ASSEMBLY__) */ diff --git a/arch/xtensa/mm/tlb.c b/arch/xtensa/mm/tlb.c index d8b60d6e50a8..05efba86b870 100644 --- a/arch/xtensa/mm/tlb.c +++ b/arch/xtensa/mm/tlb.c @@ -169,6 +169,12 @@ void update_mmu_tlb(struct vm_area_struct *vma, local_flush_tlb_page(vma, address); } +void update_mmu_tlb_range(struct vm_area_struct *vma, + unsigned long address, pte_t *ptep, unsigned int nr) +{ + local_flush_tlb_range(vma, address, address + PAGE_SIZE * nr); +} + #ifdef CONFIG_DEBUG_TLB_SANITY static unsigned get_pte_for_vaddr(unsigned vaddr) From patchwork Sat May 18 07:49:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bang Li X-Patchwork-Id: 13667505 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 2BFA1C25B74 for ; Sat, 18 May 2024 07:51:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 893326B0095; Sat, 18 May 2024 03:51:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 81C546B0096; Sat, 18 May 2024 03:51:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 648036B0098; Sat, 18 May 2024 03:51:45 -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 3F0DF6B0095 for ; Sat, 18 May 2024 03:51:45 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id AFA29A15B7 for ; Sat, 18 May 2024 07:51:44 +0000 (UTC) X-FDA: 82130747328.22.7F7EDCC Received: from out0-201.mail.aliyun.com (out0-201.mail.aliyun.com [140.205.0.201]) by imf17.hostedemail.com (Postfix) with ESMTP id 9C8424001D for ; Sat, 18 May 2024 07:51:42 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=antgroup.com header.s=default header.b=fJefnm4+; spf=pass (imf17.hostedemail.com: domain of libang.li@antgroup.com designates 140.205.0.201 as permitted sender) smtp.mailfrom=libang.li@antgroup.com; dmarc=pass (policy=quarantine) header.from=antgroup.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1716018703; 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=B0+VTL/IM0NbM2rCCBStVIPALiltW036NQkMXLbs88g=; b=8o6xztQ2/v68e9IXpdjKlTeokQlHabFVGtUjxE/AN9VjCV4wmvj5ox9+25g5SHwPsTj6cD kBpERC/MleQ0qYUESqi5Fba+CILjqd7geidTVDUVClCDdIQNZgMN+ls7g1iO0HEq2v6Onc f8xiakHgiB9LzlNJHfb6DW1voVU4Eoo= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1716018703; a=rsa-sha256; cv=none; b=eYOv6XJ1012dMVeBA9vegN7QBkxUB/p0dbvCPiW8VyVqPBfuUoROuEQb5lKrDEcGLsYMoU FHJEGeoQ2BZF/cDObEfInf0UUFI2u7D6C60Lv4eQYgTsv3cPXeWKJSVCJRO4aMRs9RpZQk R46VFUxuDZ29y3oZSLVVS5m8FKhbWoQ= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=antgroup.com header.s=default header.b=fJefnm4+; spf=pass (imf17.hostedemail.com: domain of libang.li@antgroup.com designates 140.205.0.201 as permitted sender) smtp.mailfrom=libang.li@antgroup.com; dmarc=pass (policy=quarantine) header.from=antgroup.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=antgroup.com; s=default; t=1716018698; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=B0+VTL/IM0NbM2rCCBStVIPALiltW036NQkMXLbs88g=; b=fJefnm4+1Gmegb9m7gub/Gj1Joe51e+/VZZ8fg/6RC06rKyHZAeKEwHpdrrWAebP5VnqcJYa44HDXHUox0YWVZiuC5kvOwygDWbcY1vsPelG3YE2t4K2ZISmH+jVJKSsN7NdQxfMuw5tWrzZxIgaoq6f9GQeKyIRbvCelRYz6+g= X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R101e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018047190;MF=libang.li@antgroup.com;NM=1;PH=DS;RN=16;SR=0;TI=SMTPD_---.XgA9uMI_1716018696; Received: from localhost(mailfrom:libang.li@antgroup.com fp:SMTPD_---.XgA9uMI_1716018696) by smtp.aliyun-inc.com; Sat, 18 May 2024 15:51:37 +0800 From: "Bang Li" To: akpm@linux-foundation.org, chenhuacai@kernel.org, tsbogend@alpha.franken.de, paul.walmsley@sifive.com, palmer@dabbelt.com, chris@zankel.net, jcmvbkbc@gmail.com Cc: , , , , , , , , "Bang Li" Subject: [PATCH v3 2/3] mm: Refactor update_mmu_tlb() Date: Sat, 18 May 2024 15:49:13 +0800 Message-Id: <20240518074914.52170-3-libang.li@antgroup.com> X-Mailer: git-send-email 2.19.1.6.gb485710b In-Reply-To: <20240518074914.52170-1-libang.li@antgroup.com> References: <20240518074914.52170-1-libang.li@antgroup.com> MIME-Version: 1.0 X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 9C8424001D X-Rspam-User: X-Stat-Signature: g5xumxag3rswsks78xzxt5yfxqtdpkze X-HE-Tag: 1716018702-685037 X-HE-Meta: U2FsdGVkX1+HRoIW+1KPer54vj47eu0oO5ADkczXebQhndcxHGR+J9faV4pyhoMwTHaS36Cqg+bjgcGmQ1Pw1Rn9f62hnwlh6pZsj4PNuXP/FXtLmIOb34seDA7z+qv/AmUTaPd9xNdYhO9ag6QC18lwRf3NojQwx1LysvrPbRgNBnSF51HG+LW7AXxyoP7tX+ziBBDVgJh0hXY4u8rtBsadf81cs9WyOTgrbqW6IjpNtreJ670nj1YQ/u29Ee45UOk0zbA2IVFWPQLxCS34u0eKrYkX27zkcF8EiTqS4GQJOvyfaLlsQ/497ewwR5MW90oA5bLbcX9eU4MU2y2BY6b+GoJdE6+e5JhoRsrU4m6p8zbtr7dr/39yEd70Z/Kds/d7fD1/vefTpYsHuGnBvWFfDTUnNdP6OLL8uuiLgxz+OafK89gNCorICZuO0xuHvY9+AOM13OJUpU6XVdYfzk0zLRt72emq4bosNs0nJhGpX8etZqZcE1qrTBpCTgMaSVk3nWJSOLjzSZRsRGxpxOm3Sm9v6C1wjJBYHmtMsnyvp4cYWq3qsA/yeQdzsmRM6s7GEVlXNK4llO9joOwD2EjHrY416V9MHqeddT3JlWNnopXsYOopk/XUGDuXcdtWtx978tNZxh2Mq37l/fjKVjs7qErHQEP14p/mwIbHKlrOX93AYYYldnQX1e1078FsI/3AiyxxQaHGcY0b8akZp+1XeeYbCx0BScat4QJEdPYRrtc9lVrWt7kpOMHEeyZwu51CgKYEkgIGFAtKVB+RX8WOn8EJCTWIzPq1rGNzMowC/lOw09CPJgwKhn/UMWUHVJAqjbUamIWgqj86PlgXVlTFhSlzxXegs9lizdi7Mc4i6Ger9r72cqJU5dRGxZGgF7sKcFzfaabOQTrfVcoPoWzJGBTGOb5O1r/O+ymnJB1Y6SfTso3dT9RCzF6p001MMH2tOU4Nsytb4/p+lPS V8uDp3PH 3AnzGz2bOe5GCl5+3lPzlBPEGd6STgfrZ7FBhvL6jCPRXRuc+nQepNngyeRab4LblKyA+qv58JQDJvci91J2kHKFV5nD/REibURxOnMpMw8wNTlahj/S+2zHSzBKyKsiy2fYFfxsB+37QmJsdAumUEg0Z6nvx+70yn52etx1jEB17Ae+H1DvTT3qh+DvbXRCeV3HC2cibD5xlsrezt5B8xOMcRvqWh9tr+wYtdhPg7F4MgDhuDXTgjMceqZSAS+eU9fWl8u1XSp4tqqaElWW20JG82raQKoZfqXxsN/MdZdeqO6sMfYc+ex2PBMS43PzD0FuUJwkVvb2OxtMtowDTJKuJB1zlbav86p7gKL2Gg0MBrqK6KMmeA+Pegw== 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: Remove update_mmu_tlb() from those architectures and define generically via update_mmu_tlb_range(), removing the ability for arches to override it. Signed-off-by: Bang Li Acked-by: David Hildenbrand --- arch/loongarch/include/asm/pgtable.h | 2 -- arch/mips/include/asm/pgtable.h | 2 -- arch/riscv/include/asm/pgtable.h | 2 -- arch/xtensa/include/asm/pgtable.h | 3 --- arch/xtensa/mm/tlb.c | 6 ------ include/linux/pgtable.h | 11 ++++++++--- 6 files changed, 8 insertions(+), 18 deletions(-) diff --git a/arch/loongarch/include/asm/pgtable.h b/arch/loongarch/include/asm/pgtable.h index 5ccc2a3a6f7a..161dd6e10479 100644 --- a/arch/loongarch/include/asm/pgtable.h +++ b/arch/loongarch/include/asm/pgtable.h @@ -467,8 +467,6 @@ static inline void update_mmu_cache_range(struct vm_fault *vmf, #define update_mmu_cache(vma, addr, ptep) \ update_mmu_cache_range(NULL, vma, addr, ptep, 1) -#define __HAVE_ARCH_UPDATE_MMU_TLB -#define update_mmu_tlb update_mmu_cache #define update_mmu_tlb_range(vma, addr, ptep, nr) \ update_mmu_cache_range(NULL, vma, addr, ptep, nr) diff --git a/arch/mips/include/asm/pgtable.h b/arch/mips/include/asm/pgtable.h index 0891ad7d43b6..c29a551eb0ca 100644 --- a/arch/mips/include/asm/pgtable.h +++ b/arch/mips/include/asm/pgtable.h @@ -594,8 +594,6 @@ static inline void update_mmu_cache_range(struct vm_fault *vmf, #define update_mmu_cache(vma, address, ptep) \ update_mmu_cache_range(NULL, vma, address, ptep, 1) -#define __HAVE_ARCH_UPDATE_MMU_TLB -#define update_mmu_tlb update_mmu_cache #define update_mmu_tlb_range(vma, address, ptep, nr) \ update_mmu_cache_range(NULL, vma, address, ptep, nr) diff --git a/arch/riscv/include/asm/pgtable.h b/arch/riscv/include/asm/pgtable.h index fc07b829ac4a..158170442d2f 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -486,8 +486,6 @@ static inline void update_mmu_cache_range(struct vm_fault *vmf, #define update_mmu_cache(vma, addr, ptep) \ update_mmu_cache_range(NULL, vma, addr, ptep, 1) -#define __HAVE_ARCH_UPDATE_MMU_TLB -#define update_mmu_tlb update_mmu_cache #define update_mmu_tlb_range(vma, addr, ptep, nr) \ update_mmu_cache_range(NULL, vma, addr, ptep, nr) diff --git a/arch/xtensa/include/asm/pgtable.h b/arch/xtensa/include/asm/pgtable.h index 436158bd9030..1647a7cc3fbf 100644 --- a/arch/xtensa/include/asm/pgtable.h +++ b/arch/xtensa/include/asm/pgtable.h @@ -410,9 +410,6 @@ void update_mmu_cache_range(struct vm_fault *vmf, struct vm_area_struct *vma, typedef pte_t *pte_addr_t; -void update_mmu_tlb(struct vm_area_struct *vma, - unsigned long address, pte_t *ptep); -#define __HAVE_ARCH_UPDATE_MMU_TLB void update_mmu_tlb_range(struct vm_area_struct *vma, unsigned long address, pte_t *ptep, unsigned int nr); #define update_mmu_tlb_range update_mmu_tlb_range diff --git a/arch/xtensa/mm/tlb.c b/arch/xtensa/mm/tlb.c index 05efba86b870..0a1a815dc796 100644 --- a/arch/xtensa/mm/tlb.c +++ b/arch/xtensa/mm/tlb.c @@ -163,12 +163,6 @@ void local_flush_tlb_kernel_range(unsigned long start, unsigned long end) } } -void update_mmu_tlb(struct vm_area_struct *vma, - unsigned long address, pte_t *ptep) -{ - local_flush_tlb_page(vma, address); -} - void update_mmu_tlb_range(struct vm_area_struct *vma, unsigned long address, pte_t *ptep, unsigned int nr) { diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h index 18019f037bae..117b807e3f89 100644 --- a/include/linux/pgtable.h +++ b/include/linux/pgtable.h @@ -729,13 +729,18 @@ static inline void clear_full_ptes(struct mm_struct *mm, unsigned long addr, * fault. This function updates TLB only, do nothing with cache or others. * It is the difference with function update_mmu_cache. */ -#ifndef __HAVE_ARCH_UPDATE_MMU_TLB +#ifndef update_mmu_tlb_range +static inline void update_mmu_tlb_range(struct vm_area_struct *vma, + unsigned long address, pte_t *ptep, unsigned int nr) +{ +} +#endif + static inline void update_mmu_tlb(struct vm_area_struct *vma, unsigned long address, pte_t *ptep) { + update_mmu_tlb_range(vma, address, ptep, 1); } -#define __HAVE_ARCH_UPDATE_MMU_TLB -#endif /* * Some architectures may be able to avoid expensive synchronization From patchwork Sat May 18 07:49:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bang Li X-Patchwork-Id: 13667506 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 DE6BAC25B74 for ; Sat, 18 May 2024 07:51:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9F5966B0096; Sat, 18 May 2024 03:51:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 97D4B6B0098; Sat, 18 May 2024 03:51:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7F6776B0099; Sat, 18 May 2024 03:51:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 569716B0096 for ; Sat, 18 May 2024 03:51:46 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id F1864140637 for ; Sat, 18 May 2024 07:51:45 +0000 (UTC) X-FDA: 82130747370.30.7F89CC3 Received: from out0-194.mail.aliyun.com (out0-194.mail.aliyun.com [140.205.0.194]) by imf17.hostedemail.com (Postfix) with ESMTP id 0EE8E40013 for ; Sat, 18 May 2024 07:51:43 +0000 (UTC) Authentication-Results: imf17.hostedemail.com; dkim=pass header.d=antgroup.com header.s=default header.b=0IlDP5wf; dmarc=pass (policy=quarantine) header.from=antgroup.com; spf=pass (imf17.hostedemail.com: domain of libang.li@antgroup.com designates 140.205.0.194 as permitted sender) smtp.mailfrom=libang.li@antgroup.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1716018704; 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=MvaQlNmLKjB1JJG125kcLMl74RVFk5etnjUBr5sySWs=; b=yFQ2TO5HP+B150UJHbdgZgnT5Z5fXcU3+HqNUb//gTXJFRR4zf74HSwWWPHHb6tYFykm93 4Ct/tjhWEEJljFAHicbVgFhdNMSNRzoyRRA3s7SUPLmvEUoBkvic7qbqSY63sJtvMLctFe xDJjkmpEuarD0emAQLp5H10/Xu8XVQM= ARC-Authentication-Results: i=1; imf17.hostedemail.com; dkim=pass header.d=antgroup.com header.s=default header.b=0IlDP5wf; dmarc=pass (policy=quarantine) header.from=antgroup.com; spf=pass (imf17.hostedemail.com: domain of libang.li@antgroup.com designates 140.205.0.194 as permitted sender) smtp.mailfrom=libang.li@antgroup.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1716018704; a=rsa-sha256; cv=none; b=k1gEd6TLxsD+fUavcRCWiMGjmr+PbhCM3ZzTkC0h4BKJkTj+LVz+2FOGFkVr+M1zWarVSe aFsPWS2j4ZTWRtN+FgV4eRrjAyTC8nBFuU3uXxeU5QSWihtIiWZ3lw6ulBeIJUvmZ2sUqI UoDaeQu3KdYnfs8NpwO5EZ5z+HT1U+0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=antgroup.com; s=default; t=1716018701; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=MvaQlNmLKjB1JJG125kcLMl74RVFk5etnjUBr5sySWs=; b=0IlDP5wf+f6nRHb1uwC+DFTFkgr5wFHSQYK4a1lx22LkveOy8pulAeT3912AVIHSp9Tjjc+Bw2N9xd9zDmN4on1gERrUMinmxDE4eSSEERoUJ4ukg0bQSOI3MQea0c9x1tjJll3Bt2njP95WC6xagfRKhzy5flJ1RxmMkepXcrU= X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R771e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018047203;MF=libang.li@antgroup.com;NM=1;PH=DS;RN=16;SR=0;TI=SMTPD_---.XgA9uMj_1716018698; Received: from localhost(mailfrom:libang.li@antgroup.com fp:SMTPD_---.XgA9uMj_1716018698) by smtp.aliyun-inc.com; Sat, 18 May 2024 15:51:39 +0800 From: "Bang Li" To: akpm@linux-foundation.org, chenhuacai@kernel.org, tsbogend@alpha.franken.de, paul.walmsley@sifive.com, palmer@dabbelt.com, chris@zankel.net, jcmvbkbc@gmail.com Cc: , , , , , , , , "Bang Li" Subject: [PATCH v3 3/3] mm: Use update_mmu_tlb_range() to simplify code Date: Sat, 18 May 2024 15:49:14 +0800 Message-Id: <20240518074914.52170-4-libang.li@antgroup.com> X-Mailer: git-send-email 2.19.1.6.gb485710b In-Reply-To: <20240518074914.52170-1-libang.li@antgroup.com> References: <20240518074914.52170-1-libang.li@antgroup.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 0EE8E40013 X-Stat-Signature: 5f4drcr85x63bszqjg5usspd57t5ca1i X-Rspam-User: X-Rspamd-Server: rspam04 X-HE-Tag: 1716018703-483619 X-HE-Meta: U2FsdGVkX1+B9gRPtvjlArhPh5si0hV/lDKQdmlDJ4+SmN4YSW8vT/5QpvyDk6VBxrx+0fJafxpe+JPU15WCDw/RveMTXygvIwabBJCdxJMXIHjgoomJoWsteAHkRY3HLv1g1wwcR3Fmvbd7HiGPMLXdrmGv0+Xac1A1mzWqIX6b8E/4vEaPQHXmMwo0dpyKFph66wDhZTrnrQghrT90y/bg/cU7ObniTHJDAZKXAFHZersqkcMhX19DGxG1qd31Tvuu4OaH2Tm+4+lfiT+5zYX9arMA8PJ+AoufXGYt/Oi0iVl8KUTdhroyZeeSftzwCAQJ62CJ2oOR/ldb+dbAYfZrbzEK/9i9LCJP+qmZfyp5n96pK4IsLNPs5jjG7PlxlluRQwqDPpRA1dkejRzDw+yVimdzptkFCJOm/MMHbh2KJPFge/VA28Dcm9b1mTaTWrhjqlyg7vMhKohvGxhKE5x1RVBjqffw/VhoLWVM+ipleRoREiTanHxvXNzp9IZdOakhOvJ8R2aa8yD2yullH+IhtOl26FvyIKXqGLdnQPhkhG5NNwweBWUIEYqIDtmjtHu94L+0o9F4bFoyORtEQ3hVTEu4EK3zgATVNpuvosaU6uTQpEvweStfBWbeehQ7n2zZwxpzzPAxYA/I0bOW+fAo5J4yczccj7hbIuiqJfTiDr2q2rGlSPGkpHGjx6AMZ/A7hC2nI6zR1OwBmhA9v84Uezrg4TZpJP8cabISnCHUhin32PTM5g9EJFJ8V1tcO0trcxeSgOu8q11/NeKiDoSOfL81jyFQREwK0HEWuazzZ8bpNdi95zoZB1eaBh5TniPp5S/c25RYEO7qKTBgBx2muc2KOdA04OVKuR3FknqKTSnR3a1Vy4UCVCjYmOsSi1Ra3iqLnO6LtoskOQ6N9b0UXm0RW4PI9smJr9V07YNpqSqlIQq3te+4pN50SJWAnwQo1QHop/HHgNHQhjJ eM2XGhCE attE88Y+dDGBOowuUvmCfXPexezd5hBEO5TpoGzj4mVwqWj8uZxEsXD84789V2Zwp0llTeH53KNIa/d/bLKR27mfbdBc3+cJoGa7/TJ+zBVCJLo4kWRVYf0fqBTMwnE6JL3vm3PnfslxtPIM6r27JPgfaILghpPEo2dDADPMIf/KsRq5XgEGfW1+QaheCiDVazHAI8Te+irS4yIIBkPYMni2GUO82l5q8O05r72f//N4qO0ki4Lx3Va2PGe1v4Q/NPyZiHo41QWX3uMTKMj4oXvTGa1hwkxRoQzVr9hVH7fgCn593vzFiczkXPDj1yWmcDWt5qQlrqcykeps= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000167, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Let us simplify the code by update_mmu_tlb_range(). Signed-off-by: Bang Li Reviewed-by: Lance Yang Acked-by: David Hildenbrand --- mm/memory.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/mm/memory.c b/mm/memory.c index eea6e4984eae..2d53e29cf76e 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -4421,7 +4421,6 @@ static vm_fault_t do_anonymous_page(struct vm_fault *vmf) vm_fault_t ret = 0; int nr_pages = 1; pte_t entry; - int i; /* File mapping without ->vm_ops ? */ if (vma->vm_flags & VM_SHARED) @@ -4491,8 +4490,7 @@ static vm_fault_t do_anonymous_page(struct vm_fault *vmf) update_mmu_tlb(vma, addr, vmf->pte); goto release; } else if (nr_pages > 1 && !pte_range_none(vmf->pte, nr_pages)) { - for (i = 0; i < nr_pages; i++) - update_mmu_tlb(vma, addr + PAGE_SIZE * i, vmf->pte + i); + update_mmu_tlb_range(vma, addr, vmf->pte, nr_pages); goto release; }