[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 02/14] usb: Fix (another) bug in usb_packet_map() fo
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 02/14] usb: Fix (another) bug in usb_packet_map() for IOMMU handling |
Date: |
Fri, 16 Nov 2012 14:44:35 +0100 |
From: David Gibson <address@hidden>
Elements in qemu SGLists can cross IOMMU page boundaries. So, in commit
39c138c8420f51a7da7b35233a8d7400a0b589ac "usb: Fix usb_packet_map() in the
presence of IOMMUs", I changed usb_packet_map() to split up each SGList
element on IOMMU page boundaries and each resulting piece of qemu's memory
space separately to the iovec the usb code uses internally.
That was correct in concept, but the patch has a bug. The 'base' variable
correctly steps through the dma address of each piece, but then we call
the dma_memory_map() function on the base address of the whole SGList
element every time.
This patch fixes at least one problem using XHCI on the pseries guest
machine. It didn't affect OHCI because that doesn't use usb_packet_map().
In theory it also affects EHCI, but we haven't observed that in practice.
I think the transfers were small enough on EHCI that they never crossed an
IOMMU page boundary in practice.
Signed-off-by: David Gibson <address@hidden>
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb/libhw.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/hw/usb/libhw.c b/hw/usb/libhw.c
index 703e2d2..24d3cad 100644
--- a/hw/usb/libhw.c
+++ b/hw/usb/libhw.c
@@ -37,7 +37,7 @@ int usb_packet_map(USBPacket *p, QEMUSGList *sgl)
while (len) {
dma_addr_t xlen = len;
- mem = dma_memory_map(sgl->dma, sgl->sg[i].base, &xlen, dir);
+ mem = dma_memory_map(sgl->dma, base, &xlen, dir);
if (!mem) {
goto err;
}
--
1.7.1
- [Qemu-devel] [PATCH 06/14] ehci: Fixup q->qtdaddr after cancelling an already completed packet, (continued)
- [Qemu-devel] [PATCH 06/14] ehci: Fixup q->qtdaddr after cancelling an already completed packet, Gerd Hoffmann, 2012/11/16
- [Qemu-devel] [PATCH 05/14] ehci: Don't access packet after freeing it, Gerd Hoffmann, 2012/11/16
- [Qemu-devel] [PATCH 09/14] ehci: keep the frame timer running in case the guest asked for frame list rollover interrupts, Gerd Hoffmann, 2012/11/16
- [Qemu-devel] [PATCH 07/14] ehci: Better detection for qtd-s linked in circles, Gerd Hoffmann, 2012/11/16
- [Qemu-devel] [PATCH 12/14] usb-redir: Set default debug level to warning, Gerd Hoffmann, 2012/11/16
- [Qemu-devel] [PATCH 13/14] usb-host: update tracing, Gerd Hoffmann, 2012/11/16
- [Qemu-devel] [PATCH 11/14] usb-redir: Only add actually in flight packets to the in flight queue, Gerd Hoffmann, 2012/11/16
- [Qemu-devel] [PATCH 14/14] usb-host: fix splitted transfers, Gerd Hoffmann, 2012/11/16
- [Qemu-devel] [PATCH 04/14] usb: host-linux: Ignore parsing errors of the device descriptors, Gerd Hoffmann, 2012/11/16
- [Qemu-devel] [PATCH 10/14] ehci: handle dma errors, Gerd Hoffmann, 2012/11/16
- [Qemu-devel] [PATCH 02/14] usb: Fix (another) bug in usb_packet_map() for IOMMU handling,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 08/14] ehci: Don't verify the next pointer for periodic qh-s and qtd-s, Gerd Hoffmann, 2012/11/16