From patchwork Tue Oct 31 22:33:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 160366 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:abcd:0:b0:403:3b70:6f57 with SMTP id f13csp61528vqx; Tue, 31 Oct 2023 15:34:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHs7r9rHzf0taexVQFwsyQ15f5hjnakb3C+TwiPEdNvmrFI6eVOYDPzJSavRGkHEWUkVV12 X-Received: by 2002:a05:6a20:12c5:b0:15e:4084:6480 with SMTP id v5-20020a056a2012c500b0015e40846480mr5020015pzg.27.1698791674716; Tue, 31 Oct 2023 15:34:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698791674; cv=none; d=google.com; s=arc-20160816; b=sQSL5mB1cUWmhAAzKIRgwMdrLUXwKClqIG6nX7LS5Mbl0J164rwYuIvMOzNeXBcxZP 1Gs6TUbUFxM9CdEqD10QGXQJ+Qv2Fic3xYAWOeldfuDbHGfHXg57YpdrjD0NBgP0udT7 PRHb7bH0hd24BwFmJqjgLjHhg0T1kp7sXD0NmWVenRfbttQqF3+Viw1ZpFrWTUdNg3Jy qfgROPLWUCXIqks1mOXWTtpfX235qPiQ0TUr41NxsfJx4rMQkf326oMwxmPuYuNvm0iQ top3wVZmL5f8BUkxZvumKY9jCOM6l8ptMInzdg7MY1AqYUa8W757HF1jYkcB/DJyuMBN +aLA== 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=iHK4lHgBMjeOB6Q679PeU2zB2hO9wbwgwGPRUkKJWs0=; fh=p9qaSGjxjg7fXhZ2SPcVaCB443dWE9yY5/nXWowH5kM=; b=UXaqzyWICuASBqO9QCSIB7f6jm0YbKGDhWsifD7vqiFIWlQnSeCLHu9wObAlPkKFwO xDaaZN//63ssL2FXj7mYzgYHiI/N08Emple6rCdatkdjdZob1hmXbycv31Zej/bCd6rC 2ug5Vx3dJEYALaQrVMkMwe7J7MAVahYPEevDtbXhZKecsVFL2aQB/I6gMYgrus1kQm7E 6i2lJdy0K4e5DkLjJSN3uxzBGwn3HMfu0f7K5WYPw2JCSig9VHATZ5ywB6kK56LCli4N qeeni0aqu+XXxw5WPrFwRvdy6KQqq4KTHJ+2ic5yBK/SPllYEklcbSHy+Nznu4mWtXOS j/NA== 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 k14-20020a056a00134e00b006bd27e41c17si287531pfu.314.2023.10.31.15.34.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Oct 2023 15:34:34 -0700 (PDT) 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 ED35F81068C1; Tue, 31 Oct 2023 15:34:33 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376263AbjJaWe3 (ORCPT + 33 others); Tue, 31 Oct 2023 18:34:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37620 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346787AbjJaWeY (ORCPT ); Tue, 31 Oct 2023 18:34:24 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BFAA6F5 for ; Tue, 31 Oct 2023 15:34:21 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 598B5C433CB; Tue, 31 Oct 2023 22:34:21 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qxxJU-00EPhR-13; Tue, 31 Oct 2023 18:34:20 -0400 Message-ID: <20231031223420.141626438@goodmis.org> User-Agent: quilt/0.66 Date: Tue, 31 Oct 2023 18:33:28 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Ajay Kaher , Andrew Morton Subject: [PATCH v5 2/7] eventfs: Have a free_ei() that just frees the eventfs_inode References: <20231031223326.794680978@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, 31 Oct 2023 15:34:34 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781312179062964399 X-GMAIL-MSGID: 1781312179062964399 From: "Steven Rostedt (Google)" As the eventfs_inode is freed in two different locations, make a helper function free_ei() to make sure all the allocated fields of the eventfs_inode is freed. This requires renaming the existing free_ei() which is called by the srcu handler to free_rcu_ei() and have free_ei() just do the freeing, where free_rcu_ei() will call it. Signed-off-by: Steven Rostedt (Google) Reviewed-by: Masami Hiramatsu (Google) --- Changse since v4: https://lore.kernel.org/all/20231031193428.133533311@goodmis.org/T/#u - Rebased to this patch series fs/tracefs/event_inode.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/fs/tracefs/event_inode.c b/fs/tracefs/event_inode.c index 2c2c75b2ad73..0331d9bd568b 100644 --- a/fs/tracefs/event_inode.c +++ b/fs/tracefs/event_inode.c @@ -129,6 +129,13 @@ static struct dentry *create_dir(const char *name, struct dentry *parent) return eventfs_end_creating(dentry); } +static void free_ei(struct eventfs_inode *ei) +{ + kfree_const(ei->name); + kfree(ei->d_children); + kfree(ei); +} + /** * eventfs_set_ei_status_free - remove the dentry reference from an eventfs_inode * @ti: the tracefs_inode of the dentry @@ -168,9 +175,7 @@ void eventfs_set_ei_status_free(struct tracefs_inode *ti, struct dentry *dentry) eventfs_remove_dir(ei_child); } - kfree_const(ei->name); - kfree(ei->d_children); - kfree(ei); + free_ei(ei); return; } @@ -784,13 +789,11 @@ struct eventfs_inode *eventfs_create_events_dir(const char *name, struct dentry return ERR_PTR(-ENOMEM); } -static void free_ei(struct rcu_head *head) +static void free_rcu_ei(struct rcu_head *head) { struct eventfs_inode *ei = container_of(head, struct eventfs_inode, rcu); - kfree_const(ei->name); - kfree(ei->d_children); - kfree(ei); + free_ei(ei); } /** @@ -883,7 +886,7 @@ void eventfs_remove_dir(struct eventfs_inode *ei) for (i = 0; i < ei->nr_entries; i++) unhook_dentry(&ei->d_children[i], &dentry_list); unhook_dentry(&ei->dentry, &dentry_list); - call_srcu(&eventfs_srcu, &ei->rcu, free_ei); + call_srcu(&eventfs_srcu, &ei->rcu, free_rcu_ei); } mutex_unlock(&eventfs_mutex);