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 0AD0EC369D1 for ; Fri, 25 Apr 2025 10:39:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2A18C6B0082; Fri, 25 Apr 2025 06:39:48 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2518E6B0088; Fri, 25 Apr 2025 06:39:48 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 119136B0089; Fri, 25 Apr 2025 06:39:48 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id E91BA6B0082 for ; Fri, 25 Apr 2025 06:39:47 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id B021C5C944 for ; Fri, 25 Apr 2025 10:39:47 +0000 (UTC) X-FDA: 83372220414.08.147068B Received: from fanzine2.igalia.com (fanzine.igalia.com [178.60.130.6]) by imf09.hostedemail.com (Postfix) with ESMTP id F085B140006 for ; Fri, 25 Apr 2025 10:39:45 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=igalia.com header.s=20170329 header.b=VBdTcEnY; dmarc=pass (policy=none) header.from=igalia.com; spf=pass (imf09.hostedemail.com: domain of gavinguo@igalia.com designates 178.60.130.6 as permitted sender) smtp.mailfrom=gavinguo@igalia.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1745577586; 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=fXn9JP6wkrNEHUrtwA4wVXvkkRNmgMST2AstnsuBA3k=; b=5f61LXc6zO1HS7JLG8rO22wm2cXUnR5QLKqG4H3SmBHiZ9SCyI+Sm85VngarQbsbRMln3e x5IUbInyI8GPvyZYINV/8j4YssYRc1KwrS/wOHl5I1wZSWOnPQhhft8xGJvvYbdvcY74Bd 6rV3M9G6+qHOUDMLwqjrl4GftDFlqEA= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=igalia.com header.s=20170329 header.b=VBdTcEnY; dmarc=pass (policy=none) header.from=igalia.com; spf=pass (imf09.hostedemail.com: domain of gavinguo@igalia.com designates 178.60.130.6 as permitted sender) smtp.mailfrom=gavinguo@igalia.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1745577586; a=rsa-sha256; cv=none; b=rH6sU1XzJpjjHnxYkl162OOhX+jJDJGHQadTHK2cX0rNzuKUQfV6IrIE904+8eRpFQ77T6 vnuX5ksomOEgXOAN0nrgaI/wMb3PgNZlmrHKexGj6ZShD3vlrfq7xDR072+uPfJ8S8twZ3 i1mNYv4F3cWuSUtrSTJpvSk9D8zycYI= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=igalia.com; s=20170329; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=fXn9JP6wkrNEHUrtwA4wVXvkkRNmgMST2AstnsuBA3k=; b=VBdTcEnYLj1bSTbPA3/qXCxQhi QaPIHQxu0gzsz8OtNwZ89ScFaJOi3M59M+rxzpBPjExS2KwLL3681n4g1b6FxQBlkS6ailcotvsnm 7Y7UJzSQxPofRMmuOncdYbQPLf8Xs58/w1w9bi3wUCYAb6aZjjYxTF239dJlou2UQCy30yAa18K5v 3J7NFdU6wSdF6gtwpscRL/kCmZK1+9PqazBcDx4DNDib/44OE8CaxOzKoyIuROR81uQWodOhODtuQ rOZEzwt6Twfv7ouvIFkoFCLEDgGr859pOSkQnQnIV3k7ePwsTT2B+7yLCjEyojB9Mxd6AONKoYjbk BIzf8wyw==; Received: from 114-44-196-209.dynamic-ip.hinet.net ([114.44.196.209] helo=gavin-HP-Z840-Workstation..) by fanzine2.igalia.com with esmtpsa (Cipher TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim) id 1u8GT9-008HIu-QR; Fri, 25 Apr 2025 12:39:44 +0200 From: Gavin Guo To: linux-mm@kvack.org, akpm@linux-foundation.org Cc: gshan@redhat.com, david@redhat.com, willy@infradead.org, ziy@nvidia.com, linmiaohe@huawei.com, hughd@google.com, revest@google.com, kernel-dev@igalia.com, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/2] mm/huge_memory: Remove useless folio pointers passing Date: Fri, 25 Apr 2025 18:38:59 +0800 Message-ID: <20250425103859.825879-3-gavinguo@igalia.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250425103859.825879-1-gavinguo@igalia.com> References: <20250425103859.825879-1-gavinguo@igalia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Stat-Signature: dax3tqqmfu3pgkztrcsrjhrgi4f647or X-Rspamd-Queue-Id: F085B140006 X-Rspam-User: X-Rspamd-Server: rspam05 X-HE-Tag: 1745577585-809325 X-HE-Meta: U2FsdGVkX1+oS6LA9DELr05zbvvS6F3w3yogt8Ga9dKu0xdyG1ycCPkhWFS6L8Wcy9+3MNSbl9Kv1Y30m/HWES6XP3HwmHz/y2ux59sB5KaFYL/HffaUPPyr8gl8ZPzRsTfCyxYhwTTKVUbi2ilMCFMpvrSimHjaH2SR6t4x/yeKfS25yW4oErFhcO4gnD7VTfQHnE4PrtlawxHxkJ+JVTX6wjJJCVnHkVt03SpQoA/Bh7Jfp4tW12EvgsXdNx/EFpo3uj0gqxGP9m+yXedHQJsqu0h8+wPO5+++FzpkzUBT6AXRqxxU61+lUt2USbxNT6j0FbY5aF3ZeKnaKs5bJ54oaU1XzkrdeFBvNezb9f6aVVvSwFV8U7lRBo89Oi5RBoQIxurVgfI6DLyIAHi1NxKBBSyI/qVc4BLASRd5cSC3rAaDcCQJ/7+VWxP+52K2bQzS9JnbHz71ofSmkVRtGWeepbrSzAhjmKhWK6I4/i+WmowJ1xKrOZakRwY54am9fAE//WpzuJGP62v6ZBh78tjLJ6UYRqShnS97ZSxSzEs/SQzdD3QJEMy8iWd7mPP81xxKWqpwpwQZmgD0u03/Fmhd9LGRb/zmA2uEXPQEkbi+9xxID9ScdmmE1BxxsdZtP1Tp0/Waa3AwldoHkrraGH0ROyML9DUzBSjbB6EQtBdxuZPfTpkGzQQWTk0PlJAW6bWrXW9gVK3O3oiWKZTNmVlZf6GCt1xJGSQBuoKRYLEKjO1R3Hb7YdeEXI7FkKCtdFtdGqub1/CLRvKDGKQ2LaJ+e0D0VpUGDEVOUlOYmwy5Ybo3di3pQlOmPtkEIbmU3Kbrw5i/IFutHKHTsFJDn3ETB+755bkYt14W3Ax6akG7wzJBxRdtvi9PHtcZjggzn7dMatnJ8+Fo9KQoyYGZ5anBUO6QakklrEl5cl1JBTTvlWl8JzNKtAHijKyxP/0oh/s7bBlTIVtIKxH7OcB YUDsek4D KgjMepGdD6DV61tdDZjo2GM9+Tdw6vq0gnZQQ1m55VA6U6AItnA0Lp2B67iR9V7gCjUJYX6BLmL+ZBdDkILPU3Z2vXwhZKoJ7KOrp4CkdiyWlb5Jjx9YOP3T8ah+73J91c0LdXJLa5oeAqhYtwztaO8FqhH11Z/aAbhOMg0B1FvsBOIPvKQI1UrWKhO+dKqQJ9Fu6byu7lc48krhu5XF9mr3XXzJudqviaoGcFw9yhh+ZuwxdmI8A3UOn6ebsYJ3MWhJABOGoTHSBj4xDXd5vAf7NVPNArtU5XctcgFUQr/IDYAxOmTxphMny3XZ1oyFum8O8m+Q0WLqKBWfuo4jLY1eNuxYw6sDHqfatyyD+Q+Ome1s= 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: Since the previous commit "mm/huge_memory: Adjust try_to_migrate_one() and split_huge_pmd_locked()" has simplified the logic by leveraging the folio verification in page_vma_mapped_walk(), this patch removes the unnecessary folio pointers passing. Suggested-by: David Hildenbrand Link: https://lore.kernel.org/all/98d1d195-7821-4627-b518-83103ade56c0@redhat.com/ Link: https://lore.kernel.org/all/91599a3c-e69e-4d79-bac5-5013c96203d7@redhat.com/ Signed-off-by: Gavin Guo Acked-by: David Hildenbrand --- include/linux/huge_mm.h | 15 +++++++-------- mm/huge_memory.c | 16 ++++++++-------- mm/memory.c | 4 ++-- mm/mprotect.c | 2 +- mm/rmap.c | 4 ++-- 5 files changed, 20 insertions(+), 21 deletions(-) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index e893d546a49f..01a6d998d212 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -395,7 +395,7 @@ static inline int split_huge_page(struct page *page) void deferred_split_folio(struct folio *folio, bool partially_mapped); void __split_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd, - unsigned long address, bool freeze, struct folio *folio); + unsigned long address, bool freeze); #define split_huge_pmd(__vma, __pmd, __address) \ do { \ @@ -403,12 +403,11 @@ void __split_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd, if (is_swap_pmd(*____pmd) || pmd_trans_huge(*____pmd) \ || pmd_devmap(*____pmd)) \ __split_huge_pmd(__vma, __pmd, __address, \ - false, NULL); \ + false); \ } while (0) - void split_huge_pmd_address(struct vm_area_struct *vma, unsigned long address, - bool freeze, struct folio *folio); + bool freeze); void __split_huge_pud(struct vm_area_struct *vma, pud_t *pud, unsigned long address); @@ -503,7 +502,7 @@ static inline bool thp_migration_supported(void) } void split_huge_pmd_locked(struct vm_area_struct *vma, unsigned long address, - pmd_t *pmd, bool freeze, struct folio *folio); + pmd_t *pmd, bool freeze); bool unmap_huge_pmd_locked(struct vm_area_struct *vma, unsigned long addr, pmd_t *pmdp, struct folio *folio); @@ -578,12 +577,12 @@ static inline void deferred_split_folio(struct folio *folio, bool partially_mapp do { } while (0) static inline void __split_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd, - unsigned long address, bool freeze, struct folio *folio) {} + unsigned long address, bool freeze) {} static inline void split_huge_pmd_address(struct vm_area_struct *vma, - unsigned long address, bool freeze, struct folio *folio) {} + unsigned long address, bool freeze) {} static inline void split_huge_pmd_locked(struct vm_area_struct *vma, unsigned long address, pmd_t *pmd, - bool freeze, struct folio *folio) {} + bool freeze) {} static inline bool unmap_huge_pmd_locked(struct vm_area_struct *vma, unsigned long addr, pmd_t *pmdp, diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 485a0ba011af..7d292693c18e 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -1786,7 +1786,7 @@ int copy_huge_pmd(struct mm_struct *dst_mm, struct mm_struct *src_mm, pte_free(dst_mm, pgtable); spin_unlock(src_ptl); spin_unlock(dst_ptl); - __split_huge_pmd(src_vma, src_pmd, addr, false, NULL); + __split_huge_pmd(src_vma, src_pmd, addr, false); return -EAGAIN; } add_mm_counter(dst_mm, MM_ANONPAGES, HPAGE_PMD_NR); @@ -2008,7 +2008,7 @@ vm_fault_t do_huge_pmd_wp_page(struct vm_fault *vmf) folio_unlock(folio); spin_unlock(vmf->ptl); fallback: - __split_huge_pmd(vma, vmf->pmd, vmf->address, false, NULL); + __split_huge_pmd(vma, vmf->pmd, vmf->address, false); return VM_FAULT_FALLBACK; } @@ -3073,7 +3073,7 @@ static void __split_huge_pmd_locked(struct vm_area_struct *vma, pmd_t *pmd, } void split_huge_pmd_locked(struct vm_area_struct *vma, unsigned long address, - pmd_t *pmd, bool freeze, struct folio *folio) + pmd_t *pmd, bool freeze) { VM_WARN_ON_ONCE(!IS_ALIGNED(address, HPAGE_PMD_SIZE)); if (pmd_trans_huge(*pmd) || pmd_devmap(*pmd) || @@ -3082,7 +3082,7 @@ void split_huge_pmd_locked(struct vm_area_struct *vma, unsigned long address, } void __split_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd, - unsigned long address, bool freeze, struct folio *folio) + unsigned long address, bool freeze) { spinlock_t *ptl; struct mmu_notifier_range range; @@ -3092,20 +3092,20 @@ void __split_huge_pmd(struct vm_area_struct *vma, pmd_t *pmd, (address & HPAGE_PMD_MASK) + HPAGE_PMD_SIZE); mmu_notifier_invalidate_range_start(&range); ptl = pmd_lock(vma->vm_mm, pmd); - split_huge_pmd_locked(vma, range.start, pmd, freeze, folio); + split_huge_pmd_locked(vma, range.start, pmd, freeze); spin_unlock(ptl); mmu_notifier_invalidate_range_end(&range); } void split_huge_pmd_address(struct vm_area_struct *vma, unsigned long address, - bool freeze, struct folio *folio) + bool freeze) { pmd_t *pmd = mm_find_pmd(vma->vm_mm, address); if (!pmd) return; - __split_huge_pmd(vma, pmd, address, freeze, folio); + __split_huge_pmd(vma, pmd, address, freeze); } static inline void split_huge_pmd_if_needed(struct vm_area_struct *vma, unsigned long address) @@ -3117,7 +3117,7 @@ static inline void split_huge_pmd_if_needed(struct vm_area_struct *vma, unsigned if (!IS_ALIGNED(address, HPAGE_PMD_SIZE) && range_in_vma(vma, ALIGN_DOWN(address, HPAGE_PMD_SIZE), ALIGN(address, HPAGE_PMD_SIZE))) - split_huge_pmd_address(vma, address, false, NULL); + split_huge_pmd_address(vma, address, false); } void vma_adjust_trans_huge(struct vm_area_struct *vma, diff --git a/mm/memory.c b/mm/memory.c index ba3ea0a82f7f..4f85167baff9 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -1799,7 +1799,7 @@ static inline unsigned long zap_pmd_range(struct mmu_gather *tlb, next = pmd_addr_end(addr, end); if (is_swap_pmd(*pmd) || pmd_trans_huge(*pmd) || pmd_devmap(*pmd)) { if (next - addr != HPAGE_PMD_SIZE) - __split_huge_pmd(vma, pmd, addr, false, NULL); + __split_huge_pmd(vma, pmd, addr, false); else if (zap_huge_pmd(tlb, vma, pmd, addr)) { addr = next; continue; @@ -5892,7 +5892,7 @@ static inline vm_fault_t wp_huge_pmd(struct vm_fault *vmf) split: /* COW or write-notify handled on pte level: split pmd. */ - __split_huge_pmd(vma, vmf->pmd, vmf->address, false, NULL); + __split_huge_pmd(vma, vmf->pmd, vmf->address, false); return VM_FAULT_FALLBACK; } diff --git a/mm/mprotect.c b/mm/mprotect.c index 62c1f7945741..88608d0dc2c2 100644 --- a/mm/mprotect.c +++ b/mm/mprotect.c @@ -379,7 +379,7 @@ static inline long change_pmd_range(struct mmu_gather *tlb, if (is_swap_pmd(_pmd) || pmd_trans_huge(_pmd) || pmd_devmap(_pmd)) { if ((next - addr != HPAGE_PMD_SIZE) || pgtable_split_needed(vma, cp_flags)) { - __split_huge_pmd(vma, pmd, addr, false, NULL); + __split_huge_pmd(vma, pmd, addr, false); /* * For file-backed, the pmd could have been * cleared; make sure pmd populated if diff --git a/mm/rmap.c b/mm/rmap.c index b53a4dcaeaae..4992005885ef 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -1944,7 +1944,7 @@ static bool try_to_unmap_one(struct folio *folio, struct vm_area_struct *vma, * restart so we can process the PTE-mapped THP. */ split_huge_pmd_locked(vma, pvmw.address, - pvmw.pmd, false, folio); + pvmw.pmd, false); flags &= ~TTU_SPLIT_HUGE_PMD; page_vma_mapped_walk_restart(&pvmw); continue; @@ -2320,7 +2320,7 @@ static bool try_to_migrate_one(struct folio *folio, struct vm_area_struct *vma, if (!pvmw.pte) { if (flags & TTU_SPLIT_HUGE_PMD) { split_huge_pmd_locked(vma, pvmw.address, - pvmw.pmd, true, NULL); + pvmw.pmd, true); ret = false; page_vma_mapped_walk_done(&pvmw); break; -- 2.43.0