From patchwork Sun Feb 4 01:16:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 196385 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp147810dyb; Sat, 3 Feb 2024 17:21:22 -0800 (PST) X-Google-Smtp-Source: AGHT+IFw4Uwos2/3f93+ZYsIHrfgxtPDsCw20qp1O5rf6Q0Mkt04klYkoAmRy2BWN+NedSZqjdpm X-Received: by 2002:a05:620a:10af:b0:785:5913:c465 with SMTP id h15-20020a05620a10af00b007855913c465mr6206526qkk.0.1707009681896; Sat, 03 Feb 2024 17:21:21 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707009681; cv=pass; d=google.com; s=arc-20160816; b=LowYVYGs9SYuyTC2GidLu6EVfdOgniiYE/AifCiBxueP+qCj7oq5UJni/rw/EgrSNp NjVTi4FH//wpRyYqYtbWNZBhoiYobKzmnngZgndIhEosgcA2SJDZZzuo0cem7x8m4aYE Ee9ZOAIMLbC+9PoX1Gi81kmNA/uvVFdUWbbzcMRIpDuIwn3IDZ1h2dB+y4C6q5YOVmGV /G8m2kVEwfzJtash0al+Kp+1XyXNzeIuYD3QAmovUdZASdvKe/IQHlccRH0guHvahCJ+ /adAs/CJ1Cs6IAZHJqS8YtAEGH3RBuSti/L7Mi0UejvpAXphLeryUUWVav4L35I8asA2 65CQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :references:subject:cc:to:from:date:user-agent:message-id; bh=+ogg/UgV27PhdL6foBSoEIa1i6xq/Q7UxaznoXL1uwE=; fh=JX/9LIYRdAub/fDwvGHjFhcdFV99YgjOo4XnSvsqJdE=; b=ENpBdEgfkL1hF/qVjB+1fSiKzqgtvNbf8o4vknvIr6CkDf9qiJUA2Mb738vOSHIksf ZvP6JuVmWaSeWbru6IxVT98tHkdWjDaKX+E5OQYv/Wnf3a5Rr/TFoLc1Oo6IGL9w7jJP 3ujdsGh7eIvgcOSBMasO1ykguahSU9q0cs49FZwbEWXDa0oTzmxOhgVZtLyZoudisqQy uUNevM1LIxA611lb4XzwKCX7jnp2kpCQZhu5cls8EDfJZVq9t2vx2PQPWBWVtHFJvpHi P9DF6cL0iBpUzuDkmf5zIgGT7wspO4dWkPm/dEF1aZNLfXpwd1hBDz6OGLwxN0rdQqGG yV8Q==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of linux-kernel+bounces-51341-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-51341-ouuuleilei=gmail.com@vger.kernel.org" X-Forwarded-Encrypted: i=1; AJvYcCURlAF/q0RGa40j4I6g44mFPkxqfTb1+gNL1R+lAw8gecBGVVvXfb+ESMnDd9KOvP+8KYcJEeZ2ScFTvkwg35o1H29Oew== Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id j16-20020a05620a147000b00785559a133fsi4737047qkl.391.2024.02.03.17.21.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 03 Feb 2024 17:21:21 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-51341-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of linux-kernel+bounces-51341-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-51341-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 9ECEE1C20FF7 for ; Sun, 4 Feb 2024 01:21:21 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 045AB14005; Sun, 4 Feb 2024 01:18:10 +0000 (UTC) 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 A570C1FA0; Sun, 4 Feb 2024 01:18: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=1707009485; cv=none; b=rBe+KZ9WW8h+ciK1lTdFYgMGUNc4SPnygpPn2+hc1iT+lAVDbsM2qGfbdnFPEvFrsm3fE4rk76Lfm4vai9XTmJ+RoQH9B5ePj/THuu8WRfnT2DiRUeosUpqVbcOe4keBtAkkq0ko2gzJ++YH8Wf3enD8v31EuZtSwa+xw7RFqAo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707009485; c=relaxed/simple; bh=Z0WFv+6WQ373ABo/KMOyPZvBrXjCfwOl5DRRrGItHYo=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=Jyao2nWgTt+1iFmN5tg2YhWwFyqo/CqJrXFkPnYp0t8donaEOnH7TCt/uEtQl2V/xXV0adeAtVf+p9njmmWOjGMWTh3nS5JhxFjjGz9ApQo3LfcYBUueQeP8ATLdSU5+lHM0PndK1oV1LP3uuGrUFgwPbjwFzsmlq+YeDAd3vA4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4D91BC41674; Sun, 4 Feb 2024 01:18:05 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.97) (envelope-from ) id 1rWR9P-00000006Omt-3Wit; Sat, 03 Feb 2024 20:18:27 -0500 Message-ID: <20240204011827.696890375@goodmis.org> User-Agent: quilt/0.67 Date: Sat, 03 Feb 2024 20:16:20 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Linus Torvalds , Greg Kroah-Hartman , Sasha Levin , Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Al Viro , Christian Brauner Subject: [v6.7][PATCH 05/23] eventfs: Do ctx->pos update for all iterations in eventfs_iterate() References: <20240204011615.703023949@goodmis.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789929383819750018 X-GMAIL-MSGID: 1789929383819750018 From: "Steven Rostedt (Google)" The ctx->pos was only updated when it added an entry, but the "skip to current pos" check (c--) happened for every loop regardless of if the entry was added or not. This inconsistency caused readdir to be incorrect. It was due to: for (i = 0; i < ei->nr_entries; i++) { if (c > 0) { c--; continue; } mutex_lock(&eventfs_mutex); /* If ei->is_freed then just bail here, nothing more to do */ if (ei->is_freed) { mutex_unlock(&eventfs_mutex); goto out; } r = entry->callback(name, &mode, &cdata, &fops); mutex_unlock(&eventfs_mutex); [..] ctx->pos++; } But this can cause the iterator to return a file that was already read. That's because of the way the callback() works. Some events may not have all files, and the callback can return 0 to tell eventfs to skip the file for this directory. for instance, we have: # ls /sys/kernel/tracing/events/ftrace/function format hist hist_debug id inject and # ls /sys/kernel/tracing/events/sched/sched_switch/ enable filter format hist hist_debug id inject trigger Where the function directory is missing "enable", "filter" and "trigger". That's because the callback() for events has: static int event_callback(const char *name, umode_t *mode, void **data, const struct file_operations **fops) { struct trace_event_file *file = *data; struct trace_event_call *call = file->event_call; [..] /* * Only event directories that can be enabled should have * triggers or filters, with the exception of the "print" * event that can have a "trigger" file. */ if (!(call->flags & TRACE_EVENT_FL_IGNORE_ENABLE)) { if (call->class->reg && strcmp(name, "enable") == 0) { *mode = TRACE_MODE_WRITE; *fops = &ftrace_enable_fops; return 1; } if (strcmp(name, "filter") == 0) { *mode = TRACE_MODE_WRITE; *fops = &ftrace_event_filter_fops; return 1; } } if (!(call->flags & TRACE_EVENT_FL_IGNORE_ENABLE) || strcmp(trace_event_name(call), "print") == 0) { if (strcmp(name, "trigger") == 0) { *mode = TRACE_MODE_WRITE; *fops = &event_trigger_fops; return 1; } } [..] return 0; } Where the function event has the TRACE_EVENT_FL_IGNORE_ENABLE set. This means that the entries array elements for "enable", "filter" and "trigger" when called on the function event will have the callback return 0 and not 1, to tell eventfs to skip these files for it. Because the "skip to current ctx->pos" check happened for all entries, but the ctx->pos++ only happened to entries that exist, it would confuse the reading of a directory. Which would cause: # ls /sys/kernel/tracing/events/ftrace/function/ format hist hist hist_debug hist_debug id inject inject The missing "enable", "filter" and "trigger" caused ls to show "hist", "hist_debug" and "inject" twice. Update the ctx->pos for every iteration to keep its update and the "skip" update consistent. This also means that on error, the ctx->pos needs to be decremented if it was incremented without adding something. Link: https://lore.kernel.org/all/20240104150500.38b15a62@gandalf.local.home/ Link: https://lore.kernel.org/linux-trace-kernel/20240104220048.172295263@goodmis.org Cc: Masami Hiramatsu Cc: Mark Rutland Cc: Mathieu Desnoyers Cc: Andrew Morton Cc: Linus Torvalds Cc: Al Viro Cc: Christian Brauner Cc: Greg Kroah-Hartman Fixes: 493ec81a8fb8e ("eventfs: Stop using dcache_readdir() for getdents()") Signed-off-by: Steven Rostedt (Google) --- fs/tracefs/event_inode.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/fs/tracefs/event_inode.c b/fs/tracefs/event_inode.c index 0aca6910efb3..c73fb1f7ddbc 100644 --- a/fs/tracefs/event_inode.c +++ b/fs/tracefs/event_inode.c @@ -760,6 +760,8 @@ static int eventfs_iterate(struct file *file, struct dir_context *ctx) continue; } + ctx->pos++; + if (ei_child->is_freed) continue; @@ -767,13 +769,12 @@ static int eventfs_iterate(struct file *file, struct dir_context *ctx) dentry = create_dir_dentry(ei, ei_child, ei_dentry); if (!dentry) - goto out; + goto out_dec; ino = dentry->d_inode->i_ino; dput(dentry); if (!dir_emit(ctx, name, strlen(name), ino, DT_DIR)) - goto out; - ctx->pos++; + goto out_dec; } for (i = 0; i < ei->nr_entries; i++) { @@ -784,6 +785,8 @@ static int eventfs_iterate(struct file *file, struct dir_context *ctx) continue; } + ctx->pos++; + entry = &ei->entries[i]; name = entry->name; @@ -791,7 +794,7 @@ static int eventfs_iterate(struct file *file, struct dir_context *ctx) /* If ei->is_freed then just bail here, nothing more to do */ if (ei->is_freed) { mutex_unlock(&eventfs_mutex); - goto out; + goto out_dec; } r = entry->callback(name, &mode, &cdata, &fops); mutex_unlock(&eventfs_mutex); @@ -800,19 +803,23 @@ static int eventfs_iterate(struct file *file, struct dir_context *ctx) dentry = create_file_dentry(ei, i, ei_dentry, name, mode, cdata, fops); if (!dentry) - goto out; + goto out_dec; ino = dentry->d_inode->i_ino; dput(dentry); if (!dir_emit(ctx, name, strlen(name), ino, DT_REG)) - goto out; - ctx->pos++; + goto out_dec; } ret = 1; out: srcu_read_unlock(&eventfs_srcu, idx); return ret; + + out_dec: + /* Incremented ctx->pos without adding something, reset it */ + ctx->pos--; + goto out; } /**