aarch64: Add stolen time support
v5 cover aarch64: Add stolen time support
These patches add support for stolen time functionality.
Patch #1 moves the vCPU structure initialisation before the target->init() call to allow early access to the kvm structure from the vCPU during target->init().
Patch #2 modifies the memory layout in arm-common/kvm-arch.h and adds a new MMIO device PVTIME after the RTC region. A new flag is added in kvm-config.h that will be used to control [enable/disable] the pvtime functionality.
Patch #3 adds a new command line argument to disable the stolen time functionality(by default is enabled).
Changelog since v4:
- Propagate a return code from kvm_cpu__setup_pvtime to target->init(vcpu)
- Change the order of the patches as the vCPU structure initialisation needs to be done before the PVTIME setup
- Return -errno from pvtime__alloc_region(..)
- Verify if the system supports KVM_CAP_STEAL_TIME
Sebastian Ene (3):
aarch64: Populate the vCPU struct before target->init()
aarch64: Add stolen time support
Add --no-pvtime command line argument
Makefile | 1 + arm/aarch64/arm-cpu.c | 2 +- arm/aarch64/include/kvm/kvm-cpu-arch.h | 1 + arm/aarch64/pvtime.c | 98 ++++++++++++++++++++++++++ arm/include/arm-common/kvm-arch.h | 6 +- arm/kvm-cpu.c | 14 ++-- builtin-run.c | 2 + include/kvm/kvm-config.h | 1 + 8 files changed, 116 insertions(+), 9 deletions(-) create mode 100644 arm/aarch64/pvtime.c
Signature · 1 line
2.35.1.574.g5d30c73bfb-goog
PATCH v5 1/3 aarch64: Populate the vCPU struct before target->init()
Move the vCPU structure initialisation before the target->init() call to
keep a reference to the kvm structure during init().
This is required by the pvtime peripheral to reserve a memory region while the vCPU is beeing initialised.
--- arm/kvm-cpu.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
arm/kvm-cpu.c +7 -7
@@ -116,6 +116,13 @@ struct kvm_cpu *kvm_cpu__arch_init(struct kvm *kvm, unsigned long cpu_id)die ("Unable to find matching target" ); } +/* Populate the vcpu structure. */ + vcpu->kvm = kvm; + vcpu->cpu_id = cpu_id; + vcpu->cpu_type = vcpu_init.target; + vcpu->cpu_compatible = target->compatible; + vcpu->is_running = true; +if (err || target->init (vcpu))die ("Unable to initialise vcpu" );
@@ -125,13 +132,6 @@ struct kvm_cpu *kvm_cpu__arch_init(struct kvm *kvm, unsigned long cpu_id) vcpu->ring = (void *)vcpu->kvm_run + (coalesced_offset *PAGE_SIZE ); -/* Populate the vcpu structure. */ - vcpu->kvm = kvm; - vcpu->cpu_id = cpu_id; - vcpu->cpu_type = vcpu_init.target; - vcpu->cpu_compatible = target->compatible; - vcpu->is_running = true; -if (kvm_cpu__configure_features (vcpu))die ("Unable to configure requested vcpu features" );
Signature · 1 line
2.35.1.574.g5d30c73bfb-goog
PATCH v5 2/3 aarch64: Add stolen time support
In reply to Sebastian EneThis patch adds support for stolen time by sharing a memory region with the guest which will be used by the hypervisor to store the stolen time information. Reserve a 64kb MMIO memory region after the RTC peripheral to be used by pvtime. The exact format of the structure stored by the hypervisor is described in the ARM DEN0057A document.
--- Makefile | 1 + arm/aarch64/arm-cpu.c | 2 +- arm/aarch64/include/kvm/kvm-cpu-arch.h | 1 + arm/aarch64/pvtime.c | 98 ++++++++++++++++++++++++++ arm/include/arm-common/kvm-arch.h | 6 +- include/kvm/kvm-config.h | 1 + 6 files changed, 107 insertions(+), 2 deletions(-) create mode 100644 arm/aarch64/pvtime.c
Makefile +1 -0
@@ -182,6 +182,7 @@ ifeq ($(ARCH), arm64) OBJS += arm/aarch64/arm-cpu.o OBJS += arm/aarch64/kvm-cpu.o OBJS += arm/aarch64/kvm.o + OBJS += arm/aarch64/pvtime.o ARCH_INCLUDE := $(HDRS_ARM_COMMON) ARCH_INCLUDE += -Iarm/aarch64/include
arm/aarch64/arm-cpu.c +1 -1
@@ -22,7 +22,7 @@ static void generate_fdt_nodes(void *fdt, struct kvm *kvm)static int arm_cpu__vcpu_init (struct kvm_cpu *vcpu) { vcpu->generate_fdt_nodes = generate_fdt_nodes; -return 0 ; +return kvm_cpu__setup_pvtime (vcpu); }static struct kvm_arm_target target_generic_v8 = {
arm/aarch64/include/kvm/kvm-cpu-arch.h +1 -0
@@ -19,5 +19,6 @@void kvm_cpu__select_features (struct kvm *kvm,struct kvm_vcpu_init *init);int kvm_cpu__configure_features (struct kvm_cpu *vcpu); +int kvm_cpu__setup_pvtime (struct kvm_cpu *vcpu);#endif /* KVM__KVM_CPU_ARCH_H */
arm/aarch64/pvtime.c new file +98 -0
98 lines not on this page · raw message
arm/include/arm-common/kvm-arch.h +5 -1
@@ -15,7 +15,8 @@* | PCI |////| plat | | | | | * | I/O |////| MMIO: | Flash | virtio | GIC | PCI | DRAM * | space |////| UART, | | MMIO | | (AXI) | -* | |////| RTC | | | | | +* | |////| RTC, | | | | | +* | |////| PVTIME| | | | | * +-------+----+-------+-------+--------+-----+---------+---...... */
@@ -34,6 +35,9 @@#define ARM_RTC_MMIO_BASE (ARM_UART_MMIO_BASE + ARM_UART_MMIO_SIZE)#define ARM_RTC_MMIO_SIZE 0x10000 +#define ARM_PVTIME_MMIO_BASE (ARM_RTC_MMIO_BASE + ARM_RTC_MMIO_SIZE) +#define ARM_PVTIME_MMIO_SIZE SZ_64K +#define KVM_FLASH_MMIO_BASE (ARM_MMIO_AREA + 0x1000000)#define KVM_FLASH_MAX_SIZE 0x1000000
include/kvm/kvm-config.h +1 -0
@@ -62,6 +62,7 @@ struct kvm_config {bool no_dhcp;bool ioport_debug;bool mmio_debug; + bool no_pvtime; };#endif
Signature · 1 line
2.35.1.574.g5d30c73bfb-goog
PATCH v5 3/3 Add --no-pvtime command line argument
In reply to Sebastian EneThe command line argument disables the stolen time functionality when is specified.
--- builtin-run.c | 2 ++ 1 file changed, 2 insertions(+)
builtin-run.c +2 -0
@@ -128,6 +128,8 @@ void kvm_run_set_wrapper_sandbox(void) " rootfs"), \OPT_STRING ('\0' ,"hugetlbfs" , &(cfg)->hugetlbfs_path,"path" , \"Hugetlbfs path" ), \ +OPT_BOOLEAN ('\0' ,"no-pvtime" , &(cfg)->no_pvtime,"Disable" \ +" stolen time" ), \ \OPT_GROUP ("Kernel options:" ), \ OPT_STRING('k', "kernel", &(cfg)->kernel_filename, "kernel", \
Signature · 1 line
2.35.1.574.g5d30c73bfb-goog