From nobody Tue Nov 03 09:02:03 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 4jJjHv6Wr1z6yPXt for ; Tue, 03 Nov 2026 09:02:03 +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 4jJjHv3kT2z4K4v for ; Tue, 03 Nov 2026 09:02:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793696523; 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=GHtxUWZxBMNzwEH58fFC7TvqWrW8ol5O7X6AkinObas=; b=bqOgqKwap01Zs0tEC7c0hODmfgp2rcNYJBF8fG2jT89O639DGeZ3bklSrBZySjdHG1TU+E L2L0gL5/7zDzHBK1oMZl5dJo5kABANDfDuGTWBk6FY6rc4yLmGEuWYcGzPJELXX6IWslRo b0V8PzCkDwzZ6OaihzDQRPpz0d2OGQFDH1pjeKIBCWA1sfpK1DOT81Fca0nUdP4TX338QQ LK8TliTNvpss+xYhwm6zhsDEHTEvz9uzjHHUv0QrOPgi+A9rtmLErCDVu25kyrHXLOGMJ/ i5xYewbgkaFzTTPuREb0K7Lr7GSyWCHyMPY954hn5lTsDebc7gkihPY5qImJTw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793696523; b=d6SctcYqF78zpskvc59Vhp5KYqjZZbAAMOEejYF33IHD+/YUGwFaB1UjmmigQ9+MjoZann Bkkx2pEXkEcdqDcSUcXsIe3xYV3M1IPfLgapmEvrkRrhh87c/N7MM8TyCCQwJJo5zEdVPg E1QRQ3pUonWz+R4Wl9Htov2/IW24VA6FKIpx2lFzZ5Sr+Ov4vhXCoJSu+6a76h38lqScQb Qor0Q/opTBR8QpHUCYCx3Ha9MQcIae4JDir/St+S+BcVx8BPz8XoTvCnR4hjspT8yChZwY BJEFvQR1/PkN2IfJdzyrOF9vvZL4wKX3iwpjFYQyII0uee2jwMZAX6a90ohewg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793696523; 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=GHtxUWZxBMNzwEH58fFC7TvqWrW8ol5O7X6AkinObas=; b=CzHfuhL5KfRGmB98hPl90Zs1Lag6k508RA3f2Znlb9riZI9nhbH7atJ4FJc7EBXgDkEJCw hxSxFAnHdTZGV81KktO7ba9ay/lWfB6ARSjbgDczQABf4x7YEQ4sIL1jSBoNuDqYAsq0TO 2TL0GpGS5O6usg5Fyij7hd92+EdeMeIA01B56Hk/NG387J5Cq1Qgc/5joyi9TbRIJr6lEM BnHo6CQlUEmAjVQcuoNvqyadxlZoMFO1RMuknYcocS8GS6g3uDsiRAOvzUxDo+G9Ttlfyk Ug3f4cuFB4i7Yr+11FFIkwCshSEafzwmXsfgvY1mTnjQWHZ8wD4+izKwePaGIA== 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 4jJjHv2PFfz1P9N for ; Tue, 03 Nov 2026 09:02:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 446a4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 03 Nov 2026 09:02:03 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: b9fba0c59689 - stable/15 - amd64_cpu_init_fred(): set stack level for NMI and not #NM 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/stable/15 X-Git-Reftype: branch X-Git-Commit: b9fba0c59689aebd930d04b34d2dfc223afe86af Auto-Submitted: auto-generated Date: Tue, 03 Nov 2026 09:02:03 +0000 Message-Id: <6ae9a30b.446a4.419f497f@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b9fba0c59689aebd930d04b34d2dfc223afe86af commit b9fba0c59689aebd930d04b34d2dfc223afe86af Author: Konstantin Belousov AuthorDate: 2026-10-27 08:54:43 +0000 Commit: Konstantin Belousov CommitDate: 2026-11-03 09:01:13 +0000 amd64_cpu_init_fred(): set stack level for NMI and not #NM (cherry picked from commit 787e2e411d2a169fd28581f9bbf1e87c51757303) --- sys/amd64/amd64/initcpu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/amd64/amd64/initcpu.c b/sys/amd64/amd64/initcpu.c index 2d2f5835e3b3..925f312421c5 100644 --- a/sys/amd64/amd64/initcpu.c +++ b/sys/amd64/amd64/initcpu.c @@ -416,14 +416,14 @@ amd64_cpu_init_fred(void) /* * With FRED, there is no need for workarounds requiring * dedicated stack for #DB. Also, there is no need to have - * separate stacks for #NM and #MC, because CSL rules ensure + * separate stacks for NMI and #MC, because CSL rules ensure * that interrupted frame is safe even if NMI was interrupted * by machine check or vice versa. * * Still, we need to provide a stack for events that can occur * with the interrupts disabled, to avoid caring about the * ordering of the context update in cpu_switch.S. Use CSL 1 - * for #NM and #MC. + * for NMI and #MC. * * Since double fault handler is used to handle stack * overflow, it gets the dedicated stack, of the highest used @@ -432,7 +432,7 @@ amd64_cpu_init_fred(void) * CSL 3 is unused, and we have some space to re-arrange this * if a need in the future appears. */ - wrmsr(MSR_FRED_STKLVLS, (1ul << (IDT_NM * 2)) | + wrmsr(MSR_FRED_STKLVLS, (1ul << (IDT_NMI * 2)) | (1ul << (IDT_MC * 2)) | (2ul << (IDT_DF * 2))); wrmsr(MSR_FRED_RSP3, 0); load_cr4(rcr4() | CR4_FRED);