Force IDE cache flush on shutdown
Hi,
Alan discovered the hard way that the current 2.6 IDE code doesn't do a cache-flush on shutdown. The patch below forward ports this from 2.4. In addition it fixes a bug where the ->wcache value only got determined for removable disks not all disks. (that fix is from Alan, all other bugs are mine ;)
Greetings,
Arjan van de Ven
drivers/ide/ide-disk.c +71 -15
@@ -58,6 +58,8 @@#include <linux/genhd.h> #include <linux/slab.h> #include <linux/delay.h> +#include <linux/reboot.h> +#define _IDE_DISK
@@ -1729,11 +1733,11 @@ static ide_driver_t idedisk_driver = {static int idedisk_open (struct inode *inode,struct file *filp) { +u8 cf;ide_drive_t *drive = inode->i_bdev->bd_disk->private_data; drive->usage++;if (drive->removable && drive->usage ==1 ) {ide_task_t args; -u8 cf;memset (&args,0 ,sizeof (ide_task_t)); args.tfRegister[IDE_COMMAND_OFFSET ] =WIN_DOORLOCK ; args.command_type =IDE_DRIVE_TASK_NO_DATA ;
@@ -1746,18 +1750,18 @@ static int idedisk_open(struct inode *in*/ if (drive->doorlocking &&ide_raw_taskfile (drive, &args,NULL )) drive->doorlocking =0 ; - drive->wcache =0 ; -/* Cache enabled ? */ -if (drive->id->csfo &1 ) - drive->wcache =1 ; -/* Cache command set available ? */ -if (drive->id->cfs_enable_1 & (1 <<5 )) - drive->wcache =1 ; -/* ATA6 cache extended commands */ - cf = drive->id->command_set_2 >>24 ; -if ((cf &0xC0 ) ==0x40 && (cf &0x30 ) !=0 ) - drive->wcache =1 ; } + drive->wcache =0 ; +/* Cache enabled ? */ +if (drive->id->csfo &1 ) + drive->wcache =1 ; +/* Cache command set available ? */ +if (drive->id->cfs_enable_1 & (1 <<5 )) + drive->wcache =1 ; +/* ATA6 cache extended commands */ + cf = drive->id->command_set_2 >>24 ; +if ((cf &0xC0 ) ==0x40 && (cf &0x30 ) !=0 ) + drive->wcache =1 ;return 0 ; }
@@ -1779,6 +1783,7 @@ static int ide_cacheflush_p(ide_drive_tstatic int idedisk_release (struct inode *inode,struct file *filp) {ide_drive_t *drive = inode->i_bdev->bd_disk->private_data; +ide_cacheflush_p (drive);if (drive->removable && drive->usage ==1 ) {ide_task_t args;memset (&args,0 ,sizeof (ide_task_t));
@@ -1788,7 +1793,6 @@ static int idedisk_release(struct inodeif (drive->doorlocking &&ide_raw_taskfile (drive, &args,NULL )) drive->doorlocking =0 ; } -ide_cacheflush_p (drive); drive->usage--;return 0 ; }
@@ -1874,14 +1878,68 @@ failed:return 1 ; } + +static int ide_disk_notify_reboot (struct notifier_block *this,unsigned long event,void *x) +{ +ide_hwif_t *hwif; +ide_drive_t *drive; +int i, unit; + +switch (event) { +case SYS_HALT : +case SYS_POWER_OFF : +break ; +default : +return NOTIFY_DONE ; + } +printk (KERN_INFO "flushing ide devices: " ); +for (i =0 ; i <MAX_HWIFS ; i++) { + hwif = &ide_hwifs[i]; +if (!hwif->present) +continue ; +for (unit =0 ; unit <MAX_DRIVES ; ++unit) { + drive = &hwif->drives[unit]; +if (!drive->present) +continue ; +if (drive->media != ide_disk) +continue ; + +/* set the drive to standby */ +printk ("%s " , drive->name); + +ide_cacheflush_p (drive); + } + } +printk ("\n" ); +mdelay (1000 ); +return NOTIFY_DONE ; + +} + +static struct notifier_block ide_notifier = { + ide_disk_notify_reboot, +NULL , +5 +}; + + + static void __exit idedisk_exit (void) { +unregister_reboot_notifier (&ide_notifier);ide_unregister_driver (&idedisk_driver); }static int idedisk_init (void ) -{ -return ide_register_driver (&idedisk_driver); +{ +int i; + i =ide_register_driver (&idedisk_driver); + +if (i) +return i; + +register_reboot_notifier (&ide_notifier); +return 0 ; }module_init (idedisk_init);
drivers/ide/ide-disk.c failed: · line 1894
Quoted 13 lines · Arjan van de Ven
drivers/ide/ide-disk.c +13
-0+static int ide_disk_notify_reboot (struct notifier_block *this,unsigned long event,void *x) +{ +ide_hwif_t *hwif; +ide_drive_t *drive; +int i, unit; + +switch (event) { +case SYS_HALT : +case SYS_POWER_OFF : +break ; +default : +return NOTIFY_DONE ; + }
Please don't use reboot notifiers in new driver code. The driver model has a ->shutdown method for that.
Quoted 17 lines · Christoph Hellwig
drivers/ide/ide-disk.c failed: · line 1894
Quoted 13 lines · Arjan van de Ven
drivers/ide/ide-disk.c +13
-0+static int ide_disk_notify_reboot (struct notifier_block *this,unsigned long event,void *x) +{ +ide_hwif_t *hwif; +ide_drive_t *drive; +int i, unit; + +switch (event) { +case SYS_HALT : +case SYS_POWER_OFF : +break ; +default : +return NOTIFY_DONE ; + }Please don't use reboot notifiers in new driver code. The driver model has a ->shutdown method for that.
there is somewhat of a problem with that; the reboot command potentially runs from the disk in question, so that might never get called since that will keep things busy.
Quoted 6 lines · Arjan van de Ven
Quoted 2 lines
Please don't use reboot notifiers in new driver code. The driver model has a ->shutdown method for that.
there is somewhat of a problem with that; the reboot command potentially runs from the disk in question, so that might never get called since that will keep things busy.
shutdown != remove. Shutdown is called for all devices on shutdown, remove isn't called at all at reboot.
Quoted 10 lines · Christoph Hellwig
Quoted 6 lines · Arjan van de Ven
Quoted 2 lines
Please don't use reboot notifiers in new driver code. The driver model has a ->shutdown method for that.
there is somewhat of a problem with that; the reboot command potentially runs from the disk in question, so that might never get called since that will keep things busy.
shutdown != remove. Shutdown is called for all devices on shutdown, remove isn't called at all at reboot.
Ok the following does the trick for me. Better?
drivers/ide/ide-disk.c +18 -0
@@ -1820,6 +1820,23 @@ static int idedisk_revalidate_disk(strucreturn 0 ; } +static int ide_drive_shutdown (struct device * dev) +{ +ide_drive_t * drive =container_of (dev,ide_drive_t,gendev); + +/* safety checks */ +if (!drive->present) +return 0 ; +if (drive->media != ide_disk) +return 0 ; +printk ("Flushing cache: %s \n" , drive->name); +ide_cacheflush_p (drive); +/* give the hardware time to finish; it may return prematurely to cheat */ +mdelay (300 ); +return 0 ; +} + +static struct block_device_operations idedisk_ops = { .owner =THIS_MODULE , .open = idedisk_open,
@@ -1881,6 +1898,7 @@ static void __exit idedisk_exit (void)static int idedisk_init (void ) { + idedisk_driver.gen_driver.shutdown = ide_drive_shutdown;return ide_register_driver (&idedisk_driver); }
Quoted 14 lines · Arjan van de Ven
Ok the following does the trick for me. Better?
diff -purN
linux-2.6.5/drivers/ide/ide-disk.clinux/drivers/ide/ide-disk.cdrivers/ide/ide-disk.c +5
-0@@ -1820,6 +1820,23 @@ static int idedisk_revalidate_disk(strucreturn 0 ; } +static int ide_drive_shutdown (struct device * dev) +{ +ide_drive_t * drive =container_of (dev,ide_drive_t,gendev); + +/* safety checks */
drivers/ide/ide-disk.c static int idedisk_revalidate_disk(struc · line 1837
Quoted 10 lines
drivers/ide/ide-disk.c +10
-0+if (!drive->present) +return 0 ; +if (drive->media != ide_disk) +return 0 ; +printk ("Flushing cache: %s \n" , drive->name); +ide_cacheflush_p (drive); +/* give the hardware time to finish; it may return prematurely to cheat */ +mdelay (300 ); +return 0 ; +}
Looks good to mz limited understanding of the ide code :)
drivers/ide/ide-disk.c static void __exit idedisk_exit (void) · line 1901
Quoted 8 lines
drivers/ide/ide-disk.c +1
-0static struct block_device_operations idedisk_ops = { .owner =THIS_MODULE , .open = idedisk_open,@@ -1881,6 +1898,7 @@ static void __exit idedisk_exit (void)static int idedisk_init (void ) { + idedisk_driver.gen_driver.shutdown = ide_drive_shutdown;
isn't idedisk_driver initialized statically somewhere? You should probably add
.gen_driver = {
.shutdown = ide_drive_shutdown,
},to that initializer instead.
Quoted 3 lines · Christoph Hellwig
Review
Quoted 1 line
(quoted diff) +1
-0+ idedisk_driver.gen_driver.shutdown = ide_drive_shutdown;isn't
idedisk_driverinitialized statically somewhere? You should probably
ok ok you win
drivers/ide/ide-disk.c +20 -0
@@ -1725,6 +1725,9 @@ static ide_driver_t idedisk_driver = { .drives = LIST_HEAD_INIT(idedisk_driver.drives), .start_power_step = idedisk_start_power_step, .complete_power_step = idedisk_complete_power_step, + .gen_driver = { + .shutdown = ide_drive_shutdown, + }, };
@@ -1820,6 +1823,23 @@ static int idedisk_revalidate_disk(strucreturn 0 ; } +static int ide_drive_shutdown (struct device * dev) +{ +ide_drive_t * drive =container_of (dev,ide_drive_t,gendev); + +/* safety checks */ +if (!drive->present) +return 0 ; +if (drive->media != ide_disk) +return 0 ; +printk ("Flushing cache: %s \n" , drive->name); +ide_cacheflush_p (drive); +/* give the hardware time to finish; it may return prematurely to cheat */ +mdelay (300 ); +return 0 ; +} + +static struct block_device_operations idedisk_ops = { .owner =THIS_MODULE , .open = idedisk_open,
Quoted 11 lines · Arjan van de Ven
Quoted 3 lines · Christoph Hellwig
Review
Quoted 1 line
(quoted diff) +1
-0+ idedisk_driver.gen_driver.shutdown = ide_drive_shutdown;isn't
idedisk_driverinitialized statically somewhere? You should probablyok ok you win
diff -purN
linux-2.6.5/drivers/ide/ide-disk.clinux/drivers/ide/ide-disk.c
drivers/ide/ide-disk.c static ide_driver_t idedisk_driver = { · line 1730
Quoted 6 lines
drivers/ide/ide-disk.c +3
-0@@ -1725,6 +1725,9 @@ static ide_driver_t idedisk_driver = { .drives = LIST_HEAD_INIT(idedisk_driver.drives), .start_power_step = idedisk_start_power_step, .complete_power_step = idedisk_complete_power_step, + .gen_driver = { + .shutdown = ide_drive_shutdown, + },
and that needs a prototype as well
drivers/ide/ide-disk.c renamed from drivers/ide/ide-disk.c~ +1 -0
@@ -1701,6 +1701,7 @@ }static int idedisk_attach (ide_drive_t *drive); +static int ide_drive_shutdown (struct device * dev);/* * IDE subdriver functions, registered with ide.c
Hi.
If you want it tested on some more systems, send it to the suspend list (swsusp-devel at lists dot sourceforge dot net). There are a bunch of people there who'd love to give it a go and suspend2 will make any issues show up quickly. (At the moment, it calls drivers_suspend() prior to the power off call to force flushing).
Regards,
Nigel
Signature · 7 lines
Nigel & Michelle Cunningham C/- Westminster Presbyterian Church Belconnen 61 Templeton Street, Cook, ACT 2614. +61 (2) 6251 7727(wk); +61 (2) 6254 0216 (home) Evolution (n): A hypothetical process whereby infinitely improbable events occur with alarming frequency, order arises from chaos, and no one is given credit.
Quoted 21 lines · Arjan van de Ven
Quoted 4 lines · Christoph Hellwig
Review
Quoted 1 line
(quoted diff) +1
-0+ idedisk_driver.gen_driver.shutdown = ide_drive_shutdown;isn't
idedisk_driverinitialized statically somewhere? You should probablyok ok you win
diff -purN
linux-2.6.5/drivers/ide/ide-disk.clinux/drivers/ide/ide-disk.cdrivers/ide/ide-disk.c +3
-0@@ -1725,6 +1725,9 @@ static ide_driver_t idedisk_driver = { .drives = LIST_HEAD_INIT(idedisk_driver.drives), .start_power_step = idedisk_start_power_step, .complete_power_step = idedisk_complete_power_step, + .gen_driver = { + .shutdown = ide_drive_shutdown, + }, };
drivers/ide/ide-disk.c static int idedisk_revalidate_disk(struc · line 1832
Quoted 10 lines
drivers/ide/ide-disk.c +7
-0@@ -1820,6 +1823,23 @@ static int idedisk_revalidate_disk(strucreturn 0 ; } +static int ide_drive_shutdown (struct device * dev) +{ +ide_drive_t * drive =container_of (dev,ide_drive_t,gendev); + +/* safety checks */ +if (!drive->present) +return 0 ;
not needed / BUG_ON
drivers/ide/ide-disk.c static int idedisk_revalidate_disk(struc · line 1834
Quoted 2 lines
drivers/ide/ide-disk.c +2
-0+if (drive->media != ide_disk) +return 0 ;
not needed / BUG_ON
drivers/ide/ide-disk.c static int idedisk_revalidate_disk(struc
Quoted 4 lines
drivers/ide/ide-disk.c +3
-0+printk ("Flushing cache: %s \n" , drive->name); +ide_cacheflush_p (drive); +/* give the hardware time to finish; it may return prematurely to cheat */ +mdelay (300 );
I really don't like it.
Is this delay arbitrary or you know about such devices?
Quoted 7 lines
drivers/ide/ide-disk.c +4
-0+return 0 ; +} + +static struct block_device_operations idedisk_ops = { .owner =THIS_MODULE , .open = idedisk_open,
Quoted 9 lines
Quoted 5 lines
drivers/ide/ide-disk.c +3
-0+printk ("Flushing cache: %s \n" , drive->name); +ide_cacheflush_p (drive); +/* give the hardware time to finish; it may return prematurely to cheat */ + mdelay(300);
I really don't like it.
Is this delay arbitrary or you know about such devices?
Agreed... Why not standby the disk instead ? We could re-use the exact same code path as the Power Management... At least we know that once standby complete, we are ok (though I noticed that some proprietary OSes still impose a half a second delay after standby and before removing power ... broken IDE disks ...)
In fact, I'd like to kill the shutdown() callback in drivers in general as I think it's just a special case of a PM suspend in fact. The problem is we need once for all to fix the meaning of the "state" passed to those callbacks. Once that's done, we can have states for restart, shutdown and kexec (which wants devices to be put idle -> stop DMA etc...)
Ben.
Quoted 17 lines · Christoph Hellwig
drivers/ide/ide-disk.c failed: · line 1894
Quoted 13 lines · Arjan van de Ven
+static int
ide_disk_notify_reboot(structnotifier_block*this, unsigned long event, void *x) +{drivers/ide/ide-disk.c +11
-0+ide_hwif_t *hwif; +ide_drive_t *drive; +int i, unit; + +switch (event) { +case SYS_HALT : +case SYS_POWER_OFF : +break ; +default : +return NOTIFY_DONE ; + }Please don't use reboot notifiers in new driver code. The driver model has a ->shutdown method for that.
There is one problem with using ->shutdown:
handling of SYS_RESTART isn't the same as of SYS_HALT and SYS_POWER_OFF.
Quoted 4 lines
There is one problem with using ->shutdown:
handling ofSYS_RESTARTisn't the same as ofSYS_HALTandSYS_POWER_OFF.
See my other comment... I think this duplicates what the suspend callback does (though fixing that might not be a 2.6 option).
Ben.
Hi!
Quoted 8 lines
Quoted 8 lines
drivers/ide/ide-disk.c +8
-0+static int ide_disk_notify_reboot (struct notifier_block *this,unsigned long event,void *x) +{ +ide_hwif_t *hwif; +ide_drive_t *drive; +int i, unit; + +switch (event) { +case SYS_HALT :
Quoted 8 lines
drivers/ide/ide-disk.c failed: · line 1894
Quoted 5 lines
drivers/ide/ide-disk.c +5
-0+case SYS_POWER_OFF : +break ; +default : +return NOTIFY_DONE ; + }Please don't use reboot notifiers in new driver code. The driver model has a ->shutdown method for that.
Also you want to run this on machine entering S3 or suspend-to-disk, too...
Pavel
Signature · 1 line
When do you have heart between your knees?
Quoted 7 lines · Arjan van de Ven
Hi,
Alan discovered the hard way that the current 2.6 IDE code doesn't do a cache-flush on shutdown. The patch below forward ports this from 2.4. In addition it fixes a bug where the ->wcache value only got determined for removable disks not all disks. (that fix is from Alan, all other bugs are mine ;)
Yeah that's a dumb bug, I fixed that in the barrier patches as well (but forgot to send it in).
Maybe you could send that in seperately first, it needs to go in regardless.
Signature · 1 line
Jens Axboe
Quoted 8 lines · Arjan van de Ven
Quoted 7 lines
Hi,
Alan discovered the hard way that the current 2.6 IDE code doesn't do a cache-flush on shutdown. The patch below forward ports this from 2.4. In addition it fixes a bug where the ->wcache value only got determined for removable disks not all disks. (that fix is from Alan, all other bugs are mine ;)
Quoted 5 lines
Yeah that's a dumb bug, I fixed that in the barrier patches as well (but forgot to send it in).
Maybe you could send that in seperately first, it needs to go in regardless.
ok below are the uncontended bits
1) calculate wcache for non-removable disks too
2) flush the cache BEFORE unlocking the door on removable media, otherwise you have a small race with the human..
it makes sense for these to go in separate; I'm working on the shutdown hook now (and testing which is the fun part ;)
drivers/ide/ide-disk.c +13 -13
@@ -1729,11 +1733,11 @@ static ide_driver_t idedisk_driver = {static int idedisk_open (struct inode *inode,struct file *filp) { +u8 cf;ide_drive_t *drive = inode->i_bdev->bd_disk->private_data; drive->usage++;if (drive->removable && drive->usage ==1 ) {ide_task_t args; -u8 cf;memset (&args,0 ,sizeof (ide_task_t)); args.tfRegister[IDE_COMMAND_OFFSET ] =WIN_DOORLOCK ; args.command_type =IDE_DRIVE_TASK_NO_DATA ;
@@ -1746,18 +1750,18 @@ static int idedisk_open(struct inode *in*/ if (drive->doorlocking &&ide_raw_taskfile (drive, &args,NULL )) drive->doorlocking =0 ; - drive->wcache =0 ; -/* Cache enabled ? */ -if (drive->id->csfo &1 ) - drive->wcache =1 ; -/* Cache command set available ? */ -if (drive->id->cfs_enable_1 & (1 <<5 )) - drive->wcache =1 ; -/* ATA6 cache extended commands */ - cf = drive->id->command_set_2 >>24 ; -if ((cf &0xC0 ) ==0x40 && (cf &0x30 ) !=0 ) - drive->wcache =1 ; } + drive->wcache =0 ; +/* Cache enabled ? */ +if (drive->id->csfo &1 ) + drive->wcache =1 ; +/* Cache command set available ? */ +if (drive->id->cfs_enable_1 & (1 <<5 )) + drive->wcache =1 ; +/* ATA6 cache extended commands */ + cf = drive->id->command_set_2 >>24 ; +if ((cf &0xC0 ) ==0x40 && (cf &0x30 ) !=0 ) + drive->wcache =1 ;return 0 ; }
@@ -1779,6 +1783,7 @@ static int ide_cacheflush_p(ide_drive_tstatic int idedisk_release (struct inode *inode,struct file *filp) {ide_drive_t *drive = inode->i_bdev->bd_disk->private_data; +ide_cacheflush_p (drive);if (drive->removable && drive->usage ==1 ) {ide_task_t args;memset (&args,0 ,sizeof (ide_task_t));
@@ -1788,7 +1793,6 @@ static int idedisk_release(struct inodeif (drive->doorlocking &&ide_raw_taskfile (drive, &args,NULL )) drive->doorlocking =0 ; } -ide_cacheflush_p (drive); drive->usage--;return 0 ; }
Quoted 80 lines · Arjan van de Ven
Quoted 8 lines · Arjan van de Ven
Quoted 7 lines
Hi,
Alan discovered the hard way that the current 2.6 IDE code doesn't do a cache-flush on shutdown. The patch below forward ports this from 2.4. In addition it fixes a bug where the ->wcache value only got determined for removable disks not all disks. (that fix is from Alan, all other bugs are mine ;)
Quoted 5 lines
Yeah that's a dumb bug, I fixed that in the barrier patches as well (but forgot to send it in).
Maybe you could send that in seperately first, it needs to go in regardless.
ok below are the uncontended bits
1) calculate wcache for non-removable disks too
2) flush the cache BEFORE unlocking the door on removable media, otherwise you have a small race with the human..it makes sense for these to go in separate; I'm working on the shutdown hook now (and testing which is the fun part ;)
diff -urNp
linux-1110/drivers/ide/ide-disk.clinux-1120/drivers/ide/ide-disk.cdrivers/ide/ide-disk.c +13
-12@@ -1729,11 +1733,11 @@ static ide_driver_t idedisk_driver = {static int idedisk_open (struct inode *inode,struct file *filp) { +u8 cf;ide_drive_t *drive = inode->i_bdev->bd_disk->private_data; drive->usage++;if (drive->removable && drive->usage ==1 ) {ide_task_t args; -u8 cf;memset (&args,0 ,sizeof (ide_task_t)); args.tfRegister[IDE_COMMAND_OFFSET ] =WIN_DOORLOCK ; args.command_type =IDE_DRIVE_TASK_NO_DATA ;@@ -1746,18 +1750,18 @@ static int idedisk_open(struct inode *in*/ if (drive->doorlocking &&ide_raw_taskfile (drive, &args,NULL )) drive->doorlocking =0 ; - drive->wcache =0 ; -/* Cache enabled ? */ -if (drive->id->csfo &1 ) - drive->wcache =1 ; -/* Cache command set available ? */ -if (drive->id->cfs_enable_1 & (1 <<5 )) - drive->wcache =1 ; -/* ATA6 cache extended commands */ - cf = drive->id->command_set_2 >>24 ; -if ((cf &0xC0 ) ==0x40 && (cf &0x30 ) !=0 ) - drive->wcache =1 ; } + drive->wcache =0 ; +/* Cache enabled ? */ +if (drive->id->csfo &1 ) + drive->wcache =1 ; +/* Cache command set available ? */ +if (drive->id->cfs_enable_1 & (1 <<5 )) + drive->wcache =1 ; +/* ATA6 cache extended commands */ + cf = drive->id->command_set_2 >>24 ; +if ((cf &0xC0 ) ==0x40 && (cf &0x30 ) !=0 ) + drive->wcache =1 ;return 0 ; }@@ -1779,6 +1783,7 @@ static int ide_cacheflush_p(ide_drive_tstatic int idedisk_release (struct inode *inode,struct file *filp) {ide_drive_t *drive = inode->i_bdev->bd_disk->private_data; +ide_cacheflush_p (drive);if (drive->removable && drive->usage ==1 ) {ide_task_t args;memset (&args,0 ,sizeof (ide_task_t));
drivers/ide/ide-disk.c static int idedisk_release(struct inode · line 1798
Quoted 7 lines
drivers/ide/ide-disk.c +0
-1@@ -1788,7 +1793,6 @@ static int idedisk_release(struct inodeif (drive->doorlocking &&ide_raw_taskfile (drive, &args,NULL )) drive->doorlocking =0 ; } -ide_cacheflush_p (drive); drive->usage--;return 0 ; }
Looks good to me.
Signature · 1 line
Jens Axboe