From nobody Tue Sep 29 00:31:52 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 4htzdP07G5z6t4x4 for ; Tue, 29 Sep 2026 00:31:53 +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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4htzdN5m16z4Vht for ; Tue, 29 Sep 2026 00:31:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790641912; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H+ftlgk/3h46AneSUZ7hdvQNTkGm/I61TlPxO1rHJp4=; b=W7fbunFaB2ADVIWqrkacDTObLINjLPxxS0krOf78QaLShTfO0XXhx+0hiUWTAUXJ+/9Q85 5rolvC2F7UyMmXop8Hy3GxmEFqlNDib+u6HpzUIA9JKDVx/N6/HglHxty/FtqV0lYj+oax Oux4PAWgCuB+qvTnCHXHNv+dpZtG6bGRkgDcsw4rGfmy9r1Z4gAODQGHVc8cbceGziqiEu lLcea6adfHIoEHwBoB4Gl9FqQ2VeYsK5vq4ZspoAQDVpEQiROE9OO9pqbKCHeoHi3V9LWO YTH0F3Uf7mH3hPmkMnMHRo81zcicqanK9SHuFKxxAkXJ4j3sb8T6AdDXOfaapQ== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790641912; b=Pe4FvFw+E22mFR/8KCzoZONJjgaNkF6V5VOaBJCT40B6v+ImcXK6tuZvg51PegVJ0hQnq6 IIEE4AtLe6aAG1EDpTg8spdYKRuswi9SKGh9PkjfzAsiCEnL5MbAb7u7GJPG/w/FwCn/Mo 96VNWK5TUb1W9tyimeZo5C/zxOns8hwHJGwNmAraHbyUQ3JVsWtdAIxfdOdz8S5yRQpEyY DHWTFgCLnd5rBncv20ZqPs6/1wmwEZxb/WOLcU6Sttwi4trpaSEimfqY9g5MbwZobsOpF3 ydXwUNUlXt9ADxRnmokyxqajuaUmsymyyb8dBMlaaFyY3gguKG1U0tXbctKlbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790641912; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H+ftlgk/3h46AneSUZ7hdvQNTkGm/I61TlPxO1rHJp4=; b=OT/VDIw/wn0uQHK8itJDbA3PJS/mpb63TCuHFylCzGAv/XUtZsPFK7I9ASTBKX0eoRsvIX vLTtomz/6tXfkcIblvfWhwnXg5oXECFdxR9qRDgs/AI0J2w6kQ4muCixQjYE42aDK/wtRV r8JHM6roe6GPiROjP6i6qOSdtQaRksJKOenRwOnVYBcGdEFJgDDLoF1TgQwhBwrUghlp2n PDNCNT/VxHNzRdbksZWD7BlLHwHOcAEtWHfjqEcbEnANxfNk6TWueAsx602f9yNoajg/3E Z0p9H2foVVynq0otm765bGJfSBenUBZ4S4qdwc+lWXxlPXFf1PmtohBE8TO2NA== 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 4htzdN4fFtzrjR for ; Tue, 29 Sep 2026 00:31:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3cd4a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 29 Sep 2026 00:31:52 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Brooks Davis From: Konstantin Belousov Subject: git: 54cb4bf00b82 - stable/15 - amd64: gate WRMSRNS immediate form on compiler support List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: 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: 54cb4bf00b82f4a9cafb9942089aa00bfcca06f0 Auto-Submitted: auto-generated Date: Tue, 29 Sep 2026 00:31:52 +0000 Message-Id: <6abb06f8.3cd4a.e32f5fb@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=54cb4bf00b82f4a9cafb9942089aa00bfcca06f0 commit 54cb4bf00b82f4a9cafb9942089aa00bfcca06f0 Author: Brooks Davis AuthorDate: 2026-09-26 11:43:34 +0000 Commit: Konstantin Belousov CommitDate: 2026-09-29 00:27:13 +0000 amd64: gate WRMSRNS immediate form on compiler support (cherry picked from commit 53fe018630d06eeef6791cfacaa6dc9acdf4d669) --- sys/amd64/include/cpufunc.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sys/amd64/include/cpufunc.h b/sys/amd64/include/cpufunc.h index 1703d0109595..7144866273fb 100644 --- a/sys/amd64/include/cpufunc.h +++ b/sys/amd64/include/cpufunc.h @@ -392,8 +392,18 @@ wrmsrns(u_int msr, uint64_t newval) __asm __volatile("wrmsrns" : : "a" (low), "d" (high), "c" (msr)); } +#if defined(__clang__) && \ + (__clang_major__ > 20 || (__clang_major__ == 20 && __clang_minor__ >= 1)) #define wrmsr_imm(msr, val) \ __asm __volatile("wrmsrns %0, %1" : : "r" (val), "i" (msr)) +#else +/* + * When Clang does not support the immediate form of wrmsr, decay it + * to plain wrmsr. + */ +#define wrmsr_imm(msr, val) \ + wrmsr((msr), (val)); +#endif static __inline void load_cr0(u_long data)