From patchwork Wed May 22 06:12:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bang Li X-Patchwork-Id: 13670454 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 59548C25B77 for ; Wed, 22 May 2024 06:13:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 419F76B0088; Wed, 22 May 2024 02:13:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 37DB16B0089; Wed, 22 May 2024 02:13:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 21CC46B008A; Wed, 22 May 2024 02:13:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id ECC896B0088 for ; Wed, 22 May 2024 02:13:30 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id B11021C03BA for ; Wed, 22 May 2024 06:13:30 +0000 (UTC) X-FDA: 82145014980.23.7C247DA Received: from out0-209.mail.aliyun.com (out0-209.mail.aliyun.com [140.205.0.209]) by imf07.hostedemail.com (Postfix) with ESMTP id 6D8FC40016 for ; Wed, 22 May 2024 06:13:28 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=antgroup.com header.s=default header.b=LwysctnJ; dmarc=pass (policy=quarantine) header.from=antgroup.com; spf=pass (imf07.hostedemail.com: domain of libang.li@antgroup.com designates 140.205.0.209 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=1716358408; 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=TlFp/9e3+paphJkYj5hBfGpalgoFCMsN0GnLIT6/eZ4=; b=09PLKuf13VzYYzJCLkSXMzs0ffPNv+jnoXXJgMhS/Mdan9bvoUhOLr5rKhdbS9NZY+TtFR YR+nMmTy9rPxDw6LULWtP7NFQg3SKdJthrA8hZ8Nf8JZyKXIcsghhdKrkPCq38EzafwjfN VayDje25H9pBw/Stiua2417j4fUdyng= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=antgroup.com header.s=default header.b=LwysctnJ; dmarc=pass (policy=quarantine) header.from=antgroup.com; spf=pass (imf07.hostedemail.com: domain of libang.li@antgroup.com designates 140.205.0.209 as permitted sender) smtp.mailfrom=libang.li@antgroup.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1716358408; a=rsa-sha256; cv=none; b=uctL68XI3FgWxbQKd2QRsa5WyiDLDJR+AlQeE1ug3UfIPstgDZ2SQ6gVvrvzhvxIIRVcAT Ig38JfUzkizBIG09p7LEKQBRxB4br9Dz8Q/fF96/V6pCKKnFLoGhezUz1PMAQe2m0CrMXo Zr4ysIWs/NenR4qUPvokvHsVmuqJsDM= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=antgroup.com; s=default; t=1716358405; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=TlFp/9e3+paphJkYj5hBfGpalgoFCMsN0GnLIT6/eZ4=; b=LwysctnJ1/b2rmEt9CJtG2f20irwsnxK53iCF3wFsBa4+94AqrP4dfAo1AlYvEqJGf2F6RKHTmYkE1tkDxrFWSr586tgBfVgpkM0+DycmrIh8fm2wUqrEnyqLEH04hWEL1E25Sj5yf2QbjLFY6zWBgixwGEObsBnQUR0hIIM+i0= X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R211e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=maildocker-contentspam033070043001;MF=libang.li@antgroup.com;NM=1;PH=DS;RN=16;SR=0;TI=SMTPD_---.XjzNVv6_1716358403; Received: from localhost(mailfrom:libang.li@antgroup.com fp:SMTPD_---.XjzNVv6_1716358403) by smtp.aliyun-inc.com; Wed, 22 May 2024 14:13:24 +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 v4 2/3] mm: implement update_mmu_tlb() using update_mmu_tlb_range() Date: Wed, 22 May 2024 14:12:03 +0800 Message-Id: <20240522061204.117421-3-libang.li@antgroup.com> X-Mailer: git-send-email 2.19.1.6.gb485710b In-Reply-To: <20240522061204.117421-1-libang.li@antgroup.com> References: <20240522061204.117421-1-libang.li@antgroup.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 6D8FC40016 X-Stat-Signature: yi3zi7yk75am9kwy99454ekcmm1p11ek X-Rspam-User: X-Rspamd-Server: rspam04 X-HE-Tag: 1716358408-877265 X-HE-Meta: U2FsdGVkX198z2gtzS8WJjdoN8WqvWVS7i89JxEXrkayTVZ9v+ik95U2T7WKD+PiyivRdXWAJshIkAVzgq5Pm+NP+F2SoGYRcvvkVdK3pG26qBkfdHI1u/9p5WtxHGE+Ng5kZQ5sWR9+DAmCEmDsgsgxSDNg6bDsSBcpMrn6cD18vM61iNkyHQFZBWI3DX36m5FNHUnrkGEw/36p6oKAoMLFvtv4B7ZQZEf8R/jy1OGnalfro3qk1h5uTIqM5SQhqJLBATd914YAIxNyGbSfxSrLOQXH1DPnVx5sHSNJhVVMLKC0XIoQ0H2FJe5EI8aFQ4Qy0buAoq3wzbiTmFsk9iphlhM+FRhNN3XpLJ6i9w49p738thatntrs+jqUIaSS2H1slPDo5vWLVe8M39cETYFNoNBfkPgH9bHL0YU/lvgjn770J76TNhuAFTZJdqBSNni54VGvL32I2oj2R/MLeNMz/jYkEg9qTlNykeQa2VhumfvUHuew19DqFAmx1A170HqGM0GB6I9J9Zi1SNjaTVN/9r134Ma+DT+3tgGDF3e+/bDYAU4gMRqzwLck+UZ6vvagGFLR1ijgVkC6f1a+qoc+H07jVtd92N8xSTIcax1pBiNSQ47RzT7HJqYHAKCrYL7QbwCvfdckYRaUVVrMYuRv5fcctypDyrXYIREQhlOSJ+C/BYKnFVWGzg/rGjDmfhKzoiUNZC5fVmscnaPVBnnnAjYCRv6mvlYwWgdCoqC6h3EyR433cbwGGmaaPa4RwDcg71qVBdE14sTmyhElYRurYylzbnU7oGT1EuH+fIbTWhg6gw3eM/xyp56g/gvntpxvqBikFFMlSHaVHeyRdqF9r5efUVNf8P5hn1JDaL6sQOJ+ZAoKL7UyhoTtg4SL3kDKzAdF67XtNz2S85skyPT3EpjuCWZ8dY5GEuTglbIlueCjHSDLwOYVZls5MM/1qbwM5z15NosKBSs3AC0 WYMamJeQ C6sDLUbzvI0UTyFBfZa/FkpMcaOLX4kQCMCzi3TsPPFd9H11EHauBZGFo/KBMcx6QPWVzeSJdZyot/DN4Kimen+Tgna4tEIb3BbGoqBIZIcMJT721/+tY637SscKAqMQWG8HAofWsESuNQBGoG8JyTMatSCalpnnMT0ZdccEhSIP/0GGgPBoj1XRCLtI+iC37EVWSCFLC0iDxxds83bf9ptEmeyGzgZ0HEzed5rBNoEvOemyYAkOqFVsRh8TJrT+xA2zhTrQXGuq7kD5s1grXDbfVb0btG6B6pr++DT//R1gT5Ib8N/uK4OfRT58EXi78NeWIpmnKRBXYL2XAzg/6wNX+MwlHuyMn53vYHfgy4zQQV+YgklDmtxA+ZiHTOg3iwSMVlXm9N7iv76k= 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: Let's make update_mmu_tlb() simply a generic wrapper around update_mmu_tlb_range(). Only the latter can now be overridden by the architecture. We can now remove __HAVE_ARCH_UPDATE_MMU_TLB as well. Acked-by: David Hildenbrand 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 ------ include/linux/pgtable.h | 4 +--- 6 files changed, 1 insertion(+), 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 4630815b0253..ddfd6f8cdcb3 100644 --- a/arch/riscv/include/asm/pgtable.h +++ b/arch/riscv/include/asm/pgtable.h @@ -489,8 +489,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 17d1caee39ab..117b807e3f89 100644 --- a/include/linux/pgtable.h +++ b/include/linux/pgtable.h @@ -736,13 +736,11 @@ static inline void update_mmu_tlb_range(struct vm_area_struct *vma, } #endif -#ifndef __HAVE_ARCH_UPDATE_MMU_TLB 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