mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-11-01 17:08:10 +00:00
ea44d19076
There are bugs on vhci with usb 3.0 storage device. In USB, each SG list entry buffer should be divisible by the bulk max packet size. But with native SG support, this problem doesn't matter because the SG buffer is treated as contiguous buffer. But without native SG support, USB storage driver breaks SG list into several URBs and the error occurs because of a buffer size of URB that cannot be divided by the bulk max packet size. The error situation is as follows. When USB Storage driver requests 31.5 KB data and has SG list which has 3584 bytes buffer followed by 7 4096 bytes buffer for some reason. USB Storage driver splits this SG list into several URBs because VHCI doesn't support SG and sends them separately. So the first URB buffer size is 3584 bytes. When receiving data from device, USB 3.0 device sends data packet of 1024 bytes size because the max packet size of BULK pipe is 1024 bytes. So device sends 4096 bytes. But the first URB buffer has only 3584 bytes buffer size. So host controller terminates the transfer even though there is more data to receive. So, vhci needs to support SG transfer to prevent this error. In this patch, vhci supports SG regardless of whether the server's host controller supports SG or not, because stub driver splits SG list into several URBs if the server's host controller doesn't support SG. To support SG, vhci sets URB_DMA_MAP_SG flag in urb->transfer_flags if URB has SG list and this flag will tell stub driver to use SG list. After receiving urb from stub driver, vhci clear URB_DMA_MAP_SG flag to avoid unnecessary DMA unmapping in HCD. vhci sends each SG list entry to stub driver. Then, stub driver sees the total length of the buffer and allocates SG table and pages according to the total buffer length calling sgl_alloc(). After stub driver receives completed URB, it again sends each SG list entry to vhci. If the server's host controller doesn't support SG, stub driver breaks a single SG request into several URBs and submits them to the server's host controller. When all the split URBs are completed, stub driver reassembles the URBs into a single return command and sends it to vhci. Moreover, in the situation where vhci supports SG, but stub driver does not, or vice versa, usbip works normally. Because there is no protocol modification, there is no problem in communication between server and client even if the one has a kernel without SG support. In the case of vhci supports SG and stub driver doesn't, because vhci sends only the total length of the buffer to stub driver as it did before the patch applied, stub driver only needs to allocate the required length of buffers using only kmalloc() regardless of whether vhci supports SG or not. But stub driver has to allocate buffer with kmalloc() as much as the total length of SG buffer which is quite huge when vhci sends SG request, so it has overhead in buffer allocation in this situation. If stub driver needs to send data buffer to vhci because of IN pipe, stub driver also sends only total length of buffer as metadata and then sends real data as vhci does. Then vhci receive data from stub driver and store it to the corresponding buffer of SG list entry. And for the case of stub driver supports SG and vhci doesn't, since the USB storage driver checks that vhci doesn't support SG and sends the request to stub driver by splitting the SG list into multiple URBs, stub driver allocates a buffer for each URB with kmalloc() as it did before this patch. * Test environment Test uses two difference machines and two different kernel version to make mismatch situation between the client and the server where vhci supports SG, but stub driver does not, or vice versa. All tests are conducted in both full SG support that both vhci and stub support SG and half SG support that is the mismatch situation. Test kernel version is 5.3-rc6 with commit "usb: add a HCD_DMA flag instead of guestimating DMA capabilities" to avoid unnecessary DMA mapping and unmapping. - Test kernel version - 5.3-rc6 with SG support - 5.1.20-200.fc29.x86_64 without SG support * SG support test - Test devices - Super-speed storage device - SanDisk Ultra USB 3.0 - High-speed storage device - SMI corporation USB 2.0 flash drive - Test description Test read and write operation of mass storage device that uses the BULK transfer. In test, the client reads and writes files whose size is over 1G and it works normally. * Regression test - Test devices - Super-speed device - Logitech Brio webcam - High-speed device - Logitech C920 HD Pro webcam - Full-speed device - Logitech bluetooth mouse - Britz BR-Orion speaker - Low-speed device - Logitech wired mouse - Test description Moving and click test for mouse. To test the webcam, use gnome-cheese. To test the speaker, play music and video on the client. All works normally. * VUDC compatibility test VUDC also works well with this patch. Tests are done with two USB gadget created by CONFIGFS USB gadget. Both use the BULK pipe. 1. Serial gadget 2. Mass storage gadget - Serial gadget test Serial gadget on the host sends and receives data using cat command on the /dev/ttyGS<N>. The client uses minicom to communicate with the serial gadget. - Mass storage gadget test After connecting the gadget with vhci, use "dd" to test read and write operation on the client side. Read - dd if=/dev/sd<N> iflag=direct of=/dev/null bs=1G count=1 Write - dd if=<my file path> iflag=direct of=/dev/sd<N> bs=1G count=1 Signed-off-by: Suwan Kim <suwan.kim027@gmail.com> Acked-by: Shuah khan <skhan@linuxfoundation.org> Link: https://lore.kernel.org/r/20190828032741.12234-1-suwan.kim027@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
263 lines
6 KiB
C
263 lines
6 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* Copyright (C) 2003-2008 Takahiro Hirofuchi
|
|
*/
|
|
|
|
#include <linux/kthread.h>
|
|
#include <linux/slab.h>
|
|
|
|
#include "usbip_common.h"
|
|
#include "vhci.h"
|
|
|
|
/* get URB from transmitted urb queue. caller must hold vdev->priv_lock */
|
|
struct urb *pickup_urb_and_free_priv(struct vhci_device *vdev, __u32 seqnum)
|
|
{
|
|
struct vhci_priv *priv, *tmp;
|
|
struct urb *urb = NULL;
|
|
int status;
|
|
|
|
list_for_each_entry_safe(priv, tmp, &vdev->priv_rx, list) {
|
|
if (priv->seqnum != seqnum)
|
|
continue;
|
|
|
|
urb = priv->urb;
|
|
status = urb->status;
|
|
|
|
usbip_dbg_vhci_rx("find urb seqnum %u\n", seqnum);
|
|
|
|
switch (status) {
|
|
case -ENOENT:
|
|
/* fall through */
|
|
case -ECONNRESET:
|
|
dev_dbg(&urb->dev->dev,
|
|
"urb seq# %u was unlinked %ssynchronously\n",
|
|
seqnum, status == -ENOENT ? "" : "a");
|
|
break;
|
|
case -EINPROGRESS:
|
|
/* no info output */
|
|
break;
|
|
default:
|
|
dev_dbg(&urb->dev->dev,
|
|
"urb seq# %u may be in a error, status %d\n",
|
|
seqnum, status);
|
|
}
|
|
|
|
list_del(&priv->list);
|
|
kfree(priv);
|
|
urb->hcpriv = NULL;
|
|
|
|
break;
|
|
}
|
|
|
|
return urb;
|
|
}
|
|
|
|
static void vhci_recv_ret_submit(struct vhci_device *vdev,
|
|
struct usbip_header *pdu)
|
|
{
|
|
struct vhci_hcd *vhci_hcd = vdev_to_vhci_hcd(vdev);
|
|
struct vhci *vhci = vhci_hcd->vhci;
|
|
struct usbip_device *ud = &vdev->ud;
|
|
struct urb *urb;
|
|
unsigned long flags;
|
|
|
|
spin_lock_irqsave(&vdev->priv_lock, flags);
|
|
urb = pickup_urb_and_free_priv(vdev, pdu->base.seqnum);
|
|
spin_unlock_irqrestore(&vdev->priv_lock, flags);
|
|
|
|
if (!urb) {
|
|
pr_err("cannot find a urb of seqnum %u max seqnum %d\n",
|
|
pdu->base.seqnum,
|
|
atomic_read(&vhci_hcd->seqnum));
|
|
usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
|
|
return;
|
|
}
|
|
|
|
/* unpack the pdu to a urb */
|
|
usbip_pack_pdu(pdu, urb, USBIP_RET_SUBMIT, 0);
|
|
|
|
/* recv transfer buffer */
|
|
if (usbip_recv_xbuff(ud, urb) < 0)
|
|
return;
|
|
|
|
/* recv iso_packet_descriptor */
|
|
if (usbip_recv_iso(ud, urb) < 0)
|
|
return;
|
|
|
|
/* restore the padding in iso packets */
|
|
usbip_pad_iso(ud, urb);
|
|
|
|
if (usbip_dbg_flag_vhci_rx)
|
|
usbip_dump_urb(urb);
|
|
|
|
if (urb->num_sgs)
|
|
urb->transfer_flags &= ~URB_DMA_MAP_SG;
|
|
|
|
usbip_dbg_vhci_rx("now giveback urb %u\n", pdu->base.seqnum);
|
|
|
|
spin_lock_irqsave(&vhci->lock, flags);
|
|
usb_hcd_unlink_urb_from_ep(vhci_hcd_to_hcd(vhci_hcd), urb);
|
|
spin_unlock_irqrestore(&vhci->lock, flags);
|
|
|
|
usb_hcd_giveback_urb(vhci_hcd_to_hcd(vhci_hcd), urb, urb->status);
|
|
|
|
usbip_dbg_vhci_rx("Leave\n");
|
|
}
|
|
|
|
static struct vhci_unlink *dequeue_pending_unlink(struct vhci_device *vdev,
|
|
struct usbip_header *pdu)
|
|
{
|
|
struct vhci_unlink *unlink, *tmp;
|
|
unsigned long flags;
|
|
|
|
spin_lock_irqsave(&vdev->priv_lock, flags);
|
|
|
|
list_for_each_entry_safe(unlink, tmp, &vdev->unlink_rx, list) {
|
|
pr_info("unlink->seqnum %lu\n", unlink->seqnum);
|
|
if (unlink->seqnum == pdu->base.seqnum) {
|
|
usbip_dbg_vhci_rx("found pending unlink, %lu\n",
|
|
unlink->seqnum);
|
|
list_del(&unlink->list);
|
|
|
|
spin_unlock_irqrestore(&vdev->priv_lock, flags);
|
|
return unlink;
|
|
}
|
|
}
|
|
|
|
spin_unlock_irqrestore(&vdev->priv_lock, flags);
|
|
|
|
return NULL;
|
|
}
|
|
|
|
static void vhci_recv_ret_unlink(struct vhci_device *vdev,
|
|
struct usbip_header *pdu)
|
|
{
|
|
struct vhci_hcd *vhci_hcd = vdev_to_vhci_hcd(vdev);
|
|
struct vhci *vhci = vhci_hcd->vhci;
|
|
struct vhci_unlink *unlink;
|
|
struct urb *urb;
|
|
unsigned long flags;
|
|
|
|
usbip_dump_header(pdu);
|
|
|
|
unlink = dequeue_pending_unlink(vdev, pdu);
|
|
if (!unlink) {
|
|
pr_info("cannot find the pending unlink %u\n",
|
|
pdu->base.seqnum);
|
|
return;
|
|
}
|
|
|
|
spin_lock_irqsave(&vdev->priv_lock, flags);
|
|
urb = pickup_urb_and_free_priv(vdev, unlink->unlink_seqnum);
|
|
spin_unlock_irqrestore(&vdev->priv_lock, flags);
|
|
|
|
if (!urb) {
|
|
/*
|
|
* I get the result of a unlink request. But, it seems that I
|
|
* already received the result of its submit result and gave
|
|
* back the URB.
|
|
*/
|
|
pr_info("the urb (seqnum %d) was already given back\n",
|
|
pdu->base.seqnum);
|
|
} else {
|
|
usbip_dbg_vhci_rx("now giveback urb %d\n", pdu->base.seqnum);
|
|
|
|
/* If unlink is successful, status is -ECONNRESET */
|
|
urb->status = pdu->u.ret_unlink.status;
|
|
pr_info("urb->status %d\n", urb->status);
|
|
|
|
spin_lock_irqsave(&vhci->lock, flags);
|
|
usb_hcd_unlink_urb_from_ep(vhci_hcd_to_hcd(vhci_hcd), urb);
|
|
spin_unlock_irqrestore(&vhci->lock, flags);
|
|
|
|
usb_hcd_giveback_urb(vhci_hcd_to_hcd(vhci_hcd), urb, urb->status);
|
|
}
|
|
|
|
kfree(unlink);
|
|
}
|
|
|
|
static int vhci_priv_tx_empty(struct vhci_device *vdev)
|
|
{
|
|
int empty = 0;
|
|
unsigned long flags;
|
|
|
|
spin_lock_irqsave(&vdev->priv_lock, flags);
|
|
empty = list_empty(&vdev->priv_rx);
|
|
spin_unlock_irqrestore(&vdev->priv_lock, flags);
|
|
|
|
return empty;
|
|
}
|
|
|
|
/* recv a pdu */
|
|
static void vhci_rx_pdu(struct usbip_device *ud)
|
|
{
|
|
int ret;
|
|
struct usbip_header pdu;
|
|
struct vhci_device *vdev = container_of(ud, struct vhci_device, ud);
|
|
|
|
usbip_dbg_vhci_rx("Enter\n");
|
|
|
|
memset(&pdu, 0, sizeof(pdu));
|
|
|
|
/* receive a pdu header */
|
|
ret = usbip_recv(ud->tcp_socket, &pdu, sizeof(pdu));
|
|
if (ret < 0) {
|
|
if (ret == -ECONNRESET)
|
|
pr_info("connection reset by peer\n");
|
|
else if (ret == -EAGAIN) {
|
|
/* ignore if connection was idle */
|
|
if (vhci_priv_tx_empty(vdev))
|
|
return;
|
|
pr_info("connection timed out with pending urbs\n");
|
|
} else if (ret != -ERESTARTSYS)
|
|
pr_info("xmit failed %d\n", ret);
|
|
|
|
usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
|
|
return;
|
|
}
|
|
if (ret == 0) {
|
|
pr_info("connection closed");
|
|
usbip_event_add(ud, VDEV_EVENT_DOWN);
|
|
return;
|
|
}
|
|
if (ret != sizeof(pdu)) {
|
|
pr_err("received pdu size is %d, should be %d\n", ret,
|
|
(unsigned int)sizeof(pdu));
|
|
usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
|
|
return;
|
|
}
|
|
|
|
usbip_header_correct_endian(&pdu, 0);
|
|
|
|
if (usbip_dbg_flag_vhci_rx)
|
|
usbip_dump_header(&pdu);
|
|
|
|
switch (pdu.base.command) {
|
|
case USBIP_RET_SUBMIT:
|
|
vhci_recv_ret_submit(vdev, &pdu);
|
|
break;
|
|
case USBIP_RET_UNLINK:
|
|
vhci_recv_ret_unlink(vdev, &pdu);
|
|
break;
|
|
default:
|
|
/* NOT REACHED */
|
|
pr_err("unknown pdu %u\n", pdu.base.command);
|
|
usbip_dump_header(&pdu);
|
|
usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
|
|
break;
|
|
}
|
|
}
|
|
|
|
int vhci_rx_loop(void *data)
|
|
{
|
|
struct usbip_device *ud = data;
|
|
|
|
while (!kthread_should_stop()) {
|
|
if (usbip_event_happened(ud))
|
|
break;
|
|
|
|
vhci_rx_pdu(ud);
|
|
}
|
|
|
|
return 0;
|
|
}
|