linux-kernel - Re: [PATCH tip/core/rcu 19/55] rcutorture: Abstract TOROUT

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Mon, 17 Feb 2014 16:26:06 -0800
From:	Josh Triplett <josh@...htriplett.org>
To:	"Paul E. McKenney" <paulmck@...ux.vnet.ibm.com>
Cc:	linux-kernel@...r.kernel.org, mingo@...nel.org,
	laijs@...fujitsu.com, dipankar@...ibm.com,
	akpm@...ux-foundation.org, mathieu.desnoyers@...icios.com,
	niv@...ibm.com, tglx@...utronix.de, peterz@...radead.org,
	rostedt@...dmis.org, dhowells@...hat.com, edumazet@...gle.com,
	darren@...art.com, fweisbec@...il.com, oleg@...hat.com, sbw@....edu
Subject: Re: [PATCH tip/core/rcu 19/55] rcutorture: Abstract TOROUT_STRING()
 and friends

On Mon, Feb 17, 2014 at 02:12:23PM -0800, Paul E. McKenney wrote:
> From: "Paul E. McKenney" <paulmck@...ux.vnet.ibm.com>
> 
> These diagnostic macros are not confined to torturing RCU, so this commit
> makes them available to other torture tests.
> 
> Signed-off-by: Paul E. McKenney <paulmck@...ux.vnet.ibm.com>

This removes the do {} while (0) around the first of the macros, without
any explanation in the commit message.

Also, to what extent could these be made redundant with pr_fmt?
if(verbose) seems like it really ought to become a priority level or
dynamic debugging (and it's really awful to further propagate macros
that reference an out-of-macro variable).  Ideally all of these could go
away in favor of pr_fmt, and then the individual calls to them would
become pr_alert, pr_debug, pr_error, or similar.

- Josh Triplett

>  include/linux/torture.h | 8 ++++++++
>  kernel/rcu/rcutorture.c | 8 --------
>  2 files changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/include/linux/torture.h b/include/linux/torture.h
> index 368e15bb1a39..8a4088f2f87b 100644
> --- a/include/linux/torture.h
> +++ b/include/linux/torture.h
> @@ -41,6 +41,14 @@
>  	module_param(name, type, 0444); \
>  	MODULE_PARM_DESC(name, msg);
>  
> +#define TORTURE_FLAG "-torture:"
> +#define TOROUT_STRING(s) \
> +	pr_alert("%s" TORTURE_FLAG s "\n", torture_type)
> +#define VERBOSE_TOROUT_STRING(s) \
> +	do { if (verbose) pr_alert("%s" TORTURE_FLAG s "\n", torture_type); } while (0)
> +#define VERBOSE_TOROUT_ERRSTRING(s) \
> +	do { if (verbose) pr_alert("%s" TORTURE_FLAG "!!! " s "\n", torture_type); } while (0)
> +
>  /* Low-rider random number generator. */
>  struct torture_random_state {
>  	unsigned long trs_state;
> diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
> index 04813bdf5e53..2bb3dcb67221 100644
> --- a/kernel/rcu/rcutorture.c
> +++ b/kernel/rcu/rcutorture.c
> @@ -96,14 +96,6 @@ static char *torture_type = "rcu";
>  module_param(torture_type, charp, 0444);
>  MODULE_PARM_DESC(torture_type, "Type of RCU to torture (rcu, rcu_bh, ...)");
>  
> -#define TORTURE_FLAG "-torture:"
> -#define TOROUT_STRING(s) \
> -	do { pr_alert("%s" TORTURE_FLAG s "\n", torture_type); } while (0)
> -#define VERBOSE_TOROUT_STRING(s) \
> -	do { if (verbose) pr_alert("%s" TORTURE_FLAG s "\n", torture_type); } while (0)
> -#define VERBOSE_TOROUT_ERRSTRING(s) \
> -	do { if (verbose) pr_alert("%s" TORTURE_FLAG "!!! " s "\n", torture_type); } while (0)
> -
>  static int nrealreaders;
>  static struct task_struct *writer_task;
>  static struct task_struct **fakewriter_tasks;
> -- 
> 1.8.1.5
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/