From owner-dev-commits-src-all@freebsd.org Thu Jan 14 20:06:31 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2B8994EC831; Thu, 14 Jan 2021 20:06: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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DGwLb0fz4z4rsx; Thu, 14 Jan 2021 20:06:31 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 0A0817CAE; Thu, 14 Jan 2021 20:06:31 +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 10EK6Uje082423; Thu, 14 Jan 2021 20:06:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 10EK6UTE082422; Thu, 14 Jan 2021 20:06:30 GMT (envelope-from git) Date: Thu, 14 Jan 2021 20:06:30 GMT Message-Id: <202101142006.10EK6UTE082422@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: b360682ac940 - main - hid: Add missing input enter/exit epoch pairs. 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: b360682ac940a4cef1c922c33d685db24a67c96b Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jan 2021 20:06:31 -0000 The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=b360682ac940a4cef1c922c33d685db24a67c96b commit b360682ac940a4cef1c922c33d685db24a67c96b Author: Vladimir Kondratyev AuthorDate: 2021-01-14 19:48:53 +0000 Commit: Vladimir Kondratyev CommitDate: 2021-01-14 20:04:47 +0000 hid: Add missing input enter/exit epoch pairs. This was affecting unloading keyboard driver and kdb-related code. --- sys/dev/evdev/cdev.c | 5 +++++ sys/dev/hid/hkbd.c | 15 +++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/sys/dev/evdev/cdev.c b/sys/dev/evdev/cdev.c index ec60a12dbf2d..91536c119fb4 100644 --- a/sys/dev/evdev/cdev.c +++ b/sys/dev/evdev/cdev.c @@ -396,6 +396,7 @@ evdev_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag, struct evdev_dev *evdev = dev->si_drv1; struct evdev_client *client; struct input_keymap_entry *ke; + struct epoch_tracker et; int ret, len, limit, type_num; uint32_t code; size_t nvalues; @@ -415,7 +416,11 @@ evdev_ioctl(struct cdev *dev, u_long cmd, caddr_t data, int fflag, EVDEV_LOCK(evdev); if (evdev->ev_kdb_active) { evdev->ev_kdb_active = false; + if (evdev->ev_lock_type == EV_LOCK_EXT_EPOCH) + epoch_enter_preempt(INPUT_EPOCH, &et); evdev_restore_after_kdb(evdev); + if (evdev->ev_lock_type == EV_LOCK_EXT_EPOCH) + epoch_exit_preempt(INPUT_EPOCH, &et); } EVDEV_UNLOCK(evdev); } diff --git a/sys/dev/hid/hkbd.c b/sys/dev/hid/hkbd.c index 63dd626cdef9..6f4b71dd49b6 100644 --- a/sys/dev/hid/hkbd.c +++ b/sys/dev/hid/hkbd.c @@ -598,16 +598,22 @@ static void hkbd_timeout(void *arg) { struct hkbd_softc *sc = arg; +#ifdef EVDEV_SUPPORT struct epoch_tracker et; +#endif HKBD_LOCK_ASSERT(sc); sc->sc_time_ms += sc->sc_delay; sc->sc_delay = 0; +#ifdef EVDEV_SUPPORT epoch_enter_preempt(INPUT_EPOCH, &et); +#endif hkbd_interrupt(sc); +#ifdef EVDEV_SUPPORT epoch_exit_preempt(INPUT_EPOCH, &et); +#endif /* Make sure any leftover key events gets read out */ taskqueue_enqueue(taskqueue_swi_giant, &sc->sc_task); @@ -1023,6 +1029,9 @@ static int hkbd_detach(device_t dev) { struct hkbd_softc *sc = device_get_softc(dev); +#ifdef EVDEV_SUPPORT + struct epoch_tracker et; +#endif int error; SYSCONS_LOCK_ASSERT(); @@ -1045,7 +1054,13 @@ hkbd_detach(device_t dev) /* process releasing of all keys */ HKBD_LOCK(sc); +#ifdef EVDEV_SUPPORT + epoch_enter_preempt(INPUT_EPOCH, &et); +#endif hkbd_interrupt(sc); +#ifdef EVDEV_SUPPORT + epoch_exit_preempt(INPUT_EPOCH, &et); +#endif HKBD_UNLOCK(sc); taskqueue_drain(taskqueue_swi_giant, &sc->sc_task); }