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