From: Greg Kroah-Hartman gregkh@linuxfoundation.org
This reverts commit 503e554782c916aec553f790298564a530cf1778 which is commit 0af462f19e635ad522f28981238334620881badc upstream.
Guenter reports problems with it, and it's not quite obvious why, so revert it for now.
Reported-by: Guenter Roeck linux@roeck-us.net Link: https://lore.kernel.org/r/d35b1ff1-e198-481c-b1be-9e22445efe06@roeck-us.net Cc: Ido Schimmel idosch@nvidia.com Cc: Thomas Gleixner tglx@linutronix.de Cc: Linus Torvalds torvalds@linux-foundation.org Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org --- lib/debugobjects.c | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-)
--- a/lib/debugobjects.c +++ b/lib/debugobjects.c @@ -590,16 +590,6 @@ static struct debug_obj *lookup_object_o return NULL; }
-static void debug_objects_fill_pool(void) -{ - /* - * On RT enabled kernels the pool refill must happen in preemptible - * context: - */ - if (!IS_ENABLED(CONFIG_PREEMPT_RT) || preemptible()) - fill_pool(); -} - static void __debug_object_init(void *addr, const struct debug_obj_descr *descr, int onstack) { @@ -608,7 +598,12 @@ __debug_object_init(void *addr, const st struct debug_obj *obj; unsigned long flags;
- debug_objects_fill_pool(); + /* + * On RT enabled kernels the pool refill must happen in preemptible + * context: + */ + if (!IS_ENABLED(CONFIG_PREEMPT_RT) || preemptible()) + fill_pool();
db = get_bucket((unsigned long) addr);
@@ -693,8 +688,6 @@ int debug_object_activate(void *addr, co if (!debug_objects_enabled) return 0;
- debug_objects_fill_pool(); - db = get_bucket((unsigned long) addr);
raw_spin_lock_irqsave(&db->lock, flags); @@ -904,8 +897,6 @@ void debug_object_assert_init(void *addr if (!debug_objects_enabled) return;
- debug_objects_fill_pool(); - db = get_bucket((unsigned long) addr);
raw_spin_lock_irqsave(&db->lock, flags);