From mboxrd@z Thu Jan 1 00:00:00 1970 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 221653FE5 for ; Wed, 4 Jun 2025 02:09:12 +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=1749002952; cv=none; b=S7U4CE44uIOlj2MRNJKSmH/BVSZoSQKXajAPoOWgt2TXk3LQ+rWXrNKnr9T3IrKhjoB6pHYutN4tcvlmdji04AOjiYRF/SMqFwPattC7He7LXJdaVMWFOfBlKpd12I92EIrt6RMm2F5iRNFciV0N42cZqZVudyxxWqLh+wXBSQw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1749002952; c=relaxed/simple; bh=/6AEfYeBhkzaoSiA+ul9OVvlQWKANsZt/ELYw3/XoPM=; h=Date:To:From:Subject:Message-Id; b=Em8uq15CYgf3f1z4p2zlGoOhhEtJzGiFPvsCkHJBrMRlon9gqD61Yd/VBMSgzCT9IWR0O41p0JdI8r+5SLF8cHvjUYOoF7xjFIho5GZyxfx7hZXmx0vAj0O4Nr4UipbfkBiwgxwP4OoTc9OHsvj6XUyqCjqflJwJJeEBuZin0xU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=chpd7GRG; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="chpd7GRG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D9442C4CEEF; Wed, 4 Jun 2025 02:09:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1749002952; bh=/6AEfYeBhkzaoSiA+ul9OVvlQWKANsZt/ELYw3/XoPM=; h=Date:To:From:Subject:From; b=chpd7GRGBF9varB1XH0LTIw9vSb9O1TMvFohbuu3Nd9QEhLI6F1cNNkX9ud1U2rVs Yt9730NlsqCiiplc/59SrfC8oup4LjzX/OqLoObuEP0LD+ZeK+W+vx3jr/pXHdMJCQ dpf+yfvYdrYMyDX7LhPZSrHTMhKGbEyKDOCwxiug= Date: Tue, 03 Jun 2025 19:09:11 -0700 To: mm-commits@vger.kernel.org,tzimmermann@suse.de,tursulin@ursulin.net,thomas.weissschuh@linutronix.de,rodrigo.vivi@intel.com,qasdev00@gmail.com,pabeni@redhat.com,nathan@kernel.org,mripard@kernel.org,maarten.lankhorst@linux.intel.com,kuniyu@amazon.com,kuba@kernel.org,krzysztof.karas@intel.com,joonas.lahtinen@linux.intel.com,jani.nikula@linux.intel.com,horms@kernel.org,edumazet@google.com,davem@davemloft.net,andrew@lunn.ch,airlied@gmail.com,jlayton@kernel.org,akpm@linux-foundation.org From: Andrew Morton Subject: + ref_tracker-have-callers-pass-output-function-to-pr_ostream.patch added to mm-nonmm-unstable branch Message-Id: <20250604020911.D9442C4CEEF@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The patch titled Subject: ref_tracker: have callers pass output function to pr_ostream() has been added to the -mm mm-nonmm-unstable branch. Its filename is ref_tracker-have-callers-pass-output-function-to-pr_ostream.patch This patch will shortly appear at https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/ref_tracker-have-callers-pass-output-function-to-pr_ostream.patch This patch will later appear in the mm-nonmm-unstable branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/process/submit-checklist.rst when testing your code *** The -mm tree is included into linux-next via the mm-everything branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm and is updated there every 2-3 working days ------------------------------------------------------ From: Jeff Layton Subject: ref_tracker: have callers pass output function to pr_ostream() Date: Tue, 03 Jun 2025 07:27:14 -0400 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. Link: https://lkml.kernel.org/r/20250603-reftrack-dbgfs-v13-3-7b2a425019d8@kernel.org Signed-off-by: Jeff Layton Reviewed-by: Andrew Lunn Cc: Dave Airlie Cc: David S. Miller Cc: Eric Dumaze Cc: Jakub Kacinski Cc: Jani Nikula Cc: Jonas Lahtinen Cc: Krzysztof Karas Cc: Kuniyuki Iwashima Cc: Maarten Lankhorst Cc: Maxime Ripard Cc: Nathan Chancellor Cc: Paolo Abeni Cc: Qasim Ijaz Cc: Rodrigo Vivi Cc: Simon Horman Cc: Thomas Weißschuh Cc: Thomas Zimemrmann Cc: Tvrtko Ursulin Signed-off-by: Andrew Morton --- include/linux/ref_tracker.h | 2 + lib/ref_tracker.c | 52 ++++++++++++++++++++++++---------- 2 files changed, 39 insertions(+), 15 deletions(-) --- a/include/linux/ref_tracker.h~ref_tracker-have-callers-pass-output-function-to-pr_ostream +++ a/include/linux/ref_tracker.h @@ -6,6 +6,8 @@ #include #include +#define __ostream_printf __printf(2, 3) + struct ref_tracker; struct ref_tracker_dir { --- a/lib/ref_tracker.c~ref_tracker-have-callers-pass-output-function-to-pr_ostream +++ a/lib/ref_tracker.c @@ -63,21 +63,38 @@ ref_tracker_get_stats(struct ref_tracker } struct ostream { + void __ostream_printf (*func)(struct ostream *stream, char *fmt, ...); + char *prefix; char *buf; int size, used; }; +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 = stream->size - stream->used; + va_list args; + + va_start(args, fmt); + ret = vsnprintf(stream->buf + stream->used, len, fmt, args); + va_end(args); + if (ret > 0) + stream->used += min(ret, len); +} + #define pr_ostream(stream, fmt, args...) \ ({ \ struct ostream *_s = (stream); \ \ - if (!_s->buf) { \ - pr_err(fmt, ##args); \ - } else { \ - int ret, len = _s->size - _s->used; \ - ret = snprintf(_s->buf + _s->used, len, pr_fmt(fmt), ##args); \ - _s->used += min(ret, len); \ - } \ + _s->func(_s, fmt, ##args); \ }) static void @@ -96,8 +113,8 @@ __ref_tracker_dir_pr_ostream(struct ref_ stats = 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; } @@ -107,14 +124,15 @@ __ref_tracker_dir_pr_ostream(struct ref_ stack = stats->stacks[i].stack_handle; if (sbuf && !stack_depot_snprint(stack, sbuf, STACK_BUF_SIZE, 4)) sbuf[0] = 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 -= stats->stacks[i].count; } 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); kfree(sbuf); @@ -124,7 +142,8 @@ __ref_tracker_dir_pr_ostream(struct ref_ void ref_tracker_dir_print_locked(struct ref_tracker_dir *dir, unsigned int display_limit) { - struct ostream os = {}; + struct ostream os = { .func = pr_ostream_log, + .prefix = "ref_tracker: " }; __ref_tracker_dir_pr_ostream(dir, display_limit, &os); } @@ -143,7 +162,10 @@ EXPORT_SYMBOL(ref_tracker_dir_print); int ref_tracker_dir_snprint(struct ref_tracker_dir *dir, char *buf, size_t size) { - struct ostream os = { .buf = buf, .size = size }; + struct ostream os = { .func = pr_ostream_buf, + .prefix = "ref_tracker: ", + .buf = buf, + .size = size }; unsigned long flags; spin_lock_irqsave(&dir->lock, flags); _ Patches currently in -mm which might be from jlayton@kernel.org are ref_tracker-dont-use-%pk-in-pr_ostream-output.patch ref_tracker-add-a-top-level-debugfs-directory-for-ref_tracker.patch ref_tracker-have-callers-pass-output-function-to-pr_ostream.patch ref_tracker-add-a-static-classname-string-to-each-ref_tracker_dir.patch ref_tracker-allow-pr_ostream-to-print-directly-to-a-seq_file.patch ref_tracker-automatically-register-a-file-in-debugfs-for-a-ref_tracker_dir.patch ref_tracker-add-a-way-to-create-a-symlink-to-the-ref_tracker_dir-debugfs-file.patch net-add-symlinks-to-ref_tracker_dir-for-netns.patch ref_tracker-eliminate-the-ref_tracker_dir-name-field.patch