Commit b1f77b05 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

kmemtrace, rcu: fix linux/rcutree.h and linux/rcuclassic.h dependencies 



Impact: build fix for all non-x86 architectures

We want to remove percpu.h from rcuclassic.h/rcutree.h (for upcoming
kmemtrace changes) but that would break the DECLARE_PER_CPU based
declarations in these files.

Move the quiescent counter management functions to their respective
RCU implementation .c files - they were slightly above the inlining
limit anyway.

Cc: Pekka Enberg <penberg@cs.helsinki.fi>
Cc: Eduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
Cc: paulmck@linux.vnet.ibm.com
LKML-Reference: <1237898630.25315.83.camel@penberg-laptop>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 255d11bc

include/linux/rcuclassic.h

+2 −13
Original line number Diff line number Diff line
@@ -108,25 +108,14 @@ struct rcu_data { 
	struct rcu_head barrier;

};



DECLARE_PER_CPU(struct rcu_data, rcu_data);

DECLARE_PER_CPU(struct rcu_data, rcu_bh_data);



/*

 * Increment the quiescent state counter.

 * The counter is a bit degenerated: We do not need to know

 * how many quiescent states passed, just if there was at least

 * one since the start of the grace period. Thus just a flag.

 */

static inline void rcu_qsctr_inc(int cpu)

{

	struct rcu_data *rdp = &per_cpu(rcu_data, cpu);

	rdp->passed_quiesc = 1;

}

static inline void rcu_bh_qsctr_inc(int cpu)

{

	struct rcu_data *rdp = &per_cpu(rcu_bh_data, cpu);

	rdp->passed_quiesc = 1;

}

extern void rcu_qsctr_inc(int cpu);

extern void rcu_bh_qsctr_inc(int cpu);



extern int rcu_pending(int cpu);

extern int rcu_needs_cpu(int cpu);

include/linux/rcutree.h

+2 −24
Original line number Diff line number Diff line
@@ -236,30 +236,8 @@ struct rcu_state { 
#endif /* #ifdef CONFIG_NO_HZ */

};



extern struct rcu_state rcu_state;

DECLARE_PER_CPU(struct rcu_data, rcu_data);



extern struct rcu_state rcu_bh_state;

DECLARE_PER_CPU(struct rcu_data, rcu_bh_data);



/*

 * Increment the quiescent state counter.

 * The counter is a bit degenerated: We do not need to know

 * how many quiescent states passed, just if there was at least

 * one since the start of the grace period. Thus just a flag.

 */

static inline void rcu_qsctr_inc(int cpu)

{

	struct rcu_data *rdp = &per_cpu(rcu_data, cpu);

	rdp->passed_quiesc = 1;

	rdp->passed_quiesc_completed = rdp->completed;

}

static inline void rcu_bh_qsctr_inc(int cpu)

{

	struct rcu_data *rdp = &per_cpu(rcu_bh_data, cpu);

	rdp->passed_quiesc = 1;

	rdp->passed_quiesc_completed = rdp->completed;

}

extern void rcu_qsctr_inc(int cpu);

extern void rcu_bh_qsctr_inc(int cpu);



extern int rcu_pending(int cpu);

extern int rcu_needs_cpu(int cpu);

kernel/rcuclassic.c

+21 −2
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ static struct rcu_ctrlblk rcu_ctrlblk = { 
	.lock = __SPIN_LOCK_UNLOCKED(&rcu_ctrlblk.lock),

	.cpumask = CPU_BITS_NONE,

};



static struct rcu_ctrlblk rcu_bh_ctrlblk = {

	.cur = -300,

	.completed = -300,
@@ -73,8 +74,26 @@ static struct rcu_ctrlblk rcu_bh_ctrlblk = { 
	.cpumask = CPU_BITS_NONE,

};



DEFINE_PER_CPU(struct rcu_data, rcu_data) = { 0L };

DEFINE_PER_CPU(struct rcu_data, rcu_bh_data) = { 0L };

static DEFINE_PER_CPU(struct rcu_data, rcu_data);

static DEFINE_PER_CPU(struct rcu_data, rcu_bh_data);



/*

 * Increment the quiescent state counter.

 * The counter is a bit degenerated: We do not need to know

 * how many quiescent states passed, just if there was at least

 * one since the start of the grace period. Thus just a flag.

 */

void rcu_qsctr_inc(int cpu)

{

	struct rcu_data *rdp = &per_cpu(rcu_data, cpu);

	rdp->passed_quiesc = 1;

}



void rcu_bh_qsctr_inc(int cpu)

{

	struct rcu_data *rdp = &per_cpu(rcu_bh_data, cpu);

	rdp->passed_quiesc = 1;

}



static int blimit = 10;

static int qhimark = 10000;

kernel/rcutree.c

+24 −4
Original line number Diff line number Diff line
@@ -72,11 +72,31 @@ EXPORT_SYMBOL_GPL(rcu_lock_map); 
	.n_force_qs_ngp = 0, \

}



struct rcu_state rcu_state = RCU_STATE_INITIALIZER(rcu_state);

DEFINE_PER_CPU(struct rcu_data, rcu_data);

static struct rcu_state rcu_state = RCU_STATE_INITIALIZER(rcu_state);

static DEFINE_PER_CPU(struct rcu_data, rcu_data);



struct rcu_state rcu_bh_state = RCU_STATE_INITIALIZER(rcu_bh_state);

DEFINE_PER_CPU(struct rcu_data, rcu_bh_data);

static struct rcu_state rcu_bh_state = RCU_STATE_INITIALIZER(rcu_bh_state);

static DEFINE_PER_CPU(struct rcu_data, rcu_bh_data);



/*

 * Increment the quiescent state counter.

 * The counter is a bit degenerated: We do not need to know

 * how many quiescent states passed, just if there was at least

 * one since the start of the grace period. Thus just a flag.

 */

void rcu_qsctr_inc(int cpu)

{

	struct rcu_data *rdp = &per_cpu(rcu_data, cpu);

	rdp->passed_quiesc = 1;

	rdp->passed_quiesc_completed = rdp->completed;

}



void rcu_bh_qsctr_inc(int cpu)

{

	struct rcu_data *rdp = &per_cpu(rcu_bh_data, cpu);

	rdp->passed_quiesc = 1;

	rdp->passed_quiesc_completed = rdp->completed;

}



#ifdef CONFIG_NO_HZ

DEFINE_PER_CPU(struct rcu_dynticks, rcu_dynticks) = {

CRA Git | Maintained and supported by SUSTech CRA and CCSE