From nobody Tue Nov 03 09:02:27 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 4jJjJN1XHNz6yQ3d for ; Tue, 03 Nov 2026 09:02: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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jJjJM6cnyz4Kjr for ; Tue, 03 Nov 2026 09:02:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793696548; 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=iRSBbnNL3qsmjW4t1jJY8GV8cJhlr2vBiyq7h5UtHVI=; b=QyO1D1CjaoaFJUsd0/7RuZgtGTGhRU2KZTFgJwkq/0HoBSydGODLkznkh6U2JoEL71I/6f LF7SSQjkfJvqax7gxqcCfBFmrbVxo9qCwNVEpMugtNbSH9VJuFBUv1kImZ0qpxWf94PR06 M9VYEi5X7HjwYml6QYkN0WB+NDP4GTF/9owuP+7MdY1La5nSuhDOvpssWprD5g78WPjpVH E6Qvra1geoaEHFJ6NXrXjieWv5zGxlnghOH9v8S1H0PWFl3ApDuDe5Pmm9TuvhrjEov98t A6pJvanbGsQQTUH3gTOR3VcbHgaOEulKsgOka1RmzXRtdxu/K5OgYEdO7LwELg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793696547; b=BoELCRLhyUwqEd9r7NZ09f9K4auadk1IfTqWxEq4Dls3K/dfWsmZ23UExwnPPPFsA43YjF vQJcFaS3P7CMWFaiRt+uwZNdp6dXo0YNRFbU9I8uhoN7TfsuZM5RFiDziwfPr3hmDkLJXu cIYyEIPt+5Q3DZ8BU1heYst2taevQAjvbbDRLf1BqealXizDU9Hm8LqvoKzkI6Gb2+uwwe MLyiSzCTurVX1IdXIOLQVQjMQzGYJyh5Y2ldmHUna93FpdYkXTdHaTv58DRXEaIoNpspKM LcA62TVu6H/vtQ+xLMgFFDOukmmOS+GtePIuwzMiuJ3dmIiYIfQpsoYRcdhpeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793696547; 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=iRSBbnNL3qsmjW4t1jJY8GV8cJhlr2vBiyq7h5UtHVI=; b=XREHfL1FcU4fpq8riUQOz0kabM1mtWEDCyAkv+r49XainVqaZSjkzjg71gx0LohceCN9+e c1mIiYr/ZEAHE7a2bs70RH1LTQC2PRGpzl6wshlDWOPlcfc22IGaltidwDc8tK4hBK69Eq UH4+1Qqtjv16M3B+cp0ZxK+H5gy/yB0bjLemchx1Ga/pcXJJcOQZ0Birw0x6GNJG6JCI40 FuekpCneUJYhTTFYYwEI4hLW+4QRDRkHspp2KBjVE7WqYFCyQ93qIxLQqfqqhPOzrEafH1 N1Ztcy7B8borZuMp1BWjRWzrsyBjUK4QFV3G1xORwhlhkeb28s82KDXi4LzYng== 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 4jJjJM4JJKz1PYy for ; Tue, 03 Nov 2026 09:02:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 44721 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Nov 2026 09:02:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: d3040b1cf1e2 - stable/15 - amd64 FRED: use symbolic constant for the NMI unblocking bit for ERETS 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: d3040b1cf1e23333620ca9105601356619c5a0ea Auto-Submitted: auto-generated Date: Tue, 03 Nov 2026 09:02:27 +0000 Message-Id: <6ae9a323.44721.59a22860@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d3040b1cf1e23333620ca9105601356619c5a0ea commit d3040b1cf1e23333620ca9105601356619c5a0ea Author: Konstantin Belousov AuthorDate: 2026-10-30 12:46:52 +0000 Commit: Konstantin Belousov CommitDate: 2026-11-03 09:01:20 +0000 amd64 FRED: use symbolic constant for the NMI unblocking bit for ERETS (cherry picked from commit 614b6597e7025b5b1dd23f058e53e8c28dc28efe) --- sys/amd64/amd64/exception.S | 3 ++- sys/amd64/amd64/genassym.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/amd64/amd64/exception.S b/sys/amd64/amd64/exception.S index d81d942b4b22..c259f6df0332 100644 --- a/sys/amd64/amd64/exception.S +++ b/sys/amd64/amd64/exception.S @@ -1699,7 +1699,8 @@ fred_out_of_nmi: pushq $0 pushq $0 movw %ss,%ax - orl $(1<<18),%eax /* NMI block release for ERETS */ + /* NMI block release for ERETS */ + orl $(TF_FRED_EVINFO1_NMI << 16),%eax pushq %rax pushq %rbp pushfq diff --git a/sys/amd64/amd64/genassym.c b/sys/amd64/amd64/genassym.c index 96421a90a102..b03c9b8062d2 100644 --- a/sys/amd64/amd64/genassym.c +++ b/sys/amd64/amd64/genassym.c @@ -202,6 +202,7 @@ ASSYM(TF_FRED_EVINFO2_SYSCALLVAL, TF_FRED_EVINFO2_TYPE_SYSCALL | TF_FRED_EVINFO2_VEC_SYSCALL | TF_FRED_EVINFO2_LM); ASSYM(TF_FRED_EVINFO2_INSTLENMASK, TF_FRED_EVINFO2_INSTLENMASK); ASSYM(TF_FRED_EVINFO2_INSTLENSHIFT, TF_FRED_EVINFO2_INSTLENSHIFT); +ASSYM(TF_FRED_EVINFO1_NMI, TF_FRED_EVINFO1_NMI); ASSYM(PTI_RDX, offsetof(struct pti_frame, pti_rdx)); ASSYM(PTI_RAX, offsetof(struct pti_frame, pti_rax));