From nobody Sat Jul 11 08:40:05 2026 X-Original-To: dev-commits-src-main@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 4gy2Fd5MNbz6khlp for ; Sat, 11 Jul 2026 08:40:05 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gy2Fd4Tmcz3y27 for ; Sat, 11 Jul 2026 08:40:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783759205; 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=AwFOKScIT3dRxGw5+coVbR46B4K53jt206X0W9dxIWE=; b=qRRFyz1LDZrK8moBTo/qvQYRV9Oak6a9D/UGZMjL6bUO6zged1ojd5sk3Vq18OcfriJRjy SNftbv6C8leFF9ysaeph6g9vPcWEn8kGKFuNghKlORrbbNTgckDTi7h2d+OwXaCQ7PCVbn oYbruMFqlbPWLXNejt0q7wn8O6iSJAEEQ1+NngMR1L4gkkLR5u1HcybdTAbMbwOhga6hoA Kw8Gt6SQUPBaxvyGN+6pXKvvxXfmZy1B+ReglaLiVCdjFmV8sis310WjhO061h3tKOTK2V e+sBxL24Dux0l34NXLzq5UNqRvrq2h5afZhGvC+7DMuCNO/wW8nbuhx1nTJXrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783759205; a=rsa-sha256; cv=none; b=E3ob8OxMxSDIZcYNlsJaBNIH95HEbrD3d0URrjR48kHAIw3MvaUDSnYlleCfv0tbeZG97G mOXa8YMcNfcKE3uSTSquuvS5ycvHaf3DnTtitP88n6K2MNNFbhDTzU9zXs87pgAtunbCMc pUu924fNEov7lKTsyrarL5OkCcSI7nrU4D/rz9eEftoCgfwZu8ZuV0nKXhPP7qf4Na5Azq aOctDRIpeNjfOJLPZ6DzQ9zhB4Pd5blZsYqFE32PWBpYzPQN5N9OnI8N+RBvRCRsnOHeeb Vf1xIKJ0IW2Ag6hSqUPx6jgd1jD3R7iotnFr02rqRdXj1aYQgbaJS6sJr3vNdw== 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=1783759205; 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=AwFOKScIT3dRxGw5+coVbR46B4K53jt206X0W9dxIWE=; b=KLURraIh166CIGGLD34w/HtYEEwQc5Hghl0eMpdyyEM7o+TiNaGahU3CvYAbTfEsppqmEc 5hD8anKgzJ2Gu833juKdFuVDwc+pRZ6KtpZ4U/mHjw+ZjLWlBFKL5zaEdmmsVAwxMyqt80 4FCWmnCMKKco6w+CyRpJCwbo98R89agJJr1xm/9opEyeHEj9AoukYL8pTqhvgA4WbvW+pi X+K4+S9HmIUdr8VVu8vcZhc4T01Bx5uFNU5z4y12fChayeDdC+7wOf+tUIMtRqrcPWKyw1 6EMPPpIE8Sb9S53rdJOY7A9dy1L5Qozeh8Tg4v5GVlnrysZAihbrqv76jxA/hw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gy2Fd38C4zb4H for ; Sat, 11 Jul 2026 08:40:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 317d6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 11 Jul 2026 08:40:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: ShengYi Hung Subject: git: 86691d52a6d3 - main - kvm: Support non-default CPUID leaf List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: aokblast X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 86691d52a6d3796ad36ba474cf0a9493f6d99202 Auto-Submitted: auto-generated Date: Sat, 11 Jul 2026 08:40:05 +0000 Message-Id: <6a520165.317d6.7830b157@gitrepo.freebsd.org> The branch main has been updated by aokblast: URL: https://cgit.FreeBSD.org/src/commit/?id=86691d52a6d3796ad36ba474cf0a9493f6d99202 commit 86691d52a6d3796ad36ba474cf0a9493f6d99202 Author: ShengYi Hung AuthorDate: 2026-07-10 09:21:11 +0000 Commit: ShengYi Hung CommitDate: 2026-07-11 08:39:36 +0000 kvm: Support non-default CPUID leaf KVM does not always use 0x40000000 as its CPUID base. For example, QEMU adds a 0x100 offset when nested virtualization is detected and the host exposes Hyper-V enlightenment hints. To accommodate this behavior, switch the detection logic to use the CPUID leaf returned by do_cpuid(), making the implementation more flexible. See: https://github.com/qemu/qemu/blob/master/target/i386/kvm/kvm.c#L2300 Reviewed by: kib MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D58146 --- sys/x86/include/kvm.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/x86/include/kvm.h b/sys/x86/include/kvm.h index 83dd20fa8d23..5414075f89d6 100644 --- a/sys/x86/include/kvm.h +++ b/sys/x86/include/kvm.h @@ -45,7 +45,7 @@ #include #define KVM_CPUID_SIGNATURE 0x40000000 -#define KVM_CPUID_FEATURES_LEAF 0x40000001 +#define KVM_CPUID_FEATURES_LEAF(base) ((base) + 1) #define KVM_FEATURE_CLOCKSOURCE 0x00000001 #define KVM_FEATURE_CLOCKSOURCE2 0x00000008 @@ -63,8 +63,7 @@ static inline bool kvm_cpuid_features_leaf_supported(void) { return (vm_guest == VM_GUEST_KVM && - KVM_CPUID_FEATURES_LEAF > hv_base && - KVM_CPUID_FEATURES_LEAF <= hv_high); + KVM_CPUID_FEATURES_LEAF(hv_base) <= hv_high); } static inline void @@ -73,7 +72,7 @@ kvm_cpuid_get_features(u_int *regs) if (!kvm_cpuid_features_leaf_supported()) regs[0] = regs[1] = regs[2] = regs[3] = 0; else - do_cpuid(KVM_CPUID_FEATURES_LEAF, regs); + do_cpuid(KVM_CPUID_FEATURES_LEAF(hv_base), regs); } #endif /* !_X86_KVM_H_ */