Received: by 2002:a05:6520:2586:b029:fa:41f3:c225 with SMTP id u6csp453832lky; Fri, 11 Jun 2021 06:35:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxcqGSLWan4Fw6CZyn0l42VQWA5uFFuNflMBrc14Lf89V9YKZCLLp5xJqHmbCYJNZiaS+Ry X-Received: by 2002:a17:906:6dc5:: with SMTP id j5mr3688741ejt.364.1623418540659; Fri, 11 Jun 2021 06:35:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623418540; cv=none; d=google.com; s=arc-20160816; b=XsB8RbToKN+9VmxRjeBpCczALHFR3uQeQiHGQ9JSAdrxGREeFS6DZulL6KMiOnhGU8 HdK/Ig5zyEr3Xr2KGwBC4vDkA/0AvnBRQQAg+9f7s8ZpjZIoK7WfNja4CQSbz8bSoAWx P98VpF5XyeExDu6UnxWxtOEVacoEGnpzxrzjuEEGkpzH4qvtTDo7k5SZKLC4xZkiD6Ac TTrOXKE+f3c+Y0s9NazuyezaP7BxBh1VhxPChHoIxfLevD34DZmiYUQe1C8JG4fzupYK uPVU4xARC1zpLTibwqte6hX4KXtCl0+wVRp+FZxDGE/x/OLard9Fl9dXhQHzfWc2R+gs lxhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:date:cc:to:from:subject :message-id:dkim-signature:dkim-signature; bh=GjwKU+XZBhFKHVYjmgKYWRtYYLdEXkmDES0gwDYX30Q=; b=FDqV1gs9E2JCnkuORUqyOSIoIVQEUaTMLJ1i31DEHp9K8qsm9cnD04/oXSLSPt4Q3Q x0hIcKEJAxicubc7wUufO8JaccuwIuSKVrzOW5nyLKqRH2UJ/WxtSvA35yNIjpL1Aaf6 Su0Y7tGHwZvD6KRXfwW7CwcEHNOhT+nAsg+BYQHVGMCNVw1/OSCjsbaNQ2Pc9owGoOKL MOSYVCpkdkW+HRz+qFAP9nuMRN/UxTjqX3SiyImntwDrm58+J6lxBP0ovN+ZayXB+AUv 0q49jkdhBHjz9hP7MElsh3Fz4NSMKYP2oCJ9Ni/uuDyhwoz2BCrlH2bmLVoz4q4/5FGm I+hQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@themaw.net header.s=fm3 header.b=fhcjG8Gy; dkim=pass header.i=@messagingengine.com header.s=fm3 header.b=n7ECLgSU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y18si5007621edr.488.2021.06.11.06.35.13; Fri, 11 Jun 2021 06:35:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@themaw.net header.s=fm3 header.b=fhcjG8Gy; dkim=pass header.i=@messagingengine.com header.s=fm3 header.b=n7ECLgSU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229484AbhFKNdt (ORCPT + 99 others); Fri, 11 Jun 2021 09:33:49 -0400 Received: from wnew3-smtp.messagingengine.com ([64.147.123.17]:45497 "EHLO wnew3-smtp.messagingengine.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229517AbhFKNdr (ORCPT ); Fri, 11 Jun 2021 09:33:47 -0400 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailnew.west.internal (Postfix) with ESMTP id BD81E1816; Fri, 11 Jun 2021 09:31:48 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Fri, 11 Jun 2021 09:31:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=themaw.net; h= message-id:subject:from:to:cc:date:in-reply-to:references :content-type:mime-version:content-transfer-encoding; s=fm3; bh= GjwKU+XZBhFKHVYjmgKYWRtYYLdEXkmDES0gwDYX30Q=; b=fhcjG8GypyqILujd EPOcZy7DYVUEpQWom/9zlOtQbeLfCs1dJSG2Dfj+L8yit84TYWIw50Qf3zXkZtpr 6eUljJ7Lvxq8p7OmM3h5crpLVSzYF/kZKwaxio4u1ycJ5/Xw5O3GtBQtAgmQcTh9 eFDCRd3bGZEOCdhibijxJYq1afIQCadK0P5F1t8nzR9gz/f3q+nJWiXwsyZiQDNP TLAg6YBlww9UlSnH09vnVTLzipmoP9foA1Am+q9aFEzX2yTBskGS3prs3GVoE2Be 2yEf6O59cXQ+XyYYrDtEwEIfYw8vr8gAaDk2R6aSn0N1pnBavqrqgDAS8BhI6Yo3 N0n5ag== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; bh=GjwKU+XZBhFKHVYjmgKYWRtYYLdEXkmDES0gwDYX3 0Q=; b=n7ECLgSU9qMLk3N9lE01xFnzZ+Ry1bSMJkXbltIuU+GD7Rf+GO4mzNPg3 oIh6hDPOfxfl13r+gw1XTYt2M/MqJt9DsNAiy5KcdcoSL45kDqDHUFFugnNKKi0F l8uBYG48RxtpxrJ/wva2dJphJ7c/N956d4Kf9ig3M9G8mKJNulVe8brYvfnmEKN2 BqNaZyibWxvivCyZwHefHwmkBHale1GoOkKCjIXXshJGPDbvzTtLR1WFrtApkSth Sw2jcUG7OdGugIyADw/79aNEQ0djdjbugWocdKtGz0/8Mog9XDaIg7hcLGyNMTd3 8nj4oO+zH0vDu6T6Z/309fmb811Ng== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrfedujedgieehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepkffuhffvffgjfhgtfggggfesthekredttderjeenucfhrhhomhepkfgrnhcu mfgvnhhtuceorhgrvhgvnhesthhhvghmrgifrdhnvghtqeenucggtffrrghtthgvrhhnpe fgleelkeetheelgeehueejueduhfeufffgleehgfevtdehhffhhffhtddugfefheenucev lhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehrrghvvghnse hthhgvmhgrfidrnhgvth X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 11 Jun 2021 09:31:40 -0400 (EDT) Message-ID: <21ec3ad11c4d0d74f9b51df3c3e43ab9f62c32b4.camel@themaw.net> Subject: Re: [PATCH v6 2/7] kernfs: add a revision to identify directory node changes From: Ian Kent To: Greg Kroah-Hartman Cc: Miklos Szeredi , Tejun Heo , Eric Sandeen , Fox Chen , Brice Goglin , Al Viro , Rick Lindsley , David Howells , Marcelo Tosatti , "Eric W. Biederman" , Carlos Maiolino , linux-fsdevel , Kernel Mailing List Date: Fri, 11 Jun 2021 21:31:36 +0800 In-Reply-To: References: <162322846765.361452.17051755721944717990.stgit@web.messagingengine.com> <162322859985.361452.14110524195807923374.stgit@web.messagingengine.com> <03f6e366fb4ebb56b15541d53eda461a55d3d38e.camel@themaw.net> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.38.4 (3.38.4-1.fc33) MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 2021-06-11 at 15:11 +0200, Greg Kroah-Hartman wrote: > On Fri, Jun 11, 2021 at 08:56:18PM +0800, Ian Kent wrote: > > On Fri, 2021-06-11 at 14:49 +0200, Miklos Szeredi wrote: > > > On Wed, 9 Jun 2021 at 10:50, Ian Kent wrote: > > > > > > > > Add a revision counter to kernfs directory nodes so it can be > > > > used > > > > to detect if a directory node has changed during negative > > > > dentry > > > > revalidation. > > > > > > > > There's an assumption that sizeof(unsigned long) <= > > > > sizeof(pointer) > > > > on all architectures and as far as I know that assumption > > > > holds. > > > > > > > > So adding a revision counter to the struct kernfs_elem_dir > > > > variant > > > > of > > > > the kernfs_node type union won't increase the size of the > > > > kernfs_node > > > > struct. This is because struct kernfs_elem_dir is at least > > > > sizeof(pointer) smaller than the largest union variant. It's > > > > tempting > > > > to make the revision counter a u64 but that would increase the > > > > size > > > > of > > > > kernfs_node on archs where sizeof(pointer) is smaller than the > > > > revision > > > > counter. > > > > > > > > Signed-off-by: Ian Kent > > > > --- > > > >  fs/kernfs/dir.c             |    2 ++ > > > >  fs/kernfs/kernfs-internal.h |   23 +++++++++++++++++++++++ > > > >  include/linux/kernfs.h      |    5 +++++ > > > >  3 files changed, 30 insertions(+) > > > > > > > > diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c > > > > index 33166ec90a112..b3d1bc0f317d0 100644 > > > > --- a/fs/kernfs/dir.c > > > > +++ b/fs/kernfs/dir.c > > > > @@ -372,6 +372,7 @@ static int kernfs_link_sibling(struct > > > > kernfs_node *kn) > > > >         /* successfully added, account subdir number */ > > > >         if (kernfs_type(kn) == KERNFS_DIR) > > > >                 kn->parent->dir.subdirs++; > > > > +       kernfs_inc_rev(kn->parent); > > > > > > > >         return 0; > > > >  } > > > > @@ -394,6 +395,7 @@ static bool kernfs_unlink_sibling(struct > > > > kernfs_node *kn) > > > > > > > >         if (kernfs_type(kn) == KERNFS_DIR) > > > >                 kn->parent->dir.subdirs--; > > > > +       kernfs_inc_rev(kn->parent); > > > > > > > >         rb_erase(&kn->rb, &kn->parent->dir.children); > > > >         RB_CLEAR_NODE(&kn->rb); > > > > diff --git a/fs/kernfs/kernfs-internal.h b/fs/kernfs/kernfs- > > > > internal.h > > > > index ccc3b44f6306f..b4e7579e04799 100644 > > > > --- a/fs/kernfs/kernfs-internal.h > > > > +++ b/fs/kernfs/kernfs-internal.h > > > > @@ -81,6 +81,29 @@ static inline struct kernfs_node > > > > *kernfs_dentry_node(struct dentry *dentry) > > > >         return d_inode(dentry)->i_private; > > > >  } > > > > > > > > +static inline void kernfs_set_rev(struct kernfs_node *kn, > > > > +                                 struct dentry *dentry) > > > > +{ > > > > +       if (kernfs_type(kn) == KERNFS_DIR) > > > > +               dentry->d_time = kn->dir.rev; > > > > +} > > > > + > > > > +static inline void kernfs_inc_rev(struct kernfs_node *kn) > > > > +{ > > > > +       if (kernfs_type(kn) == KERNFS_DIR) > > > > +               kn->dir.rev++; > > > > +} > > > > + > > > > +static inline bool kernfs_dir_changed(struct kernfs_node *kn, > > > > +                                     struct dentry *dentry) > > > > +{ > > > > +       if (kernfs_type(kn) == KERNFS_DIR) { > > > > > > Aren't these always be called on a KERNFS_DIR node? > > > > Yes they are. > > > > > > > > You could just reduce that to a WARN_ON, or remove the conditions > > > altogether then. > > > > I was tempted to not use the check, a WARN_ON sounds better than > > removing the check, I'll do that in a v7. > > No, WARN_ON is not ok, as systems will crash if panic-on-warn is set. Thanks Greg, understood. > > If these are impossible to hit, great, let's not check this and we > can > just drop the code.  If they can be hit, then the above code is > correct > and it should stay. It's a programming mistake to call these on a non-directory node. I can remove the check but do you think there's any value in passing the node and updating it's parent to avoid possible misuse? Ian