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 E21D970830 for ; Sat, 28 Mar 2026 17:01:02 +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=1774717263; cv=none; b=SzEZsqqHM4RSy4MFGPPeejambLgyxwTCdsTO4UI9Y13s9ENELtpgh/Dx+FI+MjVVG/jAqEU+YYcBkNk6vBqEv2P0gAB1Y2KB5NxwfDSBCe2y9b0T3v42doxNyxcfFReYrdRf4p5B47fsmpqxrqJCKLirU7eQEC6ZHTQ2RFvCKWc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774717263; c=relaxed/simple; bh=se4CdJX6lDoIifrTDAhEYyaksWDWVwwrBzE2wNuUWbI=; h=Date:To:From:Subject:Message-Id; b=iOUgmbRTlWshO6uERY7tibvxmkQcVz0UfAlDlDcBhONZewnFN7lMCSiqcmUum8r+HLVzMdMrkVjW/VOeLTmIctkqhXlVmcC881kbVW6NygNT9m0AXjPcc2T7TUfeH/gG6DabIkiftgMmXamRmKiIaDRtNQ6MwWVEvWHJG/sH0B0= 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=bu71Atoj; 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="bu71Atoj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 75202C4CEF7; Sat, 28 Mar 2026 17:01:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1774717262; bh=se4CdJX6lDoIifrTDAhEYyaksWDWVwwrBzE2wNuUWbI=; h=Date:To:From:Subject:From; b=bu71AtojtxPjjHONKhsRf29dhwdLsiOf7nQYWpPUeraL5pum2/KcWm7wEaQp8ylJP igKDxKmrwAMXYIarKQc8J3eepdXtQwbl3dvww+8jUYacR5XUcUx3gxejEpST2kBZOU Y6eh2CAW0m6LvCUrug3TuDsV/u7JwD2t90JsSTb8= Date: Sat, 28 Mar 2026 10:01:01 -0700 To: mm-commits@vger.kernel.org,ziy@nvidia.com,surenb@google.com,ryan.roberts@arm.com,rppt@kernel.org,npache@redhat.com,mhocko@suse.com,liam.howlett@oracle.com,lance.yang@linux.dev,dev.jain@arm.com,david@kernel.org,baolin.wang@linux.alibaba.com,baohua@kernel.org,ljs@kernel.org,akpm@linux-foundation.org From: Andrew Morton Subject: [folded-merged] mm-huge_memory-add-and-use-has_deposited_pgtable-fix.patch removed from -mm tree Message-Id: <20260328170102.75202C4CEF7@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-add-and-use-has_deposited_pgtable-fix has been removed from the -mm tree. Its filename was mm-huge_memory-add-and-use-has_deposited_pgtable-fix.patch This patch was dropped because it was folded into mm-huge_memory-add-and-use-has_deposited_pgtable.patch ------------------------------------------------------ From: "Lorenzo Stoakes (Oracle)" Subject: mm-huge_memory-add-and-use-has_deposited_pgtable-fix Date: Mon, 23 Mar 2026 11:42:01 +0000 resolve an issue with us performing folio_put() on a folio before checking it again to see if a table was deposited, as per Sashiko. Link: https://lkml.kernel.org/r/0a917f80-902f-49b0-a75f-1bbaf23d7f94@lucifer.local Signed-off-by: Lorenzo Stoakes (Oracle) Cc: Baolin Wang Cc: Barry Song Cc: David Hildenbrand Cc: Dev Jain Cc: Lance Yang Cc: Liam Howlett Cc: Michal Hocko Cc: Mike Rapoport Cc: Nico Pache Cc: Ryan Roberts Cc: Suren Baghdasaryan Cc: Zi Yan Signed-off-by: Andrew Morton --- mm/huge_memory.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/mm/huge_memory.c~mm-huge_memory-add-and-use-has_deposited_pgtable-fix +++ a/mm/huge_memory.c @@ -2474,6 +2474,7 @@ bool zap_huge_pmd(struct mmu_gather *tlb struct mm_struct *mm = tlb->mm; struct folio *folio = NULL; bool is_present = false; + bool has_deposit; spinlock_t *ptl; pmd_t orig_pmd; @@ -2495,10 +2496,10 @@ bool zap_huge_pmd(struct mmu_gather *tlb is_present = pmd_present(orig_pmd); folio = normal_or_softleaf_folio_pmd(vma, addr, orig_pmd, is_present); + has_deposit = has_deposited_pgtable(vma, orig_pmd, folio); if (folio) zap_huge_pmd_folio(mm, vma, orig_pmd, folio, is_present); - - if (has_deposited_pgtable(vma, orig_pmd, folio)) + if (has_deposit) zap_deposited_table(mm, pmd); spin_unlock(ptl); _ Patches currently in -mm which might be from ljs@kernel.org are mm-rename-vma-flag-helpers-to-be-more-readable.patch mm-add-vma_desc_test_all-and-use-it.patch mm-always-inline-__mk_vma_flags-and-invoked-functions.patch mm-reintroduce-vma_flags_test-as-a-singular-flag-test.patch mm-reintroduce-vma_desc_test-as-a-singular-flag-test.patch tools-testing-vma-add-test-for-vma_flags_test-vma_desc_test.patch mm-mremap-correct-invalid-map-count-check.patch mm-abstract-reading-sysctl_max_map_count-and-read_once.patch mm-mremap-check-map-count-under-mmap-write-lock-and-abstract.patch mm-vma-add-vma_flags_empty-vma_flags_and-vma_flags_diff_pair.patch tools-testing-vma-add-unit-tests-flag-empty-diff_pair-and.patch mm-vma-add-further-vma_flags_t-unions.patch tools-testing-vma-convert-bulk-of-test-code-to-vma_flags_t.patch mm-vma-use-new-vma-flags-for-sticky-flags-logic.patch tools-testing-vma-fix-vma-flag-tests.patch mm-vma-add-append_vma_flags-helper.patch tools-testing-vma-add-simple-test-for-append_vma_flags.patch mm-unexport-vm_brk_flags-and-eliminate-vm_flags-parameter.patch mm-vma-introduce-vma_flags_same.patch mm-vma-introduce-_to_-helpers.patch tools-testing-vma-test-that-legacy-flag-helpers-work-correctly.patch mm-vma-introduce-vma_test-and-make-inlining-consistent.patch tools-testing-vma-update-vma-flag-tests-to-test-vma_test.patch mm-introduce-vma_flags_count-and-vma_test_single_mask.patch tools-testing-vma-test-vma_flags_countvma_test_single_mask.patch mm-convert-do_brk_flags-to-use-vma_flags_t.patch mm-update-vma_supports_mlock-to-use-new-vma-flags.patch mm-vma-introduce-vma_clear_flags.patch tools-testing-vma-update-vma-tests-to-test-vma_clear_flags.patch mm-vma-convert-as-much-as-we-can-in-mm-vmac-to-vma_flags_t.patch tools-bitmap-add-missing-bitmap_copy-implementation.patch mm-vma-convert-vma_modify_flags-to-use-vma_flags_t.patch mm-vma-convert-__mmap_region-to-use-vma_flags_t.patch mm-simplify-vma-flag-tests-of-excluded-flags.patch mm-various-small-mmap_prepare-cleanups.patch mm-add-documentation-for-the-mmap_prepare-file-operation-callback.patch mm-document-vm_operations_struct-open-the-same-as-close.patch mm-avoid-deadlock-when-holding-rmap-on-mmap_prepare-error.patch mm-switch-the-rmap-lock-held-option-off-in-compat-layer.patch mm-vma-remove-superfluous-map-hold_file_rmap_lock.patch mm-have-mmap_action_complete-handle-the-rmap-lock-and-unmap.patch mm-add-vm_ops-mapped-hook.patch fs-afs-revert-mmap_prepare-change.patch fs-afs-restore-mmap_prepare-implementation.patch mm-add-mmap_action_simple_ioremap.patch misc-open-dice-replace-deprecated-mmap-hook-with-mmap_prepare.patch hpet-replace-deprecated-mmap-hook-with-mmap_prepare.patch mtdchar-replace-deprecated-mmap-hook-with-mmap_prepare-clean-up.patch stm-replace-deprecated-mmap-hook-with-mmap_prepare.patch staging-vme_user-replace-deprecated-mmap-hook-with-mmap_prepare.patch mm-allow-handling-of-stacked-mmap_prepare-hooks-in-more-drivers.patch drivers-hv-vmbus-replace-deprecated-mmap-hook-with-mmap_prepare.patch uio-replace-deprecated-mmap-hook-with-mmap_prepare-in-uio_info.patch mm-add-mmap_action_map_kernel_pages.patch mm-on-remap-assert-that-input-range-within-the-proposed-vma.patch mm-huge_memory-simplify-vma_is_specal_huge.patch mm-huge-avoid-big-else-branch-in-zap_huge_pmd.patch mm-huge_memory-have-zap_huge_pmd-return-a-boolean-add-kdoc.patch mm-huge_memory-handle-buggy-pmd-entry-in-zap_huge_pmd.patch mm-huge_memory-add-a-common-exit-path-to-zap_huge_pmd.patch mm-huge_memory-remove-unnecessary-vm_bug_on_page.patch mm-huge_memory-deduplicate-zap-deposited-table-call.patch mm-huge_memory-remove-unnecessary-sanity-checks.patch mm-huge_memory-use-mm-instead-of-tlb-mm.patch mm-huge_memory-separate-out-the-folio-part-of-zap_huge_pmd.patch mm-add-softleaf_is_valid_pmd_entry-pmd_to_softleaf_folio.patch mm-huge_memory-add-and-use-normal_or_softleaf_folio_pmd.patch mm-huge_memory-add-and-use-has_deposited_pgtable.patch maintainers-update-mglru-entry-to-reflect-current-status.patch