The patch titled
Subject: memcg: remove duplication detection for mem_cgroup_uncharge_swap
has been added to the -mm mm-unstable branch. Its filename is
memcg-removed-duplication-detection-for-mem_cgroup_uncharge_swap.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/memcg-removed-duplication-detection-for-mem_cgroup_uncharge_swap.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: Lu Jialin <lujialin4@xxxxxxxxxx>
Subject: memcg: remove duplication detection for mem_cgroup_uncharge_swap
Date: Sat, 19 Aug 2023 08:13:02 +0000
__mem_cgroup_uncharge_swap is only called in mem_cgroup_uncharge_swap, if
mem cgroup is disabled, __mem_cgroup_uncharge_swap cannot be called.
Therefore, there is no need to judge whether mem_cgroup is disabled or
not.
Link: https://lkml.kernel.org/r/20230819081302.1217098-1-lujialin4@xxxxxxxxxx
Signed-off-by: Lu Jialin <lujialin4@xxxxxxxxxx>
Acked-by: Shakeel Butt <shakeelb@xxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxx>
Cc: Roman Gushchin <roman.gushchin@xxxxxxxxx>
Cc: Johannes Weiner <hannes@xxxxxxxxxxx>
Cc: Muchun Song <songmuchun@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/memcontrol.c | 3 ---
1 file changed, 3 deletions(-)
--- a/mm/memcontrol.c~memcg-removed-duplication-detection-for-mem_cgroup_uncharge_swap
+++ a/mm/memcontrol.c
@@ -7535,9 +7535,6 @@ void __mem_cgroup_uncharge_swap(swp_entr
struct mem_cgroup *memcg;
unsigned short id;
- if (mem_cgroup_disabled())
- return;
-
id = swap_cgroup_record(entry, 0, nr_pages);
rcu_read_lock();
memcg = mem_cgroup_from_id(id);
_
Patches currently in -mm which might be from lujialin4@xxxxxxxxxx are
memcg-removed-duplication-detection-for-mem_cgroup_uncharge_swap.patch
