From nobody Sat Feb 7 18:22:07 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 756CBCD80B9 for ; Tue, 10 Oct 2023 12:01:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231627AbjJJMB2 (ORCPT ); Tue, 10 Oct 2023 08:01:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41236 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231664AbjJJMA6 (ORCPT ); Tue, 10 Oct 2023 08:00:58 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DB1C310D4; Tue, 10 Oct 2023 05:00:24 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2C528C433C8; Tue, 10 Oct 2023 12:00:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1696939224; bh=ha2jr1RYr7HhVfbt6KZ0EmGhSb2PFj9LG18wINl8AWA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J8GQOFGv3Fl5LVw8DXcXJ94En597LSNTkyCP9zaUyTuQ1dq68wEANQOV0totn72n0 ScnPwHq9+DQIvBm5OLKD4SYDrPMxm8K/i4ODjzs52SXx++8A5kYxCqNJ8xjBJreX6A /V6aAM52reCWBnQHpA+yJv9o5mUPPLOVlFtp1NXZGLN2Eq83J4xzKhOSmkuoq7ZYjC t93gesmdNOV5DuqOydf0uWt+SV25h6ybH0wDrodFeebdSYEVIq014pdMsMeeZkaP9+ 6otDs5Bk59HdSJ8mTu/j2GgL5pJ5baZNEbTORAId0H1tfao5Qnck08U1uOVUvbEZHv xbzasBg7wuVKQ== From: Frederic Weisbecker To: LKML Cc: "Paul E. McKenney" , Boqun Feng , Joel Fernandes , Josh Triplett , Mathieu Desnoyers , Neeraj Upadhyay , Steven Rostedt , Uladzislau Rezki , rcu , Frederic Weisbecker Subject: [PATCH 18/23] locktorture: Rename readers_bind/writers_bind to bind_readers/bind_writers Date: Tue, 10 Oct 2023 13:59:16 +0200 Message-Id: <20231010115921.988766-19-frederic@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231010115921.988766-1-frederic@kernel.org> References: <20231010115921.988766-1-frederic@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: "Paul E. McKenney" This commit renames the readers_bind and writers_bind module parameters to bind_readers and bind_writers, respectively. This provides added clarity via the imperative mode and better organizes the documentation. Signed-off-by: Paul E. McKenney Signed-off-by: Frederic Weisbecker --- .../admin-guide/kernel-parameters.txt | 16 +++++------ kernel/locking/locktorture.c | 28 +++++++++---------- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentatio= n/admin-guide/kernel-parameters.txt index 47f8b1cef4fd..1d539c6d9d1c 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -2918,6 +2918,14 @@ acquisition. Acquisitions exceeding this limit will result in a splat once they do complete. =20 + locktorture.bind_readers=3D [KNL] + Specify the list of CPUs to which the readers are + to be bound. + + locktorture.bind_writers=3D [KNL] + Specify the list of CPUs to which the writers are + to be bound. + locktorture.call_rcu_chains=3D [KNL] Specify the number of self-propagating call_rcu() chains to set up. These are used to ensure that @@ -2952,10 +2960,6 @@ Set time (s) between CPU-hotplug operations, or zero to disable CPU-hotplug testing. =20 - locktorture.readers_bind=3D [KNL] - Specify the list of CPUs to which the readers are - to be bound. - locktorture.rt_boost=3D [KNL] Do periodic testing of real-time lock priority boosting. Select 0 to disable, 1 to boost @@ -3000,10 +3004,6 @@ locktorture.verbose=3D [KNL] Enable additional printk() statements. =20 - locktorture.writers_bind=3D [KNL] - Specify the list of CPUs to which the writers are - to be bound. - locktorture.writer_fifo=3D [KNL] Run the write-side locktorture kthreads at sched_set_fifo() real-time priority. diff --git a/kernel/locking/locktorture.c b/kernel/locking/locktorture.c index 01d56e6c44d7..a3abcd136f56 100644 --- a/kernel/locking/locktorture.c +++ b/kernel/locking/locktorture.c @@ -58,8 +58,8 @@ module_param(torture_type, charp, 0444); MODULE_PARM_DESC(torture_type, "Type of lock to torture (spin_lock, spin_lock_irq, mutex_lock, ...)"); =20 -static cpumask_var_t readers_bind; // Bind the readers to the specified se= t of CPUs. -static cpumask_var_t writers_bind; // Bind the writers to the specified se= t of CPUs. +static cpumask_var_t bind_readers; // Bind the readers to the specified se= t of CPUs. +static cpumask_var_t bind_writers; // Bind the writers to the specified se= t of CPUs. =20 // Parse a cpumask kernel parameter. If there are more users later on, // this might need to got to a more central location. @@ -102,8 +102,8 @@ static const struct kernel_param_ops lt_bind_ops =3D { .get =3D param_get_cpumask, }; =20 -module_param_cb(readers_bind, <_bind_ops, &readers_bind, 0644); -module_param_cb(writers_bind, <_bind_ops, &writers_bind, 0644); +module_param_cb(bind_readers, <_bind_ops, &bind_readers, 0644); +module_param_cb(bind_writers, <_bind_ops, &bind_writers, 0644); =20 long torture_sched_setaffinity(pid_t pid, const struct cpumask *in_mask); =20 @@ -1039,18 +1039,18 @@ lock_torture_print_module_parms(struct lock_torture= _ops *cur_ops, const char *tag) { static cpumask_t cpumask_all; - cpumask_t *rcmp =3D cpumask_nonempty(readers_bind) ? readers_bind : &cpum= ask_all; - cpumask_t *wcmp =3D cpumask_nonempty(writers_bind) ? writers_bind : &cpum= ask_all; + cpumask_t *rcmp =3D cpumask_nonempty(bind_readers) ? bind_readers : &cpum= ask_all; + cpumask_t *wcmp =3D cpumask_nonempty(bind_writers) ? bind_writers : &cpum= ask_all; =20 cpumask_setall(&cpumask_all); pr_alert("%s" TORTURE_FLAG - "--- %s%s: acq_writer_lim=3D%d call_rcu_chains=3D%d long_hold=3D%d nest= ed_locks=3D%d nreaders_stress=3D%d nwriters_stress=3D%d onoff_holdoff=3D%d = onoff_interval=3D%d rt_boost=3D%d rt_boost_factor=3D%d shuffle_interval=3D%= d shutdown_secs=3D%d stat_interval=3D%d stutter=3D%d verbose=3D%d writer_fi= fo=3D%d readers_bind=3D%*pbl writers_bind=3D%*pbl\n", + "--- %s%s: acq_writer_lim=3D%d bind_readers=3D%*pbl bind_writers=3D%*pb= l call_rcu_chains=3D%d long_hold=3D%d nested_locks=3D%d nreaders_stress=3D%= d nwriters_stress=3D%d onoff_holdoff=3D%d onoff_interval=3D%d rt_boost=3D%d= rt_boost_factor=3D%d shuffle_interval=3D%d shutdown_secs=3D%d stat_interva= l=3D%d stutter=3D%d verbose=3D%d writer_fifo=3D%d\n", torture_type, tag, cxt.debug_lock ? " [debug]": "", - acq_writer_lim, call_rcu_chains, long_hold, nested_locks, cxt.nrealread= ers_stress, + acq_writer_lim, cpumask_pr_args(rcmp), cpumask_pr_args(wcmp), + call_rcu_chains, long_hold, nested_locks, cxt.nrealreaders_stress, cxt.nrealwriters_stress, onoff_holdoff, onoff_interval, rt_boost, rt_boost_factor, shuffle_interval, shutdown_secs, stat_interval, stutte= r, - verbose, writer_fifo, - cpumask_pr_args(rcmp), cpumask_pr_args(wcmp)); + verbose, writer_fifo); } =20 // If requested, maintain call_rcu() chains to keep a grace period always @@ -1356,8 +1356,8 @@ static int __init lock_torture_init(void) writer_fifo ? sched_set_fifo : NULL); if (torture_init_error(firsterr)) goto unwind; - if (cpumask_nonempty(writers_bind)) - torture_sched_setaffinity(writer_tasks[i]->pid, writers_bind); + if (cpumask_nonempty(bind_writers)) + torture_sched_setaffinity(writer_tasks[i]->pid, bind_writers); =20 create_reader: if (cxt.cur_ops->readlock =3D=3D NULL || (j >=3D cxt.nrealreaders_stress= )) @@ -1367,8 +1367,8 @@ static int __init lock_torture_init(void) reader_tasks[j]); if (torture_init_error(firsterr)) goto unwind; - if (cpumask_nonempty(readers_bind)) - torture_sched_setaffinity(reader_tasks[j]->pid, readers_bind); + if (cpumask_nonempty(bind_readers)) + torture_sched_setaffinity(reader_tasks[j]->pid, bind_readers); } if (stat_interval > 0) { firsterr =3D torture_create_kthread(lock_torture_stats, NULL, --=20 2.34.1