From: Linus Torvalds <torvalds@linux-foundation.org>
To: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Jiri Slaby <jslaby@suse.cz>, Jiri Slaby <jirislaby@gmail.com>,
Alan Cox <alan@lxorguk.ukuu.org.uk>,
LKML <linux-kernel@vger.kernel.org>,
Al Viro <viro@zeniv.linux.org.uk>,
Maciej Rutecki <maciej.rutecki@gmail.com>
Subject: Re: [PATCH 3/3] sysfs: Remove SYSFS_FLAG_REMOVED and use sd->s_nlink == 0 instead.
Date: Thu, 8 Mar 2012 19:40:47 -0800 [thread overview]
Message-ID: <CA+55aFzP3VWRXQ0ZN7GqcKhxdWLSWSMRHnb=KdYRZGusQ-B4gA@mail.gmail.com> (raw)
In-Reply-To: <m1haxywz8y.fsf_-_@fess.ebiederm.org>
Is this safe?
What's the serialization with sysfs_link_sibling(), which you just made do
sd->s_nlink++;
if (!sd->s_nlink)
sd->s_nlink = 1;
in your previous patch?
Yes, sysfs_link_sibling() runs under sysfs_mutex, but
sysfs_dentry_delete() does not.
So what protects sysfs_dentry_delete() from never seeing that bogus 0
due to the overflow?
Linus
On Thu, Mar 8, 2012 at 1:37 PM, Eric W. Biederman <ebiederm@xmission.com> wrote:
>
> Now that we have a nlink field in sysfs_dirent report deleted
> files and directories the traditional way with nlink == 0.
>
> Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
> ---
> fs/sysfs/dir.c | 11 +++++------
> fs/sysfs/sysfs.h | 1 -
> 2 files changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c
> index 1526567..b5471d1 100644
> --- a/fs/sysfs/dir.c
> +++ b/fs/sysfs/dir.c
> @@ -202,7 +202,7 @@ static void sysfs_deactivate(struct sysfs_dirent *sd)
> DECLARE_COMPLETION_ONSTACK(wait);
> int v;
>
> - BUG_ON(!(sd->s_flags & SYSFS_FLAG_REMOVED));
> + BUG_ON(sd->s_nlink != 0);
>
> if (!(sysfs_type(sd) & SYSFS_ACTIVE_REF))
> return;
> @@ -279,7 +279,7 @@ void release_sysfs_dirent(struct sysfs_dirent * sd)
> static int sysfs_dentry_delete(const struct dentry *dentry)
> {
> struct sysfs_dirent *sd = dentry->d_fsdata;
> - return !!(sd->s_flags & SYSFS_FLAG_REMOVED);
> + return sd->s_nlink == 0;
> }
>
> static int sysfs_dentry_revalidate(struct dentry *dentry, struct nameidata *nd)
> @@ -294,7 +294,7 @@ static int sysfs_dentry_revalidate(struct dentry *dentry, struct nameidata *nd)
> mutex_lock(&sysfs_mutex);
>
> /* The sysfs dirent has been deleted */
> - if (sd->s_flags & SYSFS_FLAG_REMOVED)
> + if (sd->s_nlink == 0)
> goto out_bad;
>
> /* The sysfs dirent has been moved? */
> @@ -534,7 +534,7 @@ void sysfs_remove_one(struct sysfs_addrm_cxt *acxt, struct sysfs_dirent *sd)
> {
> struct sysfs_inode_attrs *ps_iattr;
>
> - BUG_ON(sd->s_flags & SYSFS_FLAG_REMOVED);
> + BUG_ON(sd->s_nlink == 0);
>
> sysfs_unlink_sibling(sd);
>
> @@ -546,7 +546,6 @@ void sysfs_remove_one(struct sysfs_addrm_cxt *acxt, struct sysfs_dirent *sd)
> }
>
> sd->s_nlink = 0;
> - sd->s_flags |= SYSFS_FLAG_REMOVED;
> sd->u.removed_list = acxt->removed;
> acxt->removed = sd;
> }
> @@ -946,7 +945,7 @@ static struct sysfs_dirent *sysfs_dir_pos(const void *ns,
> struct sysfs_dirent *parent_sd, loff_t hash, struct sysfs_dirent *pos)
> {
> if (pos) {
> - int valid = !(pos->s_flags & SYSFS_FLAG_REMOVED) &&
> + int valid = (pos->s_nlink > 0) &&
> pos->s_parent == parent_sd &&
> hash == pos->s_hash;
> sysfs_put(pos);
> diff --git a/fs/sysfs/sysfs.h b/fs/sysfs/sysfs.h
> index 71f9bf7..db2c5c5 100644
> --- a/fs/sysfs/sysfs.h
> +++ b/fs/sysfs/sysfs.h
> @@ -98,7 +98,6 @@ struct sysfs_dirent {
> #define SYSFS_NS_TYPE_SHIFT 4
>
> #define SYSFS_FLAG_MASK ~(SYSFS_NS_TYPE_MASK|SYSFS_TYPE_MASK)
> -#define SYSFS_FLAG_REMOVED 0x080
>
> static inline unsigned int sysfs_type(struct sysfs_dirent *sd)
> {
> --
> 1.7.2.5
>
next prev parent reply other threads:[~2012-03-09 3:41 UTC|newest]
Thread overview: 75+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-30 21:56 sysfs regression: wrong link counts Jiri Slaby
2012-01-30 22:06 ` Greg KH
2012-01-30 22:10 ` Alan Cox
2012-01-30 22:27 ` Greg KH
2012-01-30 22:43 ` Al Viro
2012-01-30 22:56 ` Al Viro
2012-01-31 1:27 ` Eric W. Biederman
2012-01-31 10:48 ` Jiri Slaby
2012-01-31 12:44 ` Eric W. Biederman
2012-01-31 16:45 ` Linus Torvalds
2012-01-31 19:18 ` Al Viro
2012-02-01 5:06 ` Eric W. Biederman
2012-02-01 22:21 ` [PATCH] sysfs: Optionally count subdirectories to support buggy applications Eric W. Biederman
2012-02-01 22:24 ` Greg Kroah-Hartman
2012-02-01 22:44 ` Eric W. Biederman
2012-02-01 22:49 ` Greg Kroah-Hartman
2012-02-01 22:31 ` Dave Jones
2012-02-01 22:35 ` Jiri Slaby
2012-02-01 23:15 ` Linus Torvalds
2012-02-01 23:18 ` Linus Torvalds
2012-02-02 1:22 ` Al Viro
2012-02-02 21:24 ` [RFC] killing boilerplate checks in ->link/->mkdir/->rename Al Viro
2012-02-02 23:46 ` Linus Torvalds
2012-02-03 1:16 ` Al Viro
2012-02-03 1:45 ` Al Viro
2012-02-03 2:00 ` Linus Torvalds
2012-02-03 14:57 ` Chris Mason
2012-02-03 17:08 ` Al Viro
2012-02-03 19:34 ` Artem Bityutskiy
2012-02-06 8:50 ` Artem Bityutskiy
2012-02-06 13:56 ` Al Viro
2012-02-06 17:05 ` Artem Bityutskiy
2012-02-06 17:11 ` Al Viro
2012-02-07 7:21 ` Artem Bityutskiy
2012-02-06 22:49 ` Dave Chinner
2012-02-03 8:25 ` Andreas Dilger
2012-02-03 17:03 ` Al Viro
2012-02-04 7:42 ` Andreas Dilger
2012-03-05 13:30 ` [PATCH] sysfs: Optionally count subdirectories to support buggy applications Jiri Slaby
2012-03-05 16:09 ` Greg Kroah-Hartman
2012-03-05 16:47 ` Linus Torvalds
2012-03-08 21:05 ` Greg Kroah-Hartman
2012-03-08 22:18 ` Eric W. Biederman
2012-03-08 23:40 ` Linus Torvalds
2012-03-08 21:28 ` Eric W. Biederman
2012-03-08 21:34 ` [PATCH 1/3] sysfs: Compact sysfs_dirent s_flags into a byte Eric W. Biederman
2012-03-08 21:36 ` [PATCH 2/3] sysfs: Maintain usable nlink directory counts Eric W. Biederman
2012-03-08 21:37 ` [PATCH 3/3] sysfs: Remove SYSFS_FLAG_REMOVED and use sd->s_nlink == 0 instead Eric W. Biederman
2012-03-09 3:40 ` Linus Torvalds [this message]
2012-03-08 22:28 ` [PATCH 1/3] sysfs: Compact sysfs_dirent s_flags into a byte Greg Kroah-Hartman
2012-03-09 2:49 ` Eric W. Biederman
2012-01-31 3:45 ` sysfs regression: wrong link counts Eric W. Biederman
2012-01-31 11:54 ` Alan Cox
2012-01-30 22:52 ` Kay Sievers
2012-01-31 10:41 ` network regression: cannot rename netdev twice Jiri Slaby
2012-01-31 10:52 ` Kay Sievers
2012-01-31 11:00 ` Jiri Slaby
2012-01-31 11:13 ` Kay Sievers
2012-01-31 11:17 ` Jiri Slaby
2012-01-31 11:58 ` Kay Sievers
2012-01-31 14:18 ` Eric W. Biederman
2012-01-31 14:40 ` [PATCH] sysfs: Update the name hash when renaming sysfs entries Eric W. Biederman
2012-01-31 14:41 ` Jiri Slaby
2012-01-31 14:55 ` Greg KH
2012-02-04 2:14 ` network regression: cannot rename netdev twice Henrique de Moraes Holschuh
2012-02-06 20:03 ` Kay Sievers
2012-02-08 2:00 ` Henrique de Moraes Holschuh
2012-02-08 3:50 ` Kay Sievers
2012-02-08 6:42 ` Valdis.Kletnieks
2012-02-08 10:57 ` Kay Sievers
2012-02-08 20:06 ` Valdis.Kletnieks
2012-02-08 20:27 ` Stephen Hemminger
2012-02-08 23:48 ` Kay Sievers
2012-01-31 1:32 ` sysfs regression: wrong link counts Eric W. Biederman
2012-02-01 18:29 ` Maciej Rutecki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CA+55aFzP3VWRXQ0ZN7GqcKhxdWLSWSMRHnb=KdYRZGusQ-B4gA@mail.gmail.com' \
--to=torvalds@linux-foundation.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=ebiederm@xmission.com \
--cc=gregkh@linuxfoundation.org \
--cc=jirislaby@gmail.com \
--cc=jslaby@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=maciej.rutecki@gmail.com \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).