From: Li Zhong <zhong@linux.vnet.ibm.com>
To: Tejun Heo <tj@kernel.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
gregkh@linuxfoundation.org, rafael.j.wysocki@intel.com,
toshi.kani@hp.com
Subject: [RFC PATCH v4] Use kernfs_break_active_protection() for device online store callbacks
Date: Thu, 17 Apr 2014 14:50:44 +0800 [thread overview]
Message-ID: <1397717444.4034.15.camel@ThinkPad-T5421> (raw)
In-Reply-To: <20140416151749.GE1257@htj.dyndns.org>
This patch tries to solve the device hot remove locking issues in a
different way from commit 5e33bc41, as kernfs already has a mechanism
to break active protection.
The problem here is the order of s_active, and series of hotplug related
lock.
This patch takes s_active out of the lock dependency graph, so it won't
dead lock with any hotplug realted locks.
Signed-off-by: Li Zhong <zhong@linux.vnet.ibm.com>
---
drivers/base/core.c | 37 ++++++++++++++++++++++++++++++++++---
drivers/base/memory.c | 18 +++++++++++++++---
2 files changed, 49 insertions(+), 6 deletions(-)
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 0dd6528..1b96cb9 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -439,17 +439,48 @@ static ssize_t online_store(struct device *dev, struct device_attribute *attr,
{
bool val;
int ret;
+ struct kernfs_node *kn;
ret = strtobool(buf, &val);
if (ret < 0)
return ret;
- ret = lock_device_hotplug_sysfs();
- if (ret)
- return ret;
+ kn = kernfs_find_and_get(dev->kobj.sd, attr->attr.name);
+ if (WARN_ON_ONCE(!kn))
+ return -ENODEV;
+
+ /*
+ * Break active protection here to avoid deadlocks with device
+ * removing process, which tries to remove sysfs entries including this
+ * "online" attribute while holding some hotplug related locks.
+ *
+ * @dev needs to be protected here, or it could go away any time after
+ * dropping active protection. But it is still unreasonable/unsafe to
+ * online/offline a device after it being removed. Fortunately, there
+ * are some checks in online/offline knobs. Like cpu, it checks cpu
+ * present/online mask before doing the real work.
+ */
+
+ get_device(dev);
+ kernfs_break_active_protection(kn);
+
+ lock_device_hotplug();
+
+ /*
+ * If we assume device_hotplug_lock must be acquired before removing
+ * device, we may try to find a way to check whether the device has
+ * been removed here, so we don't call device_{on|off}line against
+ * removed device.
+ */
ret = val ? device_online(dev) : device_offline(dev);
unlock_device_hotplug();
+
+ kernfs_unbreak_active_protection(kn);
+ put_device(dev);
+
+ kernfs_put(kn);
+
return ret < 0 ? ret : count;
}
static DEVICE_ATTR_RW(online);
diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index bece691..0d2f3a5 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -320,10 +320,17 @@ store_mem_state(struct device *dev,
{
struct memory_block *mem = to_memory_block(dev);
int ret, online_type;
+ struct kernfs_node *kn;
- ret = lock_device_hotplug_sysfs();
- if (ret)
- return ret;
+ kn = kernfs_find_and_get(dev->kobj.sd, attr->attr.name);
+ if (WARN_ON_ONCE(!kn))
+ return -ENODEV;
+
+ /* refer to comments in online_store() for more information */
+ get_device(dev);
+ kernfs_break_active_protection(kn);
+
+ lock_device_hotplug();
if (!strncmp(buf, "online_kernel", min_t(int, count, 13)))
online_type = ONLINE_KERNEL;
@@ -362,6 +369,11 @@ store_mem_state(struct device *dev,
err:
unlock_device_hotplug();
+ kernfs_unbreak_active_protection(kn);
+ put_device(dev);
+
+ kernfs_put(kn);
+
if (ret)
return ret;
return count;
next prev parent reply other threads:[~2014-04-17 6:50 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-10 9:18 [RFC PATCH] Suppress a device hot remove related lockdep warning Li Zhong
2014-04-10 13:31 ` Tejun Heo
2014-04-11 4:10 ` [RFC PATCH v2] Use kernfs_break_active_protection() for device online store callbacks Li Zhong
2014-04-11 10:26 ` Tejun Heo
2014-04-14 7:47 ` [RFC PATCH v3] " Li Zhong
2014-04-14 20:13 ` Tejun Heo
2014-04-15 2:44 ` Li Zhong
2014-04-15 14:50 ` Tejun Heo
2014-04-16 1:41 ` Li Zhong
2014-04-16 15:17 ` Tejun Heo
2014-04-17 3:05 ` Li Zhong
2014-04-17 15:06 ` Tejun Heo
2014-04-17 6:50 ` Li Zhong [this message]
2014-04-17 15:17 ` [RFC PATCH v4] " Tejun Heo
2014-04-18 8:33 ` Li Zhong
2014-04-21 9:20 ` [RFC PATCH v5 1/2] Use lock_device_hotplug() in cpu_probe_store() and cpu_release_store() Li Zhong
2014-04-21 9:23 ` [RFC PATCH v5 2/2] Use kernfs_break_active_protection() for device online store callbacks Li Zhong
2014-04-21 22:46 ` Tejun Heo
2014-04-22 3:34 ` Li Zhong
2014-04-22 10:11 ` Rafael J. Wysocki
2014-04-23 1:50 ` Li Zhong
2014-04-23 10:54 ` Rafael J. Wysocki
2014-04-24 1:13 ` Li Zhong
2014-04-22 20:44 ` Tejun Heo
2014-04-22 22:21 ` Rafael J. Wysocki
2014-04-23 14:23 ` Tejun Heo
2014-04-23 16:12 ` Rafael J. Wysocki
2014-04-23 16:52 ` Tejun Heo
2014-04-24 8:59 ` Li Zhong
2014-04-24 10:02 ` Rafael J. Wysocki
2014-04-25 1:46 ` Li Zhong
2014-04-25 12:47 ` Rafael J. Wysocki
2014-04-28 1:49 ` Li Zhong
2014-04-23 5:03 ` Li Zhong
2014-04-23 10:58 ` Rafael J. Wysocki
2014-04-24 1:33 ` Li Zhong
2014-05-09 8:35 ` Li Zhong
2014-05-09 8:40 ` [RFC PATCH v6 1/2 ] Use lock_device_hotplug() in cpu_probe_store() and cpu_release_store() Li Zhong
2014-05-09 8:40 ` [RFC PATCH v6 2/2] Implement lock_device_hotplug_sysfs() by breaking active protection Li Zhong
2014-04-21 22:38 ` [RFC PATCH v5 1/2] Use lock_device_hotplug() in cpu_probe_store() and cpu_release_store() Tejun Heo
2014-04-22 2:29 ` Li Zhong
2014-04-22 20:40 ` Tejun Heo
2014-04-23 2:00 ` Li Zhong
2014-04-23 14:39 ` Tejun Heo
2014-04-24 8:37 ` Li Zhong
2014-04-24 14:32 ` Tejun Heo
2014-04-25 1:56 ` Li Zhong
2014-04-25 12:28 ` Tejun Heo
2014-04-28 0:51 ` Li Zhong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1397717444.4034.15.camel@ThinkPad-T5421 \
--to=zhong@linux.vnet.ibm.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rafael.j.wysocki@intel.com \
--cc=tj@kernel.org \
--cc=toshi.kani@hp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome