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 3764632ED20 for ; Mon, 1 Sep 2025 18:42:40 +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=1756752160; cv=none; b=u/wYFDgA0UeIY5knaznwLMyWGZb26S2uwBELZGkNbcuIeMSnsr/uGi6UGl0BGyOe3iLDch57qD5qHagiyrtuVa2sXfKHIldlGQI7QBd4H0MVYmqvDR1UbmdUyMAscmtw6k5iguiJnFqMZeqnv6zspFwcCnevpc0lVlqosSh80dY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756752160; c=relaxed/simple; bh=GInJ5EzF5kZNuD1dkYxttFLx4T11mMqK8XNeNRmF1MU=; h=Date:To:From:Subject:Message-Id; b=WsuWH7mhjqimm/WJNqyUzvum6uG2z9BNUfjVjQVG/5nhGWfjNHwgGOX+hC5uTQmPcxD21K8irYSX7hWWYZNL4G8LtGARgdzuhii1CS0OIW5eNrMZ0nTimxpFvYO+CeYGjO0NDSJcutAUmphzQZ7KzrkS7R9qMiQoZ098FwPh/a0= 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=flC5GIJS; 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="flC5GIJS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0CFADC4CEF0; Mon, 1 Sep 2025 18:42:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1756752160; bh=GInJ5EzF5kZNuD1dkYxttFLx4T11mMqK8XNeNRmF1MU=; h=Date:To:From:Subject:From; b=flC5GIJSXsUjZrVr00/gZak6HluRq3ubICwjfnndls6FC1eI84XyIACO0i/b1rdRb 5jZWNli7dfx4lm2aWi0Pj9lNzY5JdEbBvsmS5558XAiBqB1kkRp9fJrFp3HoAp3o1F TE02DN0GLMw8fOGxBT5M615q14dV2czyixqgjkMc= Date: Mon, 01 Sep 2025 11:42:39 -0700 To: mm-commits@vger.kernel.org,ziy@nvidia.com,lorenzo.stoakes@oracle.com,david@redhat.com,akpm@linux-foundation.org From: Andrew Morton Subject: + fs-hugetlbfs-cleanup-folio-in-adjust_range_hwpoison.patch added to mm-new branch Message-Id: <20250901184240.0CFADC4CEF0@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The patch titled Subject: fs: hugetlbfs: cleanup folio in adjust_range_hwpoison() has been added to the -mm mm-new branch. Its filename is fs-hugetlbfs-cleanup-folio-in-adjust_range_hwpoison.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/fs-hugetlbfs-cleanup-folio-in-adjust_range_hwpoison.patch This patch will later appear in the mm-new branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Note, mm-new is a provisional staging ground for work-in-progress patches, and acceptance into mm-new is a notification for others take notice and to finish up reviews. Please do not hesitate to respond to review feedback and post updated versions to replace or incrementally fixup patches in mm-new. Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: David Hildenbrand Subject: fs: hugetlbfs: cleanup folio in adjust_range_hwpoison() Date: Mon, 1 Sep 2025 17:03:37 +0200 Let's cleanup and simplify the function a bit. Link: https://lkml.kernel.org/r/20250901150359.867252-17-david@redhat.com Signed-off-by: David Hildenbrand Reviewed-by: Zi Yan Reviewed-by: Lorenzo Stoakes Signed-off-by: Andrew Morton --- fs/hugetlbfs/inode.c | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) --- a/fs/hugetlbfs/inode.c~fs-hugetlbfs-cleanup-folio-in-adjust_range_hwpoison +++ a/fs/hugetlbfs/inode.c @@ -192,37 +192,25 @@ hugetlb_get_unmapped_area(struct file *f * Someone wants to read @bytes from a HWPOISON hugetlb @folio from @offset. * Returns the maximum number of bytes one can read without touching the 1st raw * HWPOISON page. - * - * The implementation borrows the iteration logic from copy_page_to_iter*. */ static size_t adjust_range_hwpoison(struct folio *folio, size_t offset, size_t bytes) { - struct page *page; - size_t n = 0; - size_t res = 0; + struct page *page = folio_page(folio, offset / PAGE_SIZE); + size_t safe_bytes; - /* First page to start the loop. */ - page = folio_page(folio, offset / PAGE_SIZE); - offset %= PAGE_SIZE; - while (1) { - if (is_raw_hwpoison_page_in_hugepage(page)) - break; + if (is_raw_hwpoison_page_in_hugepage(page)) + return 0; + /* Safe to read the remaining bytes in this page. */ + safe_bytes = PAGE_SIZE - (offset % PAGE_SIZE); + page++; - /* Safe to read n bytes without touching HWPOISON subpage. */ - n = min(bytes, (size_t)PAGE_SIZE - offset); - res += n; - bytes -= n; - if (!bytes || !n) + /* Check each remaining page as long as we are not done yet. */ + for (; safe_bytes < bytes; safe_bytes += PAGE_SIZE, page++) + if (is_raw_hwpoison_page_in_hugepage(page)) break; - offset += n; - if (offset == PAGE_SIZE) { - page++; - offset = 0; - } - } - return res; + return min(safe_bytes, bytes); } /* _ Patches currently in -mm which might be from david@redhat.com are mm-migrate-remove-migratepage_unmap.patch mm-migrate-remove-migratepage_unmap-fix.patch treewide-remove-migratepage_success.patch mm-huge_memory-move-more-common-code-into-insert_pmd.patch mm-huge_memory-move-more-common-code-into-insert_pud.patch mm-huge_memory-support-huge-zero-folio-in-vmf_insert_folio_pmd.patch fs-dax-use-vmf_insert_folio_pmd-to-insert-the-huge-zero-folio.patch mm-huge_memory-mark-pmd-mappings-of-the-huge-zero-folio-special.patch powerpc-ptdump-rename-struct-pgtable_level-to-struct-ptdump_pglevel.patch mm-rmap-convert-enum-rmap_level-to-enum-pgtable_level.patch mm-memory-convert-print_bad_pte-to-print_bad_page_map.patch mm-memory-convert-print_bad_pte-to-print_bad_page_map-fix.patch mm-memory-factor-out-common-code-from-vm_normal_page_.patch mm-introduce-and-use-vm_normal_page_pud.patch mm-rename-vm_ops-find_special_page-to-vm_ops-find_normal_page.patch prctl-extend-pr_set_thp_disable-to-optionally-exclude-vm_hugepage.patch mm-huge_memory-convert-tva_flags-to-enum-tva_type.patch mm-huge_memory-respect-madv_collapse-with-pr_thp_disable_except_advised.patch mm-stop-making-sparsemem_vmemmap-user-selectable.patch arm64-kconfig-drop-superfluous-select-sparsemem_vmemmap.patch s390-kconfig-drop-superfluous-select-sparsemem_vmemmap.patch x86-kconfig-drop-superfluous-select-sparsemem_vmemmap.patch wireguard-selftests-remove-config_sparsemem_vmemmap=y-from-qemu-kernel-config.patch mm-page_alloc-reject-unreasonable-folio-compound-page-sizes-in-alloc_contig_range_noprof.patch mm-memremap-reject-unreasonable-folio-compound-page-sizes-in-memremap_pages.patch mm-hugetlb-check-for-unreasonable-folio-sizes-when-registering-hstate.patch mm-mm_init-make-memmap_init_compound-look-more-like-prep_compound_page.patch mm-sanity-check-maximum-folio-size-in-folio_set_order.patch mm-limit-folio-compound-page-sizes-in-problematic-kernel-configs.patch mm-simplify-folio_page-and-folio_page_idx.patch mm-hugetlb-cleanup-hugetlb_folio_init_tail_vmemmap.patch mm-mm-percpu-km-drop-nth_page-usage-within-single-allocation.patch fs-hugetlbfs-remove-nth_page-usage-within-folio-in-adjust_range_hwpoison.patch fs-hugetlbfs-cleanup-folio-in-adjust_range_hwpoison.patch mm-pagewalk-drop-nth_page-usage-within-folio-in-folio_walk_start.patch mm-gup-drop-nth_page-usage-within-folio-when-recording-subpages.patch mm-gup-remove-record_subpages.patch io_uring-zcrx-remove-nth_page-usage-within-folio.patch mips-mm-convert-__flush_dcache_pages-to-__flush_dcache_folio_pages.patch mm-cma-refuse-handing-out-non-contiguous-page-ranges.patch dma-remap-drop-nth_page-in-dma_common_contiguous_remap.patch scatterlist-disallow-non-contigous-page-ranges-in-a-single-sg-entry.patch ata-libata-sff-drop-nth_page-usage-within-sg-entry.patch drm-i915-gem-drop-nth_page-usage-within-sg-entry.patch mspro_block-drop-nth_page-usage-within-sg-entry.patch memstick-drop-nth_page-usage-within-sg-entry.patch mmc-drop-nth_page-usage-within-sg-entry.patch scsi-scsi_lib-drop-nth_page-usage-within-sg-entry.patch scsi-sg-drop-nth_page-usage-within-sg-entry.patch vfio-pci-drop-nth_page-usage-within-sg-entry.patch crypto-remove-nth_page-usage-within-sg-entry.patch mm-gup-drop-nth_page-usage-in-unpin_user_page_range_dirty_lock.patch kfence-drop-nth_page-usage.patch block-update-comment-of-struct-bio_vec-regarding-nth_page.patch mm-remove-nth_page.patch