Skip to contentSkip to conversation

mm-memcg-move-legacy-memcg-event-code-into-memcontrol-v1c.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Jul 5, 2024

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm: memcg: move legacy memcg event code into memcontrol-v1.c
has been removed from the -mm tree. Its filename was
mm-memcg-move-legacy-memcg-event-code-into-memcontrol-v1c.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: Roman Gushchin <[email protected]>
Subject: mm: memcg: move legacy memcg event code into memcontrol-v1.c
Date: Mon, 24 Jun 2024 17:58:58 -0700

Cgroup v1's memory controller contains a pretty complicated event notifications mechanism which is not used on cgroup v2. Let's move the corresponding code into memcontrol-v1.c.

Please, note, that mem_cgroup_event_ratelimit() remains in memcontrol.c, otherwise it would require exporting too many details on memcg stats outside of memcontrol.c.

---

 include/linux/memcontrol.h |   12 
 mm/memcontrol-v1.c         |  653 +++++++++++++++++++++++++++++++++
 mm/memcontrol-v1.h         |   51 ++
 mm/memcontrol.c            |  687 -----------------------------------
 4 files changed, 709 insertions(+), 694 deletions(-)
include/linux/memcontrol.h renamed from include/linux/memcontrol.h~mm-memcg-move-legacy-memcg-event-code-into-memcontrol-v1c +0 -12
@@ -69,18 +69,6 @@ struct mem_cgroup_id {
 	refcount_t ref;
 };
 
-/*
- * Per memcg event counter is incremented at every pagein/pageout. With THP,
- * it will be incremented by the number of pages. This counter is used
- * to trigger some periodic events. This is straightforward and better
- * than using jiffies etc. to handle periodic memcg event.
- */
-enum mem_cgroup_events_target {
-	MEM_CGROUP_TARGET_THRESH,
-	MEM_CGROUP_TARGET_SOFTLIMIT,
-	MEM_CGROUP_NTARGETS,
-};
-
 struct memcg_vmstats_percpu;
 struct memcg_vmstats;
 struct lruvec_stats_percpu;
mm/memcontrol.c renamed from mm/memcontrol.c~mm-memcg-move-legacy-memcg-event-code-into-memcontrol-v1c +5 -682

755 lines not on this page · raw message

mm/memcontrol-v1.c renamed from mm/memcontrol-v1.c~mm-memcg-move-legacy-memcg-event-code-into-memcontrol-v1c +653 -0

671 lines not on this page · raw message

mm/memcontrol-v1.h renamed from mm/memcontrol-v1.h~mm-memcg-move-legacy-memcg-event-code-into-memcontrol-v1c +51 -0

55 lines not on this page · raw message

_

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

mm-memcg-drop-obsolete-cache-line-padding-in-struct-mem_cgroup.patch mm-memcg-add-cache-line-padding-to-mem_cgroup_per_node.patch