Skip to content

Commit a48d5bd

Browse files
Stefan Roeschakpm00
authored andcommitted
mm: fix for negative counter: nr_file_hugepages
While qualifiying the 6.4 release, the following warning was detected in messages: vmstat_refresh: nr_file_hugepages -15664 The warning is caused by the incorrect updating of the NR_FILE_THPS counter in the function split_huge_page_to_list. The if case is checking for folio_test_swapbacked, but the else case is missing the check for folio_test_pmd_mappable. The other functions that manipulate the counter like __filemap_add_folio and filemap_unaccount_folio have the corresponding check. I have a test case, which reproduces the problem. It can be found here: https://github.com/sroeschus/testcase/blob/main/vmstat_refresh/madv.c The test case reproduces on an XFS filesystem. Running the same test case on a BTRFS filesystem does not reproduce the problem. AFAIK version 6.1 until 6.6 are affected by this problem. [akpm@linux-foundation.org: whitespace fix] [shr@devkernel.io: test for folio_test_pmd_mappable()] Link: https://lkml.kernel.org/r/20231108171517.2436103-1-shr@devkernel.io Link: https://lkml.kernel.org/r/20231106181918.1091043-1-shr@devkernel.io Signed-off-by: Stefan Roesch <shr@devkernel.io> Co-debugged-by: Johannes Weiner <hannes@cmpxchg.org> Acked-by: Johannes Weiner <hannes@cmpxchg.org> Reviewed-by: Matthew Wilcox (Oracle) <willy@infradead.org> Reviewed-by: David Hildenbrand <david@redhat.com> Reviewed-by: Yang Shi <shy828301@gmail.com> Cc: Rik van Riel <riel@surriel.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent edf1454 commit a48d5bd

1 file changed

Lines changed: 9 additions & 7 deletions

File tree

mm/huge_memory.c

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2769,13 +2769,15 @@ int split_huge_page_to_list(struct page *page, struct list_head *list)
27692769
int nr = folio_nr_pages(folio);
27702770

27712771
xas_split(&xas, folio, folio_order(folio));
2772-
if (folio_test_swapbacked(folio)) {
2773-
__lruvec_stat_mod_folio(folio, NR_SHMEM_THPS,
2774-
-nr);
2775-
} else {
2776-
__lruvec_stat_mod_folio(folio, NR_FILE_THPS,
2777-
-nr);
2778-
filemap_nr_thps_dec(mapping);
2772+
if (folio_test_pmd_mappable(folio)) {
2773+
if (folio_test_swapbacked(folio)) {
2774+
__lruvec_stat_mod_folio(folio,
2775+
NR_SHMEM_THPS, -nr);
2776+
} else {
2777+
__lruvec_stat_mod_folio(folio,
2778+
NR_FILE_THPS, -nr);
2779+
filemap_nr_thps_dec(mapping);
2780+
}
27792781
}
27802782
}
27812783

0 commit comments

Comments
 (0)