dm sysfs: fix a module unload race
authorMikulas Patocka <mpatocka@redhat.com>
Tue, 14 Jan 2014 00:37:54 +0000 (19:37 -0500)
committerBen Hutchings <ben@decadent.org.uk>
Tue, 1 Apr 2014 23:58:43 +0000 (00:58 +0100)
commit43057146932997ca54a2326cfd6abe9fe1ec5a9f
treebfa876f0e2a6e1c327e42952dd3a51daea3299bd
parentb7785833fe6d2c3027d3e385d72bd31775031d2b
dm sysfs: fix a module unload race

commit 2995fa78e423d7193f3b57835f6c1c75006a0315 upstream.

This reverts commit be35f48610 ("dm: wait until embedded kobject is
released before destroying a device") and provides an improved fix.

The kobject release code that calls the completion must be placed in a
non-module file, otherwise there is a module unload race (if the process
calling dm_kobject_release is preempted and the DM module unloaded after
the completion is triggered, but before dm_kobject_release returns).

To fix this race, this patch moves the completion code to dm-builtin.c
which is always compiled directly into the kernel if BLK_DEV_DM is
selected.

The patch introduces a new dm_kobject_holder structure, its purpose is
to keep the completion and kobject in one place, so that it can be
accessed from non-module code without the need to export the layout of
struct mapped_device to that code.

Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
[bwh: Backported to 3.2:
 - Adjust context
 - Remove paranoid check of container_of() result in dm_get_from_kobject(),
   which would now be incorrect
 - Include <linux/export.h> in dm-builtin.c, included indirectly upstream]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/md/Kconfig
drivers/md/Makefile
drivers/md/dm-builtin.c [new file with mode: 0644]
drivers/md/dm-sysfs.c
drivers/md/dm.c
drivers/md/dm.h