linux/drivers/usb/mon
Alan Stern ff9c895f07 USB: fix usbmon and DMA mapping for scatter-gather URBs
This patch (as1368) fixes a rather obscure bug in usbmon: When tracing
URBs sent by the scatter-gather library, it accesses the data buffers
while they are still mapped for DMA.

The solution is to move the mapping and unmapping out of the s-g
library and into the usual place in hcd.c.  This requires the addition
of new URB flag bits to describe the kind of mapping needed, since we
have to call dma_map_sg() if the HCD supports native scatter-gather
operation and dma_map_page() if it doesn't.  The nice thing about
having the new flags is that they simplify the testing for unmapping.

The patch removes the only caller of usb_buffer_[un]map_sg(), so those
functions are #if'ed out.  A later patch will remove them entirely.

As a result of this change, urb->sg will be set in situations where
it wasn't set previously.  Hence the xhci and whci drivers are
adjusted to test urb->num_sgs instead, which retains its original
meaning and is nonzero only when the HCD has to handle a scatterlist.

Finally, even when a submission error occurs we don't want to hand
URBs to usbmon before they are unmapped.  The submission path is
rearranged so that map_urb_for_dma() is called only for non-root-hub
URBs and unmap_urb_for_dma() is called immediately after a submission
error.  This simplifies the error handling.

Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
CC: <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2010-05-20 13:21:37 -07:00
..
Kconfig USB: usbmon: drop Kconfig defaults 2009-09-23 06:46:19 -07:00
Makefile USB: usbmon: end ugly tricks with DMA peeking 2009-09-23 06:46:19 -07:00
mon_bin.c USB: fix usbmon and DMA mapping for scatter-gather URBs 2010-05-20 13:21:37 -07:00
mon_main.c USB: make hcd.h public (drivers dependency) 2010-05-20 13:21:30 -07:00
mon_stat.c include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h 2010-03-30 22:02:32 +09:00
mon_text.c USB: fix usbmon and DMA mapping for scatter-gather URBs 2010-05-20 13:21:37 -07:00
usb_mon.h USB: usbmon: end ugly tricks with DMA peeking 2009-09-23 06:46:19 -07:00