oopses in kobjects in 2.6.0-test11 (was Re: kobject patch)
Subsystems (2)
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]
Ok, I'm ccing lkml and everyone else who has been in on this thread at different times. This is based on a patch from Andrey that was/is in the -mm tree for a while.
Quoted 20 lines · Greg KH
Quoted 2 lines · Andrew Morton
I've had this in -mm for a while. What to do with it?
Heh, nothing like digging up something from the past that I insisted was not needed, but...
Quoted 5 lines
It is possible that parent is removed before child when child is in use. Trivial example is mounted USB storage when you unplug it. The kobject for USB device is removed but subordinate SCSI device remains. Then kernel oopses on attempt to release child e.g. umount removed USB storage. This patch fixes two problems:
Yes, I now think this patch needs to be applied. I can easily cause a parent device in sysfs to go away, with the child still present:
- plug in a usb-serial device
- run 'cat/dev/ttyUSB0'
- yank the device out.
Now if you cancel the 'cat' program, lovely oopses...
Quoted 3 lines
So, Andrew, very sorry about this, but this patch should be sent to Linus. I think Pat agrees with me, but he's on the road for a few days. You might want to wait for him.
Hm, wait, Pat objected to the patch to kobject.c (now that I went back and read the whole thread.) And I agree with him, but I'm now getting an oops in get_kobj_path_length if I do the above while loading down the machine with other tasks when I cancel 'cat'.
So something else bad is happening here...
Quoted 7 lines
Quoted 7 lines
-
kset_hotplug. It oopses inget_kobj_path_lengthbecausechild->parentpoints to nowhere - even if parent has not yet been overwritten, its name is already freed.The patch moves
kobject_putfor parent fromunlink()intokobject_cleanupfor child making sure reference to parents exists for as long as child is there and may use it.
But you can't do this, as you need that kobject_put() in unlink() for when it is called from kobject_add().
Hm, wait... I think we are close...
Ok, here's how a parent can be removed from the system without the child going away:
- create parent and register it successfully.
- create child, call kobject_add() which increments the count of the parent.
- call kobject_get() on the child.
- call kobject_del() on the parent. This will keep the parent around, as the child still has a reference on it.
- call kobject_del() on the child. This will decrement the count on the parent due to the call in unlink(). That will free the parent up from memory. But this child still has a incremented count (rightly, as it is in use).
- So the child now has a stale parent pointer, causing all sorts of fun...
I'll work on a patch for kobject.c and post it in the next message, and include the original message and patch below for others to see.
thanks,
greg k-h
Quoted 62 lines
Quoted 62 lines
- after this oops has been fixed I got next one now in sysfs. The problem is
sysfs_remove_dirwould unlink all children including directories for subordinate kobjects. Resulting in dget/dput mismatch. I usually got oops due to the fact thatd_deleteinremove_dirwould free inode and thensimple_rmdirwould try to access it.The patch avoids calling extra d_delete/unlink on already-deleted dentry. I hate this patch but anything better apparently requires complete redesign of sysfs implementation. Unlinking busy directory is otherwise impossible and I am afraid it will show itself somewhere else.
25-akpm/fs/sysfs/dir.c | 12 ++++++++++-- 25-akpm/lib/kobject.c | 4 ++-- 2 files changed, 12 insertions(+), 4 deletions(-)diff -puN
fs/sysfs/dir.c~kobject-oops-fixesfs/sysfs/dir.cfs/sysfs/dir.c renamed from fs/sysfs/dir.c~kobject-oops-fixes +10
-2@@ -82,8 +82,16 @@ static void remove_dir(struct dentry * d {struct dentry * parent =dget (d->d_parent);down (&parent->d_inode->i_sem); -d_delete (d); -simple_rmdir (parent->d_inode,d); +/* +* It is possible that parent has already been removed, in which +* case directory is already unhashed and dput. +* Note that this won't update parent->d_inode->i_nlink; OTOH +* parent should already be dead +*/ +if (!d_unhashed (d)) { +d_delete (d); +simple_rmdir (parent->d_inode,d); + }pr_debug (" o %s removing done (%d)\n" ,d->d_name.name,atomic_read (&d->d_count));diff -puN
lib/kobject.c~kobject-oops-fixeslib/kobject.clib/kobject.c renamed from lib/kobject.c~kobject-oops-fixes +2
-2@@ -236,8 +236,6 @@ static void unlink(struct kobject * kobjlist_del_init (&kobj->entry);up_write (&kobj->kset->subsys->rwsem); } -if (kobj->parent) -kobject_put (kobj->parent);kobject_put (kobj); }@@ -457,6 +455,8 @@ void kobject_cleanup(struct kobject * koif (kobj->k_name != kobj->name)kfree (kobj->k_name); kobj->k_name =NULL ; +if (kobj->parent) +kobject_put (kobj->parent);if (t && t->release) t->release (kobj);if (s)_
Quoted 14 lines · Greg KH
Ok, here's how a parent can be removed from the system without the child going away:
- create parent and register it successfully.
- create child, callkobject_add()which increments the count of the parent.
- callkobject_get()on the child.
- callkobject_del()on the parent. This will keep the parent around, as the child still has a reference on it.
- callkobject_del()on the child. This will decrement the count on the parent due to the call inunlink(). That will free the parent up from memory. But this child still has a incremented count (rightly, as it is in use).
Quoted 5 lines
- So the child now has a stale parent pointer, causing all sorts of fun...
I'll work on a patch for
kobject.cand post it in the next message, and include the original message and patch below for others to see.
Here's a patch for kobject.c that should fix this problem and keep kobject parent's around until after the child is gone. Please can someone verify that I didn't get this wrong...
thanks,
greg k-h
lib/kobject.c +7 -4
@@ -236,8 +236,6 @@list_del_init (&kobj->entry);up_write (&kobj->kset->subsys->rwsem); } -if (kobj->parent) -kobject_put (kobj->parent);kobject_put (kobj); }
@@ -274,9 +272,11 @@ kobj->parent = parent; error =create_dir (kobj); -if (error) +if (error) {unlink (kobj); -else { +if (parent) +kobject_put (parent); + }else {/* If this kobj does not belong to a kset, try to find a parent that does. */ top_kobj = kobj;
@@ -452,6 +452,7 @@ {struct kobj_type * t =get_ktype (kobj);struct kset * s = kobj->kset; +struct kobject * parent = kobj->parent;pr_debug ("kobject %s: cleaning up\n" ,kobject_name (kobj));if (kobj->k_name != kobj->name)
@@ -461,6 +462,8 @@ t->release (kobj);if (s)kset_put (s); +if (parent) +kobject_put (parent); }/**
Sorry about the delay in getting back to you.
Quoted 3 lines
Here's a patch for
kobject.cthat should fix this problem and keep kobject parent's around until after the child is gone. Please can someone verify that I didn't get this wrong...
The patch looks good, please forward it on to Linus/Andrew.
Thanks,
Pat
P.S. I've left OSDL to go work for a startup. Please use this email address from now on.
Quoted 8 lines · Patrick Mochel
Sorry about the delay in getting back to you.
Quoted 3 lines
Here's a patch for
kobject.cthat should fix this problem and keep kobject parent's around until after the child is gone. Please can someone verify that I didn't get this wrong...The patch looks good, please forward it on to Linus/Andrew.
Will do, thanks for looking it over.
greg k-h
Quoted 4 lines · Greg KH
Ok, I'm ccing lkml and everyone else who has been in on this thread at different times. This is based on a patch from Andrey that was/is in the -mm tree for a while.
what about second part in sysfs/dir.c? How relevant is it?
-andrey
Quoted 42 lines
Quoted 42 lines
Quoted 42 lines
- after this oops has been fixed I got next one now in sysfs. The problem is
sysfs_remove_dirwould unlink all children including directories for subordinate kobjects. Resulting in dget/dput
mismatch. I usually got oops due to the fact thatd_deleteinremove_dirwould free inode and thensimple_rmdirwould try to access it.The patch avoids calling extra d_delete/unlink on already-deleted dentry. I hate this patch but anything better apparently requires complete redesign of sysfs implementation. Unlinking busy directory
is otherwise impossible and I am afraid it will show itself somewhere else.25-akpm/fs/sysfs/dir.c | 12 ++++++++++-- 25-akpm/lib/kobject.c | 4 ++-- 2 files changed, 12 insertions(+), 4 deletions(-)diff -puN
fs/sysfs/dir.c~kobject-oops-fixesfs/sysfs/dir.cfs/sysfs/dir.c renamed from fs/sysfs/dir.c~kobject-oops-fixes +10
-2@@ -82,8 +82,16 @@ static void remove_dir(struct dentry * d {struct dentry * parent =dget (d->d_parent);down (&parent->d_inode->i_sem); -d_delete (d); -simple_rmdir (parent->d_inode,d); +/* +* It is possible that parent has already been removed, in which +* case directory is already unhashed and dput. +* Note that this won't update parent->d_inode->i_nlink; OTOH +* parent should already be dead +*/ +if (!d_unhashed (d)) { +d_delete (d); +simple_rmdir (parent->d_inode,d); + }pr_debug (" o %s removing done (%d)\n" ,d->d_name.name,atomic_read (&d->d_count));
Quoted 7 lines · Andrey Borzenkov
Quoted 4 lines · Greg KH
Ok, I'm ccing lkml and everyone else who has been in on this thread at different times. This is based on a patch from Andrey that was/is in the -mm tree for a while.
what about second part in
sysfs/dir.c? How relevant is it?
Very relevant, that's why it's in the -mm tree right now :)
thanks,
greg k-h