From patchwork Thu Oct 26 01:27:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 158347 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp355665vqb; Wed, 25 Oct 2023 18:28:04 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHRbwJmT1RWlcJcYc6Mnq6uV2Mo9uzWR1XMQtjpm5Z92OaBEQy4SbXhh2HeWHckZJxbzUYL X-Received: by 2002:a81:83ca:0:b0:5a7:b8a5:1474 with SMTP id t193-20020a8183ca000000b005a7b8a51474mr20178376ywf.22.1698283684636; Wed, 25 Oct 2023 18:28:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698283684; cv=none; d=google.com; s=arc-20160816; b=vz/2RBB9yu/pDrNZ4zT3VA03XYPJha5tmXFQRSsqKnC1f2c3pkKDEQzlz5BiVjJkxT X+zNoV5vRoXhENX1rMvImHSerVWYjFahpZrvWrQtbOy88Cu7nebmcPBDVZs8CR7/jewX p+qzpW6DWahR/FwNHnusi8gyoW+LejiPvp6n5CbEW2KP8hmME4BRmo2KVHM3KihZpp/D XT4xo0+20wt4YgX02xqNoqgXusdZ00zQ6AA7BYY6BLkwTLSuegp4ubzR363sN+NS2GkO IZqF/fSW7dvji64QTPl8VoPXTwefku9NdMixJ75rJD+4yUJvRYJhsmTiX71CE/BX2k7N 8xxg== 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=uISItmdW+E1oV3DzBqqyAE3rRr+Eb+OFfTdQVNeIpDU=; fh=easJR01Tb+n7upxYiKQ8cYY2fdzmtdLkK9f6VckevDI=; b=AmCrd7THsRz/quqZAzEu9ZzeuFESBv9rKu+dLyjfX28LIKUqf0Qb+eKEWGZHbDoLZw ufQKfrlDlqHlRzclrm9hRtQhR1WecGJzRD+auchmsBC1tCvUUIRp+LhX5ZyU5AyzUNQ6 K+IXo8VlOfDq+ahplSvbuTtGmD/dIbtQSF9TslvJU2YT5H0QhODZmKkS5ZFTkgLczVob ZicSGk08Ekse5oj0bqmnRJwv52wpVqAHTE8TyV2xHVpDRU5p187g+x/iSI6NcwvDvjkg JKdoaK5k93RGThNKlMwycSbaC92PRHw0PCBlyCYsGD3Vpuufbq1/XSsy9LMojZJFzAf1 KZwQ== 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 v5-20020a0dd305000000b0058c99180384si12214430ywd.440.2023.10.25.18.28.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Oct 2023 18:28:04 -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 620E881B75FA; Wed, 25 Oct 2023 18:28:03 -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 S232904AbjJZB16 (ORCPT + 25 others); Wed, 25 Oct 2023 21:27:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231288AbjJZB15 (ORCPT ); Wed, 25 Oct 2023 21:27:57 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 03EDCCC for ; Wed, 25 Oct 2023 18:27:55 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AA0E5C433C9; Thu, 26 Oct 2023 01:27:54 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qvpA9-00CqSz-1x; Wed, 25 Oct 2023 21:27:53 -0400 Message-ID: <20231026012753.418244796@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 25 Oct 2023 21:27:35 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Christophe JAILLET , Mukesh ojha Subject: [for-next][PATCH 1/4] tracing/histograms: Simplify last_cmd_set() References: <20231026012734.358814002@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 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]); Wed, 25 Oct 2023 18:28:03 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780779513093960759 X-GMAIL-MSGID: 1780779513093960759 From: Christophe JAILLET Turn a kzalloc()+strcpy()+strncat() into an equivalent and less verbose kasprintf(). Link: https://lore.kernel.org/linux-trace-kernel/30b6fb04dadc10a03cc1ad08f5d8a93ef623a167.1697899346.git.christophe.jaillet@wanadoo.fr Cc: Masami Hiramatsu Signed-off-by: Christophe JAILLET Reviewed-by: Mukesh ojha Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace_events_hist.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c index d06938ae0717..1abc07fba1b9 100644 --- a/kernel/trace/trace_events_hist.c +++ b/kernel/trace/trace_events_hist.c @@ -774,23 +774,16 @@ static void last_cmd_set(struct trace_event_file *file, char *str) { const char *system = NULL, *name = NULL; struct trace_event_call *call; - int len; if (!str) return; - /* sizeof() contains the nul byte */ - len = sizeof(HIST_PREFIX) + strlen(str); kfree(last_cmd); - last_cmd = kzalloc(len, GFP_KERNEL); + + last_cmd = kasprintf(GFP_KERNEL, HIST_PREFIX "%s", str); if (!last_cmd) return; - strcpy(last_cmd, HIST_PREFIX); - /* Again, sizeof() contains the nul byte */ - len -= sizeof(HIST_PREFIX); - strncat(last_cmd, str, len); - if (file) { call = file->event_call; system = call->class->system; From patchwork Thu Oct 26 01:27:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 158349 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp355850vqb; Wed, 25 Oct 2023 18:28:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEHW9ntbKso0HUgoHj8lFE9SytCFtcX4h4RnE0XoyWREK3ZciThdnKCPf6GkyvCyI8+EMQK X-Received: by 2002:a81:600a:0:b0:59f:9c08:8f12 with SMTP id u10-20020a81600a000000b0059f9c088f12mr20519534ywb.38.1698283710756; Wed, 25 Oct 2023 18:28:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698283710; cv=none; d=google.com; s=arc-20160816; b=rDNvAL6IUhG1p2YFmsx841vgdZ1NjmHF5ZpZ10j59xvw2ehlpRuKVl54roMzZCW5gd JbnF03WQOdtsf18302KUgW6/PDoZieJ5CfA6QrnCcCYulxLOQM5XsaSPMThuUlMWIUJ8 sKHRpfOqsYss1gaQthP5g17LnayGvgkZlNGeZFFECb3hgMLA9fEi4SU77xkjpyQ99woV REbmTAW2sxyBzZZSWe290Jc3CmF96Ox/gzWI3R13ERE0GzX7YOD51Nja/UIn+MU4xsO3 r7JXkQIFU1NOXeQR6bnVBpYiamMHfnMLoznJgHpgOEqbN/CCwy+OT9XxXH9XEN3tzOvH 3ChQ== 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=w5l3dwhqLsa9xFmNuv9oX39MsURwFGY3srLQTAuffW0=; fh=ORuo45stHkoBGfS0Dy6JyYQx/EZhXh/BH9zFtb2k2Hw=; b=nfyagLfB9qwiSKxX1Lf1FSCtUsqKlL/lZXgSbSgZZAS+La2svqIQ2m2ziZa7DQQddi 0S+OeiIcz13mA9FJkQLDEUYd2uWNFz9Q81qpJbwFs3pCEBX9CReh332RsA9IMeprutO6 6WfuWkRtuod3a8j2BBKevcew6cB8htz/XagqMNI0tqnHVIxA8Qfe0XzfzOjOKw2/nKdi lpPSfpI1ahsaLnENJDUwLWz4XROL5tAfK7TRN/wh/oxIGJg5GKFJNVLGgxzq2bAg9/Pz 33w/0+8XI53JtA9OAFEZIuv578DOqTSqY6/PFwFAwOe3S/rhbR0T7nUzZgBrC17fAc6X evqw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id m15-20020a81d24f000000b005a4ddcc6205si13065425ywl.205.2023.10.25.18.28.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Oct 2023 18:28:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 C478680E9E84; Wed, 25 Oct 2023 18:28:27 -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 S233204AbjJZB2E (ORCPT + 25 others); Wed, 25 Oct 2023 21:28:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51346 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232626AbjJZB15 (ORCPT ); Wed, 25 Oct 2023 21:27:57 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 250F8136 for ; Wed, 25 Oct 2023 18:27:55 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C170FC433CC; Thu, 26 Oct 2023 01:27:54 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qvpA9-00CqTX-2c; Wed, 25 Oct 2023 21:27:53 -0400 Message-ID: <20231026012753.628263428@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 25 Oct 2023 21:27:36 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Christoph Hellwig , Justin Stitt , Kent Overstreet , Petr Mladek , Andy Shevchenko , Rasmus Villemoes , Sergey Senozhatsky , Michael Ellerman , Kees Cook , "Matthew Wilcox (Oracle)" Subject: [for-next][PATCH 2/4] powerpc: Remove initialisation of readpos References: <20231026012734.358814002@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 autolearn=unavailable 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]); Wed, 25 Oct 2023 18:28:27 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780779540271830661 X-GMAIL-MSGID: 1780779540271830661 From: "Matthew Wilcox (Oracle)" While powerpc doesn't use the seq_buf readpos, it did explicitly initialise it for no good reason. Link: https://lore.kernel.org/linux-trace-kernel/20231024145600.739451-1-willy@infradead.org Cc: Christoph Hellwig Cc: Justin Stitt Cc: Kent Overstreet Cc: Petr Mladek Cc: Andy Shevchenko Cc: Rasmus Villemoes Cc: Sergey Senozhatsky Cc: Michael Ellerman Reviewed-by: Kees Cook Fixes: d0ed46b60396 ("tracing: Move readpos from seq_buf to trace_seq") Signed-off-by: Matthew Wilcox (Oracle) Signed-off-by: Steven Rostedt (Google) --- arch/powerpc/kernel/setup-common.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c index 2f1026fba00d..34975532e44c 100644 --- a/arch/powerpc/kernel/setup-common.c +++ b/arch/powerpc/kernel/setup-common.c @@ -601,7 +601,6 @@ struct seq_buf ppc_hw_desc __initdata = { .buffer = ppc_hw_desc_buf, .size = sizeof(ppc_hw_desc_buf), .len = 0, - .readpos = 0, }; static __init void probe_machine(void) From patchwork Thu Oct 26 01:27:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 158348 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp355682vqb; Wed, 25 Oct 2023 18:28:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFvkPruMAJ0hSc3LDp2/xkDovUDORtQ2rB7xWaP+NjMWt8cUo8pf/ySJzzTTnaSnwBw1hR3 X-Received: by 2002:a1f:a9c3:0:b0:4a8:4218:804b with SMTP id s186-20020a1fa9c3000000b004a84218804bmr15285234vke.12.1698283687368; Wed, 25 Oct 2023 18:28:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698283687; cv=none; d=google.com; s=arc-20160816; b=hcgqlJVXuBxFnWz5GVbWsoEUxk6BiZREJnYB+oGODukcBvGmo0FLg+11DD9cwiXGl9 ac/majVxdOtJZL5JUK75hBbvchKGHXJukQe7NXGhrsKS/jOYKBAC7x3sc5vcDm7MkLXz n2wHbZ+0Z8aGKzEHZk2n+wc1x50MVUtqS63+Amxwj/VGKrHhS2EcbL/ulIPZUZpmxb9s SmDjSGHAYiNXbBOlPNRwGOipgTx+NBINMJaPSTnwiT4uGhT8tjR3aY6glTGECD4TF+7S JFeh1puFeG+DtUZD2QqUrdJeLss0DWMVO9bFBzd80OSevGO9F5Ax0WqUBXNq4R43lRIT V1QA== 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=E+JLr14FGwQp4fxwptxCcjEwrt3myv8MamoDyhW6U1E=; fh=cY9HGbp9RiQ9xCYqjybSe1/cIiXVFs0Cn9z6ge1iyyY=; b=03m0BJ3eEMUmsOFBEdf3RbZo2i0IvRv6qqnOJYioEcPrFcCBOrg+5KmtY+EeGG+G0o hUHkj1VjllBo1r9xUTnAcie4SxuMjmBH5bq5Qkrxo/LIj2x6n4/JUr5PZOz20zmJRFEK sb8GaXOb6rGd1m7KEw/dy4Eqm64bXVfHN8Ew9nD0Odc+FbJCDfiMNjG/whqVKHsTOApQ 1w7xEe2F6Kf51qMK6dGYEfbeNUib6SCc+fObtpL1u0HT1DaOElvw6A0jZAY8eD+wrhM2 sxZvHdzEbflRI2RH2EuD0e5jjqRTkWJMkXc+iOrj8vfnwgwNgFkuQqSpHlOxm/pf+ykD fBDg== 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 h204-20020a816cd5000000b0058cd7815d28si13129105ywc.190.2023.10.25.18.28.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Oct 2023 18:28:07 -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 724CA81B8000; Wed, 25 Oct 2023 18:28:06 -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 S232946AbjJZB2A (ORCPT + 25 others); Wed, 25 Oct 2023 21:28:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51354 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232710AbjJZB15 (ORCPT ); Wed, 25 Oct 2023 21:27:57 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6FF71185 for ; Wed, 25 Oct 2023 18:27:55 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1C47AC43395; Thu, 26 Oct 2023 01:27:55 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qvpAA-00CqU5-05; Wed, 25 Oct 2023 21:27:54 -0400 Message-ID: <20231026012753.831438923@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 25 Oct 2023 21:27:37 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton Subject: [for-next][PATCH 3/4] eventfs: Fix WARN_ON() in create_file_dentry() References: <20231026012734.358814002@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 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]); Wed, 25 Oct 2023 18:28:06 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780779515684751705 X-GMAIL-MSGID: 1780779515684751705 From: "Steven Rostedt (Google)" As the comment right above a WARN_ON() in create_file_dentry() states: * Note, with the mutex held, the e_dentry cannot have content * and the ei->is_freed be true at the same time. But the WARN_ON() only has: WARN_ON_ONCE(ei->is_free); Where to match the comment (and what it should actually do) is: dentry = *e_dentry; WARN_ON_ONCE(dentry && ei->is_free) Also in that case, set dentry to NULL (although it should never happen). Link: https://lore.kernel.org/linux-trace-kernel/20231024123628.62b88755@gandalf.local.home Cc: Masami Hiramatsu Cc: Mark Rutland Fixes: 5790b1fb3d672 ("eventfs: Remove eventfs_file and just use eventfs_inode") Signed-off-by: Steven Rostedt (Google) --- fs/tracefs/event_inode.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fs/tracefs/event_inode.c b/fs/tracefs/event_inode.c index 09ab93357957..4d2da7480e5f 100644 --- a/fs/tracefs/event_inode.c +++ b/fs/tracefs/event_inode.c @@ -264,8 +264,9 @@ create_file_dentry(struct eventfs_inode *ei, struct dentry **e_dentry, * Note, with the mutex held, the e_dentry cannot have content * and the ei->is_freed be true at the same time. */ - WARN_ON_ONCE(ei->is_freed); dentry = *e_dentry; + if (WARN_ON_ONCE(dentry && ei->is_freed)) + dentry = NULL; /* The lookup does not need to up the dentry refcount */ if (dentry && !lookup) dget(dentry); From patchwork Thu Oct 26 01:27:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 158350 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp355897vqb; Wed, 25 Oct 2023 18:28:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFBWSLe0RXmxf5y9K8CKM9xqLo7lHqV8QvJA8eHzbOdf5XTVqH0q2cKBsKH5SEggEpJoYgF X-Received: by 2002:a0d:d783:0:b0:59b:65d4:4d73 with SMTP id z125-20020a0dd783000000b0059b65d44d73mr16512739ywd.27.1698283716629; Wed, 25 Oct 2023 18:28:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698283716; cv=none; d=google.com; s=arc-20160816; b=zD3rv0UCDLi/YvuD/JDplRp0wBx0mDDzOBVL452iWAvwZuM0bweWL+OdK9ENsRGiam VxJ378QlQjun5f8Rv0ajeYNqd4ZmO2CXC/hmSR5ANGsmABEX9EUtaPAL8//SOaOzNbEK NGCJOPlS6I2U9TbemQ8a2pmW2Zo+lRusKqlT573oVK/vTUXbM7DfaSDQ9WUKFLGDm6ed QcUwiuwSzyr8QwIMgxc9VLbDvw12DSJGCs4lvWn/6LsgeLrEnI+o8ejTGT7v6t6rmEi0 J4AinZR3Z14dgAZTKhUyc8mug1JztQleFZGoN50N7sXJ3x7vLx1e081MClT83CwwkKRQ r81A== 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=9JcB98339c8bZG7vO+doM3G1oUiwDoukj4g8OE+yjhs=; fh=cY9HGbp9RiQ9xCYqjybSe1/cIiXVFs0Cn9z6ge1iyyY=; b=Lqts5YpNuX4AsWoQGjnmqKtIr5kaJ7xaeApLTYSRF5+AUa2ANpTvi7S+NBt3Dx6Wc2 jYnFO6Jh3Vi9lLeigwZeiTivV2cJndl0uJwHKrH+SO6eXwiOAWuWZpu7ljlGnVYUUN8B PQgy5JqFs3+HYEVLAx73Lzlt34Jvm+Wd/9Ge3T/kJtBmkhLtkHezdAOphhEFvJdL7x1Y hlGvjX5x9RHXKk5HMFleAqTaCmYfvL6Ksja7X8MPLLLJDHRptJRdfYCPRyk7VT59qGle ZRCnUxwJBqlRODdvWrrzYxhQ2769YZwudH76YBCvb+n/FWaY9WVH9lN9p2HmGTCwFtKf axVg== 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 u71-20020a81844a000000b0059c21d53f92si12604432ywf.427.2023.10.25.18.28.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Oct 2023 18:28:36 -0700 (PDT) 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 F08928181BB9; Wed, 25 Oct 2023 18:28:33 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233132AbjJZB2I (ORCPT + 25 others); Wed, 25 Oct 2023 21:28:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51370 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232813AbjJZB15 (ORCPT ); Wed, 25 Oct 2023 21:27:57 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9A8F7186 for ; Wed, 25 Oct 2023 18:27:55 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 37908C4339A; Thu, 26 Oct 2023 01:27:55 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qvpAA-00CqUd-0k; Wed, 25 Oct 2023 21:27:54 -0400 Message-ID: <20231026012754.043877861@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 25 Oct 2023 21:27:38 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton Subject: [for-next][PATCH 4/4] eventfs: Fix typo in eventfs_inode union comment References: <20231026012734.358814002@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 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]); Wed, 25 Oct 2023 18:28:34 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780779546685855633 X-GMAIL-MSGID: 1780779546685855633 From: "Steven Rostedt (Google)" It's eventfs_inode not eventfs_indoe. There's no deer involved! Link: https://lore.kernel.org/linux-trace-kernel/20231024131024.5634c743@gandalf.local.home Cc: Masami Hiramatsu Cc: Mark Rutland Fixes: 5790b1fb3d672 ("eventfs: Remove eventfs_file and just use eventfs_inode") Signed-off-by: Steven Rostedt (Google) --- fs/tracefs/internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/tracefs/internal.h b/fs/tracefs/internal.h index 298d3ecaf621..64fde9490f52 100644 --- a/fs/tracefs/internal.h +++ b/fs/tracefs/internal.h @@ -37,7 +37,7 @@ struct eventfs_inode { /* * Union - used for deletion * @del_list: list of eventfs_inode to delete - * @rcu: eventfs_indoe to delete in RCU + * @rcu: eventfs_inode to delete in RCU * @is_freed: node is freed if one of the above is set */ union {