From nobody Tue Nov 03 09:02:28 2026 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 4jJjJP2NNPz6yQ3g for ; Tue, 03 Nov 2026 09:02:29 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jJjJP0246z4KR2 for ; Tue, 03 Nov 2026 09:02:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793696549; 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=eO44tUzp6gyQkvmHB4kGVkRtUBlMev/jmR/7cT9W0lU=; b=Kac9fHy9VuVs5k6+tlsTGlfQQTVEESWLk7GbHa2ACJhF6ogBOO3a6fYikWMPBkKQN6Aw9p kH3fTyb0F7AuUwtI1s3watXEcSROGmZq88rE6hIyjnrgNikIhwEMdqtrlfDWKbqC3WmNp+ l8wCpI8q/ghJowKca4dvEPC5h4ray0NPeDye1H3X0zhXvMuAxtNNQu83kjnfK7qi6h2m23 ZXukDGfhHQIZTcq11EoKO4RHliZ3JX0vXh68kTca0H6rBt5E7gjqcmZjr9LTC92qFZuL8t ClPY84oBQaCIOimJUyb5n+LC+q0uJxxboulbd32SAMehqxWS3Qr/wi3K9ab7SA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793696549; b=V0/ctO3uEEczM6FZO88FZgVpuJg0KGOEwoZhmSOGzalqxxQspzbmiCF7Kwvq+lnSORQgHF sTQ+J6395JqL6EHlpEAiF+EKyoAqdpTLf3c7kFy4KDuiKysfaiT2SDxyv6LueF7UUMA2QE xwGY6GVnpDW/DClESgndzBSuEAR1kh4aloJ9OJPB6mDm2nbxTrpSaxlGjk2BYes96KtSTV QUM3WmE6YbaXULQT7mT9pTz+OhBb4nBb8+iczi6qP0bJsMGh8rBofNnBSRzkRJRC2ImuML q7wuxwCd2RBkiAtMH3QuRDoSqZ72TKyN7uffMQzDEvPKLFGlrocAHurHJ7+sPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793696549; 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=eO44tUzp6gyQkvmHB4kGVkRtUBlMev/jmR/7cT9W0lU=; b=Sfm84PlV9tU4TYMmK0fbtjZb5o8UP1K1iyqQ6nzZ4YkRlsgxcnM84cx91CpJ6QxiljuVIw WTDDVskuFzcC4McsE4ZBD3AC0JhVtqymyYWStyw4yEK9gx57G1teGYR5gZB1FuV2w6A07E Jqsy2ceqRXKNV8k5K9ilUP6ItRH2DzxMec+ZHG/0SsGtuoDChAAdmGS6kIFGBEhG3STWTC +HcDPHfpfxKNiMQDNQtexH5Id1gjpLNT8etZ/VPwDXh++C6ShP6RjVeJUoTbbzcvbVpLfh BXhbS5f19i/8WpBqdwYtwgyG83sG1sQ5UwZvBxrseAup8VzDFpdi6+SzJnO7Ug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jJjJN57Jwz1PFJ for ; Tue, 03 Nov 2026 09:02:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 459d9 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Nov 2026 09:02:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 87bba0ac1178 - stable/15 - amd64 FRED: enable interrupts after user EXTINTs and NMIs List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: Commits to the stable branches of the FreeBSD src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 87bba0ac11788cb3a7ee48dee64e01e57b6f39f7 Auto-Submitted: auto-generated Date: Tue, 03 Nov 2026 09:02:28 +0000 Message-Id: <6ae9a324.459d9.5d0cd05a@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=87bba0ac11788cb3a7ee48dee64e01e57b6f39f7 commit 87bba0ac11788cb3a7ee48dee64e01e57b6f39f7 Author: Konstantin Belousov AuthorDate: 2026-10-30 13:01:15 +0000 Commit: Konstantin Belousov CommitDate: 2026-11-03 09:01:20 +0000 amd64 FRED: enable interrupts after user EXTINTs and NMIs (cherry picked from commit 91d9fbb6e1537009c35ec0c1c37ca09b28c0b31d) --- sys/amd64/amd64/trap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index ae5199c309e2..60a5cdd5abee 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -1635,20 +1635,20 @@ trap_fred_u(struct trapframe_fred *frame) switch (type) { case TF_FRED_EVINFO2_TYPE_EXTINT: trap_fred_extint(frame, vec); + enable_intr(); break; case TF_FRED_EVINFO2_TYPE_NMI: frame->tf_idt.tf_trapno = T_NMI; nmi_handle_intr(&frame->tf_idt); fred_out_of_nmi(); + enable_intr(); #ifdef HWPMC_HOOKS if ((td->td_pflags & TDP_CALLCHAIN) != 0) { int (*ph)(struct thread *, int, void *); ph = atomic_load_ptr(&pmc_hook); - if (ph != NULL) { - enable_intr(); + if (ph != NULL) ph(td, PMC_FN_USER_CALLCHAIN, &frame->tf_idt); - } } #endif break;