From: "Paul E. McKenney" <paulmck@linux.ibm.com>
To: linux-kernel@vger.kernel.org
Cc: mingo@kernel.org, jiangshanlai@gmail.com, dipankar@in.ibm.com,
akpm@linux-foundation.org, mathieu.desnoyers@efficios.com,
josh@joshtriplett.org, tglx@linutronix.de, peterz@infradead.org,
rostedt@goodmis.org, dhowells@redhat.com, edumazet@google.com,
fweisbec@gmail.com, oleg@redhat.com, joel@joelfernandes.org,
"Paul E. McKenney" <paulmck@linux.ibm.com>
Subject: [PATCH tip/core/rcu 04/10] rcuperf: Stop abusing IS_ENABLED()
Date: Wed, 9 Jan 2019 13:50:02 -0800 [thread overview]
Message-ID: <20190109215008.6401-4-paulmck@linux.ibm.com> (raw)
In-Reply-To: <20190109214944.GA5610@linux.ibm.com>
The ever-evolving IS_ENABLED() macro is intended for CONFIG_* Kconfig
options, but rcuperf currently uses it for the decidedly non-CONFIG_*
MODULE macro. In the spirit of not inviting trouble, this commit
substitutes tried-and-true #ifdef.
Reported-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Paul E. McKenney <paulmck@linux.ibm.com>
Acked-by: Ingo Molnar <mingo@kernel.org>
---
kernel/rcu/rcuperf.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/kernel/rcu/rcuperf.c b/kernel/rcu/rcuperf.c
index b459da70b4fc..8d342d57cdaf 100644
--- a/kernel/rcu/rcuperf.c
+++ b/kernel/rcu/rcuperf.c
@@ -83,13 +83,19 @@ MODULE_AUTHOR("Paul E. McKenney <paulmck@linux.vnet.ibm.com>");
* Various other use cases may of course be specified.
*/
+#ifdef MODULE
+# define RCUPERF_SHUTDOWN 0
+#else
+# define RCUPERF_SHUTDOWN 1
+#endif
+
torture_param(bool, gp_async, false, "Use asynchronous GP wait primitives");
torture_param(int, gp_async_max, 1000, "Max # outstanding waits per reader");
torture_param(bool, gp_exp, false, "Use expedited GP wait primitives");
torture_param(int, holdoff, 10, "Holdoff time before test start (s)");
torture_param(int, nreaders, -1, "Number of RCU reader threads");
torture_param(int, nwriters, -1, "Number of RCU updater threads");
-torture_param(bool, shutdown, !IS_ENABLED(MODULE),
+torture_param(bool, shutdown, RCUPERF_SHUTDOWN,
"Shutdown at end of performance tests.");
torture_param(int, verbose, 1, "Enable verbose debugging printk()s");
torture_param(int, writer_holdoff, 0, "Holdoff (us) between GPs, zero to disable");
--
2.17.1
next prev parent reply other threads:[~2019-01-09 21:50 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-09 21:49 [PATCH tip/core/rcu 0/10] Torture-test updates for v5.1 Paul E. McKenney
2019-01-09 21:49 ` [PATCH tip/core/rcu 01/10] rcutorture: Record grace periods in forward-progress histogram Paul E. McKenney
2019-01-09 21:50 ` [PATCH tip/core/rcu 02/10] torture: Explain and simplify odd "for" loop in mkinitrd.sh Paul E. McKenney
2019-01-09 21:50 ` [PATCH tip/core/rcu 03/10] rcutorture: Add grace period after CPU offline Paul E. McKenney
2019-01-09 21:50 ` Paul E. McKenney [this message]
2019-01-09 21:50 ` [PATCH tip/core/rcu 05/10] rcutorture/nolibc: Fix the clobbered registers in the MIPS syscall definition Paul E. McKenney
2019-01-09 21:50 ` [PATCH tip/core/rcu 06/10] rcutorture/nolibc: Fix some poor indentation and alignment Paul E. McKenney
2019-01-09 21:50 ` [PATCH tip/core/rcu 07/10] rcutorture/nolibc: Add a bit of documentation to explain how to use nolibc Paul E. McKenney
2019-01-09 21:50 ` [PATCH tip/core/rcu 08/10] tools headers: Move the nolibc header from rcutorture to tools/include/nolibc/ Paul E. McKenney
2019-01-09 21:50 ` [PATCH tip/core/rcu 09/10] MAINTAINERS: Add myself as the maintainer for the nolibc header file(s) Paul E. McKenney
2019-01-09 21:50 ` [PATCH tip/core/rcu 10/10] RCU/torture.txt: Remove section MODULE PARAMETERS Paul E. McKenney
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=20190109215008.6401-4-paulmck@linux.ibm.com \
--to=paulmck@linux.ibm.com \
--cc=akpm@linux-foundation.org \
--cc=dhowells@redhat.com \
--cc=dipankar@in.ibm.com \
--cc=edumazet@google.com \
--cc=fweisbec@gmail.com \
--cc=jiangshanlai@gmail.com \
--cc=joel@joelfernandes.org \
--cc=josh@joshtriplett.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mathieu.desnoyers@efficios.com \
--cc=mingo@kernel.org \
--cc=oleg@redhat.com \
--cc=peterz@infradead.org \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
/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