From patchwork Wed Nov 1 21:37:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 160686 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:abcd:0:b0:403:3b70:6f57 with SMTP id f13csp724368vqx; Wed, 1 Nov 2023 14:38:28 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE0krwvla7mMQ8oQsG38pkoPbw8T8BJqhr9//GNMP1AvPSa1JZAmRCHTnt6Kt0yziLhyYCM X-Received: by 2002:a05:6870:169a:b0:1e9:9e04:1d1e with SMTP id j26-20020a056870169a00b001e99e041d1emr20421967oae.48.1698874708714; Wed, 01 Nov 2023 14:38:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698874708; cv=none; d=google.com; s=arc-20160816; b=d+l5gGTBPDUylEpR2Oo96u2jGntYMKDYf1y/U1tJYq2MV7UZxe7289NguCILYRQhOX EtF2PabN8FTTkm1zsc4h6Gkjn0NwxbtLQvtVULQwMO04TQ0MeXX7za9t2uAKCTt+al31 IE5mKbpvW6SHXl78G4LMZ6ZBFXo3pu/fmg9dakmQk702XSFUkk7sYEVoa5VWNEZEmUBf vKJTaDdRCMhRV3F0G1L6Bd+5nk3NeRM8xXjDAgtYGLQlivwqUJKZ8W7xmSsvfcpet4aX iLNGsqA7siEJgwOPMTnxkG/6mgM7QN3sfK1ksMdyX3sj5hMvlnwjjEj4g1eF8qx88Qpq TWRQ== 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=/ABQgVgqFR3SE9RrfpAhMQRgeTAXB64DZCb9BOreP48=; fh=YD2plINFzzQkeIFsZ95VaD7apA4QxoMdT5d/25lsi30=; b=JXwfiolrg7mQoRHZxFf/m5I32MMj0O3kq0fNA0ZUFzqApHu8HhTQ0s/WyBa+xvfi5g PDglDW1dSQ69soPYnmk+t7gTmWWPJS/NkZlNWWtCuNJfi8YPh4vzfJzPpWqxx3k6YLPF e9+1JLf9UkxKKbUz1+23AxtiZO/eAgj4KJXwFzxEjtfmk7kjfkn6Um0m5YtRqnpqK711 3WDtRpgtnx03WIDCOXEmkIvJWjYRvosAtqOhIxJH1DUUnERxVHr3o+qhIJiDUmu+d3Ex cPPv0TFjcbfpGz9xeM2NCRGTSmxzclamf3IcZ33TYAUnNgKv7HcYDdOCWcTxcQxBRrHl B4Cg== 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 bj25-20020a056a02019900b0057771e49c25si729943pgb.693.2023.11.01.14.38.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Nov 2023 14:38:28 -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 AE6C68197EBE; Wed, 1 Nov 2023 14:38:27 -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 S1346290AbjKAViX (ORCPT + 35 others); Wed, 1 Nov 2023 17:38:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38596 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345807AbjKAViH (ORCPT ); Wed, 1 Nov 2023 17:38:07 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7863810F for ; Wed, 1 Nov 2023 14:38:04 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0872DC4339A; Wed, 1 Nov 2023 21:38:04 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qyIuZ-00EdZK-0A; Wed, 01 Nov 2023 17:38:03 -0400 Message-ID: <20231101213802.860270972@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 01 Nov 2023 17:37:24 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Ajay Kaher Subject: [for-next][PATCH 06/12] eventfs: Have a free_ei() that just frees the eventfs_inode References: <20231101213718.381015321@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no 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]); Wed, 01 Nov 2023 14:38:27 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781399246408408103 X-GMAIL-MSGID: 1781399246408408103 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. Link: https://lkml.kernel.org/r/20231101172649.265214087@goodmis.org Cc: Ajay Kaher Cc: Mark Rutland Cc: Andrew Morton Reviewed-by: Masami Hiramatsu (Google) Signed-off-by: Steven Rostedt (Google) --- 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);