arm: Drop support for 32-bit kvmtool
v2 cover arm: Drop support for 32-bit kvmtool
v1: https://lore.kernel.org/kvmarm/[email protected]/
v1 -> v2:
- Move headers under arm64/include/kvm similar to other arches (Alex)
Oliver Upton (9):
Drop support for 32-bit arm
arm64: Move arm64-only features into main directory
arm64: Combine kvm.c
arm64: Merge kvm-cpu.c
arm64: Combine kvm-config-arch.h
arm64: Move remaining kvm/* headers
arm64: Move asm headers
arm64: Rename top-level directory
arm64: Get rid of the 'arm-common' include directory
INSTALL | 9 +-
Makefile | 40 +--
arm/aarch32/arm-cpu.c | 50 ---
arm/aarch32/include/asm/kernel.h | 8 -
arm/aarch32/include/asm/kvm.h | 311 ------------------
arm/aarch32/include/kvm/barrier.h | 10 -
arm/aarch32/include/kvm/fdt-arch.h | 6 -
arm/aarch32/include/kvm/kvm-arch.h | 18 -
arm/aarch32/include/kvm/kvm-config-arch.h | 8 -
arm/aarch32/include/kvm/kvm-cpu-arch.h | 24 --
arm/aarch32/kvm-cpu.c | 132 --------
arm/aarch32/kvm.c | 14 -
arm/aarch64/include/kvm/fdt-arch.h | 6 -
arm/aarch64/include/kvm/kvm-arch.h | 22 --
arm/aarch64/include/kvm/kvm-config-arch.h | 29 --
arm/aarch64/include/kvm/kvm-cpu-arch.h | 19 --
arm/aarch64/kvm.c | 212 ------------
arm/kvm-cpu.c | 153 ---------
{arm/aarch64 => arm64}/arm-cpu.c | 5 +-
{arm => arm64}/fdt.c | 5 +-
{arm => arm64}/gic.c | 3 +-
{arm => arm64}/gicv2m.c | 3 +-
{arm/aarch64 => arm64}/include/asm/image.h | 0
{arm/aarch64 => arm64}/include/asm/kernel.h | 0
{arm/aarch64 => arm64}/include/asm/kvm.h | 0
{arm/aarch64 => arm64}/include/asm/pmu.h | 0
.../include/asm/sve_context.h | 0
{arm/aarch64 => arm64}/include/kvm/barrier.h | 0
.../include/kvm}/fdt-arch.h | 0
.../arm-common => arm64/include/kvm}/gic.h | 0
.../include/kvm}/kvm-arch.h | 8 +-
.../include/kvm}/kvm-config-arch.h | 24 +-
.../include/kvm}/kvm-cpu-arch.h | 10 +-
.../pci.h => arm64/include/kvm/pci-arch.h | 0
.../arm-common => arm64/include/kvm}/timer.h | 0
{arm => arm64}/ioport.c | 0
{arm/aarch64 => arm64}/kvm-cpu.c | 289 ++++++++++++----
{arm => arm64}/kvm.c | 210 +++++++++++-
{arm => arm64}/pci.c | 5 +-
{arm/aarch64 => arm64}/pmu.c | 3 +-
{arm/aarch64 => arm64}/pvtime.c | 0
{arm => arm64}/timer.c | 5 +-
builtin-run.c | 2 +-
hw/cfi_flash.c | 2 +-
hw/rtc.c | 2 +-
hw/serial.c | 2 +-
virtio/core.c | 2 +-
47 files changed, 498 insertions(+), 1153 deletions(-)
delete mode 100644 arm/aarch32/arm-cpu.c
delete mode 100644 arm/aarch32/include/asm/kernel.h
delete mode 100644 arm/aarch32/include/asm/kvm.h
delete mode 100644 arm/aarch32/include/kvm/barrier.h
delete mode 100644 arm/aarch32/include/kvm/fdt-arch.h
delete mode 100644 arm/aarch32/include/kvm/kvm-arch.h
delete mode 100644 arm/aarch32/include/kvm/kvm-config-arch.h
delete mode 100644 arm/aarch32/include/kvm/kvm-cpu-arch.h
delete mode 100644 arm/aarch32/kvm-cpu.c
delete mode 100644 arm/aarch32/kvm.c
delete mode 100644 arm/aarch64/include/kvm/fdt-arch.h
delete mode 100644 arm/aarch64/include/kvm/kvm-arch.h
delete mode 100644 arm/aarch64/include/kvm/kvm-config-arch.h
delete mode 100644 arm/aarch64/include/kvm/kvm-cpu-arch.h
delete mode 100644 arm/aarch64/kvm.c
delete mode 100644 arm/kvm-cpu.c
rename {arm/aarch64 => arm64}/arm-cpu.c (96%)
rename {arm => arm64}/fdt.c (99%)
rename {arm => arm64}/gic.c (99%)
rename {arm => arm64}/gicv2m.c (99%)
rename {arm/aarch64 => arm64}/include/asm/image.h (100%)
rename {arm/aarch64 => arm64}/include/asm/kernel.h (100%)
rename {arm/aarch64 => arm64}/include/asm/kvm.h (100%)
rename {arm/aarch64 => arm64}/include/asm/pmu.h (100%)
rename {arm/aarch64 => arm64}/include/asm/sve_context.h (100%)
rename {arm/aarch64 => arm64}/include/kvm/barrier.h (100%)
rename {arm/include/arm-common => arm64/include/kvm}/fdt-arch.h (100%)
rename {arm/include/arm-common => arm64/include/kvm}/gic.h (100%)
rename {arm/include/arm-common => arm64/include/kvm}/kvm-arch.h (96%)
rename {arm/include/arm-common => arm64/include/kvm}/kvm-config-arch.h (54%)
rename {arm/include/arm-common => arm64/include/kvm}/kvm-cpu-arch.h (82%)
rename arm/include/arm-common/pci.h => arm64/include/kvm/pci-arch.h (100%)
rename {arm/include/arm-common => arm64/include/kvm}/timer.h (100%)
rename {arm => arm64}/ioport.c (100%)
rename {arm/aarch64 => arm64}/kvm-cpu.c (70%)
rename {arm => arm64}/kvm.c (59%)
rename {arm => arm64}/pci.c (98%)
rename {arm/aarch64 => arm64}/pmu.c (99%)
rename {arm/aarch64 => arm64}/pvtime.c (100%)
rename {arm => arm64}/timer.c (94%)base-commit: e48563f5c4a48fe6a6bc2a98a9a7c84a10f043be
Signature · 1 line
2.39.5
PATCH v2 1/9 Drop support for 32-bit arm
Linux dropped support for KVM in 32-bit arm kernels almost 5 years ago in the 5.7 kernel release. In addition to that KVM/arm64 never had 32-bit compat support, so it is a safe assumption that usage of 32-bit kvmtool is pretty much dead at this point.
Do not despair -- 32-bit guests are still supported with a 64-bit userspace.
--- INSTALL | 9 +- Makefile | 31 +-- arm/aarch32/arm-cpu.c | 50 ---- arm/aarch32/include/asm/kernel.h | 8 - arm/aarch32/include/asm/kvm.h | 311 ---------------------- arm/aarch32/include/kvm/barrier.h | 10 - arm/aarch32/include/kvm/fdt-arch.h | 6 - arm/aarch32/include/kvm/kvm-arch.h | 18 -- arm/aarch32/include/kvm/kvm-config-arch.h | 8 - arm/aarch32/include/kvm/kvm-cpu-arch.h | 24 -- arm/aarch32/kvm-cpu.c | 132 --------- arm/aarch32/kvm.c | 14 - builtin-run.c | 2 +- hw/cfi_flash.c | 2 +- hw/rtc.c | 2 +- hw/serial.c | 2 +- virtio/core.c | 2 +- 17 files changed, 19 insertions(+), 612 deletions(-) delete mode 100644 arm/aarch32/arm-cpu.c delete mode 100644 arm/aarch32/include/asm/kernel.h delete mode 100644 arm/aarch32/include/asm/kvm.h delete mode 100644 arm/aarch32/include/kvm/barrier.h delete mode 100644 arm/aarch32/include/kvm/fdt-arch.h delete mode 100644 arm/aarch32/include/kvm/kvm-arch.h delete mode 100644 arm/aarch32/include/kvm/kvm-config-arch.h delete mode 100644 arm/aarch32/include/kvm/kvm-cpu-arch.h delete mode 100644 arm/aarch32/kvm-cpu.c delete mode 100644 arm/aarch32/kvm.c
INSTALL +4 -5
@@ -26,7 +26,7 @@ For Fedora based systems: For OpenSUSE based systems: # zypper install glibc-devel-static -Architectures which require device tree (PowerPC, ARM, ARM64, RISC-V) also +Architectures which require device tree (PowerPC, ARM64, RISC-V) also require libfdt. deb: $ sudo apt-get install libfdt-dev Fedora: # yum install libfdt-devel
@@ -61,16 +61,15 @@ to the Linux name of the architecture. Architectures supported: - i386 - x86_64 - powerpc -- arm - arm64 - mips - riscv If ARCH is not provided, the target architecture will be automatically determined by running "uname -m" on your host, resulting in a native build. -To cross-compile to ARM for instance, install a cross-compiler, put the +To cross-compile to arm64 for instance, install a cross-compiler, put the required libraries in the cross-compiler's SYSROOT and type: -$ make CROSS_COMPILE=arm-linux-gnueabihf- ARCH=arm +$ make CROSS_COMPILE=aarch64-linux-gnu- ARCH=arm64 Missing libraries when cross-compiling ---------------------------------------
@@ -82,7 +81,7 @@ On multiarch system you should be able to install those be appending the architecture name after the package (example for ARM64): $ sudo apt-get install libfdt-dev:arm64 -PowerPC, ARM/ARM64 and RISC-V require libfdt to be installed. If you cannot use +PowerPC, ARM64 and RISC-V require libfdt to be installed. If you cannot use precompiled mulitarch packages, you could either copy the required header and library files from an installed target system into the SYSROOT (you will need /usr/include/*fdt*.h and /usr/lib64/libfdt-v.v.v.so and its symlinks), or you
Makefile +10 -21
@@ -166,35 +166,24 @@ ifeq ($(ARCH), powerpc) ARCH_WANT_LIBFDT := y endif -# ARM -OBJS_ARM_COMMON := arm/fdt.o arm/gic.o arm/gicv2m.o arm/ioport.o \ - arm/kvm.o arm/kvm-cpu.o arm/pci.o arm/timer.o \ - hw/serial.o -HDRS_ARM_COMMON := arm/include -ifeq ($(ARCH), arm) - DEFINES += -DCONFIG_ARM - OBJS += $(OBJS_ARM_COMMON) - OBJS += arm/aarch32/arm-cpu.o - OBJS += arm/aarch32/kvm-cpu.o - OBJS += arm/aarch32/kvm.o - ARCH_INCLUDE := $(HDRS_ARM_COMMON) - ARCH_INCLUDE += -Iarm/aarch32/include - CFLAGS += -march=armv7-a - - ARCH_WANT_LIBFDT := y - ARCH_HAS_FLASH_MEM := y -endif - # ARM64 ifeq ($(ARCH), arm64) DEFINES += -DCONFIG_ARM64 - OBJS += $(OBJS_ARM_COMMON) + OBJS += arm/fdt.o + OBJS += arm/gic.o + OBJS += arm/gicv2m.o + OBJS += arm/ioport.o + OBJS += arm/kvm.o + OBJS += arm/kvm-cpu.o + OBJS += arm/pci.o + OBJS += arm/timer.o + OBJS += hw/serial.o OBJS += arm/aarch64/arm-cpu.o OBJS += arm/aarch64/kvm-cpu.o OBJS += arm/aarch64/kvm.o OBJS += arm/aarch64/pvtime.o OBJS += arm/aarch64/pmu.o - ARCH_INCLUDE := $(HDRS_ARM_COMMON) + ARCH_INCLUDE := arm/include ARCH_INCLUDE += -Iarm/aarch64/include ARCH_WANT_LIBFDT := y
arm/aarch32/arm-cpu.c deleted +0 -50
50 lines not on this page · raw message
arm/aarch32/include/asm/kernel.h deleted +0 -8
@@ -1,8 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ - -#ifndef __ASM_KERNEL_H -#define __ASM_KERNEL_H - -#define NR_CPUS 32 - -#endif /* __ASM_KERNEL_H */
arm/aarch32/include/asm/kvm.h deleted +0 -311
311 lines not on this page · raw message
arm/aarch32/include/kvm/barrier.h deleted +0 -10
@@ -1,10 +0,0 @@ -#ifndef KVM__KVM_BARRIER_H -#define KVM__KVM_BARRIER_H - -#define dmb () asm volatile ("dmb" : : : "memory") - -#define mb () dmb() -#define rmb () dmb() -#define wmb () dmb() - -#endif /* KVM__KVM_BARRIER_H */
arm/aarch32/include/kvm/fdt-arch.h deleted +0 -6
@@ -1,6 +0,0 @@ -#ifndef KVM__KVM_FDT_H -#define KVM__KVM_FDT_H - -#include "arm-common/fdt-arch.h" - -#endif /* KVM__KVM_FDT_H */
arm/aarch32/include/kvm/kvm-arch.h deleted +0 -18
@@ -1,18 +0,0 @@ -#ifndef KVM__KVM_ARCH_H -#define KVM__KVM_ARCH_H - -#include <linux/sizes.h> - -#define kvm__arch_get_kern_offset (...) 0x8000 -#define kvm__arch_get_kernel_size (...) 0 -#define kvm__arch_get_payload_region_size (...) SZ_256M - -struct kvm ; -static inline void kvm__arch_read_kernel_header (struct kvm *kvm,int fd) {} -static inline void kvm__arch_enable_mte (struct kvm *kvm) {} - -#define MAX_PAGE_SIZE SZ_4K - -#include "arm-common/kvm-arch.h" - -#endif /* KVM__KVM_ARCH_H */
arm/aarch32/include/kvm/kvm-config-arch.h deleted +0 -8
@@ -1,8 +0,0 @@ -#ifndef KVM__KVM_CONFIG_ARCH_H -#define KVM__KVM_CONFIG_ARCH_H - -#define ARM_OPT_ARCH_RUN (...) - -#include "arm-common/kvm-config-arch.h" - -#endif /* KVM__KVM_CONFIG_ARCH_H */
arm/aarch32/include/kvm/kvm-cpu-arch.h deleted +0 -24
@@ -1,24 +0,0 @@ -#ifndef KVM__KVM_CPU_ARCH_H -#define KVM__KVM_CPU_ARCH_H - -#include "kvm/kvm.h" - -#include "arm-common/kvm-cpu-arch.h" - -#define ARM_MPIDR_HWID_BITMASK 0xFFFFFF -#define ARM_CPU_ID 0, 0, 0 -#define ARM_CPU_ID_MPIDR 5 - -static inline void kvm_cpu__select_features (struct kvm *kvm, -struct kvm_vcpu_init *init) { } -static inline int kvm_cpu__configure_features (struct kvm_cpu *vcpu) -{ -return 0 ; -} - -static inline int kvm_cpu__teardown_pvtime (struct kvm *kvm) -{ -return 0 ; -} - -#endif /* KVM__KVM_CPU_ARCH_H */
arm/aarch32/kvm-cpu.c deleted +0 -132
132 lines not on this page · raw message
arm/aarch32/kvm.c deleted +0 -14
@@ -1,14 +0,0 @@ -#include "kvm/kvm.h" - -void kvm__arch_validate_cfg (struct kvm *kvm) -{ -if (kvm->cfg.ram_size >ARM_LOMAP_MAX_MEMORY ) { -die ("RAM size 0x%llx exceeds maximum allowed 0x%llx" , - kvm->cfg.ram_size,ARM_LOMAP_MAX_MEMORY ); - } -} - -u64 kvm__arch_default_ram_address (void ) -{ -return ARM_MEMORY_AREA ; -}
builtin-run.c +1 -1
@@ -182,7 +182,7 @@ static int loglevel_parser(const struct option *opt, const char *arg, int unset) " in megabytes (M)"#endif -#if defined(CONFIG_ARM ) || defined(CONFIG_ARM64 ) || defined(CONFIG_RISCV ) +#if defined(CONFIG_ARM64 ) || defined(CONFIG_RISCV )#define VIRTIO_TRANS_OPT_HELP_SHORT "[pci|pci-legacy|mmio|mmio-legacy]"#else #define VIRTIO_TRANS_OPT_HELP_SHORT "[pci|pci-legacy]"
hw/cfi_flash.c +1 -1
@@ -443,7 +443,7 @@ static void cfi_flash_write(struct cfi_flash_device *sfdev, u16 command,* If we are in ARRAY_READ mode, we can map the flash array directly * into the guest, just as read-only. This greatly improves read * performance, and avoids problems with exits due to accesses from -* load instructions without syndrome information (on ARM). +* load instructions without syndrome information (on arm64). * Also it could allow code to be executed XIP in there. */ static int map_flash_memory (struct kvm *kvm,struct cfi_flash_device *sfdev)
hw/rtc.c +1 -1
@@ -6,7 +6,7 @@#include <time.h> -#if defined(CONFIG_ARM ) || defined(CONFIG_ARM64 ) +#if defined(CONFIG_ARM64 )#define RTC_BUS_TYPE DEVICE_BUS_MMIO#define RTC_BASE_ADDRESS ARM_RTC_MMIO_BASE#elif defined(CONFIG_RISCV )
hw/serial.c +1 -1
@@ -13,7 +13,7 @@#include <pthread.h> -#if defined(CONFIG_ARM ) || defined(CONFIG_ARM64 ) +#if defined(CONFIG_ARM64 )#define serial_iobase (nr) (ARM_UART_MMIO_BASE + (nr) * 0x1000)#define serial_irq (nr) (32 + (nr))#define SERIAL8250_BUS_TYPE DEVICE_BUS_MMIO
virtio/core.c +1 -1
@@ -31,7 +31,7 @@ int virtio_transport_parser(const struct option *opt, const char *arg, int unset *type =VIRTIO_PCI ; }else if (!strcmp (arg,"pci-legacy" )) { *type =VIRTIO_PCI_LEGACY ; -#if defined(CONFIG_ARM ) || defined(CONFIG_ARM64 ) || defined(CONFIG_RISCV ) +#if defined(CONFIG_ARM64 ) || defined(CONFIG_RISCV ) } else if (!strcmp(arg, "mmio")) { *type =VIRTIO_MMIO ; }else if (!strcmp (arg,"mmio-legacy" )) {
Signature · 1 line
2.39.5
PATCH v2 2/9 arm64: Move arm64-only features into main directory
In reply to Oliver UptonStart the backing out the 32/64-bit split by moving arm64-only features up a level into the main arch directory.
---
Makefile | 6 +++---
arm/{aarch64 => }/arm-cpu.c | 0
arm/{aarch64 => }/pmu.c | 0
arm/{aarch64 => }/pvtime.c | 0
4 files changed, 3 insertions(+), 3 deletions(-)
rename arm/{aarch64 => }/arm-cpu.c (100%)
rename arm/{aarch64 => }/pmu.c (100%)
rename arm/{aarch64 => }/pvtime.c (100%)Makefile +3 -3
@@ -178,11 +178,11 @@ ifeq ($(ARCH), arm64) OBJS += arm/pci.o OBJS += arm/timer.o OBJS += hw/serial.o - OBJS += arm/aarch64/arm-cpu.o + OBJS += arm/arm-cpu.o OBJS += arm/aarch64/kvm-cpu.o OBJS += arm/aarch64/kvm.o - OBJS += arm/aarch64/pvtime.o - OBJS += arm/aarch64/pmu.o + OBJS += arm/pvtime.o + OBJS += arm/pmu.o ARCH_INCLUDE := arm/include ARCH_INCLUDE += -Iarm/aarch64/include
arm/arm-cpu.c renamed from arm/aarch64/arm-cpu.c +0 -0
arm/pmu.c renamed from arm/aarch64/pmu.c +0 -0
arm/pvtime.c renamed from arm/aarch64/pvtime.c +0 -0
Signature · 1 line
2.39.5
PATCH v2 3/9 arm64: Combine kvm.c
In reply to Oliver UptonGlue together the ARM common and previously arm64-specific bits into one source file.
---
Makefile | 1 -
arm/aarch64/include/kvm/kvm-arch.h | 22 ---
arm/aarch64/kvm.c | 212 ---------------------
arm/include/{arm-common => kvm}/kvm-arch.h | 6 +-
arm/kvm.c | 207 ++++++++++++++++++++
5 files changed, 212 insertions(+), 236 deletions(-)
delete mode 100644 arm/aarch64/include/kvm/kvm-arch.h
delete mode 100644 arm/aarch64/kvm.c
rename arm/include/{arm-common => kvm}/kvm-arch.h (97%)Makefile +0 -1
@@ -180,7 +180,6 @@ ifeq ($(ARCH), arm64) OBJS += hw/serial.o OBJS += arm/arm-cpu.o OBJS += arm/aarch64/kvm-cpu.o - OBJS += arm/aarch64/kvm.o OBJS += arm/pvtime.o OBJS += arm/pmu.o ARCH_INCLUDE := arm/include
arm/aarch64/include/kvm/kvm-arch.h deleted +0 -22
@@ -1,22 +0,0 @@ -#ifndef KVM__KVM_ARCH_H -#define KVM__KVM_ARCH_H - -#include <linux/sizes.h> - -struct kvm ; -void kvm__arch_read_kernel_header (struct kvm *kvm,int fd); -unsigned long long kvm__arch_get_kern_offset (struct kvm *kvm); -u64 kvm__arch_get_kernel_size (struct kvm *kvm); - -u64 kvm__arch_get_payload_region_size (struct kvm *kvm); - -int kvm__arch_get_ipa_limit (struct kvm *kvm); -void kvm__arch_enable_mte (struct kvm *kvm); - -#define MAX_PAGE_SIZE SZ_64K - -#define ARCH_HAS_CFG_RAM_ADDRESS 1 - -#include "arm-common/kvm-arch.h" - -#endif /* KVM__KVM_ARCH_H */
arm/aarch64/kvm.c deleted +0 -212
212 lines not on this page · raw message
arm/include/kvm/kvm-arch.h renamed from arm/include/arm-common/kvm-arch.h +5 -1
@@ -82,7 +82,11 @@#define VIRTIO_RING_ENDIAN (VIRTIO_ENDIAN_LE | VIRTIO_ENDIAN_BE) -#define ARCH_HAS_PCI_EXP 1 +#define ARCH_HAS_PCI_EXP 1 +#define ARCH_HAS_CFG_RAM_ADDRESS 1 + +#define MAX_PAGE_SIZE SZ_64K +static inline bool arm_addr_in_ioport_region (u64 phys_addr) {
arm/kvm.c +207 -0
232 lines not on this page · raw message
Signature · 1 line
2.39.5
PATCH v2 4/9 arm64: Merge kvm-cpu.c
In reply to Oliver UptonAs before, glue together the arm64 and ARM generic bits into one file.
---
Makefile | 1 -
arm/aarch64/include/kvm/kvm-cpu-arch.h | 19 -
arm/aarch64/kvm-cpu.c | 330 ------------------
.../{arm-common => kvm}/kvm-cpu-arch.h | 10 +-
arm/kvm-cpu.c | 328 +++++++++++++++++
5 files changed, 337 insertions(+), 351 deletions(-)
delete mode 100644 arm/aarch64/include/kvm/kvm-cpu-arch.h
delete mode 100644 arm/aarch64/kvm-cpu.c
rename arm/include/{arm-common => kvm}/kvm-cpu-arch.h (82%)Makefile +0 -1
@@ -179,7 +179,6 @@ ifeq ($(ARCH), arm64) OBJS += arm/timer.o OBJS += hw/serial.o OBJS += arm/arm-cpu.o - OBJS += arm/aarch64/kvm-cpu.o OBJS += arm/pvtime.o OBJS += arm/pmu.o ARCH_INCLUDE := arm/include
arm/aarch64/include/kvm/kvm-cpu-arch.h deleted +0 -19
@@ -1,19 +0,0 @@ -#ifndef KVM__KVM_CPU_ARCH_H -#define KVM__KVM_CPU_ARCH_H - -#include "kvm/kvm.h" - -#include "arm-common/kvm-cpu-arch.h" - -#define ARM_MPIDR_HWID_BITMASK 0xFF00FFFFFFUL -#define ARM_CPU_ID 3, 0, 0, 0 -#define ARM_CPU_ID_MPIDR 5 -#define ARM_CPU_CTRL 3, 0, 1, 0 -#define ARM_CPU_CTRL_SCTLR_EL1 0 - -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); -int kvm_cpu__teardown_pvtime (struct kvm *kvm); - -#endif /* KVM__KVM_CPU_ARCH_H */
arm/aarch64/kvm-cpu.c deleted +0 -330
330 lines not on this page · raw message
arm/include/kvm/kvm-cpu-arch.h renamed from arm/include/arm-common/kvm-cpu-arch.h +9 -1
@@ -1,11 +1,17 @@ #ifndef ARM_COMMON__KVM_CPU_ARCH_H #define ARM_COMMON__KVM_CPU_ARCH_H +#include "kvm/kvm.h" + #include <linux/kvm.h> #include <pthread.h> #include <stdbool.h> -struct kvm; +#define ARM_MPIDR_HWID_BITMASK 0xFF00FFFFFFUL +#define ARM_CPU_ID 3, 0, 0, 0 +#define ARM_CPU_ID_MPIDR 5 +#define ARM_CPU_CTRL 3, 0, 1, 0 +#define ARM_CPU_CTRL_SCTLR_EL1 0 struct kvm_cpu { pthread_t thread;
@@ -58,5 +64,7 @@ static inline bool kvm_cpu__emulate_mmio(struct kvm_cpu *vcpu, u64 phys_addr, }unsigned long kvm_cpu__get_vcpu_mpidr (struct kvm_cpu *vcpu); +int kvm_cpu__setup_pvtime (struct kvm_cpu *vcpu); +int kvm_cpu__teardown_pvtime (struct kvm *kvm);#endif /* ARM_COMMON__KVM_CPU_ARCH_H */
arm/kvm-cpu.c +328 -0
342 lines not on this page · raw message
Signature · 1 line
2.39.5
PATCH v2 5/9 arm64: Combine kvm-config-arch.h
In reply to Oliver UptonYou get the point...
---
arm/aarch64/include/kvm/kvm-config-arch.h | 29 -------------------
.../{arm-common => kvm}/kvm-config-arch.h | 24 +++++++++++++--
2 files changed, 22 insertions(+), 31 deletions(-)
delete mode 100644 arm/aarch64/include/kvm/kvm-config-arch.h
rename arm/include/{arm-common => kvm}/kvm-config-arch.h (54%)arm/aarch64/include/kvm/kvm-config-arch.h deleted +0 -29
@@ -1,29 +0,0 @@ -#ifndef KVM__KVM_CONFIG_ARCH_H -#define KVM__KVM_CONFIG_ARCH_H - -int vcpu_affinity_parser (const struct option *opt,const char *arg,int unset); -int sve_vl_parser (const struct option *opt,const char *arg,int unset); - -#define ARM_OPT_ARCH_RUN (cfg) \ - OPT_BOOLEAN('\0', "aarch32", &(cfg)->aarch32_guest, \ - "Run AArch32 guest"), \ - OPT_BOOLEAN('\0', "pmu", &(cfg)->has_pmuv3, \ - "Create PMUv3 device. The emulated PMU will be" \ - " set to the PMU associated with the" \ - " main thread, unless --vcpu-affinity is set"), \ - OPT_BOOLEAN('\0', "disable-mte", &(cfg)->mte_disabled, \ - "Disable Memory Tagging Extension"), \ - OPT_CALLBACK('\0', "vcpu-affinity", kvm, "cpulist", \ - "Specify the CPU affinity that will apply to " \ - "all VCPUs", vcpu_affinity_parser, kvm), \ - OPT_U64('\0', "kaslr-seed", &(cfg)->kaslr_seed, \ - "Specify random seed for Kernel Address Space " \ - "Layout Randomization (KASLR)"), \ - OPT_BOOLEAN('\0', "no-pvtime", &(cfg)->no_pvtime, "Disable" \ - " stolen time"), \ - OPT_CALLBACK('\0', "sve-max-vl", NULL, "vector length", \ - "Specify the max SVE vector length (in bits) for " \ - "all vCPUs", sve_vl_parser, kvm), -#include "arm-common/kvm-config-arch.h" - -#endif /* KVM__KVM_CONFIG_ARCH_H */
arm/include/kvm/kvm-config-arch.h renamed from arm/include/arm-common/kvm-config-arch.h +22 -2
@@ -18,17 +18,37 @@ struct kvm_config_arch { };int irqchip_parser (const struct option *opt,const char *arg,int unset); +int vcpu_affinity_parser (const struct option *opt,const char *arg,int unset); +int sve_vl_parser (const struct option *opt,const char *arg,int unset);#define OPT_ARCH_RUN (pfx, cfg) \ pfx, \ - ARM_OPT_ARCH_RUN(cfg) \ + OPT_BOOLEAN('\0', "aarch32", &(cfg)->aarch32_guest, \ + "Run AArch32 guest"), \ + OPT_BOOLEAN('\0', "pmu", &(cfg)->has_pmuv3, \ + "Create PMUv3 device. The emulated PMU will be" \ + " set to the PMU associated with the" \ + " main thread, unless --vcpu-affinity is set"), \ + OPT_BOOLEAN('\0', "disable-mte", &(cfg)->mte_disabled, \ + "Disable Memory Tagging Extension"), \ + OPT_CALLBACK('\0', "vcpu-affinity", kvm, "cpulist", \ + "Specify the CPU affinity that will apply to " \ + "all VCPUs", vcpu_affinity_parser, kvm), \ + OPT_U64('\0', "kaslr-seed", &(cfg)->kaslr_seed, \ + "Specify random seed for Kernel Address Space " \ + "Layout Randomization (KASLR)"), \ + OPT_BOOLEAN('\0', "no-pvtime", &(cfg)->no_pvtime, "Disable" \ + " stolen time"), \ + OPT_CALLBACK('\0', "sve-max-vl", NULL, "vector length", \ + "Specify the max SVE vector length (in bits) for " \ + "all vCPUs", sve_vl_parser, kvm), \ OPT_STRING('\0', "dump-dtb", &(cfg)->dump_dtb_filename, \ ".dtb file", "Dump generated .dtb to specified file"), \ OPT_UINTEGER('\0', "override-bad-firmware-cntfrq", &(cfg)->force_cntfrq,\ "Specify Generic Timer frequency in guest DT to " \ "work around buggy secure firmware *Firmware should be " \ "updated to program CNTFRQ correctly*"), \ - OPT_CALLBACK_NOOPT('\0', "force-pci", NULL, "", \ + OPT_CALLBACK_NOOPT('\0', "force-pci", NULL, "", \ "Force virtio devices to use PCI as their default " \ "transport (Deprecated: Use --virtio-transport " \ "option instead)", virtio_transport_parser, kvm), \
Signature · 1 line
2.39.5
PATCH v2 6/9 arm64: Move remaining kvm/* headers
In reply to Oliver UptonMove the remaining kvm/* headers into the top-level ARM include path.
---
arm/aarch64/include/kvm/fdt-arch.h | 6 ------
arm/{aarch64 => }/include/kvm/barrier.h | 0
arm/include/{arm-common => kvm}/fdt-arch.h | 0
3 files changed, 6 deletions(-)
delete mode 100644 arm/aarch64/include/kvm/fdt-arch.h
rename arm/{aarch64 => }/include/kvm/barrier.h (100%)
rename arm/include/{arm-common => kvm}/fdt-arch.h (100%)arm/aarch64/include/kvm/fdt-arch.h deleted +0 -6
@@ -1,6 +0,0 @@ -#ifndef KVM__KVM_FDT_H -#define KVM__KVM_FDT_H - -#include "arm-common/fdt-arch.h" - -#endif /* KVM__KVM_FDT_H */
arm/include/kvm/barrier.h renamed from arm/aarch64/include/kvm/barrier.h +0 -0
arm/include/kvm/fdt-arch.h renamed from arm/include/arm-common/fdt-arch.h +0 -0
Signature · 1 line
2.39.5
PATCH v2 7/9 arm64: Move asm headers
In reply to Oliver Upton---
Makefile | 1 -
arm/{aarch64 => }/include/asm/image.h | 0
arm/{aarch64 => }/include/asm/kernel.h | 0
arm/{aarch64 => }/include/asm/kvm.h | 0
arm/{aarch64 => }/include/asm/pmu.h | 0
arm/{aarch64 => }/include/asm/sve_context.h | 0
6 files changed, 1 deletion(-)
rename arm/{aarch64 => }/include/asm/image.h (100%)
rename arm/{aarch64 => }/include/asm/kernel.h (100%)
rename arm/{aarch64 => }/include/asm/kvm.h (100%)
rename arm/{aarch64 => }/include/asm/pmu.h (100%)
rename arm/{aarch64 => }/include/asm/sve_context.h (100%)Makefile +0 -1
@@ -182,7 +182,6 @@ ifeq ($(ARCH), arm64) OBJS += arm/pvtime.o OBJS += arm/pmu.o ARCH_INCLUDE := arm/include - ARCH_INCLUDE += -Iarm/aarch64/include ARCH_WANT_LIBFDT := y ARCH_HAS_FLASH_MEM := y
arm/include/asm/image.h renamed from arm/aarch64/include/asm/image.h +0 -0
arm/include/asm/kernel.h renamed from arm/aarch64/include/asm/kernel.h +0 -0
arm/include/asm/kvm.h renamed from arm/aarch64/include/asm/kvm.h +0 -0
arm/include/asm/pmu.h renamed from arm/aarch64/include/asm/pmu.h +0 -0
arm/include/asm/sve_context.h renamed from arm/aarch64/include/asm/sve_context.h +0 -0
Signature · 1 line
2.39.5
PATCH v2 8/9 arm64: Rename top-level directory
In reply to Oliver UptonAs a finishing touch, align the top-level arch directory name with the kernel's naming scheme.
---
Makefile | 24 ++++++++++----------
{arm => arm64}/arm-cpu.c | 0
{arm => arm64}/fdt.c | 0
{arm => arm64}/gic.c | 0
{arm => arm64}/gicv2m.c | 0
{arm => arm64}/include/arm-common/gic.h | 0
{arm => arm64}/include/arm-common/pci.h | 0
{arm => arm64}/include/arm-common/timer.h | 0
{arm => arm64}/include/asm/image.h | 0
{arm => arm64}/include/asm/kernel.h | 0
{arm => arm64}/include/asm/kvm.h | 0
{arm => arm64}/include/asm/pmu.h | 0
{arm => arm64}/include/asm/sve_context.h | 0
{arm => arm64}/include/kvm/barrier.h | 0
{arm => arm64}/include/kvm/fdt-arch.h | 0
{arm => arm64}/include/kvm/kvm-arch.h | 0
{arm => arm64}/include/kvm/kvm-config-arch.h | 0
{arm => arm64}/include/kvm/kvm-cpu-arch.h | 0
{arm => arm64}/ioport.c | 0
{arm => arm64}/kvm-cpu.c | 0
{arm => arm64}/kvm.c | 0
{arm => arm64}/pci.c | 0
{arm => arm64}/pmu.c | 0
{arm => arm64}/pvtime.c | 0
{arm => arm64}/timer.c | 0
25 files changed, 12 insertions(+), 12 deletions(-)
rename {arm => arm64}/arm-cpu.c (100%)
rename {arm => arm64}/fdt.c (100%)
rename {arm => arm64}/gic.c (100%)
rename {arm => arm64}/gicv2m.c (100%)
rename {arm => arm64}/include/arm-common/gic.h (100%)
rename {arm => arm64}/include/arm-common/pci.h (100%)
rename {arm => arm64}/include/arm-common/timer.h (100%)
rename {arm => arm64}/include/asm/image.h (100%)
rename {arm => arm64}/include/asm/kernel.h (100%)
rename {arm => arm64}/include/asm/kvm.h (100%)
rename {arm => arm64}/include/asm/pmu.h (100%)
rename {arm => arm64}/include/asm/sve_context.h (100%)
rename {arm => arm64}/include/kvm/barrier.h (100%)
rename {arm => arm64}/include/kvm/fdt-arch.h (100%)
rename {arm => arm64}/include/kvm/kvm-arch.h (100%)
rename {arm => arm64}/include/kvm/kvm-config-arch.h (100%)
rename {arm => arm64}/include/kvm/kvm-cpu-arch.h (100%)
rename {arm => arm64}/ioport.c (100%)
rename {arm => arm64}/kvm-cpu.c (100%)
rename {arm => arm64}/kvm.c (100%)
rename {arm => arm64}/pci.c (100%)
rename {arm => arm64}/pmu.c (100%)
rename {arm => arm64}/pvtime.c (100%)
rename {arm => arm64}/timer.c (100%)Makefile +12 -12
@@ -169,19 +169,19 @@ endif # ARM64 ifeq ($(ARCH), arm64) DEFINES += -DCONFIG_ARM64 - OBJS += arm/fdt.o - OBJS += arm/gic.o - OBJS += arm/gicv2m.o - OBJS += arm/ioport.o - OBJS += arm/kvm.o - OBJS += arm/kvm-cpu.o - OBJS += arm/pci.o - OBJS += arm/timer.o + OBJS += arm64/fdt.o + OBJS += arm64/gic.o + OBJS += arm64/gicv2m.o + OBJS += arm64/ioport.o + OBJS += arm64/kvm.o + OBJS += arm64/kvm-cpu.o + OBJS += arm64/pci.o + OBJS += arm64/timer.o OBJS += hw/serial.o - OBJS += arm/arm-cpu.o - OBJS += arm/pvtime.o - OBJS += arm/pmu.o - ARCH_INCLUDE := arm/include + OBJS += arm64/arm-cpu.o + OBJS += arm64/pvtime.o + OBJS += arm64/pmu.o + ARCH_INCLUDE := arm64/include ARCH_WANT_LIBFDT := y ARCH_HAS_FLASH_MEM := y
arm64/arm-cpu.c renamed from arm/arm-cpu.c +0 -0
arm64/fdt.c renamed from arm/fdt.c +0 -0
arm64/gic.c renamed from arm/gic.c +0 -0
arm64/gicv2m.c renamed from arm/gicv2m.c +0 -0
arm64/include/arm-common/gic.h renamed from arm/include/arm-common/gic.h +0 -0
arm64/include/arm-common/pci.h renamed from arm/include/arm-common/pci.h +0 -0
arm64/include/arm-common/timer.h renamed from arm/include/arm-common/timer.h +0 -0
arm64/include/asm/image.h renamed from arm/include/asm/image.h +0 -0
arm64/include/asm/kernel.h renamed from arm/include/asm/kernel.h +0 -0
arm64/include/asm/kvm.h renamed from arm/include/asm/kvm.h +0 -0
arm64/include/asm/pmu.h renamed from arm/include/asm/pmu.h +0 -0
arm64/include/asm/sve_context.h renamed from arm/include/asm/sve_context.h +0 -0
arm64/include/kvm/barrier.h renamed from arm/include/kvm/barrier.h +0 -0
arm64/include/kvm/fdt-arch.h renamed from arm/include/kvm/fdt-arch.h +0 -0
arm64/include/kvm/kvm-arch.h renamed from arm/include/kvm/kvm-arch.h +0 -0
arm64/include/kvm/kvm-config-arch.h renamed from arm/include/kvm/kvm-config-arch.h +0 -0
arm64/include/kvm/kvm-cpu-arch.h renamed from arm/include/kvm/kvm-cpu-arch.h +0 -0
arm64/ioport.c renamed from arm/ioport.c +0 -0
arm64/kvm-cpu.c renamed from arm/kvm-cpu.c +0 -0
arm64/kvm.c renamed from arm/kvm.c +0 -0
arm64/pci.c renamed from arm/pci.c +0 -0
arm64/pmu.c renamed from arm/pmu.c +0 -0
arm64/pvtime.c renamed from arm/pvtime.c +0 -0
arm64/timer.c renamed from arm/timer.c +0 -0
Signature · 1 line
2.39.5
PATCH v2 9/9 arm64: Get rid of the 'arm-common' include directory
In reply to Oliver Upton---
arm64/arm-cpu.c | 5 ++---
arm64/fdt.c | 5 ++---
arm64/gic.c | 3 +--
arm64/gicv2m.c | 3 +--
arm64/include/{arm-common => kvm}/gic.h | 0
arm64/include/kvm/kvm-arch.h | 2 +-
arm64/include/{arm-common/pci.h => kvm/pci-arch.h} | 0
arm64/include/{arm-common => kvm}/timer.h | 0
arm64/kvm.c | 3 +--
arm64/pci.c | 5 ++---
arm64/pmu.c | 3 +--
arm64/timer.c | 5 ++---
12 files changed, 13 insertions(+), 21 deletions(-)
rename arm64/include/{arm-common => kvm}/gic.h (100%)
rename arm64/include/{arm-common/pci.h => kvm/pci-arch.h} (100%)
rename arm64/include/{arm-common => kvm}/timer.h (100%)arm64/arm-cpu.c +2 -3
@@ -1,11 +1,10 @@#include "kvm/fdt.h" +#include "kvm/gic.h" #include "kvm/kvm.h" #include "kvm/kvm-cpu.h" +#include "kvm/timer.h" #include "kvm/util.h" -#include "arm-common/gic.h" -#include "arm-common/timer.h" -#include "asm/pmu.h" #include <linux/byteorder.h>
arm64/fdt.c +2 -3
@@ -1,12 +1,11 @@#include "kvm/devices.h" #include "kvm/fdt.h" +#include "kvm/gic.h" #include "kvm/kvm.h" #include "kvm/kvm-cpu.h" +#include "kvm/pci-arch.h" #include "kvm/virtio-mmio.h" -#include "arm-common/gic.h" -#include "arm-common/pci.h" -#include <stdbool.h> #include <linux/byteorder.h>
arm64/gic.c +1 -2
@@ -1,10 +1,9 @@#include "kvm/fdt.h" +#include "kvm/gic.h" #include "kvm/irq.h" #include "kvm/kvm.h" #include "kvm/virtio.h" -#include "arm-common/gic.h" -#include <linux/byteorder.h> #include <linux/kernel.h> #include <linux/kvm.h>
arm64/gicv2m.c +1 -2
@@ -2,11 +2,10 @@#include <stdlib.h> #include "kvm/irq.h" +#include "kvm/gic.h" #include "kvm/kvm.h" #include "kvm/util.h" -#include "arm-common/gic.h" -#define GICV2M_MSI_TYPER 0x008#define GICV2M_MSI_SETSPI 0x040#define GICV2M_MSI_IIDR 0xfcc
arm64/include/kvm/gic.h renamed from arm64/include/arm-common/gic.h +0 -0
arm64/include/kvm/kvm-arch.h +1 -1
@@ -10,7 +10,7 @@#include <linux/const.h> #include <linux/types.h> -#include "arm-common/gic.h" +#include "kvm/gic.h" /* * The memory map used for ARM guests (not to scale):
arm64/include/kvm/pci-arch.h renamed from arm64/include/arm-common/pci.h +0 -0
arm64/include/kvm/timer.h renamed from arm64/include/arm-common/timer.h +0 -0
arm64/kvm.c +1 -2
@@ -4,8 +4,7 @@#include "kvm/8250-serial.h" #include "kvm/virtio-console.h" #include "kvm/fdt.h" - -#include "arm-common/gic.h" +#include "kvm/gic.h" #include <linux/byteorder.h> #include <linux/cpumask.h>
arm64/pci.c +2 -3
@@ -1,13 +1,12 @@#include "kvm/devices.h" #include "kvm/fdt.h" +#include "kvm/gic.h" #include "kvm/kvm.h" #include "kvm/of_pci.h" #include "kvm/pci.h" +#include "kvm/pci-arch.h" #include "kvm/util.h" -#include "arm-common/pci.h" -#include "arm-common/gic.h" -/* * An entry in the interrupt-map table looks like: * <pci unit address> <pci interrupt pin> <gic phandle> <gic interrupt>
arm64/pmu.c +1 -2
@@ -5,12 +5,11 @@#include "linux/err.h" #include "kvm/fdt.h" +#include "kvm/gic.h" #include "kvm/kvm.h" #include "kvm/kvm-cpu.h" #include "kvm/util.h" -#include "arm-common/gic.h" -#include "asm/pmu.h" static bool pmu_has_attr (struct kvm_cpu *vcpu,u64 attr)
arm64/timer.c +2 -3
@@ -1,11 +1,10 @@#include "kvm/fdt.h" +#include "kvm/gic.h" #include "kvm/kvm.h" #include "kvm/kvm-cpu.h" +#include "kvm/timer.h" #include "kvm/util.h" -#include "arm-common/gic.h" -#include "arm-common/timer.h" -void timer__generate_fdt_nodes (void *fdt,struct kvm *kvm,int *irqs) {const char compatible[] ="arm,armv8-timer\0arm,armv7-timer" ;
Signature · 1 line
2.39.5
v4 cover KVM: arm64: Debug cleanups
In reply to Oliver UptonHopefully the last round.
v3 -> v4:
- Collect Tested-by from James (thanks!)
- Delete stray if condition (Marc)
- Write mdcr_el2 from kvm_arm_setup_mdcr_el2() on VHE
- Purge DBGxVR/DBGxCR accessors since it isn't nice to look at
Oliver Upton (19):
KVM: arm64: Drop MDSCR_EL1_DEBUG_MASK
KVM: arm64: Get rid of __kvm_get_mdcr_el2() and related warts
KVM: arm64: Track presence of SPE/TRBE in kvm_host_data instead of
vCPU
KVM: arm64: Move host SME/SVE tracking flags to host data
KVM: arm64: Write MDCR_EL2 directly from kvm_arm_setup_mdcr_el2()
KVM: arm64: Evaluate debug owner at vcpu_load()
KVM: arm64: Clean up KVM_SET_GUEST_DEBUG handler
KVM: arm64: Select debug state to save/restore based on debug owner
KVM: arm64: Remove debug tracepoints
KVM: arm64: Remove vestiges of debug_ptr
KVM: arm64: Use debug_owner to track if debug regs need save/restore
KVM: arm64: Reload vCPU for accesses to OSLAR_EL1
KVM: arm64: Compute MDCR_EL2 at vcpu_load()
KVM: arm64: Don't hijack guest context MDSCR_EL1
KVM: arm64: Manage software step state at load/put
KVM: arm64: nv: Honor MDCR_EL2.TDE routing for debug exceptions
KVM: arm64: Avoid reading ID_AA64DFR0_EL1 for debug save/restore
KVM: arm64: Fold DBGxVR/DBGxCR accessors into common set
KVM: arm64: Promote guest ownership for DBGxVR/DBGxCR reads
arch/arm64/include/asm/kvm_asm.h | 5 +- arch/arm64/include/asm/kvm_host.h | 94 ++--- arch/arm64/include/asm/kvm_nested.h | 1 + arch/arm64/kvm/arm.c | 14 +- arch/arm64/kvm/debug.c | 384 +++++++-------------- arch/arm64/kvm/emulate-nested.c | 23 +- arch/arm64/kvm/fpsimd.c | 12 +- arch/arm64/kvm/guest.c | 31 +- arch/arm64/kvm/handle_exit.c | 5 +- arch/arm64/kvm/hyp/include/hyp/debug-sr.h | 42 ++- arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h | 43 ++- arch/arm64/kvm/hyp/nvhe/debug-sr.c | 13 +- arch/arm64/kvm/hyp/nvhe/hyp-main.c | 8 - arch/arm64/kvm/hyp/vhe/debug-sr.c | 5 - arch/arm64/kvm/sys_regs.c | 245 ++++--------- arch/arm64/kvm/trace_handle_exit.h | 75 ---- 16 files changed, 353 insertions(+), 647 deletions(-)
base-commit: 78d4f34e2115b517bcbfe7ec0d018bbbb6f9b0b8
Signature · 1 line
2.39.5
Re: [PATCH v4 00/19] KVM: arm64: Debug cleanups
Oops, forgot to clean out directory where I stage patches.
Thanks,
Oliver
Quoted 53 lines · Oliver Upton
Hopefully the last round.
v3 -> v4:
- Collect Tested-by from James (thanks!)
- Delete stray if condition (Marc)
- Writemdcr_el2fromkvm_arm_setup_mdcr_el2()on VHE
- Purge DBGxVR/DBGxCR accessors since it isn't nice to look atOliver Upton (19):
KVM: arm64: DropMDSCR_EL1_DEBUG_MASK
KVM: arm64: Get rid of__kvm_get_mdcr_el2()and related warts
KVM: arm64: Track presence of SPE/TRBE inkvm_host_datainstead of
vCPU
KVM: arm64: Move host SME/SVE tracking flags to host data
KVM: arm64: WriteMDCR_EL2directly fromkvm_arm_setup_mdcr_el2()
KVM: arm64: Evaluate debug owner atvcpu_load()
KVM: arm64: Clean upKVM_SET_GUEST_DEBUGhandler
KVM: arm64: Select debug state to save/restore based on debug owner
KVM: arm64: Remove debug tracepoints
KVM: arm64: Remove vestiges ofdebug_ptr
KVM: arm64: Usedebug_ownerto track if debug regs need save/restore
KVM: arm64: Reload vCPU for accesses toOSLAR_EL1
KVM: arm64: ComputeMDCR_EL2atvcpu_load()
KVM: arm64: Don't hijack guest contextMDSCR_EL1
KVM: arm64: Manage software step state at load/put
KVM: arm64: nv: Honor MDCR_EL2.TDE routing for debug exceptions
KVM: arm64: Avoid readingID_AA64DFR0_EL1for debug save/restore
KVM: arm64: Fold DBGxVR/DBGxCR accessors into common set
KVM: arm64: Promote guest ownership for DBGxVR/DBGxCR readsarch/arm64/include/asm/kvm_asm.h | 5 +- arch/arm64/include/asm/kvm_host.h | 94 ++--- arch/arm64/include/asm/kvm_nested.h | 1 + arch/arm64/kvm/arm.c | 14 +- arch/arm64/kvm/debug.c | 384 +++++++-------------- arch/arm64/kvm/emulate-nested.c | 23 +- arch/arm64/kvm/fpsimd.c | 12 +- arch/arm64/kvm/guest.c | 31 +- arch/arm64/kvm/handle_exit.c | 5 +- arch/arm64/kvm/hyp/include/hyp/debug-sr.h | 42 ++- arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h | 43 ++- arch/arm64/kvm/hyp/nvhe/debug-sr.c | 13 +- arch/arm64/kvm/hyp/nvhe/hyp-main.c | 8 - arch/arm64/kvm/hyp/vhe/debug-sr.c | 5 - arch/arm64/kvm/sys_regs.c | 245 ++++--------- arch/arm64/kvm/trace_handle_exit.h | 75 ---- 16 files changed, 353 insertions(+), 647 deletions(-)base-commit:
78d4f34e2115b517bcbfe7ec0d018bbbb6f9b0b8Signature · 1 line
2.39.5
Will Deacon
AppliedQuoted 16 lines · Oliver Upton
v1: https://lore.kernel.org/kvmarm/[email protected]/
v1 -> v2:
- Move headers under arm64/include/kvm similar to other arches (Alex)Oliver Upton (9):
Drop support for 32-bit arm
arm64: Move arm64-only features into main directory
arm64: Combinekvm.c
arm64: Mergekvm-cpu.c
arm64: Combinekvm-config-arch.h
arm64: Move remaining kvm/* headers
arm64: Move asm headers
arm64: Rename top-level directory
arm64: Get rid of the 'arm-common' include directory
Quoted 1 line
[...]
Applied to kvmtool (master), thanks!
[1/9] Drop support for 32-bit arm
https://git.kernel.org/will/kvmtool/c/329fe56944fc [2/9] arm64: Move arm64-only features into main directory https://git.kernel.org/will/kvmtool/c/518857543a4b [3/9] arm64: Combine kvm.c https://git.kernel.org/will/kvmtool/c/14e8c4204d11 [4/9] arm64: Merge kvm-cpu.c https://git.kernel.org/will/kvmtool/c/65878da23508 [5/9] arm64: Combine kvm-config-arch.h https://git.kernel.org/will/kvmtool/c/71135783886f [6/9] arm64: Move remaining kvm/* headers https://git.kernel.org/will/kvmtool/c/f8a539a99ef5 [7/9] arm64: Move asm headers https://git.kernel.org/will/kvmtool/c/4cd7b87ab292 [8/9] arm64: Rename top-level directory https://git.kernel.org/will/kvmtool/c/0a10c482b403 [9/9] arm64: Get rid of the 'arm-common' include directory https://git.kernel.org/will/kvmtool/c/d410d9a16f91
Cheers,
Signature · 5 lines
Will https://fixes.arm64.dev https://next.arm64.dev https://will.arm64.dev