ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ehci: stop recursive calls to ehci_work_bh 

Can happen with usb-storage devices: ehci_work_bh calls usb-storage,
usb-storage calls into block layer, block layer may run BHs.

Add a simple bool and just do nothing in case we figure ehci_work_bh is
active.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20170612073109.25930-1-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2017-06-12 09:31:09 +02:00
parent d54fddea98
commit ad3c5412f2
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/usb/hcd-ehci.c
View File

@ -2241,6 +2241,11 @@ static void ehci_work_bh(void *opaque)
uint64_t uframes, skipped_uframes; uint64_t uframes, skipped_uframes;
int i; int i;
if (ehci->working) {
return;
}
ehci->working = true;
t_now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); t_now = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
ns_elapsed = t_now - ehci->last_run_ns; ns_elapsed = t_now - ehci->last_run_ns;
uframes = ns_elapsed / UFRAME_TIMER_NS; uframes = ns_elapsed / UFRAME_TIMER_NS;
@ -2322,6 +2327,8 @@ static void ehci_work_bh(void *opaque)
} }
timer_mod(ehci->frame_timer, expire_time); timer_mod(ehci->frame_timer, expire_time);
} }
ehci->working = false;
} }
static void ehci_work_timer(void *opaque) static void ehci_work_timer(void *opaque)

1
hw/usb/hcd-ehci.h
View File

@ -297,6 +297,7 @@ struct EHCIState {
*/ */
QEMUTimer *frame_timer; QEMUTimer *frame_timer;
QEMUBH *async_bh; QEMUBH *async_bh;
bool working;
uint32_t astate; /* Current state in asynchronous schedule */ uint32_t astate; /* Current state in asynchronous schedule */
uint32_t pstate; /* Current state in periodic schedule */ uint32_t pstate; /* Current state in periodic schedule */
USBPort ports[NB_PORTS]; USBPort ports[NB_PORTS];