xhci: prevent double-fetch of transfer and transfer event TRBs

The same values are parsed several times from transfer and event
TRBs by different functions in the same call path, all while processing
one transfer event.

As the TRBs are in DMA memory and can be accessed by the xHC host we want
to avoid this to prevent double-fetch issues.

To resolve this pass the already parsed values to the different functions
in the path of parsing a transfer event

Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com>
Link: https://lore.kernel.org/r/20210406070208.3406266-5-mathias.nyman@linux.intel.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index 1eee60ac518f5ed8edaf531fd35583a187022e55..05c38dd3ee361a6e1fc5e002e8e1a3d2a68c8cae 100644 (file)
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -2128,16 +2128,13 @@ int xhci_is_vendor_info_code(struct xhci_hcd *xhci, unsigned int trb_comp_code)
        return 0;
 }
 
-static int finish_td(struct xhci_hcd *xhci, struct xhci_td *td,
-       struct xhci_transfer_event *event, struct xhci_virt_ep *ep)
+static int finish_td(struct xhci_hcd *xhci, struct xhci_virt_ep *ep,
+                    struct xhci_ring *ep_ring, struct xhci_td *td,
+                    u32 trb_comp_code)
 {
        struct xhci_ep_ctx *ep_ctx;
-       struct xhci_ring *ep_ring;
-       u32 trb_comp_code;
 
-       ep_ring = xhci_dma_to_transfer_ring(ep, le64_to_cpu(event->buffer));
        ep_ctx = xhci_get_ep_ctx(xhci, ep->vdev->out_ctx, ep->ep_index);
-       trb_comp_code = GET_COMP_CODE(le32_to_cpu(event->transfer_len));
 
        switch (trb_comp_code) {
        case COMP_STOPPED_LENGTH_INVALID:
@@ -2233,9 +2230,9 @@ static int sum_trb_lengths(struct xhci_hcd *xhci, struct xhci_ring *ring,
 /*
  * Process control tds, update urb status and actual_length.
  */
-static int process_ctrl_td(struct xhci_hcd *xhci, struct xhci_td *td,
-       union xhci_trb *ep_trb, struct xhci_transfer_event *event,
-       struct xhci_virt_ep *ep)
+static int process_ctrl_td(struct xhci_hcd *xhci, struct xhci_virt_ep *ep,
+               struct xhci_ring *ep_ring,  struct xhci_td *td,
+                          union xhci_trb *ep_trb, struct xhci_transfer_event *event)
 {
        struct xhci_ep_ctx *ep_ctx;
        u32 trb_comp_code;
@@ -2323,15 +2320,15 @@ static int process_ctrl_td(struct xhci_hcd *xhci, struct xhci_td *td,
                td->urb->actual_length = requested;
 
 finish_td:
-       return finish_td(xhci, td, event, ep);
+       return finish_td(xhci, ep, ep_ring, td, trb_comp_code);
 }
 
 /*
  * Process isochronous tds, update urb packet status and actual_length.
  */
-static int process_isoc_td(struct xhci_hcd *xhci, struct xhci_td *td,
-       union xhci_trb *ep_trb, struct xhci_transfer_event *event,
-       struct xhci_virt_ep *ep)
+static int process_isoc_td(struct xhci_hcd *xhci, struct xhci_virt_ep *ep,
+               struct xhci_ring *ep_ring, struct xhci_td *td,
+               union xhci_trb *ep_trb, struct xhci_transfer_event *event)
 {
        struct urb_priv *urb_priv;
        int idx;
@@ -2408,7 +2405,7 @@ static int process_isoc_td(struct xhci_hcd *xhci, struct xhci_td *td,
 
        td->urb->actual_length += frame->actual_length;
 
-       return finish_td(xhci, td, event, ep);
+       return finish_td(xhci, ep, ep_ring, td, trb_comp_code);
 }
 
 static int skip_isoc_td(struct xhci_hcd *xhci, struct xhci_td *td,
@@ -2440,17 +2437,15 @@ static int skip_isoc_td(struct xhci_hcd *xhci, struct xhci_td *td,
 /*
  * Process bulk and interrupt tds, update urb status and actual_length.
  */
-static int process_bulk_intr_td(struct xhci_hcd *xhci, struct xhci_td *td,
-       union xhci_trb *ep_trb, struct xhci_transfer_event *event,
-       struct xhci_virt_ep *ep)
+static int process_bulk_intr_td(struct xhci_hcd *xhci, struct xhci_virt_ep *ep,
+               struct xhci_ring *ep_ring, struct xhci_td *td,
+               union xhci_trb *ep_trb, struct xhci_transfer_event *event)
 {
        struct xhci_slot_ctx *slot_ctx;
-       struct xhci_ring *ep_ring;
        u32 trb_comp_code;
        u32 remaining, requested, ep_trb_len;
 
        slot_ctx = xhci_get_slot_ctx(xhci, ep->vdev->out_ctx);
-       ep_ring = xhci_dma_to_transfer_ring(ep, le64_to_cpu(event->buffer));
        trb_comp_code = GET_COMP_CODE(le32_to_cpu(event->transfer_len));
        remaining = EVENT_TRB_LEN(le32_to_cpu(event->transfer_len));
        ep_trb_len = TRB_LEN(le32_to_cpu(ep_trb->generic.field[2]));
@@ -2510,7 +2505,8 @@ finish_td:
                          remaining);
                td->urb->actual_length = 0;
        }
-       return finish_td(xhci, td, event, ep);
+
+       return finish_td(xhci, ep, ep_ring, td, trb_comp_code);
 }
 
 /*
@@ -2853,11 +2849,11 @@ static int handle_tx_event(struct xhci_hcd *xhci,
 
                /* update the urb's actual_length and give back to the core */
                if (usb_endpoint_xfer_control(&td->urb->ep->desc))
-                       process_ctrl_td(xhci, td, ep_trb, event, ep);
+                       process_ctrl_td(xhci, ep, ep_ring, td, ep_trb, event);
                else if (usb_endpoint_xfer_isoc(&td->urb->ep->desc))
-                       process_isoc_td(xhci, td, ep_trb, event, ep);
+                       process_isoc_td(xhci, ep, ep_ring, td, ep_trb, event);
                else
-                       process_bulk_intr_td(xhci, td, ep_trb, event, ep);
+                       process_bulk_intr_td(xhci, ep, ep_ring, td, ep_trb, event);
 cleanup:
                handling_skipped_tds = ep->skip &&
                        trb_comp_code != COMP_MISSED_SERVICE_ERROR &&