| From 8272d099d05f7ab2776cf56a2ab9f9443be18907 Mon Sep 17 00:00:00 2001 |
| From: Shuah Khan <shuahkh@osg.samsung.com> |
| Date: Mon, 18 Dec 2017 17:24:22 -0700 |
| Subject: usbip: vhci: stop printing kernel pointer addresses in messages |
| |
| From: Shuah Khan <shuahkh@osg.samsung.com> |
| |
| commit 8272d099d05f7ab2776cf56a2ab9f9443be18907 upstream. |
| |
| Remove and/or change debug, info. and error messages to not print |
| kernel pointer addresses. |
| |
| Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/usb/usbip/vhci_hcd.c | 10 ---------- |
| drivers/usb/usbip/vhci_rx.c | 23 +++++++++++------------ |
| drivers/usb/usbip/vhci_tx.c | 3 ++- |
| 3 files changed, 13 insertions(+), 23 deletions(-) |
| |
| --- a/drivers/usb/usbip/vhci_hcd.c |
| +++ b/drivers/usb/usbip/vhci_hcd.c |
| @@ -506,9 +506,6 @@ static int vhci_urb_enqueue(struct usb_h |
| struct vhci_device *vdev; |
| unsigned long flags; |
| |
| - usbip_dbg_vhci_hc("enter, usb_hcd %p urb %p mem_flags %d\n", |
| - hcd, urb, mem_flags); |
| - |
| if (portnum > VHCI_HC_PORTS) { |
| pr_err("invalid port number %d\n", portnum); |
| return -ENODEV; |
| @@ -671,8 +668,6 @@ static int vhci_urb_dequeue(struct usb_h |
| struct vhci_device *vdev; |
| unsigned long flags; |
| |
| - pr_info("dequeue a urb %p\n", urb); |
| - |
| spin_lock_irqsave(&vhci->lock, flags); |
| |
| priv = urb->hcpriv; |
| @@ -700,7 +695,6 @@ static int vhci_urb_dequeue(struct usb_h |
| /* tcp connection is closed */ |
| spin_lock(&vdev->priv_lock); |
| |
| - pr_info("device %p seems to be disconnected\n", vdev); |
| list_del(&priv->list); |
| kfree(priv); |
| urb->hcpriv = NULL; |
| @@ -712,8 +706,6 @@ static int vhci_urb_dequeue(struct usb_h |
| * vhci_rx will receive RET_UNLINK and give back the URB. |
| * Otherwise, we give back it here. |
| */ |
| - pr_info("gives back urb %p\n", urb); |
| - |
| usb_hcd_unlink_urb_from_ep(hcd, urb); |
| |
| spin_unlock_irqrestore(&vhci->lock, flags); |
| @@ -741,8 +733,6 @@ static int vhci_urb_dequeue(struct usb_h |
| |
| unlink->unlink_seqnum = priv->seqnum; |
| |
| - pr_info("device %p seems to be still connected\n", vdev); |
| - |
| /* send cmd_unlink and try to cancel the pending URB in the |
| * peer */ |
| list_add_tail(&unlink->list, &vdev->unlink_tx); |
| --- a/drivers/usb/usbip/vhci_rx.c |
| +++ b/drivers/usb/usbip/vhci_rx.c |
| @@ -37,24 +37,23 @@ struct urb *pickup_urb_and_free_priv(str |
| urb = priv->urb; |
| status = urb->status; |
| |
| - usbip_dbg_vhci_rx("find urb %p vurb %p seqnum %u\n", |
| - urb, priv, seqnum); |
| + usbip_dbg_vhci_rx("find urb seqnum %u\n", seqnum); |
| |
| switch (status) { |
| case -ENOENT: |
| /* fall through */ |
| case -ECONNRESET: |
| - dev_info(&urb->dev->dev, |
| - "urb %p was unlinked %ssynchronuously.\n", urb, |
| - status == -ENOENT ? "" : "a"); |
| + dev_dbg(&urb->dev->dev, |
| + "urb seq# %u was unlinked %ssynchronuously\n", |
| + seqnum, status == -ENOENT ? "" : "a"); |
| break; |
| case -EINPROGRESS: |
| /* no info output */ |
| break; |
| default: |
| - dev_info(&urb->dev->dev, |
| - "urb %p may be in a error, status %d\n", urb, |
| - status); |
| + dev_dbg(&urb->dev->dev, |
| + "urb seq# %u may be in a error, status %d\n", |
| + seqnum, status); |
| } |
| |
| list_del(&priv->list); |
| @@ -80,8 +79,8 @@ static void vhci_recv_ret_submit(struct |
| spin_unlock_irqrestore(&vdev->priv_lock, flags); |
| |
| if (!urb) { |
| - pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum); |
| - pr_info("max seqnum %d\n", |
| + pr_err("cannot find a urb of seqnum %u max seqnum %d\n", |
| + pdu->base.seqnum, |
| atomic_read(&vhci->seqnum)); |
| usbip_event_add(ud, VDEV_EVENT_ERROR_TCP); |
| return; |
| @@ -104,7 +103,7 @@ static void vhci_recv_ret_submit(struct |
| if (usbip_dbg_flag_vhci_rx) |
| usbip_dump_urb(urb); |
| |
| - usbip_dbg_vhci_rx("now giveback urb %p\n", urb); |
| + 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_to_hcd(vhci), urb); |
| @@ -170,7 +169,7 @@ static void vhci_recv_ret_unlink(struct |
| pr_info("the urb (seqnum %d) was already given back\n", |
| pdu->base.seqnum); |
| } else { |
| - usbip_dbg_vhci_rx("now giveback urb %p\n", urb); |
| + 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; |
| --- a/drivers/usb/usbip/vhci_tx.c |
| +++ b/drivers/usb/usbip/vhci_tx.c |
| @@ -83,7 +83,8 @@ static int vhci_send_cmd_submit(struct v |
| memset(&msg, 0, sizeof(msg)); |
| memset(&iov, 0, sizeof(iov)); |
| |
| - usbip_dbg_vhci_tx("setup txdata urb %p\n", urb); |
| + usbip_dbg_vhci_tx("setup txdata urb seqnum %lu\n", |
| + priv->seqnum); |
| |
| /* 1. setup usbip_header */ |
| setup_cmd_submit_pdu(&pdu_header, urb); |