Commit b5e87d65 authored Aug 13, 2019 by Stephen Boyd Committed by Tri Vo Oct 11, 2019

UPSTREAM: PM / wakeup: Fix sysfs registration error path



We shouldn't call wakeup_source_destroy() from the error path in
wakeup_source_register() because that calls __pm_relax() which takes a
lock that isn't initialized until wakeup_source_add() is called. Add a
new function, wakeup_source_free(), that just does the bare minimum to
free a wakeup source that was created but hasn't been added yet and use
it from the two places it's needed. This fixes the following problem
seen on various x86 server boxes:

 INFO: trying to register non-static key.
 the code is fine but needs lockdep annotation.
 turning off the locking correctness validator.
 CPU: 12 PID: 1 Comm: swapper/0 Not tainted 5.3.0-rc4-
 Hardware name: HP ProLiant XL420 Gen9/ProLiant XL420 Gen9, BIOS U19 12/27/2015
 Call Trace:
  dump_stack+0x62/0x9a
  register_lock_class+0x95a/0x960
  ? __platform_driver_probe+0xcd/0x230
  ? __platform_create_bundle+0xc0/0xe0
  ? i8042_init+0x4ec/0x578
  ? do_one_initcall+0xfe/0x45a
  ? kernel_init_freeable+0x614/0x6a7
  ? kernel_init+0x11/0x138
  ? ret_from_fork+0x35/0x40
  ? is_dynamic_key+0xf0/0xf0
  ? rwlock_bug.part.0+0x60/0x60
  ? __debug_check_no_obj_freed+0x8e/0x250
  __lock_acquire.isra.13+0x5f/0x830
  ? __debug_check_no_obj_freed+0x152/0x250
  lock_acquire+0x107/0x220
  ? __pm_relax.part.2+0x21/0xa0
  _raw_spin_lock_irqsave+0x35/0x50
  ? __pm_relax.part.2+0x21/0xa0
  __pm_relax.part.2+0x21/0xa0
  wakeup_source_destroy.part.3+0x18/0x190
  wakeup_source_register+0x43/0x50

Fixes: c8377adfa781 ("PM / wakeup: Show wakeup sources stats in sysfs")
Reported-by: Qian Cai <cai@lca.pw>
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry picked from commit ae367b7936408444afc76a8a3e141abede9ccbe4)
Bug: 129087298
Signed-off-by: Tri Vo <trong@google.com>
Change-Id: I9be1908d7738df3f79ffd5715861278e768f0d4f

parent 2c9f5fa9

drivers/base/power/wakeup.c

+9 −4

Original line number	Diff line number	Diff line
		@@ -138,6 +138,13 @@ static void wakeup_source_record(struct wakeup_source *ws)
		spin_unlock_irqrestore(&deleted_ws.lock, flags);
		}

		static void wakeup_source_free(struct wakeup_source *ws)
		{
		ida_free(&wakeup_ida, ws->id);
		kfree_const(ws->name);
		kfree(ws);
		}

		/**
		* wakeup_source_destroy - Destroy a struct wakeup_source object.
		* @ws: Wakeup source to destroy.
		@@ -151,9 +158,7 @@ void wakeup_source_destroy(struct wakeup_source *ws)

		__pm_relax(ws);
		wakeup_source_record(ws);
		ida_free(&wakeup_ida, ws->id);
		kfree_const(ws->name);
		kfree(ws);
		wakeup_source_free(ws);
		}
		EXPORT_SYMBOL_GPL(wakeup_source_destroy);

		@@ -218,7 +223,7 @@ struct wakeup_source wakeup_source_register(struct device dev,
		if (ws) {
		ret = wakeup_source_sysfs_add(dev, ws);
		if (ret) {
		wakeup_source_destroy(ws);
		wakeup_source_free(ws);
		return NULL;
		}
		wakeup_source_add(ws);