The quilt patch titled
Subject: zswap-memcg-accounting-fix-2
has been removed from the -mm tree. Its filename was
zswap-memcg-accounting-fix-2.patch
This patch was dropped because it was folded into zswap-memcg-accounting.patch
------------------------------------------------------
From: Johannes Weiner <hannes@xxxxxxxxxxx>
Subject: zswap-memcg-accounting-fix-2
Date: Fri, 13 May 2022 14:25:59 -0400
opt out of v1
Link: https://lkml.kernel.org/r/Yn6it9mBYFA+/lTb@xxxxxxxxxxx
Signed-off-by: Johannes Weiner <hannes@xxxxxxxxxxx>
Cc: Michal Hocko <mhocko@xxxxxxxx>
Cc: Roman Gushchin <guro@xxxxxx>
Cc: Shakeel Butt <shakeelb@xxxxxxxxxx>
Cc: Seth Jennings <sjenning@xxxxxxxxxx>
Cc: Dan Streetman <ddstreet@xxxxxxxx>
Cc: Minchan Kim <minchan@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/memcontrol.c | 9 +++++++++
1 file changed, 9 insertions(+)
--- a/mm/memcontrol.c~zswap-memcg-accounting-fix-2
+++ a/mm/memcontrol.c
@@ -7484,6 +7484,9 @@ bool obj_cgroup_may_zswap(struct obj_cgr
struct mem_cgroup *memcg, *original_memcg;
bool ret = true;
+ if (!cgroup_subsys_on_dfl(memory_cgrp_subsys))
+ return true;
+
original_memcg = get_mem_cgroup_from_objcg(objcg);
for (memcg = original_memcg; memcg != root_mem_cgroup;
memcg = parent_mem_cgroup(memcg)) {
@@ -7520,6 +7523,9 @@ void obj_cgroup_charge_zswap(struct obj_
{
struct mem_cgroup *memcg;
+ if (!cgroup_subsys_on_dfl(memory_cgrp_subsys))
+ return;
+
VM_WARN_ON_ONCE(!(current->flags & PF_MEMALLOC));
/* PF_MEMALLOC context, charging must succeed */
@@ -7544,6 +7550,9 @@ void obj_cgroup_uncharge_zswap(struct ob
{
struct mem_cgroup *memcg;
+ if (!cgroup_subsys_on_dfl(memory_cgrp_subsys))
+ return;
+
obj_cgroup_uncharge(objcg, size);
rcu_read_lock();
_
Patches currently in -mm which might be from hannes@xxxxxxxxxxx are
documentation-filesystems-proc-update-meminfo-section.patch
mm-kconfig-move-swap-and-slab-config-options-to-the-mm-section.patch
mm-kconfig-group-swap-slab-hotplug-and-thp-options-into-submenus.patch
mm-kconfig-simplify-zswap-configuration.patch
mm-zswap-add-basic-meminfo-and-vmstat-coverage.patch
zswap-memcg-accounting.patch
revert-mm-vmscan-never-demote-for-memcg-reclaim.patch
