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

rcu: Expand SRCU ->completed to 64 bits 



When rcutorture used only the low-order 32 bits of the grace-period
number, it was not a problem for SRCU to use a 32-bit completed field.
However, rcutorture now uses the full 64 bits on 64-bit systems, so
this commit converts SRCU's ->completed field to unsigned long so as to
provide 64 bits on 64-bit systems.

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

include/linux/srcu.h

+2 −2
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ struct rcu_batch { 
#define RCU_BATCH_INIT(name) { NULL, &(name.head) }



struct srcu_struct {

	unsigned completed;

	unsigned long completed;

	struct srcu_struct_array __percpu *per_cpu_ref;

	spinlock_t queue_lock; /* protect ->batch_queue, ->running */

	bool running;
@@ -135,7 +135,7 @@ int __srcu_read_lock(struct srcu_struct *sp) __acquires(sp); 
void __srcu_read_unlock(struct srcu_struct *sp, int idx) __releases(sp);

void synchronize_srcu(struct srcu_struct *sp);

void synchronize_srcu_expedited(struct srcu_struct *sp);

long srcu_batches_completed(struct srcu_struct *sp);

unsigned long srcu_batches_completed(struct srcu_struct *sp);

void srcu_barrier(struct srcu_struct *sp);



#ifdef CONFIG_DEBUG_LOCK_ALLOC

kernel/rcu/srcu.c

+1 −1
Original line number Diff line number Diff line
@@ -546,7 +546,7 @@ EXPORT_SYMBOL_GPL(srcu_barrier); 
 * Report the number of batches, correlated with, but not necessarily

 * precisely the same as, the number of grace periods that have elapsed.

 */

long srcu_batches_completed(struct srcu_struct *sp)

unsigned long srcu_batches_completed(struct srcu_struct *sp)

{

	return sp->completed;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE