The quilt patch titled
Subject: mm-store-zero-pages-to-be-swapped-out-in-a-bitmap-v6
has been removed from the -mm tree. Its filename was
mm-store-zero-pages-to-be-swapped-out-in-a-bitmap-v6.patch
This patch was dropped because it was folded into mm-store-zero-pages-to-be-swapped-out-in-a-bitmap.patch
------------------------------------------------------
From: Usama Arif <usamaarif642@xxxxxxxxx>
Subject: mm-store-zero-pages-to-be-swapped-out-in-a-bitmap-v6
Date: Mon, 24 Jun 2024 15:01:28 +0100
Change bitmap_zalloc/free to kvzalloc/free as a very large swap file will
result in the allocation order to exceed MAX_PAGE_ORDER resulting in
bitmap_zalloc to fail.
Link: https://lkml.kernel.org/r/20240624140427.1334871-2-usamaarif642@xxxxxxxxx
Signed-off-by: Usama Arif <usamaarif642@xxxxxxxxx>
Reviewed-by: Chengming Zhou <chengming.zhou@xxxxxxxxx>
Reviewed-by: Yosry Ahmed <yosryahmed@xxxxxxxxxx>
Reviewed-by: Nhat Pham <nphamcs@xxxxxxxxx>
Cc: David Hildenbrand <david@xxxxxxxxxx>
Cc: "Huang, Ying" <ying.huang@xxxxxxxxx>
Cc: Hugh Dickins <hughd@xxxxxxxxxx>
Cc: Johannes Weiner <hannes@xxxxxxxxxxx>
Cc: Matthew Wilcox (Oracle) <willy@xxxxxxxxxxxxx>
Cc: Shakeel Butt <shakeel.butt@xxxxxxxxx>
Cc: Usama Arif <usamaarif642@xxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/swapfile.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/mm/swapfile.c~mm-store-zero-pages-to-be-swapped-out-in-a-bitmap-v6
+++ a/mm/swapfile.c
@@ -2653,7 +2653,7 @@ SYSCALL_DEFINE1(swapoff, const char __us
free_percpu(p->cluster_next_cpu);
p->cluster_next_cpu = NULL;
vfree(swap_map);
- bitmap_free(p->zeromap);
+ kvfree(p->zeromap);
kvfree(cluster_info);
/* Destroy swap account information */
swap_cgroup_swapoff(p->type);
@@ -3180,7 +3180,7 @@ SYSCALL_DEFINE2(swapon, const char __use
goto bad_swap_unlock_inode;
}
- p->zeromap = bitmap_zalloc(maxpages, GFP_KERNEL);
+ p->zeromap = kvzalloc(DIV_ROUND_UP(maxpages, 8), GFP_KERNEL);
if (!p->zeromap) {
error = -ENOMEM;
goto bad_swap_unlock_inode;
_
Patches currently in -mm which might be from usamaarif642@xxxxxxxxx are
mm-store-zero-pages-to-be-swapped-out-in-a-bitmap.patch
mm-store-zero-pages-to-be-swapped-out-in-a-bitmap-v7.patch
mm-store-zero-pages-to-be-swapped-out-in-a-bitmap-v8.patch
mm-remove-code-to-handle-same-filled-pages.patch
