Minimal collection for running on Xen/ARM64

RELNOTES

@@ -10,6 +10,21 @@ newline.  Entries should be separated by a newline.
 
 Changes to this file should not be MFCed.
 
+????????????:
+	Support for operation in Xen/ARM64 VMs was introduced.  FreeBSD
+	has worked in x86 Xen VMs for more than a decade, but now FreeBSD
+	works in Xen's ARM64 VMs.  Effort was made to keep the patches
+	architecture-independent, so support for Xen/RISC-V should appear
+	once Xen/RISC-V becomes viable.
+
+	Tianocore/EDK2 for Xen/ARM is the presently known to work initial boot
+	stage.  Build the ArmVirtXen.dsc configuration and configure XEN_EFI.fd
+	as the kernel to boot.
+
+	Presently DomU operation has been implemented.  Dom0 operation could
+	be implemented in the future.  A sponsor could aid this, or CheriBSD
+	may get there first.
+
 f57efe95cc25:
 	New mididump(1) utility which dumps MIDI 1.0 events in real time.
 

share/man/man4/xen.4

@@ -26,7 +26,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd January 8, 2024
+.Dd January 23, 2024
 .Dt XEN 4
 .Os
 .Sh NAME
@@ -136,3 +136,9 @@ This manual page was written by
 .An Robert Watson Aq Mt [email protected] ,
 and
 .An Roger Pau Monné Aq Mt [email protected] .
+A great deal of work since 2015 has been done by
+.An Roger Pau Monné Aq Mt [email protected] .
+Initial work on adding support for DomU support on ARM64 was done by
+.An Julien Grall Aq Mt [email protected] .
+ARM64 DomU support was completed in 2022 by
+.An Elliott Mitchell .

sys/amd64/include/xen/hypercall.h

@@ -39,8 +39,6 @@
 #ifndef __MACHINE_XEN_HYPERCALL_H__
 #define __MACHINE_XEN_HYPERCALL_H__
 
-#include <sys/systm.h>
-
 #ifndef __XEN_HYPERVISOR_H__
 # error "please don't include this file directly"
 #endif
@@ -164,227 +162,8 @@ HYPERVISOR_set_trap_table(
 	return _hypercall1(int, set_trap_table, table);
 }
 
-static inline int __must_check
-HYPERVISOR_mmu_update(
-	mmu_update_t *req, unsigned int count, unsigned int *success_count,
-	domid_t domid)
-{
-	return _hypercall4(int, mmu_update, req, count, success_count, domid);
-}
-
-static inline int __must_check
-HYPERVISOR_mmuext_op(
-	struct mmuext_op *op, unsigned int count, unsigned int *success_count,
-	domid_t domid)
-{
-	return _hypercall4(int, mmuext_op, op, count, success_count, domid);
-}
-
-static inline int __must_check
-HYPERVISOR_set_gdt(
-	unsigned long *frame_list, unsigned int entries)
-{
-	return _hypercall2(int, set_gdt, frame_list, entries);
-}
-
-static inline int __must_check
-HYPERVISOR_stack_switch(
-	unsigned long ss, unsigned long esp)
-{
-	return _hypercall2(int, stack_switch, ss, esp);
-}
-
-static inline int __must_check
-HYPERVISOR_set_callbacks(
-	unsigned long event_address, unsigned long failsafe_address,
-	unsigned long syscall_address)
-{
-	return _hypercall3(int, set_callbacks,
-			   event_address, failsafe_address, syscall_address);
-}
-
-static inline int
-HYPERVISOR_fpu_taskswitch(
-	int set)
-{
-	return _hypercall1(int, fpu_taskswitch, set);
-}
-
-static inline int __must_check
-HYPERVISOR_sched_op(
-	int cmd, void *arg)
-{
-	return _hypercall2(int, sched_op, cmd, arg);
-}
-
-static inline long __must_check
-HYPERVISOR_set_timer_op(
-	uint64_t timeout)
-{
-	return _hypercall1(long, set_timer_op, timeout);
-}
-
-static inline int __must_check
-HYPERVISOR_platform_op(
-	struct xen_platform_op *platform_op)
-{
-	platform_op->interface_version = XENPF_INTERFACE_VERSION;
-	return _hypercall1(int, platform_op, platform_op);
-}
-
-static inline int __must_check
-HYPERVISOR_set_debugreg(
-	unsigned int reg, unsigned long value)
-{
-	return _hypercall2(int, set_debugreg, reg, value);
-}
-
-static inline unsigned long __must_check
-HYPERVISOR_get_debugreg(
-	unsigned int reg)
-{
-	return _hypercall1(unsigned long, get_debugreg, reg);
-}
-
-static inline int __must_check
-HYPERVISOR_update_descriptor(
-	unsigned long ma, unsigned long word)
-{
-	return _hypercall2(int, update_descriptor, ma, word);
-}
-
-static inline int __must_check
-HYPERVISOR_memory_op(
-	unsigned int cmd, void *arg)
-{
-	return _hypercall2(int, memory_op, cmd, arg);
-}
-
-static inline int __must_check
-HYPERVISOR_multicall(
-	multicall_entry_t *call_list, unsigned int nr_calls)
-{
-	return _hypercall2(int, multicall, call_list, nr_calls);
-}
-
-static inline int __must_check
-HYPERVISOR_update_va_mapping(
-	unsigned long va, uint64_t new_val, unsigned long flags)
-{
-	return _hypercall3(int, update_va_mapping, va, new_val, flags);
-}
-
-static inline int __must_check
-HYPERVISOR_event_channel_op(
-	int cmd, void *arg)
-{
-	return _hypercall2(int, event_channel_op, cmd, arg);
-}
-
-static inline int __must_check
-HYPERVISOR_xen_version(
-	int cmd, void *arg)
-{
-	return _hypercall2(int, xen_version, cmd, arg);
-}
-
-static inline int __must_check
-HYPERVISOR_console_io(
-	int cmd, unsigned int count, const char *str)
-{
-	return _hypercall3(int, console_io, cmd, count, str);
-}
-
-static inline int __must_check
-HYPERVISOR_physdev_op(
-	int cmd, void *arg)
-{
-	return _hypercall2(int, physdev_op, cmd, arg);
-}
-
-static inline int __must_check
-HYPERVISOR_grant_table_op(
-	unsigned int cmd, void *uop, unsigned int count)
-{
-	return _hypercall3(int, grant_table_op, cmd, uop, count);
-}
-
-static inline int __must_check
-HYPERVISOR_update_va_mapping_otherdomain(
-	unsigned long va, uint64_t new_val, unsigned long flags, domid_t domid)
-{
-	return _hypercall4(int, update_va_mapping_otherdomain, va,
-			   new_val, flags, domid);
-}
-
-static inline int __must_check
-HYPERVISOR_vm_assist(
-	unsigned int cmd, unsigned int type)
-{
-	return _hypercall2(int, vm_assist, cmd, type);
-}
-
-static inline int __must_check
-HYPERVISOR_vcpu_op(
-	int cmd, unsigned int vcpuid, void *extra_args)
-{
-	return _hypercall3(int, vcpu_op, cmd, vcpuid, extra_args);
-}
-
-static inline int __must_check
-HYPERVISOR_set_segment_base(
-	int reg, unsigned long value)
-{
-	return _hypercall2(int, set_segment_base, reg, value);
-}
-
-static inline int __must_check
-HYPERVISOR_suspend(
-	unsigned long srec)
-{
-	struct sched_shutdown sched_shutdown = {
-		.reason = SHUTDOWN_suspend
-	};
-
-	return _hypercall3(int, sched_op, SCHEDOP_shutdown,
-			     &sched_shutdown, srec);
-}
-
-static inline unsigned long __must_check
-HYPERVISOR_hvm_op(
-	int op, void *arg)
-{
-	return _hypercall2(unsigned long, hvm_op, op, arg);
-}
-
-static inline int __must_check
-HYPERVISOR_callback_op(
-	int cmd, const void *arg)
-{
-	return _hypercall2(int, callback_op, cmd, arg);
-}
-
-static inline int __must_check
-HYPERVISOR_xenoprof_op(
-	int op, void *arg)
-{
-	return _hypercall2(int, xenoprof_op, op, arg);
-}
-
-static inline int __must_check
-HYPERVISOR_kexec_op(
-	unsigned long op, void *args)
-{
-	return _hypercall2(int, kexec_op, op, args);
-}
-
-static inline int __must_check
-HYPERVISOR_dm_op(
-	domid_t domid, unsigned int nr_bufs, const void *bufs)
-{
-	return _hypercall3(int, dm_op, domid, nr_bufs, bufs);
-}
-
 #undef __must_check
 
+#include <xen/hypercall.h>
+
 #endif /* __MACHINE_XEN_HYPERCALL_H__ */

sys/arm/arm/gic.c

@@ -205,6 +205,13 @@ arm_gic_init_secondary(device_t dev, uint32_t rootnum)
 	struct arm_gic_softc *sc = device_get_softc(dev);
 	u_int irq, cpu;
 
+	if (root_type >= INTR_ROOT_COUNT) {
+		/*
+		 * Per-processor setup for devices with PPI interrupts?
+		 */
+		return;
+	}
+
 	/* Set the mask so we can find this CPU to send it IPIs */
 	cpu = PCPU_GET(cpuid);
 	MPASS(cpu < GIC_MAXCPU);

sys/arm/broadcom/bcm2835/bcm2836.c

@@ -543,6 +543,13 @@ bcm_lintc_init_secondary(device_t dev, uint32_t rootnum)
 	u_int cpu;
 	struct bcm_lintc_softc *sc;
 
+	if (root_type >= INTR_ROOT_COUNT) {
+		/*
+		 * Per-processor setup for devices with PPI interrupts?
+		 */
+		return;
+	}
+
 	cpu = PCPU_GET(cpuid);
 	sc = device_get_softc(dev);
 

sys/arm64/arm64/gic_v3.c

@@ -1103,6 +1103,13 @@ gic_v3_init_secondary(device_t dev, uint32_t rootnum)
 	u_int cpu, irq;
 	int err, i;
 
+	if (root_type >= INTR_ROOT_COUNT) {
+		/*
+		 * Per-processor setup for devices with PPI interrupts?
+		 */
+		return;
+	}
+
 	sc = device_get_softc(dev);
 	cpu = PCPU_GET(cpuid);
 

sys/arm64/arm64/gicv3_its.c

@@ -1297,6 +1297,13 @@ gicv3_its_init_secondary(device_t dev, uint32_t rootnum)
 {
 	struct gicv3_its_softc *sc;
 
+	if (root_type >= INTR_ROOT_COUNT) {
+		/*
+		 * Per-processor setup for devices with PPI interrupts?
+		 */
+		return;
+	}
+
 	sc = device_get_softc(dev);
 
 	/*

sys/arm64/conf/LINT-ACPI

@@ -2,3 +2,9 @@
 include "../../conf/NOTES"
 include NOTES
 nooptions	FDT
+
+#####################################################################
+# Items broken without FDT that are generally available elsewhere
+
+# Only presently available probe method uses device-trees
+nooptions	XENHVM

sys/arm64/conf/LINT-FDT

@@ -2,3 +2,6 @@
 include "../../conf/NOTES"
 include NOTES
 nodevice	acpi
+
+#####################################################################
+# Items broken without ACPI that are generally available elsewhere

sys/arm64/conf/NOTES

@@ -66,6 +66,9 @@ device		gve		# Google Virtual NIC (gVNIC) driver
 # Microsoft Hyper-V
 device		hyperv
 
+# Xen HVM Guest support
+options		XENHVM			# Xen HVM kernel infrastructure
+
 # CPU frequency control
 device		cpufreq
 

sys/arm64/conf/std.virt

@@ -2,6 +2,9 @@
 # Virt SoC support
 #
 
+# Xen HVM Guest support
+options		XENHVM			# Xen HVM kernel infrastructure
+
 # Block devices
 device		pvscsi			# VMware PVSCSI
 

sys/arm64/include/xen/arch-intr.h

@@ -0,0 +1 @@
+../../../dev/xen/intrng/arch-intr.h