From nobody Fri Oct 30 13:47:46 2026 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 4jGMqR3VVKz6wtZS for ; Fri, 30 Oct 2026 13:47:47 +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 4jGMqQ705Fz4gxp for ; Fri, 30 Oct 2026 13:47:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793368067; 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=+6wvttKrpjEKNj2anrx4lExmcpmIAvrEaFVhNdO8uEY=; b=dEunAt4QxdHZ8rLIkQun+VXRwjmcC9CXrn23Y1vCi6lELTU2Nphv9/gt1y/OGrSUWvK2/c JbIHLsObanSCrxiIx5SGlAAIra5dFSyztdqoZIjTGreX3VkQzAj7KQcATArRc0HFrsdMLC U4Y12XPPNeVBnmTbPPfF2vhDKaSMOBEoUrmso+LChVA6p3YPJ9LD1pvajolixaDF6k7vpU FoWzZ3wxS2PNZs06l2Pwoqndk6Z3En0dJjXLJuovii3ts4llft4fl0CNdLes4epzXlakJd CJzKTRjPGdnWU7wUTgGNuALZw+6s+Y8LKrVSn52UZcQK5/7BrpBp/oC+7BcEvw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793368067; b=xIWv0DKyR9Eclxb8PFExvnCm05Dx1yAgx1zR+mysTK3ULEYnA5ReRJ0PtHpaC4zsDNQlNw sgep9zHUMXVWJDjAvERjHOUCXDUef5cW1svqTBVUbw3HBCoHsR3EZqf85WSq3bKx+8tOZR uIZFso8rCvCEEMGam4yLXu8OCOt23KdF/+G6RhOVY3auSJ/DQhAjBQxO3zxoADu2hXuHN6 yR1T3SbsomzpNtO+Evfsn87xuQ6OHv3Ob7Tpe3AWnI6YNU1etDkhfwphfSyyzrqhIIa8EV zJvetB3Vn13YSr1FKo3Jv4lP6tnyBks5nkAWr2R+87mJKsCRjHGSU1h6M0YH9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793368067; 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=+6wvttKrpjEKNj2anrx4lExmcpmIAvrEaFVhNdO8uEY=; b=pm9vzoxzypuUm+wAV9hMdIQ4PdT8gBs40RMkWTrGsR1MzCcZLBacQs5hyyomLvOAoaq3uT AYvlLgHUrsapVJNqNGf8WvPcxQ5G1RhzWCXoRVpxq4WUQ9VSck62NYOFQAfblbdPnyHni0 khRa+nMBJCS8ovnwM63A89g3BSK0ZUjAuYaNX17NUv0BH/tncqqjHUAJlD/XUQEcZBgWHj Ani1JlINflyyLI10PZT4iAa3AXaK7j+wAGMSYgbBKQSYZpMY32Jt4uiCpDqrSILU/v8xWS ObocB6L/GR1WgZ/6zBWkxocRTwYPhNr4sYKKqoGPYBCjDO9wqS8YwDld3Sb5zQ== 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 4jGMqQ5yWyzSxj for ; Fri, 30 Oct 2026 13:47:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f1be by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 30 Oct 2026 13:47:46 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 614b6597e702 - main - amd64 FRED: use symbolic constant for the NMI unblocking bit for ERETS List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the 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/main X-Git-Reftype: branch X-Git-Commit: 614b6597e7025b5b1dd23f058e53e8c28dc28efe Auto-Submitted: auto-generated Date: Fri, 30 Oct 2026 13:47:46 +0000 Message-Id: <6ae4a002.1f1be.11c9c573@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=614b6597e7025b5b1dd23f058e53e8c28dc28efe commit 614b6597e7025b5b1dd23f058e53e8c28dc28efe Author: Konstantin Belousov AuthorDate: 2026-10-30 12:46:52 +0000 Commit: Konstantin Belousov CommitDate: 2026-10-30 13:47:12 +0000 amd64 FRED: use symbolic constant for the NMI unblocking bit for ERETS Sponsored by: The FreeBSD Foundation MFC after: 1 week --- 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 ba997dd0ab84..85c5c50085a3 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 d0331e3bdfd9..aaeef58bf8e3 100644 --- a/sys/amd64/amd64/genassym.c +++ b/sys/amd64/amd64/genassym.c @@ -204,6 +204,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));