Skip to content

Commit 428aac8

Browse files
Ming Leigregkh
Ming Lei
authored and
gregkh
committed
USB: EHCI: support running URB giveback in tasklet context
All 4 transfer types can work well on EHCI HCD after switching to run URB giveback in tasklet context, so mark all HCD drivers to support it. Also we don't need to release ehci->lock during URB giveback any more. >From below test results on 3 machines(2 ARM and one x86), time consumed by EHCI interrupt handler droped much without performance loss. 1 test description 1.1 mass storage performance test: - run below command 10 times and compute the average performance dd if=/dev/sdN iflag=direct of=/dev/null bs=200M count=1 - two usb mass storage device: A: sandisk extreme USB 3.0 16G(used in test case 1 & case 2) B: kingston DataTraveler G2 4GB(only used in test case 2) 1.2 uvc function test: - run one simple capture program in the below link http://kernel.ubuntu.com/~ming/up/capture.c - capture format 640*480 and results in High Bandwidth mode on the uvc device: Z-Star 0x0ac8/0x3450 - on T410(x86) laptop, also use guvcview to watch video capture/playback 1.3 about test2 and test4 - both two devices involved are tested concurrently by above test items 1.4 how to compute irq time(the time consumed by ehci_irq) - use trace points of irq:irq_handler_entry and irq:irq_handler_exit 1.5 kernel 3.10.0-rc3-next-20130528 1.6 test machines Pandaboard A1: ARM CortexA9 dural core Arndale board: ARM CortexA15 dural core T410: i5 CPU 2.67GHz quad core 2 test result 2.1 test case1: single mass storage device performance test -------------------------------------------------------------------- upstream | patched perf(MB/s)+irq time(us) | perf(MB/s)+irq time(us) -------------------------------------------------------------------- Pandaboard A1: 25.280(avg:145,max:772) | 25.540(avg:14, max:75) Arndale board: 29.700(avg:33, max:129) | 29.700(avg:10, max:50) T410: 34.430(avg:17, max:154*)| 34.660(avg:12, max:155) --------------------------------------------------------------------- 2.2 test case2: two mass storage devices' performance test -------------------------------------------------------------------- upstream | patched perf(MB/s)+irq time(us) | perf(MB/s)+irq time(us) -------------------------------------------------------------------- Pandaboard A1: 15.840/15.580(avg:158,max:1216) | 16.500/16.160(avg:15,max:139) Arndale board: 17.370/16.220(avg:33 max:234) | 17.480/16.200(avg:11, max:91) T410: 21.180/19.820(avg:18 max:160) | 21.220/19.880(avg:11, max:149) --------------------------------------------------------------------- 2.3 test case3: one uvc streaming test - uvc device works well(on x86, luvcview can be used too and has same result with uvc capture) -------------------------------------------------------------------- upstream | patched irq time(us) | irq time(us) -------------------------------------------------------------------- Pandaboard A1: (avg:445, max:873) | (avg:33, max:44) Arndale board: (avg:316, max:630) | (avg:20, max:27) T410: (avg:39, max:107) | (avg:10, max:65) --------------------------------------------------------------------- 2.4 test case4: one uvc streaming plus one mass storage device test -------------------------------------------------------------------- upstream | patched perf(MB/s)+irq time(us) | perf(MB/s)+irq time(us) -------------------------------------------------------------------- Pandaboard A1: 20.340(avg:259,max:1704)| 20.390(avg:24, max:101) Arndale board: 23.460(avg:124,max:726) | 23.370(avg:15, max:52) T410: 28.520(avg:27, max:169) | 28.630(avg:13, max:160) --------------------------------------------------------------------- 2.5 test case5: read single mass storage device with small transfer - run below command 10 times and compute the average speed dd if=/dev/sdN iflag=direct of=/dev/null bs=4K count=4000 1), test device A: -------------------------------------------------------------------- upstream | patched perf(MB/s)+irq time(us) | perf(MB/s)+irq time(us) -------------------------------------------------------------------- Pandaboard A1: 6.5(avg:21, max:64) | 6.5(avg:10, max:24) Arndale board: 8.13(avg:12, max:23) | 8.06(avg:7, max:17) T410: 6.66(avg:13, max:131) | 6.84(avg:11, max:149) --------------------------------------------------------------------- 2), test device B: -------------------------------------------------------------------- upstream | patched perf(MB/s)+irq time(us) | perf(MB/s)+irq time(us) -------------------------------------------------------------------- Pandaboard A1: 5.5(avg:21,max:43) | 5.49(avg:10, max:24) Arndale board: 5.9(avg:12, max:22) | 5.9(avg:7, max:17) T410: 5.48(avg:13, max:155) | 5.48(avg:7, max:140) --------------------------------------------------------------------- * On T410, sometimes read ehci status register in ehci_irq takes more than 100us, and the problem has been reported on the link: http://marc.info/?t=137065867300001&r=1&w=2 Acked-by: Alan Stern <[email protected]> Signed-off-by: Ming Lei <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 9118f9e commit 428aac8

File tree

14 files changed

+13
-18
lines changed

14 files changed

+13
-18
lines changed

‎drivers/usb/host/ehci-fsl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -669,7 +669,7 @@ static const struct hc_driver ehci_fsl_hc_driver = {
669669
* generic hardware linkage
670670
*/
671671
.irq = ehci_irq,
672-
.flags = HCD_USB2 | HCD_MEMORY,
672+
.flags = HCD_USB2 | HCD_MEMORY | HCD_BH,
673673

674674
/*
675675
* basic lifecycle operations

‎drivers/usb/host/ehci-grlib.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ static const struct hc_driver ehci_grlib_hc_driver = {
4343
* generic hardware linkage
4444
*/
4545
.irq = ehci_irq,
46-
.flags = HCD_MEMORY | HCD_USB2,
46+
.flags = HCD_MEMORY | HCD_USB2 | HCD_BH,
4747

4848
/*
4949
* basic lifecycle operations

‎drivers/usb/host/ehci-hcd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1166,7 +1166,7 @@ static const struct hc_driver ehci_hc_driver = {
11661166
* generic hardware linkage
11671167
*/
11681168
.irq = ehci_irq,
1169-
.flags = HCD_MEMORY | HCD_USB2,
1169+
.flags = HCD_MEMORY | HCD_USB2 | HCD_BH,
11701170

11711171
/*
11721172
* basic lifecycle operations

‎drivers/usb/host/ehci-mv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ static const struct hc_driver mv_ehci_hc_driver = {
9696
* generic hardware linkage
9797
*/
9898
.irq = ehci_irq,
99-
.flags = HCD_MEMORY | HCD_USB2,
99+
.flags = HCD_MEMORY | HCD_USB2 | HCD_BH,
100100

101101
/*
102102
* basic lifecycle operations

‎drivers/usb/host/ehci-octeon.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ static const struct hc_driver ehci_octeon_hc_driver = {
5151
* generic hardware linkage
5252
*/
5353
.irq = ehci_irq,
54-
.flags = HCD_MEMORY | HCD_USB2,
54+
.flags = HCD_MEMORY | HCD_USB2 | HCD_BH,
5555

5656
/*
5757
* basic lifecycle operations

‎drivers/usb/host/ehci-pmcmsp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ static const struct hc_driver ehci_msp_hc_driver = {
286286
#else
287287
.irq = ehci_irq,
288288
#endif
289-
.flags = HCD_MEMORY | HCD_USB2,
289+
.flags = HCD_MEMORY | HCD_USB2 | HCD_BH,
290290

291291
/*
292292
* basic lifecycle operations

‎drivers/usb/host/ehci-ppc-of.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ static const struct hc_driver ehci_ppc_of_hc_driver = {
2828
* generic hardware linkage
2929
*/
3030
.irq = ehci_irq,
31-
.flags = HCD_MEMORY | HCD_USB2,
31+
.flags = HCD_MEMORY | HCD_USB2 | HCD_BH,
3232

3333
/*
3434
* basic lifecycle operations

‎drivers/usb/host/ehci-ps3.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ static const struct hc_driver ps3_ehci_hc_driver = {
7171
.product_desc = "PS3 EHCI Host Controller",
7272
.hcd_priv_size = sizeof(struct ehci_hcd),
7373
.irq = ehci_irq,
74-
.flags = HCD_MEMORY | HCD_USB2,
74+
.flags = HCD_MEMORY | HCD_USB2 | HCD_BH,
7575
.reset = ps3_ehci_hc_reset,
7676
.start = ehci_run,
7777
.stop = ehci_stop,

‎drivers/usb/host/ehci-q.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -254,8 +254,6 @@ static int qtd_copy_status (
254254

255255
static void
256256
ehci_urb_done(struct ehci_hcd *ehci, struct urb *urb, int status)
257-
__releases(ehci->lock)
258-
__acquires(ehci->lock)
259257
{
260258
if (usb_pipetype(urb->pipe) == PIPE_INTERRUPT) {
261259
/* ... update hc-wide periodic stats */
@@ -281,11 +279,8 @@ __acquires(ehci->lock)
281279
urb->actual_length, urb->transfer_buffer_length);
282280
#endif
283281

284-
/* complete() can reenter this HCD */
285282
usb_hcd_unlink_urb_from_ep(ehci_to_hcd(ehci), urb);
286-
spin_unlock (&ehci->lock);
287283
usb_hcd_giveback_urb(ehci_to_hcd(ehci), urb, status);
288-
spin_lock (&ehci->lock);
289284
}
290285

291286
static int qh_schedule (struct ehci_hcd *ehci, struct ehci_qh *qh);

‎drivers/usb/host/ehci-sead3.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ const struct hc_driver ehci_sead3_hc_driver = {
5555
* generic hardware linkage
5656
*/
5757
.irq = ehci_irq,
58-
.flags = HCD_MEMORY | HCD_USB2,
58+
.flags = HCD_MEMORY | HCD_USB2 | HCD_BH,
5959

6060
/*
6161
* basic lifecycle operations

‎drivers/usb/host/ehci-sh.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ static const struct hc_driver ehci_sh_hc_driver = {
3636
* generic hardware linkage
3737
*/
3838
.irq = ehci_irq,
39-
.flags = HCD_USB2 | HCD_MEMORY,
39+
.flags = HCD_USB2 | HCD_MEMORY | HCD_BH,
4040

4141
/*
4242
* basic lifecycle operations

‎drivers/usb/host/ehci-tilegx.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ static const struct hc_driver ehci_tilegx_hc_driver = {
6161
* Generic hardware linkage.
6262
*/
6363
.irq = ehci_irq,
64-
.flags = HCD_MEMORY | HCD_USB2,
64+
.flags = HCD_MEMORY | HCD_USB2 | HCD_BH,
6565

6666
/*
6767
* Basic lifecycle operations.

‎drivers/usb/host/ehci-w90x900.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ static const struct hc_driver ehci_w90x900_hc_driver = {
108108
* generic hardware linkage
109109
*/
110110
.irq = ehci_irq,
111-
.flags = HCD_USB2|HCD_MEMORY,
111+
.flags = HCD_USB2|HCD_MEMORY|HCD_BH,
112112

113113
/*
114114
* basic lifecycle operations

‎drivers/usb/host/ehci-xilinx-of.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ static const struct hc_driver ehci_xilinx_of_hc_driver = {
7979
* generic hardware linkage
8080
*/
8181
.irq = ehci_irq,
82-
.flags = HCD_MEMORY | HCD_USB2,
82+
.flags = HCD_MEMORY | HCD_USB2 | HCD_BH,
8383

8484
/*
8585
* basic lifecycle operations

0 commit comments

Comments
 (0)