From nobody Mon Feb 9 10:26:27 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D1C4F11712 for ; Wed, 30 Apr 2025 01:05:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745975126; cv=none; b=ng6pyXjh+CwVSiQyZF22a4/7bTbC5BeF4542D0y7eN5DnznBbct8U/RGmzChtyo2UF/FqvCbnpjjc9SeM601FQdlruFXmrLMbq8TvAKoj02hamVv8Z4HtH/aHBN0T3IQqh0yiUsNiqJehvYriLykYhmJNTKbDVqcJ9TcQR48Wrg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745975126; c=relaxed/simple; bh=N3RIolT2/wwpsyp3qVL0vety09DWGenJ3HGIlVCg+P0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=tTvEWLAneR1X4VSAHzGVWBymCLFu2hVdpqT2UIE1siVcDy+Jh80QG+E2xhs4mTV87Q1UdfzFi0pWdrKYOWYSruwjzjtbGrxSU7KvMLB0uBBTcOcxp5gFhrbCq6U/kuf0T1RjoCBhMmDFzsNmHDifKErROlchnx+rlvnqQdgnqaw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=OtV0/lFX; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="OtV0/lFX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 621E7C4CEED; Wed, 30 Apr 2025 01:05:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1745975126; bh=N3RIolT2/wwpsyp3qVL0vety09DWGenJ3HGIlVCg+P0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OtV0/lFX2qmoJ7fHvG5EdLqgeuJ0Sm79t1SeFHcHJ3K0nwFvue7YvDYn+akTnDneC fg/IcTLE3kpWjCg0ccDSP4m3Y3mQEdAKp+4uF5CfQHpxPNt2WUpebhrcvp76jZFe6E eChDq5euQTXGy0ClmmFTLj+fox4AdjJNvmo/3yJFTeWKb+zX5BM+PJjsKcoxOhHJ48 jky+bkPgXoyUmkUiiCeZ7RhdryT3Wlwmrtv/8wh066o40OKtcfITWPyHxu2IHO3BrF y+jKvlaIKs1L1srqX6ZetQjwxLXA2IIunsYUx92Jf7hxy2T6++8siBJB6ICzqf9krE BHnr4XNVsuMig== Received: by paulmck-ThinkPad-P17-Gen-1.home (Postfix, from userid 1000) id 418E6CE084A; Tue, 29 Apr 2025 18:05:25 -0700 (PDT) From: "Paul E. McKenney" To: linux-kernel@vger.kernel.org Cc: kernel-team@meta.com, Andrew Morton , Kuniyuki Iwashima , Mateusz Guzik , Petr Mladek , Steven Rostedt , John Ogness , Sergey Senozhatsky , Jon Pan-Doh , Bjorn Helgaas , Karolina Stolarek , "Paul E. McKenney" Subject: [PATCH v4 02/20] ratelimit: Create functions to handle ratelimit_state internals Date: Tue, 29 Apr 2025 18:05:06 -0700 Message-Id: <20250430010524.3614408-2-paulmck@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" A number of ratelimit use cases do open-coded access to the ratelimit_state structure's ->missed field. This works, but is a bit messy and makes it more annoying to make changes to this field. Therefore, provide a ratelimit_state_inc_miss() function that increments the ->missed field, a ratelimit_state_get_miss() function that reads out the ->missed field, and a ratelimit_state_reset_miss() function that reads out that field, but that also resets its value to zero. These functions will replace client-code open-coded uses of ->missed. In addition, a new ratelimit_state_reset_interval() function encapsulates what was previously open-coded lock acquisition and direct field updates. [ paulmck: Apply kernel test robot feedback. ] Link: https://lore.kernel.org/all/fbe93a52-365e-47fe-93a4-44a44547d601@paul= mck-laptop/ Link: https://lore.kernel.org/all/20250423115409.3425-1-spasswolf@web.de/ Signed-off-by: Paul E. McKenney Reviewed-by: Petr Mladek Cc: Andrew Morton Cc: Kuniyuki Iwashima Cc: Mateusz Guzik Cc: Steven Rostedt Cc: John Ogness Cc: Sergey Senozhatsky --- include/linux/ratelimit.h | 40 ++++++++++++++++++++++++++++++++++----- lib/ratelimit.c | 8 ++++---- 2 files changed, 39 insertions(+), 9 deletions(-) diff --git a/include/linux/ratelimit.h b/include/linux/ratelimit.h index b17e0cd0a30cf..8400c5356c187 100644 --- a/include/linux/ratelimit.h +++ b/include/linux/ratelimit.h @@ -22,16 +22,46 @@ static inline void ratelimit_default_init(struct rateli= mit_state *rs) DEFAULT_RATELIMIT_BURST); } =20 +static inline void ratelimit_state_inc_miss(struct ratelimit_state *rs) +{ + rs->missed++; +} + +static inline int ratelimit_state_get_miss(struct ratelimit_state *rs) +{ + return rs->missed; +} + +static inline int ratelimit_state_reset_miss(struct ratelimit_state *rs) +{ + int ret =3D rs->missed; + + rs->missed =3D 0; + return ret; +} + +static inline void ratelimit_state_reset_interval(struct ratelimit_state *= rs, int interval_init) +{ + unsigned long flags; + + raw_spin_lock_irqsave(&rs->lock, flags); + rs->interval =3D interval_init; + rs->begin =3D 0; + rs->printed =3D 0; + ratelimit_state_reset_miss(rs); + raw_spin_unlock_irqrestore(&rs->lock, flags); +} + static inline void ratelimit_state_exit(struct ratelimit_state *rs) { + int m; + if (!(rs->flags & RATELIMIT_MSG_ON_RELEASE)) return; =20 - if (rs->missed) { - pr_warn("%s: %d output lines suppressed due to ratelimiting\n", - current->comm, rs->missed); - rs->missed =3D 0; - } + m =3D ratelimit_state_reset_miss(rs); + if (m) + pr_warn("%s: %d output lines suppressed due to ratelimiting\n", current-= >comm, m); } =20 static inline void diff --git a/lib/ratelimit.c b/lib/ratelimit.c index ce945c17980b9..85e22f00180c5 100644 --- a/lib/ratelimit.c +++ b/lib/ratelimit.c @@ -51,12 +51,12 @@ int ___ratelimit(struct ratelimit_state *rs, const char= *func) rs->begin =3D jiffies; =20 if (time_is_before_jiffies(rs->begin + interval)) { - if (rs->missed) { + int m =3D ratelimit_state_reset_miss(rs); + + if (m) { if (!(rs->flags & RATELIMIT_MSG_ON_RELEASE)) { printk_deferred(KERN_WARNING - "%s: %d callbacks suppressed\n", - func, rs->missed); - rs->missed =3D 0; + "%s: %d callbacks suppressed\n", func, m); } } rs->begin =3D jiffies; --=20 2.40.1