Skip to contentSkip to conversation

mm-fix-pswpin-counter-for-large-folios-swap-in.patch removed from -mm tree

merged mm-hotfixes-stable Andrew Morton 1 participant 1 message Oct 31, 2024

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm: fix PSWPIN counter for large folios swap-in
has been removed from the -mm tree. Its filename was
mm-fix-pswpin-counter-for-large-folios-swap-in.patch

This patch was dropped because it was merged into the mm-hotfixes-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Barry Song <[email protected]>
Subject: mm: fix PSWPIN counter for large folios swap-in
Date: Thu, 24 Oct 2024 10:02:01 +1300

Similar to PSWPOUT, we should count the number of base pages instead of large folios.

Fixes 242d12c98174 ("mm: support large folios swap-in for sync io devices")
Cc Chris Li <[email protected]>
Cc Yosry Ahmed <[email protected]>
Cc "Huang, Ying" <[email protected]>
Cc Kairui Song <[email protected]>
Cc Ryan Roberts <[email protected]>
Cc Kanchana P Sridhar <[email protected]>
Cc Usama Arif <[email protected]>

---

 mm/page_io.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
mm/page_io.c renamed from mm/page_io.c~mm-fix-pswpin-counter-for-large-folios-swap-in +2 -2
@@ -570,7 +570,7 @@ static void swap_read_folio_bdev_sync(st
 	 * attempt to access it in the page fault retry time check.
 	 */
 	get_task_struct(current);
-	count_vm_event(PSWPIN);
+	count_vm_events(PSWPIN, folio_nr_pages(folio));
 	submit_bio_wait(&bio);
 	__end_swap_bio_read(&bio);
 	put_task_struct(current);
@@ -585,7 +585,7 @@ static void swap_read_folio_bdev_async(s
 	bio->bi_iter.bi_sector = swap_folio_sector(folio);
 	bio->bi_end_io = end_swap_bio_read;
 	bio_add_folio_nofail(bio, folio, folio_size(folio), 0);
-	count_vm_event(PSWPIN);
+	count_vm_events(PSWPIN, folio_nr_pages(folio));
 	submit_bio(bio);
 }
 

_

Patches currently in -mm which might be from [email protected] are

mm-add-per-order-mthp-swpin-counters.patch
mm-add-per-order-mthp-swpin-counters-v2.patch