From nobody Wed Oct 12 16:46:28 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 4MndpD3nJQz4fkcj; Wed, 12 Oct 2022 16:46:28 +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 4MndpD3F6wz3RNR; Wed, 12 Oct 2022 16:46:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665593188; 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=PAI9vPf3+w675mDMXzgoOaKmLhosxzJ1xIXVx0QRkKk=; b=iGrZ7r8jYE+6obKee2rD2ckj3M6v6JlGhSie/MELClOgPThdsyl4kxuhA3Rpd9XS9hSNnQ SvGnSt32OusN3SbcTHdyeHbcGOE9Zf9hB729z9MENMPHHHFeTnumamyisr7LjnXznrG2d5 OTMp0UJLajphNruIUSR+zuJUJAynmwkd3Nzn/ATwLDlt5K0ZWfB+jokYUBYB6MXCWe/E50 insR5OCPZsZOFjcVjrkTa300HwB8mXckmSTvbHEtTfo5x5mD50qUugEP4z3RjVi23tUVqW 5zK3QCS9bQuEFrqlImkPijHq8rzvzCUu8vX0jMtlbkCCn0f3n1veIbjbg44JeA== 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 4MndpD2M0hz1Mrk; Wed, 12 Oct 2022 16:46:28 +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 29CGkSP1007614; Wed, 12 Oct 2022 16:46:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29CGkS5Y007613; Wed, 12 Oct 2022 16:46:28 GMT (envelope-from git) Date: Wed, 12 Oct 2022 16:46:28 GMT Message-Id: <202210121646.29CGkS5Y007613@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 05b727fee550 - main - Downgrade tty_intr_event from a global 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 05b727fee550598bfae5754783f9decfdeeb3c3d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665593188; 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=PAI9vPf3+w675mDMXzgoOaKmLhosxzJ1xIXVx0QRkKk=; b=Jqg4HswdLuaEszamKDqjG1A3tSyxaIQ78mq6gor3rEgrkzaSnYqRX6ylFlhpRwjJudSXWd ZQWb8iqTkkv7E5RrvKOpRXjfXvJIZKvbeJhYVGce9aEwkGiH3K/riNbC7PHQnti5J4ciQB BAIMSuXGqFwQeSGqJ7bucQlaZTXhGXlpRie6mk8OCT9yZVo9ggh6HBFJOmfBxigI5k7a0F nweEbyWfaycgd/dfF5SB6OLrecHBRfZ6jFcXueCWkrkf0+2EUP3Ues+lQBK+JOvfntiCRn tcHJzXJqfOWCDdSI8zV6mb5nppSrZwBIKaI2kZGZAHKCLo0mk7mxg2q/6tL5Hg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665593188; a=rsa-sha256; cv=none; b=DXcTtfddYJ/A8JugGXvm4PHVDUNhAbqAhTWlchgwCWodD1cxHqtrwbBJhPWP8Br+rD2za8 C/ZIU4JFtHk20Gj/5a0rowo2A9L4KVzNWqVtoGe1EDrVnHmG5fndjbyZZi9vrP/UgC1BdP rVkF+x0mVCNz9LKXRX9h8xjT8k491V73RJf/fiL2r/M/G9DIrkmWw/OnG9ZJMNfyjikAJ1 M29OlzOTAAMcxwPKEhTUixTlRnx6FY7gXALO1ZNFJzD6inL6DV8gZ6mf+WaS774FnhBT9o 1C5tpSDdOR5DKIhNBbVirItjpZEOr+UN2aSjI1BjM6YSLB/DdMKbPgR0qaWV7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=05b727fee550598bfae5754783f9decfdeeb3c3d commit 05b727fee550598bfae5754783f9decfdeeb3c3d Author: Mitchell Horne AuthorDate: 2022-10-12 16:36:08 +0000 Commit: Mitchell Horne CommitDate: 2022-10-12 16:46:12 +0000 Downgrade tty_intr_event from a global It can be static within uart_tty.c. It is an open question whether there remains any real benefit to having uart instances share a swi thread. Reviewed by: imp, markj, jhb MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D36938 --- share/man/man9/swi.9 | 13 +++---------- sys/dev/uart/uart_tty.c | 3 +++ sys/kern/kern_intr.c | 1 - sys/sys/interrupt.h | 1 - 4 files changed, 6 insertions(+), 12 deletions(-) diff --git a/share/man/man9/swi.9 b/share/man/man9/swi.9 index 0dfc924325d6..cba8e7dd6742 100644 --- a/share/man/man9/swi.9 +++ b/share/man/man9/swi.9 @@ -35,7 +35,6 @@ .In sys/param.h .In sys/bus.h .In sys/interrupt.h -.Vt "extern struct intr_event *tty_intr_event" ; .Vt "extern struct intr_event *clk_intr_event" ; .Ft int .Fo swi_add @@ -148,16 +147,10 @@ On platforms allowing IPI sending from NMI context it immediately wakes via the IPI, otherwise it works just like SWI_DELAY. .El .Pp -The -.Va tty_intr_event -and .Va clk_intr_event -variables contain pointers to the software interrupt handlers for the tty and -clock software interrupts, respectively. -.Va tty_intr_event -is used to hang tty software interrupt handlers off of the same thread. -.Va clk_intr_event -is used to hang delayed handlers off of the clock interrupt, and is invoked +is a pointer to the +.Vt struct intr_event +used to hang delayed handlers off of the clock interrupt, and is invoked directly by .Xr hardclock 9 . .Sh RETURN VALUES diff --git a/sys/dev/uart/uart_tty.c b/sys/dev/uart/uart_tty.c index ad7052289f0b..482a392cdb27 100644 --- a/sys/dev/uart/uart_tty.c +++ b/sys/dev/uart/uart_tty.c @@ -77,6 +77,9 @@ CONSOLE_DRIVER( static struct uart_devinfo uart_console; +/* TTY swi(9) event. Allows all uart soft handlers to share one ithread. */ +static struct intr_event *tty_intr_event; + static void uart_cnprobe(struct consdev *cp) { diff --git a/sys/kern/kern_intr.c b/sys/kern/kern_intr.c index 07515214c9c5..bcd5dc82864e 100644 --- a/sys/kern/kern_intr.c +++ b/sys/kern/kern_intr.c @@ -89,7 +89,6 @@ struct intr_entropy { }; struct intr_event *clk_intr_event; -struct intr_event *tty_intr_event; struct proc *intrproc; static MALLOC_DEFINE(M_ITHREAD, "ithread", "Interrupt Threads"); diff --git a/sys/sys/interrupt.h b/sys/sys/interrupt.h index edef36e68fc7..ec4f0d214ff9 100644 --- a/sys/sys/interrupt.h +++ b/sys/sys/interrupt.h @@ -153,7 +153,6 @@ struct intr_event { struct proc; extern struct intr_event *clk_intr_event; -extern struct intr_event *tty_intr_event; /* Counts and names for statistics (defined in MD code). */ extern u_long *intrcnt; /* counts for each device and stray */