From patchwork Tue Nov 21 23:10: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: 168029 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2b07:b0:403:3b70:6f57 with SMTP id io7csp971769vqb; Tue, 21 Nov 2023 15:11:33 -0800 (PST) X-Google-Smtp-Source: AGHT+IFeXhGdsdfK/bA8XP0X+yRchGhhC2bFUe/AtLPWd7lIbpKxps9Fk+iDHgeFq++m9AXEjtAw X-Received: by 2002:a17:903:5c3:b0:1cf:6b8f:5af4 with SMTP id kf3-20020a17090305c300b001cf6b8f5af4mr553619plb.43.1700608293460; Tue, 21 Nov 2023 15:11:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700608293; cv=none; d=google.com; s=arc-20160816; b=DB7hK87Jn2ceCZX0bh7C6K0UVEqXCXzvGGvTEY0FcI8C8ht6uGTIRtW0DWcen20vZM +0k/RbRg8uq6j1OvgHJdzsABmd62edYVrS3ConqQ0PxSsjxzCQbUW46rgI+/buK8Wx21 jaUEEBrFn3nXtC6KvzU3aYGr7dt/FO0ZnSRkOZl99jSr8AopJ3fIYfif2/8SayR/NOh3 7MhjA/l01R4oVfEKGsyykwswzR0T5IDRyVmJZqZ9FP/GJoT6eLRx1x2fJ98ClffMoFCo WRE6x7zc0LQdkKkXFGLzBk0iKokzibIcnaso7MLS5jTO0jgflod2m9NXvsdUZZFsdNZO lIkw== 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=UMdCQ/XJkuHfQpfMd3V3T9ad5QuJPVTi1nPivLRsobo=; fh=v5d2iK8lt4G1vkplZbghBt7rCstLvm5F4A2+SX42VNY=; b=ia29R8Z1bzKcM0ewmXN9SlMq1EqZgTiwTESPB72OxPfg3enLGmVdEGeYaoK1ciE95Y WJ0gYqgEoLiDjpNC+5JCUqs65sVVPyLs2smlZo6wQbyJVOIxnMKdjqm1hIFDGMn37ZXY UIBaYbIIwxFBdG3O2WWL8vpuwhBtmQJW8c7IOy4p0RONFaM5nxHYf1SZLi42JWsYmtIR C/TC967vpR3HU53d3eWzAHb1MN3vPARUlWCkj56BrswqMVOGmCHMVxCb+O4gPenyvKCL G1LRezzSebA6FawU00ppHoWSeFomoDPdKoHhhXJHoTmMfZOZQOnNTddMm67AzqhXV5vN TxSw== 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:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id n4-20020a170902f60400b001c624cbc92dsi11689455plg.296.2023.11.21.15.11.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 15:11:33 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 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 agentk.vger.email (Postfix) with ESMTP id D8C3880EA943; Tue, 21 Nov 2023 15:11:28 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234901AbjKUXLK (ORCPT + 99 others); Tue, 21 Nov 2023 18:11:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54968 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233024AbjKUXLB (ORCPT ); Tue, 21 Nov 2023 18:11:01 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1CFA4A4 for ; Tue, 21 Nov 2023 15:10:58 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B5607C433C7; Tue, 21 Nov 2023 23:10:57 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.97-RC3) (envelope-from ) id 1r5Ztg-00000002dF5-4BCs; Tue, 21 Nov 2023 18:11:12 -0500 Message-ID: <20231121231112.853962542@goodmis.org> User-Agent: quilt/0.67 Date: Tue, 21 Nov 2023 18:10:07 -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 4/4] eventfs: Make sure that parent->d_inode is locked in creating files/dirs References: <20231121231003.516999942@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email 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 (agentk.vger.email [0.0.0.0]); Tue, 21 Nov 2023 15:11:29 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783217041863722403 X-GMAIL-MSGID: 1783217041863722403 From: "Steven Rostedt (Google)" Since the locking of the parent->d_inode has been moved outside the creation of the files and directories (as it use to be locked via a conditional), add a WARN_ON_ONCE() to the case that it's not locked. Signed-off-by: Steven Rostedt (Google) --- fs/tracefs/event_inode.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fs/tracefs/event_inode.c b/fs/tracefs/event_inode.c index 590e8176449b..0b90869fd805 100644 --- a/fs/tracefs/event_inode.c +++ b/fs/tracefs/event_inode.c @@ -327,6 +327,8 @@ create_file_dentry(struct eventfs_inode *ei, int idx, struct dentry **e_dentry = &ei->d_children[idx]; struct dentry *dentry; + WARN_ON_ONCE(!inode_is_locked(parent->d_inode)); + mutex_lock(&eventfs_mutex); if (ei->is_freed) { mutex_unlock(&eventfs_mutex); @@ -430,6 +432,8 @@ create_dir_dentry(struct eventfs_inode *pei, struct eventfs_inode *ei, { struct dentry *dentry = NULL; + WARN_ON_ONCE(!inode_is_locked(parent->d_inode)); + mutex_lock(&eventfs_mutex); if (pei->is_freed || ei->is_freed) { mutex_unlock(&eventfs_mutex);