Skip to content

Commit bdd0d69

Browse files
x-y-zakpm00
authored andcommitted
mm/huge_memory: change folio_split_supported() to folio_check_splittable()
Patch series "Improve folio split related functions", v4. This patchset improves several folio split related functions to avoid future misuse. The changes are: 1. Consolidated folio splittable checks by moving truncated folio check, huge zero folio check, and writeback folio check into folio_split_supported(). Changed the function return type. Renamed it to folio_check_splittable() for clarification. 2. Replaced can_split_folio() with open coded folio_expected_ref_count() and folio_ref_count() and introduced folio_cache_ref_count(). 3. Changed min_order_for_split() to always return an order. 4. Fixed folio split stats counting. Motivation ========== This is based on Wei's observation[1] and solves several potential issues: 1. Dereferencing NULL folio->mapping in try_folio_split_to_order() if it is called on truncated folios. 2. Not handling of negative return value of min_order_for_split() in mm/memory-failure.c There is no bug in the current code. This patch (of 4): folio_split_supported() used in try_folio_split_to_order() requires folio->mapping to be non NULL, but current try_folio_split_to_order() does not check it. There is no issue in the current code, since try_folio_split_to_order() is only used in truncate_inode_partial_folio(), where folio->mapping is not NULL. To prevent future misuse, move folio->mapping NULL check (i.e., folio is truncated) into folio_split_supported(). Since folio->mapping NULL check returns -EBUSY and folio_split_supported() == false means -EINVAL, change folio_split_supported() return type from bool to int and return error numbers accordingly. Rename folio_split_supported() to folio_check_splittable() to match the return type change. While at it, move is_huge_zero_folio() check and folio_test_writeback() check into folio_check_splittable() and add kernel-doc. Remove all warnings inside folio_check_splittable() and give warnings in __folio_split() instead, so that bool warns parameter can be removed. Link: https://lkml.kernel.org/r/20251126210618.1971206-1-ziy@nvidia.com Link: https://lkml.kernel.org/r/20251126210618.1971206-2-ziy@nvidia.com Signed-off-by: Zi Yan <ziy@nvidia.com> Reviewed-by: Wei Yang <richard.weiyang@gmail.com> Acked-by: Balbir Singh <balbirs@nvidia.com> Acked-by: David Hildenbrand (Red Hat) <david@kernel.org> Cc: Baolin Wang <baolin.wang@linux.alibaba.com> Cc: Barry Song <baohua@kernel.org> Cc: Dev Jain <dev.jain@arm.com> Cc: Lance Yang <lance.yang@linux.dev> Cc: Liam Howlett <liam.howlett@oracle.com> Cc: Lorenzo Stoakes <lorenzo.stoakes@oracle.com> Cc: Miaohe Lin <linmiaohe@huawei.com> Cc: Naoya Horiguchi <nao.horiguchi@gmail.com> Cc: Nico Pache <npache@redhat.com> Cc: Ryan Roberts <ryan.roberts@arm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent 1cba2eb commit bdd0d69

2 files changed

Lines changed: 46 additions & 36 deletions

File tree

include/linux/huge_mm.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -375,8 +375,8 @@ int __split_huge_page_to_list_to_order(struct page *page, struct list_head *list
375375
int folio_split_unmapped(struct folio *folio, unsigned int new_order);
376376
int min_order_for_split(struct folio *folio);
377377
int split_folio_to_list(struct folio *folio, struct list_head *list);
378-
bool folio_split_supported(struct folio *folio, unsigned int new_order,
379-
enum split_type split_type, bool warns);
378+
int folio_check_splittable(struct folio *folio, unsigned int new_order,
379+
enum split_type split_type);
380380
int folio_split(struct folio *folio, unsigned int new_order, struct page *page,
381381
struct list_head *list);
382382

@@ -407,7 +407,7 @@ static inline int split_huge_page_to_order(struct page *page, unsigned int new_o
407407
static inline int try_folio_split_to_order(struct folio *folio,
408408
struct page *page, unsigned int new_order)
409409
{
410-
if (!folio_split_supported(folio, new_order, SPLIT_TYPE_NON_UNIFORM, /* warns= */ false))
410+
if (folio_check_splittable(folio, new_order, SPLIT_TYPE_NON_UNIFORM))
411411
return split_huge_page_to_order(&folio->page, new_order);
412412
return folio_split(folio, new_order, page, NULL);
413413
}

mm/huge_memory.c

Lines changed: 43 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -3688,15 +3688,40 @@ static int __split_unmapped_folio(struct folio *folio, int new_order,
36883688
return 0;
36893689
}
36903690

3691-
bool folio_split_supported(struct folio *folio, unsigned int new_order,
3692-
enum split_type split_type, bool warns)
3691+
/**
3692+
* folio_check_splittable() - check if a folio can be split to a given order
3693+
* @folio: folio to be split
3694+
* @new_order: the smallest order of the after split folios (since buddy
3695+
* allocator like split generates folios with orders from @folio's
3696+
* order - 1 to new_order).
3697+
* @split_type: uniform or non-uniform split
3698+
*
3699+
* folio_check_splittable() checks if @folio can be split to @new_order using
3700+
* @split_type method. The truncated folio check must come first.
3701+
*
3702+
* Context: folio must be locked.
3703+
*
3704+
* Return: 0 - @folio can be split to @new_order, otherwise an error number is
3705+
* returned.
3706+
*/
3707+
int folio_check_splittable(struct folio *folio, unsigned int new_order,
3708+
enum split_type split_type)
36933709
{
3710+
VM_WARN_ON_FOLIO(!folio_test_locked(folio), folio);
3711+
/*
3712+
* Folios that just got truncated cannot get split. Signal to the
3713+
* caller that there was a race.
3714+
*
3715+
* TODO: this will also currently refuse folios without a mapping in the
3716+
* swapcache (shmem or to-be-anon folios).
3717+
*/
3718+
if (!folio->mapping && !folio_test_anon(folio))
3719+
return -EBUSY;
3720+
36943721
if (folio_test_anon(folio)) {
36953722
/* order-1 is not supported for anonymous THP. */
3696-
VM_WARN_ONCE(warns && new_order == 1,
3697-
"Cannot split to order-1 folio");
36983723
if (new_order == 1)
3699-
return false;
3724+
return -EINVAL;
37003725
} else if (split_type == SPLIT_TYPE_NON_UNIFORM || new_order) {
37013726
if (IS_ENABLED(CONFIG_READ_ONLY_THP_FOR_FS) &&
37023727
!mapping_large_folio_support(folio->mapping)) {
@@ -3717,9 +3742,7 @@ bool folio_split_supported(struct folio *folio, unsigned int new_order,
37173742
* case, the mapping does not actually support large
37183743
* folios properly.
37193744
*/
3720-
VM_WARN_ONCE(warns,
3721-
"Cannot split file folio to non-0 order");
3722-
return false;
3745+
return -EINVAL;
37233746
}
37243747
}
37253748

@@ -3732,12 +3755,16 @@ bool folio_split_supported(struct folio *folio, unsigned int new_order,
37323755
* here.
37333756
*/
37343757
if ((split_type == SPLIT_TYPE_NON_UNIFORM || new_order) && folio_test_swapcache(folio)) {
3735-
VM_WARN_ONCE(warns,
3736-
"Cannot split swapcache folio to non-0 order");
3737-
return false;
3758+
return -EINVAL;
37383759
}
37393760

3740-
return true;
3761+
if (is_huge_zero_folio(folio))
3762+
return -EINVAL;
3763+
3764+
if (folio_test_writeback(folio))
3765+
return -EBUSY;
3766+
3767+
return 0;
37413768
}
37423769

37433770
static int __folio_freeze_and_split_unmapped(struct folio *folio, unsigned int new_order,
@@ -3922,39 +3949,22 @@ static int __folio_split(struct folio *folio, unsigned int new_order,
39223949
int remap_flags = 0;
39233950
int extra_pins, ret;
39243951
pgoff_t end = 0;
3925-
bool is_hzp;
39263952

39273953
VM_WARN_ON_ONCE_FOLIO(!folio_test_locked(folio), folio);
39283954
VM_WARN_ON_ONCE_FOLIO(!folio_test_large(folio), folio);
39293955

39303956
if (folio != page_folio(split_at) || folio != page_folio(lock_at))
39313957
return -EINVAL;
39323958

3933-
/*
3934-
* Folios that just got truncated cannot get split. Signal to the
3935-
* caller that there was a race.
3936-
*
3937-
* TODO: this will also currently refuse shmem folios that are in the
3938-
* swapcache.
3939-
*/
3940-
if (!is_anon && !folio->mapping)
3941-
return -EBUSY;
3942-
39433959
if (new_order >= old_order)
39443960
return -EINVAL;
39453961

3946-
if (!folio_split_supported(folio, new_order, split_type, /* warn = */ true))
3947-
return -EINVAL;
3948-
3949-
is_hzp = is_huge_zero_folio(folio);
3950-
if (is_hzp) {
3951-
pr_warn_ratelimited("Called split_huge_page for huge zero page\n");
3952-
return -EBUSY;
3962+
ret = folio_check_splittable(folio, new_order, split_type);
3963+
if (ret) {
3964+
VM_WARN_ONCE(ret == -EINVAL, "Tried to split an unsplittable folio");
3965+
return ret;
39533966
}
39543967

3955-
if (folio_test_writeback(folio))
3956-
return -EBUSY;
3957-
39583968
if (is_anon) {
39593969
/*
39603970
* The caller does not necessarily hold an mmap_lock that would

0 commit comments

Comments
 (0)