Skip to contentSkip to conversation

lib-debugobjects-fix-stat-count-and-optimize-debug_objects_mem_init.patch removed from -mm tree

merged mm-nonmm-stable Andrew Morton 1 participant 1 message Nov 15, 2022

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: lib/debugobjects: fix stat count and optimize debug_objects_mem_init
has been removed from the -mm tree. Its filename was
lib-debugobjects-fix-stat-count-and-optimize-debug_objects_mem_init.patch

This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: wuchi <[email protected]>
Subject: lib/debugobjects: fix stat count and optimize debug_objects_mem_init
Date: Sat, 11 Jun 2022 21:06:34 +0800

1. Var debug_objects_allocated tracks valid kmem_cache_alloc calls, so track it in debug_objects_replace_static_objects. Do similar things in object_cpu_offline.

2. In debug_objects_mem_init, there is no need to call function cpuhp_setup_state_nocalls when debug_objects_enabled = 0 (out of memory).

Fixes 634d61f45d6f ("debugobjects: Percpu pool lookahead freeing/allocation")
Fixes c4b73aabd098 ("debugobjects: Track number of kmem_cache_alloc/kmem_cache_free done")
Cc Thomas Gleixner <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc Kees Cook <[email protected]>

---

 lib/debugobjects.c |   10 ++++++++++
 1 file changed, 10 insertions(+)
lib/debugobjects.c renamed from lib/debugobjects.c~lib-debugobjects-fix-stat-count-and-optimize-debug_objects_mem_init +10 -0
@@ -437,6 +437,7 @@ static int object_cpu_offline(unsigned i
 	struct debug_percpu_free *percpu_pool;
 	struct hlist_node *tmp;
 	struct debug_obj *obj;
+	unsigned long flags;
 
 	/* Remote access is safe as the CPU is dead already */
 	percpu_pool = per_cpu_ptr(&percpu_obj_pool, cpu);
@@ -444,6 +445,12 @@ static int object_cpu_offline(unsigned i
 		hlist_del(&obj->node);
 		kmem_cache_free(obj_cache, obj);
 	}
+
+	raw_spin_lock_irqsave(&pool_lock, flags);
+	obj_pool_used -= percpu_pool->obj_free;
+	debug_objects_freed += percpu_pool->obj_free;
+	raw_spin_unlock_irqrestore(&pool_lock, flags);
+
 	percpu_pool->obj_free = 0;
 
 	return 0;
@@ -1318,6 +1325,8 @@ static int __init debug_objects_replace_
 		hlist_add_head(&obj->node, &objects);
 	}
 
+	debug_objects_allocated += i;
+
 	/*
 	 * debug_objects_mem_init() is now called early that only one CPU is up
 	 * and interrupts have been disabled, so it is safe to replace the
@@ -1386,6 +1395,7 @@ void __init debug_objects_mem_init(void)
 		debug_objects_enabled = 0;
 		kmem_cache_destroy(obj_cache);
 		pr_warn("out of memory.\n");
+		return;
 	} else
 		debug_objects_selftest();
 

_

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