leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

locking/locktorture: Pass thread id to lock/unlock functions

Browse Source 
To allow the lock and unlock functions in locktorture to access
per-thread information, we need to pass some hint on how to locate
those information. One way to do this is to pass in a unique thread
id which can then be used to access a global array for thread specific
information.

Change the lock and unlock method to add a thread id parameter which
can be determined by the offset of the lwsp/lrsp pointer from the global
lwsa/lrsa array.

There is no other functional change in this patch.

Signed-off-by: Waiman Long <longman@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20210318172814.4400-5-longman@redhat.com
This commit is contained in:
Waiman Long
2021-03-18 13:28:13 -04:00
committed by Ingo Molnar
parent 5261ced47f
commit aa3a5f3187
1 changed files with 58 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
kernel/locking/locktorture.c
View File

@@ -76,13 +76,13 @@ static void lock_torture_cleanup(void);
struct lock_torture_ops { struct lock_torture_ops {
void (*init)(void); void (*init)(void);
void (*exit)(void); void (*exit)(void);
int (*writelock)(void); int (*writelock)(int tid);
void (*write_delay)(struct torture_random_state *trsp); void (*write_delay)(struct torture_random_state *trsp);
void (*task_boost)(struct torture_random_state *trsp); void (*task_boost)(struct torture_random_state *trsp);
void (*writeunlock)(void); void (*writeunlock)(int tid);
int (*readlock)(void); int (*readlock)(int tid);
void (*read_delay)(struct torture_random_state *trsp); void (*read_delay)(struct torture_random_state *trsp);
void (*readunlock)(void); void (*readunlock)(int tid);
unsigned long flags; /* for irq spinlocks */ unsigned long flags; /* for irq spinlocks */
const char *name; const char *name;
@@ -105,7 +105,7 @@ static struct lock_torture_cxt cxt = { 0, 0, false, false,
* Definitions for lock torture testing. * Definitions for lock torture testing.
*/ */
static int torture_lock_busted_write_lock(void) static int torture_lock_busted_write_lock(int tid __maybe_unused)
{ {
return 0; /* BUGGY, do not use in real life!!! */ return 0; /* BUGGY, do not use in real life!!! */
} }
@@ -122,7 +122,7 @@ static void torture_lock_busted_write_delay(struct torture_random_state *trsp)
torture_preempt_schedule(); /* Allow test to be preempted. */ torture_preempt_schedule(); /* Allow test to be preempted. */
} }
static void torture_lock_busted_write_unlock(void) static void torture_lock_busted_write_unlock(int tid __maybe_unused)
{ {
/* BUGGY, do not use in real life!!! */ /* BUGGY, do not use in real life!!! */
} }
@@ -145,7 +145,8 @@ static struct lock_torture_ops lock_busted_ops = {
static DEFINE_SPINLOCK(torture_spinlock); static DEFINE_SPINLOCK(torture_spinlock);
static int torture_spin_lock_write_lock(void) __acquires(torture_spinlock) static int torture_spin_lock_write_lock(int tid __maybe_unused)
__acquires(torture_spinlock)
{ {
spin_lock(&torture_spinlock); spin_lock(&torture_spinlock);
return 0; return 0;
@@ -169,7 +170,8 @@ static void torture_spin_lock_write_delay(struct torture_random_state *trsp)
torture_preempt_schedule(); /* Allow test to be preempted. */ torture_preempt_schedule(); /* Allow test to be preempted. */
} }
static void torture_spin_lock_write_unlock(void) __releases(torture_spinlock) static void torture_spin_lock_write_unlock(int tid __maybe_unused)
__releases(torture_spinlock)
{ {
spin_unlock(&torture_spinlock); spin_unlock(&torture_spinlock);
} }
@@ -185,7 +187,7 @@ static struct lock_torture_ops spin_lock_ops = {
.name = "spin_lock" .name = "spin_lock"
}; };
static int torture_spin_lock_write_lock_irq(void) static int torture_spin_lock_write_lock_irq(int tid __maybe_unused)
__acquires(torture_spinlock) __acquires(torture_spinlock)
{ {
unsigned long flags; unsigned long flags;
@@ -195,7 +197,7 @@ __acquires(torture_spinlock)
return 0; return 0;
} }
static void torture_lock_spin_write_unlock_irq(void) static void torture_lock_spin_write_unlock_irq(int tid __maybe_unused)
__releases(torture_spinlock) __releases(torture_spinlock)
{ {
spin_unlock_irqrestore(&torture_spinlock, cxt.cur_ops->flags); spin_unlock_irqrestore(&torture_spinlock, cxt.cur_ops->flags);
@@ -214,7 +216,8 @@ static struct lock_torture_ops spin_lock_irq_ops = {
static DEFINE_RWLOCK(torture_rwlock); static DEFINE_RWLOCK(torture_rwlock);
static int torture_rwlock_write_lock(void) __acquires(torture_rwlock) static int torture_rwlock_write_lock(int tid __maybe_unused)
__acquires(torture_rwlock)
{ {
write_lock(&torture_rwlock); write_lock(&torture_rwlock);
return 0; return 0;
@@ -235,12 +238,14 @@ static void torture_rwlock_write_delay(struct torture_random_state *trsp)
udelay(shortdelay_us); udelay(shortdelay_us);
} }
static void torture_rwlock_write_unlock(void) __releases(torture_rwlock) static void torture_rwlock_write_unlock(int tid __maybe_unused)
__releases(torture_rwlock)
{ {
write_unlock(&torture_rwlock); write_unlock(&torture_rwlock);
} }
static int torture_rwlock_read_lock(void) __acquires(torture_rwlock) static int torture_rwlock_read_lock(int tid __maybe_unused)
__acquires(torture_rwlock)
{ {
read_lock(&torture_rwlock); read_lock(&torture_rwlock);
return 0; return 0;
@@ -261,7 +266,8 @@ static void torture_rwlock_read_delay(struct torture_random_state *trsp)
udelay(shortdelay_us); udelay(shortdelay_us);
} }
static void torture_rwlock_read_unlock(void) __releases(torture_rwlock) static void torture_rwlock_read_unlock(int tid __maybe_unused)
__releases(torture_rwlock)
{ {
read_unlock(&torture_rwlock); read_unlock(&torture_rwlock);
} }
@@ -277,7 +283,8 @@ static struct lock_torture_ops rw_lock_ops = {
.name = "rw_lock" .name = "rw_lock"
}; };
static int torture_rwlock_write_lock_irq(void) __acquires(torture_rwlock) static int torture_rwlock_write_lock_irq(int tid __maybe_unused)
__acquires(torture_rwlock)
{ {
unsigned long flags; unsigned long flags;
@@ -286,13 +293,14 @@ static int torture_rwlock_write_lock_irq(void) __acquires(torture_rwlock)
return 0; return 0;
} }
static void torture_rwlock_write_unlock_irq(void) static void torture_rwlock_write_unlock_irq(int tid __maybe_unused)
__releases(torture_rwlock) __releases(torture_rwlock)
{ {
write_unlock_irqrestore(&torture_rwlock, cxt.cur_ops->flags); write_unlock_irqrestore(&torture_rwlock, cxt.cur_ops->flags);
} }
static int torture_rwlock_read_lock_irq(void) __acquires(torture_rwlock) static int torture_rwlock_read_lock_irq(int tid __maybe_unused)
__acquires(torture_rwlock)
{ {
unsigned long flags; unsigned long flags;
@@ -301,7 +309,7 @@ static int torture_rwlock_read_lock_irq(void) __acquires(torture_rwlock)
return 0; return 0;
} }
static void torture_rwlock_read_unlock_irq(void) static void torture_rwlock_read_unlock_irq(int tid __maybe_unused)
__releases(torture_rwlock) __releases(torture_rwlock)
{ {
read_unlock_irqrestore(&torture_rwlock, cxt.cur_ops->flags); read_unlock_irqrestore(&torture_rwlock, cxt.cur_ops->flags);
@@ -320,7 +328,8 @@ static struct lock_torture_ops rw_lock_irq_ops = {
static DEFINE_MUTEX(torture_mutex); static DEFINE_MUTEX(torture_mutex);
static int torture_mutex_lock(void) __acquires(torture_mutex) static int torture_mutex_lock(int tid __maybe_unused)
__acquires(torture_mutex)
{ {
mutex_lock(&torture_mutex); mutex_lock(&torture_mutex);
return 0; return 0;
@@ -340,7 +349,8 @@ static void torture_mutex_delay(struct torture_random_state *trsp)
torture_preempt_schedule(); /* Allow test to be preempted. */ torture_preempt_schedule(); /* Allow test to be preempted. */
} }
static void torture_mutex_unlock(void) __releases(torture_mutex) static void torture_mutex_unlock(int tid __maybe_unused)
__releases(torture_mutex)
{ {
mutex_unlock(&torture_mutex); mutex_unlock(&torture_mutex);
} }
@@ -372,7 +382,7 @@ static void torture_ww_mutex_init(void)
ww_mutex_init(&torture_ww_mutex_2, &torture_ww_class); ww_mutex_init(&torture_ww_mutex_2, &torture_ww_class);
} }
static int torture_ww_mutex_lock(void) static int torture_ww_mutex_lock(int tid __maybe_unused)
__acquires(torture_ww_mutex_0) __acquires(torture_ww_mutex_0)
__acquires(torture_ww_mutex_1) __acquires(torture_ww_mutex_1)
__acquires(torture_ww_mutex_2) __acquires(torture_ww_mutex_2)
@@ -417,7 +427,7 @@ __acquires(torture_ww_mutex_2)
return 0; return 0;
} }
static void torture_ww_mutex_unlock(void) static void torture_ww_mutex_unlock(int tid __maybe_unused)
__releases(torture_ww_mutex_0) __releases(torture_ww_mutex_0)
__releases(torture_ww_mutex_1) __releases(torture_ww_mutex_1)
__releases(torture_ww_mutex_2) __releases(torture_ww_mutex_2)
@@ -442,7 +452,8 @@ static struct lock_torture_ops ww_mutex_lock_ops = {
#ifdef CONFIG_RT_MUTEXES #ifdef CONFIG_RT_MUTEXES
static DEFINE_RT_MUTEX(torture_rtmutex); static DEFINE_RT_MUTEX(torture_rtmutex);
static int torture_rtmutex_lock(void) __acquires(torture_rtmutex) static int torture_rtmutex_lock(int tid __maybe_unused)
__acquires(torture_rtmutex)
{ {
rt_mutex_lock(&torture_rtmutex); rt_mutex_lock(&torture_rtmutex);
return 0; return 0;
@@ -498,7 +509,8 @@ static void torture_rtmutex_delay(struct torture_random_state *trsp)
torture_preempt_schedule(); /* Allow test to be preempted. */ torture_preempt_schedule(); /* Allow test to be preempted. */
} }
static void torture_rtmutex_unlock(void) __releases(torture_rtmutex) static void torture_rtmutex_unlock(int tid __maybe_unused)
__releases(torture_rtmutex)
{ {
rt_mutex_unlock(&torture_rtmutex); rt_mutex_unlock(&torture_rtmutex);
} }
@@ -516,7 +528,8 @@ static struct lock_torture_ops rtmutex_lock_ops = {
#endif #endif
static DECLARE_RWSEM(torture_rwsem); static DECLARE_RWSEM(torture_rwsem);
static int torture_rwsem_down_write(void) __acquires(torture_rwsem) static int torture_rwsem_down_write(int tid __maybe_unused)
__acquires(torture_rwsem)
{ {
down_write(&torture_rwsem); down_write(&torture_rwsem);
return 0; return 0;
@@ -536,12 +549,14 @@ static void torture_rwsem_write_delay(struct torture_random_state *trsp)
torture_preempt_schedule(); /* Allow test to be preempted. */ torture_preempt_schedule(); /* Allow test to be preempted. */
} }
static void torture_rwsem_up_write(void) __releases(torture_rwsem) static void torture_rwsem_up_write(int tid __maybe_unused)
__releases(torture_rwsem)
{ {
up_write(&torture_rwsem); up_write(&torture_rwsem);
} }
static int torture_rwsem_down_read(void) __acquires(torture_rwsem) static int torture_rwsem_down_read(int tid __maybe_unused)
__acquires(torture_rwsem)
{ {
down_read(&torture_rwsem); down_read(&torture_rwsem);
return 0; return 0;
@@ -561,7 +576,8 @@ static void torture_rwsem_read_delay(struct torture_random_state *trsp)
torture_preempt_schedule(); /* Allow test to be preempted. */ torture_preempt_schedule(); /* Allow test to be preempted. */
} }
static void torture_rwsem_up_read(void) __releases(torture_rwsem) static void torture_rwsem_up_read(int tid __maybe_unused)
__releases(torture_rwsem)
{ {
up_read(&torture_rwsem); up_read(&torture_rwsem);
} }
@@ -590,24 +606,28 @@ static void torture_percpu_rwsem_exit(void)
percpu_free_rwsem(&pcpu_rwsem); percpu_free_rwsem(&pcpu_rwsem);
} }
static int torture_percpu_rwsem_down_write(void) __acquires(pcpu_rwsem) static int torture_percpu_rwsem_down_write(int tid __maybe_unused)
__acquires(pcpu_rwsem)
{ {
percpu_down_write(&pcpu_rwsem); percpu_down_write(&pcpu_rwsem);
return 0; return 0;
} }
static void torture_percpu_rwsem_up_write(void) __releases(pcpu_rwsem) static void torture_percpu_rwsem_up_write(int tid __maybe_unused)
__releases(pcpu_rwsem)
{ {
percpu_up_write(&pcpu_rwsem); percpu_up_write(&pcpu_rwsem);
} }
static int torture_percpu_rwsem_down_read(void) __acquires(pcpu_rwsem) static int torture_percpu_rwsem_down_read(int tid __maybe_unused)
__acquires(pcpu_rwsem)
{ {
percpu_down_read(&pcpu_rwsem); percpu_down_read(&pcpu_rwsem);
return 0; return 0;
} }
static void torture_percpu_rwsem_up_read(void) __releases(pcpu_rwsem) static void torture_percpu_rwsem_up_read(int tid __maybe_unused)
__releases(pcpu_rwsem)
{ {
percpu_up_read(&pcpu_rwsem); percpu_up_read(&pcpu_rwsem);
} }
@@ -632,6 +652,7 @@ static struct lock_torture_ops percpu_rwsem_lock_ops = {
static int lock_torture_writer(void *arg) static int lock_torture_writer(void *arg)
{ {
struct lock_stress_stats *lwsp = arg; struct lock_stress_stats *lwsp = arg;
int tid = lwsp - cxt.lwsa;
DEFINE_TORTURE_RANDOM(rand); DEFINE_TORTURE_RANDOM(rand);
VERBOSE_TOROUT_STRING("lock_torture_writer task started"); VERBOSE_TOROUT_STRING("lock_torture_writer task started");
@@ -642,7 +663,7 @@ static int lock_torture_writer(void *arg)
schedule_timeout_uninterruptible(1); schedule_timeout_uninterruptible(1);
cxt.cur_ops->task_boost(&rand); cxt.cur_ops->task_boost(&rand);
cxt.cur_ops->writelock(); cxt.cur_ops->writelock(tid);
if (WARN_ON_ONCE(lock_is_write_held)) if (WARN_ON_ONCE(lock_is_write_held))
lwsp->n_lock_fail++; lwsp->n_lock_fail++;
lock_is_write_held = true; lock_is_write_held = true;
@@ -653,7 +674,7 @@ static int lock_torture_writer(void *arg)
cxt.cur_ops->write_delay(&rand); cxt.cur_ops->write_delay(&rand);
lock_is_write_held = false; lock_is_write_held = false;
WRITE_ONCE(last_lock_release, jiffies); WRITE_ONCE(last_lock_release, jiffies);
cxt.cur_ops->writeunlock(); cxt.cur_ops->writeunlock(tid);
stutter_wait("lock_torture_writer"); stutter_wait("lock_torture_writer");
} while (!torture_must_stop()); } while (!torture_must_stop());
@@ -670,6 +691,7 @@ static int lock_torture_writer(void *arg)
static int lock_torture_reader(void *arg) static int lock_torture_reader(void *arg)
{ {
struct lock_stress_stats *lrsp = arg; struct lock_stress_stats *lrsp = arg;
int tid = lrsp - cxt.lrsa;
DEFINE_TORTURE_RANDOM(rand); DEFINE_TORTURE_RANDOM(rand);
VERBOSE_TOROUT_STRING("lock_torture_reader task started"); VERBOSE_TOROUT_STRING("lock_torture_reader task started");
@@ -679,7 +701,7 @@ static int lock_torture_reader(void *arg)
if ((torture_random(&rand) & 0xfffff) == 0) if ((torture_random(&rand) & 0xfffff) == 0)
schedule_timeout_uninterruptible(1); schedule_timeout_uninterruptible(1);
cxt.cur_ops->readlock(); cxt.cur_ops->readlock(tid);
lock_is_read_held = true; lock_is_read_held = true;
if (WARN_ON_ONCE(lock_is_write_held)) if (WARN_ON_ONCE(lock_is_write_held))
lrsp->n_lock_fail++; /* rare, but... */ lrsp->n_lock_fail++; /* rare, but... */
@@ -687,7 +709,7 @@ static int lock_torture_reader(void *arg)
lrsp->n_lock_acquired++; lrsp->n_lock_acquired++;
cxt.cur_ops->read_delay(&rand); cxt.cur_ops->read_delay(&rand);
lock_is_read_held = false; lock_is_read_held = false;
cxt.cur_ops->readunlock(); cxt.cur_ops->readunlock(tid);
stutter_wait("lock_torture_reader"); stutter_wait("lock_torture_reader");
} while (!torture_must_stop()); } while (!torture_must_stop());