From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 29C6B15E90 for ; Fri, 25 Jul 2025 02:15:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753409724; cv=none; b=N6+A0n84tPsVZUarbz6+IceDGjXG1UV+kdWlHeKkdsTCkxyTY7r3abctmXLaFw9neCFhX4xm9FCV8aK9j0z7CG8Q2GlgYIpB2t0naSk1xnMiqOQcc4k+4TekA7JstICisJjRXKnBg59k+JtAhJamdM4gPxELWDW7apWwa9R/B5o= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753409724; c=relaxed/simple; bh=cmoJSiQsnszwTIqz4SF8OUrtRfZbNOdvXyU4JiJee5g=; h=Date:To:From:Subject:Message-Id; b=nH5EUT2K3b96ExCYiAW9J2XbR4h4vEyGQcRXI2hSzi/GYwlFsRRMWc1DVSrnYnceIqRes5NrzCTgq7aTRI+InfJNAULYq8tbHgPlRd4FBxbrpokK5exVMrTLE2iFmKQEUXt3wF0Tp8HUbrMu/6Fu85SXQpcCXSofUWvB607BxPE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=1dVlQdbL; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="1dVlQdbL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BF381C4CEED; Fri, 25 Jul 2025 02:15:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1753409723; bh=cmoJSiQsnszwTIqz4SF8OUrtRfZbNOdvXyU4JiJee5g=; h=Date:To:From:Subject:From; b=1dVlQdbLejH8f0t+iZ2IfPShIg/mgKRxvw6Zqxkg3R0woX7yl3KgQd5wOOh+iews8 lxec6vIB1RwyNKldywtEcSDrRDqlwiuWm70jZLtbhXCP+Bv3ZKGjwfawX0aHt+0+Nv 7ud5tRktlKt/GnYkcvpDiaqayug1o9LodQylSIK4= Date: Thu, 24 Jul 2025 19:15:23 -0700 To: mm-commits@vger.kernel.org,ryan.roberts@arm.com,npache@redhat.com,matthew.brost@intel.com,lorenzo.stoakes@oracle.com,liam.howlett@oracle.com,k.shutemov@gmail.com,hughd@google.com,dev.jain@arm.com,david@redhat.com,dan.carpenter@linaro.org,baolin.wang@linux.alibaba.com,baohua@kernel.org,balbirs@nvidia.com,antonio@mandelbit.com,ziy@nvidia.com,akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-stable] mm-huge_memory-deduplicate-code-in-__folio_split.patch removed from -mm tree Message-Id: <20250725021523.BF381C4CEED@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The quilt patch titled Subject: mm/huge_memory: deduplicate code in __folio_split() has been removed from the -mm tree. Its filename was mm-huge_memory-deduplicate-code-in-__folio_split.patch This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: Zi Yan Subject: mm/huge_memory: deduplicate code in __folio_split() Date: Fri, 18 Jul 2025 14:37:17 -0400 xas unlock, remap_page(), local_irq_enable() are moved out of if branches to deduplicate the code. While at it, add remap_flags to clean up remap_page() call site. nr_dropped is renamed to nr_shmem_dropped, as it becomes a variable at __folio_split() scope. Link: https://lkml.kernel.org/r/20250718183720.4054515-4-ziy@nvidia.com Signed-off-by: Zi Yan Acked-by: David Hildenbrand Reviewed-by: Lorenzo Stoakes Cc: Antonio Quartulli Cc: Balbir Singh Cc: Baolin Wang Cc: Barry Song Cc: Dan Carpenter Cc: Dev Jain Cc: Hugh Dickins Cc: Kirill A. Shutemov Cc: Liam Howlett Cc: Mariano Pache Cc: Mathew Brost Cc: Ryan Roberts Signed-off-by: Andrew Morton --- mm/huge_memory.c | 73 +++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 38 deletions(-) --- a/mm/huge_memory.c~mm-huge_memory-deduplicate-code-in-__folio_split +++ a/mm/huge_memory.c @@ -3595,6 +3595,8 @@ static int __folio_split(struct folio *f struct anon_vma *anon_vma = NULL; int order = folio_order(folio); struct folio *new_folio, *next; + int nr_shmem_dropped = 0; + int remap_flags = 0; int extra_pins, ret; pgoff_t end; bool is_hzp; @@ -3718,15 +3720,16 @@ static int __folio_split(struct folio *f */ xas_lock(&xas); xas_reset(&xas); - if (xas_load(&xas) != folio) + if (xas_load(&xas) != folio) { + ret = -EAGAIN; goto fail; + } } /* Prevent deferred_split_scan() touching ->_refcount */ spin_lock(&ds_queue->split_queue_lock); if (folio_ref_freeze(folio, 1 + extra_pins)) { struct address_space *swap_cache = NULL; - int nr_dropped = 0; struct lruvec *lruvec; if (folio_order(folio) > 1 && @@ -3798,7 +3801,7 @@ static int __folio_split(struct folio *f /* Some pages can be beyond EOF: drop them from cache */ if (new_folio->index >= end) { if (shmem_mapping(mapping)) - nr_dropped += folio_nr_pages(new_folio); + nr_shmem_dropped += folio_nr_pages(new_folio); else if (folio_test_clear_dirty(new_folio)) folio_account_cleaned( new_folio, @@ -3828,47 +3831,41 @@ static int __folio_split(struct folio *f if (swap_cache) xa_unlock(&swap_cache->i_pages); - if (mapping) - xas_unlock(&xas); + } else { + spin_unlock(&ds_queue->split_queue_lock); + ret = -EAGAIN; + } +fail: + if (mapping) + xas_unlock(&xas); - local_irq_enable(); + local_irq_enable(); - if (nr_dropped) - shmem_uncharge(mapping->host, nr_dropped); + if (nr_shmem_dropped) + shmem_uncharge(mapping->host, nr_shmem_dropped); - remap_page(folio, 1 << order, - !ret && folio_test_anon(folio) ? - RMP_USE_SHARED_ZEROPAGE : - 0); + if (!ret && is_anon) + remap_flags = RMP_USE_SHARED_ZEROPAGE; + remap_page(folio, 1 << order, remap_flags); + /* + * Unlock all after-split folios except the one containing + * @lock_at page. If @folio is not split, it will be kept locked. + */ + for (new_folio = folio; new_folio != end_folio; new_folio = next) { + next = folio_next(new_folio); + if (new_folio == page_folio(lock_at)) + continue; + + folio_unlock(new_folio); /* - * Unlock all after-split folios except the one containing - * @lock_at page. If @folio is not split, it will be kept locked. + * Subpages may be freed if there wasn't any mapping + * like if add_to_swap() is running on a lru page that + * had its mapping zapped. And freeing these pages + * requires taking the lru_lock so we do the put_page + * of the tail pages after the split is complete. */ - for (new_folio = folio; new_folio != end_folio; - new_folio = next) { - next = folio_next(new_folio); - if (new_folio == page_folio(lock_at)) - continue; - - folio_unlock(new_folio); - /* - * Subpages may be freed if there wasn't any mapping - * like if add_to_swap() is running on a lru page that - * had its mapping zapped. And freeing these pages - * requires taking the lru_lock so we do the put_page - * of the tail pages after the split is complete. - */ - free_folio_and_swap_cache(new_folio); - } - } else { - spin_unlock(&ds_queue->split_queue_lock); -fail: - if (mapping) - xas_unlock(&xas); - local_irq_enable(); - remap_page(folio, folio_nr_pages(folio), 0); - ret = -EAGAIN; + free_folio_and_swap_cache(new_folio); } out_unlock: _ Patches currently in -mm which might be from ziy@nvidia.com are mm-page_alloc-remove-trace_mm_alloc_contig_migrate_range_info.patch