The patch titled
Subject: mm: swap_cgroup: get rid of __lookup_swap_cgroup()
has been added to the -mm mm-unstable branch. Its filename is
mm-swap_cgroup-get-rid-of-__lookup_swap_cgroup.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-swap_cgroup-get-rid-of-__lookup_swap_cgroup.patch
This patch will later appear in the mm-unstable branch at
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next via the mm-everything
branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there every 2-3 working days
------------------------------------------------------
From: Roman Gushchin <roman.gushchin@xxxxxxxxx>
Subject: mm: swap_cgroup: get rid of __lookup_swap_cgroup()
Date: Fri, 15 Nov 2024 19:02:29 +0000
Because swap_cgroup map is now virtually contiguous, swap_cgroup_record()
can be simplified, which eliminates a need to use __lookup_swap_cgroup().
Now as __lookup_swap_cgroup() is really trivial and is used only once, it
can be inlined.
Link: https://lkml.kernel.org/r/20241115190229.676440-2-roman.gushchin@xxxxxxxxx
Signed-off-by: Roman Gushchin <roman.gushchin@xxxxxxxxx>
Acked-by: Shakeel Butt <shakeel.butt@xxxxxxxxx>
Cc: Johannes Weiner <hannes@xxxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/swap_cgroup.c | 18 ++----------------
1 file changed, 2 insertions(+), 16 deletions(-)
--- a/mm/swap_cgroup.c~mm-swap_cgroup-get-rid-of-__lookup_swap_cgroup
+++ a/mm/swap_cgroup.c
@@ -33,13 +33,6 @@ static struct swap_cgroup_ctrl swap_cgro
*
* TODO: we can push these buffers out to HIGHMEM.
*/
-
-static struct swap_cgroup *__lookup_swap_cgroup(struct swap_cgroup_ctrl *ctrl,
- pgoff_t offset)
-{
- return &ctrl->map[offset];
-}
-
static struct swap_cgroup *lookup_swap_cgroup(swp_entry_t ent,
struct swap_cgroup_ctrl **ctrlp)
{
@@ -49,7 +42,7 @@ static struct swap_cgroup *lookup_swap_c
ctrl = &swap_cgroup_ctrl[swp_type(ent)];
if (ctrlp)
*ctrlp = ctrl;
- return __lookup_swap_cgroup(ctrl, offset);
+ return &ctrl->map[offset];
}
/**
@@ -104,16 +97,9 @@ unsigned short swap_cgroup_record(swp_en
spin_lock_irqsave(&ctrl->lock, flags);
old = sc->id;
- for (;;) {
+ for (; offset < end; offset++, sc++) {
VM_BUG_ON(sc->id != old);
sc->id = id;
- offset++;
- if (offset == end)
- break;
- if (offset % SC_PER_PAGE)
- sc++;
- else
- sc = __lookup_swap_cgroup(ctrl, offset);
}
spin_unlock_irqrestore(&ctrl->lock, flags);
_
Patches currently in -mm which might be from roman.gushchin@xxxxxxxxx are
mm-swap_cgroup-allocate-swap_cgroup-map-using-vcalloc.patch
mm-swap_cgroup-get-rid-of-__lookup_swap_cgroup.patch
