src - FreeBSD source tree

diff options


context:
space:
mode:

author	Souradeep Chakrabarti <schakrabarti@microsoft.com>	2022-10-27 13:46:08 +0000
committer	Wei Hu <whu@FreeBSD.org>	2022-10-27 13:53:22 +0000
commit	9729f076e4d93c5a37e78d427bfe0f1ab99bbcc6 (patch)
tree	7e4ba91aacdc8f06573479d4cfa72a1fc70ec0e2 /sys/dev/hyperv
parent	9349fc283b581a52396b6027bfa792e61dfd8035 (diff)
download	src-9729f076e4d93c5a37e78d427bfe0f1ab99bbcc6.tar.gz src-9729f076e4d93c5a37e78d427bfe0f1ab99bbcc6.zip

arm64: Hyper-V: enablement for ARM64 in Hyper-V (Part 3, final)

This is the last part for ARM64 Hyper-V enablement. This includes commone files and make file changes to enable the ARM64 FreeBSD guest on Hyper-V. With this patch, it should be able to build the ARM64 image and install it on Hyper-V. Reviewed by: emaste, andrew, whu Tested by: Souradeep Chakrabarti <schakrabarti@microsoft.com> Sponsored by: Microsoft Differential Revision: https://reviews.freebsd.org/D36744

Diffstat (limited to 'sys/dev/hyperv')

-rw-r--r--

sys/dev/hyperv/include/hyperv.h

-rw-r--r--

sys/dev/hyperv/vmbus/amd64/hyperv_machdep.c

-rw-r--r--

sys/dev/hyperv/vmbus/hyperv.c

194

-rw-r--r--

sys/dev/hyperv/vmbus/hyperv_machdep.h

-rw-r--r--

sys/dev/hyperv/vmbus/hyperv_reg.h

193

-rw-r--r--

sys/dev/hyperv/vmbus/hyperv_var.h

-rw-r--r--

sys/dev/hyperv/vmbus/i386/hyperv_machdep.c

-rw-r--r--

sys/dev/hyperv/vmbus/vmbus.c

197

-rw-r--r--

sys/dev/hyperv/vmbus/vmbus_et.c

-rw-r--r--

sys/dev/hyperv/vmbus/vmbus_reg.h

-rw-r--r--

sys/dev/hyperv/vmbus/vmbus_var.h

11 files changed, 120 insertions, 546 deletions

diff --git a/sys/dev/hyperv/include/hyperv.h b/sys/dev/hyperv/include/hyperv.h
index 8b985b2f31a7..2e46a092a16e 100644
--- a/sys/dev/hyperv/include/hyperv.h
+++ b/sys/dev/hyperv/include/hyperv.h

@@ -86,6 +86,11 @@ typedef uint64_t (*hyperv_tc64_t)(void);

int hyperv_guid2str(const struct hyperv_guid *, char *,

size_t);

+void hyperv_init_tc(void);

+int hypercall_page_setup(vm_paddr_t);

+void hypercall_disable(void);

+bool hyperv_identify_features(void);

* hyperv_tc64 could be NULL, if there were no suitable Hyper-V

* specific timecounter.

diff --git a/sys/dev/hyperv/vmbus/amd64/hyperv_machdep.c b/sys/dev/hyperv/vmbus/amd64/hyperv_machdep.c
index f3f5308fa6dc..c158f72eb9e7 100644
--- a/sys/dev/hyperv/vmbus/amd64/hyperv_machdep.c
+++ b/sys/dev/hyperv/vmbus/amd64/hyperv_machdep.c

@@ -44,9 +44,10 @@ __FBSDID("$FreeBSD$");

#include <dev/hyperv/include/hyperv.h>

#include <dev/hyperv/include/hyperv_busdma.h>

-#include <dev/hyperv/vmbus/hyperv_machdep.h>

-#include <dev/hyperv/vmbus/hyperv_reg.h>

+#include <dev/hyperv/vmbus/x86/hyperv_machdep.h>

+#include <dev/hyperv/vmbus/x86/hyperv_reg.h>

#include <dev/hyperv/vmbus/hyperv_var.h>

+#include <dev/hyperv/vmbus/hyperv_common_reg.h>

struct hyperv_reftsc_ctx {

struct hyperv_reftsc *tsc_ref;

diff --git a/sys/dev/hyperv/vmbus/hyperv.c b/sys/dev/hyperv/vmbus/hyperv.c
index b2a74036f6c3..38217d1f0b67 100644
--- a/sys/dev/hyperv/vmbus/hyperv.c
+++ b/sys/dev/hyperv/vmbus/hyperv.c

@@ -45,8 +45,14 @@ __FBSDID("$FreeBSD$");

#include <dev/hyperv/include/hyperv.h>

#include <dev/hyperv/include/hyperv_busdma.h>

-#include <dev/hyperv/vmbus/hyperv_machdep.h>

-#include <dev/hyperv/vmbus/hyperv_reg.h>

+#if defined(__aarch64__)

+#include <dev/hyperv/vmbus/aarch64/hyperv_machdep.h>

+#include <dev/hyperv/vmbus/aarch64/hyperv_reg.h>

+#else

+#include <dev/hyperv/vmbus/x86/hyperv_machdep.h>

+#include <dev/hyperv/vmbus/x86/hyperv_reg.h>

+#endif

+#include <dev/hyperv/vmbus/hyperv_common_reg.h>

#include <dev/hyperv/vmbus/hyperv_var.h>

#define HYPERV_FREEBSD_BUILD 0ULL

@@ -68,51 +74,10 @@ __FBSDID("$FreeBSD$");

MSR_HV_GUESTID_OSID_FREEBSD | \

MSR_HV_GUESTID_OSTYPE_FREEBSD)

-struct hypercall_ctx {

- void *hc_addr;

- vm_paddr_t hc_paddr;

-};

-static u_int hyperv_get_timecount(struct timecounter *);

static bool hyperv_identify(void);

static void hypercall_memfree(void);

-u_int hyperv_ver_major;

-u_int hyperv_features;

-u_int hyperv_recommends;

-static u_int hyperv_pm_features;

-static u_int hyperv_features3;

-hyperv_tc64_t hyperv_tc64;

-static struct timecounter hyperv_timecounter = {

- .tc_get_timecount = hyperv_get_timecount,

- .tc_poll_pps = NULL,

- .tc_counter_mask = 0xffffffff,

- .tc_frequency = HYPERV_TIMER_FREQ,

- .tc_name = "Hyper-V",

- .tc_quality = 2000,

- .tc_flags = 0,

- .tc_priv = NULL

-};

static struct hypercall_ctx hypercall_context;

-static u_int

-hyperv_get_timecount(struct timecounter *tc __unused)

- return rdmsr(MSR_HV_TIME_REF_COUNT);

-static uint64_t

-hyperv_tc64_rdmsr(void)

- return (rdmsr(MSR_HV_TIME_REF_COUNT));

uint64_t

hypercall_post_message(bus_addr_t msg_paddr)

{

@@ -143,97 +108,8 @@ hyperv_guid2str(const struct hyperv_guid *guid, char *buf, size_t sz)

static bool

hyperv_identify(void)

{

- u_int regs[4];

- unsigned int maxleaf;

- if (vm_guest != VM_GUEST_HV)

- return (false);

- do_cpuid(CPUID_LEAF_HV_MAXLEAF, regs);

- maxleaf = regs[0];

- if (maxleaf < CPUID_LEAF_HV_LIMITS)

- return (false);

- do_cpuid(CPUID_LEAF_HV_INTERFACE, regs);

- if (regs[0] != CPUID_HV_IFACE_HYPERV)

- return (false);

- do_cpuid(CPUID_LEAF_HV_FEATURES, regs);

- if ((regs[0] & CPUID_HV_MSR_HYPERCALL) == 0) {

- /*

- * Hyper-V w/o Hypercall is impossible; someone

- * is faking Hyper-V.

- */

- return (false);

- }

- hyperv_features = regs[0];

- hyperv_pm_features = regs[2];

- hyperv_features3 = regs[3];

- do_cpuid(CPUID_LEAF_HV_IDENTITY, regs);

- hyperv_ver_major = regs[1] >> 16;

- printf("Hyper-V Version: %d.%d.%d [SP%d]\n",

- hyperv_ver_major, regs[1] & 0xffff, regs[0], regs[2]);

- printf(" Features=0x%b\n", hyperv_features,

- "\020"

- "\001VPRUNTIME" /* MSR_HV_VP_RUNTIME */

- "\002TMREFCNT" /* MSR_HV_TIME_REF_COUNT */

- "\003SYNIC" /* MSRs for SynIC */

- "\004SYNTM" /* MSRs for SynTimer */

- "\005APIC" /* MSR_HV_{EOI,ICR,TPR} */

- "\006HYPERCALL" /* MSR_HV_{GUEST_OS_ID,HYPERCALL} */

- "\007VPINDEX" /* MSR_HV_VP_INDEX */

- "\010RESET" /* MSR_HV_RESET */

- "\011STATS" /* MSR_HV_STATS_ */

- "\012REFTSC" /* MSR_HV_REFERENCE_TSC */

- "\013IDLE" /* MSR_HV_GUEST_IDLE */

- "\014TMFREQ" /* MSR_HV_{TSC,APIC}_FREQUENCY */

- "\015DEBUG"); /* MSR_HV_SYNTH_DEBUG_ */

- printf(" PM Features=0x%b [C%u]\n",

- (hyperv_pm_features & ~CPUPM_HV_CSTATE_MASK),

- "\020"

- "\005C3HPET", /* HPET is required for C3 state */

- CPUPM_HV_CSTATE(hyperv_pm_features));

- printf(" Features3=0x%b\n", hyperv_features3,

- "\020"

- "\001MWAIT" /* MWAIT */

- "\002DEBUG" /* guest debug support */

- "\003PERFMON" /* performance monitor */

- "\004PCPUDPE" /* physical CPU dynamic partition event */

- "\005XMMHC" /* hypercall input through XMM regs */

- "\006IDLE" /* guest idle support */

- "\007SLEEP" /* hypervisor sleep support */

- "\010NUMA" /* NUMA distance query support */

- "\011TMFREQ" /* timer frequency query (TSC, LAPIC) */

- "\012SYNCMC" /* inject synthetic machine checks */

- "\013CRASH" /* MSRs for guest crash */

- "\014DEBUGMSR" /* MSRs for guest debug */

- "\015NPIEP" /* NPIEP */

- "\016HVDIS"); /* disabling hypervisor */

- do_cpuid(CPUID_LEAF_HV_RECOMMENDS, regs);

- hyperv_recommends = regs[0];

- if (bootverbose)

- printf(" Recommends: %08x %08x\n", regs[0], regs[1]);

- do_cpuid(CPUID_LEAF_HV_LIMITS, regs);

- if (bootverbose) {

- printf(" Limits: Vcpu:%d Lcpu:%d Int:%d\n",

- regs[0], regs[1], regs[2]);

- }

- if (maxleaf >= CPUID_LEAF_HV_HWFEATURES) {

- do_cpuid(CPUID_LEAF_HV_HWFEATURES, regs);

- if (bootverbose) {

- printf(" HW Features: %08x, AMD: %08x\n",

- regs[0], regs[3]);

- }

- return (true);

+ return(hyperv_identify_features());

}

static void

hyperv_init(void *dummy __unused)

{

@@ -245,22 +121,8 @@ hyperv_init(void *dummy __unused)

}

/* Set guest id */

- wrmsr(MSR_HV_GUEST_OS_ID, MSR_HV_GUESTID_FREEBSD);

- if (hyperv_features & CPUID_HV_MSR_TIME_REFCNT) {

- /*

- * Register Hyper-V timecounter. This should be done as early

- * as possible to let DELAY() work, since the 8254 PIT is not

- * reliably emulated or even available.

- */

- tc_init(&hyperv_timecounter);

- /*

- * Install 64 bits timecounter method for other modules

- * to use.

- */

- hyperv_tc64 = hyperv_tc64_rdmsr;

- }

+ WRMSR(MSR_HV_GUEST_OS_ID, MSR_HV_GUESTID_FREEBSD);

+ hyperv_init_tc();

}

SYSINIT(hyperv_initialize, SI_SUB_HYPERVISOR, SI_ORDER_FIRST, hyperv_init,

NULL);

@@ -275,8 +137,8 @@ hypercall_memfree(void)

static void

hypercall_create(void *arg __unused)

{

- uint64_t hc, hc_orig;

+ int ret;

if (vm_guest != VM_GUEST_HV)

return;

@@ -288,30 +150,9 @@ hypercall_create(void *arg __unused)

hypercall_context.hc_addr = kmem_malloc(PAGE_SIZE, M_EXEC | M_WAITOK);

hypercall_context.hc_paddr = vtophys(hypercall_context.hc_addr);

- /* Get the 'reserved' bits, which requires preservation. */

- hc_orig = rdmsr(MSR_HV_HYPERCALL);

- /*

- * Setup the Hypercall page.

- *

- * NOTE: 'reserved' bits MUST be preserved.

- */

- hc = ((hypercall_context.hc_paddr >> PAGE_SHIFT) <<

- MSR_HV_HYPERCALL_PGSHIFT) |

- (hc_orig & MSR_HV_HYPERCALL_RSVD_MASK) |

- MSR_HV_HYPERCALL_ENABLE;

- wrmsr(MSR_HV_HYPERCALL, hc);

- /*

- * Confirm that Hypercall page did get setup.

- */

- hc = rdmsr(MSR_HV_HYPERCALL);

- if ((hc & MSR_HV_HYPERCALL_ENABLE) == 0) {

- printf("hyperv: Hypercall setup failed\n");

+ ret = hypercall_page_setup(hypercall_context.hc_paddr);

+ if (ret) {

hypercall_memfree();

- /* Can't perform any Hyper-V specific actions */

- vm_guest = VM_GUEST_VM;

return;

}

if (bootverbose)

@@ -322,16 +163,11 @@ SYSINIT(hypercall_ctor, SI_SUB_DRIVERS, SI_ORDER_FIRST, hypercall_create, NULL);

static void

hypercall_destroy(void *arg __unused)

{

- uint64_t hc;

if (hypercall_context.hc_addr == NULL)

return;

- /* Disable Hypercall */

- hc = rdmsr(MSR_HV_HYPERCALL);

- wrmsr(MSR_HV_HYPERCALL, (hc & MSR_HV_HYPERCALL_RSVD_MASK));

+ hypercall_disable();

hypercall_memfree();

if (bootverbose)

printf("hyperv: Hypercall destroyed\n");

}

diff --git a/sys/dev/hyperv/vmbus/hyperv_machdep.h b/sys/dev/hyperv/vmbus/hyperv_machdep.h
deleted file mode 100644
index 48cf5b78dc3b..000000000000
--- a/sys/dev/hyperv/vmbus/hyperv_machdep.h
+++ /dev/null

@@ -1,37 +0,0 @@

-/*-

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions

- * are met:

- * 1. Redistributions of source code must retain the above copyright

- * notice unmodified, this list of conditions, and the following

- * disclaimer.

- * 2. Redistributions in binary form must reproduce the above copyright

- * notice, this list of conditions and the following disclaimer in the

- * documentation and/or other materials provided with the distribution.

- *

- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR

- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.

- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,

- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT

- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF

- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- *

- * $FreeBSD$

- */

-#ifndef _HYPERV_MACHDEP_H_

-#define _HYPERV_MACHDEP_H_

-#include <sys/param.h>

-uint64_t hypercall_md(volatile void *hc_addr, uint64_t in_val,

- uint64_t in_paddr, uint64_t out_paddr);

-#endif /* !_HYPERV_MACHDEP_H_ */

diff --git a/sys/dev/hyperv/vmbus/hyperv_reg.h b/sys/dev/hyperv/vmbus/hyperv_reg.h
deleted file mode 100644
index b3b133c84881..000000000000
--- a/sys/dev/hyperv/vmbus/hyperv_reg.h
+++ /dev/null

@@ -1,193 +0,0 @@