From nobody Wed Aug 13 20:32:18 2025 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 4c2Kmg1cL0z64TJb; Wed, 13 Aug 2025 20:32:19 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c2Kmg0VW0z3QP3; Wed, 13 Aug 2025 20:32:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755117139; 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=zGVrhgtu0TQfXm5rJN9IG7LbJn7cHlH+8Wnk8cxtrf4=; b=rQrkVGoMwl2ve/BxaP4mipRCSnd9GwpwQKNmkiu2wzYEy2tMQs9A9GUTmNNKmpmd0CbpWn 4FP2MFJaCg/WgZMJFIeG7KN4+CfpqwnSWJhC5K0q3PUIbLGaU+mfgyAb5YcV31LgNjYQzH ciULsDBR9wJM5nDr8U2od+evivh/gt+t8gws7xmqTFpaLif+y73DL6RM6/Z5V2IB/lDCzG UKkSCDSpd/N03+s7twSKEhZxYfF+9UvnRhA7RebY4tAOwQLZAIIv9213QllrZEItRmBgt4 b6nMZWul2dMfviJ07LLrAjK7Q8qg9pjFNYwXY+uV2OPK0L1m9NcDm3s/yhHOUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755117139; 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=zGVrhgtu0TQfXm5rJN9IG7LbJn7cHlH+8Wnk8cxtrf4=; b=nKyBx84htAZDlkbQjU9MYOYX8ABtWwc/mLPIf1+RjlQSjPnruu0G2sWAxKgVhJr8iqjFu8 iPXkj57kX6dw0EoFQYY+EU+PcIe2d12go+r8aYzGg+oY23bKd3Ofn3eEojO7S90b/7QUn8 hq8XEPv54n+f+N2TJ0Eana1gDzWQxT45JVhwjIHJv0eUlKbGBCRMFHtPvFKnh+i5aK/Cvd XEFH3S3l33MgRM2nwYJViaYaWLfSnHg+i49r4/y2eOUcHWo0zydeXCGMC3myirjOZX8Rfk 3c/ttKu63Dk2b8OXmTnnQO357ubhgw3WrAscDH2TktmGXFIKjUnpRbN50VVHZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755117139; a=rsa-sha256; cv=none; b=bWvP3E/pg0oOGgx1tjkvabLUV1dyhycLsHWG8JjewJ8CCsIwUWPwjF8kaAw+NvFNKGjTRZ vRITE88KXeFmoZUypU3j48CRUFR6Vc7HSArxxc31cpfDnwU5bwioMKa+goIMGKdhsSJuQr fsoZY5RuayHkzfdZj9a+TLLJ3fTJYX8P/DeB4PJl93uUOs8Yn75ObUlWBgTtcHZM+zS87F STjiA2c99kQRQ03Ru1FoGQd9d3/RA9QXAT/FTpRGULyzx8YYZvVedhCJPFJSbTRKI3VeY0 o62CE5JIzbQPwKp9/1/ussS2m0zp84oPkEDHvvlUykv4/eY+tMeIGPJNAZvKcA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c2Kmg068lz7b4; Wed, 13 Aug 2025 20:32:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57DKWIo7075605; Wed, 13 Aug 2025 20:32:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57DKWI7w075602; Wed, 13 Aug 2025 20:32:18 GMT (envelope-from git) Date: Wed, 13 Aug 2025 20:32:18 GMT Message-Id: <202508132032.57DKWI7w075602@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 313a68ea20b4 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 313a68ea20b48629f655cf38987f4a6ff822f1ab Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=313a68ea20b48629f655cf38987f4a6ff822f1ab commit 313a68ea20b48629f655cf38987f4a6ff822f1ab Author: David Woodhouse AuthorDate: 2025-08-11 10:44:05 +0000 Commit: Colin Percival CommitDate: 2025-08-13 20:31:15 +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 --- 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 366f1da9f850..9c2fdac11a81 100644 --- a/sys/amd64/vmm/x86.c +++ b/sys/amd64/vmm/x86.c @@ -48,7 +48,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 "; @@ -100,7 +105,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) { @@ -601,13 +606,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: /*