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 4876722F15E for ; Wed, 21 May 2025 16:57: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=1747846660; cv=none; b=LjJ8StGCTX7hEJa09YM4IwXTDnSpSegPYxY40342aLmiXXJzG1FpAvNNLz3wWhoJQs6HI9LtxKHz/sXRfG/PooIUVZGW41fsdl6+zgw8WxtOfGA9IQPGp2i3E5sRD6t2k2VxQY2s9CeKniH5UvF0U6qtFOFy/JFPnAphCbTfHjo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1747846660; c=relaxed/simple; bh=L8Ek6cenAnrPpN38hnSWY/bEEHZRWzdPKQTwmZpqjG0=; h=Date:To:From:Subject:Message-Id; b=ngTpF3Q5NOjofF/dxan0JvHh16Hu3brZzN6TCRfADMQ8cACVLDepV6/HHkqWKAB28qxARavUANjwLqJpORtI2FZjvd8Zl+cynvaK+kcc2kkCZD9Vyb7h0OlOm0o2w9KPViCLzw/959QmjKqdHHlMg0nVqjPf/6hz4M4N/w5W2rk= 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=a3+yVPk4; 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="a3+yVPk4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 195C7C4CEEB; Wed, 21 May 2025 16:57:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1747846660; bh=L8Ek6cenAnrPpN38hnSWY/bEEHZRWzdPKQTwmZpqjG0=; h=Date:To:From:Subject:From; b=a3+yVPk4DU3Bz4q/hZxjsi2vMT8KKnvv+GqsbiqRKKbNeiPVoNiP7SR2m/RA2Djo4 O30PeuLp0TkqBeLRL6ZgSFsTPT8kkm7Ubx2/pYLtOup84/Xf/GUqLynQLChgtQat0x t/6zcxn2D/SJRdCtf4wrWDOClGbJIP2S/bUUppmk= Date: Wed, 21 May 2025 09:57:39 -0700 To: mm-commits@vger.kernel.org,ziy@nvidia.com,vbabka@suse.cz,surenb@google.com,ryan.roberts@arm.com,rppt@kernel.org,npache@redhat.com,mhocko@suse.com,lorenzo.stoakes@oracle.com,liam.howlett@oracle.com,dev.jain@arm.com,david@redhat.com,baolin.wang@linux.alibaba.com,akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-stable] mm-khugepaged-decouple-shmem-and-file-folios-collapse.patch removed from -mm tree Message-Id: <20250521165740.195C7C4CEEB@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: khugepaged: decouple SHMEM and file folios' collapse has been removed from the -mm tree. Its filename was mm-khugepaged-decouple-shmem-and-file-folios-collapse.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: Baolin Wang Subject: mm: khugepaged: decouple SHMEM and file folios' collapse Date: Tue, 13 May 2025 14:56:35 +0800 Originally, the file pages collapse was intended for tmpfs/shmem to merge into THP in the background. However, now not only tmpfs/shmem can support large folios, but some other file systems (such as XFS, erofs ...) also support large folios. Therefore, it is time to decouple the support of file folios collapse from SHMEM. Link: https://lkml.kernel.org/r/ce5c2314e0368cf34bda26f9bacf01c982d4da17.1747119309.git.baolin.wang@linux.alibaba.com Signed-off-by: Baolin Wang Acked-by: David Hildenbrand Acked-by: Zi Yan Cc: Dev Jain Cc: Liam Howlett Cc: Lorenzo Stoakes Cc: Mariano Pache Cc: Michal Hocko Cc: Mike Rapoport Cc: Ryan Roberts Cc: Suren Baghdasaryan Cc: Vlastimil Babka Signed-off-by: Andrew Morton --- include/linux/khugepaged.h | 8 -------- mm/Kconfig | 2 +- mm/khugepaged.c | 13 ++----------- 3 files changed, 3 insertions(+), 20 deletions(-) --- a/include/linux/khugepaged.h~mm-khugepaged-decouple-shmem-and-file-folios-collapse +++ a/include/linux/khugepaged.h @@ -15,16 +15,8 @@ extern void khugepaged_enter_vma(struct unsigned long vm_flags); extern void khugepaged_min_free_kbytes_update(void); extern bool current_is_khugepaged(void); -#ifdef CONFIG_SHMEM extern int collapse_pte_mapped_thp(struct mm_struct *mm, unsigned long addr, bool install_pmd); -#else -static inline int collapse_pte_mapped_thp(struct mm_struct *mm, - unsigned long addr, bool install_pmd) -{ - return 0; -} -#endif static inline void khugepaged_fork(struct mm_struct *mm, struct mm_struct *oldmm) { --- a/mm/Kconfig~mm-khugepaged-decouple-shmem-and-file-folios-collapse +++ a/mm/Kconfig @@ -886,7 +886,7 @@ config THP_SWAP config READ_ONLY_THP_FOR_FS bool "Read-only THP for filesystems (EXPERIMENTAL)" - depends on TRANSPARENT_HUGEPAGE && SHMEM + depends on TRANSPARENT_HUGEPAGE help Allow khugepaged to put read-only file-backed pages in THP. --- a/mm/khugepaged.c~mm-khugepaged-decouple-shmem-and-file-folios-collapse +++ a/mm/khugepaged.c @@ -1464,7 +1464,6 @@ static void collect_mm_slot(struct khuge } } -#ifdef CONFIG_SHMEM /* folio must be locked, and mmap_lock must be held */ static int set_huge_pmd(struct vm_area_struct *vma, unsigned long addr, pmd_t *pmdp, struct folio *folio, struct page *page) @@ -2353,14 +2352,6 @@ static int hpage_collapse_scan_file(stru trace_mm_khugepaged_scan_file(mm, folio, file, present, swap, result); return result; } -#else -static int hpage_collapse_scan_file(struct mm_struct *mm, unsigned long addr, - struct file *file, pgoff_t start, - struct collapse_control *cc) -{ - BUILD_BUG(); -} -#endif static unsigned int khugepaged_scan_mm_slot(unsigned int pages, int *result, struct collapse_control *cc) @@ -2436,7 +2427,7 @@ skip: VM_BUG_ON(khugepaged_scan.address < hstart || khugepaged_scan.address + HPAGE_PMD_SIZE > hend); - if (IS_ENABLED(CONFIG_SHMEM) && !vma_is_anonymous(vma)) { + if (!vma_is_anonymous(vma)) { struct file *file = get_file(vma->vm_file); pgoff_t pgoff = linear_page_index(vma, khugepaged_scan.address); @@ -2782,7 +2773,7 @@ int madvise_collapse(struct vm_area_stru mmap_assert_locked(mm); memset(cc->node_load, 0, sizeof(cc->node_load)); nodes_clear(cc->alloc_nmask); - if (IS_ENABLED(CONFIG_SHMEM) && !vma_is_anonymous(vma)) { + if (!vma_is_anonymous(vma)) { struct file *file = get_file(vma->vm_file); pgoff_t pgoff = linear_page_index(vma, addr); _ Patches currently in -mm which might be from baolin.wang@linux.alibaba.com are