From patchwork Mon Nov 20 23:51:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 167429 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2b07:b0:403:3b70:6f57 with SMTP id io7csp294178vqb; Mon, 20 Nov 2023 15:54:49 -0800 (PST) X-Google-Smtp-Source: AGHT+IGcGZ1mz1y5QJaT82fzRyZSLk/qc1d7nJ3+yaTBBuST5T7A4h1UHiG9bXe4AZSIVht3GolY X-Received: by 2002:a17:90a:142:b0:280:699:c5c with SMTP id z2-20020a17090a014200b0028006990c5cmr7415754pje.21.1700524489494; Mon, 20 Nov 2023 15:54:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700524489; cv=none; d=google.com; s=arc-20160816; b=f8oKc1bGvwdNAMRLg8nN5t+6Uc/x51Mo1trmnEPd0NTFcJr+Im25piWhi88AXQROPP JtvpyyRBmbKntvTCGi9D7L+hxFSJ/KpcQdB34GcJQpXfSvKkUlVq6c2KqPXA6IGloeMG WLaDBteskeRLV800iBYiy19Q7fUH+Jy5bbLyjc5nwCx///X/FFudxJR4hd83fG52HQKJ jjf8MVoQ52yOhXGzfOfDxwvLOLrjpU4vooyNO03ACXN4N5ygHKkhHomwTtXEdZX8TbMk 2Mozlix3QTsvfSMxN70aifL8J1E6xtrwHl4CPHSw4m/QlFD/3SJZukCJHY37/fIVgV9m ja1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:subject:cc:to:from:date :user-agent:message-id; bh=jikyGUxFj8iW0/SFDWGy/tR6G/kZxrxCgx+p1SblOLE=; fh=ITD31G6OgFufOBQOQmmU2hFE9Zw8sXvYrHobkrxkH08=; b=K0ZwZ1d/KN+w4mXbs5KDE6hNgdBc0t2QTcxs01Matr7FMi/qJK2hgy/AOO3SuLImFg s41M05zc5cO00GBAc1qVH8m6NCLsdYnEcRZTR9gaSyMnBqAdMoDDP9v6IEsJcDKKY9hi HR0JPEQ8AAknMslH6lxLMLiquHR1/N1epYZxnSAAnzpkrPQ6/JIL6nRU9CN/qwnDveoD 13xqtu+e6aq4wzEIgS4maIoz8NUUnlffjdvqGptMfXq2MBWIeWgAQYol5IqOS/4RPnzh 0OxRRs3Ba0brKpKV9v1JdXOZStvXOBUcYwKtosTe2z9k025M50DUEbwAJqTbdFMlpcfx Epog== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id t23-20020a17090aba9700b0027d088ae385si8816721pjr.96.2023.11.20.15.54.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Nov 2023 15:54:49 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 91468806CC1D; Mon, 20 Nov 2023 15:51:59 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232665AbjKTXvr (ORCPT + 27 others); Mon, 20 Nov 2023 18:51:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52074 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232590AbjKTXvm (ORCPT ); Mon, 20 Nov 2023 18:51:42 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 842F0C7 for ; Mon, 20 Nov 2023 15:51:39 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 25666C433C8; Mon, 20 Nov 2023 23:51:39 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.97-RC3) (envelope-from ) id 1r5E3W-00000002Po8-2Nff; Mon, 20 Nov 2023 18:51:54 -0500 Message-ID: <20231120235154.422970988@goodmis.org> User-Agent: quilt/0.67 Date: Mon, 20 Nov 2023 18:51:07 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Naresh Kamboju , Linux Kernel Functional Testing Subject: [PATCH 2/2] eventfs: Do not invalidate dentry in create_file/dir_dentry() References: <20231120235105.834774147@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 20 Nov 2023 15:51:59 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783129167045149903 X-GMAIL-MSGID: 1783129167045149903 From: "Steven Rostedt (Google)" With the call to simple_recursive_removal() on the entire eventfs sub system when the directory is removed, it performs the d_invalidate on all the dentries when it is removed. There's no need to do clean ups when a dentry is being created while the directory is being deleted. As dentries are cleaned up by the simpler_recursive_removal(), trying to do d_invalidate() in these functions will cause the dentry to be invalidated twice, and crash the kernel. Link: https://lore.kernel.org/all/20231116123016.140576-1-naresh.kamboju@linaro.org/ Fixes: 407c6726ca71 ("eventfs: Use simple_recursive_removal() to clean up dentries") Reported-by: Mark Rutland Reported-by: Naresh Kamboju Reported-by: Linux Kernel Functional Testing Signed-off-by: Steven Rostedt (Google) --- fs/tracefs/event_inode.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/fs/tracefs/event_inode.c b/fs/tracefs/event_inode.c index f239b2b507a4..3eb6c622a74d 100644 --- a/fs/tracefs/event_inode.c +++ b/fs/tracefs/event_inode.c @@ -326,7 +326,6 @@ create_file_dentry(struct eventfs_inode *ei, int idx, struct eventfs_attr *attr = NULL; struct dentry **e_dentry = &ei->d_children[idx]; struct dentry *dentry; - bool invalidate = false; mutex_lock(&eventfs_mutex); if (ei->is_freed) { @@ -389,17 +388,14 @@ create_file_dentry(struct eventfs_inode *ei, int idx, * Otherwise it means two dentries exist with the same name. */ WARN_ON_ONCE(!ei->is_freed); - invalidate = true; + dentry = NULL; } mutex_unlock(&eventfs_mutex); - if (invalidate) - d_invalidate(dentry); - - if (lookup || invalidate) + if (lookup) dput(dentry); - return invalidate ? NULL : dentry; + return dentry; } /** @@ -439,7 +435,6 @@ static struct dentry * create_dir_dentry(struct eventfs_inode *pei, struct eventfs_inode *ei, struct dentry *parent, bool lookup) { - bool invalidate = false; struct dentry *dentry = NULL; mutex_lock(&eventfs_mutex); @@ -495,16 +490,14 @@ create_dir_dentry(struct eventfs_inode *pei, struct eventfs_inode *ei, * Otherwise it means two dentries exist with the same name. */ WARN_ON_ONCE(!ei->is_freed); - invalidate = true; + dentry = NULL; } mutex_unlock(&eventfs_mutex); - if (invalidate) - d_invalidate(dentry); - if (lookup || invalidate) + if (lookup) dput(dentry); - return invalidate ? NULL : dentry; + return dentry; } /**