From nobody Sat Feb 7 21:14:41 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 54F6BC7EE24 for ; Wed, 31 May 2023 10:18:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235871AbjEaKSN (ORCPT ); Wed, 31 May 2023 06:18:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35948 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234902AbjEaKR6 (ORCPT ); Wed, 31 May 2023 06:17:58 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 67BDB13E; Wed, 31 May 2023 03:17:57 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 7298760EFE; Wed, 31 May 2023 10:17:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6ED96C433EF; Wed, 31 May 2023 10:17:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1685528275; bh=V2pULL6IX7rEXNXR3IXgioKKTYc27dEUYXc+7cPP0iA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=m/Zre9LvUfzC2p/nEewycKx9N2uzuB5M4uMoOrgQ51lx1M78xh13elU8WAn6WzmBx FmasKscjTZWx/8oAo0ziDp1QgjQuRKuI4+MvyzxPmtaWrr0u8fRJKZgnojAXLolsIQ OcdN1Cvw7PuxpSsGIuqO04M+YrC1/q13zPurAQloyFpgBWK5INUDAjnnrOsFFmDGIQ 2UvBEIPDKYuB23h25IupgEpOIpRNpQU5YMPA3bkux0tHVoCxFKnqjNIM3CDhe3hMps FxnR5fewL6m+1lchavyNiAqZxJ3DUgxcrde2uj+rNbTgOnorC7TPjKYquWMMTUKBt5 m9kNrzHqQS1VA== From: Frederic Weisbecker To: "Paul E . McKenney" Cc: LKML , Frederic Weisbecker , rcu , Uladzislau Rezki , Neeraj Upadhyay , Joel Fernandes , Giovanni Gherdovich Subject: [PATCH 3/9] rcu: Rename jiffies_till_flush to jiffies_lazy_flush Date: Wed, 31 May 2023 12:17:30 +0200 Message-Id: <20230531101736.12981-4-frederic@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230531101736.12981-1-frederic@kernel.org> References: <20230531101736.12981-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" The variable name jiffies_till_flush is too generic and therefore: * It may shadow a global variable * It doesn't tell on what it operates Make the name more precise, along with the related APIs. Signed-off-by: Frederic Weisbecker --- kernel/rcu/rcu.h | 8 ++++---- kernel/rcu/rcuscale.c | 6 +++--- kernel/rcu/tree_nocb.h | 20 ++++++++++---------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/kernel/rcu/rcu.h b/kernel/rcu/rcu.h index 98c1544cf572..236d6f837c49 100644 --- a/kernel/rcu/rcu.h +++ b/kernel/rcu/rcu.h @@ -526,11 +526,11 @@ enum rcutorture_type { }; =20 #if defined(CONFIG_RCU_LAZY) -unsigned long rcu_lazy_get_jiffies_till_flush(void); -void rcu_lazy_set_jiffies_till_flush(unsigned long j); +unsigned long rcu_get_jiffies_lazy_flush(void); +void rcu_set_jiffies_lazy_flush(unsigned long j); #else -static inline unsigned long rcu_lazy_get_jiffies_till_flush(void) { return= 0; } -static inline void rcu_lazy_set_jiffies_till_flush(unsigned long j) { } +static inline unsigned long rcu_get_jiffies_lazy_flush(void) { return 0; } +static inline void rcu_set_jiffies_lazy_flush(unsigned long j) { } #endif =20 #if defined(CONFIG_TREE_RCU) diff --git a/kernel/rcu/rcuscale.c b/kernel/rcu/rcuscale.c index 7fba3ab66e35..53ec80868791 100644 --- a/kernel/rcu/rcuscale.c +++ b/kernel/rcu/rcuscale.c @@ -725,9 +725,9 @@ kfree_scale_init(void) =20 if (kfree_by_call_rcu) { /* do a test to check the timeout. */ - orig_jif =3D rcu_lazy_get_jiffies_till_flush(); + orig_jif =3D rcu_get_jiffies_lazy_flush(); =20 - rcu_lazy_set_jiffies_till_flush(2 * HZ); + rcu_set_jiffies_lazy_flush(2 * HZ); rcu_barrier(); =20 jif_start =3D jiffies; @@ -736,7 +736,7 @@ kfree_scale_init(void) =20 smp_cond_load_relaxed(&rcu_lazy_test1_cb_called, VAL =3D=3D 1); =20 - rcu_lazy_set_jiffies_till_flush(orig_jif); + rcu_set_jiffies_lazy_flush(orig_jif); =20 if (WARN_ON_ONCE(jiffies_at_lazy_cb - jif_start < 2 * HZ)) { pr_alert("ERROR: call_rcu() CBs are not being lazy as expected!\n"); diff --git a/kernel/rcu/tree_nocb.h b/kernel/rcu/tree_nocb.h index 43229d2b0c44..8320eb77b58b 100644 --- a/kernel/rcu/tree_nocb.h +++ b/kernel/rcu/tree_nocb.h @@ -264,21 +264,21 @@ static bool wake_nocb_gp(struct rcu_data *rdp, bool f= orce) * left unsubmitted to RCU after those many jiffies. */ #define LAZY_FLUSH_JIFFIES (10 * HZ) -static unsigned long jiffies_till_flush =3D LAZY_FLUSH_JIFFIES; +static unsigned long jiffies_lazy_flush =3D LAZY_FLUSH_JIFFIES; =20 #ifdef CONFIG_RCU_LAZY // To be called only from test code. -void rcu_lazy_set_jiffies_till_flush(unsigned long jif) +void rcu_lazy_set_jiffies_lazy_flush(unsigned long jif) { - jiffies_till_flush =3D jif; + jiffies_lazy_flush =3D jif; } -EXPORT_SYMBOL(rcu_lazy_set_jiffies_till_flush); +EXPORT_SYMBOL(rcu_lazy_set_jiffies_lazy_flush); =20 -unsigned long rcu_lazy_get_jiffies_till_flush(void) +unsigned long rcu_lazy_get_jiffies_lazy_flush(void) { - return jiffies_till_flush; + return jiffies_lazy_flush; } -EXPORT_SYMBOL(rcu_lazy_get_jiffies_till_flush); +EXPORT_SYMBOL(rcu_lazy_get_jiffies_lazy_flush); #endif =20 /* @@ -299,7 +299,7 @@ static void wake_nocb_gp_defer(struct rcu_data *rdp, in= t waketype, */ if (waketype =3D=3D RCU_NOCB_WAKE_LAZY && rdp->nocb_defer_wakeup =3D=3D RCU_NOCB_WAKE_NOT) { - mod_timer(&rdp_gp->nocb_timer, jiffies + jiffies_till_flush); + mod_timer(&rdp_gp->nocb_timer, jiffies + jiffies_lazy_flush); WRITE_ONCE(rdp_gp->nocb_defer_wakeup, waketype); } else if (waketype =3D=3D RCU_NOCB_WAKE_BYPASS) { mod_timer(&rdp_gp->nocb_timer, jiffies + 2); @@ -482,7 +482,7 @@ static bool rcu_nocb_try_bypass(struct rcu_data *rdp, s= truct rcu_head *rhp, // flush ->nocb_bypass to ->cblist. if ((ncbs && !bypass_is_lazy && j !=3D READ_ONCE(rdp->nocb_bypass_first))= || (ncbs && bypass_is_lazy && - (time_after(j, READ_ONCE(rdp->nocb_bypass_first) + jiffies_till_flus= h))) || + (time_after(j, READ_ONCE(rdp->nocb_bypass_first) + jiffies_lazy_flus= h))) || ncbs >=3D qhimark) { rcu_nocb_lock(rdp); *was_alldone =3D !rcu_segcblist_pend_cbs(&rdp->cblist); @@ -723,7 +723,7 @@ static void nocb_gp_wait(struct rcu_data *my_rdp) lazy_ncbs =3D READ_ONCE(rdp->lazy_len); =20 if (bypass_ncbs && (lazy_ncbs =3D=3D bypass_ncbs) && - (time_after(j, READ_ONCE(rdp->nocb_bypass_first) + jiffies_till_flus= h) || + (time_after(j, READ_ONCE(rdp->nocb_bypass_first) + jiffies_lazy_flus= h) || bypass_ncbs > 2 * qhimark)) { flush_bypass =3D true; } else if (bypass_ncbs && (lazy_ncbs !=3D bypass_ncbs) && --=20 2.40.1