Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp606807pxj; Fri, 11 Jun 2021 07:06:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxC0EnXj9HgIebmYa5xdkatyiwe7N+Xwzo7VcGyJn2CS0c5p+NCZ4ML7UoyvwVs4V7vWkMO X-Received: by 2002:a17:906:1701:: with SMTP id c1mr3853535eje.425.1623420412042; Fri, 11 Jun 2021 07:06:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623420412; cv=none; d=google.com; s=arc-20160816; b=sgo4Q9+TrNNK+Fxq7tSf8qDOsG0qWevEhCCnNSum15F+geZZfAqzUtMP64PeX1W//f /noVOJ9Qi2id5he9boSFDIR656N1ccWa4ghU5Q/Yzp6oKszs9YLGpC+OUpuZpJiH+q88 /F7N3HRRu1vYu5EWGHrqSuoSrHg6bsdsKQTnPz6ZrGitUeYltt1c7Ks6dCEoxz7xP19q ZVcNhSub/0/GMJn+hLtSCrAmu0j88K8e8jB1QdNw8d7rb+fFr+CFGN032MnJac7eWp3d /LZn8Y9SrkEd1hCu99jaTzLneTFjWznXtVn+y0DapUwteMnzfLVQTUn9U1mjMQS1YVrU EAoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-transfer-encoding :content-disposition:mime-version:references:message-id:subject:cc :to:from:date:dkim-signature; bh=ScwNmoaInenyAnZ11kN3/K+MP93/K/Eh+wJdAMXOigI=; b=CDkcFw+bLazJm/oAktItUYd7bPHfRarI5mkZ0V2ogrpAS4+EwPsePSGud5mgNWSARD qcDmJf3d3BiXZ60CGzYhDKE89Oi88ONvhF0ml+EZHw6QplQIRmH4kdWc4ViJqP2Gww3j XTYRLRQlnfL5kbviimMmcC37fkB0ULwAf/pxoicn+GqKeXXG8Tgov4LzGKhuvsg12+du K0wnofVDBGwltzWGNOAq0xrAG56EdKHcrKwm3zrjh9b6r0JyWJ4q3DU379quKIfcIj1W l7CIeppLcVl4PzJIDFY1+zohSt1XgteVO/y4NUguJMMy1TAtCIKGDS7Tu/asAEEb8O9O Ha1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=P8uXWGuR; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z1si344837edc.239.2021.06.11.07.06.26; Fri, 11 Jun 2021 07:06:52 -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=@linuxfoundation.org header.s=korg header.b=P8uXWGuR; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231231AbhFKOHM (ORCPT + 99 others); Fri, 11 Jun 2021 10:07:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:44670 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229529AbhFKOHL (ORCPT ); Fri, 11 Jun 2021 10:07:11 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 3B011613FA; Fri, 11 Jun 2021 14:05:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1623420313; bh=BT0EZgPDQoGSnbdayeXSZWpTlTPLeYX5sPy/3IHH0s4=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=P8uXWGuR2FORSMJtJeXhnWVAmBmUFWNJpUnDkmnewdInNIpS4wCVfh7bq115OW9mM vxni8K6yJZM5jn1Wbh2M89JxnMOjjxuWMpXMkHUHmWP/gpjFpKaX2+DYTATJTb1F11 bH/2Ld56l9I5K7Nrk9UlbnPlxrw5aQSsfrS3UebM= Date: Fri, 11 Jun 2021 16:05:11 +0200 From: Greg Kroah-Hartman To: Ian Kent 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 Subject: Re: [PATCH v6 2/7] kernfs: add a revision to identify directory node changes Message-ID: References: <162322846765.361452.17051755721944717990.stgit@web.messagingengine.com> <162322859985.361452.14110524195807923374.stgit@web.messagingengine.com> <03f6e366fb4ebb56b15541d53eda461a55d3d38e.camel@themaw.net> <21ec3ad11c4d0d74f9b51df3c3e43ab9f62c32b4.camel@themaw.net> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <21ec3ad11c4d0d74f9b51df3c3e43ab9f62c32b4.camel@themaw.net> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Jun 11, 2021 at 09:31:36PM +0800, Ian Kent wrote: > 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? I do not understand the question here, sorry. It's a static function, you control the callers, who can "misuse" it? thanks, greg k-h