From nobody Tue Nov 03 09:02:26 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 4jJjJM0byWz6yPsc for ; Tue, 03 Nov 2026 09:02:27 +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 4jJjJL59DPz4KQs for ; Tue, 03 Nov 2026 09:02:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793696546; 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=5jNv55L4Cggo2Ei88YH+BMIrAAdeVPsxFRMqh0+rkwg=; b=BhV2Dfm/xD6sLb+S5mgmElfA7KqNxH9eeQgmR+Ejg8ZYGgkWdZznIpIMNuIpP7lK6u7fUY 2Ktlnzm1MbRGfCl6imhFgm3eSJijebOyIKIvNbxb8+Jp3IIA0G618fHDPnVkYt0oRg2cnJ btwptAmWLRlP6GxrKI330MfNuRJsRCv4ixWYnH/vXOUB9rEBO01mn2PECJRmJqky5cYa7S zkHrrWjIw1cdb6Zq3ygmMLRiM9wHvAyCQV/XziBdoPKrq6s4dDCByfofSg6yLgsEeeZIL0 XDCyDAnLX7kw7iryhTNKYHA4FEYLFZmXYD24Bn4x5zconD0DBz59uo4DSwWoaA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793696546; b=XYCEoIkORjwBZgt+6wwKHrDlj3XHh7RLq9Yea/ziywGuiy36B1Alhu6yKaXyhRUeUYTS2d pYJHwcnCMJS80ev0YCM92vumR5tonfxuJAuHEYWiyI2UlCrqybm6QUe/PgAvkdZhP9guhw 9Z8WIFRQwU/mDtTW6gk7u+blAF2vIMRR9530kZSncEjVnOFb/AqdgLwBQdnJefN69iNm6m PUhOoBff469H5aXTX16RBiXkaiVTgWL72PsrM5nHdZMFnpfNes8eGmVcNtDzgkSXL5PKgp zgLy+fbkQ+7pBzRRcEpwamLeIO1jKhTFnFkEwOCw0GVVSVwYe62au0tGOi1sHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793696546; 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=5jNv55L4Cggo2Ei88YH+BMIrAAdeVPsxFRMqh0+rkwg=; b=glGEV1p2QrktAmZtcUJwHTbkCt/7pJUrve27XuYwDyMsHnZaAqo0P2QUMTQFPzW+HuDs07 2YRNs3REBGEHHB/FgVm7m8CcRTrl2alpvwX5NIlXCXeugwcMs1DGcSB9FKiL5u7GC42//d CN43kvtlAII2ikEVwQrG6162yOdEaT4Zj6fJWpkJFLniQ04ipEPt+IlSmgtDTN60fOiv2c LZv/nMb0mqwwhJ04Hfr7m/96nLMZDW9enP1yiY9xQcZDLTEADsbQ3x8H7XedMVU+58saep FMUmN9tRf72ZEvC4FqQ8dUctSP96Fvv0oD6sSMiLHuUbY4nHRODpiceGretmRA== 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 4jJjJL3SWvz1Njb for ; Tue, 03 Nov 2026 09:02:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 447a0 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Nov 2026 09:02:26 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: eb91ae9eb20e - stable/15 - amd64 FRED: get out of NMI blocking mode unconditionally 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: eb91ae9eb20ee6b8ef6655700e2e2e173234343c Auto-Submitted: auto-generated Date: Tue, 03 Nov 2026 09:02:26 +0000 Message-Id: <6ae9a322.447a0.1fd2312f@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=eb91ae9eb20ee6b8ef6655700e2e2e173234343c commit eb91ae9eb20ee6b8ef6655700e2e2e173234343c Author: Konstantin Belousov AuthorDate: 2026-10-30 12:43:44 +0000 Commit: Konstantin Belousov CommitDate: 2026-11-03 09:01:19 +0000 amd64 FRED: get out of NMI blocking mode unconditionally (cherry picked from commit 880d2991661de74e1f800db867dc9d0eda7b1bc9) --- sys/amd64/amd64/trap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index afcd13604caf..ae5199c309e2 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -1639,11 +1639,11 @@ trap_fred_u(struct trapframe_fred *frame) case TF_FRED_EVINFO2_TYPE_NMI: frame->tf_idt.tf_trapno = T_NMI; nmi_handle_intr(&frame->tf_idt); + fred_out_of_nmi(); #ifdef HWPMC_HOOKS if ((td->td_pflags & TDP_CALLCHAIN) != 0) { int (*ph)(struct thread *, int, void *); - fred_out_of_nmi(); ph = atomic_load_ptr(&pmc_hook); if (ph != NULL) { enable_intr();