* [PATCH v2 0/3] Early boot self tests for RCU
@ 2014-09-19 15:32 Pranith Kumar
2014-09-19 15:32 ` [PATCH v2 1/1] rcu: Add early boot self tests Pranith Kumar
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Pranith Kumar @ 2014-09-19 15:32 UTC (permalink / raw)
To: Paul E. McKenney, Josh Triplett, Steven Rostedt,
Mathieu Desnoyers, Lai Jiangshan, open list
Hi Paul,
Please find v2 of the RCU early boot tests. For now
all we do in these tests are enqueue test callbacks and check if they are being
invoked or not.
I was able to reproduce the hang which Amit reported after reverting the fix. So
this should catch such errors if they occur in the future.
I enabled the selftests in a few rcutorture configurations.
Thanks!
--
Pranith
v2: removed srcu tests and updated according to feedback
Pranith Kumar (3):
rcu: Add early boot self tests
doc: Document RCU self test boot params
rcutorture: Enable RCU self test in configs
Documentation/kernel-parameters.txt | 9 +++
kernel/rcu/rcu.h | 2 +
kernel/rcu/tiny.c | 4 +-
kernel/rcu/tree.c | 2 +
kernel/rcu/update.c | 82 ++++++++++++++++++++++
.../selftests/rcutorture/configs/rcu/TINY02 | 2 +
.../selftests/rcutorture/configs/rcu/TINY02.boot | 2 +
.../selftests/rcutorture/configs/rcu/TREE05.boot | 1 +
.../selftests/rcutorture/configs/rcu/TREE06.boot | 3 +
.../selftests/rcutorture/configs/rcu/TREE08 | 2 +
.../selftests/rcutorture/configs/rcu/TREE08.boot | 2 +
11 files changed, 110 insertions(+), 1 deletion(-)
create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TINY02.boot
create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE06.boot
--
2.1.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 1/1] rcu: Add early boot self tests
2014-09-19 15:32 [PATCH v2 0/3] Early boot self tests for RCU Pranith Kumar
@ 2014-09-19 15:32 ` Pranith Kumar
2014-09-19 15:32 ` [PATCH v2 2/3] doc: Document RCU self test boot params Pranith Kumar
2014-09-19 15:32 ` [PATCH v2 3/3] rcutorture: Enable RCU self test in configs Pranith Kumar
2 siblings, 0 replies; 6+ messages in thread
From: Pranith Kumar @ 2014-09-19 15:32 UTC (permalink / raw)
To: Paul E. McKenney, Josh Triplett, Steven Rostedt,
Mathieu Desnoyers, Lai Jiangshan, open list:READ-COPY UPDATE...
Add early boot self tests for RCU under CONFIG_PROVE_RCU.
Currently the only test is adding a dummy callback which increments a counter
which we then later verify after calling rcu_barrier*().
Signed-off-by: Pranith Kumar <bobby.prani@gmail.com>
---
kernel/rcu/rcu.h | 2 ++
kernel/rcu/tiny.c | 4 ++-
kernel/rcu/tree.c | 2 ++
kernel/rcu/update.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 91 insertions(+), 1 deletion(-)
diff --git a/kernel/rcu/rcu.h b/kernel/rcu/rcu.h
index ff1a6de..07bb02e 100644
--- a/kernel/rcu/rcu.h
+++ b/kernel/rcu/rcu.h
@@ -135,4 +135,6 @@ int rcu_jiffies_till_stall_check(void);
*/
#define TPS(x) tracepoint_string(x)
+void rcu_early_boot_tests(void);
+
#endif /* __LINUX_RCU_H */
diff --git a/kernel/rcu/tiny.c b/kernel/rcu/tiny.c
index c0623fc..d3d44c5 100644
--- a/kernel/rcu/tiny.c
+++ b/kernel/rcu/tiny.c
@@ -380,7 +380,9 @@ void call_rcu_bh(struct rcu_head *head, void (*func)(struct rcu_head *rcu))
}
EXPORT_SYMBOL_GPL(call_rcu_bh);
-void rcu_init(void)
+void __init rcu_init(void)
{
open_softirq(RCU_SOFTIRQ, rcu_process_callbacks);
+
+ rcu_early_boot_tests();
}
diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
index bc085e5..3db8f15 100644
--- a/kernel/rcu/tree.c
+++ b/kernel/rcu/tree.c
@@ -3774,6 +3774,8 @@ void __init rcu_init(void)
pm_notifier(rcu_pm_notify, 0);
for_each_online_cpu(cpu)
rcu_cpu_notify(NULL, CPU_UP_PREPARE, (void *)(long)cpu);
+
+ rcu_early_boot_tests();
}
#include "tree_plugin.h"
diff --git a/kernel/rcu/update.c b/kernel/rcu/update.c
index 3ef8ba5..99d47e6 100644
--- a/kernel/rcu/update.c
+++ b/kernel/rcu/update.c
@@ -690,3 +690,87 @@ static void rcu_spawn_tasks_kthread(void)
}
#endif /* #ifdef CONFIG_TASKS_RCU */
+
+#ifdef CONFIG_PROVE_RCU
+
+/*
+ * Early boot self test parameters, one for each flavor
+ */
+static bool rcu_self_test;
+static bool rcu_self_test_bh;
+static bool rcu_self_test_sched;
+
+module_param(rcu_self_test, bool, 0444);
+module_param(rcu_self_test_bh, bool, 0444);
+module_param(rcu_self_test_sched, bool, 0444);
+
+static int rcu_self_test_counter;
+
+static void test_callback(struct rcu_head *r)
+{
+ rcu_self_test_counter++;
+ pr_info("RCU test callback executed %d\n", rcu_self_test_counter);
+}
+
+static void early_boot_test_call_rcu(void)
+{
+ static struct rcu_head head;
+
+ call_rcu(&head, test_callback);
+}
+
+static void early_boot_test_call_rcu_bh(void)
+{
+ static struct rcu_head head;
+
+ call_rcu_bh(&head, test_callback);
+}
+
+static void early_boot_test_call_rcu_sched(void)
+{
+ static struct rcu_head head;
+
+ call_rcu_sched(&head, test_callback);
+}
+
+void rcu_early_boot_tests(void)
+{
+ pr_info("Running RCU self tests\n");
+
+ if (rcu_self_test)
+ early_boot_test_call_rcu();
+ if (rcu_self_test_bh)
+ early_boot_test_call_rcu_bh();
+ if (rcu_self_test_sched)
+ early_boot_test_call_rcu_sched();
+}
+
+static int rcu_verify_early_boot_tests(void)
+{
+ int ret = 0;
+ int early_boot_test_counter = 0;
+
+ if (rcu_self_test) {
+ early_boot_test_counter++;
+ rcu_barrier();
+ }
+ if (rcu_self_test_bh) {
+ early_boot_test_counter++;
+ rcu_barrier_bh();
+ }
+ if (rcu_self_test_sched) {
+ early_boot_test_counter++;
+ rcu_barrier_sched();
+ }
+
+ if (rcu_self_test_counter != early_boot_test_counter) {
+ WARN_ON(1);
+ ret = -1;
+ }
+
+ return ret;
+}
+late_initcall(rcu_verify_early_boot_tests);
+#else
+void rcu_early_boot_tests(void) {}
+#endif /* CONFIG_PROVE_RCU */
--
2.1.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 2/3] doc: Document RCU self test boot params
2014-09-19 15:32 [PATCH v2 0/3] Early boot self tests for RCU Pranith Kumar
2014-09-19 15:32 ` [PATCH v2 1/1] rcu: Add early boot self tests Pranith Kumar
@ 2014-09-19 15:32 ` Pranith Kumar
2014-10-02 19:52 ` Paul E. McKenney
2014-09-19 15:32 ` [PATCH v2 3/3] rcutorture: Enable RCU self test in configs Pranith Kumar
2 siblings, 1 reply; 6+ messages in thread
From: Pranith Kumar @ 2014-09-19 15:32 UTC (permalink / raw)
To: Randy Dunlap, open list:DOCUMENTATION, open list
Document the RCU self test boot parameters in kernel-parameters.txt.
Signed-off-by: Pranith Kumar <bobby.prani@gmail.com>
---
Documentation/kernel-parameters.txt | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index c403957..04df74e 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -3054,6 +3054,15 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
messages. Disable with a value less than or equal
to zero.
+ rcupdate.rcu_self_test= [KNL]
+ Run the RCU early boot self tests
+
+ rcupdate.rcu_self_test_bh= [KNL]
+ Run the RCU bh early boot self tests
+
+ rcupdate.rcu_self_test_sched= [KNL]
+ Run the RCU sched early boot self tests
+
rdinit= [KNL]
Format: <full_path>
Run specified binary instead of /init from the ramdisk,
--
2.1.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 3/3] rcutorture: Enable RCU self test in configs
2014-09-19 15:32 [PATCH v2 0/3] Early boot self tests for RCU Pranith Kumar
2014-09-19 15:32 ` [PATCH v2 1/1] rcu: Add early boot self tests Pranith Kumar
2014-09-19 15:32 ` [PATCH v2 2/3] doc: Document RCU self test boot params Pranith Kumar
@ 2014-09-19 15:32 ` Pranith Kumar
2 siblings, 0 replies; 6+ messages in thread
From: Pranith Kumar @ 2014-09-19 15:32 UTC (permalink / raw)
To: Paul E. McKenney, Josh Triplett, Steven Rostedt,
Mathieu Desnoyers, Lai Jiangshan, open list
Add config and boot parameters to enable the self tests in rcutorture testing.
Signed-off-by: Pranith Kumar <bobby.prani@gmail.com>
---
tools/testing/selftests/rcutorture/configs/rcu/TINY02 | 2 ++
tools/testing/selftests/rcutorture/configs/rcu/TINY02.boot | 2 ++
tools/testing/selftests/rcutorture/configs/rcu/TREE05.boot | 1 +
tools/testing/selftests/rcutorture/configs/rcu/TREE06.boot | 3 +++
tools/testing/selftests/rcutorture/configs/rcu/TREE08 | 2 ++
tools/testing/selftests/rcutorture/configs/rcu/TREE08.boot | 2 ++
6 files changed, 12 insertions(+)
create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TINY02.boot
create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/TREE06.boot
diff --git a/tools/testing/selftests/rcutorture/configs/rcu/TINY02 b/tools/testing/selftests/rcutorture/configs/rcu/TINY02
index f4feaee..36e41df 100644
--- a/tools/testing/selftests/rcutorture/configs/rcu/TINY02
+++ b/tools/testing/selftests/rcutorture/configs/rcu/TINY02
@@ -7,6 +7,8 @@ CONFIG_HZ_PERIODIC=y
CONFIG_NO_HZ_IDLE=n
CONFIG_NO_HZ_FULL=n
CONFIG_RCU_TRACE=y
+CONFIG_PROVE_LOCKING=y
+CONFIG_PROVE_RCU=y
CONFIG_DEBUG_LOCK_ALLOC=y
CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
CONFIG_PREEMPT_COUNT=y
diff --git a/tools/testing/selftests/rcutorture/configs/rcu/TINY02.boot b/tools/testing/selftests/rcutorture/configs/rcu/TINY02.boot
new file mode 100644
index 0000000..0f08027
--- /dev/null
+++ b/tools/testing/selftests/rcutorture/configs/rcu/TINY02.boot
@@ -0,0 +1,2 @@
+rcupdate.rcu_self_test=1
+rcupdate.rcu_self_test_bh=1
diff --git a/tools/testing/selftests/rcutorture/configs/rcu/TREE05.boot b/tools/testing/selftests/rcutorture/configs/rcu/TREE05.boot
index 3b42b8b..15b3e1a 100644
--- a/tools/testing/selftests/rcutorture/configs/rcu/TREE05.boot
+++ b/tools/testing/selftests/rcutorture/configs/rcu/TREE05.boot
@@ -1 +1,2 @@
rcutorture.torture_type=sched
+rcupdate.rcu_self_test_sched=1
diff --git a/tools/testing/selftests/rcutorture/configs/rcu/TREE06.boot b/tools/testing/selftests/rcutorture/configs/rcu/TREE06.boot
new file mode 100644
index 0000000..da9a03a
--- /dev/null
+++ b/tools/testing/selftests/rcutorture/configs/rcu/TREE06.boot
@@ -0,0 +1,3 @@
+rcupdate.rcu_self_test=1
+rcupdate.rcu_self_test_bh=1
+rcupdate.rcu_self_test_sched=1
diff --git a/tools/testing/selftests/rcutorture/configs/rcu/TREE08 b/tools/testing/selftests/rcutorture/configs/rcu/TREE08
index 316aa6c..1a9303d 100644
--- a/tools/testing/selftests/rcutorture/configs/rcu/TREE08
+++ b/tools/testing/selftests/rcutorture/configs/rcu/TREE08
@@ -18,6 +18,8 @@ CONFIG_RCU_FANOUT_LEAF=2
CONFIG_RCU_NOCB_CPU=y
CONFIG_RCU_NOCB_CPU_ALL=y
CONFIG_DEBUG_LOCK_ALLOC=n
+CONFIG_PROVE_LOCKING=y
+CONFIG_PROVE_RCU=y
CONFIG_RCU_CPU_STALL_INFO=n
CONFIG_RCU_BOOST=n
CONFIG_DEBUG_OBJECTS_RCU_HEAD=n
diff --git a/tools/testing/selftests/rcutorture/configs/rcu/TREE08.boot b/tools/testing/selftests/rcutorture/configs/rcu/TREE08.boot
index 3b42b8b..2561daf 100644
--- a/tools/testing/selftests/rcutorture/configs/rcu/TREE08.boot
+++ b/tools/testing/selftests/rcutorture/configs/rcu/TREE08.boot
@@ -1 +1,3 @@
rcutorture.torture_type=sched
+rcupdate.rcu_self_test=1
+rcupdate.rcu_self_test_sched=1
--
2.1.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2 2/3] doc: Document RCU self test boot params
2014-09-19 15:32 ` [PATCH v2 2/3] doc: Document RCU self test boot params Pranith Kumar
@ 2014-10-02 19:52 ` Paul E. McKenney
2014-10-03 16:08 ` Pranith Kumar
0 siblings, 1 reply; 6+ messages in thread
From: Paul E. McKenney @ 2014-10-02 19:52 UTC (permalink / raw)
To: Pranith Kumar; +Cc: Randy Dunlap, open list:DOCUMENTATION, open list
On Fri, Sep 19, 2014 at 11:32:30AM -0400, Pranith Kumar wrote:
> Document the RCU self test boot parameters in kernel-parameters.txt.
>
> Signed-off-by: Pranith Kumar <bobby.prani@gmail.com>
I have this one queued, please let me know if this is an update.
Thanx, Paul
> ---
> Documentation/kernel-parameters.txt | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
> diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
> index c403957..04df74e 100644
> --- a/Documentation/kernel-parameters.txt
> +++ b/Documentation/kernel-parameters.txt
> @@ -3054,6 +3054,15 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
> messages. Disable with a value less than or equal
> to zero.
>
> + rcupdate.rcu_self_test= [KNL]
> + Run the RCU early boot self tests
> +
> + rcupdate.rcu_self_test_bh= [KNL]
> + Run the RCU bh early boot self tests
> +
> + rcupdate.rcu_self_test_sched= [KNL]
> + Run the RCU sched early boot self tests
> +
> rdinit= [KNL]
> Format: <full_path>
> Run specified binary instead of /init from the ramdisk,
> --
> 2.1.0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 2/3] doc: Document RCU self test boot params
2014-10-02 19:52 ` Paul E. McKenney
@ 2014-10-03 16:08 ` Pranith Kumar
0 siblings, 0 replies; 6+ messages in thread
From: Pranith Kumar @ 2014-10-03 16:08 UTC (permalink / raw)
To: Paul McKenney; +Cc: Randy Dunlap, open list:DOCUMENTATION, open list
On Thu, Oct 2, 2014 at 3:52 PM, Paul E. McKenney
<paulmck@linux.vnet.ibm.com> wrote:
> On Fri, Sep 19, 2014 at 11:32:30AM -0400, Pranith Kumar wrote:
>> Document the RCU self test boot parameters in kernel-parameters.txt.
>>
>> Signed-off-by: Pranith Kumar <bobby.prani@gmail.com>
>
> I have this one queued, please let me know if this is an update.
>
Hi Paul, this is the same one you have queued. Thanks!
--
Pranith
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-10-03 16:08 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-09-19 15:32 [PATCH v2 0/3] Early boot self tests for RCU Pranith Kumar
2014-09-19 15:32 ` [PATCH v2 1/1] rcu: Add early boot self tests Pranith Kumar
2014-09-19 15:32 ` [PATCH v2 2/3] doc: Document RCU self test boot params Pranith Kumar
2014-10-02 19:52 ` Paul E. McKenney
2014-10-03 16:08 ` Pranith Kumar
2014-09-19 15:32 ` [PATCH v2 3/3] rcutorture: Enable RCU self test in configs Pranith Kumar
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).