From patchwork Thu Nov 23 17:25:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 169064 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ce62:0:b0:403:3b70:6f57 with SMTP id o2csp603950vqx; Thu, 23 Nov 2023 09:30:53 -0800 (PST) X-Google-Smtp-Source: AGHT+IEDEAiQhinMgsA9OIzaATO8meN2Af81rfOqZ804aw453EjwrC/ZFojQ7OQOQOXPuQv6+3e4 X-Received: by 2002:a05:6a00:4c14:b0:6b4:231b:a45c with SMTP id ea20-20020a056a004c1400b006b4231ba45cmr139830pfb.26.1700760652727; Thu, 23 Nov 2023 09:30:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700760652; cv=none; d=google.com; s=arc-20160816; b=Q/KrsIocYjsd9t2Kylyrl9IGWQzj4HFBOxctHu9MZ2wPy+R7aEMgRexh0RUeOL774X QGNz4T/dqTYJl3wKOxFRMmL8yU4O+i02gdMpbu+YPdzadmZspcpLVNJUs7rM900WQEKh oqrXTPe4Q32L4YCcbqVetb1dDAEZvaJYqWBeIRzyLXiiaOPydnPicYTMWczeuO63hfu5 m7es4hpghP5/Sv7H5uGG2MQViJOjshK6XHtMhZVRhWYfdlvRSJCBz/LRb80GyM/Qh1Pb uGgxMTUjJqSZdAMHWfektNsOBiQISRpAwVLMPDuuNmkPR/o7E4Hpj+/xCOzkEGMOA9+A v3hg== 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=I7OVvNGEf93Qr62jtjOm6nMR6em9g1HjNj5Cf0Ve8eQ=; fh=mgEK3u4FNCVZrw2eK4ElottVljJzztdE8jidxZTIxyU=; b=RGPC13exofjC/ucsIkggToHjWddQ6aOhXcfi+6v7cMTDwrZ5E8YXWeBP45gX1VCz1h 6FaRdaw7uRA1hxPgE71LDjB80B56rwQSNtIHynvb5omhvKOh7y7aiS0oT7d6L/QH2ups iX53xYFzTjXCo9rO6x+DQWa0+EqauplJYt7gajMU/QOf5A+urFkHYvhyf03pxi1BFXl6 YqxJlgpf7sQHqdlJp2atzJ2TW6Gplew7jTX4PY9KoSpN3cfmhsoAUwdg7LNXRgixaM7V 8wMN7UfHRSPUYJa5XKaXa9RraWOvdUuiT1ykEAA1r67ujEqiZOgyARQXWNRfjJgDnRkG bOaw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from pete.vger.email (pete.vger.email. [23.128.96.36]) by mx.google.com with ESMTPS id d10-20020a65424a000000b005c278210f82si1655022pgq.544.2023.11.23.09.30.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 23 Nov 2023 09:30:52 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 pete.vger.email (Postfix) with ESMTP id 47770806AFE4; Thu, 23 Nov 2023 09:30:49 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345564AbjKWRaW (ORCPT + 99 others); Thu, 23 Nov 2023 12:30:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60746 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229921AbjKWRaL (ORCPT ); Thu, 23 Nov 2023 12:30:11 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A0142D44 for ; Thu, 23 Nov 2023 09:30:17 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4AC91C43391; Thu, 23 Nov 2023 17:30:17 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.97-RC3) (envelope-from ) id 1r6DX9-0000000367c-0sgZ; Thu, 23 Nov 2023 12:30:35 -0500 Message-ID: <20231123173035.075321171@goodmis.org> User-Agent: quilt/0.67 Date: Thu, 23 Nov 2023 12:25:43 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Josef Bacik Subject: [for-linus][PATCH 4/5] eventfs: Make sure that parent->d_inode is locked in creating files/dirs References: <20231123172539.582640797@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 pete.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 (pete.vger.email [0.0.0.0]); Thu, 23 Nov 2023 09:30:49 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783376802115896044 X-GMAIL-MSGID: 1783376802115896044 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. Link: https://lkml.kernel.org/r/20231121231112.853962542@goodmis.org Cc: Masami Hiramatsu Cc: Mark Rutland Cc: Andrew Morton Reviewed-by: Josef Bacik 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);