Commit a95f9b6e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull core updates (RCU and locking) from Ingo Molnar:
 "Most of the diffstat comes from the RCU slow boot regression fixes,
  but there's also a debuggability improvements/fixes."

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  memblock: Document memblock_is_region_{memory,reserved}()
  rcu: Precompute RCU_FAST_NO_HZ timer offsets
  rcu: Move RCU_FAST_NO_HZ per-CPU variables to rcu_dynticks structure
  rcu: Update RCU_FAST_NO_HZ tracing for lazy callbacks
  rcu: RCU_FAST_NO_HZ detection of callback adoption
  spinlock: Indicate that a lockup is only suspected
  kdump: Execute kmsg_dump(KMSG_DUMP_PANIC) after smp_send_stop()
  panic: Make panic_on_oops configurable
parents a41b0e71 4a1e001d

include/linux/rcutiny.h

+4 −2
Original line number Original line Diff line number Diff line
@@ -87,8 +87,9 @@ static inline void kfree_call_rcu(struct rcu_head *head, 




#ifdef CONFIG_TINY_RCU

#ifdef CONFIG_TINY_RCU





static inline int rcu_needs_cpu(int cpu)

static inline int rcu_needs_cpu(int cpu, unsigned long *delta_jiffies)

{

{

	*delta_jiffies = ULONG_MAX;

	return 0;

	return 0;

}

}
@@ -96,8 +97,9 @@ static inline int rcu_needs_cpu(int cpu) 




int rcu_preempt_needs_cpu(void);

int rcu_preempt_needs_cpu(void);





static inline int rcu_needs_cpu(int cpu)

static inline int rcu_needs_cpu(int cpu, unsigned long *delta_jiffies)

{

{

	*delta_jiffies = ULONG_MAX;

	return rcu_preempt_needs_cpu();

	return rcu_preempt_needs_cpu();

}

}

include/linux/rcutree.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -32,7 +32,7 @@ 




extern void rcu_init(void);

extern void rcu_init(void);

extern void rcu_note_context_switch(int cpu);

extern void rcu_note_context_switch(int cpu);

extern int rcu_needs_cpu(int cpu);

extern int rcu_needs_cpu(int cpu, unsigned long *delta_jiffies);

extern void rcu_cpu_stall_reset(void);

extern void rcu_cpu_stall_reset(void);





/*

/*

include/trace/events/rcu.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -289,6 +289,7 @@ TRACE_EVENT(rcu_dyntick, 
 *	"In holdoff": Nothing to do, holding off after unsuccessful attempt.

 *	"In holdoff": Nothing to do, holding off after unsuccessful attempt.

 *	"Begin holdoff": Attempt failed, don't retry until next jiffy.

 *	"Begin holdoff": Attempt failed, don't retry until next jiffy.

 *	"Dyntick with callbacks": Entering dyntick-idle despite callbacks.

 *	"Dyntick with callbacks": Entering dyntick-idle despite callbacks.

 *	"Dyntick with lazy callbacks": Entering dyntick-idle w/lazy callbacks.

 *	"More callbacks": Still more callbacks, try again to clear them out.

 *	"More callbacks": Still more callbacks, try again to clear them out.

 *	"Callbacks drained": All callbacks processed, off to dyntick idle!

 *	"Callbacks drained": All callbacks processed, off to dyntick idle!

 *	"Timer": Timer fired to cause CPU to continue processing callbacks.

 *	"Timer": Timer fired to cause CPU to continue processing callbacks.

kernel/panic.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -27,7 +27,7 @@ 
#define PANIC_TIMER_STEP 100

#define PANIC_TIMER_STEP 100

#define PANIC_BLINK_SPD 18

#define PANIC_BLINK_SPD 18





int panic_on_oops;

int panic_on_oops = CONFIG_PANIC_ON_OOPS_VALUE;

static unsigned long tainted_mask;

static unsigned long tainted_mask;

static int pause_on_oops;

static int pause_on_oops;

static int pause_on_oops_flag;

static int pause_on_oops_flag;
@@ -108,8 +108,6 @@ void panic(const char *fmt, ...) 
	 */

	 */

	crash_kexec(NULL);

	crash_kexec(NULL);





	kmsg_dump(KMSG_DUMP_PANIC);



	/*

	/*

	 * Note smp_send_stop is the usual smp shutdown function, which

	 * Note smp_send_stop is the usual smp shutdown function, which

	 * unfortunately means it may not be hardened to work in a panic

	 * unfortunately means it may not be hardened to work in a panic
@@ -117,6 +115,8 @@ void panic(const char *fmt, ...) 
	 */

	 */

	smp_send_stop();

	smp_send_stop();





	kmsg_dump(KMSG_DUMP_PANIC);



	atomic_notifier_call_chain(&panic_notifier_list, 0, buf);

	atomic_notifier_call_chain(&panic_notifier_list, 0, buf);





	bust_spinlocks(0);

	bust_spinlocks(0);

kernel/rcutree.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -1397,6 +1397,8 @@ static void rcu_adopt_orphan_cbs(struct rcu_state *rsp) 
	rdp->qlen_lazy += rsp->qlen_lazy;

	rdp->qlen_lazy += rsp->qlen_lazy;

	rdp->qlen += rsp->qlen;

	rdp->qlen += rsp->qlen;

	rdp->n_cbs_adopted += rsp->qlen;

	rdp->n_cbs_adopted += rsp->qlen;

	if (rsp->qlen_lazy != rsp->qlen)

		rcu_idle_count_callbacks_posted();

	rsp->qlen_lazy = 0;

	rsp->qlen_lazy = 0;

	rsp->qlen = 0;

	rsp->qlen = 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE