Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2884de3 authored by Paul E. McKenney's avatar Paul E. McKenney
Browse files

rcutorture: Abstract TOROUT_STRING() and friends 



These diagnostic macros are not confined to torturing RCU, so this commit
makes them available to other torture tests.  Also removed the do-while
from TOROUT_STRING() in response to checkpatch complaints.

Signed-off-by: default avatarPaul E. McKenney <paulmck@linux.vnet.ibm.com>
parent 5ccf60f2

include/linux/torture.h

+8 −0
Original line number Diff line number Diff line
@@ -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;

kernel/rcu/rcutorture.c

+0 −8
Original line number Diff line number Diff line
@@ -97,14 +97,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;