From nobody Sat Oct 4 03:02:20 2025 Received: from mail-wr1-f74.google.com (mail-wr1-f74.google.com [209.85.221.74]) (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 6EBF421C9F9 for ; Fri, 3 Oct 2025 13:39:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759498751; cv=none; b=iXcKYH3lb4u7LQWUhgcGQNz95i3HqlBvtTGXis/zBFL/Rg3am4KAZgCTk6s85KG2WiLEVddeHNLbZZAHyf+1+IE/61DAtX+tDL3ZC19WmUyfH9Qr0MB4rNgnutl/KqA90keFZKNZCU4MObZyffrYFQpwf23kbipk9hQtxHkRcGU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759498751; c=relaxed/simple; bh=QUPYfbDskoW1V0zL8PrtXLcVNc0Rj9seLNH5bvzhzHg=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=oT1TNFsVxf2gXTw7b7yx+BVOm3zQv9tUqFNMQbBJU7jBW7rfAjMiV7NqBgGYez6uSi76VE07KPnw937L6FloT37bYuJnfT/Il5aS0FfJgiHtqEG3jFDJocQheqptOMAH4eVG557jOZnq+OlSj+T42SPKa2AZzSUdpZdEOiPIMHc= 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=Ow8jIPZM; arc=none smtp.client-ip=209.85.221.74 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="Ow8jIPZM" Received: by mail-wr1-f74.google.com with SMTP id ffacd0b85a97d-40cfb98eddbso1592997f8f.0 for ; Fri, 03 Oct 2025 06:39:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1759498746; x=1760103546; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=wNuzwqo0SryxPVWfT4A633RiduwyoKQb5duSwc7WjqM=; b=Ow8jIPZMndKD2jXZCBjb6ZJEOq0N7+1sXOb/slAocdVBB/HctRqXLhYoZRxid4bC4p E3BuqcAcqnR16L+CyEc3ouUhykqVddsOTNB5ct+iK2PcV90hcaEz+huDuGHaI3mhsXi8 BQZAPN+PBDUHrvtQ2iFNHK1n8vrt2PcIQstu0mBgsiKyp/iqyNrWq8i/VAIV/+TLtsnP 5XY36OgnOP/iwfU5UYNMefNEbHHshrrdqEV9b4i526bSCKT73KKSWeTh09fZt2GEf04j Uep8EU9MQ9vi/FbLXpMsS7bQoBwGXz5RYo7sp3mBxm9xv3xbQIwfxKKVbczWTYzY8iR7 r+2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1759498746; x=1760103546; h=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; bh=wNuzwqo0SryxPVWfT4A633RiduwyoKQb5duSwc7WjqM=; b=kihg52EXYCI2TqGB6fPeoRFrI+DbOndISj/qabY3tr6JfBWCjpoTu+nL4cZuwONd6C I9mcJeixIm51mCEQikqXaeTmRIFeQm0VaPFJMpHZ3dBu/yVYj8ZXzl7HRjtHFlhN5K/D OFkOnt4pyQxQxBhajZ6fTOVEi15rKeR8QDRAMRvyXfkm7N5eynSHjVgyXRdNGlXd/SwW QRiAbQWc71ZweBpTAjkOjeaTdIm7Xw31oUk8Dx+mkJslT5w3uEJVJoOBO6+CYTRFxmYj kGb7SLsOb/uKWH9mce/g7xvUua1PUosXJrp9XT7m3Puq4SVHZbhfLhu/gK84MmFd6Y8Y cGnA== X-Forwarded-Encrypted: i=1; AJvYcCUnH+tFP6aFzdrsJATJ/UWbFfP9j5jECw5Qty6kD0VQLI1sufVG4RHQKt2Th7I5i1f6QbHUtu8SlIP2lt8=@vger.kernel.org X-Gm-Message-State: AOJu0YxLARwznHPs106pKKURjob/j0tTQiWGCkLXbeQBoKZEUkc03aJA zcaGzBfNgj7Fm5ziwu5f/Y2T9UPc/vhFxglBb/akT88UdftNCT6R3YgsDUSj9Nc6+vz90tUtxva zArSbtFSCMLZuJH9aN9NcOg== X-Google-Smtp-Source: AGHT+IHdLlzmFSd/8uLT/n+RQpFrBV4OeFRePRaDs9j8FRUA3U3c+FD2rubzZ09J18jdk0ft6f5Qd0MP++kgD1NG X-Received: from wmrk19.prod.google.com ([2002:a05:600c:b53:b0:46e:5ad6:9013]) (user=vdonnefort job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600d:11:b0:46e:6d12:ee2a with SMTP id 5b1f17b1804b1-46e6d12f14dmr30146875e9.16.1759498746709; Fri, 03 Oct 2025 06:39:06 -0700 (PDT) Date: Fri, 3 Oct 2025 14:38:07 +0100 In-Reply-To: <20251003133825.2068970-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: <20251003133825.2068970-1-vdonnefort@google.com> X-Mailer: git-send-email 2.51.0.618.g983fd99d29-goog Message-ID: <20251003133825.2068970-11-vdonnefort@google.com> Subject: [PATCH v7 10/28] tracing: Add events/ root files to trace remotes From: Vincent Donnefort To: rostedt@goodmis.org, mhiramat@kernel.org, mathieu.desnoyers@efficios.com, linux-trace-kernel@vger.kernel.org, maz@kernel.org, oliver.upton@linux.dev, joey.gouly@arm.com, suzuki.poulose@arm.com, yuzenghui@huawei.com Cc: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org, jstultz@google.com, qperret@google.com, will@kernel.org, aneesh.kumar@kernel.org, kernel-team@android.com, linux-kernel@vger.kernel.org, Vincent Donnefort Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Just like for the kernel events directory, add 'enable', 'header_page' and 'header_event' at the root of the trace remote events/ directory. Signed-off-by: Vincent Donnefort diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index eb556e691b5e..a26a6f537f87 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -604,7 +604,8 @@ int ring_buffer_print_page_header(struct trace_buffer *= buffer, struct trace_seq trace_seq_printf(s, "\tfield: char data;\t" "offset:%u;\tsize:%u;\tsigned:%u;\n", (unsigned int)offsetof(typeof(field), data), - (unsigned int)buffer->subbuf_size, + (unsigned int)(buffer ? buffer->subbuf_size : + PAGE_SIZE - BUF_PAGE_HDR_SIZE), (unsigned int)is_signed_type(char)); =20 return !trace_seq_has_overflowed(s); diff --git a/kernel/trace/trace_remote.c b/kernel/trace/trace_remote.c index 9504d9c04bef..1bc9c9a5197f 100644 --- a/kernel/trace/trace_remote.c +++ b/kernel/trace/trace_remote.c @@ -1075,10 +1075,145 @@ static int remote_event_callback(const char *name,= umode_t *mode, void **data, return 0; } =20 +static ssize_t remote_events_dir_enable_write(struct file *filp, const cha= r __user *ubuf, + size_t count, loff_t *ppos) +{ + struct trace_remote *remote =3D file_inode(filp)->i_private; + int i, ret; + u8 enable; + + ret =3D kstrtou8_from_user(ubuf, count, 10, &enable); + if (ret) + return ret; + + guard(mutex)(&remote->lock); + + for (i =3D 0; i < remote->nr_events; i++) { + struct remote_event *evt =3D &remote->events[i]; + + trace_remote_enable_event(remote, evt, enable); + } + + return count; +} + +static ssize_t remote_events_dir_enable_read(struct file *filp, char __use= r *ubuf, size_t cnt, + loff_t *ppos) +{ + struct trace_remote *remote =3D file_inode(filp)->i_private; + const char enabled_char[] =3D {'0', '1', 'X'}; + char enabled_str[] =3D " \n"; + int i, enabled =3D -1; + + guard(mutex)(&remote->lock); + + for (i =3D 0; i < remote->nr_events; i++) { + struct remote_event *evt =3D &remote->events[i]; + + if (enabled =3D=3D -1) { + enabled =3D evt->enabled; + } else if (enabled !=3D evt->enabled) { + enabled =3D 2; + break; + } + } + + enabled_str[0] =3D enabled_char[enabled =3D=3D -1 ? 0 : enabled]; + + return simple_read_from_buffer(ubuf, cnt, ppos, enabled_str, 2); +} + +static const struct file_operations remote_events_dir_enable_fops =3D { + .write =3D remote_events_dir_enable_write, + .read =3D remote_events_dir_enable_read, +}; + +static ssize_t +remote_events_dir_header_page_read(struct file *filp, char __user *ubuf, s= ize_t cnt, loff_t *ppos) +{ + struct trace_seq *s; + int ret; + + s =3D kmalloc(sizeof(*s), GFP_KERNEL); + if (!s) + return -ENOMEM; + + trace_seq_init(s); + + ring_buffer_print_page_header(NULL, s); + ret =3D simple_read_from_buffer(ubuf, cnt, ppos, s->buffer, trace_seq_use= d(s)); + kfree(s); + + return ret; +} + +static const struct file_operations remote_events_dir_header_page_fops =3D= { + .read =3D remote_events_dir_header_page_read, +}; + +static ssize_t +remote_events_dir_header_event_read(struct file *filp, char __user *ubuf, = size_t cnt, loff_t *ppos) +{ + struct trace_seq *s; + int ret; + + s =3D kmalloc(sizeof(*s), GFP_KERNEL); + if (!s) + return -ENOMEM; + + trace_seq_init(s); + + ring_buffer_print_entry_header(s); + ret =3D simple_read_from_buffer(ubuf, cnt, ppos, s->buffer, trace_seq_use= d(s)); + kfree(s); + + return ret; +} + +static const struct file_operations remote_events_dir_header_event_fops = =3D { + .read =3D remote_events_dir_header_event_read, +}; + +static int remote_events_dir_callback(const char *name, umode_t *mode, voi= d **data, + const struct file_operations **fops) +{ + if (!strcmp(name, "enable")) { + *mode =3D TRACEFS_MODE_WRITE; + *fops =3D &remote_events_dir_enable_fops; + return 1; + } + + if (!strcmp(name, "header_page")) { + *mode =3D TRACEFS_MODE_READ; + *fops =3D &remote_events_dir_header_page_fops; + return 1; + } + + if (!strcmp(name, "header_event")) { + *mode =3D TRACEFS_MODE_READ; + *fops =3D &remote_events_dir_header_event_fops; + return 1; + } + + return 0; +} + static int trace_remote_init_eventfs(const char *remote_name, struct trace= _remote *remote, struct remote_event *evt) { struct eventfs_inode *eventfs =3D remote->eventfs; + static struct eventfs_entry dir_entries[] =3D { + { + .name =3D "enable", + .callback =3D remote_events_dir_callback, + }, { + .name =3D "header_page", + .callback =3D remote_events_dir_callback, + }, { + .name =3D "header_event", + .callback =3D remote_events_dir_callback, + } + }; static struct eventfs_entry entries[] =3D { { .name =3D "enable", @@ -1094,7 +1229,8 @@ static int trace_remote_init_eventfs(const char *remo= te_name, struct trace_remot bool eventfs_create =3D false; =20 if (!eventfs) { - eventfs =3D eventfs_create_events_dir("events", remote->dentry, NULL, 0,= NULL); + eventfs =3D eventfs_create_events_dir("events", remote->dentry, dir_entr= ies, + ARRAY_SIZE(dir_entries), remote); if (IS_ERR(eventfs)) return PTR_ERR(eventfs); =20 --=20 2.51.0.618.g983fd99d29-goog