From: Shaohua Li <shli@kernel.org>
To: linux-kernel@vger.kernel.org
Cc: Jens Axboe <axboe@fb.com>, Tejun Heo <tj@kernel.org>,
Kent Overstreet <kmo@daterainc.com>
Subject: [PATCH] percpu-ref: correctly get percpu pointer
Date: Fri, 21 Nov 2014 22:48:57 -0800 [thread overview]
Message-ID: <995deb699f5b873c45d667df4add3b06f73c2c25.1416638887.git.shli@kernel.org> (raw)
I saw randam system hang testing virtio with blk-mq enabled and cpu hotplug
runing in the background. It turns out __ref_is_percpu() doesn't always return
correct percpu pointer. percpu_ref_put() calls __ref_is_percpu(), which checks
__PERCPU_REF_ATOMIC. After this check, the __PERCPU_REF_ATOMIC or
__PERCPU_REF_DEAD might be set, so we must exclude the two bits from the percpu
pointer. Fortunately we can still use percpu data for percpu_ref_put() even
this happens, because the final transistion from percpu to atomic occurs at rcu
context while __ref_is_percpu() is always called with rcu read lock protected.
CC: Jens Axboe <axboe@fb.com>
CC: Tejun Heo <tj@kernel.org>
CC: Kent Overstreet <kmo@daterainc.com>
Signed-off-by: Shaohua Li <shli@fb.com>
---
include/linux/percpu-refcount.h | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/include/linux/percpu-refcount.h b/include/linux/percpu-refcount.h
index d5c89e0..6beee08 100644
--- a/include/linux/percpu-refcount.h
+++ b/include/linux/percpu-refcount.h
@@ -136,7 +136,14 @@ static inline bool __ref_is_percpu(struct percpu_ref *ref,
if (unlikely(percpu_ptr & __PERCPU_REF_ATOMIC))
return false;
- *percpu_countp = (unsigned long __percpu *)percpu_ptr;
+ /*
+ * At this point ATOMIC or DEAD might be set when percpu_ref_kill() is
+ * running. It's still safe to use percpu here, because the final
+ * transition from percpu to atomic occurs at rcu context while this
+ * routine is protected with rcu read lock.
+ */
+ *percpu_countp = (unsigned long __percpu *)(percpu_ptr &
+ ~__PERCPU_REF_ATOMIC_DEAD);
return true;
}
--
1.8.3.2
next reply other threads:[~2014-11-22 6:49 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-11-22 6:48 Shaohua Li [this message]
2014-11-22 14:22 ` [PATCH percpu/for-3.18-fixes] percpu-ref: fix DEAD flag contamination of percpu pointer Tejun Heo
2014-11-22 17:04 ` Shaohua Li
2014-11-22 17:06 ` Tejun Heo
2014-11-23 0:47 ` Shaohua Li
2014-11-23 17:48 ` Tejun Heo
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=995deb699f5b873c45d667df4add3b06f73c2c25.1416638887.git.shli@kernel.org \
--to=shli@kernel.org \
--cc=axboe@fb.com \
--cc=kmo@daterainc.com \
--cc=linux-kernel@vger.kernel.org \
--cc=tj@kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).