From: Kirill Tkhai <tkhai@yandex.ru>
To: Tejun Heo <tj@kernel.org>
Cc: linux-ide@vger.kernel.org
Subject: [PATCH] ata_port_wait_eh(): Change irqsave into unconditional closing of interrupts
Date: Thu, 26 Sep 2013 17:21:19 +0400 [thread overview]
Message-ID: <1491380201679@web5j.yandex.ru> (raw)
Hi,
ata_port_wait_eh() uses spin_lock_irqsave() and this can confuse in fact
that it is suitable to use in irqs_disabled() context. But we can't.
(schedule() returns with interrupts enabled so it's possible
ata_port_wait_eh() enters with disabled interrupts but returns with enabled)
So, replace irqsave to unconditional closing of interrupts.
I propose to consider to add patch like this. (If you don't have a magic
with flags which is not obvious for me :)
Signed-off-by: Kirill Tkhai <tkhai@yandex.ru>
---
drivers/ata/libata-eh.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index c69fcce..502c1f9 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -841,21 +841,20 @@ EXPORT_SYMBOL_GPL(ata_scsi_port_error_handler);
*/
void ata_port_wait_eh(struct ata_port *ap)
{
- unsigned long flags;
DEFINE_WAIT(wait);
retry:
- spin_lock_irqsave(ap->lock, flags);
+ spin_lock_irq(ap->lock);
while (ap->pflags & (ATA_PFLAG_EH_PENDING | ATA_PFLAG_EH_IN_PROGRESS)) {
prepare_to_wait(&ap->eh_wait_q, &wait, TASK_UNINTERRUPTIBLE);
- spin_unlock_irqrestore(ap->lock, flags);
+ spin_unlock_irq(ap->lock);
schedule();
- spin_lock_irqsave(ap->lock, flags);
+ spin_lock_irq(ap->lock);
}
finish_wait(&ap->eh_wait_q, &wait);
- spin_unlock_irqrestore(ap->lock, flags);
+ spin_unlock_irq(ap->lock);
/* make sure SCSI EH is complete */
if (scsi_host_in_recovery(ap->scsi_host)) {
next reply other threads:[~2013-09-26 13:27 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-26 13:21 Kirill Tkhai [this message]
2013-09-26 13:31 ` [PATCH] ata_port_wait_eh(): Change irqsave into unconditional closing of interrupts Tejun Heo
2013-09-26 13:43 ` Kirill Tkhai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1491380201679@web5j.yandex.ru \
--to=tkhai@yandex.ru \
--cc=linux-ide@vger.kernel.org \
--cc=tj@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox