Linux USB
 help / color / mirror / Atom feed
From: Niklas Neronin <niklas.neronin@linux.intel.com>
To: mathias.nyman@linux.intel.com
Cc: linux-usb@vger.kernel.org,
	Niklas Neronin <niklas.neronin@linux.intel.com>
Subject: [PATCH 2/5] usb: xhci: correct num_active_eps accounting on allocation failure
Date: Tue,  6 Oct 2026 17:24:24 +0200	[thread overview]
Message-ID: <20261006152427.3735383-3-niklas.neronin@linux.intel.com> (raw)
In-Reply-To: <20261006152427.3735383-1-niklas.neronin@linux.intel.com>

Some host controllers have a global endpoint limit across all slots,
tracked by 'xhci->num_active_eps' when XHCI_EP_LIMIT_QUIRK is set.

During device allocation, EP0 resources are reserved before
xhci_alloc_virt_device() is called, and 'num_active_eps' is incremented
accordingly. If xhci_alloc_virt_device() subsequently fails, the slot is
disabled but the reserved endpoint resource is not released, leaving
'num_active_eps' permanently increased.

Decreasing 'num_active_eps' happens in xhci_handle_cmd_disable_slot(),
which is called upon a Disable Slot completion command.

This causes the driver to gradually lose available endpoint resources
after allocation failures and may eventually prevent new endpoints from
being allocated.

Fix this by decrementing 'num_active_eps' when virtual device allocation
fails.

Signed-off-by: Niklas Neronin <niklas.neronin@linux.intel.com>
---
 drivers/usb/host/xhci.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 4708fabba84a..ca56e0b69415 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -4279,6 +4279,11 @@ int xhci_alloc_dev(struct usb_hcd *hcd, struct usb_device *udev)
 	 */
 	if (!xhci_alloc_virt_device(xhci, slot_id, udev, GFP_NOIO)) {
 		xhci_warn(xhci, "Could not allocate xHCI USB device data structures\n");
+		if (xhci->quirks & XHCI_EP_LIMIT_QUIRK) {
+			spin_lock_irqsave(&xhci->lock, flags);
+			xhci->num_active_eps -= 1;
+			spin_unlock_irqrestore(&xhci->lock, flags);
+		}
 		goto disable_slot;
 	}
 	vdev = xhci->devs[slot_id];
-- 
2.50.1


  parent reply	other threads:[~2026-10-06 15:24 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-10-06 15:24 [PATCH 0/5] usb: xhci: bandwidth accounting fixes and cleanup Niklas Neronin
2026-10-06 15:24 ` [PATCH 1/5] usb: xhci: clear stale bandwidth data after hibernation Niklas Neronin
2026-10-06 16:12   ` Michal Pecio
2026-10-06 16:22   ` sashiko-bot
2026-10-06 15:24 ` Niklas Neronin [this message]
2026-10-06 16:29   ` [PATCH 2/5] usb: xhci: correct num_active_eps accounting on allocation failure sashiko-bot
2026-10-06 16:33   ` Michal Pecio
2026-10-06 21:02     ` Michal Pecio
2026-10-07  9:28       ` Neronin, Niklas
2026-10-06 15:24 ` [PATCH 3/5] usb: xhci: remove redundant TT active EP update from xhci_free_virt_device() Niklas Neronin
2026-10-06 16:41   ` sashiko-bot
2026-10-06 15:24 ` [PATCH 4/5] usb: xhci: correct variable size conversion Niklas Neronin
2026-10-06 16:46   ` sashiko-bot
2026-10-06 15:24 ` [PATCH 5/5] usb: xhci: remove unused structs Niklas Neronin
2026-10-06 16:47   ` sashiko-bot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20261006152427.3735383-3-niklas.neronin@linux.intel.com \
    --to=niklas.neronin@linux.intel.com \
    --cc=linux-usb@vger.kernel.org \
    --cc=mathias.nyman@linux.intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox