From nobody Mon Feb 9 17:35:43 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 EF9FF2609D3; Wed, 30 Apr 2025 15:07:05 +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=1746025626; cv=none; b=Viox4Bc9vAg5/pq6IxFsdiG9HVNxEf5i82wDR3Ay8HU24AHs8Tumirp2vvyUUbQ7HFlFuWQFwx/HxiOVI1pmGevw0kgVY7h7ykEwNI+zytLkRLYVShw4JH6SOj5VEnSnaSSstQIOf6AjNMKfNSwECKOJthkmkrnWBF6qblliMuo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746025626; c=relaxed/simple; bh=D7eYUyrEMPuIlNDnf5xYhfYtI7n2pvxbIb5qGlnf6w4=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=aJZ3xlCdpKWS6LxGngjft3WhFYXpE1pKGXDD9h5KkfkyrnmBeJ0OdGCDimqxptPszo5MZ9qksL00+fVEI5gEIelm+1MlTxtzLzg9pUQh1sNtxHFpCNq3R2VLkRIqz+bI4d24ryDemxSEtPIit2iJKP471aDrPUTzXONlvoShE+g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=PwDE+QTm; 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="PwDE+QTm" Received: by smtp.kernel.org (Postfix) with ESMTPSA id ECD77C4CEEE; Wed, 30 Apr 2025 15:07:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746025625; bh=D7eYUyrEMPuIlNDnf5xYhfYtI7n2pvxbIb5qGlnf6w4=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=PwDE+QTm8euiz6JCbtrNwmYZkLWFW7xN3MYiq4BG+ZxPDV+fCCJky87Nm4mtBpAUT WTItyVAkg8gGcJv784Us80anEd7yCHSiMbY1LeC7D9NCs254opjY8su/225woP6Of8 DbStG2On+H8BVp1BcdAsNzV6FLhTqmlnERekvAn9k2mw75e9V8nKT3OuJx7ok5DrJ4 VsAybpzY1RcEH9it6BS1Hmsa7nUQRESiasnQnsmKTpsbeO4oRlWr3shgylwZXKne6x A4/O4D6+BgrpNwVCvd/5yOZgiZqabRCndmQa68xLMo9Nx9KrAh6eviSuYmwfG8FXMn +Acqd+sEqR0dQ== From: Jeff Layton Date: Wed, 30 Apr 2025 08:06:49 -0700 Subject: [PATCH v6 03/10] 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: <20250430-reftrack-dbgfs-v6-3-867c29aff03a@kernel.org> References: <20250430-reftrack-dbgfs-v6-0-867c29aff03a@kernel.org> In-Reply-To: <20250430-reftrack-dbgfs-v6-0-867c29aff03a@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: 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=3845; i=jlayton@kernel.org; h=from:subject:message-id; bh=D7eYUyrEMPuIlNDnf5xYhfYtI7n2pvxbIb5qGlnf6w4=; b=owEBbQKS/ZANAwAIAQAOaEEZVoIVAcsmYgBoEjyTiIARanPYQArsviqK9IeK73cqDlVhO1+v9 E7Ob19cvaOJAjMEAAEIAB0WIQRLwNeyRHGyoYTq9dMADmhBGVaCFQUCaBI8kwAKCRAADmhBGVaC FZzHEADTHkCMU5FFtaPA6Y9omm9SFcBj15BwaZngJOAqNsAm9nFXzgcPgEMt9y4i4MGB8oZ0Bzo tlaG7rpjQxyeBOLpa4uOCEdIyKHuaO5v0kBgG+zw81KEsz62ZhT8ddMxc4O9ik9lTYl2dteORvr wvHNRsrclFnuSznhi3e94XyzmWhIaY2H71bhb2Z7Zk39FT7QCPSZDZQ9brUShhqs5tkRBZOtJWK EYHCw+NbUpQRHFWiCUFYmFIctJFbdSzxcKAcS7ALgp2LV0q1e2eC2IVgJfPOp1Rqsez1yQz2nIx e1zjOaNuNKaWX6L3UDVgVmCj+a2+Ko7VQ/fT4SAqn5hW31RwDti7yOC8WYkL2Uvew+0K9P3BfRd 7kOlR9hoPrIDIijh0yb99jNls6UbIbb5bn1JkhKPqNlvOYNVqgxW2mNiVGr0jVDqir/sNdgqqtp wuyR0xCjT8MwofIjnoySLb5PDBy/GzmycLlhdOFsi8TIgDjcq5EhiLGp9nh7PobsBvAkvN/2/7Y 1Rkchwi9pm1ms08bS282ntZ6hB9Tw6+X5JpCs2qO2aOFsqjWh58OR6dFdvdeZ7MDehOxRvdY5dS TYdKikOU7PXPkIXl7qg1NKLqEhb2N4+uGCPjxpgMG5vHHDShGfCGyDbiHntZQmKtCdglkxx3FIe JNYUn5dqoeqX5jw== 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 --- lib/ref_tracker.c | 53 ++++++++++++++++++++++++++++++++++++++-------------= -- 1 file changed, 38 insertions(+), 15 deletions(-) diff --git a/lib/ref_tracker.c b/lib/ref_tracker.c index a66cde325920780cfe7529ea9d827d0ee943318d..b6e0a87dd75eddef4d504419c0c= f398ea65c19d8 100644 --- a/lib/ref_tracker.c +++ b/lib/ref_tracker.c @@ -64,22 +64,40 @@ ref_tracker_get_stats(struct ref_tracker_dir *dir, unsi= gned int limit) return stats; } =20 +#define __ostream_printf __printf(2, 3) + 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); + 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 @@ -98,8 +116,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 @@ -109,14 +127,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 @@ -126,7 +145,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); } @@ -145,7 +165,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