From nobody Mon Mar 2 12:49:31 2026 X-Original-To: dev-commits-src-branches@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 4fPdzv2vsFz6TNVN for ; Mon, 02 Mar 2026 12:49:31 +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 4fPdzv29mHz3QZM for ; Mon, 02 Mar 2026 12:49:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1772455771; 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=+NEk/pyEERCeh9r2KvFQvTSvmbgTw8lbd5+IETjYgI8=; b=UbVrJu5ovYInvrvkppxvBYGH0400jI3yV+uQHqvNCiTKmIxCq1Fgoj5VLTj25ugYKduoxg yD2qleXhimSWvs6NgqPqiP80hKc/cyTlwIm+8WqCXLkZ4GXSrhC9EuPX6PE/ftckaFK6Lj eNEBFPoz3HWfbN6qLMMolg39i86c0D9WcaLIJT169Iv7rkfOZQlUYm/p6R2RWt94l4Lf5Y O6wDxa6/QSGTYJxr6CaqUBC/EChl5M1mhpe3QB0GTBifuU5xwZukmvuasdoSR2bKgNBmLp 95Pub6WIcR+L9Rxe8T4UZEkUhMiNXRVb5Oky8EH1orraesycTEI85yn5rQpKhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1772455771; a=rsa-sha256; cv=none; b=qWPVOSDj4CQND437rb5vH6M8zWmm6CqnAAvtS803maSs9wqHBPjRt/s9x6VUf7Wn0EVZO2 wLNDSEctZUUPdIXuzHCjOUkpccME49rNfaWEFEtEc/bNobvETOK2jhdpOLsgUdi3Mekcnf tDHzOQSTlH8E4GrQtY5S/nH4GJxf64YZGDyIn1Wx1mCT26BwZUKr437AMSo16UGuqI2U+i ZicFjs0eAGQNA7T0aJDQsDXKwXu22jFL9Motk13iudps0F1RFi5pm0gAKeo5QmE9E8V41/ 46xPM86/fQ81Lo1DMkAfKPAra62SAduFTmooARO0aWTgWI9QW9SwW/pFRIMl6w== 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=1772455771; 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=+NEk/pyEERCeh9r2KvFQvTSvmbgTw8lbd5+IETjYgI8=; b=YLRnGANmqkW0gV4AiYZNBjaWWii2kj9s15chgEEZryhLctpzpxlF/8B567bL0W7xwuQUyE zi2pMEqzs/bT2Day5QX2LxHEv1FZSc000YLm72/GuDyXuCw0hFetmAJxrpU9GuF3OjDnsa gmJqliEOITpxiCFdhaziN3wRjLhL0WdzDriKCq7yPfCHelkP2BHNMzyRGiGpT7A3dS2WF+ wQ2ID/uqo2BPcPiC/R0pot2RySnlP5jV5KwSLJIFILtuPxb0V/Cq8T45axnNelLrc/PMPu mBUiFDs5QdDaWG0hkb2XPQsoHccTdBdSEBj/S6EA/WjJ9DXLthidwUYuJfuQIA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fPdzv1bz4zbT1 for ; Mon, 02 Mar 2026 12:49:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 19d01 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 02 Mar 2026 12:49:31 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: f35cb87a56b0 - stable/15 - libusb: dequeue next transfer on completion to prevent stalls List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/15 X-Git-Reftype: branch X-Git-Commit: f35cb87a56b0fb21dc19546135bd68315ce17714 Auto-Submitted: auto-generated Date: Mon, 02 Mar 2026 12:49:31 +0000 Message-Id: <69a5875b.19d01.3994b2e4@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=f35cb87a56b0fb21dc19546135bd68315ce17714 commit f35cb87a56b0fb21dc19546135bd68315ce17714 Author: Baptiste Daroussin AuthorDate: 2026-02-15 18:07:07 +0000 Commit: Baptiste Daroussin CommitDate: 2026-03-02 12:49:22 +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 e226def0b7b6..b3af017ab980 100644 --- a/lib/libusb/libusb10.c +++ b/lib/libusb/libusb10.c @@ -1259,6 +1259,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) */ @@ -1281,6 +1284,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; } } @@ -1322,11 +1328,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 */ @@ -1353,6 +1363,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; } } @@ -1397,11 +1409,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 */ @@ -1442,6 +1458,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; } }