libata-core: convert to use cancel_rearming_delayed_work()
PATCH 1/1 libata-core: convert to use cancel_rearming_delayed_work()
Compile tested, depends on
make-cancel_rearming_delayed_work-reliable.patch
We should not use cancel_work_sync(delayed_work->work). This works, but not good. We can use cancel_rearming_delayed_work(), this also simplifies the code.
drivers/ata/libata-core.c | 44 ++++---------------------------------------- include/linux/libata.h | 1 - 2 files changed, 4 insertions(+), 41 deletions(-)
include/linux/libata.h renamed from include/linux/libata.h~ATA +0 -1
@@ -192,7 +192,6 @@ enum {ATA_PFLAG_UNLOADING = (1 <<5 ),/* module is unloading */ ATA_PFLAG_SCSI_HOTPLUG = (1 <<6 ),/* SCSI hotplug scheduled */ -ATA_PFLAG_FLUSH_PORT_TASK = (1 <<16 ),/* flush port task */ ATA_PFLAG_SUSPENDED = (1 <<17 ),/* port is suspended (power) */ ATA_PFLAG_PM_PENDING = (1 << 18), /* PM operation pending */
drivers/ata/libata-core.c renamed from drivers/ata/libata-core.c~ATA +4 -40
67 lines not on this page · raw message
Hello,
Quoted 8 lines · Oleg Nesterov
void ata_port_queue_task(struct
ata_port*ap,work_func_tfn, void *data,drivers/ata/libata-core.c renamed from drivers/ata/libata-core.c~ATA +0
-5unsigned long delay) { -int rc; - -if (ap->pflags &ATA_PFLAG_FLUSH_PORT_TASK ) -return ; -
drivers/ata/libata-core.c static unsigned int ata_id_xfermask(cons · line 1087
Quoted 10 lines
drivers/ata/libata-core.c renamed from drivers/ata/libata-core.c~ATA +2
-4PREPARE_DELAYED_WORK (&ap->port_task, fn); ap->port_task_data = data; - rc =queue_delayed_work (ata_wq, &ap->port_task, delay); - -/* rc == 0 means that another user is using port task */ -WARN_ON (rc ==0 ); +/* may fail if ata_port_flush_task() in progress */ +queue_delayed_work (ata_wq, &ap->port_task, delay); }
I don't really think ata_port_queue_task() deserves to live after this.
Feel free to kill it.
Quoted 19 lines
void
ata_port_flush_task(struct ata_port *ap)
{drivers/ata/libata-core.c renamed from drivers/ata/libata-core.c~ATA +0
-15-unsigned long flags; -DPRINTK ("ENTER\n" ); -spin_lock_irqsave (ap->lock, flags); - ap->pflags |=ATA_PFLAG_FLUSH_PORT_TASK ; -spin_unlock_irqrestore (ap->lock, flags); - -DPRINTK ("flush #1\n" ); -cancel_work_sync (&ap->port_task.work);/* akpm: seems unneeded */ - -/* -* At this point, if a task is running, it's guaranteed to see -* the FLUSH flag; thus, it will never queue pio tasks again. -* Cancel and flush. -*/ -if (!cancel_delayed_work (&ap->port_task)) {
drivers/ata/libata-core.c void ata_port_queue_task(struct ata_port · line 1103
Quoted 10 lines
drivers/ata/libata-core.c renamed from drivers/ata/libata-core.c~ATA +1
-9-if (ata_msg_ctl (ap)) -ata_port_printk (ap,KERN_DEBUG ,"%s: flush #2\n" , - __FUNCTION__); -cancel_work_sync (&ap->port_task.work); - } - -spin_lock_irqsave (ap->lock, flags); - ap->pflags &= ~ATA_PFLAG_FLUSH_PORT_TASK ; -spin_unlock_irqrestore (ap->lock, flags); +cancel_rearming_delayed_work (&ap->port_task);
Nor does ata_port_flush_task().
drivers/ata/libata-core.c void ata_port_detach(struct ata_port *ap · line 6067
Quoted 12 lines
drivers/ata/libata-core.c renamed from drivers/ata/libata-core.c~ATA +1
-7@@ -6094,13 +6064,7 @@ void ata_port_detach(struct ata_port *apspin_unlock_irqrestore (ap->lock, flags);ata_port_wait_eh (ap); - -/* Flush hotplug task. The sequence is similar to -* ata_port_flush_task(). -*/ -cancel_work_sync (&ap->hotplug_task.work);/* akpm: why? */ -cancel_delayed_work (&ap->hotplug_task); -cancel_work_sync (&ap->hotplug_task.work); +cancel_rearming_delayed_work (&ap->hotplug_task);
Yay, I've always wanted to do that. :-)
Thanks.
Signature · 1 line
tejun