From nobody Tue Oct 7 21:48:15 2025 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 5E193231833; Tue, 3 Jun 2025 11:27:31 +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=1748950053; cv=none; b=YgIQNrUUwPqrCdh2OHO+i42O0asmnl4IHxHGB4HIpxXUhaqFW/i7U09Zod6VB8GkOI+/OgiVG17Sw4yjDTXOBrEKVOkHC3W1BLaOJSZ8bKJi71iq5vhPdjgZQnQFyFRbnLBUgzkUoyvTXLVP9QBsf7A+FJD39wIOOsrUXpj8nfQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748950053; c=relaxed/simple; bh=TA7LFTdMJDELDuvkJuuGw4yjXy1LcM/cr6YWykJIBfY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=gSv4RzkRW+YDra7GUHt1tu29l3dUecgfI/3bt/t7XIaiYslzC4E0J4IESMRr3R/t4bvekYf9xjQvYazljpn9V1nS9YIRfQEYxt4odxCBrPPfA1I9ypzDWmayqGMWtXfvIEFLiKucHJupfvbOF63za43bGqIJfW24mgWvh4jkMig= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=G81lrSHQ; 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="G81lrSHQ" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 05619C4CEF0; Tue, 3 Jun 2025 11:27:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1748950051; bh=TA7LFTdMJDELDuvkJuuGw4yjXy1LcM/cr6YWykJIBfY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=G81lrSHQdo/W0nzxCgUM0MKisuhe7HBw4WlRG6zmTYHyJ1YTDdQjJ+3pw4V385LQO n/3ZDa0SgFb2adlvfGaEu0iQKFPzcxpY1eOydz2axsiao4l9EP6Ic7epZ65VZy/pa/ qrfKwqPWlcgR8zTre8qslcfX1NN6y6vMnB41y0toOkfzQK0Es2AjRiYzGN1u/93meC pkmVR9CyBawmsmKMVVtkv4n8ntDvbU0wVFTFIuC7bfSBBKM12ERKBr4Jy0lLszs8TN Kq3DnMzb9TxoRZjzfLM1+vBvL1zCWa4htrT87GEJ3+hTqdfS2/yH81p/3ma6NZeE2j 7m1TwVKFiKDHw== From: Jeff Layton Date: Tue, 03 Jun 2025 07:27:14 -0400 Subject: [PATCH v13 3/9] ref_tracker: have callers pass output function to pr_ostream() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250603-reftrack-dbgfs-v13-3-7b2a425019d8@kernel.org> References: <20250603-reftrack-dbgfs-v13-0-7b2a425019d8@kernel.org> In-Reply-To: <20250603-reftrack-dbgfs-v13-0-7b2a425019d8@kernel.org> To: Andrew Morton , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Simon Horman , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Jani Nikula , Joonas Lahtinen , Rodrigo Vivi , Tvrtko Ursulin Cc: Krzysztof Karas , Kuniyuki Iwashima , Qasim Ijaz , Nathan Chancellor , Andrew Lunn , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, Jeff Layton X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=4259; i=jlayton@kernel.org; h=from:subject:message-id; bh=TA7LFTdMJDELDuvkJuuGw4yjXy1LcM/cr6YWykJIBfY=; b=owEBbQKS/ZANAwAKAQAOaEEZVoIVAcsmYgBoPtwZ+tL2i3R5hAyydM5i/kuA60e/ElIYMt91Y sMxZE//DPKJAjMEAAEKAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaD7cGQAKCRAADmhBGVaC FdU6D/9qcbCXT9wr+e+OXqUUvsx3fD/74E7NP7UFhRiY0HOqGNpce6AcyNeLuBoi3ZH0OK4owzC SxtmD5r/fliPqJJSDciAiXUMx2bfKphAaBwyIZtXGuLl6VMSHW5DUQGaYuKEjI6kp29R59qS8t1 OAN/RbZaNB2/FEY2MxXuMa7F+u8JZgp6hnUHE4gm4GjuPzDHhuSuOyuV+8QNg4fB6erP17ebczP x11ce2wOTFrvzNPvrrL1wX3giPTw9nKsQ+f8Af7QSeNHB5hxDawnHMi+eFKi1PyySaOCAPEis2m +129ZsVi3T4Z0yABASsGGFMptn2g58o7EpRK8JGDMBdtGMJ4lDYJvCmXJBjjo+FARfCWp/KMWm9 2wRc95cs/bDJ9Ri2BaXKjfejBCDo+xlotvDIKs60fIM/XOR73LCM3EPa2AJDNb6OG/G+vhJWl5p JZSM9EmUB2UQEfa/HgsUAIKL87fAU4eHk8qtyW4BrIRIjdFbVroOcRFaKjXrvMV9ADtHnRbnI37 0XrhytBs9a+1In3FbR+3pSZZuE4U8vNG07rUjAVjjpCA3To9Jzk7TOGHSl7CXY0IaOXgUR7TBLO +hTZZw8HupF72GnSExPpo8YCeteW8a2SnvkDoAJjEm8YiphzpW2ek4teBI1lp9pmCcgRC3BUSJe oEvAOxPH+y9yyzg== X-Developer-Key: i=jlayton@kernel.org; a=openpgp; fpr=4BC0D7B24471B2A184EAF5D3000E684119568215 In a later patch, we'll be adding a 3rd mechanism for outputting ref_tracker info via seq_file. Instead of a conditional, have the caller set a pointer to an output function in struct ostream. As part of this, the log prefix must be explicitly passed in, as it's too late for the pr_fmt macro. Reviewed-by: Andrew Lunn Signed-off-by: Jeff Layton --- include/linux/ref_tracker.h | 2 ++ lib/ref_tracker.c | 52 ++++++++++++++++++++++++++++++++---------= ---- 2 files changed, 39 insertions(+), 15 deletions(-) diff --git a/include/linux/ref_tracker.h b/include/linux/ref_tracker.h index 8eac4f3d52547ccbaf9dcd09962ce80d26fbdff8..a0a1ee43724ffa00e60c116be18= e481bfe1d1455 100644 --- a/include/linux/ref_tracker.h +++ b/include/linux/ref_tracker.h @@ -6,6 +6,8 @@ #include #include =20 +#define __ostream_printf __printf(2, 3) + struct ref_tracker; =20 struct ref_tracker_dir { diff --git a/lib/ref_tracker.c b/lib/ref_tracker.c index d374e5273e1497cac0d70c02c282baa2c3ab63fe..42872f406b2a91b5bc611405cae= 7ce883fd8ed22 100644 --- a/lib/ref_tracker.c +++ b/lib/ref_tracker.c @@ -63,21 +63,38 @@ ref_tracker_get_stats(struct ref_tracker_dir *dir, unsi= gned int limit) } =20 struct ostream { + void __ostream_printf (*func)(struct ostream *stream, char *fmt, ...); + char *prefix; char *buf; int size, used; }; =20 +static void __ostream_printf pr_ostream_log(struct ostream *stream, char *= fmt, ...) +{ + va_list args; + + va_start(args, fmt); + vprintk(fmt, args); + va_end(args); +} + +static void __ostream_printf pr_ostream_buf(struct ostream *stream, char *= fmt, ...) +{ + int ret, len =3D stream->size - stream->used; + va_list args; + + va_start(args, fmt); + ret =3D vsnprintf(stream->buf + stream->used, len, fmt, args); + va_end(args); + if (ret > 0) + stream->used +=3D min(ret, len); +} + #define pr_ostream(stream, fmt, args...) \ ({ \ struct ostream *_s =3D (stream); \ \ - if (!_s->buf) { \ - pr_err(fmt, ##args); \ - } else { \ - int ret, len =3D _s->size - _s->used; \ - ret =3D snprintf(_s->buf + _s->used, len, pr_fmt(fmt), ##args); \ - _s->used +=3D min(ret, len); \ - } \ + _s->func(_s, fmt, ##args); \ }) =20 static void @@ -96,8 +113,8 @@ __ref_tracker_dir_pr_ostream(struct ref_tracker_dir *dir, =20 stats =3D ref_tracker_get_stats(dir, display_limit); if (IS_ERR(stats)) { - pr_ostream(s, "%s@%p: couldn't get stats, error %pe\n", - dir->name, dir, stats); + pr_ostream(s, "%s%s@%p: couldn't get stats, error %pe\n", + s->prefix, dir->name, dir, stats); return; } =20 @@ -107,14 +124,15 @@ __ref_tracker_dir_pr_ostream(struct ref_tracker_dir *= dir, stack =3D stats->stacks[i].stack_handle; if (sbuf && !stack_depot_snprint(stack, sbuf, STACK_BUF_SIZE, 4)) sbuf[0] =3D 0; - pr_ostream(s, "%s@%p has %d/%d users at\n%s\n", dir->name, dir, - stats->stacks[i].count, stats->total, sbuf); + pr_ostream(s, "%s%s@%p has %d/%d users at\n%s\n", s->prefix, + dir->name, dir, stats->stacks[i].count, + stats->total, sbuf); skipped -=3D stats->stacks[i].count; } =20 if (skipped) - pr_ostream(s, "%s@%p skipped reports about %d/%d users.\n", - dir->name, dir, skipped, stats->total); + pr_ostream(s, "%s%s@%p skipped reports about %d/%d users.\n", + s->prefix, dir->name, dir, skipped, stats->total); =20 kfree(sbuf); =20 @@ -124,7 +142,8 @@ __ref_tracker_dir_pr_ostream(struct ref_tracker_dir *di= r, void ref_tracker_dir_print_locked(struct ref_tracker_dir *dir, unsigned int display_limit) { - struct ostream os =3D {}; + struct ostream os =3D { .func =3D pr_ostream_log, + .prefix =3D "ref_tracker: " }; =20 __ref_tracker_dir_pr_ostream(dir, display_limit, &os); } @@ -143,7 +162,10 @@ EXPORT_SYMBOL(ref_tracker_dir_print); =20 int ref_tracker_dir_snprint(struct ref_tracker_dir *dir, char *buf, size_t= size) { - struct ostream os =3D { .buf =3D buf, .size =3D size }; + struct ostream os =3D { .func =3D pr_ostream_buf, + .prefix =3D "ref_tracker: ", + .buf =3D buf, + .size =3D size }; unsigned long flags; =20 spin_lock_irqsave(&dir->lock, flags); --=20 2.49.0