From nobody Tue Jun 16 11:23:03 2026 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 4gfl3C3d9Pz6hSsJ for ; Tue, 16 Jun 2026 11:23:03 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gfl3C2JLKz3MR5 for ; Tue, 16 Jun 2026 11:23:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1781608983; 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=OVibnSOpE7Y2RAfJGNAIyX6vmwHAVBgBmtFk4YkVmig=; b=LSPrM/iF8KuIotKrUAae7L9YucYVdeh4iSnYHjnZ19QxZFjQZcJd8RMYbOlyB5MIgpwtR4 sxdVqfjKC07HGuk9GWdSNoQrRfgLqvEywpTM04PfBPfs84kqbI8XZxik0uxdYX3Yjk1OgK wXZhH5aZ/SBLCUbgoI+HxSjK2uZhb3x7l5dcthCQK+Ft73G+TcJ+x9ziWmrSRgd0pXn1T1 NFlIfzbyPtSNN5iFDd38xTEFFDKoJdw2iB0u7utCAXJ75ulVIgP0tRQDLTTpt4sbaHTbUB NU1D60sHdtVoLrxlf7HwD1wgPsQbZZ5LfhzdkBCpMV05NUp/XgyVd03iI9QS5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1781608983; a=rsa-sha256; cv=none; b=NfworEgC0rHRqM0JAhyCEkLLPah0bZoqnmbx5mGoifmcGN9lk6yM7l6QPwZx+59m02tOuH /hjQczS0bjnBySqCVDdkHVdMSyPLiMLLwPZ/oWUFeRRkxjwVUKM8DTT1nE8STuH4uNGKPy Zbk33cUmx14M5stt9+ftNJ8fNHKMG4x+bHq8Ce8esQaQn1ufaPnrVvIDZw4WTkYr7iHoTi f6lt6dQruhu12ax/iyaL0VGxDJ/tOSsc/YzaIV0t+GXd0xmtKIfoyEq9/BD/Q/IJr6t+uH 66lJxlwJ8Ip1HSWn5E1PRdoP5UhX89PY8yDKRPp0lcbePm+ia/TookAIpSNwhg== 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=1781608983; 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=OVibnSOpE7Y2RAfJGNAIyX6vmwHAVBgBmtFk4YkVmig=; b=FL6nqJnxxhdY2Wml+D82YzpKoSIwuEhkvyG1UVyfefy7fD1/UC/StGwQpOM5LQbg+a+JTk 60pl8B/k0gSADNliSZCS6hvpnv5jQhgsE7aJe0LObThOQrhlcv/fW3KuK2S7HUFeaWigRQ FJ0pRQm3f1J7wdIUutiJmrY0kFhfB6ssQNan6xofZwE26dC26WIF+htB3cBEs5zbtVGYM4 xVz3af9mhA04ptOSAbaf1JSXSve/AT46ct8KFylLk5KQY3DSU00DeULjg9lEg0+McfYyg4 52Rs6MfEIT/mr8UTUpZWHjf9lwSd8dQDtQCx84v9iB438eUKFCbAum0oICsVCg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gfl3C1pQVz7Z8 for ; Tue, 16 Jun 2026 11:23:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e99f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 16 Jun 2026 11:23:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 54df18cbb400 - main - uvideo: add kqueue support 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/main X-Git-Reftype: branch X-Git-Commit: 54df18cbb400e6394edad8abab0e5cb3a97e4df3 Auto-Submitted: auto-generated Date: Tue, 16 Jun 2026 11:23:03 +0000 Message-Id: <6a313217.1e99f.3d1c1d4@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=54df18cbb400e6394edad8abab0e5cb3a97e4df3 commit 54df18cbb400e6394edad8abab0e5cb3a97e4df3 Author: Baptiste Daroussin AuthorDate: 2026-05-06 16:22:07 +0000 Commit: Baptiste Daroussin CommitDate: 2026-06-16 11:20:57 +0000 uvideo: add kqueue support Add EVFILT_READ kqueue filter so applications using kqueue/kevent can efficiently wait for video frames instead of polling. Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D56961 --- sys/dev/usb/video/uvideo.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/sys/dev/usb/video/uvideo.c b/sys/dev/usb/video/uvideo.c index 310c66db2846..a33b3ac31ea6 100644 --- a/sys/dev/usb/video/uvideo.c +++ b/sys/dev/usb/video/uvideo.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include @@ -155,6 +156,7 @@ static d_close_t uvideo_cdev_close; static d_read_t uvideo_cdev_read; static d_ioctl_t uvideo_cdev_ioctl; static d_poll_t uvideo_cdev_poll; +static d_kqfilter_t uvideo_cdev_kqfilter; static d_mmap_t uvideo_cdev_mmap; static int uvideo_querycap(struct uvideo_softc *, struct v4l2_capability *); @@ -540,6 +542,7 @@ static struct cdevsw uvideo_cdevsw = { .d_read = uvideo_cdev_read, .d_ioctl = uvideo_cdev_ioctl, .d_poll = uvideo_cdev_poll, + .d_kqfilter = uvideo_cdev_kqfilter, .d_mmap = uvideo_cdev_mmap, .d_name = "video", }; @@ -2433,6 +2436,7 @@ uvideo_mmap_queue(struct uvideo_softc *sc, int len, int err) wakeup(sc); selwakeup(&sc->sc_selinfo); + KNOTE_LOCKED(&sc->sc_selinfo.si_note, 0); } static void @@ -2453,6 +2457,7 @@ uvideo_read_frame(struct uvideo_softc *sc, uint8_t *buf, int len) wakeup(sc); selwakeup(&sc->sc_selinfo); + KNOTE_LOCKED(&sc->sc_selinfo.si_note, 0); } /* ---------------------------------------------------------------- */ @@ -2690,6 +2695,49 @@ uvideo_cdev_poll(struct cdev *dev, int events, struct thread *td) return (revents); } +static void +uvideo_kqfilter_detach(struct knote *kn) +{ + struct uvideo_softc *sc = kn->kn_hook; + + knlist_remove(&sc->sc_selinfo.si_note, kn, 0); +} + +static int +uvideo_kqfilter_read(struct knote *kn, long hint __unused) +{ + struct uvideo_softc *sc = kn->kn_hook; + + if (sc->sc_mmap_flag) + return (!STAILQ_EMPTY(&sc->sc_mmap_q)); + return (sc->sc_frames_ready > 0); +} + +static struct filterops uvideo_filtops_read = { + .f_isfd = 1, + .f_detach = uvideo_kqfilter_detach, + .f_event = uvideo_kqfilter_read, +}; + +static int +uvideo_cdev_kqfilter(struct cdev *dev, struct knote *kn) +{ + struct uvideo_softc *sc = dev->si_drv1; + + if (sc == NULL || sc->sc_dying) + return (ENXIO); + + switch (kn->kn_filter) { + case EVFILT_READ: + kn->kn_fop = &uvideo_filtops_read; + kn->kn_hook = sc; + knlist_add(&sc->sc_selinfo.si_note, kn, 0); + return (0); + default: + return (EINVAL); + } +} + static int uvideo_cdev_mmap(struct cdev *dev, vm_ooffset_t offset, vm_paddr_t *paddr, int nprot, vm_memattr_t *memattr)