From patchwork Wed Nov 1 21:37:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 160685 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:abcd:0:b0:403:3b70:6f57 with SMTP id f13csp724362vqx; Wed, 1 Nov 2023 14:38:28 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFK2LLLHiOhWZ4bAtnp8AJLykyCc1TbsHClC4E4QdGXf5VwYE4MmT/0lE9xQ5sQfH/O1iXK X-Received: by 2002:a05:6a00:1709:b0:6be:2dce:cf5a with SMTP id h9-20020a056a00170900b006be2dcecf5amr15711074pfc.26.1698874707723; Wed, 01 Nov 2023 14:38:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698874707; cv=none; d=google.com; s=arc-20160816; b=pEaDaMEUo+8GSUO3sdcxA9Xoxacsn7cYhW2VxSB25dPY4noEy1lxQgV/Jnbm00eT+W HY+ErofLvnJ2rbEbnVR+6it+UElkkXP1gQDMrS+nXxNEixINwPH7R/ZPPqbdDG4FR7Md bhlfvV5QY4cMbcyUDAbceMHASi2xRvQ/Uk6UYcnRbyHG0bv68e2d1CRtFir6kTvxYMjI 25ib9bJYpjyn1YLawRoeCtGe8J0Cu6igGI9dhxTzDDuOIUR0WCoSSeJQEI36WJZ8L2sJ VNoeSuLsW/m4GNdmhjBwly5ITHBXmY15ovvkP6g6Nq2yyDL833So2g3gsAEhHP5W4om2 W9hA== 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=IvEdu45mapUaIRUpZPzLeLE29X+K0aLKw+Xk0+Qdo3o=; fh=6eUAIHNAwDW+7DsB/WWjxjB0HPk6vyCgJSvpipnVKYc=; b=qSdZigv1AWk37riG2bzce+CxONf7ydJfi3SAno4UFEZXmLKStmKNuELKbXldU0lpZT HZc8+grE91SBTs0s2duEN1N2snyhB4A7Wuxlo2jqtllFF8ebCpuvw9SCwee1h0ul0JaT lFSBKYfN6cqtEUtRhv9z+0EsYQJMS7iKSPCE+BIwH3I1dqMwQ+hSwBsa80y5j89MVJde BXAjKn+DA7noFQN9OfiMO8ZZXZR5uFHbtPmHdWAkZ8hnh4tStEEwoxXGQlFfbTValcNB TSkUdEdGqAVzMjGCZpJbyAI62Xc0wqx0pmuoLJLBYnnUDjxpxECca4oO5Wc1mq6aNPNd fdig== 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 g124-20020a636b82000000b00577960a815csi722595pgc.188.2023.11.01.14.38.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Nov 2023 14:38:27 -0700 (PDT) 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 C48848197EB3; Wed, 1 Nov 2023 14:38:26 -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 S1346213AbjKAViT (ORCPT + 35 others); Wed, 1 Nov 2023 17:38:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38574 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345806AbjKAViH (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 7882B122; Wed, 1 Nov 2023 14:38:04 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C0116C43397; Wed, 1 Nov 2023 21:38:03 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qyIuY-00EdYl-2h; Wed, 01 Nov 2023 17:38:02 -0400 Message-ID: <20231101213802.652626263@goodmis.org> User-Agent: quilt/0.66 Date: Wed, 01 Nov 2023 17:37:23 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , stable@vger.kernel.org, Ajay Kaher Subject: [for-next][PATCH 05/12] eventfs: Remove "is_freed" union with rcu head 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:26 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781399245361426434 X-GMAIL-MSGID: 1781399245361426434 From: "Steven Rostedt (Google)" 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 | 2 ++ fs/tracefs/internal.h | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/fs/tracefs/event_inode.c b/fs/tracefs/event_inode.c index 9f612a8f009d..1ce73acf3df0 100644 --- a/fs/tracefs/event_inode.c +++ b/fs/tracefs/event_inode.c @@ -824,6 +824,8 @@ static void eventfs_remove_rec(struct eventfs_inode *ei, struct list_head *head, eventfs_remove_rec(ei_child, head, level + 1); } + ei->is_freed = 1; + list_del_rcu(&ei->list); list_add_tail(&ei->del_list, head); } diff --git a/fs/tracefs/internal.h b/fs/tracefs/internal.h index 64fde9490f52..c7d88aaa949f 100644 --- a/fs/tracefs/internal.h +++ b/fs/tracefs/internal.h @@ -23,6 +23,7 @@ struct tracefs_inode { * @d_parent: pointer to the parent's dentry * @d_children: The array of dentries to represent the files when created * @data: The private data to pass to the callbacks + * @is_freed: Flag set if the eventfs is on its way to be freed * @nr_entries: The number of items in @entries */ struct eventfs_inode { @@ -38,14 +39,13 @@ struct eventfs_inode { * Union - used for deletion * @del_list: list of eventfs_inode to delete * @rcu: eventfs_inode 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; }; - int nr_entries; + unsigned int is_freed:1; + unsigned int nr_entries:31; }; static inline struct tracefs_inode *get_tracefs(const struct inode *inode)