Skip to contentSkip to conversation

mm-kmem-make-mem_cgroup_from_obj-vmalloc-safe.patch removed from -mm tree

merged mm-stable Andrew Morton 1 participant 1 message Jun 17, 2022

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: mm: kmem: make mem_cgroup_from_obj() vmalloc()-safe
has been removed from the -mm tree. Its filename was
mm-kmem-make-mem_cgroup_from_obj-vmalloc-safe.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: kmem: make mem_cgroup_from_obj() vmalloc()-safe
Date: Fri, 10 Jun 2022 11:03:10 -0700

Currently mem_cgroup_from_obj() is not working properly with objects allocated using vmalloc(). It creates problems in some cases, when it's called for static objects belonging to modules or generally allocated using vmalloc().

This patch makes mem_cgroup_from_obj() safe to be called on objects allocated using vmalloc().

It also introduces mem_cgroup_from_slab_obj(), which is a faster version to use in places when we know the object is either a slab object or a generic slab page (e.g. when adding an object to a lru list).

---

 include/linux/memcontrol.h |    6 ++
 mm/list_lru.c              |    2 
 mm/memcontrol.c            |   71 ++++++++++++++++++++++++-----------
 3 files changed, 57 insertions(+), 22 deletions(-)
include/linux/memcontrol.h renamed from include/linux/memcontrol.h~mm-kmem-make-mem_cgroup_from_obj-vmalloc-safe +6 -0
@@ -1740,6 +1740,7 @@ static inline int memcg_kmem_id(struct m
 }
 
 struct mem_cgroup *mem_cgroup_from_obj(void *p);
+struct mem_cgroup *mem_cgroup_from_slab_obj(void *p);
 
 static inline void count_objcg_event(struct obj_cgroup *objcg,
 				     enum vm_event_item idx)
@@ -1801,6 +1802,11 @@ static inline struct mem_cgroup *mem_cgr
        return NULL;
 }
 
+static inline struct mem_cgroup *mem_cgroup_from_slab_obj(void *p)
+{
+	return NULL;
+}
+
 static inline void count_objcg_event(struct obj_cgroup *objcg,
 				     enum vm_event_item idx)
 {
mm/list_lru.c renamed from mm/list_lru.c~mm-kmem-make-mem_cgroup_from_obj-vmalloc-safe +1 -1
@@ -71,7 +71,7 @@ list_lru_from_kmem(struct list_lru *lru,
 	if (!list_lru_memcg_aware(lru))
 		goto out;
 
-	memcg = mem_cgroup_from_obj(ptr);
+	memcg = mem_cgroup_from_slab_obj(ptr);
 	if (!memcg)
 		goto out;
 
mm/memcontrol.c renamed from mm/memcontrol.c~mm-kmem-make-mem_cgroup_from_obj-vmalloc-safe +50 -21

90 lines not on this page · raw message

_

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

mm-memcontrol-introduce-mem_cgroup_ino-and-mem_cgroup_get_from_ino.patch mm-shrinkers-introduce-debugfs-interface-for-memory-shrinkers.patch mm-shrinkers-provide-shrinkers-with-names.patch mm-docs-document-shrinker-debugfs.patch tools-add-memcg_shrinkerpy.patch mm-shrinkers-add-scan-interface-for-shrinker-debugfs.patch mm-shrinkers-add-scan-interface-for-shrinker-debugfs-fix.patch