From nobody Sat Dec 24 08:37:08 2022 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 4NfHTx3YN3z1HSmn; Sat, 24 Dec 2022 08:37:09 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NfHTx1rM4z3PW5; Sat, 24 Dec 2022 08:37:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671871029; 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=J95zn31Ko4q9q5f6h/Q4/CtJDN7g/lRi/58jz1mWO7E=; b=lGMrzr7lMQVyhiMItf3Ou8EddqvWxboTpIVk0NtnXpQh3N/k9NTOM9jRh2FoHbsN2qaMYF buLdMpoEc4VDhENDBy/eEulngl7VfOSjlxPM/WSMJVSXFxRmcvvydWuzkTA3FBoWDr00XM 0Djc4+Q2W1FMfWCoQMn59yoipE5CJxq4IoCEX5RLqnQcnzEEEJQMZQcwR6ybXkZUrDETUY saqqa2k1d8ylwmzo6zAvVrZbQY+cDsrfGX6Netk2auimkMQ9xoqKAAXF+6GyF/TAI7czCK hqMk0IQ7qLy+qDUsCSnMqeb/GU+B318oLiQrvKjzYepHyUTk6rLL2x6GyO9mzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671871029; 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=J95zn31Ko4q9q5f6h/Q4/CtJDN7g/lRi/58jz1mWO7E=; b=nGuD1AVqyXMSAjSiTvSnIxkAEiJf71FkMgOZ4W0mKzovyrfzN9pLl/Yg0UhdxaY+M0KlnZ K3SZUUVykaJT31xVwWBFYjflU2bvp1coLZeqQr92RJ+NP9AShfj5msymLXf20cv/C+m/Rw KfselTvaiq6iXlgybCKq1cU1Xd2dRwCKLihsgAKyrmc1dZLQ/6niSVLaS5h9zPMklgwrFg f1cF+wykROu4JSIxoTOGtI1hJjG5cXpO1LMN7Sp4Pds+Zc5Fxx49QWSc5QEbBMIQAtXUsf SIm/iCBFu6nce+qsyOYegzM3VW9XWdnSHK9YGUY8EV+ZA2jNp1tp0bpqvEbDHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671871029; a=rsa-sha256; cv=none; b=udwnBGXGK9nDAzhBNraqEy52aOdI4mZJLrM1EtoOYTgdP0ilpBcfv9baJprdtUP40o5WQn VJm9xBDEN1fl3skvmq0iGyVDBqGw7zDygRGC9FECDYqyMgFO6Y+XW/7iUcVKcnCWpL+KBF 8SchK60og4KidmVA4P+rEiICTfDZUCXyL4RuXKJjXTfzW7NdsEzLstYN+Mlr4RvCbSNZtD 2I2L2tCqfLvUE0P4pJJ0WXrB8YxK1YIunxHVk9fy4LzhExgjide3Gy2Jyp9m4IrSeYlJu3 OOozf94Gq98v9I2ZNMexZ6vNnNzOCSCpE8cm/JN6HiyxPaQY8gF5Q+svEx+3Pw== 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 4NfHTx0t73z16Wj; Sat, 24 Dec 2022 08:37:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BO8b8rt083634; Sat, 24 Dec 2022 08:37:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BO8b8H6083633; Sat, 24 Dec 2022 08:37:08 GMT (envelope-from git) Date: Sat, 24 Dec 2022 08:37:08 GMT Message-Id: <202212240837.2BO8b8H6083633@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: 017cb70bec9c - stable/13 - evdev: Extend EVIOCGRAB ioctl scope to cover kbd interface 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: 017cb70bec9c35fff395e3ad402a20c861f1eb67 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=017cb70bec9c35fff395e3ad402a20c861f1eb67 commit 017cb70bec9c35fff395e3ad402a20c861f1eb67 Author: Vladimir Kondratyev AuthorDate: 2022-11-18 23:54:46 +0000 Commit: Vladimir Kondratyev CommitDate: 2022-12-24 08:33:27 +0000 evdev: Extend EVIOCGRAB ioctl scope to cover kbd interface of various keyboard drivers. EVIOCGRAB ioctl execution on /dev/input/event# device node gains exclusive access to this device to caller. It is used mostly for development purposes and remote control software. See e.g. https://reviews.freebsd.org/D30020 which is the reason of creation of this change. Keyboard grabbing is disabled in KDB and during panics. (cherry picked from commit 183088934a6c4384e45ac6d01c04754e0d7a991c) --- sys/dev/atkbdc/atkbd.c | 3 +++ sys/dev/evdev/evdev.c | 2 ++ sys/dev/gpio/gpiokeys.c | 4 ++++ sys/dev/hid/hkbd.c | 4 ++++ sys/dev/hyperv/input/hv_kbd.c | 2 ++ sys/dev/kbdmux/kbdmux.c | 3 +++ sys/dev/usb/input/ukbd.c | 4 ++++ 7 files changed, 22 insertions(+) diff --git a/sys/dev/atkbdc/atkbd.c b/sys/dev/atkbdc/atkbd.c index 9cf60dbcff57..2e4c8e8e940f 100644 --- a/sys/dev/atkbdc/atkbd.c +++ b/sys/dev/atkbdc/atkbd.c @@ -703,6 +703,9 @@ next_code: evdev_sync(state->ks_evdev); } } + + if (state->ks_evdev != NULL && evdev_is_grabbed(state->ks_evdev)) + return (NOKEY); #endif /* return the byte as is for the K_RAW mode */ diff --git a/sys/dev/evdev/evdev.c b/sys/dev/evdev/evdev.c index a0a039f0b691..2bb365125b5a 100644 --- a/sys/dev/evdev/evdev.c +++ b/sys/dev/evdev/evdev.c @@ -1097,6 +1097,8 @@ evdev_release_client(struct evdev_dev *evdev, struct evdev_client *client) bool evdev_is_grabbed(struct evdev_dev *evdev) { + if (kdb_active || SCHEDULER_STOPPED()) + return (false); /* * The function is intended to be called from evdev-unrelated parts of * code like syscons-compatible parts of mouse and keyboard drivers. diff --git a/sys/dev/gpio/gpiokeys.c b/sys/dev/gpio/gpiokeys.c index 6fd1edddab44..652a828b63ba 100644 --- a/sys/dev/gpio/gpiokeys.c +++ b/sys/dev/gpio/gpiokeys.c @@ -194,6 +194,10 @@ gpiokeys_key_event(struct gpiokeys_softc *sc, struct gpiokey *key, int pressed) evdev_push_key(sc->sc_evdev, key->evcode, pressed); evdev_sync(sc->sc_evdev); } + if (evdev_is_grabbed(sc->sc_evdev)) { + GPIOKEYS_UNLOCK(sc); + return; + } #endif if (key->keycode != GPIOKEY_NONE) { code = key->keycode & SCAN_KEYCODE_MASK; diff --git a/sys/dev/hid/hkbd.c b/sys/dev/hid/hkbd.c index ad9b3dde3d37..7515c1e426dd 100644 --- a/sys/dev/hid/hkbd.c +++ b/sys/dev/hid/hkbd.c @@ -391,6 +391,8 @@ hkbd_put_key(struct hkbd_softc *sc, uint32_t key) if (evdev_rcpt_mask & EVDEV_RCPT_HW_KBD && sc->sc_evdev != NULL) evdev_push_event(sc->sc_evdev, EV_KEY, evdev_hid2key(KEY_INDEX(key)), !(key & KEY_RELEASE)); + if (sc->sc_evdev != NULL && evdev_is_grabbed(sc->sc_evdev)) + return; #endif tail = (sc->sc_inputtail + 1) % HKBD_IN_BUF_SIZE; @@ -541,6 +543,8 @@ hkbd_interrupt(struct hkbd_softc *sc) #ifdef EVDEV_SUPPORT if (evdev_rcpt_mask & EVDEV_RCPT_HW_KBD && sc->sc_evdev != NULL) evdev_sync(sc->sc_evdev); + if (sc->sc_evdev != NULL && evdev_is_grabbed(sc->sc_evdev)) + return; #endif /* wakeup keyboard system */ diff --git a/sys/dev/hyperv/input/hv_kbd.c b/sys/dev/hyperv/input/hv_kbd.c index 52ce621b2a89..291dfe64a803 100644 --- a/sys/dev/hyperv/input/hv_kbd.c +++ b/sys/dev/hyperv/input/hv_kbd.c @@ -341,6 +341,8 @@ next_code: evdev_sync(sc->ks_evdev); } } + if (sc->ks_evdev != NULL && evdev_is_grabbed(sc->ks_evdev)) + return (NOKEY); #endif ++kbd->kb_count; DEBUG_HVKBD(kbd, "read scan: 0x%x\n", scancode); diff --git a/sys/dev/kbdmux/kbdmux.c b/sys/dev/kbdmux/kbdmux.c index 3bbdc78b7c1a..b70e956830e5 100644 --- a/sys/dev/kbdmux/kbdmux.c +++ b/sys/dev/kbdmux/kbdmux.c @@ -715,6 +715,9 @@ next_code: evdev_sync(state->ks_evdev); } } + + if (state->ks_evdev != NULL && evdev_is_grabbed(state->ks_evdev)) + return (NOKEY); #endif /* return the byte as is for the K_RAW mode */ diff --git a/sys/dev/usb/input/ukbd.c b/sys/dev/usb/input/ukbd.c index f2ff476150ff..48bac46ab088 100644 --- a/sys/dev/usb/input/ukbd.c +++ b/sys/dev/usb/input/ukbd.c @@ -394,6 +394,8 @@ ukbd_put_key(struct ukbd_softc *sc, uint32_t key) if (evdev_rcpt_mask & EVDEV_RCPT_HW_KBD && sc->sc_evdev != NULL) evdev_push_event(sc->sc_evdev, EV_KEY, evdev_hid2key(KEY_INDEX(key)), !(key & KEY_RELEASE)); + if (sc->sc_evdev != NULL && evdev_is_grabbed(sc->sc_evdev)) + return; #endif if (sc->sc_inputs < UKBD_IN_BUF_SIZE) { @@ -562,6 +564,8 @@ ukbd_interrupt(struct ukbd_softc *sc) #ifdef EVDEV_SUPPORT if (evdev_rcpt_mask & EVDEV_RCPT_HW_KBD && sc->sc_evdev != NULL) evdev_sync(sc->sc_evdev); + if (sc->sc_evdev != NULL && evdev_is_grabbed(sc->sc_evdev)) + return; #endif /* wakeup keyboard system */