Commit 0cfecd7d authored by Paul E. McKenney's avatar Paul E. McKenney Committed by Frederic Weisbecker
Browse files

torture: Move rcutorture_sched_setaffinity() out of rcutorture 



The rcutorture_sched_setaffinity() function is needed by locktorture,
so move its declaration from rcu.h to torture.h and rename it to the
more generic torture_sched_setaffinity() name.

Please note that use of this function is still restricted to torture
tests, and of those, currently only rcutorture and locktorture.

Signed-off-by: default avatarPaul E. McKenney <paulmck@kernel.org>
Signed-off-by: default avatarFrederic Weisbecker <frederic@kernel.org>
parent 3853a720

include/linux/torture.h

+5 −0
Original line number Diff line number Diff line
@@ -121,10 +121,15 @@ void _torture_stop_kthread(char *m, struct task_struct **tp); 
#define torture_stop_kthread(n, tp) \

	_torture_stop_kthread("Stopping " #n " task", &(tp))



/* Scheduler-related definitions. */

#ifdef CONFIG_PREEMPTION

#define torture_preempt_schedule() __preempt_schedule()

#else

#define torture_preempt_schedule()	do { } while (0)

#endif



#if IS_ENABLED(CONFIG_RCU_TORTURE_TEST) || IS_MODULE(CONFIG_RCU_TORTURE_TEST) || IS_ENABLED(CONFIG_LOCK_TORTURE_TEST) || IS_MODULE(CONFIG_LOCK_TORTURE_TEST)

long torture_sched_setaffinity(pid_t pid, const struct cpumask *in_mask);

#endif



#endif /* __LINUX_TORTURE_H */

kernel/rcu/rcu.h

+0 −4
Original line number Diff line number Diff line
@@ -568,10 +568,6 @@ void do_trace_rcu_torture_read(const char *rcutorturename, 
static inline void rcu_gp_set_torture_wait(int duration) { }

#endif



#if IS_ENABLED(CONFIG_RCU_TORTURE_TEST) || IS_MODULE(CONFIG_RCU_TORTURE_TEST)

long rcutorture_sched_setaffinity(pid_t pid, const struct cpumask *in_mask);

#endif



#ifdef CONFIG_TINY_SRCU



static inline void srcutorture_get_gp_data(enum rcutorture_type test_type,

kernel/rcu/rcutorture.c

+1 −1
Original line number Diff line number Diff line
@@ -810,7 +810,7 @@ static void synchronize_rcu_trivial(void) 
	int cpu;



	for_each_online_cpu(cpu) {

		rcutorture_sched_setaffinity(current->pid, cpumask_of(cpu));

		torture_sched_setaffinity(current->pid, cpumask_of(cpu));

		WARN_ON_ONCE(raw_smp_processor_id() != cpu);

	}

}

kernel/rcu/update.c

+4 −4
Original line number Diff line number Diff line
@@ -525,17 +525,17 @@ EXPORT_SYMBOL_GPL(do_trace_rcu_torture_read); 
	do { } while (0)

#endif



#if IS_ENABLED(CONFIG_RCU_TORTURE_TEST) || IS_MODULE(CONFIG_RCU_TORTURE_TEST)

#if IS_ENABLED(CONFIG_RCU_TORTURE_TEST) || IS_MODULE(CONFIG_RCU_TORTURE_TEST) || IS_ENABLED(CONFIG_LOCK_TORTURE_TEST) || IS_MODULE(CONFIG_LOCK_TORTURE_TEST)

/* Get rcutorture access to sched_setaffinity(). */

long rcutorture_sched_setaffinity(pid_t pid, const struct cpumask *in_mask)

long torture_sched_setaffinity(pid_t pid, const struct cpumask *in_mask)

{

	int ret;



	ret = sched_setaffinity(pid, in_mask);

	WARN_ONCE(ret, "%s: sched_setaffinity() returned %d\n", __func__, ret);

	WARN_ONCE(ret, "%s: sched_setaffinity(%d) returned %d\n", __func__, pid, ret);

	return ret;

}

EXPORT_SYMBOL_GPL(rcutorture_sched_setaffinity);

EXPORT_SYMBOL_GPL(torture_sched_setaffinity);

#endif



#ifdef CONFIG_RCU_STALL_COMMON