Page MenuHomeFreeBSD
Differential D1010

Rework hypervisor detection.
ClosedPublic
Actions

Authored by jhb on Oct 26 2014, 8:30 PM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Mar 10, 2:09 PM
Unknown Object (File)
Mon, Mar 9, 6:22 PM
Unknown Object (File)
Mon, Mar 9, 11:23 AM
Unknown Object (File)
Sun, Mar 8, 10:04 PM
Unknown Object (File)
Sat, Mar 7, 7:54 PM
Unknown Object (File)
Fri, Mar 6, 11:52 AM
Unknown Object (File)
Fri, Mar 6, 11:52 AM
Unknown Object (File)
Thu, Mar 5, 5:12 AM
View All Files
Subscribers
allanjude
delphij
emaste

Details

Reviewers
grehan
jkim
neel
delphij
Commits
rS273800: Rework virtual machine hypervisor detection.
Summary

Rework virtual machine hypervisor detection.

  • Move the existing code to x86/x86/identcpu.c since it is x86-specific.
  • If the CPUID2_HV flag is set, assume a hypervisor is present and query the 0x40000000 leaf to determine the hypervisor vendor ID. Export the vendor ID and the highest supported hypervisor CPUID leaf via hv_vendor[] and hv_high variables, respectively. The hv_vendor[] array is also exported via the hw.hv_vendor sysctl.
  • Merge the VMWare detection code from tsc.c into the new probe in identcpu.c. Add a VM_GUEST_VMWARE to identify vmware and use that in the TSC code to identify VMWare.
Test Plan
  • Booted the patch under bhyve and verified the origin string in dmesg as well as setting of kern.vm_guest and hw.hv_vendor sysctls.

Diff Detail

Repository
rS FreeBSD src repository - subversion
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

jhb updated this revision to Diff 2116.Oct 26 2014, 8:30 PM
jhb retitled this revision from to Rework hypervisor detection..
jhb updated this object.
jhb edited the test plan for this revision. (Show Details)
jhb added reviewers: jkim, grehan, neel.Oct 26 2014, 8:37 PM
jhb added a comment.Oct 26 2014, 8:40 PM

I will also post this to virtualization@ for review. I believe the Hyper-V folks will like this change. We should perhaps add setting of VM_GUEST_HV to this routine as well instead of in the hyperv drivers.

sys/x86/include/vmware.h
31

Jung-uk, this file is purely your code from a change you added to tsc.c. As such, you should choose the license block that goes on this file. Let me know what to use.

neel accepted this revision.Oct 26 2014, 9:05 PM
neel edited edge metadata.

Looks good.

This revision is now accepted and ready to land.Oct 26 2014, 9:05 PM
delphij accepted this revision.Oct 27 2014, 5:18 PM
delphij added a reviewer: delphij.
delphij added a subscriber: delphij.

Looks good to me.

allanjude added a subscriber: allanjude.Oct 27 2014, 5:42 PM
jhb updated this revision to Diff 2128.Oct 27 2014, 6:29 PM
jhb edited edge metadata.
  • Whitespace fix.
emaste added a subscriber: emaste.Oct 28 2014, 2:19 AM
jhb updated this revision to Diff 2134.Oct 28 2014, 4:07 PM
  • Update license for vmware.h per jkim@.
jkim accepted this revision.Oct 28 2014, 4:32 PM
jkim edited edge metadata.

Looks good.

sys/x86/include/vmware.h
31

Please use the standard FreeBSD license (2-clause) with my copyright, i.e.,

Copyright (c) 2011-2014 Jung-uk Kim <jkim@FreeBSD.org>

jhb updated this revision to Diff 2138.Oct 28 2014, 5:44 PM
jhb edited edge metadata.
  • De-XXX.
jhb updated this revision to Diff 2139.Oct 28 2014, 5:54 PM
  • Merge branch 'master' into vm_guest
jhb closed this revision.Oct 28 2014, 7:18 PM
jhb updated this revision to Diff 2141.

Closed by commit rS273800 (authored by @jhb).

Revision Contents
Changeset List

PathSize
sys/
amd64/
include/
2 lines
i386/
include/
2 lines
kern/
67 lines
sys/
2 lines
x86/
include/
47 lines
x86/
132 lines
69 lines

Diff 2138

View Options

sys/amd64/include/md_var.h

Loading...
View Options

sys/i386/include/md_var.h

Loading...
View Options

sys/kern/subr_param.c

Loading...
View Options

sys/sys/systm.h

Loading...
View Options

sys/x86/include/vmware.h

Loading...
View Options

sys/x86/x86/identcpu.c

Loading...
View Options

sys/x86/x86/tsc.c

Loading...