[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 03/11] rcu: allow nesting of rcu_read_lock/rcu_read_u
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 03/11] rcu: allow nesting of rcu_read_lock/rcu_read_unlock |
Date: |
Fri, 30 Jan 2015 16:19:49 +0100 |
Reviewed-by: Fam Zheng <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
include/qemu/rcu.h | 15 ++++++++++++++-
tests/rcutorture.c | 2 ++
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/include/qemu/rcu.h b/include/qemu/rcu.h
index cfef36e..da043f2 100644
--- a/include/qemu/rcu.h
+++ b/include/qemu/rcu.h
@@ -68,6 +68,9 @@ struct rcu_reader_data {
unsigned long ctr;
bool waiting;
+ /* Data used by reader only */
+ unsigned depth;
+
/* Data used for registry, protected by rcu_gp_lock */
QLIST_ENTRY(rcu_reader_data) node;
};
@@ -77,8 +80,13 @@ extern __thread struct rcu_reader_data rcu_reader;
static inline void rcu_read_lock(void)
{
struct rcu_reader_data *p_rcu_reader = &rcu_reader;
+ unsigned ctr;
+
+ if (p_rcu_reader->depth++ > 0) {
+ return;
+ }
- unsigned ctr = atomic_read(&rcu_gp_ctr);
+ ctr = atomic_read(&rcu_gp_ctr);
atomic_xchg(&p_rcu_reader->ctr, ctr);
if (atomic_read(&p_rcu_reader->waiting)) {
atomic_set(&p_rcu_reader->waiting, false);
@@ -90,6 +98,11 @@ static inline void rcu_read_unlock(void)
{
struct rcu_reader_data *p_rcu_reader = &rcu_reader;
+ assert(p_rcu_reader->depth != 0);
+ if (--p_rcu_reader->depth > 0) {
+ return;
+ }
+
atomic_xchg(&p_rcu_reader->ctr, 0);
if (atomic_read(&p_rcu_reader->waiting)) {
atomic_set(&p_rcu_reader->waiting, false);
diff --git a/tests/rcutorture.c b/tests/rcutorture.c
index e370843..93ec1b3 100644
--- a/tests/rcutorture.c
+++ b/tests/rcutorture.c
@@ -255,9 +255,11 @@ static void *rcu_read_stress_test(void *arg)
if (p->mbtest == 0) {
n_mberror++;
}
+ rcu_read_lock();
for (i = 0; i < 100; i++) {
garbage++;
}
+ rcu_read_unlock();
pc = p->pipe_count;
rcu_read_unlock();
if ((pc > RCU_STRESS_PIPE_LEN) || (pc < 0)) {
--
1.8.3.1
- [Qemu-devel] [PULL 09/11] cpu-exec: simplify init_delay_params, (continued)
- [Qemu-devel] [PULL 09/11] cpu-exec: simplify init_delay_params, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 07/11] memory: avoid ref/unref in memory_region_find, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 11/11] configure: Default to enable module build, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 10/11] scsi: Fix scsi_req_cancel_async for no aiocb req, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 00/11] RCU, scsi, modules, icount changes for 2015-01-30, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 02/11] rcu: add rcutorture, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 01/11] rcu: add rcu library, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 04/11] rcu: add call_rcu, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 06/11] memory: protect current_map by RCU, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 07/11] memory: avoid ref/unref in memory_region_find, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 03/11] rcu: allow nesting of rcu_read_lock/rcu_read_unlock,
Paolo Bonzini <=
- [Qemu-devel] [PULL 08/11] cpu-exec: simplify align_clocks, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 05/11] memory: remove assertion on memory_region_destroy, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 10/11] scsi: Fix scsi_req_cancel_async for no aiocb req, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 09/11] cpu-exec: simplify init_delay_params, Paolo Bonzini, 2015/01/30
- [Qemu-devel] [PULL 11/11] configure: Default to enable module build, Paolo Bonzini, 2015/01/30