From nobody Fri May 10 21:36:53 2024 X-Original-To: dev-commits-src-all@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 4VbhzV1pstz5KT6W; Fri, 10 May 2024 21:36:54 +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 4VbhzV1GwPz4hNn; Fri, 10 May 2024 21:36:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715377014; 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=VntkTSPJcsSJetsp8MWCfJE4Khv8HfaqKqGEDeA8+Io=; b=QneRNkQ8jnTHz1PcH4c5pbGFLrMNN1wGhDytbV3UmgiPNgRNzF/5AFN7YNa5mvAx1f0eBo B2G2uddws1Oi84VqtSsadiSszZS5045TldJIEA4KNVmRK1Ao1cTwkRHnSzZmwDNnyGnnQ+ 9alQB5Rn3p28SGMnHYG1lwro4U7ToDjKMfdfSVp4Vte4Nz8B/uStlWMf9VP1XKAmy2PMVe 7cCn78y5JhZCnl6D6q5S8S4ce+OrBYbuMy0sntzhFMIVAiuPLBCmm7PLlCRSBxIqKKiaSh 169UvX9nycjRD91TEwoYy0tFcmpRlbEysAWSwC8ccIi74qgIJk5+fOV8nJhK0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715377014; a=rsa-sha256; cv=none; b=g7uWV4Mx4cPr/c3du/bPyRGrN0bJNoR/iCyN3/jTv3yY5YEnq1ey+7iskNJw10bDLDNWOf AXI58Rvyg1HsEnVE3jfaCn4h3S/gwM2GgJQnA9osPp0e1JZokKvZUbXV+Vb/OXmihWXRJ+ M/PfIr5Xe21ErD9Zl5j2zve6xQgHDdea+eyGnu8GRjxApnGjwpayAtB9PJlIhnjI3lz0UE Hetu87WJgnAIXHLrXFX00GZjxHemvA1Dn+sFZVJi88nqLYyvcY0lNY+508ulX2J4HNV/Ia RckrosScRZaif9R0LUxBCxCZnH032n8wSCA4tahYAoYH2KtSEhs0SEzHt/T7PA== 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=1715377014; 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=VntkTSPJcsSJetsp8MWCfJE4Khv8HfaqKqGEDeA8+Io=; b=Gu/TIXlhMsjnWrLzvc5TQQ5RB+N4n5BwyhbnC3WBQs4zR7GNVL9YeJvtObbBNlQI7OrdK6 nCQuUazyGjoZGdP3eWBuoEmp8QMO2N4iVSBM5ANT2u/NdkA4h9f3/Vtm53okO0RLowZDKU Wj+xGUCcuY1lt4a4zwuf/k8CZnlzyTCoV3EMwrp2pMVdEyFYnQrIxdtSLNAVXe374HqEnf aFTIXpReQNgpkWiypzbggf84g58Wd17xnOn+9m+Vdq2UTOfIe7aSwSNSgNnMyREpwKvHPI eyOTlHZGiiulKGEt3mvoB9AJgYBYQsDuhB6LOl8SgIn4Ds0RVU7BDwsq9DWoYQ== 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 4VbhzV0hShztks; Fri, 10 May 2024 21:36:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44ALarTb016777; Fri, 10 May 2024 21:36:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44ALar5l016774; Fri, 10 May 2024 21:36:53 GMT (envelope-from git) Date: Fri, 10 May 2024 21:36:53 GMT Message-Id: <202405102136.44ALar5l016774@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 38c35248fe3b - main - kern/intr: remove support for passing trap frame as argument List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 38c35248fe3b740e107682b4a10bebe28992590f Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=38c35248fe3b740e107682b4a10bebe28992590f commit 38c35248fe3b740e107682b4a10bebe28992590f Author: Elliott Mitchell AuthorDate: 2021-10-08 21:43:26 +0000 Commit: Warner Losh CommitDate: 2024-05-10 21:33:24 +0000 kern/intr: remove support for passing trap frame as argument While otherwise a handy potential approach, getting the trap frame via the argument isn't documented and isn't supposed to be used. With all uses removed, now remove support to end the mixed calling conventions. Differential Revision: https://reviews.freebsd.org/D37688 Reviewed by: imp, mhorne Pull Request: https://github.com/freebsd/freebsd-src/pull/1225 --- sys/kern/kern_intr.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/sys/kern/kern_intr.c b/sys/kern/kern_intr.c index 9073e0d7af01..008f8d1242ca 100644 --- a/sys/kern/kern_intr.c +++ b/sys/kern/kern_intr.c @@ -1346,8 +1346,8 @@ ithread_loop(void *arg) * * Input: * o ie: the event connected to this interrupt. - * o frame: some archs (i.e. i386) pass a frame to some. - * handlers as their main argument. + * o frame: the current trap frame. + * * Return value: * o 0: everything ok. * o EINVAL: stray interrupt. @@ -1374,9 +1374,6 @@ intr_event_handle(struct intr_event *ie, struct trapframe *frame) /* * Execute fast interrupt handlers directly. - * To support clock handlers, if a handler registers - * with a NULL argument, then we pass it a pointer to - * a trapframe as its argument. */ td->td_intr_nesting_level++; filter = false; @@ -1405,12 +1402,8 @@ intr_event_handle(struct intr_event *ie, struct trapframe *frame) continue; } CTR4(KTR_INTR, "%s: exec %p(%p) for %s", __func__, - ih->ih_filter, ih->ih_argument == NULL ? frame : - ih->ih_argument, ih->ih_name); - if (ih->ih_argument == NULL) - ret = ih->ih_filter(frame); - else - ret = ih->ih_filter(ih->ih_argument); + ih->ih_filter, ih->ih_argument, ih->ih_name); + ret = ih->ih_filter(ih->ih_argument); #ifdef HWPMC_HOOKS PMC_SOFT_CALL_TF( , , intr, all, frame); #endif