PM/Hibernate: fix "swap breaks after hibernation failures"
Subsystems (2)
cover PM/Hibernate: fix "swap breaks after hibernation failures"
Hi Len,
The following patch fixes a long-standing bug in the hibernate code related to swap, which causes the swap partition used for saving hibernation images to become unusable after two consecutive failing attempts to hibernate.
Please add to the suspend branch as 2.6.29 material.
Thanks,
Rafael
PATCH 1/1 PM/Hibernate: fix "swap breaks after hibernation failures"
From: Alan Jenkins <[email protected]>
http://bugzilla.kernel.org/show_bug.cgi?id=12239
The image writing code dropped a reference to the current swap device. This doesn't show up if the hibernation succeeds - because it doesn't affect the image which gets resumed. But it means multiple _failed_ hibernations end up freeing the swap device while it is still use!
swsusp_write() finds the block device for the swap file using swap_type_of(). It then uses blkdev_get() / blkdev_put() to open and close the block device.
Unfortunately, blkdev_get() assumes ownership of the inode of the block_device passed to it. So blkdev_put() calls iput() on the inode. This is by design and other callers expect this behaviour. The fix is for swap_type_of() to take a reference on the inode using bdget().
mm/swapfile.c +2 -2
@@ -635,7 +635,7 @@ int swap_type_of(dev_t device, sector_t offset, struct block_device **bdev_p)if (!bdev) {if (bdev_p) - *bdev_p = sis->bdev; + *bdev_p =bdget (sis->bdev->bd_dev);spin_unlock (&swap_lock);return i;
@@ -647,7 +647,7 @@ int swap_type_of(dev_t device, sector_t offset, struct block_device **bdev_p) struct swap_extent, list);if (se->start_block == offset) {if (bdev_p) - *bdev_p = sis->bdev; + *bdev_p =bdget (sis->bdev->bd_dev);spin_unlock (&swap_lock);bdput (bdev);
PATCH 1/1 PM/Hibernate: fix "swap breaks after hibernation failures"
In reply to Rafael J. WysockiFrom: Alan Jenkins <[email protected]>
http://bugzilla.kernel.org/show_bug.cgi?id=12239
The image writing code dropped a reference to the current swap device. This doesn't show up if the hibernation succeeds - because it doesn't affect the image which gets resumed. But it means multiple _failed_ hibernations end up freeing the swap device while it is still use!
swsusp_write() finds the block device for the swap file using swap_type_of(). It then uses blkdev_get() / blkdev_put() to open and close the block device.
Unfortunately, blkdev_get() assumes ownership of the inode of the block_device passed to it. So blkdev_put() calls iput() on the inode. This is by design and other callers expect this behaviour. The fix is for swap_type_of() to take a reference on the inode using bdget().
mm/swapfile.c +2 -2
@@ -635,7 +635,7 @@ int swap_type_of(dev_t device, sector_t offset, struct block_device **bdev_p)if (!bdev) {if (bdev_p) - *bdev_p = sis->bdev; + *bdev_p =bdget (sis->bdev->bd_dev);spin_unlock (&swap_lock);return i;
@@ -647,7 +647,7 @@ int swap_type_of(dev_t device, sector_t offset, struct block_device **bdev_p) struct swap_extent, list);if (se->start_block == offset) {if (bdev_p) - *bdev_p = sis->bdev; + *bdev_p =bdget (sis->bdev->bd_dev);spin_unlock (&swap_lock);bdput (bdev);
Quoted 12 lines · Rafael J. Wysocki
From: Alan Jenkins <[email protected]>
http://bugzilla.kernel.org/show_bug.cgi?id=12239
The image writing code dropped a reference to the current swap device. This doesn't show up if the hibernation succeeds - because it doesn't affect the image which gets resumed. But it means multiple _failed_ hibernations end up freeing the swap device while it is still use!
swsusp_write()finds the block device for the swap file usingswap_type_of(). It then usesblkdev_get()/blkdev_put()to open and close the block device.
Quoted 7 lines
Unfortunately,
blkdev_get()assumes ownership of the inode of theblock_devicepassed to it. Soblkdev_put()callsiput()on the inode. This is by design and other callers expect this behaviour. The fix is forswap_type_of()to take a reference on the inode usingbdget().Signed-off-by Alan Jenkins <[email protected]>Signed-off-by Rafael J. Wysocki <[email protected]>
Quoted 27 lines
mm/swapfile.c +2
-2@@ -635,7 +635,7 @@ int swap_type_of(dev_t device, sector_t offset, struct block_device **bdev_p)if (!bdev) {if (bdev_p) - *bdev_p = sis->bdev; + *bdev_p =bdget (sis->bdev->bd_dev);spin_unlock (&swap_lock);return i;@@ -647,7 +647,7 @@ int swap_type_of(dev_t device, sector_t offset, struct block_device **bdev_p) struct swap_extent, list);if (se->start_block == offset) {if (bdev_p) - *bdev_p = sis->bdev; + *bdev_p =bdget (sis->bdev->bd_dev);spin_unlock (&swap_lock);bdput (bdev);
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
Quoted 12 lines · Rafael J. Wysocki
From: Alan Jenkins <[email protected]>
http://bugzilla.kernel.org/show_bug.cgi?id=12239
The image writing code dropped a reference to the current swap device. This doesn't show up if the hibernation succeeds - because it doesn't affect the image which gets resumed. But it means multiple _failed_ hibernations end up freeing the swap device while it is still use!
swsusp_write()finds the block device for the swap file usingswap_type_of(). It then usesblkdev_get()/blkdev_put()to open and close the block device.
Quoted 7 lines
Unfortunately,
blkdev_get()assumes ownership of the inode of theblock_devicepassed to it. Soblkdev_put()callsiput()on the inode. This is by design and other callers expect this behaviour. The fix is forswap_type_of()to take a reference on the inode usingbdget().Signed-off-by Alan Jenkins <[email protected]>Signed-off-by Rafael J. Wysocki <[email protected]>
Quoted 27 lines
mm/swapfile.c +2
-2@@ -635,7 +635,7 @@ int swap_type_of(dev_t device, sector_t offset, struct block_device **bdev_p)if (!bdev) {if (bdev_p) - *bdev_p = sis->bdev; + *bdev_p =bdget (sis->bdev->bd_dev);spin_unlock (&swap_lock);return i;@@ -647,7 +647,7 @@ int swap_type_of(dev_t device, sector_t offset, struct block_device **bdev_p) struct swap_extent, list);if (se->start_block == offset) {if (bdev_p) - *bdev_p = sis->bdev; + *bdev_p =bdget (sis->bdev->bd_dev);spin_unlock (&swap_lock);bdput (bdev);
Signature · 2 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html