From nobody Tue Sep 29 00:31:52 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 4htzdP26qcz6t4gy 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 4htzdP0162z4Vj2 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=1790641913; 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=Rxo/Njm4lsDwRlprZ4rPb+4wPYxoC6JsOgA8xJUFTXi+s0byenWyQhGxm1kGW4KuDrdInA FPTF5iBooFJQr3CDfuEAwi6ZaIF7K6ehROymmH2KsjT64kpH/sJeeQUyiQFZk3FjeJYLYa JxG2byQSF5MB+ELkDn6jms3DgvLT+HN89curemhvXG8cw3uG1egDdTLE0WQwlODrJGSg/e UAiR6G/S4S+4c1huvDwgBqeV3XAs9rvMwn1K34H7Kvb8fiBMNN6S+gin+55RNDOswYPHiV uNEJJA3aoh2xV2aCbIGBf1aiT7LGKF/kSq9YjmL2tdIA5IOFORPeMTrKWwcJdA== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1790641913; b=bsTV4VjNOWIUkR9RqBW4A84uN4VaFwl5of1/cz7UJpooheldnizoVI1gDbVVfYXVWy87lJ tPMdDwpWyuiWqrXI82ozC1dxKw/8z8AvUIgROK7UNM2AZ28TwelcR42Br4hZltAVJN44a1 ORnE05orK4XikvtOcngZscNyT+TIZ4maNv3gusEzY8xZLLh+nBGnkMEYaez23UjvD7IfTz gXxWsFGyNmDZFRUSQWq7cpfMyY04mUCgxNbHlmchEicMV+px6tFo2V5adtK1sTLEOM17rO D8M1Hbq0NAMMVxgTX1Zp00mkw1WDLQIrf9dmrNH3IbLaDL5yaqxPAR/7azg5lw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1790641913; 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=KFZ96H4HMcbHkUXb5U4oTKMpnauSb43WYhJbX0RB05V8PkggogDqe55QowzgCDlTa9utCS q8r6fyxmkeqMP76g2L43NfB0U91bVO7TVGIBhe95qRQIpSBxQUL2beVCaJV529lX1ErW1L J8GKtm+WPmK09XWPt2b3kih2D3fBTJaJ/sTk8z3WlrRdAj8UI96vxn6PGfFvLwOjnE1cci Rsmm8S7E9LIskaIvKctsvzdVSe4V+Sww+IbVtmuOu47UA0DzIKcSnanlLspBk1GR1KR4ZF SBvMraG23ipL7Qu4XctL27htR5SQnBXmtMNoxnBajQ+2l/K3ylTN7jhs7mawBQ== 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 4htzdN4gJhzrjS 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: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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)