|
 |
d4cdad5 |
From cc5740ae8aa68dbbdc690f694b0e55d70f9c49ee Mon Sep 17 00:00:00 2001
|
|
|
d4cdad5 |
From: Hans de Goede <hdegoede@redhat.com>
|
|
|
d4cdad5 |
Date: Mon, 19 Dec 2011 13:42:40 +0100
|
|
|
d4cdad5 |
Subject: [PATCH 102/118] usb-redir: Dynamically adjust iso buffering size
|
|
|
d4cdad5 |
based on ep interval
|
|
|
d4cdad5 |
|
|
|
d4cdad5 |
Note the bufpq_target_size id stored in the endpoint info struct,
|
|
|
d4cdad5 |
even though it only used once. This is done because it will be
|
|
|
d4cdad5 |
referenced from other code in a follow up patch.
|
|
|
d4cdad5 |
|
|
|
d4cdad5 |
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
|
|
d4cdad5 |
---
|
|
|
d4cdad5 |
usb-redir.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++-----
|
|
|
d4cdad5 |
1 files changed, 47 insertions(+), 5 deletions(-)
|
|
|
d4cdad5 |
|
|
|
d4cdad5 |
diff --git a/usb-redir.c b/usb-redir.c
|
|
|
d4cdad5 |
index 7678f1a..ab2c8fa 100644
|
|
|
d4cdad5 |
--- a/usb-redir.c
|
|
|
d4cdad5 |
+++ b/usb-redir.c
|
|
|
d4cdad5 |
@@ -61,6 +61,7 @@ struct endp_data {
|
|
|
d4cdad5 |
uint8_t interrupt_started;
|
|
|
d4cdad5 |
uint8_t interrupt_error;
|
|
|
d4cdad5 |
QTAILQ_HEAD(, buf_packet) bufpq;
|
|
|
d4cdad5 |
+ int bufpq_target_size;
|
|
|
d4cdad5 |
};
|
|
|
d4cdad5 |
|
|
|
d4cdad5 |
struct USBRedirDevice {
|
|
|
d4cdad5 |
@@ -332,15 +333,41 @@ static int usbredir_handle_iso_data(USBRedirDevice *dev, USBPacket *p,
|
|
|
d4cdad5 |
uint8_t ep)
|
|
|
d4cdad5 |
{
|
|
|
d4cdad5 |
int status, len;
|
|
|
d4cdad5 |
-
|
|
|
d4cdad5 |
if (!dev->endpoint[EP2I(ep)].iso_started &&
|
|
|
d4cdad5 |
!dev->endpoint[EP2I(ep)].iso_error) {
|
|
|
d4cdad5 |
struct usb_redir_start_iso_stream_header start_iso = {
|
|
|
d4cdad5 |
.endpoint = ep,
|
|
|
d4cdad5 |
- /* TODO maybe do something with these depending on ep interval? */
|
|
|
d4cdad5 |
- .pkts_per_urb = 32,
|
|
|
d4cdad5 |
- .no_urbs = 3,
|
|
|
d4cdad5 |
};
|
|
|
d4cdad5 |
+ int pkts_per_sec;
|
|
|
d4cdad5 |
+
|
|
|
d4cdad5 |
+ if (dev->dev.speed == USB_SPEED_HIGH)
|
|
|
d4cdad5 |
+ pkts_per_sec = 8000 / dev->endpoint[EP2I(ep)].interval;
|
|
|
d4cdad5 |
+ else
|
|
|
d4cdad5 |
+ pkts_per_sec = 1000 / dev->endpoint[EP2I(ep)].interval;
|
|
|
d4cdad5 |
+ /* Testing has shown that we need circa 60 ms buffer */
|
|
|
d4cdad5 |
+ dev->endpoint[EP2I(ep)].bufpq_target_size = (pkts_per_sec * 60) / 1000;
|
|
|
d4cdad5 |
+
|
|
|
d4cdad5 |
+ /* Aim for approx 100 interrupts / second on the client to
|
|
|
d4cdad5 |
+ balance latency and interrupt load */
|
|
|
d4cdad5 |
+ start_iso.pkts_per_urb = pkts_per_sec / 100;
|
|
|
d4cdad5 |
+ if (start_iso.pkts_per_urb < 1) {
|
|
|
d4cdad5 |
+ start_iso.pkts_per_urb = 1;
|
|
|
d4cdad5 |
+ } else if (start_iso.pkts_per_urb > 32) {
|
|
|
d4cdad5 |
+ start_iso.pkts_per_urb = 32;
|
|
|
d4cdad5 |
+ }
|
|
|
d4cdad5 |
+
|
|
|
d4cdad5 |
+ start_iso.no_urbs = (dev->endpoint[EP2I(ep)].bufpq_target_size +
|
|
|
d4cdad5 |
+ start_iso.pkts_per_urb - 1) /
|
|
|
d4cdad5 |
+ start_iso.pkts_per_urb;
|
|
|
d4cdad5 |
+ /* Output endpoints pre-fill only 1/2 of the packets, keeping the rest
|
|
|
d4cdad5 |
+ as overflow buffer. Also see the usbredir protocol documentation */
|
|
|
d4cdad5 |
+ if (!(ep & USB_DIR_IN)) {
|
|
|
d4cdad5 |
+ start_iso.no_urbs *= 2;
|
|
|
d4cdad5 |
+ }
|
|
|
d4cdad5 |
+ if (start_iso.no_urbs > 16) {
|
|
|
d4cdad5 |
+ start_iso.no_urbs = 16;
|
|
|
d4cdad5 |
+ }
|
|
|
d4cdad5 |
+
|
|
|
d4cdad5 |
/* No id, we look at the ep when receiving a status back */
|
|
|
d4cdad5 |
usbredirparser_send_start_iso_stream(dev->parser, 0, &start_iso);
|
|
|
d4cdad5 |
usbredirparser_do_write(dev->parser);
|
|
|
d4cdad5 |
@@ -961,9 +988,24 @@ static void usbredir_ep_info(void *priv,
|
|
|
d4cdad5 |
dev->endpoint[i].type = ep_info->type[i];
|
|
|
d4cdad5 |
dev->endpoint[i].interval = ep_info->interval[i];
|
|
|
d4cdad5 |
dev->endpoint[i].interface = ep_info->interface[i];
|
|
|
d4cdad5 |
- if (dev->endpoint[i].type != usb_redir_type_invalid) {
|
|
|
d4cdad5 |
+ switch (dev->endpoint[i].type) {
|
|
|
d4cdad5 |
+ case usb_redir_type_invalid:
|
|
|
d4cdad5 |
+ break;
|
|
|
d4cdad5 |
+ case usb_redir_type_iso:
|
|
|
d4cdad5 |
+ case usb_redir_type_interrupt:
|
|
|
d4cdad5 |
+ if (dev->endpoint[i].interval == 0) {
|
|
|
d4cdad5 |
+ ERROR("Received 0 interval for isoc or irq endpoint\n");
|
|
|
d4cdad5 |
+ usbredir_device_disconnect(dev);
|
|
|
d4cdad5 |
+ }
|
|
|
d4cdad5 |
+ /* Fall through */
|
|
|
d4cdad5 |
+ case usb_redir_type_control:
|
|
|
d4cdad5 |
+ case usb_redir_type_bulk:
|
|
|
d4cdad5 |
DPRINTF("ep: %02X type: %d interface: %d\n", I2EP(i),
|
|
|
d4cdad5 |
dev->endpoint[i].type, dev->endpoint[i].interface);
|
|
|
d4cdad5 |
+ break;
|
|
|
d4cdad5 |
+ default:
|
|
|
d4cdad5 |
+ ERROR("Received invalid endpoint type\n");
|
|
|
d4cdad5 |
+ usbredir_device_disconnect(dev);
|
|
|
d4cdad5 |
}
|
|
|
d4cdad5 |
}
|
|
|
d4cdad5 |
}
|
|
|
d4cdad5 |
--
|
|
|
d4cdad5 |
1.7.7.5
|
|
|
d4cdad5 |
|