@@ -523,6 +523,13 @@ F: accel/hvf/
F: include/sysemu/hvf.h
F: include/sysemu/hvf_int.h
+GUNYAH
+M: Srivatsa Vaddagiri <quic_svaddagi@quicinc.com>
+S: Maintained
+F: accel/gunyah
+F: include/sysemu/gunyah.h
+F: include/sysemu/gunyah_int.h
+
WHPX CPUs
M: Sunil Muthuswamy <sunilmut@microsoft.com>
S: Supported
@@ -40,7 +40,7 @@ Those hosts are officially supported, with various accelerators:
* - CPU Architecture
- Accelerators
* - Arm
- - kvm (64 bit only), tcg, xen
+ - kvm (64 bit only), tcg, xen, gunyah (64 bit only)
* - MIPS (little endian only)
- kvm, tcg
* - PPC
@@ -248,7 +248,8 @@ accelerator_targets += { 'CONFIG_XEN': xen_targets }
if cpu in ['aarch64']
accelerator_targets += {
- 'CONFIG_HVF': ['aarch64-softmmu']
+ 'CONFIG_HVF': ['aarch64-softmmu'],
+ 'CONFIG_GUNYAH': ['aarch64-softmmu']
}
endif
@@ -736,6 +737,11 @@ if get_option('hvf').allowed()
endif
endif
+gunyah = not_found
+if get_option('gunyah').allowed() and host_os == 'linux'
+ accelerators += 'CONFIG_GUNYAH'
+endif
+
nvmm = not_found
if host_os == 'netbsd'
nvmm = cc.find_library('nvmm', required: get_option('nvmm'))
@@ -882,6 +888,9 @@ elif get_option('plugins')
else
gmodule = not_found
endif
+if 'CONFIG_GUNYAH' not in accelerators and get_option('gunyah').enabled()
+ error('Gunyah not available on this platform')
+endif
# This workaround is required due to a bug in pkg-config file for glib as it
# doesn't define GLIB_STATIC_COMPILATION for pkg-config --static
@@ -4270,6 +4279,7 @@ if have_system
summary_info += {'xen ctrl version': xen.version()}
endif
summary_info += {'Xen emulation': config_all_devices.has_key('CONFIG_XEN_EMU')}
+ summary_info += {'Gunyah support': config_all_accel.has_key('CONFIG_GUNYAH')}
endif
summary_info += {'TCG support': config_all_accel.has_key('CONFIG_TCG')}
if config_all_accel.has_key('CONFIG_TCG')
new file mode 100644
@@ -0,0 +1,30 @@
+/*
+ * QEMU Gunyah hypervisor support
+ *
+ * Copyright(c) 2023 Qualcomm Innovation Center, Inc. All Rights Reserved.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+/* header to be included in non-Gunyah-specific code */
+
+#ifndef QEMU_GUNYAH_H
+#define QEMU_GUNYAH_H
+
+#include "qemu/accel.h"
+#include "qom/object.h"
+
+#ifdef NEED_CPU_H
+#include "cpu.h"
+#endif
+
+extern bool gunyah_allowed;
+
+#define gunyah_enabled() (gunyah_allowed)
+
+#define TYPE_GUNYAH_ACCEL ACCEL_CLASS_NAME("gunyah")
+typedef struct GUNYAHState GUNYAHState;
+DECLARE_INSTANCE_CHECKER(GUNYAHState, GUNYAH_STATE,
+ TYPE_GUNYAH_ACCEL)
+
+#endif /* QEMU_GUNYAH_H */
new file mode 100644
@@ -0,0 +1,27 @@
+/*
+ * QEMU Gunyah hypervisor support
+ *
+ * Copyright(c) 2023 Qualcomm Innovation Center, Inc. All Rights Reserved.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+/* header to be included in Gunyah-specific code */
+
+#ifndef GUNYAH_INT_H
+#define GUNYAH_INT_H
+
+#include "qemu/accel.h"
+#include "qemu/typedefs.h"
+
+struct GUNYAHState {
+ AccelState parent_obj;
+
+ int fd;
+ int vmfd;
+};
+
+int gunyah_create_vm(void);
+void *gunyah_cpu_thread_fn(void *arg);
+
+#endif /* GUNYAH_INT_H */
new file mode 100644
@@ -0,0 +1,121 @@
+/*
+ * QEMU Gunyah hypervisor support
+ *
+ * (based on KVM accelerator code structure)
+ *
+ * Copyright 2008 IBM Corporation
+ * 2008 Red Hat, Inc.
+ *
+ * Copyright(c) 2023 Qualcomm Innovation Center, Inc. All Rights Reserved.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include "qemu/osdep.h"
+#include "qemu/thread.h"
+#include "hw/boards.h"
+#include "hw/core/cpu.h"
+#include "sysemu/accel-ops.h"
+#include "sysemu/cpus.h"
+#include "sysemu/gunyah.h"
+#include "sysemu/gunyah_int.h"
+#include "qapi/visitor.h"
+#include "qapi/error.h"
+
+bool gunyah_allowed;
+
+static int gunyah_init(MachineState *ms)
+{
+ return gunyah_create_vm();
+}
+
+static void gunyah_accel_instance_init(Object *obj)
+{
+ GUNYAHState *s = GUNYAH_STATE(obj);
+
+ s->fd = -1;
+ s->vmfd = -1;
+}
+
+static void gunyah_accel_class_init(ObjectClass *oc, void *data)
+{
+ AccelClass *ac = ACCEL_CLASS(oc);
+
+ ac->name = "GUNYAH";
+ ac->init_machine = gunyah_init;
+ ac->allowed = &gunyah_allowed;
+}
+
+static const TypeInfo gunyah_accel_type = {
+ .name = TYPE_GUNYAH_ACCEL,
+ .parent = TYPE_ACCEL,
+ .instance_init = gunyah_accel_instance_init,
+ .class_init = gunyah_accel_class_init,
+ .instance_size = sizeof(GUNYAHState),
+};
+
+static void gunyah_type_init(void)
+{
+ type_register_static(&gunyah_accel_type);
+}
+type_init(gunyah_type_init);
+
+static void gunyah_start_vcpu_thread(CPUState *cpu)
+{
+ char thread_name[VCPU_THREAD_NAME_SIZE];
+
+ cpu->thread = g_malloc0(sizeof(QemuThread));
+ cpu->halt_cond = g_malloc0(sizeof(QemuCond));
+ qemu_cond_init(cpu->halt_cond);
+
+ snprintf(thread_name, VCPU_THREAD_NAME_SIZE, "CPU %d/Gunyah",
+ cpu->cpu_index);
+ qemu_thread_create(cpu->thread, thread_name, gunyah_cpu_thread_fn,
+ cpu, QEMU_THREAD_JOINABLE);
+}
+
+static void gunyah_kick_vcpu_thread(CPUState *cpu)
+{
+ cpus_kick_thread(cpu);
+}
+
+static bool gunyah_vcpu_thread_is_idle(CPUState *cpu)
+{
+ return false;
+}
+
+static bool gunyah_check_capability(AccelCap cap)
+{
+ switch (cap) {
+ case CONFIDENTIAL_GUEST_SUPPORTED:
+ return true;
+ case CONFIDENTIAL_GUEST_CAN_SHARE_MEM_WITH_HOST:
+ /* fall-through */
+ default:
+ return false;
+ }
+}
+
+static void gunyah_accel_ops_class_init(ObjectClass *oc, void *data)
+{
+ AccelOpsClass *ops = ACCEL_OPS_CLASS(oc);
+
+ ops->create_vcpu_thread = gunyah_start_vcpu_thread;
+ ops->kick_vcpu_thread = gunyah_kick_vcpu_thread;
+ ops->cpu_thread_is_idle = gunyah_vcpu_thread_is_idle;
+ ops->check_capability = gunyah_check_capability;
+};
+
+static const TypeInfo gunyah_accel_ops_type = {
+ .name = ACCEL_OPS_NAME("gunyah"),
+ .parent = TYPE_ACCEL_OPS,
+ .class_init = gunyah_accel_ops_class_init,
+ .abstract = true,
+};
+
+static void gunyah_accel_ops_register_types(void)
+{
+ type_register_static(&gunyah_accel_ops_type);
+}
+
+type_init(gunyah_accel_ops_register_types);
new file mode 100644
@@ -0,0 +1,70 @@
+/*
+ * QEMU Gunyah hypervisor support
+ *
+ * (based on KVM accelerator code structure)
+ *
+ * Copyright 2008 IBM Corporation
+ * 2008 Red Hat, Inc.
+ *
+ * Copyright(c) 2023 Qualcomm Innovation Center, Inc. All Rights Reserved.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include <sys/ioctl.h>
+#include "qemu/osdep.h"
+#include "qemu/typedefs.h"
+#include "hw/core/cpu.h"
+#include "sysemu/cpus.h"
+#include "sysemu/gunyah.h"
+#include "sysemu/gunyah_int.h"
+#include "linux-headers/linux/gunyah.h"
+#include "qemu/error-report.h"
+
+static int gunyah_ioctl(int type, ...)
+{
+ void *arg;
+ va_list ap;
+ GUNYAHState *s = GUNYAH_STATE(current_accel());
+
+ assert(s->fd);
+
+ va_start(ap, type);
+ arg = va_arg(ap, void *);
+ va_end(ap);
+
+ return ioctl(s->fd, type, arg);
+}
+
+int gunyah_create_vm(void)
+{
+ GUNYAHState *s;
+
+ s = GUNYAH_STATE(current_accel());
+
+ s->fd = qemu_open_old("/dev/gunyah", O_RDWR);
+ if (s->fd == -1) {
+ error_report("Could not access Gunyah kernel module at /dev/gunyah: %s",
+ strerror(errno));
+ exit(1);
+ }
+
+ s->vmfd = gunyah_ioctl(GH_CREATE_VM, 0);
+ if (s->vmfd < 0) {
+ error_report("Could not create VM: %s", strerror(errno));
+ exit(1);
+ }
+
+ return 0;
+}
+
+void *gunyah_cpu_thread_fn(void *arg)
+{
+ CPUState *cpu = arg;
+
+ do {
+ /* Do nothing */
+ } while (!cpu->unplug || cpu_can_run(cpu));
+
+ return NULL;
+}
new file mode 100644
@@ -0,0 +1,13 @@
+/*
+ * QEMU Gunyah stub
+ *
+ * Copyright(c) 2023 Qualcomm Innovation Center, Inc. All Rights Reserved.
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ *
+ */
+
+#include "qemu/osdep.h"
+#include "sysemu/gunyah.h"
+
+bool gunyah_allowed;
@@ -87,6 +87,7 @@
#include "sysemu/cpus.h"
#include "exec/confidential-guest-support.h"
#include "qom/object_interfaces.h"
+#include "sysemu/gunyah.h"
static GlobalProperty arm_virt_compat[] = {
{ TYPE_VIRTIO_IOMMU_PCI, "aw-bits", "48" },
@@ -1682,6 +1683,8 @@ static void virt_build_smbios(VirtMachineState *vms)
if (kvm_enabled()) {
product = "KVM Virtual Machine";
+ } else if (gunyah_enabled()) {
+ product = "Gunyah Virtual Machine";
}
smbios_set_defaults("QEMU", product,
@@ -44,6 +44,7 @@
#include "sysemu/tcg.h"
#include "sysemu/qtest.h"
#include "sysemu/hw_accel.h"
+#include "sysemu/gunyah.h"
#include "kvm_arm.h"
#include "disas/capstone.h"
#include "fpu/softfloat.h"
@@ -1500,7 +1501,7 @@ static void arm_cpu_initfn(Object *obj)
cpu->psci_version = QEMU_PSCI_VERSION_0_1; /* By default assume PSCI v0.1 */
cpu->kvm_target = QEMU_KVM_ARM_TARGET_NONE;
- if (tcg_enabled() || hvf_enabled()) {
+ if (tcg_enabled() || hvf_enabled() || gunyah_enabled()) {
/* TCG and HVF implement PSCI 1.1 */
cpu->psci_version = QEMU_PSCI_VERSION_1_1;
}
@@ -34,6 +34,7 @@
#include "internals.h"
#include "cpu-features.h"
#include "cpregs.h"
+#include "sysemu/gunyah.h"
void arm_cpu_sve_finalize(ARMCPU *cpu, Error **errp)
{
@@ -727,7 +728,7 @@ static void aarch64_host_initfn(Object *obj)
static void aarch64_max_initfn(Object *obj)
{
- if (kvm_enabled() || hvf_enabled()) {
+ if (kvm_enabled() || hvf_enabled() || gunyah_enabled()) {
/* With KVM or HVF, '-cpu max' is identical to '-cpu host' */
aarch64_host_initfn(obj);
return;
@@ -747,7 +748,7 @@ static const ARMCPUInfo aarch64_cpus[] = {
{ .name = "cortex-a57", .initfn = aarch64_a57_initfn },
{ .name = "cortex-a53", .initfn = aarch64_a53_initfn },
{ .name = "max", .initfn = aarch64_max_initfn },
-#if defined(CONFIG_KVM) || defined(CONFIG_HVF)
+#if defined(CONFIG_KVM) || defined(CONFIG_HVF) || defined(CONFIG_GUNYAH)
{ .name = "host", .initfn = aarch64_host_initfn },
#endif
};
@@ -17,3 +17,6 @@ config XEN
bool
select FSDEV_9P if VIRTFS
select XEN_BUS
+
+config GUNYAH
+ bool
new file mode 100644
@@ -0,0 +1,7 @@
+gunyah_ss = ss.source_set()
+gunyah_ss.add(files(
+ 'gunyah-all.c',
+ 'gunyah-accel-ops.c',
+))
+
+specific_ss.add_all(when: 'CONFIG_GUNYAH', if_true: gunyah_ss)
@@ -9,6 +9,7 @@ if have_system
subdir('kvm')
subdir('xen')
subdir('stubs')
+ subdir('gunyah')
endif
# qtest
@@ -2,5 +2,6 @@ system_stubs_ss = ss.source_set()
system_stubs_ss.add(when: 'CONFIG_XEN', if_false: files('xen-stub.c'))
system_stubs_ss.add(when: 'CONFIG_KVM', if_false: files('kvm-stub.c'))
system_stubs_ss.add(when: 'CONFIG_TCG', if_false: files('tcg-stub.c'))
+system_stubs_ss.add(when: 'CONFIG_GUNYAH', if_false: files('gunyah-stub.c'))
specific_ss.add_all(when: ['CONFIG_SYSTEM_ONLY'], if_true: system_stubs_ss)
@@ -111,6 +111,8 @@ option('dbus_display', type: 'feature', value: 'auto',
description: '-display dbus support')
option('tpm', type : 'feature', value : 'auto',
description: 'TPM support')
+option('gunyah', type: 'feature', value: 'auto',
+ description: 'Gunyah acceleration support')
# Do not enable it by default even for Mingw32, because it doesn't
# work on Wine.
@@ -126,6 +126,7 @@ meson_options_help() {
printf "%s\n" ' guest-agent-msi Build MSI package for the QEMU Guest Agent'
printf "%s\n" ' hv-balloon hv-balloon driver (requires Glib 2.68+ GTree API)'
printf "%s\n" ' hvf HVF acceleration support'
+ printf "%s\n" ' gunyah Gunyah acceleration support'
printf "%s\n" ' iconv Font glyph conversion support'
printf "%s\n" ' jack JACK sound support'
printf "%s\n" ' keyring Linux keyring support'
@@ -335,6 +336,8 @@ _meson_option_parse() {
--disable-guest-agent) printf "%s" -Dguest_agent=disabled ;;
--enable-guest-agent-msi) printf "%s" -Dguest_agent_msi=enabled ;;
--disable-guest-agent-msi) printf "%s" -Dguest_agent_msi=disabled ;;
+ --enable-gunyah) printf "%s" -Dgunyah=enabled ;;
+ --disable-gunyah) printf "%s" -Dgunyah=disabled ;;
--enable-hexagon-idef-parser) printf "%s" -Dhexagon_idef_parser=true ;;
--disable-hexagon-idef-parser) printf "%s" -Dhexagon_idef_parser=false ;;
--enable-hv-balloon) printf "%s" -Dhv_balloon=enabled ;;
Add a new accelerator, gunyah, with basic functionality of creating a VM. Subsequent patches will add support for other functions required to run a VM. Signed-off-by: Srivatsa Vaddagiri <quic_svaddagi@quicinc.com> --- MAINTAINERS | 7 ++ docs/about/build-platforms.rst | 2 +- meson.build | 12 +++- include/sysemu/gunyah.h | 30 ++++++++ include/sysemu/gunyah_int.h | 27 +++++++ accel/gunyah/gunyah-accel-ops.c | 121 ++++++++++++++++++++++++++++++++ accel/gunyah/gunyah-all.c | 70 ++++++++++++++++++ accel/stubs/gunyah-stub.c | 13 ++++ hw/arm/virt.c | 3 + target/arm/cpu.c | 3 +- target/arm/cpu64.c | 5 +- accel/Kconfig | 3 + accel/gunyah/meson.build | 7 ++ accel/meson.build | 1 + accel/stubs/meson.build | 1 + meson_options.txt | 2 + scripts/meson-buildoptions.sh | 3 + 17 files changed, 305 insertions(+), 5 deletions(-) create mode 100644 include/sysemu/gunyah.h create mode 100644 include/sysemu/gunyah_int.h create mode 100644 accel/gunyah/gunyah-accel-ops.c create mode 100644 accel/gunyah/gunyah-all.c create mode 100644 accel/stubs/gunyah-stub.c create mode 100644 accel/gunyah/meson.build