From nobody Tue Sep 27 14:08:31 2022 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 4McM0v5fnbz4d54m; Tue, 27 Sep 2022 14:08: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4McM0v58Ybz3ZYc; Tue, 27 Sep 2022 14:08:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664287711; 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=S8QPwCnmP1grjHWu3eLO3FGHfB9DJmyhPHCks+agImI=; b=ZQWbIY5aKrlTaflziC5rcyp5VIC7fqmi8xZW/UJL/WBszq3j10QygL0vrvMOxLfIN3QQKI Xb6VdTaTg+JDChHqMoISenLkQbxrhxU1VWOUxOu0kG5+q9WChk+wm8gjz+0p4yWj9ADzl9 z4MXaemVa2VuT5yk+0vZfpIvar0NVMIUSep3OWoT8mGSxpdZgPyGlNZst9S06tly6bDYY8 L0bjNFME8BK6lVow1jTboK815rs99zS5IKXPWU2u1+bzSKJ44MZbq1B5H8TksF3o1ROVYg FXdUSrWZbiIjukgE1yoylQJ44gi19351fKAhephg0HArEyC8KIphirr0/bDizw== 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 4McM0v3zJyz1827; Tue, 27 Sep 2022 14:08: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 28RE8V7P029004; Tue, 27 Sep 2022 14:08:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28RE8V5A029003; Tue, 27 Sep 2022 14:08:31 GMT (envelope-from git) Date: Tue, 27 Sep 2022 14:08:31 GMT Message-Id: <202209271408.28RE8V5A029003@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Hans Petter Selasky Subject: git: 2cce9aa0785c - main - vt(4): Make sure vt_switch_timer() has a sleepable 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: hselasky X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2cce9aa0785c438fa8b66bd230824f7460df14ac Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664287711; 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=S8QPwCnmP1grjHWu3eLO3FGHfB9DJmyhPHCks+agImI=; b=eWYdqmilFfLmtpxepztMuXy2Qy23gd45oYpBFR/btMPYghMqDoyYNsD+WqCI7N72477Q12 TvvVbXQ2OiK/qvUlgVQz1fjADJT5/lgzd6Lj8NcnG91fzAyz+GurfmtRoowx8F4TzX4rkk GS5dSPWCQNH82L9l2tnVIkjtcwzZu+fBJ78LRJ+uK2o55reSvGs72MLi8jwbinCAR19X3A 7CwumExIeqsm3349LRKPHcCGDcME7GHwJVR0iHBekbazv7t9UqNg8pgv2pM3k1QbmIRYdW 2P4YZZYSga89L8n4CSkQhoOLksjm3wYggr+8lSAUVkXLGeIPx0RSrMS3u5qh7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664287711; a=rsa-sha256; cv=none; b=BW0RQesNtPPuRQKAcwObdgNwMPFM1KbJHehY4YSizQ741a9HI8oObcH4gjvOGmCHEzQ63Z s10eQjGey7w1FnxJvujY59lby+6BDx9JAf6nV4yKLeghb1BCAYCdeJ0QPOPQYwbrD1B1UL 84U6zx7J51Zo1nPPz1KlPpelyDCNz1cToEz75oudO+vH/P/yvwF5/JwLCf/Qt3c33je7WD ZeScFDTofVDGIlOCTz/uvxp8StU7b5oJHZs9z7qpBPWmEzijYGwiyhouiTDtrXVxO6fDYI 3idUEfIbalnWZh7FVwVV3sCenL3otXWriUKmREl1zkVc/1aUI65NhNrJTzF8jA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by hselasky: URL: https://cgit.FreeBSD.org/src/commit/?id=2cce9aa0785c438fa8b66bd230824f7460df14ac commit 2cce9aa0785c438fa8b66bd230824f7460df14ac Author: Hans Petter Selasky AuthorDate: 2022-09-26 15:10:50 +0000 Commit: Hans Petter Selasky CommitDate: 2022-09-27 14:07:54 +0000 vt(4): Make sure vt_switch_timer() has a sleepable context. Fixes the following panic backtrace: panic() usbhid_sync_xfer() usbhid_set_report() hid_set_report() hidbus_write() hid_write() hkbd_set_leds() hkbd_ioctl_locked() hkbd_ioctl_locked() hkbd_ioctl() kbdmux_ioctl() vt_window_switch() vt_switch_timer() Differential Revision: https://reviews.freebsd.org/D36715 MFC after: 1 week Sponsored by: NVIDIA Networking --- sys/dev/vt/vt.h | 3 ++- sys/dev/vt/vt_core.c | 13 ++++++------- sys/dev/vt/vt_cpulogos.c | 1 - 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/sys/dev/vt/vt.h b/sys/dev/vt/vt.h index b4361f77317c..7305727804cf 100644 --- a/sys/dev/vt/vt.h +++ b/sys/dev/vt/vt.h @@ -48,6 +48,7 @@ #include #include #include +#include #include "opt_syscons.h" #include "opt_splash.h" @@ -306,7 +307,7 @@ struct vt_window { pid_t vw_pid; /* Terminal holding process */ struct proc *vw_proc; struct vt_mode vw_smode; /* switch mode */ - struct callout vw_proc_dead_timer; + struct timeout_task vw_timeout_task_dead; struct vt_window *vw_switch_to; int vw_bell_pitch; /* (?) Bell pitch */ sbintime_t vw_bell_duration; /* (?) Bell duration */ diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c index b95ff1ef677e..8f9e1cf6d2b2 100644 --- a/sys/dev/vt/vt_core.c +++ b/sys/dev/vt/vt_core.c @@ -338,7 +338,7 @@ vt_suspend_flush_timer(struct vt_device *vd) } static void -vt_switch_timer(void *arg) +vt_switch_timer(void *arg, int pending) { (void)vt_late_window_switch((struct vt_window *)arg); @@ -442,8 +442,7 @@ vt_window_preswitch(struct vt_window *vw, struct vt_window *curvw) DPRINTF(40, "%s\n", __func__); curvw->vw_switch_to = vw; /* Set timer to allow switch in case when process hang. */ - callout_reset(&vw->vw_proc_dead_timer, hz * vt_deadtimer, - vt_switch_timer, (void *)vw); + taskqueue_enqueue_timeout(taskqueue_thread, &vw->vw_timeout_task_dead, hz * vt_deadtimer); /* Notify process about vt switch attempt. */ DPRINTF(30, "%s: Notify process.\n", __func__); signal_vt_rel(curvw); @@ -466,7 +465,7 @@ vt_late_window_switch(struct vt_window *vw) struct vt_window *curvw; int ret; - callout_stop(&vw->vw_proc_dead_timer); + taskqueue_cancel_timeout(taskqueue_thread, &vw->vw_timeout_task_dead, NULL); ret = vt_window_switch(vw); if (ret != 0) { @@ -2045,7 +2044,7 @@ finish_vt_rel(struct vt_window *vw, int release, int *s) if (vw->vw_flags & VWF_SWWAIT_REL) { vw->vw_flags &= ~VWF_SWWAIT_REL; if (release) { - callout_drain(&vw->vw_proc_dead_timer); + taskqueue_drain_timeout(taskqueue_thread, &vw->vw_timeout_task_dead); (void)vt_late_window_switch(vw->vw_switch_to); } return (0); @@ -2929,7 +2928,7 @@ vt_allocate_window(struct vt_device *vd, unsigned int window) terminal_set_winsize(tm, &wsz); vd->vd_windows[window] = vw; - callout_init(&vw->vw_proc_dead_timer, 1); + TIMEOUT_TASK_INIT(taskqueue_thread, &vw->vw_timeout_task_dead, 0, &vt_switch_timer, vw); return (vw); } @@ -2953,7 +2952,7 @@ vt_upgrade(struct vt_device *vd) vw = vt_allocate_window(vd, i); } if (!(vw->vw_flags & VWF_READY)) { - callout_init(&vw->vw_proc_dead_timer, 1); + TIMEOUT_TASK_INIT(taskqueue_thread, &vw->vw_timeout_task_dead, 0, &vt_switch_timer, vw); terminal_maketty(vw->vw_terminal, "v%r", VT_UNIT(vw)); vw->vw_flags |= VWF_READY; if (vw->vw_flags & VWF_CONSOLE) { diff --git a/sys/dev/vt/vt_cpulogos.c b/sys/dev/vt/vt_cpulogos.c index 7e0be12b3adb..4337c31e0054 100644 --- a/sys/dev/vt/vt_cpulogos.c +++ b/sys/dev/vt/vt_cpulogos.c @@ -35,7 +35,6 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include #include #include