Skip to contentSkip to conversation

ahci: fix win7 hang on boot

PATCH Applied Michael S. Tsirkin 3 participants 4 messages Oct 28, 2013 – Oct 31, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ahci: fix win7 hang on boot

From: Alexander Graf <[email protected]>

When AHCI executes an asynchronous IDE command, it checked DRDY without checking either DRQ or BSY. This sometimes caused interrupt to be sent before command is actually completed.

This resulted in a race condition: if guest then managed to access the device before command has completed, it would hang waiting for an interrupt.
This was observed with windows 7 guests.

To fix, check for DRQ or BSY in additiona to DRDY, if set, the command is asynchronous so delay the interrupt until asynchronous done callback is invoked.

---
 hw/ide/ahci.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
hw/ide/ahci.c +2 -1
index a8be62c..fbea9e8 100644
@@ -961,7 +961,8 @@ static int handle_cmd(AHCIState *s, int port, int slot)
         /* We're ready to process the command in FIS byte 2. */
         ide_exec_cmd(&s->dev[port].port, cmd_fis[2]);
 
-        if (s->dev[port].port.ifs[0].status & READY_STAT) {
+        if ((s->dev[port].port.ifs[0].status & (READY_STAT|DRQ_STAT|BUSY_STAT)) ==
+            READY_STAT) {
             ahci_write_fis_d2h(&s->dev[port], cmd_fis);
         }
     }
Signature · 1 line
MST
Applied
#1 lore raw

Am 28.10.2013 um 20:01 hat Michael S. Tsirkin geschrieben:

Quoted 11 lines

From: Alexander Graf <[email protected]>

When AHCI executes an asynchronous IDE command, it checked DRDY without checking either DRQ or BSY. This sometimes caused interrupt to be sent before command is actually completed.

This resulted in a race condition: if guest then managed to access the device before command has completed, it would hang waiting for an interrupt.
This was observed with windows 7 guests.

Quoted 8 lines

To fix, check for DRQ or BSY in additiona to DRDY, if set, the command is asynchronous so delay the interrupt until asynchronous done callback is invoked.

Thanks, applied to the block branch.

Kevin

#2 lore raw
In reply to Michael S. Tsirkin

Il 28/10/2013 20:01, Michael S. Tsirkin ha scritto:

Quoted 30 lines

From: Alexander Graf <[email protected]>

When AHCI executes an asynchronous IDE command, it checked DRDY without checking either DRQ or BSY. This sometimes caused interrupt to be sent before command is actually completed.

This resulted in a race condition: if guest then managed to access the device before command has completed, it would hang waiting for an interrupt.
This was observed with windows 7 guests.

To fix, check for DRQ or BSY in additiona to DRDY, if set, the command is asynchronous so delay the interrupt until asynchronous done callback is invoked.

---
 hw/ide/ahci.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
hw/ide/ahci.c +0 -0
index a8be62c..fbea9e8 100644

hw/ide/ahci.c static int handle_cmd(AHCIState *s, int port, int slot) · line 968

Quoted 9 lines
hw/ide/ahci.c +2 -1
@@ -961,7 +961,8 @@ static int handle_cmd(AHCIState *s, int port, int slot)
         /* We're ready to process the command in FIS byte 2. */
         ide_exec_cmd(&s->dev[port].port, cmd_fis[2]);
 
-        if (s->dev[port].port.ifs[0].status & READY_STAT) {
+        if ((s->dev[port].port.ifs[0].status & (READY_STAT|DRQ_STAT|BUSY_STAT)) ==
+            READY_STAT) {
             ahci_write_fis_d2h(&s->dev[port], cmd_fis);
         }
     }

While the patch fixes the symptom, I think it is only a bandaid.

There is no reason why the async_cmd_done should be restricted to asynchronous commands. If synchronous commands are made to go through the async_cmd_done callback, you'll automatically get the D2H FIS written for all commands.

It's good for 1.7, but let's revisit it for 1.8.

Paolo

#3 lore raw
Quoted 43 lines · Paolo Bonzini

Il 28/10/2013 20:01, Michael S. Tsirkin ha scritto:

Quoted 30 lines

From: Alexander Graf <[email protected]>

When AHCI executes an asynchronous IDE command, it checked DRDY without checking either DRQ or BSY. This sometimes caused interrupt to be sent before command is actually completed.

This resulted in a race condition: if guest then managed to access the device before command has completed, it would hang waiting for an interrupt.
This was observed with windows 7 guests.

To fix, check for DRQ or BSY in additiona to DRDY, if set, the command is asynchronous so delay the interrupt until asynchronous done callback is invoked.

---
 hw/ide/ahci.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
hw/ide/ahci.c +0 -0
index a8be62c..fbea9e8 100644

hw/ide/ahci.c static int handle_cmd(AHCIState *s, int port, int slot) · line 968

Quoted 9 lines
hw/ide/ahci.c +2 -1
@@ -961,7 +961,8 @@ static int handle_cmd(AHCIState *s, int port, int slot)
         /* We're ready to process the command in FIS byte 2. */
         ide_exec_cmd(&s->dev[port].port, cmd_fis[2]);
 
-        if (s->dev[port].port.ifs[0].status & READY_STAT) {
+        if ((s->dev[port].port.ifs[0].status & (READY_STAT|DRQ_STAT|BUSY_STAT)) ==
+            READY_STAT) {
             ahci_write_fis_d2h(&s->dev[port], cmd_fis);
         }
     }

While the patch fixes the symptom, I think it is only a bandaid.

Quoted 4 lines

There is no reason why the async_cmd_done should be restricted to asynchronous commands. If synchronous commands are made to go through the async_cmd_done callback, you'll automatically get the D2H FIS written for all commands.

I suggested this to Kevin offline but he prefers it like this.

Quoted 3 lines

It's good for 1.7, but let's revisit it for 1.8.

Paolo

Fine with me.