From nobody Thu Mar 19 05:28:36 2026 Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) (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 0C2FE34CFBD for ; Thu, 19 Feb 2026 16:27:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771518469; cv=none; b=uWr+x+cTLXPt4RHnAgosTLWqWqtqXcrE4ZG2PUxHfbACIzBTyUUeoYQ+tLyo+xP0921ZvgYFoem0gn0rlLYSK0EDAhWRagPJ9dxRIGTj4PskVBiKjpltHkzDUHDGqr3aaLSnj0b5aO52Fgd+JT0ZbGCGIUV4BpO11v/3NH+V5iU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771518469; c=relaxed/simple; bh=3aIPneSbFeQu4MdSA2qZGQY/yDCy+AZLupTPmFmOaUk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=E8wD3J6V6lBHRSrJBtu52pVFABkGu8Z8efi3kgMIO+t/ytWll6lIfF/+7IvRIupFaoJi9VQSUTk4hjrhSNlomVKTreh2ZFQbfRsT96zL4hA1X95lda093erlndPQcM7c25kQxgyOeU5dfyOiiJJaFrI02WqMnBYhMX5qcn/UHFg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=D6SzTEh9; arc=none smtp.client-ip=209.85.221.50 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="D6SzTEh9" Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-4362507f396so1210371f8f.0 for ; Thu, 19 Feb 2026 08:27:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1771518465; x=1772123265; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=t8pmqafAMo/XejBQW7PotvCqT3/aAFA10KU7IAZ4oDE=; b=D6SzTEh9p337AcddKGb2SDqBg+OyuMU95ATEYHUSIX6x7tzZ9tUKLf6jaSx1Y68LJi db4FdChaPPyw7VHggEJvySO/qGyfhlCMEYjNLnUvf9R4EIjhuXARqI4GeYF9N5IRqspP vfYwp3AW42yEIUnYx33CLEbrDpu3OFnmR996ZchSsxn0J4TohHIbW/2AbMySzDDrAF6F iuevlurSivuH1kU0GphtcBLkVGYxKxjFeJmG/1HrK8v/dDj597ZRHY1te3Q4nHI5FAFd oYgUQ7VJYtED9u+v1Rh/bG+8ttlpNaErgsQW7Nms3MsMiNJcc0PnVCb+plpQVoNa4/EG ckkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771518465; x=1772123265; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=t8pmqafAMo/XejBQW7PotvCqT3/aAFA10KU7IAZ4oDE=; b=thGfYEuBo6WLgOtqwRwz9JpoU39tjTGlyfqfQUQNMbtaBJOEBP6iRnottoIEkS8qBp UAnQNc6JV0UvDhAILYDQiYb6fH8jSgkm/ZP7PArEqMZ9HUPjYKSs9k95IT3Mk0va7MjW dfA6fHOsfeBx2F58TlwgtY+SLGF2R5B0nOy1/v3rNqqBuRPpgz7bELzzExcvBAoxms3C yqKXOHOht+S/U5mgmAXlCr7nZKRRGfEejPo6LWYgs/Q1U803a8ERYK0QMa6ih1kFN4fq 9FbROubBojpLFoxYFgHlSX3ukUDbRK7GQq3jvhgpbIJTWy0OnGHomk3bGfUxNkVnDaWO Jyww== X-Forwarded-Encrypted: i=1; AJvYcCWAdYUKzJOpdqPcio0vNHoxfv0fnpeJWwkgcM6slCiIJ9EkC3ysj6NFjksp1NSVzaIC+Cr28hc7R97X4ds=@vger.kernel.org X-Gm-Message-State: AOJu0YxDaHCV71yHlmonuDvswZ7fBB49McX87pF/hrx2vd13hq1YxIFy JjeKlwOVIXqfBYOFu0U8y+6nNCqJgIInSsSauESoRT6BH7ZIQbTH9A9sheGI2MN3d4k= X-Gm-Gg: AZuq6aIMNf+ko1JCR58KoQ+K4hjXpoc1AdF9qR+1vR0Se0rfJ4IIBDR+G/p2ASQwSyZ 6V3ADEa3pSzg7WyL9flduLngWYyX3plLKdJpmeVpUFPWm5onXX0jUkTcZIeJUWfkibDcBTvW34W +moqSsXtZJCw3SIglHP4AW4cUuNXMfkq6DG4YFjqo8VkeT8PcXsMFEof53sd53NgDm9t98mxvGD PMuqNq5yCYAT//GlP1HSnIpRkXrya/zS8YWbZErUWtEAOia4kCwMtdu7CskmNG7mob73owJRory 0paIaVGry+YeGhIyj3S5JPvG02IowlAXlAA84Oin/W31aLUbat4VKhPtQMhJul+KTItXmokYysR +Js4+ixbFdMIjwagIRX2YI+vEJLi3KpUvKcHhdmz57ozVUoytLL0MAtLXJ3zH4CF8f6Y74ByD+o krPPIC3hGU+H31JACsjymQbhUsQR8UFlRVXVkrby7YGFExUniUJjU= X-Received: by 2002:a5d:588c:0:b0:436:3536:f698 with SMTP id ffacd0b85a97d-43958e4052fmr10504746f8f.30.1771518465266; Thu, 19 Feb 2026 08:27:45 -0800 (PST) Received: from zovi.suse.cz (nat2.prg.suse.com. [195.250.132.146]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43796ac8075sm47324631f8f.29.2026.02.19.08.27.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Feb 2026 08:27:44 -0800 (PST) From: Petr Pavlu To: Steven Rostedt , Masami Hiramatsu Cc: Mathieu Desnoyers , Tom Zanussi , linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, Petr Pavlu Subject: [PATCH v3 4/5] tracing: Clean up access to trace_event_file from a file pointer Date: Thu, 19 Feb 2026 17:27:04 +0100 Message-ID: <20260219162737.314231-5-petr.pavlu@suse.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260219162737.314231-1-petr.pavlu@suse.com> References: <20260219162737.314231-1-petr.pavlu@suse.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The tracing code provides two functions event_file_file() and event_file_data() to obtain a trace_event_file pointer from a file struct. The primary method to use is event_file_file(), as it checks for the EVENT_FILE_FL_FREED flag to determine whether the event is being removed. The second function event_file_data() is an optimization for retrieving the same data when the event_mutex is still held. In the past, when removing an event directory in remove_event_file_dir(), the code set i_private to NULL for all event files and readers were expected to check for this state to recognize that the event is being removed. In the case of event_id_read(), the value was read using event_file_data() without acquiring the event_mutex. This required event_file_data() to use READ_ONCE() when retrieving the i_private data. With the introduction of eventfs, i_private is assigned when an eventfs inode is allocated and remains set throughout its lifetime. Remove the now unnecessary READ_ONCE() access to i_private in both event_file_file() and event_file_data(). Inline the access to i_private in remove_event_file_dir(), which allows event_file_data() to handle i_private solely as a trace_event_file pointer. Add a check in event_file_data() to ensure that the event_mutex is held and that file->flags doesn't have the EVENT_FILE_FL_FREED flag set. Finally, move event_file_data() immediately after event_file_code() since the latter provides a comment explaining how both functions should be used together. Signed-off-by: Petr Pavlu --- kernel/trace/trace.h | 17 +++++++++++------ kernel/trace/trace_events.c | 6 +++--- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index b8f3804586a0..7db78a62f786 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -1802,11 +1802,6 @@ extern struct trace_event_file *find_event_file(stru= ct trace_array *tr, const char *system, const char *event); =20 -static inline void *event_file_data(struct file *filp) -{ - return READ_ONCE(file_inode(filp)->i_private); -} - extern struct mutex event_mutex; extern struct list_head ftrace_events; =20 @@ -1827,12 +1822,22 @@ static inline struct trace_event_file *event_file_f= ile(struct file *filp) struct trace_event_file *file; =20 lockdep_assert_held(&event_mutex); - file =3D READ_ONCE(file_inode(filp)->i_private); + file =3D file_inode(filp)->i_private; if (!file || file->flags & EVENT_FILE_FL_FREED) return NULL; return file; } =20 +static inline void *event_file_data(struct file *filp) +{ + struct trace_event_file *file; + + lockdep_assert_held(&event_mutex); + file =3D file_inode(filp)->i_private; + WARN_ON(!file || file->flags & EVENT_FILE_FL_FREED); + return file; +} + extern const struct file_operations event_trigger_fops; extern const struct file_operations event_hist_fops; extern const struct file_operations event_hist_debug_fops; diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c index 90915e1286da..c52135cd9265 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c @@ -2182,12 +2182,12 @@ static int trace_format_open(struct inode *inode, s= truct file *file) static ssize_t event_id_read(struct file *filp, char __user *ubuf, size_t cnt, loff_t *pp= os) { - int id =3D (long)event_file_data(filp); + /* id is directly in i_private and available for inode's lifetime. */ + int id =3D (long)file_inode(filp)->i_private; char buf[32]; int len; =20 - if (unlikely(!id)) - return -ENODEV; + WARN_ON(!id); =20 len =3D sprintf(buf, "%d\n", id); =20 --=20 2.53.0