From patchwork Sun Nov 5 15:56:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 161652 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp2192545vqu; Sun, 5 Nov 2023 08:02:11 -0800 (PST) X-Google-Smtp-Source: AGHT+IEcAEE82TvJPcnsj56hu/mCBQJLAk0oOpdh9/xj0CWeGlD4ad5Bs3OyN22DtGImJE5SW8Ts X-Received: by 2002:a05:6602:3c8:b0:7a9:b1c9:4380 with SMTP id g8-20020a05660203c800b007a9b1c94380mr33292619iov.1.1699200131421; Sun, 05 Nov 2023 08:02:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699200131; cv=none; d=google.com; s=arc-20160816; b=NLebQ+1mzaZDS7vN/KzFINNTSNgVUuNfThSVTT5xkJhLZZJnfvWCa7ano81i9ZBq+b hknr+KMRTObRwrVLN8cK/HUANP+xLNZB9rejsJKCxvEGLbP93Hp55p97M80chKCn6Sao f7+gInghATDIw3ys6zHAqZQn9CwP0M8Wtmiee2oDm2PhD4TVilyz4Rs9I1ic0EwTb1Gc TTGZAjj27IOZ5YfLFTlb70k9X0j6Hos+3DgX4JuC6OfFlCy0ZhbGPwFCtc64KOmYW3ri ArkFX1gFvKt1TSzTQZCfiQFyet8sLVxmUENy7ztIdFp5JTvPXvKOI3SiiLcOP6tumj2B /lTA== 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=D/8FuqLXvQ6kxvXl9z2YJntTwAsEsmPzTC65coR6OXs=; fh=5fXiwuINd15usHF5af0bVHUWftYpivNmVKkJ+nuVsWg=; b=ft6tAkZGFiIAD7xn3kxGPYk44mPa6voLQu+Xr7sWfsWyy95ed+lMi6B9XJEE8HYE+f jmI1r1vNAJTMaLRiQk8OVAPCRQcAwc9Lvv6AGxKOs7P7TVWurl9d4wvcDcoAKvfJ7Wrk KSeXoaaxS6i/KpSYRtxP7kPotwcO1dwlLLgtKZ9CUEnWNjBeIZtgaYJqzwt6i5NCPAdI gMsBHCaxL7yz+autxYoTqFxrF0KvGv6H0sr56FTGlP5TXqpkv9FWwnGs6y32tffJBWi2 5/Xf37SjKBy5bfcM6U2zghRuA29cgVMgrzqOm6vEOP1WN3kuOFt+yIY6XAx0xlBhcB26 rXqw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id ay26-20020a056638411a00b0043d281279a5si2948839jab.8.2023.11.05.08.02.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Nov 2023 08:02:11 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 1DFD880AEB08; Sun, 5 Nov 2023 08:01:55 -0800 (PST) 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 S229599AbjKEQBp (ORCPT + 34 others); Sun, 5 Nov 2023 11:01:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46864 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229379AbjKEQBl (ORCPT ); Sun, 5 Nov 2023 11:01:41 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 526BBE1; Sun, 5 Nov 2023 08:01:38 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 02DECC433C8; Sun, 5 Nov 2023 16:01:38 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.97-RC3) (envelope-from ) id 1qzfZD-00000000ChE-2gI6; Sun, 05 Nov 2023 11:01:39 -0500 Message-ID: <20231105160139.498444992@goodmis.org> User-Agent: quilt/0.67 Date: Sun, 05 Nov 2023 10:56:32 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Ajay Kaher Subject: [v6.6][PATCH 2/5] eventfs: Remove "is_freed" union with rcu head References: <20231105155630.925114107@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]); Sun, 05 Nov 2023 08:01:55 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781740476773277993 X-GMAIL-MSGID: 1781740476773277993 From: "Steven Rostedt (Google)" commit f2f496370afcbc5227d7002da28c74b91fed12ff upstream The eventfs_inode->is_freed was a union with the rcu_head with the assumption that when it was on the srcu list the head would contain a pointer which would make "is_freed" true. But that was a wrong assumption as the rcu head is a single link list where the last element is NULL. Instead, split the nr_entries integer so that "is_freed" is one bit and the nr_entries is the next 31 bits. As there shouldn't be more than 10 (currently there's at most 5 to 7 depending on the config), this should not be a problem. Link: https://lkml.kernel.org/r/20231101172649.049758712@goodmis.org Cc: stable@vger.kernel.org Cc: Mark Rutland Cc: Andrew Morton Cc: Ajay Kaher Fixes: 63940449555e7 ("eventfs: Implement eventfs lookup, read, open functions") Reviewed-by: Masami Hiramatsu (Google) Signed-off-by: Steven Rostedt (Google) --- fs/tracefs/event_inode.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/fs/tracefs/event_inode.c b/fs/tracefs/event_inode.c index 8c8d64e76103..a64d8fa39e54 100644 --- a/fs/tracefs/event_inode.c +++ b/fs/tracefs/event_inode.c @@ -38,6 +38,7 @@ struct eventfs_inode { * @fop: file_operations for file or directory * @iop: inode_operations for file or directory * @data: something that the caller will want to get to later on + * @is_freed: Flag set if the eventfs is on its way to be freed * @mode: the permission that the file or directory should have */ struct eventfs_file { @@ -52,15 +53,14 @@ struct eventfs_file { * Union - used for deletion * @del_list: list of eventfs_file to delete * @rcu: eventfs_file to delete in RCU - * @is_freed: node is freed if one of the above is set */ union { struct list_head del_list; struct rcu_head rcu; - unsigned long is_freed; }; void *data; - umode_t mode; + unsigned int is_freed:1; + unsigned int mode:31; }; static DEFINE_MUTEX(eventfs_mutex); @@ -814,6 +814,8 @@ static void eventfs_remove_rec(struct eventfs_file *ef, struct list_head *head, } } + ef->is_freed = 1; + list_del_rcu(&ef->list); list_add_tail(&ef->del_list, head); }