From: "Paul E. McKenney" <paulmck@kernel.org>
To: John Stultz <jstultz@google.com>
Cc: LKML <linux-kernel@vger.kernel.org>,
Davidlohr Bueso <dave@stgolabs.net>,
Josh Triplett <josh@joshtriplett.org>,
Joel Fernandes <joel@joelfernandes.org>,
Juri Lelli <juri.lelli@redhat.com>,
Valentin Schneider <vschneid@redhat.com>,
Dietmar Eggemann <dietmar.eggemann@arm.com>
Subject: Re: [PATCH v2 1/4] locktorture: Add nested_[un]lock() hooks and nlocks parameter
Date: Fri, 3 Feb 2023 15:38:50 -0800 [thread overview]
Message-ID: <20230203233850.GP2948950@paulmck-ThinkPad-P17-Gen-1> (raw)
In-Reply-To: <20230203200138.3872873-1-jstultz@google.com>
On Fri, Feb 03, 2023 at 08:01:35PM +0000, John Stultz wrote:
> In order ot extend locktorture to support lock nesting, add
> nested_lock() and nested_unlock() hooks to the torture ops.
>
> These take a 32bit lockset mask which is generated at random,
> so some number of locks will be taken before the main lock is
> taken and released afterwards.
>
> Additionally, add nlocks module parameter to allow specifying
> the number of nested locks to be used.
>
> This has been helpful to uncover issues in the proxy-exec
> series development.
>
> This was inspired by locktorture extensions originally implemented
> by Connor O'Brien, for stress testing the proxy-execution series:
> https://lore.kernel.org/lkml/20221003214501.2050087-12-connoro@google.com/
>
> Comments or feedback would be greatly appreciated!
I have applied this series in place of the previous one, and thank you
for the added scripting updates!
Thanx, Paul
> Cc: Davidlohr Bueso <dave@stgolabs.net>
> Cc: "Paul E. McKenney" <paulmck@kernel.org>
> Cc: Josh Triplett <josh@joshtriplett.org>
> Cc: Joel Fernandes <joel@joelfernandes.org>
> Cc: Juri Lelli <juri.lelli@redhat.com>
> Cc: Valentin Schneider <vschneid@redhat.com>
> Cc: Dietmar Eggemann <dietmar.eggemann@arm.com>
> Signed-off-by: John Stultz <jstultz@google.com>
> ---
> kernel/locking/locktorture.c | 23 +++++++++++++++++++----
> 1 file changed, 19 insertions(+), 4 deletions(-)
>
> diff --git a/kernel/locking/locktorture.c b/kernel/locking/locktorture.c
> index 9c2fb613a55d..f4fbd3194654 100644
> --- a/kernel/locking/locktorture.c
> +++ b/kernel/locking/locktorture.c
> @@ -48,6 +48,9 @@ torture_param(int, stat_interval, 60,
> torture_param(int, stutter, 5, "Number of jiffies to run/halt test, 0=disable");
> torture_param(int, verbose, 1,
> "Enable verbose debugging printk()s");
> +torture_param(int, nlocks, 0, "Number of nested locks");
> +/* Going much higher trips "BUG: MAX_LOCKDEP_CHAIN_HLOCKS too low!" errors */
> +#define MAX_LOCKS 8
>
> static char *torture_type = "spin_lock";
> module_param(torture_type, charp, 0444);
> @@ -76,10 +79,12 @@ static void lock_torture_cleanup(void);
> struct lock_torture_ops {
> void (*init)(void);
> void (*exit)(void);
> + int (*nested_lock)(int tid, u32 lockset);
> int (*writelock)(int tid);
> void (*write_delay)(struct torture_random_state *trsp);
> void (*task_boost)(struct torture_random_state *trsp);
> void (*writeunlock)(int tid);
> + void (*nested_unlock)(int tid, u32 lockset);
> int (*readlock)(int tid);
> void (*read_delay)(struct torture_random_state *trsp);
> void (*readunlock)(int tid);
> @@ -669,6 +674,7 @@ static int lock_torture_writer(void *arg)
> struct lock_stress_stats *lwsp = arg;
> int tid = lwsp - cxt.lwsa;
> DEFINE_TORTURE_RANDOM(rand);
> + u32 lockset_mask;
>
> VERBOSE_TOROUT_STRING("lock_torture_writer task started");
> set_user_nice(current, MAX_NICE);
> @@ -677,7 +683,10 @@ static int lock_torture_writer(void *arg)
> if ((torture_random(&rand) & 0xfffff) == 0)
> schedule_timeout_uninterruptible(1);
>
> + lockset_mask = torture_random(&rand);
> cxt.cur_ops->task_boost(&rand);
> + if (cxt.cur_ops->nested_lock)
> + cxt.cur_ops->nested_lock(tid, lockset_mask);
> cxt.cur_ops->writelock(tid);
> if (WARN_ON_ONCE(lock_is_write_held))
> lwsp->n_lock_fail++;
> @@ -690,6 +699,8 @@ static int lock_torture_writer(void *arg)
> lock_is_write_held = false;
> WRITE_ONCE(last_lock_release, jiffies);
> cxt.cur_ops->writeunlock(tid);
> + if (cxt.cur_ops->nested_unlock)
> + cxt.cur_ops->nested_unlock(tid, lockset_mask);
>
> stutter_wait("lock_torture_writer");
> } while (!torture_must_stop());
> @@ -830,11 +841,11 @@ lock_torture_print_module_parms(struct lock_torture_ops *cur_ops,
> const char *tag)
> {
> pr_alert("%s" TORTURE_FLAG
> - "--- %s%s: nwriters_stress=%d nreaders_stress=%d stat_interval=%d verbose=%d shuffle_interval=%d stutter=%d shutdown_secs=%d onoff_interval=%d onoff_holdoff=%d\n",
> + "--- %s%s: nwriters_stress=%d nreaders_stress=%d nlocks=%d stat_interval=%d verbose=%d shuffle_interval=%d stutter=%d shutdown_secs=%d onoff_interval=%d onoff_holdoff=%d\n",
> torture_type, tag, cxt.debug_lock ? " [debug]": "",
> - cxt.nrealwriters_stress, cxt.nrealreaders_stress, stat_interval,
> - verbose, shuffle_interval, stutter, shutdown_secs,
> - onoff_interval, onoff_holdoff);
> + cxt.nrealwriters_stress, cxt.nrealreaders_stress, nlocks,
> + stat_interval, verbose, shuffle_interval, stutter,
> + shutdown_secs, onoff_interval, onoff_holdoff);
> }
>
> static void lock_torture_cleanup(void)
> @@ -1053,6 +1064,10 @@ static int __init lock_torture_init(void)
> }
> }
>
> + /* cap nlocks to MAX_LOCKS */
> + if (nlocks > MAX_LOCKS)
> + nlocks = MAX_LOCKS;
> +
> if (cxt.cur_ops->readlock) {
> reader_tasks = kcalloc(cxt.nrealreaders_stress,
> sizeof(reader_tasks[0]),
> --
> 2.39.1.519.gcb327c4b5f-goog
>
next prev parent reply other threads:[~2023-02-03 23:38 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-03 20:01 John Stultz
2023-02-03 20:01 ` [PATCH v2 2/4] locktorture: Add nested locking to mutex torture tests John Stultz
2023-02-05 19:07 ` Davidlohr Bueso
2023-02-06 17:20 ` Paul E. McKenney
2023-02-06 19:24 ` John Stultz
2023-02-03 20:01 ` [PATCH v2 3/4] locktorture: Add nested locking to rtmutex " John Stultz
2023-02-05 18:58 ` Davidlohr Bueso
2023-02-05 19:00 ` Davidlohr Bueso
2023-02-03 20:01 ` [PATCH v2 4/4] locktorture: With nested locks, occasionally skip main lock John Stultz
2023-02-05 19:05 ` Davidlohr Bueso
2023-02-06 20:37 ` John Stultz
2023-02-03 23:38 ` Paul E. McKenney [this message]
2023-02-05 18:34 ` [PATCH v2 1/4] locktorture: Add nested_[un]lock() hooks and nlocks parameter Davidlohr Bueso
2023-02-06 19:44 ` John Stultz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230203233850.GP2948950@paulmck-ThinkPad-P17-Gen-1 \
--to=paulmck@kernel.org \
--cc=dave@stgolabs.net \
--cc=dietmar.eggemann@arm.com \
--cc=joel@joelfernandes.org \
--cc=josh@joshtriplett.org \
--cc=jstultz@google.com \
--cc=juri.lelli@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=vschneid@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®