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

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

Merge branches 'doc.2017.10.20a', 'fixes.2017.10.19a', 'stall.2017.10.09a' and... 

Merge branches 'doc.2017.10.20a', 'fixes.2017.10.19a', 'stall.2017.10.09a' and 'torture.2017.10.09a' into HEAD

doc.2017.10.20a: Documentation updates.
fixes.2017.10.19a: Miscellaneous fixes.
stall.2017.10.09a: RCU CPU stall-warning updates.
torture.2017.10.09a: Torture-test updates.
parents e4d0b679 56628a7f f22ce091 b038c58b

Documentation/admin-guide/kernel-parameters.txt

+3 −0
Original line number Diff line number Diff line
@@ -3539,6 +3539,9 @@ 
	rcutorture.stall_cpu_holdoff= [KNL]

			Time to wait (s) after boot before inducing stall.



	rcutorture.stall_cpu_irqsoff= [KNL]

			Disable interrupts while stalling if set.



	rcutorture.stat_interval= [KNL]

			Time (s) between statistics printk()s.

include/linux/irq_work.h

+0 −3
Original line number Diff line number Diff line
@@ -33,10 +33,7 @@ void init_irq_work(struct irq_work *work, void (*func)(struct irq_work *)) 
#define DEFINE_IRQ_WORK(name, _f) struct irq_work name = { .func = (_f), }



bool irq_work_queue(struct irq_work *work);



#ifdef CONFIG_SMP

bool irq_work_queue_on(struct irq_work *work, int cpu);

#endif



void irq_work_tick(void);

void irq_work_sync(struct irq_work *work);

kernel/irq_work.c

+6 −3
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ void __weak arch_irq_work_raise(void) 
	 */

}



#ifdef CONFIG_SMP

/*

 * Enqueue the irq_work @work on @cpu unless it's already pending

 * somewhere.
@@ -68,6 +67,8 @@ bool irq_work_queue_on(struct irq_work *work, int cpu) 
	/* All work should have been flushed before going offline */

	WARN_ON_ONCE(cpu_is_offline(cpu));



#ifdef CONFIG_SMP



	/* Arch remote IPI send/receive backend aren't NMI safe */

	WARN_ON_ONCE(in_nmi());
@@ -78,10 +79,12 @@ bool irq_work_queue_on(struct irq_work *work, int cpu) 
	if (llist_add(&work->llnode, &per_cpu(raised_list, cpu)))

		arch_send_call_function_single_ipi(cpu);



#else /* #ifdef CONFIG_SMP */

	irq_work_queue(work);

#endif /* #else #ifdef CONFIG_SMP */



	return true;

}

EXPORT_SYMBOL_GPL(irq_work_queue_on);

#endif



/* Enqueue the irq work @work on the current CPU */

bool irq_work_queue(struct irq_work *work)

kernel/rcu/rcu.h

+20 −1
Original line number Diff line number Diff line
@@ -203,6 +203,21 @@ static inline bool __rcu_reclaim(const char *rn, struct rcu_head *head) 
extern int rcu_cpu_stall_suppress;

int rcu_jiffies_till_stall_check(void);



#define rcu_ftrace_dump_stall_suppress() \

do { \

	if (!rcu_cpu_stall_suppress) \

		rcu_cpu_stall_suppress = 3; \

} while (0)



#define rcu_ftrace_dump_stall_unsuppress() \

do { \

	if (rcu_cpu_stall_suppress == 3) \

		rcu_cpu_stall_suppress = 0; \

} while (0)



#else /* #endif #ifdef CONFIG_RCU_STALL_COMMON */

#define rcu_ftrace_dump_stall_suppress()

#define rcu_ftrace_dump_stall_unsuppress()

#endif /* #ifdef CONFIG_RCU_STALL_COMMON */



/*
@@ -220,8 +235,12 @@ do { \ 
	static atomic_t ___rfd_beenhere = ATOMIC_INIT(0); \

	\

	if (!atomic_read(&___rfd_beenhere) && \

	    !atomic_xchg(&___rfd_beenhere, 1)) \

	    !atomic_xchg(&___rfd_beenhere, 1)) { \

		tracing_off(); \

		rcu_ftrace_dump_stall_suppress(); \

		ftrace_dump(oops_dump_mode); \

		rcu_ftrace_dump_stall_unsuppress(); \

	} \

} while (0)



void rcu_early_boot_tests(void);

kernel/rcu/rcu_segcblist.c

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/types.h>

#include <linux/kernel.h>

#include <linux/interrupt.h>

#include <linux/rcupdate.h>



#include "rcu_segcblist.h"