From nobody Mon Mar 2 12:49:36 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fPf004SL6z6TNSt for ; Mon, 02 Mar 2026 12:49:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fPf003SWmz3Qc9 for ; Mon, 02 Mar 2026 12:49:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772455776; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yyKZp0xJoYsO1CAr/pNxnzxeUBNlsxIAPGv/5RffEok=; b=nCr+zgQyx00coYEXZAGzmFzaOxNeFTQOLdkZCKWX/mvqo7Sych650/a65PQp+S+h2jQy+q wZ312TYyFTmsm2+HCKk9ZcjZROcZMDWi13yOz2jnVC6R9Hz+zEdte+/Q2i+7aZtkSrDRzc 4w1qs2wa9vWK4DU+LiG+IZ5HTCEV8jeCFThkw6hJxQzGtrPtDU9pt0627kROkYeakzyACA 9wZGNhErQ88fDetDlLdv3rJNdaUDGYKo08+RwwuZqUn2H2n72sqRjhNVDsSyyU5WL6WCLh k1mqN2wEwfuFwNBY4kG7AiQYOHzPGxrmnUJtNBKPn++ZliBDIHlFcLiUzp+ygg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772455776; a=rsa-sha256; cv=none; b=pd+WOj2kzRD5GI3AUxROtkK6QKT6pDx0z53bjDseJ22UqK268RmOHs9orq9VqY2CEIE7+6 w4XdxHFmkur9I2tYOGForFszKGIU0iRVRrsRWrNJeLHkuMzyPxO9zW+uTj/YKNqff2xZr+ JSWZ6z5kvBPTVdchqXeahv9urY9oEF6F15fNtdBlUPI78EnPg00sEu5/eYc8uwF9rEfl4M odh+4jebCn6NHmLervnWXwCsVadnTnQhk/bxZvi1S1/lhXAG+Js+alAqKz2NNnm1ne7/7o L/tmARBhRvuAblf2gkQpYytl/B+ItbNH7ty6gk00YT6sO6HjwByGaPqk1YLoUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772455776; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yyKZp0xJoYsO1CAr/pNxnzxeUBNlsxIAPGv/5RffEok=; b=kWJTkRnAW5Lxsr+QhZN3XgXIVZ456OxqgzIu8R3DAGFybUsdxLV0W37Thg67VyRoAv2M7s arTAB8fqrtP5MsYmJhZthebbNU1WIWcItwZvB6ms1isJt9sC+u23zRoxh0b0nv4/2yE6q7 3Sm1CKr4baZz0mV61aNR25bMOwVpUS1g0ecvwF/FBI6BvaVIDWnt7EpWdMM5y1FqIdybxc cB93kqbFrmAfuABYpFXB9DVK9ifHP6mft4xjrRgyOhVTpkrHLsVgLcGVCqKkGCOqc2s47o 9JvWVIkZdIo+MWbCe9g/d618rygxbqub1EnsEhhtGLHTeU0uGkNvGER4WMpC2Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fPf002khMzbql for ; Mon, 02 Mar 2026 12:49:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19510 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Mar 2026 12:49:36 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: e0e1e9e08309 - stable/14 - libusb: dequeue next transfer on completion to prevent stalls List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e0e1e9e083097383bcebf0b6cf65af46653e2f73 Auto-Submitted: auto-generated Date: Mon, 02 Mar 2026 12:49:36 +0000 Message-Id: <69a58760.19510.64fba154@gitrepo.freebsd.org> The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=e0e1e9e083097383bcebf0b6cf65af46653e2f73 commit e0e1e9e083097383bcebf0b6cf65af46653e2f73 Author: Baptiste Daroussin AuthorDate: 2026-02-15 18:07:07 +0000 Commit: Baptiste Daroussin CommitDate: 2026-03-02 12:49:01 +0000 libusb: dequeue next transfer on completion to prevent stalls The transfer proxy callbacks (bulk/interrupt, control, isochronous) only called libusb10_submit_transfer_sub() in the START path to pipeline the second kernel transfer slot. On completion or error, no attempt was made to dequeue the next pending transfer from tr_head onto the now-free slot. When more than two async transfers were submitted on the same endpoint, the third (and subsequent) transfers would remain stuck on tr_head indefinitely, since no completion ever triggered their submission. This caused a protocol-level deadlock in applications like adb that submit header + payload + zero-length terminator as three separate bulk transfers in sequence. Fix by calling libusb10_submit_transfer_sub() after every libusb10_complete_transfer() in all three proxy callbacks. MFC After: 2 weeks Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D55289 (cherry picked from commit 38c18332642500fdfe075a82f88e033f6673a53f) --- lib/libusb/libusb10.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/lib/libusb/libusb10.c b/lib/libusb/libusb10.c index f8912b5c47cb..2d55a2852c67 100644 --- a/lib/libusb/libusb10.c +++ b/lib/libusb/libusb10.c @@ -1171,6 +1171,9 @@ libusb10_isoc_proxy(struct libusb20_transfer *pxfer) libusb20_tr_get_length(pxfer, i); } libusb10_complete_transfer(pxfer, sxfer, LIBUSB_TRANSFER_COMPLETED); + + /* start next queued transfer, if any */ + libusb10_submit_transfer_sub(libusb20_tr_get_priv_sc0(pxfer), uxfer->endpoint); break; case LIBUSB20_TRANSFER_START: /* setup length(s) */ @@ -1193,6 +1196,9 @@ libusb10_isoc_proxy(struct libusb20_transfer *pxfer) break; default: libusb10_complete_transfer(pxfer, sxfer, libusb10_convert_error(status)); + + /* start next queued transfer, if any */ + libusb10_submit_transfer_sub(libusb20_tr_get_priv_sc0(pxfer), uxfer->endpoint); break; } } @@ -1234,11 +1240,15 @@ libusb10_bulk_intr_proxy(struct libusb20_transfer *pxfer) } else { libusb10_complete_transfer(pxfer, sxfer, LIBUSB_TRANSFER_COMPLETED); } + /* start next queued transfer, if any */ + libusb10_submit_transfer_sub(libusb20_tr_get_priv_sc0(pxfer), uxfer->endpoint); break; } /* check for end of data */ if (sxfer->rem_len == 0) { libusb10_complete_transfer(pxfer, sxfer, LIBUSB_TRANSFER_COMPLETED); + /* start next queued transfer, if any */ + libusb10_submit_transfer_sub(libusb20_tr_get_priv_sc0(pxfer), uxfer->endpoint); break; } /* FALLTHROUGH */ @@ -1265,6 +1275,8 @@ libusb10_bulk_intr_proxy(struct libusb20_transfer *pxfer) default: libusb10_complete_transfer(pxfer, sxfer, libusb10_convert_error(status)); + /* start next queued transfer, if any */ + libusb10_submit_transfer_sub(libusb20_tr_get_priv_sc0(pxfer), uxfer->endpoint); break; } } @@ -1309,11 +1321,15 @@ libusb10_ctrl_proxy(struct libusb20_transfer *pxfer) } else { libusb10_complete_transfer(pxfer, sxfer, LIBUSB_TRANSFER_COMPLETED); } + /* start next queued transfer, if any */ + libusb10_submit_transfer_sub(libusb20_tr_get_priv_sc0(pxfer), uxfer->endpoint); break; } /* check for end of data */ if (sxfer->rem_len == 0) { libusb10_complete_transfer(pxfer, sxfer, LIBUSB_TRANSFER_COMPLETED); + /* start next queued transfer, if any */ + libusb10_submit_transfer_sub(libusb20_tr_get_priv_sc0(pxfer), uxfer->endpoint); break; } /* FALLTHROUGH */ @@ -1354,6 +1370,8 @@ libusb10_ctrl_proxy(struct libusb20_transfer *pxfer) default: libusb10_complete_transfer(pxfer, sxfer, libusb10_convert_error(status)); + /* start next queued transfer, if any */ + libusb10_submit_transfer_sub(libusb20_tr_get_priv_sc0(pxfer), uxfer->endpoint); break; } }