From nobody Thu Sep 25 07:55:25 2025 X-Original-To: dev-commits-src-main@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 4cXQxT566sz685KN; Thu, 25 Sep 2025 07:55:25 +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 4cXQxT4Lkmz3V74; Thu, 25 Sep 2025 07:55:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758786925; 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=HOAQsZXCDCxCzwG95BT6J81pJtZO2Nbr13LmM6ezSfw=; b=QQOs0EP5icfeaauOxiVV2fS+7MEUUioAB29GvX2/eseJUpcSF8jdmnvV2GJiSMqKkit34C yjz1bRSYRwKt+3OO1Pcq1+qayKOeJ96Zs+B8Ww0qYfOd9r/WUxF228CxC+RxHqvUN3FXxZ HbNPo27OG1eRQIqo77zhDjTHdsR2flQuVCJLWuuOWHwIQroRf6jHQa3RiTGqu9vfyL7wQK u0frfb7PR6iXY+BBVUgXQmLpr7Ou4POwVdHUVuYAwd5ioQDBCEU2VXRAdXIT8deYPMkbek OPeF9Z1yLBIePT3royAltta8tPpDTz5TVIUtE/iTfgYGtPngHKlRNNPesXsfGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1758786925; 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=HOAQsZXCDCxCzwG95BT6J81pJtZO2Nbr13LmM6ezSfw=; b=p90zqDwOuc6MDLVqs9LDsaGaOpT2kL2qH1a91I3jxlRbsWwvEvx5ti0Tv9WM+52NMDDNzj 3AFseU4aHUk5E9nR0mbV189UshIRhGGO2VvnrRA/RxzcPKzssDm/jMcZYhEJ8QVI7CEOTh 6x6a0/dO2HqLTOA1BjIN5dUw2lFyqOdyELRvGLxczPDsefXViuvvo5J0t9mdRazI9mTYCh b4hgNkT2EWd9RqVIA9UQ6/WPu7fRX3qGtR4QQZZRcJW9V2DPNtCJsto37Kp2wj2yPXcmrl i11VKiFtpJ5KLr21QwR38oflqEOSJZ0c61Bcx7pvaJ3/dWiOcgvrRj1Xwu8ZSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1758786925; a=rsa-sha256; cv=none; b=hIDZoJZ8it7F1vHilduPoChENlgJC4ZtoLQQGdS6DOEWJb43BWZRwCKhZZv7f+qsoKeQhX jKNbYRcRFgu1kZdFK4WlXW3gbpc3QFnbh6nwbJHfQqVL8CJmdDmQmg/GFmbR5B2RqcwjDI f1BktyULKxyN3sEa0QYS5qJDTlYsQo/CaUspxWTpieX7fD2+lhZDdB9emftEjYN71m1hfU tmQ+YdIJzqXdLNaun/m3Uqcq2PCK/63iyLBPF0RNmnRfGOQUCCnRKfQhhgods1ux130T/W 05ec49Tsx/zPHVkpXqwGkK6M1EbadPNQBKOsOQ1AgECycLUNeUjSNpPmRfSZUA== 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 4cXQxT3Ltzz17WM; Thu, 25 Sep 2025 07:55:25 +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 58P7tPW1060930; Thu, 25 Sep 2025 07:55:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 58P7tPrf060927; Thu, 25 Sep 2025 07:55:25 GMT (envelope-from git) Date: Thu, 25 Sep 2025 07:55:25 GMT Message-Id: <202509250755.58P7tPrf060927@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 186e433300fe - main - u2f(4): Use taskqueue to start USB transfers from kqueue context List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 186e433300fed9093dd9716baa20e838eb3b51b6 Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=186e433300fed9093dd9716baa20e838eb3b51b6 commit 186e433300fed9093dd9716baa20e838eb3b51b6 Author: Vladimir Kondratyev AuthorDate: 2025-09-25 07:54:19 +0000 Commit: Vladimir Kondratyev CommitDate: 2025-09-25 07:54:19 +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 --- 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);