From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AACBF49BD77 for ; Thu, 24 Sep 2026 14:58:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.69 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790261920; cv=none; b=pLR2TgE7R4uLXIFfr/uZxZMyAlg2UrEGXqQ36PhkMBn8swJTtKPtSxvtyaF5WqXBUdS9Q7fwI0kzDfAcplfcLo52Usw/TXS/qg4rYzC2+Ugozh3ZXfTyMerLlkbJgXGH0YyNTfi+MY1ROIIpFdY2MVTrucSJ44+0jGYSD/WigY0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790261920; c=relaxed/simple; bh=wwrgRkkwrAfEymNxm6IZDWBMrmKFtLhd6iSSndLt2dU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=BxfwAT5Cpm53wvF5L5CmahMF9Ysf3FDa7MSwRZj1iraTB19dOWSxnM7nJhzTpXLR4CON9XnECbm76dXpRrvSLd5QJLupwjh7dtKv043zdSojSoUfgQ300i3rRcsboAY5t2pmkEyCnl+I3GMkrtK9pwFOeFR1UAuynCUC/4U5nk0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--vdonnefort.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=FEBie7DM; arc=none smtp.client-ip=209.85.221.69 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--vdonnefort.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="FEBie7DM" Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-47d81cf0c4cso1533623f8f.2 for ; Thu, 24 Sep 2026 07:58:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1790261913; x=1790866713; darn=vger.kernel.org; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=tUj0Ko9jiYVxaTw/TrN9RLHuqNpikUlhKmgKV9EDFGg=; b=FEBie7DMYRmtdAmU7Ms60QQwY5txFTa7Nh6aBRLk4OQ3w27HJ8lsvQMcJ5T+QWwR8v NkswUBW1Z2yfyNC8Tc8wSLIpOd8WRKCDACb/llLKD6YBeHz2SZy7rH8ggj7BCREaoNGk NDDUqorR6gcgMSUJVkqOehChsrqRI2MV91D/FHMmeCmZ1a8mipor/tQD9BmSuVq1ZqdG r/a7cG7ZHQApgbJo/b0CF2unVXjw+J6q0VOtF0WMkAfuBZG1pd6+w50lEm8LF/rqvZ4K zkXjcWcZU31BcqRBmBQkSWUmcg6C1NoFmKEZOdWOg3HEg0KcBdfZtp8+pI6jo6bI8/XV MN2w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790261913; x=1790866713; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=tUj0Ko9jiYVxaTw/TrN9RLHuqNpikUlhKmgKV9EDFGg=; b=xQ/bR8aXeqxTs3Vy06XYW9R+IJsRCX5o1wdUC3N4ph5eQtmbok/eyGN27YolBm0I3c nYtxRjEjXSV2S3zb+ZADlg92h/D8qWR2Lo728miaBjkgCJGKQDspisvjvBM9415mszYQ lJLUO0hncwMdO37vjks+6h28s2HT1thaRHjg1rFvEVM+qnh2or1cC6G53sEhDgQ7mQ6/ ZTJXPlvAwCMOWYdj93KyDEZLP0yz1Mq61jKu91LSJhffCdzLHDn2O5/ihvGKJT1LBZXd OWU5JWkxFc5LY//Os+B27W5pfgGj+zrPk8lkRtN1XZqmtV27Lv73dkORwFhHUqBehFAC Nu5Q== X-Forwarded-Encrypted: i=1; AKwUvBxMtDBnkwA9i8dg00J9XLYbPQkq+Gqxxowrd7l47SYaN2Pz4eypVJqXh82lu2U3nVnyX13udeCxzssWwAs=@vger.kernel.org X-Gm-Message-State: AFuF++nUMST2R9xM0Ggf6wQ8DJhc0NfrwFky67T5b37INCcX30iOBJUG lXC303q7qCxfox5DzJ6MhnhJvfPcv6gCnMjADcWfxQDH83FenB51s85p4vMzwdc+LqbhZ00eaSU MxxgtzfQ+rs47tBWA5+SXpA== X-Received: from wrbfk16.prod.google.com ([2002:a05:6000:2710:b0:487:19c4:5c4b]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:6000:2f8a:b0:487:27f6:a4d2 with SMTP id ffacd0b85a97d-488716a5f27mr4984521f8f.34.1790261912738; Thu, 24 Sep 2026 07:58:32 -0700 (PDT) Date: Thu, 24 Sep 2026 15:57:42 +0100 In-Reply-To: <20260924145754.1285146-1-vdonnefort@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260924145754.1285146-1-vdonnefort@google.com> X-Mailer: git-send-email 2.56.0.rc1.310.g51773c2048-goog Message-ID: <20260924145754.1285146-9-vdonnefort@google.com> Subject: [PATCH v7 08/20] tracing/remotes: Add dmesg tracefs file From: Vincent Donnefort To: rostedt@goodmis.org, mhiramat@kernel.org, linux-trace-kernel@vger.kernel.org Cc: mathieu.desnoyers@efficios.com, kernel-team@android.com, linux-kernel@vger.kernel.org, Vincent Donnefort Content-Type: text/plain; charset="UTF-8" When enabled, the dmesg tracefs file enables the redirection of all events to dmesg. This is similar to tp_printk. Signed-off-by: Vincent Donnefort --- kernel/trace/trace_remote.c | 139 ++++++++++++++++++++++++++++++++---- 1 file changed, 125 insertions(+), 14 deletions(-) diff --git a/kernel/trace/trace_remote.c b/kernel/trace/trace_remote.c index 2b5020d2c138..79afb2cdf358 100644 --- a/kernel/trace/trace_remote.c +++ b/kernel/trace/trace_remote.c @@ -21,6 +21,7 @@ enum tri_type { TRI_CONSUMING, TRI_NONCONSUMING, + TRI_DMESG, }; struct trace_remote_iterator { @@ -43,6 +44,7 @@ struct trace_remote { void *priv; struct trace_buffer *trace_buffer; struct trace_buffer_desc *trace_buffer_desc; + struct trace_remote_iterator *dmesg; struct dentry *dentry; struct eventfs_inode *eventfs_root; struct eventfs_inode *eventfs_subdir; @@ -395,10 +397,15 @@ static int __alloc_ring_buffer_iter(struct trace_remote_iterator *iter, int cpu) return 0; } +static bool trace_remote_do_dmesg(struct trace_remote *remote); + static void trace_remote_do_poll(struct trace_remote *remote) { + bool yield; + ring_buffer_poll_remote(remote->trace_buffer, RING_BUFFER_ALL_CPUS); - schedule_delayed_work(&remote->poll_work, msecs_to_jiffies(remote->poll_ms)); + yield = trace_remote_do_dmesg(remote); + schedule_delayed_work(&remote->poll_work, yield ? 0 : msecs_to_jiffies(remote->poll_ms)); } static void __poll_remote(struct work_struct *work) @@ -453,6 +460,14 @@ static struct trace_remote_iterator trace_seq_init(&iter->seq); switch (type) { + case TRI_DMESG: + /* only one dmesg iter allowed */ + if (WARN_ON_ONCE(remote->dmesg)) { + ret = -EBUSY; + break; + } + smp_store_release(&remote->dmesg, iter); + fallthrough; case TRI_CONSUMING: trace_remote_inc_poll(remote); break; @@ -487,6 +502,11 @@ static void trace_remote_iter_free(struct trace_remote_iterator *iter) lockdep_assert_held(&remote->lock); switch (iter->type) { + case TRI_DMESG: + WARN_ON_ONCE(remote->dmesg != iter); + smp_store_release(&remote->dmesg, NULL); + flush_delayed_work(&remote->poll_work); + fallthrough; case TRI_CONSUMING: trace_remote_dec_poll(remote); break; @@ -499,13 +519,24 @@ static void trace_remote_iter_free(struct trace_remote_iterator *iter) trace_remote_put(remote); } +static bool trace_remote_iter_is_consuming(struct trace_remote_iterator *iter) +{ + switch (iter->type) { + case TRI_CONSUMING: + case TRI_DMESG: + return true; + default: + return false; + } +} + static void trace_remote_iter_read_start(struct trace_remote_iterator *iter) { struct trace_remote *remote = iter->remote; int cpu = iter->cpu; /* Acquire global reader lock */ - if (cpu == RING_BUFFER_ALL_CPUS && iter->type == TRI_CONSUMING) + if (cpu == RING_BUFFER_ALL_CPUS && trace_remote_iter_is_consuming(iter)) down_write(&remote->reader_lock); else down_read(&remote->reader_lock); @@ -522,7 +553,7 @@ static void trace_remote_iter_read_start(struct trace_remote_iterator *iter) if (WARN_ON_ONCE(!remote->pcpu_reader_locks)) return; - if (iter->type == TRI_CONSUMING) + if (trace_remote_iter_is_consuming(iter)) down_write(&remote->pcpu_reader_locks[cpu]); else down_read(&remote->pcpu_reader_locks[cpu]); @@ -539,14 +570,14 @@ static void trace_remote_iter_read_finished(struct trace_remote_iterator *iter) * No need for the remote lock here, iter holds a reference on * remote->nr_readers */ - if (iter->type == TRI_CONSUMING) + if (trace_remote_iter_is_consuming(iter)) up_write(&remote->pcpu_reader_locks[cpu]); else up_read(&remote->pcpu_reader_locks[cpu]); } /* Release global reader lock */ - if (cpu == RING_BUFFER_ALL_CPUS && iter->type == TRI_CONSUMING) + if (cpu == RING_BUFFER_ALL_CPUS && trace_remote_iter_is_consuming(iter)) up_write(&remote->reader_lock); else up_read(&remote->reader_lock); @@ -563,10 +594,9 @@ __peek_event(struct trace_remote_iterator *iter, int cpu, u64 *ts, unsigned long struct ring_buffer_event *rb_evt; struct ring_buffer_iter *rb_iter; - switch (iter->type) { - case TRI_CONSUMING: + if (trace_remote_iter_is_consuming(iter)) { return ring_buffer_peek(iter->remote->trace_buffer, cpu, ts, lost_events); - case TRI_NONCONSUMING: + } else { rb_iter = __get_rb_iter(iter, cpu); if (!rb_iter) return NULL; @@ -630,14 +660,10 @@ static void trace_remote_iter_move(struct trace_remote_iterator *iter) { struct trace_buffer *trace_buffer = iter->remote->trace_buffer; - switch (iter->type) { - case TRI_CONSUMING: + if (trace_remote_iter_is_consuming(iter)) ring_buffer_consume(trace_buffer, iter->evt_cpu, NULL, NULL); - break; - case TRI_NONCONSUMING: + else ring_buffer_iter_advance(__get_rb_iter(iter, iter->evt_cpu)); - break; - } } static struct remote_event *trace_remote_find_event(struct trace_remote *remote, unsigned short id); @@ -883,6 +909,87 @@ static const struct file_operations trace_fops = { .release = trace_release, }; +static bool trace_remote_do_dmesg(struct trace_remote *remote) +{ + struct trace_remote_iterator *iter = smp_load_acquire(&remote->dmesg); + unsigned int max_events = 1000; + + if (!iter) + return false; + + trace_remote_iter_read_start(iter); + + while (trace_remote_iter_read_event(iter)) { + trace_seq_init(&iter->seq); + + trace_remote_iter_print_event(iter); + trace_seq_putc(&iter->seq, 0); + if (!pr_info("%s", seq_buf_str(&iter->seq.seq))) + break; + + trace_remote_iter_move(iter); + + if (!(--max_events)) + break; + } + + trace_remote_iter_read_finished(iter); + + return !max_events; +} + +static int trace_remote_enable_dmesg(struct trace_remote *remote, bool enable) +{ + struct trace_remote_iterator *iter = remote->dmesg; + + lockdep_assert_held(&remote->lock); + + if (enable == !!iter) + return 0; + + if (enable) { + iter = trace_remote_iter(remote, RING_BUFFER_ALL_CPUS, TRI_DMESG); + if (IS_ERR(iter)) + return PTR_ERR(iter); + } else { + trace_remote_iter_free(remote->dmesg); + /* trace_remote_iter_free has reset remote->dmesg */ + } + + return 0; +} + +static ssize_t +dmesg_write(struct file *filp, const char __user *ubuf, size_t cnt, loff_t *ppos) +{ + struct seq_file *seq = filp->private_data; + struct trace_remote *remote = seq->private; + bool val; + int ret; + + ret = kstrtobool_from_user(ubuf, cnt, &val); + if (ret) + return ret; + + guard(mutex)(&remote->lock); + + ret = trace_remote_enable_dmesg(remote, val); + if (ret) + return ret; + + return cnt; +} + +static int dmesg_show(struct seq_file *s, void *unused) +{ + struct trace_remote *remote = s->private; + + seq_printf(s, "%d\n", !!READ_ONCE(remote->dmesg)); + + return 0; +} +DEFINE_TRACE_REMOTE_ATTRIBUTE(dmesg); + static int trace_remote_init_tracefs(const char *name, struct trace_remote *remote) { struct dentry *remote_d, *percpu_d, *d; @@ -923,6 +1030,10 @@ static int trace_remote_init_tracefs(const char *name, struct trace_remote *remo if (!d) goto err; + d = trace_create_file("dmesg", TRACEFS_MODE_WRITE, remote_d, remote, &dmesg_fops); + if (!d) + goto err; + percpu_d = tracefs_create_dir("per_cpu", remote_d); if (!percpu_d) { pr_err("Failed to create tracefs dir "TRACEFS_DIR"%s/per_cpu/\n", name); -- 2.56.0.rc1.310.g51773c2048-goog