usbip: vhci: stop printing kernel pointer addresses in messages (8272d099) · Commits · 戴 / test

drivers/usb/usbip/vhci_hcd.c

+0 −10

Original line number	Diff line number	Diff line
		@@ -656,9 +656,6 @@ static int vhci_urb_enqueue(struct usb_hcd hcd, struct urb urb, gfp_t mem_flag
		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;
		@@ -822,8 +819,6 @@ static int vhci_urb_dequeue(struct usb_hcd hcd, struct urb urb, int status)
		struct vhci_device *vdev;
		unsigned long flags;

		pr_info("dequeue a urb %p\n", urb);

		spin_lock_irqsave(&vhci->lock, flags);

		priv = urb->hcpriv;
		@@ -851,7 +846,6 @@ static int vhci_urb_dequeue(struct usb_hcd hcd, struct urb urb, int status)
		/* 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;
		@@ -863,8 +857,6 @@ static int vhci_urb_dequeue(struct usb_hcd hcd, struct urb urb, int status)
		* 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);
		@@ -892,8 +884,6 @@ static int vhci_urb_dequeue(struct usb_hcd hcd, struct urb urb, int status)

		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);

drivers/usb/usbip/vhci_rx.c

+11 −12

Original line number	Diff line number	Diff line
		@@ -23,24 +23,23 @@ struct urb pickup_urb_and_free_priv(struct vhci_device vdev, __u32 seqnum)
		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);
		@@ -67,8 +66,8 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
		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_hcd->seqnum));
		usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
		return;
		@@ -91,7 +90,7 @@ static void vhci_recv_ret_submit(struct vhci_device *vdev,
		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_hcd_to_hcd(vhci_hcd), urb);
		@@ -158,7 +157,7 @@ static void vhci_recv_ret_unlink(struct vhci_device *vdev,
		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;

drivers/usb/usbip/vhci_tx.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -69,7 +69,8 @@ static int vhci_send_cmd_submit(struct vhci_device *vdev)
		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);

Admin message