GenieZone hypervisor drivers
Subsystems (4)
v7 cover GenieZone hypervisor drivers
This series is based on linux-next, tag: next-20231116.
Our previous v6 patches seem to have fallen through the cracks, so we are resending them for v7 with minor improvements and a new feature. We hope this will bring us further review of our patches.
GenieZone hypervisor(gzvm) is a type-1 hypervisor that supports various virtual machine types and provides security features such as TEE-like scenarios and secure boot. It can create guest VMs for security use cases and has virtualization capabilities for both platform and interrupt. Although the hypervisor can be booted independently, it requires the assistance of GenieZone hypervisor kernel driver(gzvm-ko) to leverage the ability of Linux kernel for vCPU scheduling, memory management, inter-VM communication and virtio backend support.
Changes in v7:
- Rebase these patches to the Linux 6.7-rc1 release.
- Refactor patches 1 to 15 to improve coding style while ensuring they do not violate the majority of the changes made in v6
- Provide individual VM memory statistics within debugfs in patch 16.
- Add tracing support for hyper call and vcpu exit_reason.
Changes in v6:
https://lore.kernel.org/all/[email protected]/
- Rebase based on kernel 6.6-rc1
- Keep dt solution and leave the reasons in the commit message
- Remove arch/arm64/include/uapi/asm/gzvm_arch.h due to simplicity
- Remove resampler in drivers/virt/geniezone/gzvm_irqfd.c due to defeature for now
- Remove PPI in arch/arm64/geniezone/vgic.c
- Refactor vm related components into 3 smaller patches, namely adding vm support, setting user memory region and checking vm capability
- Refactor vcpu and vm component to remove unnecessary ARM prefix
- Add demand paging to fix crash on destroying memory page, acclerate on booting and support ballooning deflate
- Add memory pin/unpin memory mechanism to support protected VM
- Add block-based demand paging for performance concern
- Response to reviewers and fix coding style accordingly
Changes in v5:
https://lore.kernel.org/all/[email protected]/
- Add dt solution back for device initialization
- Add GZVM_EXIT_GZ reason for gzvm_vcpu_run()
- Add patch for guest page fault handler
- Add patch for supporitng pin/unpin memory
- Remove unused enum members, namely GZVM_FUNC_GET_REGS and GZVM_FUNC_SET_REGS
- Use dev_debug() for debugging when platform device is available, and use pr_debug() otherwise
- Response to reviewers and fix bugs accordingly
Changes in v4:
https://lore.kernel.org/all/[email protected]/
- Add macro to set VM as protected without triggering pvmfw in AVF.
- Add support to pass dtb config to hypervisor.
- Add support for virtual timer.
- Add UAPI to pass memory region metadata to hypervisor.
- Define our own macros for ARM's interrupt number
- Elaborate more on GenieZone hyperivsor in documentation
- Fix coding style.
- Implement our own module for coverting ipa to pa
- Modify the way of initializing device from dt to a more discoverable way
- Move refactoring changes into indepedent patches.
Changes in v3:
https://lore.kernel.org/all/[email protected]/
- Refactor: separate arch/arm64/geniezone/gzvm_arch.c into vm.c/vcpu.c/vgic.c
- Remove redundant functions
- Fix reviewer's comments
Changes in v2:
https://lore.kernel.org/all/[email protected]/
- Refactor: move to drivers/virt/geniezone
- Refactor: decouple arch-dependent and arch-independent
- Check pending signal before entering guest context
- Fix reviewer's comments
Initial Commit in v1:
https://lore.kernel.org/all/[email protected]/
Yi-De Wu (16):
docs: geniezone: Introduce GenieZone hypervisor
dt-bindings: hypervisor: Add MediaTek GenieZone hypervisor
virt: geniezone: Add GenieZone hypervisor driver
virt: geniezone: Add vm support
virt: geniezone: Add set_user_memory_region for vm
virt: geniezone: Add vm capability check
virt: geniezone: Add vcpu support
virt: geniezone: Add irqchip support for virtual interrupt injection
virt: geniezone: Add irqfd support
virt: geniezone: Add ioeventfd support
virt: geniezone: Add memory region support
virt: geniezone: Add dtb config support
virt: geniezone: Add demand paging support
virt: geniezone: Add block-based demand paging support
virt: geniezone: Add memory pin/unpin support
virt: geniezone: Add memory relinquish support
.../hypervisor/mediatek,geniezone-hyp.yaml | 31 ++ Documentation/virt/geniezone/introduction.rst | 86 ++++ Documentation/virt/index.rst | 1 + MAINTAINERS | 11 + arch/arm64/Kbuild | 1 + arch/arm64/geniezone/Makefile | 9 + arch/arm64/geniezone/gzvm_arch_common.h | 110 ++++ arch/arm64/geniezone/vcpu.c | 80 +++ arch/arm64/geniezone/vgic.c | 50 ++ arch/arm64/geniezone/vm.c | 399 +++++++++++++++ drivers/virt/Kconfig | 2 + drivers/virt/geniezone/Kconfig | 16 + drivers/virt/geniezone/Makefile | 12 + drivers/virt/geniezone/gzvm_common.h | 12 + drivers/virt/geniezone/gzvm_exception.c | 62 +++ drivers/virt/geniezone/gzvm_ioeventfd.c | 276 +++++++++++ drivers/virt/geniezone/gzvm_irqfd.c | 382 ++++++++++++++ drivers/virt/geniezone/gzvm_main.c | 147 ++++++ drivers/virt/geniezone/gzvm_mmu.c | 284 +++++++++++ drivers/virt/geniezone/gzvm_vcpu.c | 281 +++++++++++ drivers/virt/geniezone/gzvm_vm.c | 468 ++++++++++++++++++ include/linux/gzvm_drv.h | 203 ++++++++ include/uapi/linux/gzvm.h | 395 +++++++++++++++ 23 files changed, 3318 insertions(+) create mode 100644 Documentation/devicetree/bindings/hypervisor/mediatek,geniezone-hyp.yaml create mode 100644 Documentation/virt/geniezone/introduction.rst create mode 100644 arch/arm64/geniezone/Makefile create mode 100644 arch/arm64/geniezone/gzvm_arch_common.h create mode 100644 arch/arm64/geniezone/vcpu.c create mode 100644 arch/arm64/geniezone/vgic.c create mode 100644 arch/arm64/geniezone/vm.c create mode 100644 drivers/virt/geniezone/Kconfig create mode 100644 drivers/virt/geniezone/Makefile create mode 100644 drivers/virt/geniezone/gzvm_common.h create mode 100644 drivers/virt/geniezone/gzvm_exception.c create mode 100644 drivers/virt/geniezone/gzvm_ioeventfd.c create mode 100644 drivers/virt/geniezone/gzvm_irqfd.c create mode 100644 drivers/virt/geniezone/gzvm_main.c create mode 100644 drivers/virt/geniezone/gzvm_mmu.c create mode 100644 drivers/virt/geniezone/gzvm_vcpu.c create mode 100644 drivers/virt/geniezone/gzvm_vm.c create mode 100644 include/linux/gzvm_drv.h create mode 100644 include/uapi/linux/gzvm.h
Signature · 1 line
2.18.0
PATCH v7 1/16 docs: geniezone: Introduce GenieZone hypervisor
From: "Yingshiuan Pan" <[email protected]>
GenieZone is MediaTek proprietary hypervisor solution, and it is running in EL2 stand alone as a type-I hypervisor. It is a pure EL2 implementation which implies it does not rely any specific host VM, and this behavior improves GenieZone's security as it limits its interface.
--- Documentation/virt/geniezone/introduction.rst | 86 +++++++++++++++++++ Documentation/virt/index.rst | 1 + MAINTAINERS | 6 ++ 3 files changed, 93 insertions(+) create mode 100644 Documentation/virt/geniezone/introduction.rst
Documentation/virt/geniezone/introduction.rst new file +86 -0
@@ -0,0 +1,86 @@ +.. SPDX-License-Identifier: GPL-2.0 + +====================== +GenieZone Introduction +====================== + +Overview +======== +GenieZone hypervisor(gzvm) is a type-1 hypervisor that supports various virtual +machine types and provides security features such as TEE-like scenarios and +secure boot. It can create guest VMs for security use cases and has +virtualization capabilities for both platform and interrupt. Although the +hypervisor can be booted independently, it requires the assistance of GenieZone +hypervisor kernel driver(gzvm-ko) to leverage the ability of Linux kernel for +vCPU scheduling, memory management, inter-VM communication and virtio backend +support. + +Supported Architecture +====================== +GenieZone now only supports MediaTek ARM64 SoC. + +Features +======== + +- vCPU Management + +VM manager aims to provide vCPUs on the basis of time sharing on physical CPUs. +It requires Linux kernel in host VM for vCPU scheduling and VM power management. + +- Memory Management + +Direct use of physical memory from VMs is forbidden and designed to be dictated +to the privilege models managed by GenieZone hypervisor for security reason. +With the help of gzvm-ko, the hypervisor would be able to manipulate memory as +objects. + +- Virtual Platform + +We manage to emulate a virtual mobile platform for guest OS running on guest +VM. The platform supports various architecture-defined devices, such as +virtual arch timer, GIC, MMIO, PSCI, and exception watching...etc. + +- Inter-VM Communication + +Communication among guest VMs was provided mainly on RPC. More communication +mechanisms were to be provided in the future based on VirtIO-vsock. + +- Device Virtualization + +The solution is provided using the well-known VirtIO. The gzvm-ko would +redirect MMIO traps back to VMM where the virtual devices are mostly emulated. +Ioeventfd is implemented using eventfd for signaling host VM that some IO +events in guest VMs need to be processed. + +- Interrupt virtualization + +All Interrupts during some guest VMs running would be handled by GenieZone +hypervisor with the help of gzvm-ko, both virtual and physical ones. In case +there's no guest VM running out there, physical interrupts would be handled by +host VM directly for performance reason. Irqfd is also implemented using +eventfd for accepting vIRQ requests in gzvm-ko. + +Platform architecture component +=============================== + +- vm + +The vm component is responsible for setting up the capability and memory +management for the protected VMs. The capability is mainly about the lifecycle +control and boot context initialization. And the memory management is highly +integrated with ARM 2-stage translation tables to convert VA to IPA to PA under +proper security measures required by protected VMs. + +- vcpu + +The vcpu component is the core of virtualizing aarch64 physical CPU runnable, +and it controls the vCPU lifecycle including creating, running and destroying. +With self-defined exit handler, the vm component would be able to act +accordingly before terminated. + +- vgic + +The vgic component exposes control interfaces to Linux kernel via irqchip, and +we intend to support all SPI, PPI, and SGI. When it comes to virtual +interrupts, the GenieZone hypervisor would write to list registers and trigger +vIRQ injection in guest VMs via GIC.
Documentation/virt/index.rst +1 -0
@@ -16,6 +16,7 @@ Virtualization Support coco/sev-guest coco/tdx-guest hyperv/index + geniezone/introduction .. only:: html and subproject
MAINTAINERS +6 -0
@@ -8942,6 +8942,12 @@ F: include/vdso/ F: kernel/time/vsyscall.c F: lib/vdso/ +GENIEZONE HYPERVISOR DRIVER +M: Yingshiuan Pan <[email protected]> +M: Ze-Yu Wang <[email protected]> +M: Yi-De Wu <[email protected]> +F: Documentation/virt/geniezone/ + GENWQE (IBM Generic Workqueue Card) M: Frank Haverkamp <[email protected]> S: Supported
Signature · 1 line
2.18.0
Re: [PATCH v7 01/16] docs: geniezone: Introduce GenieZone hypervisor
Quoted 6 lines · Yi-De Wu
Documentation/virt/geniezone/introduction.rst new file +0
-0
Documentation/virt/geniezone/introduction.rst line 9
Quoted 9 lines
Documentation/virt/geniezone/introduction.rst new file +9
-0@@ -0,0 +1,86 @@ +.. SPDX-License-Identifier: GPL-2.0 + +====================== +GenieZone Introduction +====================== + +Overview +======== +GenieZone hypervisor(gzvm) is a type-1 hypervisor that supports various virtual
"... hypervisor (gzvm) ..."
Documentation/virt/geniezone/introduction.rst line 14
Quoted 5 lines
Documentation/virt/geniezone/introduction.rst new file +5
-0+machine types and provides security features such as TEE-like scenarios and +secure boot. It can create guest VMs for security use cases and has +virtualization capabilities for both platform and interrupt. Although the +hypervisor can be booted independently, it requires the assistance of GenieZone +hypervisor kernel driver(gzvm-ko) to leverage the ability of Linux kernel for
"hypervisor kernel driver (also named gzvm) ..."
Quoted 10 lines
Documentation/virt/geniezone/introduction.rst new file +10
-0+vCPU scheduling, memory management, inter-VM communication and virtio backend +support. + +Supported Architecture +====================== +GenieZone now only supports MediaTek ARM64 SoC. + +Features +======== +
Documentation/virt/geniezone/introduction.rst line 34
Quoted 10 lines
Documentation/virt/geniezone/introduction.rst new file +10
-0+- vCPU Management + +VM manager aims to provide vCPUs on the basis of time sharing on physical CPUs. +It requires Linux kernel in host VM for vCPU scheduling and VM power management. + +- Memory Management + +Direct use of physical memory from VMs is forbidden and designed to be dictated +to the privilege models managed by GenieZone hypervisor for security reason. +With the help of gzvm-ko, the hypervisor would be able to manipulate memory as
s/gzvm-ko/gzvm module/g
Quoted 42 lines
Documentation/virt/geniezone/introduction.rst new file +42
-0+objects. + +- Virtual Platform + +We manage to emulate a virtual mobile platform for guest OS running on guest +VM. The platform supports various architecture-defined devices, such as +virtual arch timer, GIC, MMIO, PSCI, and exception watching...etc. + +- Inter-VM Communication + +Communication among guest VMs was provided mainly on RPC. More communication +mechanisms were to be provided in the future based on VirtIO-vsock. + +- Device Virtualization + +The solution is provided using the well-known VirtIO. The gzvm-ko would +redirect MMIO traps back to VMM where the virtual devices are mostly emulated. +Ioeventfd is implemented using eventfd for signaling host VM that some IO +events in guest VMs need to be processed. + +- Interrupt virtualization + +All Interrupts during some guest VMs running would be handled by GenieZone +hypervisor with the help of gzvm-ko, both virtual and physical ones. In case +there's no guest VM running out there, physical interrupts would be handled by +host VM directly for performance reason. Irqfd is also implemented using +eventfd for accepting vIRQ requests in gzvm-ko. + +Platform architecture component +=============================== + +- vm + +The vm component is responsible for setting up the capability and memory +management for the protected VMs. The capability is mainly about the lifecycle +control and boot context initialization. And the memory management is highly +integrated with ARM 2-stage translation tables to convert VA to IPA to PA under +proper security measures required by protected VMs. + +- vcpu + +The vcpu component is the core of virtualizing aarch64 physical CPU runnable,
Documentation/virt/geniezone/introduction.rst line 86
Quoted 10 lines
Documentation/virt/geniezone/introduction.rst new file +10
-0+and it controls the vCPU lifecycle including creating, running and destroying. +With self-defined exit handler, the vm component would be able to act +accordingly before terminated. + +- vgic + +The vgic component exposes control interfaces to Linux kernel via irqchip, and +we intend to support all SPI, PPI, and SGI. When it comes to virtual +interrupts, the GenieZone hypervisor would write to list registers and trigger +vIRQ injection in guest VMs via GIC.
Descriptions for feature lists can be aligned:
---- >8 ----
Documentation/virt/geniezone/introduction.rst +34 -33
@@ -24,63 +24,64 @@ Features - vCPU Management -VM manager aims to provide vCPUs on the basis of time sharing on physical CPUs. -It requires Linux kernel in host VM for vCPU scheduling and VM power management. + VM manager aims to provide vCPUs on the basis of time sharing on physical + CPUs. It requires Linux kernel in host VM for vCPU scheduling and VM power + management. - Memory Management -Direct use of physical memory from VMs is forbidden and designed to be dictated -to the privilege models managed by GenieZone hypervisor for security reason. -With the help of gzvm-ko, the hypervisor would be able to manipulate memory as -objects. + Direct use of physical memory from VMs is forbidden and designed to be + dictated to the privilege models managed by GenieZone hypervisor for security + reason. With the help of gzvm-ko, the hypervisor would be able to manipulate + memory as objects. - Virtual Platform -We manage to emulate a virtual mobile platform for guest OS running on guest -VM. The platform supports various architecture-defined devices, such as -virtual arch timer, GIC, MMIO, PSCI, and exception watching...etc. + We manage to emulate a virtual mobile platform for guest OS running on guest + VM. The platform supports various architecture-defined devices, such as + virtual arch timer, GIC, MMIO, PSCI, and exception watching...etc. - Inter-VM Communication -Communication among guest VMs was provided mainly on RPC. More communication -mechanisms were to be provided in the future based on VirtIO-vsock. + Communication among guest VMs was provided mainly on RPC. More communication + mechanisms were to be provided in the future based on VirtIO-vsock. - Device Virtualization -The solution is provided using the well-known VirtIO. The gzvm-ko would -redirect MMIO traps back to VMM where the virtual devices are mostly emulated. -Ioeventfd is implemented using eventfd for signaling host VM that some IO -events in guest VMs need to be processed. + The solution is provided using the well-known VirtIO. The gzvm-ko would + redirect MMIO traps back to VMM where the virtual devices are mostly + emulated. Ioeventfd is implemented using eventfd for signaling host VM that + some IO events in guest VMs need to be processed. - Interrupt virtualization -All Interrupts during some guest VMs running would be handled by GenieZone -hypervisor with the help of gzvm-ko, both virtual and physical ones. In case -there's no guest VM running out there, physical interrupts would be handled by -host VM directly for performance reason. Irqfd is also implemented using -eventfd for accepting vIRQ requests in gzvm-ko. + All Interrupts during some guest VMs running would be handled by GenieZone + hypervisor with the help of gzvm-ko, both virtual and physical ones. In case + there's no guest VM running out there, physical interrupts would be handled + by host VM directly for performance reason. Irqfd is also implemented using + eventfd for accepting vIRQ requests in gzvm-ko. Platform architecture component =============================== - vm -The vm component is responsible for setting up the capability and memory -management for the protected VMs. The capability is mainly about the lifecycle -control and boot context initialization. And the memory management is highly -integrated with ARM 2-stage translation tables to convert VA to IPA to PA under -proper security measures required by protected VMs. + The vm component is responsible for setting up the capability and memory + management for the protected VMs. The capability is mainly about the + lifecycle control and boot context initialization. And the memory management + is highly integrated with ARM 2-stage translation tables to convert VA to IPA + to PA under proper security measures required by protected VMs. - vcpu -The vcpu component is the core of virtualizing aarch64 physical CPU runnable, -and it controls the vCPU lifecycle including creating, running and destroying. -With self-defined exit handler, the vm component would be able to act -accordingly before terminated. + The vcpu component is the core of virtualizing aarch64 physical CPU runnable, + and it controls the vCPU lifecycle including creating, running and + destroying. With self-defined exit handler, the vm component would be able to + act accordingly before terminated. - vgic -The vgic component exposes control interfaces to Linux kernel via irqchip, and -we intend to support all SPI, PPI, and SGI. When it comes to virtual -interrupts, the GenieZone hypervisor would write to list registers and trigger -vIRQ injection in guest VMs via GIC. + The vgic component exposes control interfaces to Linux kernel via irqchip, + and we intend to support all SPI, PPI, and SGI. When it comes to virtual + interrupts, the GenieZone hypervisor would write to list registers and + trigger vIRQ injection in guest VMs via GIC.
Thanks.
Signature · 1 line
An old man doll... just what I always wanted! - Clara
PATCH v7 2/16 dt-bindings: hypervisor: Add MediaTek GenieZone hypervisor
In reply to Yi-De WuFrom: "Yingshiuan Pan" <[email protected]>
Add documentation for GenieZone(gzvm) node. This node informs gzvm driver to start probing if geniezone hypervisor is available and able to do virtual machine operations.
[Detail]
The debate of using dt or not remains intact, and gentle ping seems not working on this issue. We'll keep this patch for further discussion and move forward in order to rebase based on the latest rc release. For previous discussion, please kindly refer to the following link.
https://lore.kernel.org/all/[email protected]/
--- .../hypervisor/mediatek,geniezone-hyp.yaml | 31 +++++++++++++++++++ MAINTAINERS | 1 + 2 files changed, 32 insertions(+) create mode 100644 Documentation/devicetree/bindings/hypervisor/mediatek,geniezone-hyp.yaml
Documentation/devicetree/bindings/hypervisor/mediatek,geniezone-hyp.yaml new file +31 -0
@@ -0,0 +1,31 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/hypervisor/mediatek,geniezone-hyp.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: MediaTek GenieZone hypervisor + +maintainers: + - Yingshiuan Pan <[email protected]> + +description: + This interface is designed for integrating GenieZone hypervisor into Android + Virtualization Framework(AVF) along with Crosvm as a VMM. + It acts like a wrapper for every hypercall to GenieZone hypervisor in + order to control guest VM lifecycles and virtual interrupt injections. + +properties: + compatible: + const: mediatek,geniezone-hyp + +required: + - compatible + +additionalProperties: false + +examples: + - | + hypervisor { + compatible = "mediatek,geniezone-hyp"; + };
MAINTAINERS +1 -0
@@ -8946,6 +8946,7 @@ GENIEZONE HYPERVISOR DRIVER M: Yingshiuan Pan <[email protected]> M: Ze-Yu Wang <[email protected]> M: Yi-De Wu <[email protected]> +F: Documentation/devicetree/bindings/hypervisor/mediatek,geniezone-hyp.yaml F: Documentation/virt/geniezone/ GENWQE (IBM Generic Workqueue Card)
Signature · 1 line
2.18.0
Rob Herring
maintainerRe: [PATCH v7 02/16] dt-bindings: hypervisor: Add MediaTek GenieZone hypervisor
Quoted 11 lines · Yi-De Wu
From: "Yingshiuan Pan" <[email protected]>
Add documentation for GenieZone(gzvm) node. This node informs gzvm driver to start probing if geniezone hypervisor is available and able to do virtual machine operations.
[Detail]
The debate of using dt or not remains intact, and gentle ping seems not working on this issue. We'll keep this patch for further discussion and move forward in order to rebase based on the latest rc release. For previous discussion, please kindly refer to the following link.
Please explain in the commit message why this needs to be in DT and is not discoverable by some other means?
Rob
PATCH v7 3/16 virt: geniezone: Add GenieZone hypervisor driver
In reply to Yi-De WuFrom: "Yingshiuan Pan" <[email protected]>
GenieZone hypervisor(gzvm) is a type-1 hypervisor that supports various virtual machine types and provides security features such as TEE-like scenarios and secure boot. It can create guest VMs for security use cases and has virtualization capabilities for both platform and interrupt. Although the hypervisor can be booted independently, it requires the assistance of GenieZone hypervisor kernel driver(gzvm-ko) to leverage the ability of Linux kernel for vCPU scheduling, memory management, inter-VM communication and virtio backend support.
Add the basic hypervisor driver. Subsequent patches will add more supported features to this driver.
--- MAINTAINERS | 3 + arch/arm64/Kbuild | 1 + arch/arm64/geniezone/Makefile | 9 +++ arch/arm64/geniezone/gzvm_arch_common.h | 37 ++++++++++ arch/arm64/geniezone/vm.c | 40 +++++++++++ drivers/virt/Kconfig | 2 + drivers/virt/geniezone/Kconfig | 16 +++++ drivers/virt/geniezone/Makefile | 10 +++ drivers/virt/geniezone/gzvm_main.c | 89 +++++++++++++++++++++++++ include/linux/gzvm_drv.h | 25 +++++++ 10 files changed, 232 insertions(+) create mode 100644 arch/arm64/geniezone/Makefile create mode 100644 arch/arm64/geniezone/gzvm_arch_common.h create mode 100644 arch/arm64/geniezone/vm.c create mode 100644 drivers/virt/geniezone/Kconfig create mode 100644 drivers/virt/geniezone/Makefile create mode 100644 drivers/virt/geniezone/gzvm_main.c create mode 100644 include/linux/gzvm_drv.h
MAINTAINERS +3 -0
@@ -8948,6 +8948,9 @@ M: Ze-Yu Wang <[email protected]> M: Yi-De Wu <[email protected]> F: Documentation/devicetree/bindings/hypervisor/mediatek,geniezone-hyp.yaml F: Documentation/virt/geniezone/ +F: arch/arm64/geniezone/ +F: drivers/virt/geniezone/ +F: include/linux/gzvm_drv.h GENWQE (IBM Generic Workqueue Card) M: Frank Haverkamp <[email protected]>
arch/arm64/Kbuild +1 -0
@@ -4,6 +4,7 @@ obj-$(CONFIG_KVM) += kvm/ obj-$(CONFIG_XEN) += xen/ obj-$(subst m,y,$(CONFIG_HYPERV)) += hyperv/ obj-$(CONFIG_CRYPTO) += crypto/ +obj-$(CONFIG_MTK_GZVM) += geniezone/ # for cleaning subdir- += boot
arch/arm64/geniezone/Makefile new file +9 -0
@@ -0,0 +1,9 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +# Main Makefile for gzvm, this one includes drivers/virt/geniezone/Makefile +# +include $(srctree)/drivers/virt/geniezone/Makefile + +gzvm-y += vm.o + +obj-$(CONFIG_MTK_GZVM) += gzvm.o
arch/arm64/geniezone/gzvm_arch_common.h new file +37 -0
@@ -0,0 +1,37 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (c) 2023 MediaTek Inc. +*/ + +#ifndef __GZVM_ARCH_COMMON_H__ +#define __GZVM_ARCH_COMMON_H__ + +#include <linux/arm-smccc.h> + +enum { +GZVM_FUNC_PROBE =12 , +NR_GZVM_FUNC , +}; + +#define SMC_ENTITY_MTK 59 +#define GZVM_FUNCID_START (0x1000) +#define GZVM_HCALL_ID (func) \ + ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, ARM_SMCCC_SMC_32, \ + SMC_ENTITY_MTK, (GZVM_FUNCID_START + (func))) + +#define MT_HVC_GZVM_PROBE GZVM_HCALL_ID(GZVM_FUNC_PROBE) + +/** +* gzvm_hypcall_wrapper() - the wrapper for hvc calls +* @a0-a7: arguments passed in registers 0 to 7 +* @res: result values from registers 0 to 3 +* +* Return: The wrapper helps caller to convert geniezone errno to Linux errno. +*/ +int gzvm_hypcall_wrapper (unsigned long a0,unsigned long a1, +unsigned long a2,unsigned long a3, +unsigned long a4,unsigned long a5, +unsigned long a6,unsigned long a7, +struct arm_smccc_res *res); + +#endif /* __GZVM_ARCH_COMMON_H__ */
arch/arm64/geniezone/vm.c new file +40 -0
@@ -0,0 +1,40 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (c) 2023 MediaTek Inc. +*/ + +#include <linux/arm-smccc.h> +#include <linux/err.h> +#include <linux/uaccess.h> + +#include <linux/gzvm_drv.h> +#include "gzvm_arch_common.h" + +/** +* gzvm_hypcall_wrapper() - the wrapper for hvc calls +* @a0-a7: arguments passed in registers 0 to 7 +* @res: result values from registers 0 to 3 +* +* Return: The wrapper helps caller to convert geniezone errno to Linux errno. +*/ +int gzvm_hypcall_wrapper (unsigned long a0,unsigned long a1, +unsigned long a2,unsigned long a3, +unsigned long a4,unsigned long a5, +unsigned long a6,unsigned long a7, +struct arm_smccc_res *res) +{ +arm_smccc_hvc (a0, a1, a2, a3, a4, a5, a6, a7, res); +return gzvm_err_to_errno (res->a0); +} + +int gzvm_arch_probe (void ) +{ +struct arm_smccc_res res; +int ret; + + ret =gzvm_hypcall_wrapper (MT_HVC_GZVM_PROBE ,0 ,0 ,0 ,0 ,0 ,0 ,0 , &res); +if (ret) +return -ENXIO ; + +return 0 ; +}
drivers/virt/Kconfig +2 -0
@@ -50,4 +50,6 @@ source "drivers/virt/acrn/Kconfig" source "drivers/virt/coco/Kconfig" +source "drivers/virt/geniezone/Kconfig" + endif
drivers/virt/geniezone/Kconfig new file +16 -0
@@ -0,0 +1,16 @@ +# SPDX-License-Identifier: GPL-2.0-only + +config MTK_GZVM + tristate "GenieZone Hypervisor driver for guest VM operation" + depends on ARM64 + help + This driver, gzvm, enables to run guest VMs on MTK GenieZone + hypervisor. It exports kvm-like interfaces for VMM (e.g., crosvm) in + order to operate guest VMs on GenieZone hypervisor. + + GenieZone hypervisor now only supports MediaTek SoC and arm64 + architecture. + + Select M if you want it be built as a module (gzvm.ko). + + If unsure, say N.
drivers/virt/geniezone/Makefile new file +10 -0
@@ -0,0 +1,10 @@ +# SPDX-License-Identifier: GPL-2.0-only +# +# Makefile for GenieZone driver, this file should be include in arch's +# to avoid two ko being generated. +# + +GZVM_DIR ?= ../../../drivers/virt/geniezone + +gzvm-y := $(GZVM_DIR)/gzvm_main.o +
drivers/virt/geniezone/gzvm_main.c new file +89 -0
89 lines not on this page · raw message
include/linux/gzvm_drv.h new file +25 -0
@@ -0,0 +1,25 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (c) 2023 MediaTek Inc. +*/ + +#ifndef __GZVM_DRV_H__ +#define __GZVM_DRV_H__ + +/* +* These are the definitions of APIs between GenieZone hypervisor and driver, +* there's no need to be visible to uapi. Furthermore, we need GenieZone +* specific error code in order to map to Linux errno +*/ +#define NO_ERROR (0) +#define ERR_NO_MEMORY (-5) +#define ERR_NOT_SUPPORTED (-24) +#define ERR_NOT_IMPLEMENTED (-27) +#define ERR_FAULT (-40) + +int gzvm_err_to_errno (unsigned long err); + +/* arch-dependant functions */ +int gzvm_arch_probe (void ); + +#endif /* __GZVM_DRV_H__ */
Signature · 1 line
2.18.0
Re: [PATCH v7 03/16] virt: geniezone: Add GenieZone hypervisor driver
Quoted 38 lines · Yi-De Wu
From: "Yingshiuan Pan" <[email protected]>
GenieZone hypervisor(gzvm) is a type-1 hypervisor that supports various virtual machine types and provides security features such as TEE-like scenarios and secure boot. It can create guest VMs for security use cases and has virtualization capabilities for both platform and interrupt. Although the hypervisor can be booted independently, it requires the assistance of GenieZone hypervisor kernel driver(gzvm-ko) to leverage the ability of Linux kernel for vCPU scheduling, memory management, inter-VM communication and virtio backend support.
Add the basic hypervisor driver. Subsequent patches will add more supported features to this driver.
Signed-off-by Yingshiuan Pan <[email protected]>Signed-off-by Jerry Wang <[email protected]>Signed-off-by Liju Chen <[email protected]>Signed-off-by Yi-De Wu <[email protected]>--- MAINTAINERS | 3 + arch/arm64/Kbuild | 1 + arch/arm64/geniezone/Makefile | 9 +++ arch/arm64/geniezone/gzvm_arch_common.h | 37 ++++++++++ arch/arm64/geniezone/vm.c | 40 +++++++++++ drivers/virt/Kconfig | 2 + drivers/virt/geniezone/Kconfig | 16 +++++ drivers/virt/geniezone/Makefile | 10 +++ drivers/virt/geniezone/gzvm_main.c | 89 +++++++++++++++++++++++++ include/linux/gzvm_drv.h | 25 +++++++ 10 files changed, 232 insertions(+) create mode 100644 arch/arm64/geniezone/Makefile create mode 100644 arch/arm64/geniezone/gzvm_arch_common.h create mode 100644 arch/arm64/geniezone/vm.c create mode 100644 drivers/virt/geniezone/Kconfig create mode 100644 drivers/virt/geniezone/Makefile create mode 100644 drivers/virt/geniezone/gzvm_main.c create mode 100644 include/linux/gzvm_drv.h
[...]
Quoted 18 lines
arch/arm64/geniezone/gzvm_arch_common.h new file +11
-0@@ -0,0 +1,37 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (c) 2023 MediaTek Inc. +*/ + +#ifndef __GZVM_ARCH_COMMON_H__ +#define __GZVM_ARCH_COMMON_H__ + +#include <linux/arm-smccc.h> + +enum {
arch/arm64/geniezone/gzvm_arch_common.h line 21
Quoted 10 lines
arch/arm64/geniezone/gzvm_arch_common.h new file +10
-0+GZVM_FUNC_PROBE =12 , + NR_GZVM_FUNC, +}; + +#define SMC_ENTITY_MTK 59 +#define GZVM_FUNCID_START (0x1000) +#define GZVM_HCALL_ID (func) \ + ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, ARM_SMCCC_SMC_32, \ + SMC_ENTITY_MTK, (GZVM_FUNCID_START + (func))) +
ARM_SMCCC_SMC_32? Really? You never pass a 64bit quantity anywhere?
I'm half tempted to enforce the truncation to 32bit.
M.
Signature · 1 line
Jazz is not dead. It just smells funny...
kernel test robot
build botRe: [PATCH v7 03/16] virt: geniezone: Add GenieZone hypervisor driver
In reply to Yi-De Wukernel test robot noticed the following build warnings:
Hi Yi-De,
kernel test robot noticed the following build warnings:
[auto build test WARNING on linus/master]
[also build test WARNING on v6.7-rc1 next-20231116]
[cannot apply to arm64/for-next/core robh/for-next]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Yi-De-Wu/docs-geniezone-Introduce-GenieZone-hypervisor/20231116-233442 base: linus/master patch link: https://lore.kernel.org/r/20231116152756.4250-4-yi-de.wu%40mediatek.com patch subject: [PATCH v7 03/16] virt: geniezone: Add GenieZone hypervisor driver config: arm64-allmodconfig (https://download.01.org/0day-ci/archive/20231117/[email protected]/config) compiler: aarch64-linux-gcc (GCC) 13.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20231117/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All warnings (new ones prefixed by >>):
>> arch/arm64/geniezone/vm.c:25: warning: Function parameter or member 'a0' not described in 'gzvm_hypcall_wrapper' >> arch/arm64/geniezone/vm.c:25: warning: Function parameter or member 'a1' not described in 'gzvm_hypcall_wrapper' >> arch/arm64/geniezone/vm.c:25: warning: Function parameter or member 'a2' not described in 'gzvm_hypcall_wrapper' >> arch/arm64/geniezone/vm.c:25: warning: Function parameter or member 'a3' not described in 'gzvm_hypcall_wrapper' >> arch/arm64/geniezone/vm.c:25: warning: Function parameter or member 'a4' not described in 'gzvm_hypcall_wrapper' >> arch/arm64/geniezone/vm.c:25: warning: Function parameter or member 'a5' not described in 'gzvm_hypcall_wrapper' >> arch/arm64/geniezone/vm.c:25: warning: Function parameter or member 'a6' not described in 'gzvm_hypcall_wrapper' >> arch/arm64/geniezone/vm.c:25: warning: Function parameter or member 'a7' not described in 'gzvm_hypcall_wrapper'
vim +25 arch/arm64/geniezone/vm.c
12
13 /**
14 * gzvm_hypcall_wrapper() - the wrapper for hvc calls
15 * @a0-a7: arguments passed in registers 0 to 7
16 * @res: result values from registers 0 to 3
17 *
18 * Return: The wrapper helps caller to convert geniezone errno to Linux errno.
19 */
20 int gzvm_hypcall_wrapper(unsigned long a0, unsigned long a1,
21 unsigned long a2, unsigned long a3,
22 unsigned long a4, unsigned long a5,
23 unsigned long a6, unsigned long a7,
24 struct arm_smccc_res *res)
> 25 {
26 arm_smccc_hvc(a0, a1, a2, a3, a4, a5, a6, a7, res);
27 return gzvm_err_to_errno(res->a0);
28 }
29 Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
PATCH v7 4/16 virt: geniezone: Add vm support
In reply to Yi-De WuFrom: "Yingshiuan Pan" <[email protected]>
The VM component is responsible for setting up the capability and memory management for the protected VMs. The capability is mainly about the lifecycle control and boot context initialization.
--- MAINTAINERS | 1 + arch/arm64/geniezone/gzvm_arch_common.h | 9 ++ arch/arm64/geniezone/vm.c | 29 +++++++ drivers/virt/geniezone/Makefile | 2 +- drivers/virt/geniezone/gzvm_main.c | 19 +++++ drivers/virt/geniezone/gzvm_vm.c | 107 ++++++++++++++++++++++++ include/linux/gzvm_drv.h | 26 ++++++ include/uapi/linux/gzvm.h | 25 ++++++ 8 files changed, 217 insertions(+), 1 deletion(-) create mode 100644 drivers/virt/geniezone/gzvm_vm.c create mode 100644 include/uapi/linux/gzvm.h
MAINTAINERS +1 -0
@@ -8951,6 +8951,7 @@ F: Documentation/virt/geniezone/ F: arch/arm64/geniezone/ F: drivers/virt/geniezone/ F: include/linux/gzvm_drv.h +F: include/uapi/linux/gzvm.h GENWQE (IBM Generic Workqueue Card) M: Frank Haverkamp <[email protected]>
arch/arm64/geniezone/gzvm_arch_common.h +9 -0
@@ -9,6 +9,8 @@#include <linux/arm-smccc.h> enum { +GZVM_FUNC_CREATE_VM =0 , +GZVM_FUNC_DESTROY_VM =1 ,GZVM_FUNC_PROBE =12 ,NR_GZVM_FUNC , };
@@ -19,6 +21,8 @@ enum {ARM_SMCCC_CALL_VAL (ARM_SMCCC_FAST_CALL ,ARM_SMCCC_SMC_32 , \ SMC_ENTITY_MTK, (GZVM_FUNCID_START + (func))) +#define MT_HVC_GZVM_CREATE_VM GZVM_HCALL_ID(GZVM_FUNC_CREATE_VM) +#define MT_HVC_GZVM_DESTROY_VM GZVM_HCALL_ID(GZVM_FUNC_DESTROY_VM)#define MT_HVC_GZVM_PROBE GZVM_HCALL_ID(GZVM_FUNC_PROBE)/**
@@ -34,4 +38,9 @@ int gzvm_hypcall_wrapper(unsigned long a0, unsigned long a1, unsigned long a6, unsigned long a7, struct arm_smccc_res *res); +static inline u16 get_vmid_from_tuple (unsigned int tuple) +{ +return (u16)(tuple >>16 ); +} +#endif /* __GZVM_ARCH_COMMON_H__ */
arch/arm64/geniezone/vm.c +29 -0
@@ -7,9 +7,12 @@#include <linux/err.h> #include <linux/uaccess.h> +#include <linux/gzvm.h> #include <linux/gzvm_drv.h> #include "gzvm_arch_common.h" +#define PAR_PA47_MASK ((((1UL << 48) - 1) >> 12) << 12) +/** * gzvm_hypcall_wrapper() - the wrapper for hvc calls * @a0-a7: arguments passed in registers 0 to 7
@@ -38,3 +41,29 @@ int gzvm_arch_probe(void)return 0 ; } + +/** +* gzvm_arch_create_vm() - create vm +* @vm_type: VM type. Only supports Linux VM now. +* +* Return: +* * positive value - VM ID +* * -ENOMEM - Memory not enough for storing VM data +*/ +int gzvm_arch_create_vm (unsigned long vm_type) +{ +struct arm_smccc_res res; +int ret; + + ret =gzvm_hypcall_wrapper (MT_HVC_GZVM_CREATE_VM , vm_type,0 ,0 ,0 ,0 , +0 ,0 , &res); +return ret ? ret : res.a1; +} + +int gzvm_arch_destroy_vm (u16 vm_id) +{ +struct arm_smccc_res res; + +return gzvm_hypcall_wrapper (MT_HVC_GZVM_DESTROY_VM , vm_id,0 ,0 ,0 ,0 , +0 ,0 , &res); +}
drivers/virt/geniezone/Makefile +1 -1
@@ -6,5 +6,5 @@ GZVM_DIR ?= ../../../drivers/virt/geniezone -gzvm-y := $(GZVM_DIR)/gzvm_main.o +gzvm-y := $(GZVM_DIR)/gzvm_main.o $(GZVM_DIR)/gzvm_vm.o
drivers/virt/geniezone/gzvm_main.c +19 -0
@@ -4,6 +4,7 @@*/ #include <linux/device.h> +#include <linux/file.h> #include <linux/kdev_t.h> #include <linux/miscdevice.h> #include <linux/module.h>
@@ -40,7 +41,24 @@ int gzvm_err_to_errno(unsigned long err)return -EINVAL ; } +static long gzvm_dev_ioctl (struct file *filp,unsigned int cmd, +unsigned long user_args) +{ +long ret; + +switch (cmd) { +case GZVM_CREATE_VM : + ret =gzvm_dev_ioctl_create_vm (user_args); +return ret; +default : +break ; + } + +return -ENOTTY ; +} +static const struct file_operations gzvm_chardev_ops = { + .unlocked_ioctl = gzvm_dev_ioctl, .llseek = noop_llseek, };
@@ -62,6 +80,7 @@ static int gzvm_drv_probe(struct platform_device *pdev)static int gzvm_drv_remove (struct platform_device *pdev) { +gzvm_destroy_all_vms ();misc_deregister (&gzvm_dev);return 0 ; }
drivers/virt/geniezone/gzvm_vm.c new file +107 -0
107 lines not on this page · raw message
include/linux/gzvm_drv.h +26 -0
@@ -6,6 +6,12 @@#ifndef __GZVM_DRV_H__#define __GZVM_DRV_H__ +#include <linux/list.h> +#include <linux/mutex.h> +#include <linux/gzvm.h> + +#define INVALID_VM_ID 0xffff +/* * These are the definitions of APIs between GenieZone hypervisor and driver, * there's no need to be visible to uapi. Furthermore, we need GenieZone
@@ -17,9 +23,29 @@#define ERR_NOT_IMPLEMENTED (-27)#define ERR_FAULT (-40) +/* +* The following data structures are for data transferring between driver and +* hypervisor, and they're aligned with hypervisor definitions +*/ + +struct gzvm { +/* userspace tied to this vm */ +struct mm_struct *mm; +/* lock for list_add*/ +struct mutex lock; +struct list_head vm_list; +u16 vm_id; +}; + +int gzvm_dev_ioctl_create_vm (unsigned long vm_type); +int gzvm_err_to_errno (unsigned long err); +void gzvm_destroy_all_vms (void ); +/* arch-dependant functions */ int gzvm_arch_probe (void ); +int gzvm_arch_create_vm (unsigned long vm_type); +int gzvm_arch_destroy_vm (u16 vm_id);#endif /* __GZVM_DRV_H__ */
include/uapi/linux/gzvm.h new file +25 -0
@@ -0,0 +1,25 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* +* Copyright (c) 2023 MediaTek Inc. +*/ + +/** +* DOC: UAPI of GenieZone Hypervisor +* +* This file declares common data structure shared among user space, +* kernel space, and GenieZone hypervisor. +*/ +#ifndef __GZVM_H__ +#define __GZVM_H__ + +#include <linux/const.h> +#include <linux/types.h> +#include <linux/ioctl.h> + +/* GZVM ioctls */ +#define GZVM_IOC_MAGIC 0x92/* gz */ + +/* ioctls for /dev/gzvm fds */ +#define GZVM_CREATE_VM _IO(GZVM_IOC_MAGIC, 0x01)/* Returns a Geniezone VM fd */ + +#endif /* __GZVM_H__ */
Signature · 1 line
2.18.0
PATCH v7 5/16 virt: geniezone: Add set_user_memory_region for vm
In reply to Yi-De WuFrom: "Yingshiuan Pan" <[email protected]>
Direct use of physical memory from VMs is forbidden and designed to be dictated to the privilege models managed by GenieZone hypervisor for security reason. With the help of gzvm-ko, the hypervisor would be able to manipulate memory as objects. And the memory management is highly integrated with ARM 2-stage translation tables to convert VA to IPA to PA under proper security measures required by protected VMs.
--- arch/arm64/geniezone/gzvm_arch_common.h | 2 + arch/arm64/geniezone/vm.c | 34 ++++++++ drivers/virt/geniezone/Makefile | 3 +- drivers/virt/geniezone/gzvm_mmu.c | 108 +++++++++++++++++++++++ drivers/virt/geniezone/gzvm_vm.c | 110 ++++++++++++++++++++++++ include/linux/gzvm_drv.h | 44 ++++++++++ include/uapi/linux/gzvm.h | 26 ++++++ 7 files changed, 326 insertions(+), 1 deletion(-) create mode 100644 drivers/virt/geniezone/gzvm_mmu.c
arch/arm64/geniezone/gzvm_arch_common.h +2 -0
@@ -11,6 +11,7 @@enum {GZVM_FUNC_CREATE_VM =0 ,GZVM_FUNC_DESTROY_VM =1 , +GZVM_FUNC_SET_MEMREGION =4 ,GZVM_FUNC_PROBE =12 ,NR_GZVM_FUNC , };
@@ -23,6 +24,7 @@ enum {#define MT_HVC_GZVM_CREATE_VM GZVM_HCALL_ID(GZVM_FUNC_CREATE_VM)#define MT_HVC_GZVM_DESTROY_VM GZVM_HCALL_ID(GZVM_FUNC_DESTROY_VM) +#define MT_HVC_GZVM_SET_MEMREGION GZVM_HCALL_ID(GZVM_FUNC_SET_MEMREGION)#define MT_HVC_GZVM_PROBE GZVM_HCALL_ID(GZVM_FUNC_PROBE)/**
arch/arm64/geniezone/vm.c +34 -0
@@ -42,6 +42,15 @@ int gzvm_arch_probe(void)return 0 ; } +int gzvm_arch_set_memregion (u16 vm_id,size_t buf_size, +phys_addr_t region) +{ +struct arm_smccc_res res; + +return gzvm_hypcall_wrapper (MT_HVC_GZVM_SET_MEMREGION , vm_id, + buf_size, region,0 ,0 ,0 ,0 , &res); +} +/** * gzvm_arch_create_vm() - create vm * @vm_type: VM type. Only supports Linux VM now.
@@ -67,3 +76,28 @@ int gzvm_arch_destroy_vm(u16 vm_id)return gzvm_hypcall_wrapper (MT_HVC_GZVM_DESTROY_VM , vm_id,0 ,0 ,0 ,0 ,0 ,0 , &res); } + +/** +* gzvm_hva_to_pa_arch() - converts hva to pa with arch-specific way +* @hva: Host virtual address. +* +* Return: GZVM_PA_ERR_BAD for translation error +*/ +u64 gzvm_hva_to_pa_arch (u64 hva) +{ +unsigned long flags; +u64 par; + +local_irq_save (flags); + asmvolatile ("at s1e1r, %0" ::"r" (hva)); +isb (); + par =read_sysreg_par (); +local_irq_restore (flags); + +if (par &SYS_PAR_EL1_F ) +return GZVM_PA_ERR_BAD ; + par = par &PAR_PA47_MASK ; +if (!par) +return GZVM_PA_ERR_BAD ; +return par; +}
drivers/virt/geniezone/Makefile +2 -1
@@ -6,5 +6,6 @@ GZVM_DIR ?= ../../../drivers/virt/geniezone -gzvm-y := $(GZVM_DIR)/gzvm_main.o $(GZVM_DIR)/gzvm_vm.o +gzvm-y := $(GZVM_DIR)/gzvm_main.o $(GZVM_DIR)/gzvm_mmu.o \ + $(GZVM_DIR)/gzvm_vm.o
drivers/virt/geniezone/gzvm_mmu.c new file +108 -0
108 lines not on this page · raw message
drivers/virt/geniezone/gzvm_vm.c +110 -0
122 lines not on this page · raw message
include/linux/gzvm_drv.h +44 -0
70 lines not on this page · raw message
include/uapi/linux/gzvm.h +26 -0
@@ -22,4 +22,30 @@/* ioctls for /dev/gzvm fds */ #define GZVM_CREATE_VM _IO(GZVM_IOC_MAGIC, 0x01)/* Returns a Geniezone VM fd */ +/* ioctls for VM fds */ +/* for GZVM_SET_MEMORY_REGION */ +struct gzvm_memory_region { +__u32 slot; +__u32 flags; +__u64 guest_phys_addr; +__u64 memory_size;/* bytes */ +}; + +#define GZVM_SET_MEMORY_REGION _IOW(GZVM_IOC_MAGIC, 0x40, \ + struct gzvm_memory_region) + +/* for GZVM_SET_USER_MEMORY_REGION */ +struct gzvm_userspace_memory_region { +__u32 slot; +__u32 flags; +__u64 guest_phys_addr; +/* bytes */ +__u64 memory_size; +/* start of the userspace allocated memory */ +__u64 userspace_addr; +}; + +#define GZVM_SET_USER_MEMORY_REGION _IOW(GZVM_IOC_MAGIC, 0x46, \ + struct gzvm_userspace_memory_region) +#endif /* __GZVM_H__ */
Signature · 1 line
2.18.0
PATCH v7 6/16 virt: geniezone: Add vm capability check
In reply to Yi-De WuFrom: "Yingshiuan Pan" <[email protected]>
Inquire the capability support on GenieZone hypervisor. Example:GZVM_CAP_PROTECTED_VM or GZVM_CAP_VM_GPA_SIZE.
--- arch/arm64/geniezone/gzvm_arch_common.h | 2 + arch/arm64/geniezone/vm.c | 243 ++++++++++++++++++++++++ drivers/virt/geniezone/gzvm_main.c | 27 +++ drivers/virt/geniezone/gzvm_vm.c | 21 ++ include/linux/gzvm_drv.h | 6 +- include/uapi/linux/gzvm.h | 31 +++ 6 files changed, 329 insertions(+), 1 deletion(-)
arch/arm64/geniezone/gzvm_arch_common.h +2 -0
@@ -13,6 +13,7 @@ enum {GZVM_FUNC_DESTROY_VM =1 ,GZVM_FUNC_SET_MEMREGION =4 ,GZVM_FUNC_PROBE =12 , +GZVM_FUNC_ENABLE_CAP =13 , NR_GZVM_FUNC, };
@@ -26,6 +27,7 @@ enum {#define MT_HVC_GZVM_DESTROY_VM GZVM_HCALL_ID(GZVM_FUNC_DESTROY_VM)#define MT_HVC_GZVM_SET_MEMREGION GZVM_HCALL_ID(GZVM_FUNC_SET_MEMREGION)#define MT_HVC_GZVM_PROBE GZVM_HCALL_ID(GZVM_FUNC_PROBE) +#define MT_HVC_GZVM_ENABLE_CAP GZVM_HCALL_ID(GZVM_FUNC_ENABLE_CAP)/** * gzvm_hypcall_wrapper() - the wrapper for hvc calls
arch/arm64/geniezone/vm.c +243 -0
255 lines not on this page · raw message
drivers/virt/geniezone/gzvm_main.c +27 -0
@@ -41,6 +41,28 @@ int gzvm_err_to_errno(unsigned long err)return -EINVAL ; } +/** +* gzvm_dev_ioctl_check_extension() - Check if given capability is support +* or not +* +* @gzvm: Pointer to struct gzvm +* @args: Pointer in u64 from userspace +* +* Return: +* * 0 - Supported, no error +* * -EOPNOTSUPP - Unsupported +* * -EFAULT - Failed to get data from userspace +*/ +long gzvm_dev_ioctl_check_extension (struct gzvm *gzvm,unsigned long args) +{ +__u64 cap; +void __user *argp = (void __user *)args; + +if (copy_from_user (&cap, argp,sizeof (uint64_t ))) +return -EFAULT ; +return gzvm_arch_check_extension (gzvm, cap, argp); +} +static long gzvm_dev_ioctl (struct file *filp,unsigned int cmd,unsigned long user_args) {
@@ -50,6 +72,11 @@ static long gzvm_dev_ioctl(struct file *filp, unsigned int cmd,case GZVM_CREATE_VM : ret =gzvm_dev_ioctl_create_vm (user_args);return ret; +case GZVM_CHECK_EXTENSION : +if (!user_args) +return -EINVAL ; + ret =gzvm_dev_ioctl_check_extension (NULL , user_args); +return ret;default :break ; }
drivers/virt/geniezone/gzvm_vm.c +21 -0
@@ -98,6 +98,13 @@ gzvm_vm_ioctl_set_memory_region(struct gzvm *gzvm,return register_memslot_addr_range (gzvm, memslot); } +static int gzvm_vm_ioctl_enable_cap (struct gzvm *gzvm, +struct gzvm_enable_cap *cap, +void __user *argp) +{ +return gzvm_vm_ioctl_arch_enable_cap (gzvm, cap, argp); +} +/* gzvm_vm_ioctl() - Ioctl handler of VM FD */ static long gzvm_vm_ioctl (struct file *filp,unsigned int ioctl,unsigned long arg)
@@ -107,6 +114,10 @@ static long gzvm_vm_ioctl(struct file *filp, unsigned int ioctl,struct gzvm *gzvm = filp->private_data;switch (ioctl) { +case GZVM_CHECK_EXTENSION : { + ret =gzvm_dev_ioctl_check_extension (gzvm, arg); +break ; + }case GZVM_SET_USER_MEMORY_REGION : {struct gzvm_userspace_memory_region userspace_mem;
@@ -117,6 +128,16 @@ static long gzvm_vm_ioctl(struct file *filp, unsigned int ioctl, ret =gzvm_vm_ioctl_set_memory_region (gzvm, &userspace_mem);break ; } +case GZVM_ENABLE_CAP : { +struct gzvm_enable_cap cap; + +if (copy_from_user (&cap, argp,sizeof (cap))) { + ret = -EFAULT ; + goto out; + } + ret =gzvm_vm_ioctl_enable_cap (gzvm, &cap, argp); +break ; + }default : ret = -ENOTTY ; }
include/linux/gzvm_drv.h +5 -1
@@ -73,6 +73,7 @@ struct gzvm {u16 vm_id; }; +long gzvm_dev_ioctl_check_extension (struct gzvm *gzvm,unsigned long args);int gzvm_dev_ioctl_create_vm (unsigned long vm_type);int gzvm_err_to_errno (unsigned long err);
@@ -83,9 +84,12 @@ void gzvm_destroy_all_vms(void);int gzvm_arch_probe (void );int gzvm_arch_set_memregion (u16 vm_id,size_t buf_size,phys_addr_t region); +int gzvm_arch_check_extension (struct gzvm *gzvm,__u64 cap,void __user *argp);int gzvm_arch_create_vm (unsigned long vm_type);int gzvm_arch_destroy_vm (u16 vm_id); - +int gzvm_vm_ioctl_arch_enable_cap (struct gzvm *gzvm, +struct gzvm_enable_cap *cap, +void __user *argp);u64 gzvm_hva_to_pa_arch (u64 hva);u64 hva_to_pa_fast (u64 hva);u64 hva_to_pa_slow (u64 hva);
include/uapi/linux/gzvm.h +31 -0
@@ -16,12 +16,30 @@#include <linux/types.h> #include <linux/ioctl.h> +#define GZVM_CAP_VM_GPA_SIZE 0xa5 +#define GZVM_CAP_PROTECTED_VM 0xffbadab1 + +/* sub-commands put in args[0] for GZVM_CAP_PROTECTED_VM */ +#define GZVM_CAP_PVM_SET_PVMFW_GPA 0 +#define GZVM_CAP_PVM_GET_PVMFW_SIZE 1 +/* GZVM_CAP_PVM_SET_PROTECTED_VM only sets protected but not load pvmfw */ +#define GZVM_CAP_PVM_SET_PROTECTED_VM 2 +/* GZVM ioctls */ #define GZVM_IOC_MAGIC 0x92/* gz */ /* ioctls for /dev/gzvm fds */ #define GZVM_CREATE_VM _IO(GZVM_IOC_MAGIC, 0x01)/* Returns a Geniezone VM fd */ +/* +* Check if the given capability is supported or not. +* The argument is capability. Ex. GZVM_CAP_PROTECTED_VM or GZVM_CAP_VM_GPA_SIZE +* return is 0 (supported, no error) +* return is -EOPNOTSUPP (unsupported) +* return is -EFAULT (failed to get the argument from userspace) +*/ +#define GZVM_CHECK_EXTENSION _IO(GZVM_IOC_MAGIC, 0x03) +/* ioctls for VM fds */ /* for GZVM_SET_MEMORY_REGION */ struct gzvm_memory_region {
@@ -48,4 +66,17 @@ struct gzvm_userspace_memory_region {#define GZVM_SET_USER_MEMORY_REGION _IOW(GZVM_IOC_MAGIC, 0x46, \ struct gzvm_userspace_memory_region) +/** +* struct gzvm_enable_cap: The `capability support` on GenieZone hypervisor +* @cap: `GZVM_CAP_ARM_PROTECTED_VM` or `GZVM_CAP_ARM_VM_IPA_SIZE` +* @args: x3-x7 registers can be used for additional args +*/ +struct gzvm_enable_cap { +__u64 cap; +__u64 args[5 ]; +}; + +#define GZVM_ENABLE_CAP _IOW(GZVM_IOC_MAGIC, 0xa3, \ + struct gzvm_enable_cap) +#endif /* __GZVM_H__ */
Signature · 1 line
2.18.0
PATCH v7 7/16 virt: geniezone: Add vcpu support
In reply to Yi-De WuFrom: "Yingshiuan Pan" <[email protected]>
VMM use this interface to create vcpu instance which is a fd, and this fd will be for any vcpu operations, such as setting vcpu registers and accepts the most important ioctl GZVM_VCPU_RUN which requests GenieZone hypervisor to do context switch to execute VM's vcpu context.
--- arch/arm64/geniezone/Makefile | 2 +- arch/arm64/geniezone/gzvm_arch_common.h | 30 +++ arch/arm64/geniezone/vcpu.c | 80 ++++++++ arch/arm64/geniezone/vm.c | 12 ++ drivers/virt/geniezone/Makefile | 3 +- drivers/virt/geniezone/gzvm_vcpu.c | 251 ++++++++++++++++++++++++ drivers/virt/geniezone/gzvm_vm.c | 5 + include/linux/gzvm_drv.h | 24 +++ include/uapi/linux/gzvm.h | 164 ++++++++++++++++ 9 files changed, 568 insertions(+), 3 deletions(-) create mode 100644 arch/arm64/geniezone/vcpu.c create mode 100644 drivers/virt/geniezone/gzvm_vcpu.c
arch/arm64/geniezone/Makefile +1 -1
@@ -4,6 +4,6 @@ # include $(srctree)/drivers/virt/geniezone/Makefile -gzvm-y += vm.o +gzvm-y += vm.o vcpu.o obj-$(CONFIG_MTK_GZVM) += gzvm.o
arch/arm64/geniezone/gzvm_arch_common.h +30 -0
@@ -11,9 +11,15 @@enum {GZVM_FUNC_CREATE_VM =0 ,GZVM_FUNC_DESTROY_VM =1 , +GZVM_FUNC_CREATE_VCPU =2 , +GZVM_FUNC_DESTROY_VCPU =3 ,GZVM_FUNC_SET_MEMREGION =4 , +GZVM_FUNC_RUN =5 , +GZVM_FUNC_GET_ONE_REG =8 , +GZVM_FUNC_SET_ONE_REG =9 ,GZVM_FUNC_PROBE =12 ,GZVM_FUNC_ENABLE_CAP =13 , +GZVM_FUNC_INFORM_EXIT =14 ,NR_GZVM_FUNC , };
@@ -25,9 +31,15 @@ enum {#define MT_HVC_GZVM_CREATE_VM GZVM_HCALL_ID(GZVM_FUNC_CREATE_VM)#define MT_HVC_GZVM_DESTROY_VM GZVM_HCALL_ID(GZVM_FUNC_DESTROY_VM) +#define MT_HVC_GZVM_CREATE_VCPU GZVM_HCALL_ID(GZVM_FUNC_CREATE_VCPU) +#define MT_HVC_GZVM_DESTROY_VCPU GZVM_HCALL_ID(GZVM_FUNC_DESTROY_VCPU)#define MT_HVC_GZVM_SET_MEMREGION GZVM_HCALL_ID(GZVM_FUNC_SET_MEMREGION) +#define MT_HVC_GZVM_RUN GZVM_HCALL_ID(GZVM_FUNC_RUN) +#define MT_HVC_GZVM_GET_ONE_REG GZVM_HCALL_ID(GZVM_FUNC_GET_ONE_REG) +#define MT_HVC_GZVM_SET_ONE_REG GZVM_HCALL_ID(GZVM_FUNC_SET_ONE_REG)#define MT_HVC_GZVM_PROBE GZVM_HCALL_ID(GZVM_FUNC_PROBE)#define MT_HVC_GZVM_ENABLE_CAP GZVM_HCALL_ID(GZVM_FUNC_ENABLE_CAP) +#define MT_HVC_GZVM_INFORM_EXIT GZVM_HCALL_ID(GZVM_FUNC_INFORM_EXIT)/** * gzvm_hypcall_wrapper() - the wrapper for hvc calls
@@ -47,4 +59,22 @@ static inline u16 get_vmid_from_tuple(unsigned int tuple) return (u16)(tuple >> 16); } +static inline u16 get_vcpuid_from_tuple (unsigned int tuple) +{ +return (u16)(tuple &0xffff ); +} + +static inline unsigned int +assemble_vm_vcpu_tuple (u16 vmid,u16 vcpuid) +{ +return ((unsigned int )vmid <<16 | vcpuid); +} + +static inline void +disassemble_vm_vcpu_tuple (unsigned int tuple,u16 *vmid,u16 *vcpuid) +{ + *vmid =get_vmid_from_tuple (tuple); + *vcpuid =get_vcpuid_from_tuple (tuple); +} +#endif /* __GZVM_ARCH_COMMON_H__ */
arch/arm64/geniezone/vcpu.c new file +80 -0
80 lines not on this page · raw message
arch/arm64/geniezone/vm.c +12 -0
@@ -30,6 +30,18 @@ int gzvm_hypcall_wrapper(unsigned long a0, unsigned long a1,return gzvm_err_to_errno (res->a0); } +int gzvm_arch_inform_exit (u16 vm_id) +{ +struct arm_smccc_res res; +int ret; + + ret =gzvm_hypcall_wrapper (MT_HVC_GZVM_INFORM_EXIT , vm_id,0 ,0 ,0 ,0 ,0 ,0 , &res); +if (ret) +return -ENXIO ; + +return 0 ; +} +int gzvm_arch_probe (void ) {struct arm_smccc_res res;
drivers/virt/geniezone/Makefile +1 -2
@@ -7,5 +7,4 @@ GZVM_DIR ?= ../../../drivers/virt/geniezone gzvm-y := $(GZVM_DIR)/gzvm_main.o $(GZVM_DIR)/gzvm_mmu.o \ - $(GZVM_DIR)/gzvm_vm.o - + $(GZVM_DIR)/gzvm_vm.o $(GZVM_DIR)/gzvm_vcpu.o
drivers/virt/geniezone/gzvm_vcpu.c new file +251 -0
251 lines not on this page · raw message
drivers/virt/geniezone/gzvm_vm.c +5 -0
@@ -118,6 +118,10 @@ static long gzvm_vm_ioctl(struct file *filp, unsigned int ioctl, ret =gzvm_dev_ioctl_check_extension (gzvm, arg);break ; } +case GZVM_CREATE_VCPU : { + ret =gzvm_vm_ioctl_create_vcpu (gzvm, arg); +break ; + }case GZVM_SET_USER_MEMORY_REGION : {struct gzvm_userspace_memory_region userspace_mem;
@@ -151,6 +155,7 @@ static void gzvm_destroy_vm(struct gzvm *gzvm)mutex_lock (&gzvm->lock); +gzvm_destroy_vcpus (gzvm);gzvm_arch_destroy_vm (gzvm->vm_id);mutex_lock (&gzvm_list_lock);
include/linux/gzvm_drv.h +24 -0
@@ -17,6 +17,7 @@*/ #define GZVM_PA_ERR_BAD (0x7ffULL << 52) +#define GZVM_VCPU_MMAP_SIZE PAGE_SIZE#define INVALID_VM_ID 0xffff/*
@@ -34,8 +35,11 @@* The following data structures are for data transferring between driver and * hypervisor, and they're aligned with hypervisor definitions */ +#define GZVM_MAX_VCPUS 8#define GZVM_MAX_MEM_REGION 10 +#define GZVM_VCPU_RUN_MAP_SIZE (PAGE_SIZE * 2) +/* struct mem_region_addr_range - Identical to ffa memory constituent */ struct mem_region_addr_range {/* the base IPA of the constituent memory region, aligned to 4 kiB */
@@ -63,7 +67,16 @@ struct gzvm_memslot {u32 slot_id; }; +struct gzvm_vcpu { +struct gzvm *gzvm; +int vcpuid; +/* lock of vcpu*/ +struct mutex lock; +struct gzvm_vcpu_run *run; +}; +struct gzvm { +struct gzvm_vcpu *vcpus[GZVM_MAX_VCPUS ];/* userspace tied to this vm */ struct mm_struct *mm;struct gzvm_memslot memslot[GZVM_MAX_MEM_REGION ];
@@ -80,6 +93,8 @@ int gzvm_err_to_errno(unsigned long err);void gzvm_destroy_all_vms (void ); +void gzvm_destroy_vcpus (struct gzvm *gzvm); +/* arch-dependant functions */ int gzvm_arch_probe (void ); int gzvm_arch_set_memregion(u16 vm_id, size_t buf_size,
@@ -90,10 +105,19 @@ int gzvm_arch_destroy_vm(u16 vm_id);int gzvm_vm_ioctl_arch_enable_cap (struct gzvm *gzvm,struct gzvm_enable_cap *cap,void __user *argp); +u64 gzvm_hva_to_pa_arch (u64 hva);u64 hva_to_pa_fast (u64 hva);u64 hva_to_pa_slow (u64 hva);int gzvm_gfn_to_pfn_memslot (struct gzvm_memslot *memslot,u64 gfn,u64 *pfn);u64 gzvm_gfn_to_hva_memslot (struct gzvm_memslot *memslot,u64 gfn); +int gzvm_vm_ioctl_create_vcpu (struct gzvm *gzvm,u32 cpuid); +int gzvm_arch_vcpu_update_one_reg (struct gzvm_vcpu *vcpu,__u64 reg_id, +bool is_write,__u64 *data); +int gzvm_arch_create_vcpu (u16 vm_id,int vcpuid,void *run); +int gzvm_arch_vcpu_run (struct gzvm_vcpu *vcpu,__u64 *exit_reason); +int gzvm_arch_destroy_vcpu (u16 vm_id,int vcpuid); +int gzvm_arch_inform_exit (u16 vm_id); +#endif /* __GZVM_DRV_H__ */
include/uapi/linux/gzvm.h +164 -0
186 lines not on this page · raw message
Signature · 1 line
2.18.0
PATCH v7 8/16 virt: geniezone: Add irqchip support for virtual interrupt injection
In reply to Yi-De WuFrom: "Yingshiuan Pan" <[email protected]>
Enable GenieZone to handle virtual interrupt injection request.
--- arch/arm64/geniezone/Makefile | 2 +- arch/arm64/geniezone/gzvm_arch_common.h | 4 ++ arch/arm64/geniezone/vgic.c | 50 +++++++++++++++ drivers/virt/geniezone/gzvm_common.h | 12 ++++ drivers/virt/geniezone/gzvm_vm.c | 81 +++++++++++++++++++++++++ include/linux/gzvm_drv.h | 4 ++ include/uapi/linux/gzvm.h | 66 ++++++++++++++++++++ 7 files changed, 218 insertions(+), 1 deletion(-) create mode 100644 arch/arm64/geniezone/vgic.c create mode 100644 drivers/virt/geniezone/gzvm_common.h
arch/arm64/geniezone/Makefile +1 -1
@@ -4,6 +4,6 @@ # include $(srctree)/drivers/virt/geniezone/Makefile -gzvm-y += vm.o vcpu.o +gzvm-y += vm.o vcpu.o vgic.o obj-$(CONFIG_MTK_GZVM) += gzvm.o
arch/arm64/geniezone/gzvm_arch_common.h +4 -0
@@ -17,6 +17,8 @@ enum {GZVM_FUNC_RUN =5 ,GZVM_FUNC_GET_ONE_REG =8 ,GZVM_FUNC_SET_ONE_REG =9 , +GZVM_FUNC_IRQ_LINE =10 , +GZVM_FUNC_CREATE_DEVICE =11 ,GZVM_FUNC_PROBE =12 ,GZVM_FUNC_ENABLE_CAP =13 , GZVM_FUNC_INFORM_EXIT = 14,
@@ -37,6 +39,8 @@ enum {#define MT_HVC_GZVM_RUN GZVM_HCALL_ID(GZVM_FUNC_RUN)#define MT_HVC_GZVM_GET_ONE_REG GZVM_HCALL_ID(GZVM_FUNC_GET_ONE_REG)#define MT_HVC_GZVM_SET_ONE_REG GZVM_HCALL_ID(GZVM_FUNC_SET_ONE_REG) +#define MT_HVC_GZVM_IRQ_LINE GZVM_HCALL_ID(GZVM_FUNC_IRQ_LINE) +#define MT_HVC_GZVM_CREATE_DEVICE GZVM_HCALL_ID(GZVM_FUNC_CREATE_DEVICE)#define MT_HVC_GZVM_PROBE GZVM_HCALL_ID(GZVM_FUNC_PROBE)#define MT_HVC_GZVM_ENABLE_CAP GZVM_HCALL_ID(GZVM_FUNC_ENABLE_CAP)#define MT_HVC_GZVM_INFORM_EXIT GZVM_HCALL_ID(GZVM_FUNC_INFORM_EXIT)
arch/arm64/geniezone/vgic.c new file +50 -0
50 lines not on this page · raw message
drivers/virt/geniezone/gzvm_common.h new file +12 -0
@@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (c) 2023 MediaTek Inc. +*/ + +#ifndef __GZ_COMMON_H__ +#define __GZ_COMMON_H__ + +int gzvm_irqchip_inject_irq (struct gzvm *gzvm,unsigned int vcpu_idx, +u32 irq,bool level); + +#endif /* __GZVM_COMMON_H__ */
drivers/virt/geniezone/gzvm_vm.c +81 -0
99 lines not on this page · raw message
include/linux/gzvm_drv.h +4 -0
@@ -120,4 +120,8 @@ int gzvm_arch_vcpu_run(struct gzvm_vcpu *vcpu, __u64 *exit_reason);int gzvm_arch_destroy_vcpu (u16 vm_id,int vcpuid);int gzvm_arch_inform_exit (u16 vm_id); +int gzvm_arch_create_device (u16 vm_id,struct gzvm_create_device *gzvm_dev); +int gzvm_arch_inject_irq (struct gzvm *gzvm,unsigned int vcpu_idx, +u32 irq,bool level); +#endif /* __GZVM_DRV_H__ */
include/uapi/linux/gzvm.h +66 -0
72 lines not on this page · raw message
Signature · 1 line
2.18.0
PATCH v7 9/16 virt: geniezone: Add irqfd support
In reply to Yi-De WuFrom: "Yingshiuan Pan" <[email protected]>
irqfd enables other threads than vcpu threads to inject virtual interrupt through irqfd asynchronously rather through ioctl interface. This interface is necessary for VMM which creates separated thread for IO handling or uses vhost devices.
--- arch/arm64/geniezone/gzvm_arch_common.h | 18 ++ drivers/virt/geniezone/Makefile | 3 +- drivers/virt/geniezone/gzvm_irqfd.c | 382 ++++++++++++++++++++++++ drivers/virt/geniezone/gzvm_main.c | 12 +- drivers/virt/geniezone/gzvm_vcpu.c | 1 + drivers/virt/geniezone/gzvm_vm.c | 18 ++ include/linux/gzvm_drv.h | 25 ++ include/uapi/linux/gzvm.h | 26 ++ 8 files changed, 483 insertions(+), 2 deletions(-) create mode 100644 drivers/virt/geniezone/gzvm_irqfd.c
arch/arm64/geniezone/gzvm_arch_common.h +18 -0
@@ -45,6 +45,8 @@ enum {#define MT_HVC_GZVM_ENABLE_CAP GZVM_HCALL_ID(GZVM_FUNC_ENABLE_CAP)#define MT_HVC_GZVM_INFORM_EXIT GZVM_HCALL_ID(GZVM_FUNC_INFORM_EXIT) +#define GIC_V3_NR_LRS 16 +/** * gzvm_hypcall_wrapper() - the wrapper for hvc calls * @a0-a7: arguments passed in registers 0 to 7
@@ -68,6 +70,22 @@ static inline u16 get_vcpuid_from_tuple(unsigned int tuple)return (u16)(tuple &0xffff ); } +/** +* struct gzvm_vcpu_hwstate: Sync architecture state back to host for handling +* @nr_lrs: The available LRs(list registers) in Soc. +* @__pad: add an explicit '__u32 __pad;' in the middle to make it clear +* what the actual layout is. +* @lr: The array of LRs(list registers). +* +* - Keep the same layout of hypervisor data struct. +* - Sync list registers back for acking virtual device interrupt status. +*/ +struct gzvm_vcpu_hwstate { +__le32 nr_lrs; +__le32 __pad; +__le64 lr[GIC_V3_NR_LRS ]; +}; +static inline unsigned int assemble_vm_vcpu_tuple (u16 vmid,u16 vcpuid) {
drivers/virt/geniezone/Makefile +2 -1
@@ -7,4 +7,5 @@ GZVM_DIR ?= ../../../drivers/virt/geniezone gzvm-y := $(GZVM_DIR)/gzvm_main.o $(GZVM_DIR)/gzvm_mmu.o \ - $(GZVM_DIR)/gzvm_vm.o $(GZVM_DIR)/gzvm_vcpu.o + $(GZVM_DIR)/gzvm_vm.o $(GZVM_DIR)/gzvm_vcpu.o \ + $(GZVM_DIR)/gzvm_irqfd.o
drivers/virt/geniezone/gzvm_irqfd.c new file +382 -0
382 lines not on this page · raw message
drivers/virt/geniezone/gzvm_main.c +11 -1
@@ -97,16 +97,26 @@ static struct miscdevice gzvm_dev = {static int gzvm_drv_probe (struct platform_device *pdev) { +int ret; +if (gzvm_arch_probe () !=0 ) {dev_err (&pdev->dev,"Not found available conduit\n" );return -ENODEV ; } -return misc_register (&gzvm_dev); + ret =misc_register (&gzvm_dev); +if (ret) +return ret; + + ret =gzvm_drv_irqfd_init (); +if (ret) +return ret; +return 0 ; }static int gzvm_drv_remove (struct platform_device *pdev) { +gzvm_drv_irqfd_exit ();gzvm_destroy_all_vms ();misc_deregister (&gzvm_dev);return 0 ;
drivers/virt/geniezone/gzvm_vcpu.c +1 -0
@@ -228,6 +228,7 @@ int gzvm_vm_ioctl_create_vcpu(struct gzvm *gzvm, u32 cpuid) ret = -ENOMEM ; goto free_vcpu; } + vcpu->hwstate = (void *)vcpu->run +PAGE_SIZE ; vcpu->vcpuid = cpuid; vcpu->gzvm = gzvm;mutex_init (&vcpu->lock);
drivers/virt/geniezone/gzvm_vm.c +18 -0
@@ -213,6 +213,16 @@ static long gzvm_vm_ioctl(struct file *filp, unsigned int ioctl, ret =gzvm_vm_ioctl_create_device (gzvm, argp);break ; } +case GZVM_IRQFD : { +struct gzvm_irqfd data; + +if (copy_from_user (&data, argp,sizeof (data))) { + ret = -EFAULT ; + goto out; + } + ret =gzvm_irqfd (gzvm, &data); +break ; + }case GZVM_ENABLE_CAP : {struct gzvm_enable_cap cap;
@@ -236,6 +246,7 @@ static void gzvm_destroy_vm(struct gzvm *gzvm)mutex_lock (&gzvm->lock); +gzvm_vm_irqfd_release (gzvm);gzvm_destroy_vcpus (gzvm);gzvm_arch_destroy_vm (gzvm->vm_id);
@@ -281,6 +292,13 @@ static struct gzvm *gzvm_create_vm(unsigned long vm_type) gzvm->mm = current->mm;mutex_init (&gzvm->lock); + ret =gzvm_vm_irqfd_init (gzvm); +if (ret) { +pr_err ("Failed to initialize irqfd\n" ); +kfree (gzvm); +return ERR_PTR (ret); + } +mutex_lock (&gzvm_list_lock);list_add (&gzvm->vm_list, &gzvm_list);mutex_unlock (&gzvm_list_lock);
include/linux/gzvm_drv.h +25 -0
@@ -10,6 +10,7 @@#include <linux/mm.h> #include <linux/mutex.h> #include <linux/gzvm.h> +#include <linux/srcu.h> /* * For the normal physical address, the highest 12 bits should be zero, so we
@@ -30,6 +31,7 @@#define ERR_NOT_SUPPORTED (-24)#define ERR_NOT_IMPLEMENTED (-27)#define ERR_FAULT (-40) +#define GZVM_IRQFD_RESAMPLE_IRQ_SOURCE_ID 1/* * The following data structures are for data transferring between driver and
@@ -73,6 +75,7 @@ struct gzvm_vcpu {/* lock of vcpu*/ struct mutex lock;struct gzvm_vcpu_run *run; +struct gzvm_vcpu_hwstate *hwstate; };struct gzvm {
@@ -82,8 +85,23 @@ struct gzvm {struct gzvm_memslot memslot[GZVM_MAX_MEM_REGION ];/* lock for list_add*/ struct mutex lock; + +struct { +/* lock for irqfds list operation */ +spinlock_t lock; +struct list_head items; +struct list_head resampler_list; +/* lock for irqfds resampler */ +struct mutex resampler_lock; + } irqfds; +struct list_head vm_list;u16 vm_id; + +struct hlist_head irq_ack_notifier_list; +struct srcu_struct irq_srcu; +/* lock for irq injection */ +struct mutex irq_lock; };long gzvm_dev_ioctl_check_extension (struct gzvm *gzvm,unsigned long args);
@@ -124,4 +142,11 @@ int gzvm_arch_create_device(u16 vm_id, struct gzvm_create_device *gzvm_dev);int gzvm_arch_inject_irq (struct gzvm *gzvm,unsigned int vcpu_idx,u32 irq,bool level); +void gzvm_notify_acked_irq (struct gzvm *gzvm,unsigned int gsi); +int gzvm_irqfd (struct gzvm *gzvm,struct gzvm_irqfd *args); +int gzvm_drv_irqfd_init (void ); +void gzvm_drv_irqfd_exit (void ); +int gzvm_vm_irqfd_init (struct gzvm *gzvm); +void gzvm_vm_irqfd_release (struct gzvm *gzvm); +#endif /* __GZVM_DRV_H__ */
include/uapi/linux/gzvm.h +26 -0
@@ -309,4 +309,30 @@ struct gzvm_one_reg {#define GZVM_REG_GENERIC 0x0000000000000000ULL +#define GZVM_IRQFD_FLAG_DEASSIGN BIT(0) +/* +* GZVM_IRQFD_FLAG_RESAMPLE indicates resamplefd is valid and specifies +* the irqfd to operate in resampling mode for level triggered interrupt +* emulation. +*/ +#define GZVM_IRQFD_FLAG_RESAMPLE BIT(1) + +/** +* struct gzvm_irqfd: gzvm irqfd descriptor +* @fd: File descriptor. +* @gsi: Used for level IRQ fast-path. +* @flags: FLAG_DEASSIGN or FLAG_RESAMPLE. +* @resamplefd: The file descriptor of the resampler. +* @pad: Reserved for future-proof. +*/ +struct gzvm_irqfd { +__u32 fd; +__u32 gsi; +__u32 flags; +__u32 resamplefd; +__u8 pad[16 ]; +}; + +#define GZVM_IRQFD _IOW(GZVM_IOC_MAGIC, 0x76, struct gzvm_irqfd) +#endif /* __GZVM_H__ */
Signature · 1 line
2.18.0
kernel test robot
build botRe: [PATCH v7 09/16] virt: geniezone: Add irqfd support
kernel test robot noticed the following build errors:
Hi Yi-De,
kernel test robot noticed the following build errors:
[auto build test ERROR on linus/master]
[also build test ERROR on v6.7-rc1 next-20231117]
[cannot apply to arm64/for-next/core robh/for-next]
[If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Yi-De-Wu/docs-geniezone-Introduce-GenieZone-hypervisor/20231116-233442 base: linus/master patch link: https://lore.kernel.org/r/20231116152756.4250-10-yi-de.wu%40mediatek.com patch subject: [PATCH v7 09/16] virt: geniezone: Add irqfd support config: arm64-randconfig-r081-20231118 (https://download.01.org/0day-ci/archive/20231118/[email protected]/config) compiler: aarch64-linux-gcc (GCC) 13.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20231118/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All error/warnings (new ones prefixed by >>):
arch/arm64/geniezone/../../../drivers/virt/geniezone/gzvm_irqfd.c: In function 'gzvm_irqfd_assign':
>> arch/arm64/geniezone/../../../drivers/virt/geniezone/gzvm_irqfd.c:185:19: error: implicit declaration of function 'eventfd_ctx_fileget'; did you mean 'eventfd_ctx_fdget'? [-Werror=implicit-function-declaration]
185 | eventfd = eventfd_ctx_fileget(f.file);
| ^~~~~~~~~~~~~~~~~~~
| eventfd_ctx_fdget
>> arch/arm64/geniezone/../../../drivers/virt/geniezone/gzvm_irqfd.c:185:17: warning: assignment to 'struct eventfd_ctx *' from 'int' makes pointer from integer without a cast [-Wint-conversion]
185 | eventfd = eventfd_ctx_fileget(f.file);
| ^cc1: some warnings being treated as errors
vim +185 arch/arm64/geniezone/../../../drivers/virt/geniezone/gzvm_irqfd.c
160
161 static int gzvm_irqfd_assign(struct gzvm *gzvm, struct gzvm_irqfd *args)
162 {
163 struct gzvm_kernel_irqfd *irqfd, *tmp;
164 struct fd f;
165 struct eventfd_ctx *eventfd = NULL;
166 int ret;
167 int idx;
168
169 irqfd = kzalloc(sizeof(*irqfd), GFP_KERNEL_ACCOUNT);
170 if (!irqfd)
171 return -ENOMEM;
172
173 irqfd->gzvm = gzvm;
174 irqfd->gsi = args->gsi;
175
176 INIT_LIST_HEAD(&irqfd->list);
177 INIT_WORK(&irqfd->shutdown, irqfd_shutdown);
178
179 f = fdget(args->fd);
180 if (!f.file) {
181 ret = -EBADF;
182 goto out;
183 }
184
> 185 eventfd = eventfd_ctx_fileget(f.file);
186 if (IS_ERR(eventfd)) {
187 ret = PTR_ERR(eventfd);
188 goto fail;
189 }
190
191 irqfd->eventfd = eventfd;
192
193 /*
194 * Install our own custom wake-up handling so we are notified via
195 * a callback whenever someone signals the underlying eventfd
196 */
197 init_waitqueue_func_entry(&irqfd->wait, irqfd_wakeup);
198 init_poll_funcptr(&irqfd->pt, irqfd_ptable_queue_proc);
199
200 spin_lock_irq(&gzvm->irqfds.lock);
201
202 ret = 0;
203 list_for_each_entry(tmp, &gzvm->irqfds.items, list) {
204 if (irqfd->eventfd != tmp->eventfd)
205 continue;
206 /* This fd is used for another irq already. */
207 pr_err("already used: gsi=%d fd=%d\n", args->gsi, args->fd);
208 ret = -EBUSY;
209 spin_unlock_irq(&gzvm->irqfds.lock);
210 goto fail;
211 }
212
213 idx = srcu_read_lock(&gzvm->irq_srcu);
214
215 list_add_tail(&irqfd->list, &gzvm->irqfds.items);
216
217 spin_unlock_irq(&gzvm->irqfds.lock);
218
219 vfs_poll(f.file, &irqfd->pt);
220
221 srcu_read_unlock(&gzvm->irq_srcu, idx);
222
223 /*
224 * do not drop the file until the irqfd is fully initialized, otherwise
225 * we might race against the EPOLLHUP
226 */
227 fdput(f);
228 return 0;
229
230 fail:
231 if (eventfd && !IS_ERR(eventfd))
232 eventfd_ctx_put(eventfd);
233
234 fdput(f);
235
236 out:
237 kfree(irqfd);
238 return ret;
239 }
240
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
PATCH v7 10/16 virt: geniezone: Add ioeventfd support
In reply to Yi-De WuFrom: "Yingshiuan Pan" <[email protected]>
Ioeventfd leverages eventfd to provide asynchronous notification mechanism for VMM. VMM can register a mmio address and bind with an eventfd. Once a mmio trap occurs on this registered region, its corresponding eventfd will be notified.
--- drivers/virt/geniezone/Makefile | 2 +- drivers/virt/geniezone/gzvm_ioeventfd.c | 276 ++++++++++++++++++++++++ drivers/virt/geniezone/gzvm_vcpu.c | 27 ++- drivers/virt/geniezone/gzvm_vm.c | 17 ++ include/linux/gzvm_drv.h | 12 ++ include/uapi/linux/gzvm.h | 25 +++ 6 files changed, 357 insertions(+), 2 deletions(-) create mode 100644 drivers/virt/geniezone/gzvm_ioeventfd.c
drivers/virt/geniezone/Makefile +1 -1
@@ -8,4 +8,4 @@ GZVM_DIR ?= ../../../drivers/virt/geniezone gzvm-y := $(GZVM_DIR)/gzvm_main.o $(GZVM_DIR)/gzvm_mmu.o \ $(GZVM_DIR)/gzvm_vm.o $(GZVM_DIR)/gzvm_vcpu.o \ - $(GZVM_DIR)/gzvm_irqfd.o + $(GZVM_DIR)/gzvm_irqfd.o $(GZVM_DIR)/gzvm_ioeventfd.o
drivers/virt/geniezone/gzvm_ioeventfd.c new file +276 -0
276 lines not on this page · raw message
drivers/virt/geniezone/gzvm_vcpu.c +26 -1
@@ -51,6 +51,30 @@ static long gzvm_vcpu_update_one_reg(struct gzvm_vcpu *vcpu,return 0 ; } +/** +* gzvm_vcpu_handle_mmio() - Handle mmio in kernel space. +* @vcpu: Pointer to vcpu. +* +* Return: +* * true - This mmio exit has been processed. +* * false - This mmio exit has not been processed, require userspace. +*/ +static bool gzvm_vcpu_handle_mmio (struct gzvm_vcpu *vcpu) +{ +__u64 addr; +__u32 len; +const void *val_ptr; + +/* So far, we don't have in-kernel mmio read handler */ +if (!vcpu->run->mmio.is_write) +return false; + addr = vcpu->run->mmio.phys_addr; + len = vcpu->run->mmio.size; + val_ptr = &vcpu->run->mmio.data; + +return gzvm_ioevent_write (vcpu, addr, len, val_ptr); +} +/** * gzvm_vcpu_run() - Handle vcpu run ioctl, entry point to guest and exit * point from guest
@@ -82,7 +106,8 @@ static long gzvm_vcpu_run(struct gzvm_vcpu *vcpu, void __user *argp)switch (exit_reason) {case GZVM_EXIT_MMIO : - need_userspace = true; +if (!gzvm_vcpu_handle_mmio (vcpu)) + need_userspace = true;break ;/** * it's geniezone's responsibility to fill corresponding data
drivers/virt/geniezone/gzvm_vm.c +17 -0
@@ -223,6 +223,16 @@ static long gzvm_vm_ioctl(struct file *filp, unsigned int ioctl, ret =gzvm_irqfd (gzvm, &data);break ; } +case GZVM_IOEVENTFD : { +struct gzvm_ioeventfd data; + +if (copy_from_user (&data, argp,sizeof (data))) { + ret = -EFAULT ; + goto out; + } + ret =gzvm_ioeventfd (gzvm, &data); +break ; + }case GZVM_ENABLE_CAP : {struct gzvm_enable_cap cap;
@@ -299,6 +309,13 @@ static struct gzvm *gzvm_create_vm(unsigned long vm_type)return ERR_PTR (ret); } + ret =gzvm_init_ioeventfd (gzvm); +if (ret) { +pr_err ("Failed to initialize ioeventfd\n" ); +kfree (gzvm); +return ERR_PTR (ret); + } +mutex_lock (&gzvm_list_lock);list_add (&gzvm->vm_list, &gzvm_list);mutex_unlock (&gzvm_list_lock);
include/linux/gzvm_drv.h +12 -0
@@ -6,6 +6,7 @@#ifndef __GZVM_DRV_H__#define __GZVM_DRV_H__ +#include <linux/eventfd.h> #include <linux/list.h> #include <linux/mm.h> #include <linux/mutex.h>
@@ -95,6 +96,8 @@ struct gzvm {struct mutex resampler_lock; } irqfds; +struct list_head ioevents; +struct list_head vm_list;u16 vm_id;
@@ -149,4 +152,13 @@ void gzvm_drv_irqfd_exit(void);int gzvm_vm_irqfd_init (struct gzvm *gzvm);void gzvm_vm_irqfd_release (struct gzvm *gzvm); +int gzvm_init_ioeventfd (struct gzvm *gzvm); +int gzvm_ioeventfd (struct gzvm *gzvm,struct gzvm_ioeventfd *args); +bool gzvm_ioevent_write (struct gzvm_vcpu *vcpu,__u64 addr,int len, +const void *val); +void eventfd_ctx_do_read (struct eventfd_ctx *ctx,__u64 *cnt); +struct vm_area_struct *vma_lookup (struct mm_struct *mm,unsigned long addr); +void add_wait_queue_priority (struct wait_queue_head *wq_head, +struct wait_queue_entry *wq_entry); +#endif /* __GZVM_DRV_H__ */
include/uapi/linux/gzvm.h +25 -0
@@ -335,4 +335,29 @@ struct gzvm_irqfd {#define GZVM_IRQFD _IOW(GZVM_IOC_MAGIC, 0x76, struct gzvm_irqfd) +enum { + gzvm_ioeventfd_flag_nr_datamatch =0 , + gzvm_ioeventfd_flag_nr_pio =1 , + gzvm_ioeventfd_flag_nr_deassign =2 , + gzvm_ioeventfd_flag_nr_max, +}; + +#define GZVM_IOEVENTFD_FLAG_DATAMATCH (1 << gzvm_ioeventfd_flag_nr_datamatch) +#define GZVM_IOEVENTFD_FLAG_PIO (1 << gzvm_ioeventfd_flag_nr_pio) +#define GZVM_IOEVENTFD_FLAG_DEASSIGN (1 << gzvm_ioeventfd_flag_nr_deassign) +#define GZVM_IOEVENTFD_VALID_FLAG_MASK ((1 << gzvm_ioeventfd_flag_nr_max) - 1) + +struct gzvm_ioeventfd { +__u64 datamatch; +/* private: legal pio/mmio address */ +__u64 addr; +/* private: 1, 2, 4, or 8 bytes; or 0 to ignore length */ +__u32 len; +__s32 fd; +__u32 flags; +__u8 pad[36 ]; +}; + +#define GZVM_IOEVENTFD _IOW(GZVM_IOC_MAGIC, 0x79, struct gzvm_ioeventfd) +#endif /* __GZVM_H__ */
Signature · 1 line
2.18.0
PATCH v7 11/16 virt: geniezone: Add memory region support
In reply to Yi-De WuFrom: "Jerry Wang" <[email protected]>
Hypervisor might need to know the precise purpose of each memory region, so that it can provide specific memory protection. We add a new uapi to pass address and size of a memory region and its purpose.
--- arch/arm64/geniezone/gzvm_arch_common.h | 2 ++ arch/arm64/geniezone/vm.c | 10 ++++++++++ drivers/virt/geniezone/gzvm_vm.c | 7 +++++++ include/linux/gzvm_drv.h | 3 +++ 4 files changed, 22 insertions(+)
arch/arm64/geniezone/gzvm_arch_common.h +2 -0
@@ -22,6 +22,7 @@ enum {GZVM_FUNC_PROBE =12 ,GZVM_FUNC_ENABLE_CAP =13 ,GZVM_FUNC_INFORM_EXIT =14 , +GZVM_FUNC_MEMREGION_PURPOSE =15 , NR_GZVM_FUNC, };
@@ -44,6 +45,7 @@ enum {#define MT_HVC_GZVM_PROBE GZVM_HCALL_ID(GZVM_FUNC_PROBE)#define MT_HVC_GZVM_ENABLE_CAP GZVM_HCALL_ID(GZVM_FUNC_ENABLE_CAP)#define MT_HVC_GZVM_INFORM_EXIT GZVM_HCALL_ID(GZVM_FUNC_INFORM_EXIT) +#define MT_HVC_GZVM_MEMREGION_PURPOSE GZVM_HCALL_ID(GZVM_FUNC_MEMREGION_PURPOSE)#define GIC_V3_NR_LRS 16
arch/arm64/geniezone/vm.c +10 -0
@@ -123,6 +123,16 @@ int gzvm_arch_destroy_vm(u16 vm_id) 0, 0, &res); } +int gzvm_arch_memregion_purpose (struct gzvm *gzvm, +struct gzvm_userspace_memory_region *mem) +{ +struct arm_smccc_res res; + +return gzvm_hypcall_wrapper (MT_HVC_GZVM_MEMREGION_PURPOSE , gzvm->vm_id, + mem->guest_phys_addr, mem->memory_size, + mem->flags,0 ,0 ,0 , &res); +} +static int gzvm_vm_arch_enable_cap (struct gzvm *gzvm,struct gzvm_enable_cap *cap,struct arm_smccc_res *res)
drivers/virt/geniezone/gzvm_vm.c +7 -0
@@ -72,6 +72,7 @@ static int gzvm_vm_ioctl_set_memory_region(struct gzvm *gzvm, struct gzvm_userspace_memory_region *mem) { + int ret;struct vm_area_struct *vma;struct gzvm_memslot *memslot;unsigned long size;
@@ -96,6 +97,12 @@ gzvm_vm_ioctl_set_memory_region(struct gzvm *gzvm, memslot->vma = vma; memslot->flags = mem->flags; memslot->slot_id = mem->slot; + + ret =gzvm_arch_memregion_purpose (gzvm, mem); +if (ret) { +pr_err ("Failed to config memory region for the specified purpose\n" ); +return -EFAULT ; + }return register_memslot_addr_range (gzvm, memslot); }
include/linux/gzvm_drv.h +3 -0
@@ -152,6 +152,9 @@ void gzvm_drv_irqfd_exit(void);int gzvm_vm_irqfd_init (struct gzvm *gzvm);void gzvm_vm_irqfd_release (struct gzvm *gzvm); +int gzvm_arch_memregion_purpose (struct gzvm *gzvm, +struct gzvm_userspace_memory_region *mem); +int gzvm_init_ioeventfd (struct gzvm *gzvm);int gzvm_ioeventfd (struct gzvm *gzvm,struct gzvm_ioeventfd *args); bool gzvm_ioevent_write(struct gzvm_vcpu *vcpu, __u64 addr, int len,
Signature · 1 line
2.18.0
PATCH v7 12/16 virt: geniezone: Add dtb config support
In reply to Yi-De WuFrom: "Jerry Wang" <[email protected]>
Hypervisor might need to know the accurate address and size of dtb passed from userspace. And then hypervisor would parse the dtb and get vm information.
--- arch/arm64/geniezone/gzvm_arch_common.h | 2 ++ arch/arm64/geniezone/vm.c | 9 +++++++++ drivers/virt/geniezone/gzvm_vm.c | 10 ++++++++++ include/linux/gzvm_drv.h | 1 + include/uapi/linux/gzvm.h | 14 ++++++++++++++ 5 files changed, 36 insertions(+)
arch/arm64/geniezone/gzvm_arch_common.h +2 -0
@@ -23,6 +23,7 @@ enum {GZVM_FUNC_ENABLE_CAP =13 ,GZVM_FUNC_INFORM_EXIT =14 ,GZVM_FUNC_MEMREGION_PURPOSE =15 , +GZVM_FUNC_SET_DTB_CONFIG =16 , NR_GZVM_FUNC, };
@@ -46,6 +47,7 @@ enum {#define MT_HVC_GZVM_ENABLE_CAP GZVM_HCALL_ID(GZVM_FUNC_ENABLE_CAP)#define MT_HVC_GZVM_INFORM_EXIT GZVM_HCALL_ID(GZVM_FUNC_INFORM_EXIT)#define MT_HVC_GZVM_MEMREGION_PURPOSE GZVM_HCALL_ID(GZVM_FUNC_MEMREGION_PURPOSE) +#define MT_HVC_GZVM_SET_DTB_CONFIG GZVM_HCALL_ID(GZVM_FUNC_SET_DTB_CONFIG)#define GIC_V3_NR_LRS 16
arch/arm64/geniezone/vm.c +9 -0
@@ -133,6 +133,15 @@ int gzvm_arch_memregion_purpose(struct gzvm *gzvm, mem->flags, 0, 0, 0, &res); } +int gzvm_arch_set_dtb_config (struct gzvm *gzvm,struct gzvm_dtb_config *cfg) +{ +struct arm_smccc_res res; + +return gzvm_hypcall_wrapper (MT_HVC_GZVM_SET_DTB_CONFIG , gzvm->vm_id, + cfg->dtb_addr, cfg->dtb_size,0 ,0 ,0 ,0 , + &res); +} +static int gzvm_vm_arch_enable_cap (struct gzvm *gzvm,struct gzvm_enable_cap *cap,struct arm_smccc_res *res)
drivers/virt/geniezone/gzvm_vm.c +10 -0
@@ -250,6 +250,16 @@ static long gzvm_vm_ioctl(struct file *filp, unsigned int ioctl, ret =gzvm_vm_ioctl_enable_cap (gzvm, &cap, argp);break ; } +case GZVM_SET_DTB_CONFIG : { +struct gzvm_dtb_config cfg; + +if (copy_from_user (&cfg, argp,sizeof (cfg))) { + ret = -EFAULT ; + goto out; + } + ret =gzvm_arch_set_dtb_config (gzvm, &cfg); +break ; + }default : ret = -ENOTTY ; }
include/linux/gzvm_drv.h +1 -0
@@ -154,6 +154,7 @@ void gzvm_vm_irqfd_release(struct gzvm *gzvm);int gzvm_arch_memregion_purpose (struct gzvm *gzvm,struct gzvm_userspace_memory_region *mem); +int gzvm_arch_set_dtb_config (struct gzvm *gzvm,struct gzvm_dtb_config *args);int gzvm_init_ioeventfd (struct gzvm *gzvm);int gzvm_ioeventfd (struct gzvm *gzvm,struct gzvm_ioeventfd *args);
include/uapi/linux/gzvm.h +14 -0
@@ -360,4 +360,18 @@ struct gzvm_ioeventfd {#define GZVM_IOEVENTFD _IOW(GZVM_IOC_MAGIC, 0x79, struct gzvm_ioeventfd) +/** +* struct gzvm_dtb_config: store address and size of dtb passed from userspace +* +* @dtb_addr: dtb address set by VMM (guset memory) +* @dtb_size: dtb size +*/ +struct gzvm_dtb_config { +__u64 dtb_addr; +__u64 dtb_size; +}; + +#define GZVM_SET_DTB_CONFIG _IOW(GZVM_IOC_MAGIC, 0xff, \ + struct gzvm_dtb_config) +#endif /* __GZVM_H__ */
Signature · 1 line
2.18.0
PATCH v7 13/16 virt: geniezone: Add demand paging support
In reply to Yi-De WuFrom: "Yingshiuan Pan" <[email protected]>
This page fault handler helps GenieZone hypervisor to do demand paging. On a lower level translation fault, GenieZone hypervisor will first check the fault GPA (guest physical address or IPA in ARM) is valid e.g. within the registered memory region, then it will setup the vcpu_run->exit_reason with necessary information for returning to gzvm driver.
With the fault information, the gzvm driver looks up the physical address and call the MT_HVC_GZVM_MAP_GUEST to request the hypervisor maps the found PA to the fault GPA (IPA).
There is one exception, for protected vm, we will populate full VM's memory region in advance in order to improve performance.
--- arch/arm64/geniezone/gzvm_arch_common.h | 2 ++ arch/arm64/geniezone/vm.c | 9 ++++++ drivers/virt/geniezone/Makefile | 3 +- drivers/virt/geniezone/gzvm_exception.c | 39 +++++++++++++++++++++++++ drivers/virt/geniezone/gzvm_main.c | 2 ++ drivers/virt/geniezone/gzvm_mmu.c | 39 +++++++++++++++++++++++++ drivers/virt/geniezone/gzvm_vcpu.c | 6 ++-- drivers/virt/geniezone/gzvm_vm.c | 25 ++++++++++++++++ include/linux/gzvm_drv.h | 7 +++++ include/uapi/linux/gzvm.h | 11 +++++++ 10 files changed, 140 insertions(+), 3 deletions(-) create mode 100644 drivers/virt/geniezone/gzvm_exception.c
arch/arm64/geniezone/gzvm_arch_common.h +2 -0
@@ -24,6 +24,7 @@ enum {GZVM_FUNC_INFORM_EXIT =14 ,GZVM_FUNC_MEMREGION_PURPOSE =15 ,GZVM_FUNC_SET_DTB_CONFIG =16 , +GZVM_FUNC_MAP_GUEST =17 , NR_GZVM_FUNC, };
@@ -48,6 +49,7 @@ enum {#define MT_HVC_GZVM_INFORM_EXIT GZVM_HCALL_ID(GZVM_FUNC_INFORM_EXIT)#define MT_HVC_GZVM_MEMREGION_PURPOSE GZVM_HCALL_ID(GZVM_FUNC_MEMREGION_PURPOSE)#define MT_HVC_GZVM_SET_DTB_CONFIG GZVM_HCALL_ID(GZVM_FUNC_SET_DTB_CONFIG) +#define MT_HVC_GZVM_MAP_GUEST GZVM_HCALL_ID(GZVM_FUNC_MAP_GUEST)#define GIC_V3_NR_LRS 16
arch/arm64/geniezone/vm.c +9 -0
@@ -375,3 +375,12 @@ u64 gzvm_hva_to_pa_arch(u64 hva)return GZVM_PA_ERR_BAD ;return par; } + +int gzvm_arch_map_guest (u16 vm_id,int memslot_id,u64 pfn,u64 gfn, +u64 nr_pages) +{ +struct arm_smccc_res res; + +return gzvm_hypcall_wrapper (MT_HVC_GZVM_MAP_GUEST , vm_id, memslot_id, + pfn, gfn, nr_pages,0 ,0 , &res); +}
drivers/virt/geniezone/Makefile +2 -1
@@ -8,4 +8,5 @@ GZVM_DIR ?= ../../../drivers/virt/geniezone gzvm-y := $(GZVM_DIR)/gzvm_main.o $(GZVM_DIR)/gzvm_mmu.o \ $(GZVM_DIR)/gzvm_vm.o $(GZVM_DIR)/gzvm_vcpu.o \ - $(GZVM_DIR)/gzvm_irqfd.o $(GZVM_DIR)/gzvm_ioeventfd.o + $(GZVM_DIR)/gzvm_irqfd.o $(GZVM_DIR)/gzvm_ioeventfd.o \ + $(GZVM_DIR)/gzvm_exception.o
drivers/virt/geniezone/gzvm_exception.c new file +39 -0
@@ -0,0 +1,39 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (c) 2023 MediaTek Inc. +*/ + +#include <linux/device.h> +#include <linux/gzvm_drv.h> + +/** +* gzvm_handle_guest_exception() - Handle guest exception +* @vcpu: Pointer to struct gzvm_vcpu_run in userspace +* Return: +* * true - This exception has been processed, no need to back to VMM. +* * false - This exception has not been processed, require userspace. +*/ +bool gzvm_handle_guest_exception (struct gzvm_vcpu *vcpu) +{ +int ret; + +for (int i =0 ; i <ARRAY_SIZE (vcpu->run->exception.reserved); i++) { +if (vcpu->run->exception.reserved[i]) +return -EINVAL ; + } + +switch (vcpu->run->exception.exception) { +case GZVM_EXCEPTION_PAGE_FAULT : + ret =gzvm_handle_page_fault (vcpu); +break ; +case GZVM_EXCEPTION_UNKNOWN : + fallthrough; +default : + ret = -EFAULT ; + } + +if (!ret) +return true; +else +return false; +}
drivers/virt/geniezone/gzvm_main.c +2 -0
@@ -28,6 +28,8 @@ int gzvm_err_to_errno(unsigned long err)return 0 ;case ERR_NO_MEMORY :return -ENOMEM ; +case ERR_INVALID_ARGS : +return -EINVAL ;case ERR_NOT_SUPPORTED :return -EOPNOTSUPP ;case ERR_NOT_IMPLEMENTED :
drivers/virt/geniezone/gzvm_mmu.c +39 -0
@@ -106,3 +106,42 @@ int gzvm_gfn_to_pfn_memslot(struct gzvm_memslot *memslot, u64 gfn,return 0 ; } + +static int handle_single_demand_page (struct gzvm *vm,int memslot_id,u64 gfn) +{ +int ret; +u64 pfn; + + ret =gzvm_gfn_to_pfn_memslot (&vm->memslot[memslot_id], gfn, &pfn); +if (unlikely (ret)) +return -EFAULT ; + + ret =gzvm_arch_map_guest (vm->vm_id, memslot_id, pfn, gfn,1 ); +if (unlikely (ret)) +return -EFAULT ; + +return 0 ; +} + +/** +* gzvm_handle_page_fault() - Handle guest page fault, find corresponding page +* for the faulting gpa +* @vcpu: Pointer to struct gzvm_vcpu_run of the faulting vcpu +* +* Return: +* * 0 - Success to handle guest page fault +* * -EFAULT - Failed to map phys addr to guest's GPA +*/ +int gzvm_handle_page_fault (struct gzvm_vcpu *vcpu) +{ +struct gzvm *vm = vcpu->gzvm; +int memslot_id; +u64 gfn; + + gfn =PHYS_PFN (vcpu->run->exception.fault_gpa); + memslot_id =gzvm_find_memslot (vm, gfn); +if (unlikely (memslot_id <0 )) +return -EFAULT ; + +return handle_single_demand_page (vm, memslot_id, gfn); +}
drivers/virt/geniezone/gzvm_vcpu.c +4 -2
@@ -113,9 +113,11 @@ static long gzvm_vcpu_run(struct gzvm_vcpu *vcpu, void __user *argp)* it's geniezone's responsibility to fill corresponding data * structure */ -case GZVM_EXIT_HYPERCALL : - fallthrough;case GZVM_EXIT_EXCEPTION : +if (!gzvm_handle_guest_exception (vcpu)) + need_userspace = true; +break ; +case GZVM_EXIT_HYPERCALL : fallthrough;case GZVM_EXIT_DEBUG : fallthrough;
drivers/virt/geniezone/gzvm_vm.c +25 -0
@@ -23,6 +23,31 @@ u64 gzvm_gfn_to_hva_memslot(struct gzvm_memslot *memslot, u64 gfn)return memslot->userspace_addr + offset *PAGE_SIZE ; } +/** +* gzvm_find_memslot() - Find memslot containing this @gpa +* @vm: Pointer to struct gzvm +* @gfn: Guest frame number +* +* Return: +* * >=0 - Index of memslot +* * -EFAULT - Not found +*/ +int gzvm_find_memslot (struct gzvm *vm,u64 gfn) +{ +int i; + +for (i =0 ; i <GZVM_MAX_MEM_REGION ; i++) { +if (vm->memslot[i].npages ==0 ) +continue ; + +if (gfn >= vm->memslot[i].base_gfn && + gfn < vm->memslot[i].base_gfn + vm->memslot[i].npages) +return i; + } + +return -EFAULT ; +} +/** * register_memslot_addr_range() - Register memory region to GenieZone * @gzvm: Pointer to struct gzvm
include/linux/gzvm_drv.h +7 -0
@@ -29,6 +29,7 @@*/ #define NO_ERROR (0)#define ERR_NO_MEMORY (-5) +#define ERR_INVALID_ARGS (-8)#define ERR_NOT_SUPPORTED (-24)#define ERR_NOT_IMPLEMENTED (-27)#define ERR_FAULT (-40)
@@ -123,6 +124,8 @@ int gzvm_arch_set_memregion(u16 vm_id, size_t buf_size,int gzvm_arch_check_extension (struct gzvm *gzvm,__u64 cap,void __user *argp);int gzvm_arch_create_vm (unsigned long vm_type);int gzvm_arch_destroy_vm (u16 vm_id); +int gzvm_arch_map_guest (u16 vm_id,int memslot_id,u64 pfn,u64 gfn, +u64 nr_pages);int gzvm_vm_ioctl_arch_enable_cap (struct gzvm *gzvm,struct gzvm_enable_cap *cap,void __user *argp);
@@ -141,6 +144,10 @@ int gzvm_arch_vcpu_run(struct gzvm_vcpu *vcpu, __u64 *exit_reason);int gzvm_arch_destroy_vcpu (u16 vm_id,int vcpuid);int gzvm_arch_inform_exit (u16 vm_id); +int gzvm_find_memslot (struct gzvm *vm,u64 gpa); +int gzvm_handle_page_fault (struct gzvm_vcpu *vcpu); +bool gzvm_handle_guest_exception (struct gzvm_vcpu *vcpu); +int gzvm_arch_create_device (u16 vm_id,struct gzvm_create_device *gzvm_dev);int gzvm_arch_inject_irq (struct gzvm *gzvm,unsigned int vcpu_idx,u32 irq,bool level);
include/uapi/linux/gzvm.h +11 -0
@@ -185,6 +185,12 @@ enum { GZVM_EXIT_GZ = 0x9292000a, }; +/* exception definitions of GZVM_EXIT_EXCEPTION */ +enum { +GZVM_EXCEPTION_UNKNOWN =0x0 , +GZVM_EXCEPTION_PAGE_FAULT =0x1 , +}; +/** * struct gzvm_vcpu_run: Same purpose as kvm_run, this struct is * shared between userspace, kernel and
@@ -209,6 +215,9 @@ enum {* Handle exception occurred in VM * @exception: Which exception vector * @error_code: Exception error codes +* @fault_gpa: Fault GPA (guest physical address or IPA in ARM) +* @reserved: Future-proof reservation and reset to zero in hypervisor. +* Fill up to the union size, 256 bytes. * @hypercall: The nested struct in anonymous union. * Some hypercalls issued from VM must be handled * @args: The hypercall's arguments
@@ -255,6 +264,8 @@ struct gzvm_vcpu_run {struct {__u32 exception;__u32 error_code; +__u64 fault_gpa; +__u64 reserved[30 ]; } exception;/* GZVM_EXIT_HYPERCALL */ struct {
Signature · 1 line
2.18.0
PATCH v7 14/16 virt: geniezone: Add block-based demand paging support
In reply to Yi-De WuFrom: "Yingshiuan Pan" <[email protected]>
To balance memory usage and performance, GenieZone supports larger granularity demand paging, called block-based demand paging. Gzvm driver uses enable_cap to query the hypervisor if it supports block-based demand paging and the given granularity or not. Meanwhile, the gzvm driver allocates a shared buffer for storing the physical pages later.
If the hypervisor supports, every time the gzvm driver handles guest page faults, it allocates more memory in advance (default: 2MB) for demand paging. And fills those physical pages into the allocated shared memory, then calls the hypervisor to map to guest's memory.
The physical pages allocated for block-based demand paging is not necessary to be contiguous because in many cases, 2MB block is not followed. 1st, the memory is allocated because of VMM's page fault (VMM loads kernel image to guest memory before running). In this case, the page is allocated by the host kernel and using PAGE_SIZE. 2nd is that guest may return memory to host via ballooning and that is still 4KB (or PAGE_SIZE) granularity. Therefore, we do not have to allocate physically contiguous 2MB pages.
--- arch/arm64/geniezone/gzvm_arch_common.h | 2 + arch/arm64/geniezone/vm.c | 19 ++++++++-- drivers/virt/geniezone/gzvm_mmu.c | 44 +++++++++++++++++++++- drivers/virt/geniezone/gzvm_vm.c | 49 +++++++++++++++++++++++++ include/linux/gzvm_drv.h | 16 ++++++++ include/uapi/linux/gzvm.h | 2 + 6 files changed, 128 insertions(+), 4 deletions(-)
arch/arm64/geniezone/gzvm_arch_common.h +2 -0
@@ -25,6 +25,7 @@ enum {GZVM_FUNC_MEMREGION_PURPOSE =15 ,GZVM_FUNC_SET_DTB_CONFIG =16 ,GZVM_FUNC_MAP_GUEST =17 , +GZVM_FUNC_MAP_GUEST_BLOCK =18 , NR_GZVM_FUNC, };
@@ -50,6 +51,7 @@ enum {#define MT_HVC_GZVM_MEMREGION_PURPOSE GZVM_HCALL_ID(GZVM_FUNC_MEMREGION_PURPOSE)#define MT_HVC_GZVM_SET_DTB_CONFIG GZVM_HCALL_ID(GZVM_FUNC_SET_DTB_CONFIG)#define MT_HVC_GZVM_MAP_GUEST GZVM_HCALL_ID(GZVM_FUNC_MAP_GUEST) +#define MT_HVC_GZVM_MAP_GUEST_BLOCK GZVM_HCALL_ID(GZVM_FUNC_MAP_GUEST_BLOCK)#define GIC_V3_NR_LRS 16
arch/arm64/geniezone/vm.c +16 -3
@@ -318,10 +318,11 @@ static int gzvm_vm_ioctl_cap_pvm(struct gzvm *gzvm, fallthrough;case GZVM_CAP_PVM_SET_PROTECTED_VM :/* -* To improve performance for protected VM, we have to populate VM's memory -* before VM booting +* If the hypervisor doesn't support block-based demand paging, we +* populate memory in advance to improve performance for protected VM. */ -populate_mem_region (gzvm); +if (gzvm->demand_page_gran ==PAGE_SIZE ) +populate_mem_region (gzvm); ret =gzvm_vm_arch_enable_cap (gzvm, cap, &res);return ret;case GZVM_CAP_PVM_GET_PVMFW_SIZE :
@@ -338,12 +339,16 @@ int gzvm_vm_ioctl_arch_enable_cap(struct gzvm *gzvm,struct gzvm_enable_cap *cap, void __user *argp) { + struct arm_smccc_res res = {0};int ret;switch (cap->cap) {case GZVM_CAP_PROTECTED_VM : ret =gzvm_vm_ioctl_cap_pvm (gzvm, cap, argp);return ret; +case GZVM_CAP_BLOCK_BASED_DEMAND_PAGING : + ret =gzvm_vm_arch_enable_cap (gzvm, cap, &res); +return ret;default :break ; }
@@ -384,3 +389,11 @@ int gzvm_arch_map_guest(u16 vm_id, int memslot_id, u64 pfn, u64 gfn,return gzvm_hypcall_wrapper (MT_HVC_GZVM_MAP_GUEST , vm_id, memslot_id, pfn, gfn, nr_pages,0 ,0 , &res); } + +int gzvm_arch_map_guest_block (u16 vm_id,int memslot_id,u64 gfn,u64 nr_pages) +{ +struct arm_smccc_res res; + +return gzvm_hypcall_wrapper (MT_HVC_GZVM_MAP_GUEST_BLOCK , vm_id, + memslot_id, gfn, nr_pages,0 ,0 ,0 , &res); +}
drivers/virt/geniezone/gzvm_mmu.c +43 -1
54 lines not on this page · raw message
drivers/virt/geniezone/gzvm_vm.c +49 -0
73 lines not on this page · raw message
include/linux/gzvm_drv.h +16 -0
@@ -44,6 +44,8 @@#define GZVM_VCPU_RUN_MAP_SIZE (PAGE_SIZE * 2) +#define GZVM_BLOCK_BASED_DEMAND_PAGE_SIZE (2 * 1024 * 1024)/* 2MB */ +/* struct mem_region_addr_range - Identical to ffa memory constituent */ struct mem_region_addr_range {/* the base IPA of the constituent memory region, aligned to 4 kiB */
@@ -106,6 +108,19 @@ struct gzvm {struct srcu_struct irq_srcu;/* lock for irq injection */ struct mutex irq_lock; + +/* +* demand page granularity: how much memory we allocate for VM in a +* single page fault +*/ +u32 demand_page_gran; +/* the mailbox for transferring large portion pages */ +u64 *demand_page_buffer; +/* +* lock for preventing multiple cpu using the same demand page mailbox +* at the same time +*/ +struct mutex demand_paging_lock; };long gzvm_dev_ioctl_check_extension (struct gzvm *gzvm,unsigned long args);
@@ -126,6 +141,7 @@ int gzvm_arch_create_vm(unsigned long vm_type);int gzvm_arch_destroy_vm (u16 vm_id);int gzvm_arch_map_guest (u16 vm_id,int memslot_id,u64 pfn,u64 gfn,u64 nr_pages); +int gzvm_arch_map_guest_block (u16 vm_id,int memslot_id,u64 gfn,u64 nr_pages);int gzvm_vm_ioctl_arch_enable_cap (struct gzvm *gzvm,struct gzvm_enable_cap *cap,void __user *argp);
include/uapi/linux/gzvm.h +2 -0
@@ -18,6 +18,8 @@#define GZVM_CAP_VM_GPA_SIZE 0xa5#define GZVM_CAP_PROTECTED_VM 0xffbadab1 +/* query hypervisor supported block-based demand page */ +#define GZVM_CAP_BLOCK_BASED_DEMAND_PAGING 0x9201/* sub-commands put in args[0] for GZVM_CAP_PROTECTED_VM */ #define GZVM_CAP_PVM_SET_PVMFW_GPA 0
Signature · 1 line
2.18.0
PATCH v7 15/16 virt: geniezone: Add memory pin/unpin support
In reply to Yi-De WuFrom: "Jerry Wang" <[email protected]>
Protected VM's memory cannot be swapped out because the memory pages are protected from host access.
Once host accesses to those protected pages, the hardware exception is triggered and may crash the host. So, we have to make those protected pages be ineligible for swapping or merging by the host kernel to avoid host access. To do so, we pin the page when it is assigned (donated) to VM and unpin when VM relinquish the pages or is destroyed. Besides, the protected VM’s memory requires hypervisor to clear the content before returning to host, but VMM may free those memory before clearing, it will result in those memory pages are reclaimed and reused before totally clearing. Using pin/unpin can also avoid the above problems.
The implementation is described as follows.
- Use rb_tree to store pinned memory pages.
- Pin the page when handling page fault.
- Unpin the pages when VM relinquish the pages or is destroyed.
--- drivers/virt/geniezone/gzvm_mmu.c | 60 ++++++++++++++++++++++++++++++- drivers/virt/geniezone/gzvm_vm.c | 18 ++++++++++ include/linux/gzvm_drv.h | 10 ++++++ 3 files changed, 87 insertions(+), 1 deletion(-)
drivers/virt/geniezone/gzvm_mmu.c +59 -1
@@ -107,8 +107,59 @@ int gzvm_gfn_to_pfn_memslot(struct gzvm_memslot *memslot, u64 gfn,return 0 ; } +static int cmp_ppages (struct rb_node *node,const struct rb_node *parent) +{ +struct gzvm_pinned_page *a =container_of (node, + struct gzvm_pinned_page, + node); +struct gzvm_pinned_page *b =container_of (parent, + struct gzvm_pinned_page, + node); + +if (a->ipa < b->ipa) +return -1 ; +if (a->ipa > b->ipa) +return 1 ; +return 0 ; +} + +static int gzvm_insert_ppage (struct gzvm *vm,struct gzvm_pinned_page *ppage) +{ +if (rb_find_add (&ppage->node, &vm->pinned_pages, cmp_ppages)) +return -EEXIST ; +return 0 ; +} + +static int pin_one_page (struct gzvm *vm,unsigned long hva,u64 gpa) +{ +unsigned int flags =FOLL_HWPOISON |FOLL_LONGTERM |FOLL_WRITE ; +struct gzvm_pinned_page *ppage =NULL ; +struct mm_struct *mm = current->mm; +struct page *page =NULL ; + + ppage =kmalloc (sizeof (*ppage),GFP_KERNEL_ACCOUNT ); +if (!ppage) +return -ENOMEM ; + +mmap_read_lock (mm); +pin_user_pages (hva,1 , flags, &page); +mmap_read_unlock (mm); + +if (!page) { +kfree (ppage); +return -EFAULT ; + } + + ppage->page = page; + ppage->ipa = gpa; +gzvm_insert_ppage (vm, ppage); + +return 0 ; +} +static int handle_block_demand_page (struct gzvm *vm,int memslot_id,u64 gfn) { +unsigned long hva;u64 pfn, __gfn;int ret, i;
@@ -131,6 +182,11 @@ static int handle_block_demand_page(struct gzvm *vm, int memslot_id, u64 gfn) goto err_unlock; } vm->demand_page_buffer[i] = pfn; + + hva =gzvm_gfn_to_hva_memslot (&vm->memslot[memslot_id], __gfn); + ret =pin_one_page (vm, hva,PFN_PHYS (__gfn)); +if (ret) + goto err_unlock; } ret = gzvm_arch_map_guest_block(vm->vm_id, memslot_id, start_gfn,
@@ -148,6 +204,7 @@ static int handle_block_demand_page(struct gzvm *vm, int memslot_id, u64 gfn)static int handle_single_demand_page (struct gzvm *vm,int memslot_id,u64 gfn) { +unsigned long hva;int ret;u64 pfn;
@@ -159,7 +216,8 @@ static int handle_single_demand_page(struct gzvm *vm, int memslot_id, u64 gfn)if (unlikely (ret))return -EFAULT ; -return 0 ; + hva =gzvm_gfn_to_hva_memslot (&vm->memslot[memslot_id], gfn); +return pin_one_page (vm, hva,PFN_PHYS (gfn)); }/**
drivers/virt/geniezone/gzvm_vm.c +18 -0
@@ -292,6 +292,21 @@ static long gzvm_vm_ioctl(struct file *filp, unsigned int ioctl,return ret; } +static void gzvm_destroy_ppage (struct gzvm *gzvm) +{ +struct gzvm_pinned_page *ppage; +struct rb_node *node; + + node =rb_first (&gzvm->pinned_pages); +while (node) { + ppage = rb_entry(node, struct gzvm_pinned_page, node); +unpin_user_pages_dirty_lock (&ppage->page,1 , true); + node =rb_next (node); +rb_erase (&ppage->node, &gzvm->pinned_pages); +kfree (ppage); + } +} +static void gzvm_destroy_vm (struct gzvm *gzvm) {size_t allocated_size;
@@ -315,6 +330,8 @@ static void gzvm_destroy_vm(struct gzvm *gzvm)mutex_unlock (&gzvm->lock); +gzvm_destroy_ppage (gzvm); +kfree (gzvm); }
@@ -390,6 +407,7 @@ static struct gzvm *gzvm_create_vm(unsigned long vm_type) gzvm->vm_id = ret; gzvm->mm = current->mm;mutex_init (&gzvm->lock); + gzvm->pinned_pages =RB_ROOT ; ret =gzvm_vm_irqfd_init (gzvm);if (ret) {
include/linux/gzvm_drv.h +10 -0
@@ -12,6 +12,7 @@#include <linux/mutex.h> #include <linux/gzvm.h> #include <linux/srcu.h> +#include <linux/rbtree.h> /* * For the normal physical address, the highest 12 bits should be zero, so we
@@ -82,6 +83,12 @@ struct gzvm_vcpu {struct gzvm_vcpu_hwstate *hwstate; }; +struct gzvm_pinned_page { +struct rb_node node; +struct page *page; +u64 ipa; +}; +struct gzvm {struct gzvm_vcpu *vcpus[GZVM_MAX_VCPUS ];/* userspace tied to this vm */
@@ -121,6 +128,9 @@ struct gzvm {* at the same time */ struct mutex demand_paging_lock; + +/* Use rb-tree to record pin/unpin page */ +struct rb_root pinned_pages; };long gzvm_dev_ioctl_check_extension (struct gzvm *gzvm,unsigned long args);
Signature · 1 line
2.18.0
PATCH v7 16/16 virt: geniezone: Add memory relinquish support
In reply to Yi-De WuFrom: "Jerry Wang" <[email protected]>
Unpin the pages when VM relinquish the pages or is destroyed.
--- drivers/virt/geniezone/gzvm_exception.c | 23 +++++++++++++++ drivers/virt/geniezone/gzvm_mmu.c | 37 +++++++++++++++++++++++++ drivers/virt/geniezone/gzvm_vcpu.c | 6 ++-- include/linux/gzvm_drv.h | 2 ++ include/uapi/linux/gzvm.h | 5 ++++ 5 files changed, 71 insertions(+), 2 deletions(-)
drivers/virt/geniezone/gzvm_exception.c +23 -0
@@ -37,3 +37,26 @@ bool gzvm_handle_guest_exception(struct gzvm_vcpu *vcpu)else return false; } + +/** +* gzvm_handle_guest_hvc() - Handle guest hvc +* @vcpu: Pointer to struct gzvm_vcpu struct +* Return: +* * true - This hvc has been processed, no need to back to VMM. +* * false - This hvc has not been processed, require userspace. +*/ +bool gzvm_handle_guest_hvc (struct gzvm_vcpu *vcpu) +{ +unsigned long ipa; +int ret; + +switch (vcpu->run->hypercall.args[0 ]) { +case GZVM_HVC_MEM_RELINQUISH : + ipa = vcpu->run->hypercall.args[1 ]; + ret =gzvm_handle_relinquish (vcpu, ipa); +return (ret ==0 ) ? true : false; +default : +break ; + } +return false; +}
drivers/virt/geniezone/gzvm_mmu.c +37 -0
@@ -123,6 +123,16 @@ static int cmp_ppages(struct rb_node *node, const struct rb_node *parent)return 0 ; } +static int rb_ppage_cmp (const void *key,const struct rb_node *node) +{ +struct gzvm_pinned_page *p =container_of (node, + struct gzvm_pinned_page, + node); +phys_addr_t ipa = (phys_addr_t )key; + +return (ipa < p->ipa) ?-1 : (ipa > p->ipa); +} +static int gzvm_insert_ppage (struct gzvm *vm,struct gzvm_pinned_page *ppage) {if (rb_find_add (&ppage->node, &vm->pinned_pages, cmp_ppages))
@@ -157,6 +167,33 @@ static int pin_one_page(struct gzvm *vm, unsigned long hva, u64 gpa)return 0 ; } +/** +* gzvm_handle_relinquish() - Handle memory relinquish request from hypervisor +* +* @vcpu: Pointer to struct gzvm_vcpu_run in userspace +* @ipa: Start address(gpa) of a reclaimed page +* +* Return: Always return 0 because there are no cases of failure +*/ +int gzvm_handle_relinquish (struct gzvm_vcpu *vcpu,phys_addr_t ipa) +{ +struct gzvm_pinned_page *ppage; +struct rb_node *node; +struct gzvm *vm = vcpu->gzvm; + + node =rb_find ((void *)ipa, &vm->pinned_pages, rb_ppage_cmp); + +if (node) +rb_erase (node, &vm->pinned_pages); +else +return 0 ; + + ppage = container_of(node, struct gzvm_pinned_page, node); +unpin_user_pages_dirty_lock (&ppage->page,1 , true); +kfree (ppage); +return 0 ; +} +static int handle_block_demand_page (struct gzvm *vm,int memslot_id,u64 gfn) {unsigned long hva;
drivers/virt/geniezone/gzvm_vcpu.c +4 -2
@@ -113,12 +113,14 @@ static long gzvm_vcpu_run(struct gzvm_vcpu *vcpu, void __user *argp)* it's geniezone's responsibility to fill corresponding data * structure */ +case GZVM_EXIT_HYPERCALL : +if (!gzvm_handle_guest_hvc (vcpu)) + need_userspace = true; +break ;case GZVM_EXIT_EXCEPTION :if (!gzvm_handle_guest_exception (vcpu)) need_userspace = true;break ; -case GZVM_EXIT_HYPERCALL : - fallthrough;case GZVM_EXIT_DEBUG : fallthrough;case GZVM_EXIT_FAIL_ENTRY :
include/linux/gzvm_drv.h +2 -0
@@ -173,6 +173,8 @@ int gzvm_arch_inform_exit(u16 vm_id);int gzvm_find_memslot (struct gzvm *vm,u64 gpa);int gzvm_handle_page_fault (struct gzvm_vcpu *vcpu);bool gzvm_handle_guest_exception (struct gzvm_vcpu *vcpu); +int gzvm_handle_relinquish (struct gzvm_vcpu *vcpu,phys_addr_t ipa); +bool gzvm_handle_guest_hvc (struct gzvm_vcpu *vcpu);int gzvm_arch_create_device (u16 vm_id,struct gzvm_create_device *gzvm_dev); int gzvm_arch_inject_irq(struct gzvm *gzvm, unsigned int vcpu_idx,
include/uapi/linux/gzvm.h +5 -0
@@ -193,6 +193,11 @@ enum { GZVM_EXCEPTION_PAGE_FAULT = 0x1, }; +/* hypercall definitions of GZVM_EXIT_HYPERCALL */ +enum { +GZVM_HVC_MEM_RELINQUISH =0xc6000009 , +}; +/** * struct gzvm_vcpu_run: Same purpose as kvm_run, this struct is * shared between userspace, kernel and
Signature · 1 line
2.18.0