Btrfs: add missing sysfs group remove / fix leak
PATCH 1/1 Btrfs: add missing sysfs group remove / fix leak
Quoted 1 line
From kmemleak:
hex dump (first 32 bytes):
03 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace:
[<ffffffff8175f5f6>] kmemleak_alloc+0x26/0x50
[<ffffffff8118f284>] kmem_cache_alloc+0x114/0x200
[<ffffffff81219281>] sysfs_new_dirent+0x51/0x130
[<ffffffff812196d2>] create_dir+0x42/0xd0
[<ffffffff812199ff>] sysfs_create_subdir+0x1f/0x30
[<ffffffff8121b50e>] internal_create_group+0x5e/0x270
[<ffffffff8121b753>] sysfs_create_group+0x13/0x20
[<ffffffffa069c99e>] btrfs_sysfs_add_one+0x7e/0x280 [btrfs]
[<ffffffffa0682792>] open_ctree+0x17d2/0x21f0 [btrfs]
[<ffffffffa065883a>] btrfs_mount+0x53a/0x7d0 [btrfs]
[<ffffffff811a3ad3>] mount_fs+0x43/0x1b0
[<ffffffff811bfa56>] vfs_kern_mount+0x76/0x120
[<ffffffff811c1d77>] do_mount+0x237/0xa70
[<ffffffff811c2640>] SyS_mount+0x90/0xe0
[<ffffffff8177ef12>] system_call_fastpath+0x16/0x1b
[<ffffffffffffffff>] 0xffffffffffffffffunreferenced object 0xffff8804e37d45b8 (size 160):
--- fs/btrfs/sysfs.c | 2 ++ 1 file changed, 2 insertions(+)
fs/btrfs/sysfs.c +2 -0
@@ -424,6 +424,8 @@ void btrfs_sysfs_remove_one(struct btrfs_fs_info *fs_info)kobject_put (fs_info->device_dir_kobj);kobject_del (fs_info->space_info_kobj);kobject_put (fs_info->space_info_kobj); +sysfs_remove_group (&fs_info->super_kobj, + &btrfs_feature_attr_group);kobject_del (&fs_info->super_kobj);kobject_put (&fs_info->super_kobj);wait_for_completion (&fs_info->kobj_unregister);
Signature · 1 line
1.7.9.5
Quoted 22 lines · Filipe David Borba Manana
From kmemleak:
hex dump (first 32 bytes):
03 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ backtrace: [<ffffffff8175f5f6>] kmemleak_alloc+0x26/0x50 [<ffffffff8118f284>] kmem_cache_alloc+0x114/0x200 [<ffffffff81219281>] sysfs_new_dirent+0x51/0x130 [<ffffffff812196d2>] create_dir+0x42/0xd0 [<ffffffff812199ff>] sysfs_create_subdir+0x1f/0x30 [<ffffffff8121b50e>] internal_create_group+0x5e/0x270 [<ffffffff8121b753>] sysfs_create_group+0x13/0x20 [<ffffffffa069c99e>] btrfs_sysfs_add_one+0x7e/0x280 [btrfs] [<ffffffffa0682792>] open_ctree+0x17d2/0x21f0 [btrfs] [<ffffffffa065883a>] btrfs_mount+0x53a/0x7d0 [btrfs] [<ffffffff811a3ad3>] mount_fs+0x43/0x1b0 [<ffffffff811bfa56>] vfs_kern_mount+0x76/0x120 [<ffffffff811c1d77>] do_mount+0x237/0xa70 [<ffffffff811c2640>] SyS_mount+0x90/0xe0 [<ffffffff8177ef12>] system_call_fastpath+0x16/0x1b [<ffffffffffffffff>] 0xffffffffffffffff
Quoted 2 lines
unreferenced object
0xffff8804e37d45b8(size 160):
Thanks, Filipe. I thought sysfs cleaned up during kobject_del, but it skips directories (like groups).
Quoted 1 line
Signed-off-by Filipe David Borba Manana <[email protected]>
-Jeff
Quoted 18 lines
--- fs/btrfs/sysfs.c | 2 ++ 1 file changed, 2 insertions(+)fs/btrfs/sysfs.c +2
-0@@ -424,6 +424,8 @@ void btrfs_sysfs_remove_one(struct btrfs_fs_info *fs_info)kobject_put (fs_info->device_dir_kobj);kobject_del (fs_info->space_info_kobj);kobject_put (fs_info->space_info_kobj); +sysfs_remove_group (&fs_info->super_kobj, + &btrfs_feature_attr_group);kobject_del (&fs_info->super_kobj);kobject_put (&fs_info->super_kobj);wait_for_completion (&fs_info->kobj_unregister);
Signature · 2 lines
Jeff Mahoney SUSE Labs
Quoted 35 lines · Filipe David Borba Manana
From kmemleak:
hex dump (first 32 bytes):
03 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ backtrace: [<ffffffff8175f5f6>] kmemleak_alloc+0x26/0x50 [<ffffffff8118f284>] kmem_cache_alloc+0x114/0x200 [<ffffffff81219281>] sysfs_new_dirent+0x51/0x130 [<ffffffff812196d2>] create_dir+0x42/0xd0 [<ffffffff812199ff>] sysfs_create_subdir+0x1f/0x30 [<ffffffff8121b50e>] internal_create_group+0x5e/0x270 [<ffffffff8121b753>] sysfs_create_group+0x13/0x20 [<ffffffffa069c99e>] btrfs_sysfs_add_one+0x7e/0x280 [btrfs] [<ffffffffa0682792>] open_ctree+0x17d2/0x21f0 [btrfs] [<ffffffffa065883a>] btrfs_mount+0x53a/0x7d0 [btrfs] [<ffffffff811a3ad3>] mount_fs+0x43/0x1b0 [<ffffffff811bfa56>] vfs_kern_mount+0x76/0x120 [<ffffffff811c1d77>] do_mount+0x237/0xa70 [<ffffffff811c2640>] SyS_mount+0x90/0xe0 [<ffffffff8177ef12>] system_call_fastpath+0x16/0x1b [<ffffffffffffffff>] 0xffffffffffffffffunreferenced object
0xffff8804e37d45b8(size 160):Signed-off-by Filipe David Borba Manana <[email protected]>--- fs/btrfs/sysfs.c | 2 ++ 1 file changed, 2 insertions(+)fs/btrfs/sysfs.c +0
-0
fs/btrfs/sysfs.c void btrfs_sysfs_remove_one(struct btrfs_fs_info *fs_info) · line 431
Quoted 8 lines
fs/btrfs/sysfs.c +2
-0@@ -424,6 +424,8 @@ void btrfs_sysfs_remove_one(struct btrfs_fs_info *fs_info)kobject_put (fs_info->device_dir_kobj);kobject_del (fs_info->space_info_kobj);kobject_put (fs_info->space_info_kobj); +sysfs_remove_group (&fs_info->super_kobj, + &btrfs_feature_attr_group);kobject_del (&fs_info->super_kobj);kobject_put (&fs_info->super_kobj);wait_for_completion (&fs_info->kobj_unregister);
Oops, this isn't actually enough. It'll still leak the unknown feature attributes, which wouldn't have shown up in your testing. There are a few other failure cases that need to be handled as well. I'll work up a fix.
-Jeff
Signature · 2 lines
Jeff Mahoney SUSE Labs
Quoted 40 lines · Jeff Mahoney
Quoted 39 lines · Filipe David Borba Manana
From kmemleak:
hex dump (first 32 bytes):
03 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ backtrace: [<ffffffff8175f5f6>] kmemleak_alloc+0x26/0x50 [<ffffffff8118f284>] kmem_cache_alloc+0x114/0x200 [<ffffffff81219281>] sysfs_new_dirent+0x51/0x130 [<ffffffff812196d2>] create_dir+0x42/0xd0 [<ffffffff812199ff>] sysfs_create_subdir+0x1f/0x30 [<ffffffff8121b50e>] internal_create_group+0x5e/0x270 [<ffffffff8121b753>] sysfs_create_group+0x13/0x20 [<ffffffffa069c99e>] btrfs_sysfs_add_one+0x7e/0x280 [btrfs] [<ffffffffa0682792>] open_ctree+0x17d2/0x21f0 [btrfs] [<ffffffffa065883a>] btrfs_mount+0x53a/0x7d0 [btrfs] [<ffffffff811a3ad3>] mount_fs+0x43/0x1b0 [<ffffffff811bfa56>] vfs_kern_mount+0x76/0x120 [<ffffffff811c1d77>] do_mount+0x237/0xa70 [<ffffffff811c2640>] SyS_mount+0x90/0xe0 [<ffffffff8177ef12>] system_call_fastpath+0x16/0x1b [<ffffffffffffffff>] 0xffffffffffffffffunreferenced object
0xffff8804e37d45b8(size 160):Signed-off-by Filipe David Borba Manana <[email protected]>--- fs/btrfs/sysfs.c | 2 ++ 1 file changed, 2 insertions(+)fs/btrfs/sysfs.c +2
-0@@ -424,6 +424,8 @@ void btrfs_sysfs_remove_one(struct btrfs_fs_info *fs_info)kobject_put (fs_info->device_dir_kobj);kobject_del (fs_info->space_info_kobj);kobject_put (fs_info->space_info_kobj); +sysfs_remove_group (&fs_info->super_kobj, + &btrfs_feature_attr_group);
Quoted 8 lines
fs/btrfs/sysfs.c void btrfs_sysfs_remove_one(struct btrfs_fs_info *fs_info) · line 431
Quoted 4 lines
fs/btrfs/sysfs.c +0
-0kobject_del (&fs_info->super_kobj);kobject_put (&fs_info->super_kobj);wait_for_completion (&fs_info->kobj_unregister);Oops, this isn't actually enough. It'll still leak the unknown feature attributes, which wouldn't have shown up in your testing. There are a few other failure cases that need to be handled as well. I'll work up a fix.
Ok, that was the only trace I got when running xfstests. Thanks Jeff.
Quoted 7 lines
-Jeff
--
Jeff Mahoney
SUSE Labs
Signature · 5 lines
Filipe David Manana, "Reasonable men adapt themselves to the world. Unreasonable men adapt the world to themselves. That's why all progress depends on unreasonable men."