From nobody Thu Apr 16 15:12:14 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 4fxM1p5vB2z6Zq2H for ; Thu, 16 Apr 2026 15:12:14 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fxM1p3Xcdz4N53 for ; Thu, 16 Apr 2026 15:12:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776352334; 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=70+ZJqPXZeknOWMFx7FPA804NSu6gqorTzMxFKqpBIk=; b=jFeMJPIexi40syJjpQXK0MVe3mhZWtlCwyZAeDlDy/uNchncxMvN1237Uouxd1ycJgJP2J apwJN+VKUA0ONmU1F8F6xhQ6TSR6b2R+2EwzWB7uWPcKOTRq4FlJphq4ZsEJrAg/RaHDnK 5ETEHZWyzqH6a9+AX8XvoJjfMWWWRvO4tjMpBg7qhLyKuKwcRuh16+aw0feT8AdIBvwBWB JNW5EcelyMDYbI7OsD6JleJ0ja2/93hqAV3PAgYSt3KvPtrmI3FpVibAND9Jb/ZWvLQ0+g xnmsga1ja06HbCV+UDVviUjBJlP3cjB4u+Qi2NU9jBIKSJktw6uMBVaXqBYolg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776352334; a=rsa-sha256; cv=none; b=con09Nel0CbQRMgoMCw89YJrdfea8A+4dyCXXfBOscVkFct9vzC6DMtC8RnTxw8BcpWeU3 s/kztv02015wCt5XkSkOTXkXDB9A+j7uDwbqpmOUOaXLWhTi7qpc97ImHwVsbRnZ3F4bRS nSK3lE7pVYNwfM20oWanXnH5KJj3f5dTyxVS/PaUiZ5EAJRujAPSQwqiYsMQpFLcqf6RwA Y+QFV6+l8incuxkh8SjbMajp7lP9IPkf3+gMWr7MIWwtDIGgqpv6hLGOU2BSkrgll8fXQx 31O9eR4UQpQUTHmioIgImiLY71qyR3/yxoZgPwr9zjovjvDtp8/jrCy6/hyekA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776352334; 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=70+ZJqPXZeknOWMFx7FPA804NSu6gqorTzMxFKqpBIk=; b=gi++BmDgcOLh9Uyna/Th68gEvXMTTK8bEdH0xVy4F9wFlS5oS6PKrxpToc++yaQM74IGQK dp3/hnjN12CGeGS/FoQ4p43PxUWl6bDNVVXeRR59ItuLcB4r3pvxI0AnzO5EcwpHny3j81 ndzqTBhsl1/z/RGfgjWgGFaulifsyjEMBvUEuqq9l1k1P8ZUZOlKoe7xy2CWahuaalriOq q9kfqs08C1lDlYqb9tg4pchD9tDOhm0ZFT/DIKPf35zfePuYo8jj6xzQSXB5+gqajvilut QvHPU3F9dODN667I3gNHstQHlySIyR3f7WbOKhkCV3kq0bBO22k05te8kGU+TA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fxM1p2tjCz1CBN for ; Thu, 16 Apr 2026 15:12:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1c6f7 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 16 Apr 2026 15:12:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: David Woodhouse From: Colin Percival Subject: git: 020a2480f553 - stable/14 - bhyve: Add CPUID_BHYVE_FEATURES leaf 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 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 020a2480f55303f757e9683d05213ae3266e7831 Auto-Submitted: auto-generated Date: Thu, 16 Apr 2026 15:12:14 +0000 Message-Id: <69e0fc4e.1c6f7.1a36b66e@gitrepo.freebsd.org> The branch stable/14 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=020a2480f55303f757e9683d05213ae3266e7831 commit 020a2480f55303f757e9683d05213ae3266e7831 Author: David Woodhouse AuthorDate: 2025-08-11 10:44:05 +0000 Commit: Colin Percival CommitDate: 2026-04-16 15:11:41 +0000 bhyve: Add CPUID_BHYVE_FEATURES leaf This allows the hypervisor to advertise features to the guest. The first such feature is CPUID_BHYVE_EXT_DEST_ID which advertises that 15 bits of target APIC ID are available in MSI (and I/O APIC) interrupts, as documented in http://david.woodhou.se/ExtDestId.pdf This defines the guest ABI. The actual implementation will come in a subsequent commit. Reviewed by: kib Pull Request: https://github.com/freebsd/freebsd-src/pull/1797 Signed-off-by: David Woodhouse (cherry picked from commit 313a68ea20b48629f655cf38987f4a6ff822f1ab) --- sys/amd64/vmm/x86.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/sys/amd64/vmm/x86.c b/sys/amd64/vmm/x86.c index 744e2bfd57db..eea334562784 100644 --- a/sys/amd64/vmm/x86.c +++ b/sys/amd64/vmm/x86.c @@ -49,7 +49,12 @@ SYSCTL_DECL(_hw_vmm); static SYSCTL_NODE(_hw_vmm, OID_AUTO, topology, CTLFLAG_RD | CTLFLAG_MPSAFE, 0, NULL); -#define CPUID_VM_HIGH 0x40000000 +#define CPUID_VM_SIGNATURE 0x40000000 +#define CPUID_BHYVE_FEATURES 0x40000001 +#define CPUID_VM_HIGH CPUID_BHYVE_FEATURES + +/* Features advertised in CPUID_BHYVE_FEATURES %eax */ +#define CPUID_BHYVE_FEAT_EXT_DEST_ID (1UL << 0) /* MSI Extended Dest ID */ static const char bhyve_id[12] = "bhyve bhyve "; @@ -102,7 +107,7 @@ x86_emulate_cpuid(struct vcpu *vcpu, uint64_t *rax, uint64_t *rbx, if (cpu_exthigh != 0 && func >= 0x80000000) { if (func > cpu_exthigh) func = cpu_exthigh; - } else if (func >= 0x40000000) { + } else if (func >= CPUID_VM_SIGNATURE) { if (func > CPUID_VM_HIGH) func = CPUID_VM_HIGH; } else if (func > cpu_high) { @@ -603,13 +608,20 @@ x86_emulate_cpuid(struct vcpu *vcpu, uint64_t *rax, uint64_t *rbx, regs[3] = 0; break; - case 0x40000000: + case CPUID_VM_SIGNATURE: regs[0] = CPUID_VM_HIGH; bcopy(bhyve_id, ®s[1], 4); bcopy(bhyve_id + 4, ®s[2], 4); bcopy(bhyve_id + 8, ®s[3], 4); break; + case CPUID_BHYVE_FEATURES: + regs[0] = 0; /* No features to advertise yet */ + regs[1] = 0; + regs[2] = 0; + regs[3] = 0; + break; + default: default_leaf: /*