From patchwork Fri Oct 6 23:13:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 149463 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp646504vqo; Fri, 6 Oct 2023 16:13:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHUnZeO+eXy7jYdhfi8f4PbTOzm5IMmfGXSHujvviVtFbiKTWJl7o6BBU1SUKINQnGDIRg5 X-Received: by 2002:a17:90a:b017:b0:26b:4ce1:9705 with SMTP id x23-20020a17090ab01700b0026b4ce19705mr9520724pjq.38.1696633979984; Fri, 06 Oct 2023 16:12:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696633979; cv=none; d=google.com; s=arc-20160816; b=RY35p9kzmakTovmijF67o4zTgxz86wMxqKBBLp2ItZbkqm1MdUIiBYfIiBrRD68jfE jYFN9CPL/dI/l2s7g0Kvi1Xg0GCq6dBAtgodoE37p0vLjQhIvyFsRFBRvLufxMC2zbRV 6pcst6EZvdtnmImR0Zyck2xN4BWOMeL6148THHypd9gVhkLaRSyiVO/9X2kvg8RUSWmQ dReMKjAQnlAyeRRwQzP0VntdLM/8o5bE+XVFUbTxR+Fa03wbRUYCC7Wsbab+3QV5lB/2 GGOP9RDLM3SoK+7hB9Gs+lvTgnmW29LZsJ8VtTQsJjHM/5/tsuqGe5a4BkJYrA/Ar9tS 6OWA== 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=PbRx2oFqg4ULAWF2+ZdFexOk6gxYtTsx2jGyC/2YDSY=; fh=WY0fNBiZ9IyxbNho/H0WDcmgiLIu8rvBvV8VTBpE5Ns=; b=u38d2hxOgBUpUlVQ58pxXgqrJsiPAaJC5LwyLYqmog/+eerhju4IrQrvG4ncgHctQN S9WsqUgDOHsCzkJt6UdVuasuJXc3JTILAB0EHjfEok3ewK3e2sdkaujKa1jMtDDwt/NA uHosr8zc9zhFwtwL+xMjWUUch5bmYl6o+WgvLYjdgrqXfaxpxBBbYDeJLt49Y2zAykg/ t5ZmmXuhHDtQ106RghYj7za/fr7jHi8sScYknO9x3jAhmiU0g2hvMHsdJ724p1URaFR2 17tw2H8dmltJVmoelGmjpTJ5gYjyIFG2H7SSpIj21+7NHTZY7/2UPCdbs7L2ov5Mf/Wk XvJw== 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 pj3-20020a17090b4f4300b0027724d42e7esi4889016pjb.123.2023.10.06.16.12.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Oct 2023 16:12:59 -0700 (PDT) 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 2832E80F694A; Fri, 6 Oct 2023 16:12:51 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233937AbjJFXMm (ORCPT + 18 others); Fri, 6 Oct 2023 19:12:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47538 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233627AbjJFXMk (ORCPT ); Fri, 6 Oct 2023 19:12:40 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 436B19C for ; Fri, 6 Oct 2023 16:12:39 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D88A1C433C8; Fri, 6 Oct 2023 23:12:38 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qou11-005rOB-1q; Fri, 06 Oct 2023 19:13:51 -0400 Message-ID: <20231006231351.389766059@goodmis.org> User-Agent: quilt/0.66 Date: Fri, 06 Oct 2023 19:13:25 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , kernel test robot Subject: [for-next][PATCH 1/2] eventfs: Use eventfs_remove_events_dir() References: <20231006231324.646666118@goodmis.org> MIME-Version: 1.0 X-Spam-Status: No, score=2.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no 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]); Fri, 06 Oct 2023 16:12:51 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779049672361086489 X-GMAIL-MSGID: 1779049672361086489 From: "Steven Rostedt (Google)" The update to removing the eventfs_file changed the way the events top level directory was handled. Instead of returning a dentry, it now returns the eventfs_inode. In this changed, the removing of the events top level directory is not much different than removing any of the other directories. Because of this, the removal just called eventfs_remove_dir() instead of eventfs_remove_events_dir(). Although eventfs_remove_dir() does the clean up, it misses out on the dget() of the ei->dentry done in eventfs_create_events_dir(). It makes more sense to match eventfs_create_events_dir() with a specific function eventfs_remove_events_dir() and this specific function can then perform the dput() to the dentry that had the dget() when it was created. Fixes: 5790b1fb3d67 ("eventfs: Remove eventfs_file and just use eventfs_inode") Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-kbuild-all/202310051743.y9EobbUr-lkp@intel.com/ Signed-off-by: Steven Rostedt (Google) --- fs/tracefs/event_inode.c | 19 +++++++------------ include/linux/tracefs.h | 1 + kernel/trace/trace_events.c | 2 +- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/fs/tracefs/event_inode.c b/fs/tracefs/event_inode.c index eab18b157ef5..1ccd100bc565 100644 --- a/fs/tracefs/event_inode.c +++ b/fs/tracefs/event_inode.c @@ -901,22 +901,17 @@ void eventfs_remove_dir(struct eventfs_inode *ei) } /** - * eventfs_remove_events_dir - remove eventfs dir or file from list - * @dentry: events's dentry to be removed. + * eventfs_remove_events_dir - remove the top level eventfs directory + * @ei: the event_inode returned by eventfs_create_events_dir(). * - * This function remove events main directory + * This function removes the events main directory */ -void eventfs_remove_events_dir(struct dentry *dentry) +void eventfs_remove_events_dir(struct eventfs_inode *ei) { - struct tracefs_inode *ti; - - if (!dentry || !dentry->d_inode) - return; + struct dentry *dentry = ei->dentry; - ti = get_tracefs(dentry->d_inode); - if (!ti || !(ti->flags & TRACEFS_EVENT_INODE)) - return; + eventfs_remove_dir(ei); - d_invalidate(dentry); + /* Matches the dget() from eventfs_create_events_dir() */ dput(dentry); } diff --git a/include/linux/tracefs.h b/include/linux/tracefs.h index 0c39704455d9..13359b1a35d1 100644 --- a/include/linux/tracefs.h +++ b/include/linux/tracefs.h @@ -41,6 +41,7 @@ struct eventfs_inode *eventfs_create_dir(const char *name, struct eventfs_inode const struct eventfs_entry *entries, int size, void *data); +void eventfs_remove_events_dir(struct eventfs_inode *ei); void eventfs_remove_dir(struct eventfs_inode *ei); struct dentry *tracefs_create_file(const char *name, umode_t mode, diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c index a3b9d9423824..0e3a1c70e410 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c @@ -3872,7 +3872,7 @@ int event_trace_del_tracer(struct trace_array *tr) down_write(&trace_event_sem); __trace_remove_event_dirs(tr); - eventfs_remove_dir(tr->event_dir); + eventfs_remove_events_dir(tr->event_dir); up_write(&trace_event_sem); tr->event_dir = NULL;