Skip to contentSkip to conversation

usb: don't dput() in usbfs_rmdir()

RFC In review Sebastian Andrzej Siewior 5 participants 6 messages May 30, 2011 – May 31, 2011 7 messages not in the archive

Subsystems (2)
lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

A message that is not in the archive (sent off-list or not yet received): [email protected]

A message that is not in the archive (sent off-list or not yet received): 000001cc1eb1$6aa8e500$3ffaaf00$@org

A message that is not in the archive (sent off-list or not yet received): [email protected]

A message that is not in the archive (sent off-list or not yet received): BANLkTimaMihxe75vTXDS1HivCbj8-v-pBg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org

#5 lore raw

RFC 1/1 usb: don't dput() in usbfs_rmdir()

rmmod of every hcd results currently in somethig like

|uhci_hcd 0000:00:01.2: USB bus 1 deregistered
|------------[ cut here ]------------
|kernel BUG at /home/bigeasy/git/linux/fs/dcache.c:419!
|invalid opcode: 0000 [#1]
|Modules linked in: uhci_hcd(-) ehci_hcd usbcore
|
|Pid: 1736, comm: rmmod Not tainted 3.0.0-rc1-00001-geb7d864-dirty #148 Bochs Bochs
|EIP: 0060:[<810c3f6b>] EFLAGS: 00010246 CPU: 0
|EIP is at dput+0x12b/0x130
|EAX: 00000000 EBX: af3ca9a0 ECX: af3cbd00 EDX: 00000202
|ESI: af3c6000 EDI: af3cbca8 EBP: aeae7ddc ESP: aeae7dd4
| DS: 007b ES: 007b FS: 0000 GS: 0033 SS: 0068
|Process rmmod (pid: 1736, ti=aeae6000 task=ae815c00 task.ti=aeae6000)
|Stack:
| af3ca9a0 af3c6000 aeae7dfc b0a489b6 af3cb9d8 af3cbcc0 af3caa10 aefb2230
| 00000000 00000000 aeae7e28 b0a48de5 afa37140 af402300 ade0a038 aeae7e40
| 810ae9f5 81177295 b0a4dce0 00000000 00000000 aeae7e44 81049395 aefb2230
|Call Trace:
| [<b0a489b6>] fs_remove_file+0x76/0x120 [usbcore]
| [<b0a48de5>] usbfs_notify+0x35/0x2d0 [usbcore]
| [<810ae9f5>] ? kfree+0x105/0x130
| [<81177295>] ? kobject_release+0x45/0x80
| [<81049395>] notifier_call_chain+0x45/0x60
| [<81049793>] __blocking_notifier_call_chain+0x43/0x70
| [<810497df>] blocking_notifier_call_chain+0x1f/0x30
| [<b0a46a39>] usb_notify_remove_bus+0x19/0x20 [usbcore]
| [<b0a3af0b>] usb_deregister_bus+0x5b/0x70 [usbcore]
| [<b0a3b011>] usb_remove_hcd+0xf1/0x100 [usbcore]

a bisect turned up:

|commit 64252c75a2196a0cf1e0d3777143ecfe0e3ae650
|Author: Sage Weil <[email protected]>
|Date:   Tue May 24 13:06:05 2011 -0700
|
|    vfs: remove dget() from dentry_unhash()
|
|    This serves no useful purpose that I can discern.  All callers (rename,
|    rmdir) hold their own reference to the dentry.
|
|    A quick audit of all file systems showed no relevant checks on the value
|    of d_count in vfs_rmdir/vfs_rename_dir paths.
|
|    Signed-off-by: Sage Weil <[email protected]>
|    Signed-off-by: Al Viro <viro-RmSDqhL/[email protected]>

I removed the "inner" dput() which is called on emptry dir and sets error to zero. This looks like the same change in 64252c7 for vfs_rmdir() where dput() is removed from the path where we have dont_mount() and S_DEAD.

---
Could one of VFS ppl look at this an NACK/ACK it?

Jessi: I've seen your patch after I had mine done. If you send me a sign-off-by for this, I will resend it with you as Author + SOB if you like once the VFS are fine with this.

 drivers/usb/core/inode.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
drivers/usb/core/inode.c +0 -1
index 1b125c2..3ef9308 100644
@@ -381,7 +381,6 @@ static int usbfs_rmdir(struct inode *dir, struct dentry *dentry)
 		dont_mount(dentry);
 		drop_nlink(dentry->d_inode);
 		drop_nlink(dentry->d_inode);
-		dput(dentry);
 		inode->i_flags |= S_DEAD;
 		drop_nlink(dir);
 		error = 0;
Signature · 6 lines
1.7.4.4

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

A message that is not in the archive (sent off-list or not yet received): [email protected]

#7 lore raw
Quoted 3 lines · Sebastian Andrzej Siewior

Jessi: I've seen your patch after I had mine done. If you send me a sign-off-by for this, I will resend it with you as Author + SOB if you like once the VFS are fine with this.

Thanks

Quoted 16 lines

 drivers/usb/core/inode.c |    1 -

 1 files changed, 0 insertions(+), 1 deletions(-)
drivers/usb/core/inode.c +0 -2
index 1b125c2..3ef9308 100644
@@ -381,7 +381,6 @@ static int usbfs_rmdir(struct inode *dir, struct dentry *dentry)
                dont_mount(dentry);
                drop_nlink(dentry->d_inode);
                drop_nlink(dentry->d_inode);
-               dput(dentry);
                inode->i_flags |= S_DEAD;
                drop_nlink(dir);
                error = 0;
--
Quoted 3 lines

1.7.4.4

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

#8 lore raw
In reply to Sebastian Andrzej Siewior
Quoted 48 lines · Sebastian Andrzej Siewior

rmmod of every hcd results currently in somethig like

|uhci_hcd 0000:00:01.2: USB bus 1 deregistered
|------------[ cut here ]------------
|kernel BUG at /home/bigeasy/git/linux/fs/dcache.c:419!
|invalid opcode: 0000 [#1]
|Modules linked in: uhci_hcd(-) ehci_hcd usbcore
|
|Pid: 1736, comm: rmmod Not tainted 3.0.0-rc1-00001-geb7d864-dirty #148 Bochs Bochs
|EIP: 0060:[<810c3f6b>] EFLAGS: 00010246 CPU: 0
|EIP is at dput+0x12b/0x130
|EAX: 00000000 EBX: af3ca9a0 ECX: af3cbd00 EDX: 00000202
|ESI: af3c6000 EDI: af3cbca8 EBP: aeae7ddc ESP: aeae7dd4
| DS: 007b ES: 007b FS: 0000 GS: 0033 SS: 0068
|Process rmmod (pid: 1736, ti=aeae6000 task=ae815c00 task.ti=aeae6000)
|Stack:
| af3ca9a0 af3c6000 aeae7dfc b0a489b6 af3cb9d8 af3cbcc0 af3caa10 aefb2230
| 00000000 00000000 aeae7e28 b0a48de5 afa37140 af402300 ade0a038 aeae7e40
| 810ae9f5 81177295 b0a4dce0 00000000 00000000 aeae7e44 81049395 aefb2230
|Call Trace:
| [<b0a489b6>] fs_remove_file+0x76/0x120 [usbcore]
| [<b0a48de5>] usbfs_notify+0x35/0x2d0 [usbcore]
| [<810ae9f5>] ? kfree+0x105/0x130
| [<81177295>] ? kobject_release+0x45/0x80
| [<81049395>] notifier_call_chain+0x45/0x60
| [<81049793>] __blocking_notifier_call_chain+0x43/0x70
| [<810497df>] blocking_notifier_call_chain+0x1f/0x30
| [<b0a46a39>] usb_notify_remove_bus+0x19/0x20 [usbcore]
| [<b0a3af0b>] usb_deregister_bus+0x5b/0x70 [usbcore]
| [<b0a3b011>] usb_remove_hcd+0xf1/0x100 [usbcore]

a bisect turned up:

|commit 64252c75a2196a0cf1e0d3777143ecfe0e3ae650
|Author: Sage Weil <[email protected]>
|Date:   Tue May 24 13:06:05 2011 -0700
|
|    vfs: remove dget() from dentry_unhash()
|
|    This serves no useful purpose that I can discern.  All callers (rename,
|    rmdir) hold their own reference to the dentry.
|
|    A quick audit of all file systems showed no relevant checks on the value
|    of d_count in vfs_rmdir/vfs_rename_dir paths.
|
|    Signed-off-by: Sage Weil <[email protected]>
|    Signed-off-by: Al Viro <[email protected]>
Quoted 8 lines

I removed the "inner" dput() which is called on emptry dir and sets error to zero. This looks like the same change in 64252c7 for vfs_rmdir() where dput() is removed from the path where we have dont_mount() and S_DEAD.

---
Could one of VFS ppl look at this an NACK/ACK it?

I think it's the other dput that you want to remove. 64252c75 is a misleading because the first hunk has to remove dput() from every exit path for the function. dentry_unhash is unconditionally doing dget, though. I think we want

drivers/usb/core/inode.c +0 -1
index 1b125c2..2278dad 100644
@@ -389,7 +389,6 @@ static int usbfs_rmdir(struct inode *dir, struct dentry *dentry)
        mutex_unlock(&inode->i_mutex);
        if (!error)
                d_delete(dentry);
-       dput(dentry);
        return error;
 }
 

Sorry I missed this one; I forgot there were filesystems outside of fs/.

sage

Quoted 24 lines

Jessi: I've seen your patch after I had mine done. If you send me a sign-off-by for this, I will resend it with you as Author + SOB if you like once the VFS are fine with this.

 drivers/usb/core/inode.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
drivers/usb/core/inode.c +0 -1
index 1b125c2..3ef9308 100644
@@ -381,7 +381,6 @@ static int usbfs_rmdir(struct inode *dir, struct dentry *dentry)
 		dont_mount(dentry);
 		drop_nlink(dentry->d_inode);
 		drop_nlink(dentry->d_inode);
-		dput(dentry);
 		inode->i_flags |= S_DEAD;
 		drop_nlink(dir);
 		error = 0;
Signature · 1 line
1.7.4.4
#9 lore raw
Quoted 9 lines · Sage Weil
Quoted 1 line

Could one of VFS ppl look at this an NACK/ACK it?

I think it's the other dput that you want to remove. 64252c75 is a misleading because the first hunk has to remove dput() from every exit path for the function. dentry_unhash is unconditionally doing dget, though. I think we want

drivers/usb/core/inode.c +0 -0
index 1b125c2..2278dad 100644

drivers/usb/core/inode.c static int usbfs_rmdir(struct inode *dir, struct dentry *dentry) · line 393

Quoted 6 lines
drivers/usb/core/inode.c +0 -1
@@ -389,7 +389,6 @@ static int usbfs_rmdir(struct inode *dir, struct dentry *dentry)
        mutex_unlock(&inode->i_mutex);
        if (!error)
                d_delete(dentry);
-       dput(dentry);
        return error;
 }

Yep, this is the correct one. I added a file and removed it after the hcd was gone and it only survived your way :)
Are you going to post a complete patch or do you want me to do it?

Quoted 1 line

Sorry I missed this one; I forgot there were filesystems outside of fs/.

Yes, they all over the place including arch/ :)

Quoted 2 lines

sage

Sebastian

Tested-by Sebastian Andrzej Siewior
#10 lore raw
Quoted 8 lines · Sebastian Andrzej Siewior
Quoted 7 lines · Sage Weil
Quoted 1 line

Could one of VFS ppl look at this an NACK/ACK it?

I think it's the other dput that you want to remove. 64252c75 is a misleading because the first hunk has to remove dput() from every exit path for the function. dentry_unhash is unconditionally doing dget, though. I think we want

Quoted 16 lines

drivers/usb/core/inode.c static int usbfs_rmdir(struct inode *dir, struct dentry · line 394

Quoted 12 lines
drivers/usb/core/inode.c +0 -1
index 1b125c2..2278dad 100644
@@ -389,7 +389,6 @@ static int usbfs_rmdir(struct inode *dir, struct dentry
 *dentry)
        mutex_unlock(&inode->i_mutex);
        if (!error)
                d_delete(dentry);
-       dput(dentry);
        return error;
 }

Yep, this is the correct one. I added a file and removed it after the hcd was gone and it only survived your way :)
Are you going to post a complete patch or do you want me to do it?

Patch is below. Thanks for testing!

sage

Quoted 1 line

From 2dbf6d8f7426980d4c0d8798222b2ce9eed76651 Mon Sep 17 00:00:00 2001

From: Sage Weil <[email protected]>
Date: Tue, 31 May 2011 09:09:16 -0700
Subject: [PATCH] usb: remove bad dput after dentry_unhash

Commit 64252c75a removed the useless dget from dentry_unhash but didn't fix up this caller in the usb code. There used to be exactly one dput per dentry_unhash call; now there are none.

---
 drivers/usb/core/inode.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
drivers/usb/core/inode.c +0 -1
index 1b125c2..2278dad 100644
@@ -389,7 +389,6 @@ static int usbfs_rmdir(struct inode *dir, struct dentry *dentry)
 	mutex_unlock(&inode->i_mutex);
 	if (!error)
 		d_delete(dentry);
-	dput(dentry);
 	return error;
 }
 
Signature · 1 line
1.7.0

A message that is not in the archive (sent off-list or not yet received): Pine.LNX.4.64.1105310909370.25709-vIokxiIdD2AQNTJnQDzGJqxOck334EZe@public.gmane.org

#12 lore raw

Hello.

Quoted 28 lines · Sage Weil
Quoted 6 lines
Quoted 5 lines
Quoted 1 line

Could one of VFS ppl look at this an NACK/ACK it?

I think it's the other dput that you want to remove. 64252c75 is a misleading because the first hunk has to remove dput() from every exit path for the function. dentry_unhash is unconditionally doing dget, though. I think we want

Quoted 16 lines

drivers/usb/core/inode.c static int usbfs_rmdir(struct inode *dir, struct dentry · line 394

Quoted 12 lines
drivers/usb/core/inode.c +0 -1
index 1b125c2..2278dad 100644
@@ -389,7 +389,6 @@ static int usbfs_rmdir(struct inode *dir, struct dentry
 *dentry)
        mutex_unlock(&inode->i_mutex);
        if (!error)
                d_delete(dentry);
-       dput(dentry);
        return error;
 }

Yep, this is the correct one. I added a file and removed it after the hcd was gone and it only survived your way :)
Are you going to post a complete patch or do you want me to do it?

Patch is below. Thanks for testing!

sage

Quoted 6 lines

From 2dbf6d8f7426980d4c0d8798222b2ce9eed76651 Mon Sep 17 00:00:00 2001
From: Sage Weil <[email protected]>
Date: Tue, 31 May 2011 09:09:16 -0700
Subject: [PATCH] usb: remove bad dput after dentry_unhash

Commit 64252c75a removed the useless dget from dentry_unhash but didn't

Please also specify that commit's summary in parens -- for the human readers.
Commit ID is only immediately usable to gitweb.

Quoted 5 lines

fix up this caller in the usb code. There used to be exactly one dput per dentry_unhash call; now there are none.

WBR, Sergei
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html