From patchwork Wed Nov 1 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: 160615 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:abcd:0:b0:403:3b70:6f57 with SMTP id f13csp583462vqx; Wed, 1 Nov 2023 10:27:38 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGd90NILtpWHklsOvhkP0VJSWXZ8C2UtpV5gSHxWA3I6YuwAz25O5M2TijvKHGnhuf+isac X-Received: by 2002:a17:902:c409:b0:1cc:22c8:5f61 with SMTP id k9-20020a170902c40900b001cc22c85f61mr15076798plk.15.1698859658136; Wed, 01 Nov 2023 10:27:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698859658; cv=none; d=google.com; s=arc-20160816; b=n3jc8BDK+B3f4vqpMDVhH9BsLSOGgu9Ywtw0+lYZdSVyAHBNZQ16ReFn44PUSHN8gI mb3oe9gP7N1oozBU0ET/tMWQfWj3E+7JmbOBn1jWLor44rQuy3xEtRHDPOFP0nB5oasK KhcUB55hG5ECGsuaUBYyLhiJwmX/52Kza61kL4GveG/8hWBAD/B1dbWIRmnAq/5oReTz QQSveMZWmfv0fIXdwEIVgugXe8yE/bCjPwQnf2jYqEhCX83MCXRvgNoNb+sRjOrXtUpV J5K2L/21MNBbIx3nYm7yNLdJEDbO6/lp5YfvhWCNc+cEzeWWFyhEEBVsIewSrR4S+S3n es6g== 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=SFiVUJN++9tHDteknp9oKsq/ecpLUrx9AWN6IXAfI4M=; fh=GOzcny/+Yhxxe/LhYnYPHd+JVjDgZ9WgHyPLWbp+hjU=; b=wg3WZA79K+JwA6H+MC2YZH7UUi/NcrceYODNsCjs3f8qw8k9VkskY/r9zwhHFs+t0H ZhdpaGxxBqJLnsmWXkhFh2Vb1R6spi7zd6y70lBfd91Lk9KbTf1ObktWQVs96MSObM8B z0RVtkPOJi/l7TKcKB81FQ0AeJuSo69/4Pwvp1W8OgZXmZMeXzwLuN48e56oaLkBkUK4 8kjvYGiSQNgYfvZA6tXxTwTuBzEOciVEQ/jKtNw3URogFkj7UsP63PQxXdacwxLGWLCz 94a97MdnTLFvzSYBqnHd9i6VfKICtnvS7MqPeSjVbS4tB2xMzCQLz4p+EpThXKw7MLro lf+w== 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:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id d2-20020a170902f14200b001c60d1de681si3265930plb.108.2023.11.01.10.27.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Nov 2023 10:27:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (Postfix) with ESMTP id 4213480B79C6; Wed, 1 Nov 2023 10:27:21 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344461AbjKAR06 (ORCPT + 34 others); Wed, 1 Nov 2023 13:26:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36858 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232305AbjKAR0x (ORCPT ); Wed, 1 Nov 2023 13:26:53 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC9BAED for ; Wed, 1 Nov 2023 10:26:50 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7B283C433CB; Wed, 1 Nov 2023 17:26:50 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qyEzR-00EZsf-1T; Wed, 01 Nov 2023 13:26:49 -0400 Message-ID: <20231101172649.265214087@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 01 Nov 2023 13:25:43 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Ajay Kaher Subject: [PATCH v6 2/8] eventfs: Have a free_ei() that just frees the eventfs_inode References: <20231101172541.971928390@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 groat.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 (groat.vger.email [0.0.0.0]); Wed, 01 Nov 2023 10:27:21 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781383464887424815 X-GMAIL-MSGID: 1781383464887424815 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. Cc: Ajay Kaher Reviewed-by: Masami Hiramatsu (Google) Signed-off-by: Steven Rostedt (Google) --- Changes since v5: https://lkml.kernel.org/r/20231031223420.141626438@goodmis.org - Resynced 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 1ce73acf3df0..dd5971855732 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); } /** @@ -881,7 +884,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);