From nobody Sat Sep 27 10:26:52 2025 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 4cYkCK0rM0z697fY; Sat, 27 Sep 2025 10:26:53 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cYkCJ7347z3V5W; Sat, 27 Sep 2025 10:26:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758968813; 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=3MnA27Nh2KViSKPmLdRQu5LRG7tuLAmSU3gX8mTvny4=; b=thEwvjoxw2gagEBSDkL5EmtPTfywqapQ/+v6p6HRInNaRasUtqp3iBoSB/vdJhJLEcCxLd leSEvIxH9Wg/ViruFwDzeCEpDeK4O3LTIPjqFgmeobHIhzG6kP4vdlcIzcywCuwGhEECDs 0IQj7BBGZ+OXcrz2dCcqF7LEN9KYZq2sX8du3VectAywTOdziNszN98D/GC601s32I8M1B O8xMjbsnByaHL6LZC0dyePC6NRwVbxNQLdqkK+nyiDcm0kn26Xto3lergdY5LlYDvbQEUR Ptu3Rvz8ENhRNIS1FE7pPceN6wjdbu3bc8HYoQvL+QCNNMYflkEN+NrJG5gbmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758968813; 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=3MnA27Nh2KViSKPmLdRQu5LRG7tuLAmSU3gX8mTvny4=; b=xU1I7ev25sXBI0ERq6Dl4O25IzKrjuglNQyiVZfUX+R8qRiYwMje3nb1VzY5/aCcm50eH1 QL8jLcajVFcq3Ne8YdC7LtjBJi7HUSCMiZPz0chQxmOIYyuqfJskpe2Nx3LqtRT58CK/0d W+zuAuylm5kRaNHKuofl4TFJUkQNKBs9gGZmORkXwNdStibbwyuvJnD4830HcMTwvaBF1b LPc2ryb81L9zkwTNy80WNctbbQQyHhFL7iL6XOeUjjDHvugQ1Pdx1irmhgKCow6K4lZh/x whVQMdR/IDSH9cEJQAo2Wdtko+S/6igfpPWyw/fudcrvCsD2RkNPyh9NRTg7Pw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758968813; a=rsa-sha256; cv=none; b=woBETT9I+mKL2q8eRUkjKDFHicl2Z3F23M17ivNNwkGO/SX/zRr7ilxrtdq7N63qi+wtyR zqZIyN8ef8PUr5Hiy1b+AAEzGbjlQNenJjybKsiV6a49zIvDwPirZKpLNO0x1LeeV40k0K Ci7M6tMt7h+TIll9YBeEbGcXyepK9sI9bnp4ty/+aDiapa4d1ppH5WS70yEs/LE0OxNi87 3LRP8fry1iE3bFS7qLJZL6jNIDE7JIFlqCjlo+8OvmS6SlEBz9oUJkOj+O/QVlzyBv1MbL J5UIBxVqMkGl6EhYrdE2A0MkspSifT4jGA0y4g/bNhzl9yDPQ3VSH2EniI9INQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cYkCJ6GRTzTpd; Sat, 27 Sep 2025 10:26:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 58RAQqLH036274; Sat, 27 Sep 2025 10:26:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58RAQqLc036271; Sat, 27 Sep 2025 10:26:52 GMT (envelope-from git) Date: Sat, 27 Sep 2025 10:26:52 GMT Message-Id: <202509271026.58RAQqLc036271@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Vladimir Kondratyev Subject: git: d82a9494e798 - stable/15 - u2f(4): Use taskqueue to start USB transfers from kqueue context 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: wulf X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: d82a9494e7985dd9e3e8b5d31f9488e60972b865 Auto-Submitted: auto-generated The branch stable/15 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=d82a9494e7985dd9e3e8b5d31f9488e60972b865 commit d82a9494e7985dd9e3e8b5d31f9488e60972b865 Author: Vladimir Kondratyev AuthorDate: 2025-09-25 07:54:19 +0000 Commit: Vladimir Kondratyev CommitDate: 2025-09-27 10:25:05 +0000 u2f(4): Use taskqueue to start USB transfers from kqueue context to avoid recursion on u2f mutex and taking of hidbus sleepable lock. Tested by: emaste PR: 289494 MFC after: 2 days (cherry picked from commit 186e433300fed9093dd9716baa20e838eb3b51b6) --- sys/dev/hid/u2f.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/sys/dev/hid/u2f.c b/sys/dev/hid/u2f.c index ac2eba7a499d..39610845c5fb 100644 --- a/sys/dev/hid/u2f.c +++ b/sys/dev/hid/u2f.c @@ -47,6 +47,7 @@ #include #include #include +#include #include #include @@ -78,6 +79,7 @@ struct u2f_softc { struct cdev *dev; struct mtx sc_mtx; /* hidbus private mutex */ + struct task sc_kqtask; /* kqueue task */ void *sc_rdesc; hid_size_t sc_rdesc_size; hid_size_t sc_isize; @@ -121,6 +123,7 @@ static device_probe_t u2f_probe; static device_attach_t u2f_attach; static device_detach_t u2f_detach; +static void u2f_kqtask(void *context, int pending); static int u2f_kqread(struct knote *, long); static void u2f_kqdetach(struct knote *); static void u2f_notify(struct u2f_softc *); @@ -174,6 +177,7 @@ u2f_attach(device_t dev) mtx_init(&sc->sc_mtx, "u2f lock", NULL, MTX_DEF); knlist_init_mtx(&sc->sc_rsel.si_note, &sc->sc_mtx); + TASK_INIT(&sc->sc_kqtask, 0, u2f_kqtask, sc); make_dev_args_init(&mda); mda.mda_flags = MAKEDEV_WAITOK; @@ -217,6 +221,7 @@ u2f_detach(device_t dev) destroy_dev(sc->dev); } + taskqueue_drain(taskqueue_thread, &sc->sc_kqtask); hid_intr_stop(sc->sc_dev); knlist_clear(&sc->sc_rsel.si_note, 0); @@ -519,6 +524,14 @@ u2f_kqfilter(struct cdev *dev, struct knote *kn) return (0); } +static void +u2f_kqtask(void *context, int pending) +{ + struct u2f_softc *sc = context; + + hid_intr_start(sc->sc_dev); +} + static int u2f_kqread(struct knote *kn, long hint) { @@ -533,7 +546,7 @@ u2f_kqread(struct knote *kn, long hint) } else { ret = sc->sc_state.data ? 1 : 0; if (!sc->sc_state.data) - hid_intr_start(sc->sc_dev); + taskqueue_enqueue(taskqueue_thread, &sc->sc_kqtask); } return (ret);