From patchwork Tue Nov 21 23:10:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 168028 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2b07:b0:403:3b70:6f57 with SMTP id io7csp971691vqb; Tue, 21 Nov 2023 15:11:25 -0800 (PST) X-Google-Smtp-Source: AGHT+IGlM5oMA9BmpWYWnIlTYvlgXOKdGsDMBx2/fpy3kC0oR+9YHLIeQMOf2DNVyOEbtiA7WDZG X-Received: by 2002:a17:903:2352:b0:1cf:6bc2:2267 with SMTP id c18-20020a170903235200b001cf6bc22267mr723996plh.24.1700608264730; Tue, 21 Nov 2023 15:11:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700608264; cv=none; d=google.com; s=arc-20160816; b=YADT/CDFzm2zxghu0Kk2PA37EtdjQvVXINuVfQ2o/cmyxNGcfOSsqMA5tJAhiD+aMG QiafLCy5hXKgLlp9PPo7iVAE30kMrQYvfbB2yuJVbmAMBFK6Fxb/jvnrp5K2nMf+BGlw sFBtsDr6JzZfkLLmRWhV4YgZdXM2ru1OgIPV397G6J1pqkBZ7I8haZY9GY+66RiBzgjg fTaOT3PDA/fMccGUklDUHh1mVmp16JQTpgTIeOkfyD/daSJ6Ux3/sE9JWTDCdhKV6gUE 3IZ5G7j3yllQZHJpeH/M/cLCDQHn0T3XmezJjbr0xoHjOmYX5k6qs4C9r7vhv2XA3Mf+ ZsXg== 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=4FRHF8Sx6EHe/ICrhO2yGvL214Z2/wllowyBfBkziuo=; fh=v5d2iK8lt4G1vkplZbghBt7rCstLvm5F4A2+SX42VNY=; b=Ys1qwhvnMlwFOonkmKXSwi0qLqZNPQhRFv1IHV/ZYzxnB24BEC2JKMKeZ4xkVoKWMW 1jPU86B8+Ws//ZI6xxzfwnOUuxge+DKv4r2nwgR/IYefwuVMVkVx052pjbo2Y0MBCOSN KdCpYXqmg+mfbFXDhDuBChEWJnwTu/acqSGQvHl7A8rphixwKhFcbY4TMaEmKi2Sztzw lDc3IDE55dIb+Pe8V6s2qVjyvv5nfe2q74UlPg4yqKIYQAT5SNub+UuqIdiAcVWIH3qc lm+b7RVnf3fFPIyjeg8+RUV9i1oPazTDFN5myoBEkV+IxAbnZ6rSKDDXUbNyuklGYkR/ Uplg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id b12-20020a170902d50c00b001cf665669f7si4167994plg.426.2023.11.21.15.11.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 15:11:04 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 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 BB228801CA42; Tue, 21 Nov 2023 15:11:03 -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 S233419AbjKUXLC (ORCPT + 99 others); Tue, 21 Nov 2023 18:11:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54962 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229558AbjKUXLA (ORCPT ); Tue, 21 Nov 2023 18:11:00 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 31616185 for ; Tue, 21 Nov 2023 15:10:57 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9167AC433CD; Tue, 21 Nov 2023 23:10:56 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.97-RC3) (envelope-from ) id 1r5Ztg-00000002dE7-2p2f; Tue, 21 Nov 2023 18:11:12 -0500 Message-ID: <20231121231112.528544825@goodmis.org> User-Agent: quilt/0.67 Date: Tue, 21 Nov 2023 18:10:05 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton Subject: [PATCH 2/4] eventfs: Move taking of inode_lock into dcache_dir_open_wrapper() References: <20231121231003.516999942@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.0 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=ham 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]); Tue, 21 Nov 2023 15:11:03 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783217011780687147 X-GMAIL-MSGID: 1783217011780687147 From: "Steven Rostedt (Google)" The both create_file_dentry() and create_dir_dentry() takes a boolean parameter "lookup", as on lookup the inode_lock should already be taken, but for dcache_dir_open_wrapper() it is not taken. There's no reason that the dcache_dir_open_wrapper() can't take the inode_lock before calling these functions. In fact, it's better if it does, as the lock can be held throughout both directory and file creations. This also simplifies the code, and possibly prevents unexpected race conditions when the lock is released. Fixes: 5790b1fb3d672 ("eventfs: Remove eventfs_file and just use eventfs_inode") Signed-off-by: Steven Rostedt (Google) --- fs/tracefs/event_inode.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/fs/tracefs/event_inode.c b/fs/tracefs/event_inode.c index 56d192f0ead8..590e8176449b 100644 --- a/fs/tracefs/event_inode.c +++ b/fs/tracefs/event_inode.c @@ -347,15 +347,8 @@ create_file_dentry(struct eventfs_inode *ei, int idx, mutex_unlock(&eventfs_mutex); - /* The lookup already has the parent->d_inode locked */ - if (!lookup) - inode_lock(parent->d_inode); - dentry = create_file(name, mode, attr, parent, data, fops); - if (!lookup) - inode_unlock(parent->d_inode); - mutex_lock(&eventfs_mutex); if (IS_ERR_OR_NULL(dentry)) { @@ -453,15 +446,8 @@ create_dir_dentry(struct eventfs_inode *pei, struct eventfs_inode *ei, } mutex_unlock(&eventfs_mutex); - /* The lookup already has the parent->d_inode locked */ - if (!lookup) - inode_lock(parent->d_inode); - dentry = create_dir(ei, parent); - if (!lookup) - inode_unlock(parent->d_inode); - mutex_lock(&eventfs_mutex); if (IS_ERR_OR_NULL(dentry) && !ei->is_freed) { @@ -693,6 +679,7 @@ static int dcache_dir_open_wrapper(struct inode *inode, struct file *file) return -ENOMEM; } + inode_lock(parent->d_inode); list_for_each_entry_srcu(ei_child, &ei->children, list, srcu_read_lock_held(&eventfs_srcu)) { d = create_dir_dentry(ei, ei_child, parent, false); @@ -725,6 +712,7 @@ static int dcache_dir_open_wrapper(struct inode *inode, struct file *file) cnt++; } } + inode_unlock(parent->d_inode); srcu_read_unlock(&eventfs_srcu, idx); ret = dcache_dir_open(inode, file);