diff mbox

[3/6] USB OHCI bug fixes

Message ID 20120228030917.GL3433@truffala.fritz.box
State New
Headers show

Commit Message

David Gibson Feb. 28, 2012, 3:09 a.m. UTC 
On Mon, Feb 27, 2012 at 03:13:02PM +0100, Gerd Hoffmann wrote:
> On 02/24/12 01:23, David Gibson wrote:
> > From: Wei Yang <weiyang@linux.vnet.ibm.com>
> > 
> > This patch fixes two bugs in the OHCI device where the device writes
> > back data to system memory that should be exclusively under the
> > control of the guest side driver.
> 
> Looks good.  Fails checkpatch though.

Oops, missed one of the overlong lines.  checkpatch clean revised
version below.

> What is your merge plan btw?  Wanna pick me this up for the usb queue?
> Or do you need just my ack?

If you could put it in your queue that would be great.

From a4c996ba5e71dfd9f84abcf9365693229f707213 Mon Sep 17 00:00:00 2001
From: Wei Yang <weiyang@linux.vnet.ibm.com>
Date: Wed, 22 Feb 2012 12:02:06 +1100
Subject: [PATCH] USB OHCI bug fixes

This patch fixes two bugs in the OHCI device where the device writes
back data to system memory that should be exclusively under the
control of the guest side driver.

In OHCI specification Section 5.2.7, it mentioned "In all cases, Host
Controller Driver is responsible for the insertion and removal of all
Endpoint Descriptors in the various Host Controller Endpoint
Descriptor lists".  In the ohci_frame_boundary(), ohci_put_hcca()
writes the entire hcca back including the interrupt ED lists which
should be under driver control. This violates the specification and
can race with a host driver updating that list at the same time.

In the OHCI Spec Section 4.6, Transfer Descriptor Queue Processing, it
mentioned "Since the TD pointed to by TailP is not accessed by the HC,
the Host Controller Driver can initialize that TD and link at least
one other to it without creating a coherency or synchronization
problem".  While the function ohci_put_ed() writes the entire endpoint
descriptor back including the TailP which should under driver
control. This violate the specification and can race with a host
driver updating the TD list at the same time.

In each case the solution is to make sure we don't write data which is
under driver control.

Cc: Gerd Hoffman <kraxel@redhat.com>

Signed-off-by: Wei Yang <weiyang@linux.vnet.ibm.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
 hw/usb-ohci.c |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

Comments

David Gibson Feb. 28, 2012, 3:37 a.m. UTC | #1 
On Tue, Feb 28, 2012 at 02:09:17PM +1100, David Gibson wrote:
> On Mon, Feb 27, 2012 at 03:13:02PM +0100, Gerd Hoffmann wrote:
> > On 02/24/12 01:23, David Gibson wrote:
> > > From: Wei Yang <weiyang@linux.vnet.ibm.com>
> > > 
> > > This patch fixes two bugs in the OHCI device where the device writes
> > > back data to system memory that should be exclusively under the
> > > control of the guest side driver.
> > 
> > Looks good.  Fails checkpatch though.
> 
> Oops, missed one of the overlong lines.  checkpatch clean revised
> version below.
> 
> > What is your merge plan btw?  Wanna pick me this up for the usb queue?
> > Or do you need just my ack?
> 
> If you could put it in your queue that would be great.

Ugh, but don't bother with this version.  I just discovered I didn't
have the latest version from Wei Yang, I'll update and resend.
diff mbox

Patch

diff --git a/hw/usb-ohci.c b/hw/usb-ohci.c
index 7aa19fe..a4b4ef9 100644
--- a/hw/usb-ohci.c
+++ b/hw/usb-ohci.c
@@ -122,6 +122,8 @@  struct ohci_hcca {
     uint16_t frame, pad;
     uint32_t done;
 };
+#define HCCA_WRITEBACK_OFFSET   offsetof(struct ohci_hcca, frame)
+#define HCCA_WRITEBACK_SIZE     8 /* frame, pad, done */
 
 static void ohci_bus_stop(OHCIState *ohci);
 static void ohci_async_cancel_device(OHCIState *ohci, USBDevice *dev);
@@ -189,6 +191,10 @@  struct ohci_ed {
     uint32_t head;
     uint32_t next;
 };
+#define ED_TAILP_OFFSET   offsetof(struct ohci_ed, tail)
+#define ED_PART1_SIZE     ED_TAILP_OFFSET
+#define ED_HEADP_OFFSET   offsetof(struct ohci_ed, head)
+#define ED_PART2_SIZE     (sizeof(struct ohci_ed) - ED_HEADP_OFFSET)
 
 /* General transfer descriptor */
 struct ohci_td {
@@ -569,7 +575,13 @@  static inline int ohci_read_hcca(OHCIState *ohci,
 static inline int ohci_put_ed(OHCIState *ohci,
                               uint32_t addr, struct ohci_ed *ed)
 {
-    return put_dwords(ohci, addr, (uint32_t *)ed, sizeof(*ed) >> 2);
+    /* ed->tail is under control of the HCD, so we need to split
+     * the write back into two parts
+     */
+    put_dwords(ohci, addr, (uint32_t *)ed, ED_PART1_SIZE >> 2);
+    return put_dwords(ohci, addr + ED_HEADP_OFFSET,
+                      (uint32_t *)((char *)ed + ED_HEADP_OFFSET),
+                      ED_PART2_SIZE >> 2);
 }
 
 static inline int ohci_put_td(OHCIState *ohci,
@@ -588,7 +600,9 @@  static inline int ohci_put_iso_td(OHCIState *ohci,
 static inline int ohci_put_hcca(OHCIState *ohci,
                                 uint32_t addr, struct ohci_hcca *hcca)
 {
-    cpu_physical_memory_write(addr + ohci->localmem_base, hcca, sizeof(*hcca));
+    cpu_physical_memory_write(addr + ohci->localmem_base + HCCA_WRITEBACK_OFFSET,
+                              (char *)hcca + HCCA_WRITEBACK_OFFSET,
+                              HCCA_WRITEBACK_SIZE);
     return 1;
 }