rcutorture: Use unsigned for Reader Batch computations

The counter returned by the various ->completed functions is subject to
overflow, which means that subtracting two such counters might result
in overflow, which invokes undefined behavior in the C standard.  This
commit therefore changes these functions and variables to unsigned to
avoid this undefined behavior.

Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
This commit is contained in:
Paul E. McKenney 2014-11-21 14:19:26 -08:00
parent 3b009c0ebe
commit 6b80da42c0

View File

@ -244,7 +244,7 @@ struct rcu_torture_ops {
int (*readlock)(void); int (*readlock)(void);
void (*read_delay)(struct torture_random_state *rrsp); void (*read_delay)(struct torture_random_state *rrsp);
void (*readunlock)(int idx); void (*readunlock)(int idx);
int (*completed)(void); unsigned long (*completed)(void);
void (*deferred_free)(struct rcu_torture *p); void (*deferred_free)(struct rcu_torture *p);
void (*sync)(void); void (*sync)(void);
void (*exp_sync)(void); void (*exp_sync)(void);
@ -296,7 +296,7 @@ static void rcu_torture_read_unlock(int idx) __releases(RCU)
rcu_read_unlock(); rcu_read_unlock();
} }
static int rcu_torture_completed(void) static unsigned long rcu_torture_completed(void)
{ {
return rcu_batches_completed(); return rcu_batches_completed();
} }
@ -356,7 +356,7 @@ rcu_torture_cb(struct rcu_head *p)
cur_ops->deferred_free(rp); cur_ops->deferred_free(rp);
} }
static int rcu_no_completed(void) static unsigned long rcu_no_completed(void)
{ {
return 0; return 0;
} }
@ -407,7 +407,7 @@ static void rcu_bh_torture_read_unlock(int idx) __releases(RCU_BH)
rcu_read_unlock_bh(); rcu_read_unlock_bh();
} }
static int rcu_bh_torture_completed(void) static unsigned long rcu_bh_torture_completed(void)
{ {
return rcu_batches_completed_bh(); return rcu_batches_completed_bh();
} }
@ -510,7 +510,7 @@ static void srcu_torture_read_unlock(int idx) __releases(&srcu_ctl)
srcu_read_unlock(&srcu_ctl, idx); srcu_read_unlock(&srcu_ctl, idx);
} }
static int srcu_torture_completed(void) static unsigned long srcu_torture_completed(void)
{ {
return srcu_batches_completed(&srcu_ctl); return srcu_batches_completed(&srcu_ctl);
} }
@ -1015,8 +1015,8 @@ static void rcutorture_trace_dump(void)
static void rcu_torture_timer(unsigned long unused) static void rcu_torture_timer(unsigned long unused)
{ {
int idx; int idx;
int completed; unsigned long completed;
int completed_end; unsigned long completed_end;
static DEFINE_TORTURE_RANDOM(rand); static DEFINE_TORTURE_RANDOM(rand);
static DEFINE_SPINLOCK(rand_lock); static DEFINE_SPINLOCK(rand_lock);
struct rcu_torture *p; struct rcu_torture *p;
@ -1073,8 +1073,8 @@ static void rcu_torture_timer(unsigned long unused)
static int static int
rcu_torture_reader(void *arg) rcu_torture_reader(void *arg)
{ {
int completed; unsigned long completed;
int completed_end; unsigned long completed_end;
int idx; int idx;
DEFINE_TORTURE_RANDOM(rand); DEFINE_TORTURE_RANDOM(rand);
struct rcu_torture *p; struct rcu_torture *p;