Skip to contentSkip to conversation

shmem-skip-page-split-if-were-not-reclaiming.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Mar 28, 2023

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: shmem: skip page split if we're not reclaiming
has been removed from the -mm tree. Its filename was
shmem-skip-page-split-if-were-not-reclaiming.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: Luis Chamberlain <[email protected]>
Subject: shmem: skip page split if we're not reclaiming
Date: Thu, 9 Mar 2023 15:05:43 -0800

In theory when info->flags & VM_LOCKED we should not be getting shem_writepage() called so we should be verifying this with a WARN_ON_ONCE(). Since we should not be swapping then best to ensure we also don't do the folio split earlier too. So just move the check early to avoid folio splits in case its a dubious call.

We also have a similar early bail when !total_swap_pages so just move that earlier to avoid the possible folio split in the same situation.

---

 mm/shmem.c |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
mm/shmem.c renamed from mm/shmem.c~shmem-skip-page-split-if-were-not-reclaiming +6 -4
@@ -1357,6 +1357,12 @@ static int shmem_writepage(struct page *
 	if (WARN_ON_ONCE(!wbc->for_reclaim))
 		goto redirty;
 
+	if (WARN_ON_ONCE(info->flags & VM_LOCKED))
+		goto redirty;
+
+	if (!total_swap_pages)
+		goto redirty;
+
 	/*
 	 * If /sys/kernel/mm/transparent_hugepage/shmem_enabled is "always" or
 	 * "force", drivers/gpu/drm/i915/gem/i915_gem_shmem.c gets huge pages,
@@ -1372,10 +1378,6 @@ static int shmem_writepage(struct page *
 	}
 
 	index = folio->index;
-	if (info->flags & VM_LOCKED)
-		goto redirty;
-	if (!total_swap_pages)
-		goto redirty;
 
 	/*
 	 * This is somewhat ridiculous, but without plumbing a SWAP_MAP_FALLOC

_

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