KVM/arm updates for Linux 5.7
Subsystems (8)
Marc Zyngier
maintainerPaolo,
Here's the main set of KVM/arm updates for Linux 5.7. Two items on the menu this time:
- Support for GICv4.1, which allows for the direct injection of more interrupt classes than GICv4.0, and a much more sensible set of interactions with the hypervisor.
- Removal of the 32bit host support. It has been a fun ride, but with a general lack of interest as well as the 32bit Linux/ARM port being in "odd fixes" mode, there is little point in pretending that we care (100% of the activity is in the arm64 camp). This will, over time, result in cleaner code (less pointless abstractions) and be easier for arm64 to gain new features.
Please note that pulling from this tag will drag the GICv4.1 dependencies, as they are part a shared branch between the irqchip and kvmarm trees. These patches are already in Linus' tree as of this morning.
Please pull,
M.
The following changes since commit 009384b38034111bf2c0c7bfb2740f5bd45c176c:
irqchip/gic-v4.1: Eagerly vmap vPEs (2020-03-24 12:15:51 +0000)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvmarm-5.7
for you to fetch changes up to 463050599742a89e0508355e626e032e8d0dab8d:
Merge tag 'kvm-arm-removal' into kvmarm-master/next (2020-03-24 17:43:53 +0000)
----------------------------------------------------------------
KVM/arm updates for Linux 5.7
- GICv4.1 support
- 32bit host removal
----------------------------------------------------------------
KarimAllah Ahmed (1):
KVM: arm64: Use the correct timer structure to access the physical counter
Marc Zyngier (16):
arm: Unplug KVM from the build system
arm: Remove KVM from config files
arm: Remove 32bit KVM host support
arm: Remove HYP/Stage-2 page-table support
arm: Remove GICv3 vgic compatibility macros
arm: Remove the ability to set HYP vectors outside of the decompressor
MAINTAINERS: RIP KVM/arm
KVM: arm64: GICv4.1: Let doorbells be auto-enabled
KVM: arm64: GICv4.1: Add direct injection capability to SGI registers
KVM: arm64: GICv4.1: Allow SGIs to switch between HW and SW interrupts
KVM: arm64: GICv4.1: Plumb SGI implementation selection in the distributor
KVM: arm64: GICv4.1: Reload VLPI configuration on distributor enable/disable
KVM: arm64: GICv4.1: Allow non-trapping WFI when using HW SGIs
KVM: arm64: GICv4.1: Expose HW-based SGIs in debugfs
Merge branch 'kvm-arm64/gic-v4.1' into kvmarm-master/next
Merge tag 'kvm-arm-removal' into kvmarm-master/next
Documentation/virt/kvm/arm/hyp-abi.rst | 5 + MAINTAINERS | 5 +- arch/arm/Kconfig | 2 - arch/arm/Makefile | 1 - arch/arm/configs/axm55xx_defconfig | 2 - arch/arm/include/asm/arch_gicv3.h | 114 --- arch/arm/include/asm/kvm_arm.h | 239 ------ arch/arm/include/asm/kvm_asm.h | 77 -- arch/arm/include/asm/kvm_coproc.h | 36 - arch/arm/include/asm/kvm_emulate.h | 372 -------- arch/arm/include/asm/kvm_host.h | 456 ---------- arch/arm/include/asm/kvm_hyp.h | 127 --- arch/arm/include/asm/kvm_mmu.h | 435 ---------- arch/arm/include/asm/kvm_ras.h | 14 - arch/arm/include/asm/pgtable-3level.h | 20 - arch/arm/include/asm/pgtable.h | 9 - arch/arm/include/asm/sections.h | 6 +- arch/arm/include/asm/stage2_pgtable.h | 75 -- arch/arm/include/asm/virt.h | 17 - arch/arm/include/uapi/asm/kvm.h | 314 ------- arch/arm/kernel/asm-offsets.c | 11 - arch/arm/kernel/hyp-stub.S | 39 +- arch/arm/kernel/vmlinux-xip.lds.S | 8 - arch/arm/kernel/vmlinux.lds.S | 8 - arch/arm/kernel/vmlinux.lds.h | 10 - arch/arm/kvm/Kconfig | 59 -- arch/arm/kvm/Makefile | 43 - arch/arm/kvm/coproc.c | 1455 -------------------------------- arch/arm/kvm/coproc.h | 130 --- arch/arm/kvm/coproc_a15.c | 39 - arch/arm/kvm/coproc_a7.c | 42 - arch/arm/kvm/emulate.c | 166 ---- arch/arm/kvm/guest.c | 387 --------- arch/arm/kvm/handle_exit.c | 175 ---- arch/arm/kvm/hyp/Makefile | 34 - arch/arm/kvm/hyp/banked-sr.c | 70 -- arch/arm/kvm/hyp/cp15-sr.c | 72 -- arch/arm/kvm/hyp/entry.S | 121 --- arch/arm/kvm/hyp/hyp-entry.S | 295 ------- arch/arm/kvm/hyp/s2-setup.c | 22 - arch/arm/kvm/hyp/switch.c | 242 ------ arch/arm/kvm/hyp/tlb.c | 68 -- arch/arm/kvm/hyp/vfp.S | 57 -- arch/arm/kvm/init.S | 157 ---- arch/arm/kvm/interrupts.S | 36 - arch/arm/kvm/irq.h | 16 - arch/arm/kvm/reset.c | 86 -- arch/arm/kvm/trace.h | 86 -- arch/arm/kvm/vgic-v3-coproc.c | 27 - arch/arm/mach-exynos/Kconfig | 2 +- arch/arm/mm/mmu.c | 26 - arch/arm64/include/asm/kvm_emulate.h | 3 +- arch/arm64/include/asm/kvm_host.h | 1 + include/kvm/arm_vgic.h | 3 + virt/kvm/arm/arch_timer.c | 2 +- virt/kvm/arm/arm.c | 8 + virt/kvm/arm/vgic/vgic-debug.c | 14 +- virt/kvm/arm/vgic/vgic-mmio-v3.c | 81 +- virt/kvm/arm/vgic/vgic-mmio.c | 88 +- virt/kvm/arm/vgic/vgic-v3.c | 2 + virt/kvm/arm/vgic/vgic-v4.c | 107 ++- virt/kvm/arm/vgic/vgic.h | 1 + 62 files changed, 311 insertions(+), 6314 deletions(-) delete mode 100644 arch/arm/include/asm/kvm_arm.h delete mode 100644 arch/arm/include/asm/kvm_asm.h delete mode 100644 arch/arm/include/asm/kvm_coproc.h delete mode 100644 arch/arm/include/asm/kvm_emulate.h delete mode 100644 arch/arm/include/asm/kvm_host.h delete mode 100644 arch/arm/include/asm/kvm_hyp.h delete mode 100644 arch/arm/include/asm/kvm_mmu.h delete mode 100644 arch/arm/include/asm/kvm_ras.h delete mode 100644 arch/arm/include/asm/stage2_pgtable.h delete mode 100644 arch/arm/include/uapi/asm/kvm.h delete mode 100644 arch/arm/kvm/Kconfig delete mode 100644 arch/arm/kvm/Makefile delete mode 100644 arch/arm/kvm/coproc.c delete mode 100644 arch/arm/kvm/coproc.h delete mode 100644 arch/arm/kvm/coproc_a15.c delete mode 100644 arch/arm/kvm/coproc_a7.c delete mode 100644 arch/arm/kvm/emulate.c delete mode 100644 arch/arm/kvm/guest.c delete mode 100644 arch/arm/kvm/handle_exit.c delete mode 100644 arch/arm/kvm/hyp/Makefile delete mode 100644 arch/arm/kvm/hyp/banked-sr.c delete mode 100644 arch/arm/kvm/hyp/cp15-sr.c delete mode 100644 arch/arm/kvm/hyp/entry.S delete mode 100644 arch/arm/kvm/hyp/hyp-entry.S delete mode 100644 arch/arm/kvm/hyp/s2-setup.c delete mode 100644 arch/arm/kvm/hyp/switch.c delete mode 100644 arch/arm/kvm/hyp/tlb.c delete mode 100644 arch/arm/kvm/hyp/vfp.S delete mode 100644 arch/arm/kvm/init.S delete mode 100644 arch/arm/kvm/interrupts.S delete mode 100644 arch/arm/kvm/irq.h delete mode 100644 arch/arm/kvm/reset.c delete mode 100644 arch/arm/kvm/trace.h delete mode 100644 arch/arm/kvm/vgic-v3-coproc.c
Marc Zyngier
maintainerPATCH 1/15 KVM: arm64: Use the correct timer structure to access the physical counter
From: KarimAllah Ahmed <[email protected]>
Use the physical timer structure when reading the physical counter instead of using the virtual timer structure. Thankfully, nothing is accessing this code path yet (at least not until we enable save/restore of the physical counter). It doesn't hurt for this to be correct though.
--- virt/kvm/arm/arch_timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
virt/kvm/arm/arch_timer.c +1 -1
@@ -788,7 +788,7 @@ u64 kvm_arm_timer_get_reg(struct kvm_vcpu *vcpu, u64 regid) vcpu_ptimer(vcpu), TIMER_REG_CTL);case KVM_REG_ARM_PTIMER_CNT :return kvm_arm_timer_read (vcpu, -vcpu_vtimer (vcpu),TIMER_REG_CNT ); +vcpu_ptimer (vcpu),TIMER_REG_CNT );case KVM_REG_ARM_PTIMER_CVAL :return kvm_arm_timer_read (vcpu,vcpu_ptimer (vcpu),TIMER_REG_CVAL );
Signature · 1 line
2.25.0
Marc Zyngier
maintainerPATCH 2/15 arm: Unplug KVM from the build system
In reply to Marc ZyngierAs we're about to drop KVM/arm on the floor, carefully unplug it from the build system.
--- arch/arm/Kconfig | 2 -- arch/arm/Makefile | 1 - arch/arm/mach-exynos/Kconfig | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-)
arch/arm/Kconfig +0 -2
@@ -2091,5 +2091,3 @@ source "drivers/firmware/Kconfig" if CRYPTO source "arch/arm/crypto/Kconfig" endif - -source "arch/arm/kvm/Kconfig"
arch/arm/Makefile +0 -1
@@ -278,7 +278,6 @@ core-$(CONFIG_FPE_NWFPE) += arch/arm/nwfpe/ core-$(CONFIG_FPE_FASTFPE) += $(patsubst $(srctree)/%,%,$(wildcard $(srctree)/arch/arm/fastfpe/)) core-$(CONFIG_VFP) += arch/arm/vfp/ core-$(CONFIG_XEN) += arch/arm/xen/ -core-$(CONFIG_KVM_ARM_HOST) += arch/arm/kvm/ core-$(CONFIG_VDSO) += arch/arm/vdso/ # If we have a machine-specific directory, then include it in the build.
arch/arm/mach-exynos/Kconfig +1 -1
@@ -21,7 +21,7 @@ menuconfig ARCH_EXYNOS select EXYNOS_SROM select EXYNOS_PM_DOMAINS if PM_GENERIC_DOMAINS select GPIOLIB - select HAVE_ARM_ARCH_TIMER if ARCH_EXYNOS5 && VIRTUALIZATION + select HAVE_ARM_ARCH_TIMER if ARCH_EXYNOS5 select HAVE_ARM_SCU if SMP select HAVE_S3C2410_I2C if I2C select HAVE_S3C2410_WATCHDOG if WATCHDOG
Signature · 1 line
2.25.0
Marc Zyngier
maintainerPATCH 3/15 arm: Remove KVM from config files
In reply to Marc ZyngierOnly one platform is building KVM by default. How crazy! Remove it whilst nobody is watching.
--- arch/arm/configs/axm55xx_defconfig | 2 -- 1 file changed, 2 deletions(-)
arch/arm/configs/axm55xx_defconfig +0 -2
@@ -236,5 +236,3 @@ CONFIG_CRYPTO_GCM=y CONFIG_CRYPTO_XCBC=y CONFIG_CRYPTO_SHA256=y # CONFIG_CRYPTO_ANSI_CPRNG is not set -CONFIG_VIRTUALIZATION=y -CONFIG_KVM=y
Signature · 1 line
2.25.0
Marc Zyngier
maintainerPATCH 5/15 arm: Remove HYP/Stage-2 page-table support
In reply to Marc ZyngierRemove all traces of Stage-2 and HYP page table support.
--- arch/arm/include/asm/pgtable-3level.h | 20 -------------------- arch/arm/include/asm/pgtable.h | 9 --------- arch/arm/include/asm/sections.h | 6 +----- arch/arm/include/asm/virt.h | 7 ------- arch/arm/kernel/vmlinux-xip.lds.S | 8 -------- arch/arm/kernel/vmlinux.lds.S | 8 -------- arch/arm/kernel/vmlinux.lds.h | 10 ---------- arch/arm/mm/mmu.c | 26 -------------------------- 8 files changed, 1 insertion(+), 93 deletions(-)
arch/arm/include/asm/pgtable-3level.h +0 -20
@@ -104,26 +104,6 @@*/ #define L_PGD_SWAPPER (_AT(pgdval_t, 1) << 55)/* swapper_pg_dir entry */ -/* -* 2nd stage PTE definitions for LPAE. -*/ -#define L_PTE_S2_MT_UNCACHED (_AT(pteval_t, 0x0) << 2)/* strongly ordered */ -#define L_PTE_S2_MT_WRITETHROUGH (_AT(pteval_t, 0xa) << 2)/* normal inner write-through */ -#define L_PTE_S2_MT_WRITEBACK (_AT(pteval_t, 0xf) << 2)/* normal inner write-back */ -#define L_PTE_S2_MT_DEV_SHARED (_AT(pteval_t, 0x1) << 2)/* device */ -#define L_PTE_S2_MT_MASK (_AT(pteval_t, 0xf) << 2) - -#define L_PTE_S2_RDONLY (_AT(pteval_t, 1) << 6)/* HAP[1] */ -#define L_PTE_S2_RDWR (_AT(pteval_t, 3) << 6)/* HAP[2:1] */ - -#define L_PMD_S2_RDONLY (_AT(pmdval_t, 1) << 6)/* HAP[1] */ -#define L_PMD_S2_RDWR (_AT(pmdval_t, 3) << 6)/* HAP[2:1] */ - -/* -* Hyp-mode PL2 PTE definitions for LPAE. -*/ -#define L_PTE_HYP L_PTE_USER -#ifndef __ASSEMBLY__#define pud_none (pud) (!pud_val(pud))
arch/arm/include/asm/pgtable.h +0 -9
@@ -80,9 +80,6 @@ extern void __pgd_error(const char *file, int line, pgd_t);extern pgprot_t pgprot_user;extern pgprot_t pgprot_kernel; -extern pgprot_t pgprot_hyp_device; -extern pgprot_t pgprot_s2; -extern pgprot_t pgprot_s2_device;#define _MOD_PROT (p, b) __pgprot(pgprot_val(p) | (b))
@@ -95,12 +92,6 @@ extern pgprot_t pgprot_s2_device;#define PAGE_READONLY_EXEC _MOD_PROT(pgprot_user, L_PTE_USER | L_PTE_RDONLY)#define PAGE_KERNEL _MOD_PROT(pgprot_kernel, L_PTE_XN)#define PAGE_KERNEL_EXEC pgprot_kernel -#define PAGE_HYP _MOD_PROT(pgprot_kernel, L_PTE_HYP | L_PTE_XN) -#define PAGE_HYP_EXEC _MOD_PROT(pgprot_kernel, L_PTE_HYP | L_PTE_RDONLY) -#define PAGE_HYP_RO _MOD_PROT(pgprot_kernel, L_PTE_HYP | L_PTE_RDONLY | L_PTE_XN) -#define PAGE_HYP_DEVICE _MOD_PROT(pgprot_hyp_device, L_PTE_HYP) -#define PAGE_S2 _MOD_PROT(pgprot_s2, L_PTE_S2_RDONLY | L_PTE_XN) -#define PAGE_S2_DEVICE _MOD_PROT(pgprot_s2_device, L_PTE_S2_RDONLY | L_PTE_XN)#define __PAGE_NONE __pgprot(_L_PTE_DEFAULT | L_PTE_RDONLY | L_PTE_XN | L_PTE_NONE)#define __PAGE_SHARED __pgprot(_L_PTE_DEFAULT | L_PTE_USER | L_PTE_XN)
arch/arm/include/asm/sections.h +1 -5
@@ -10,8 +10,6 @@ extern char __idmap_text_start[];extern char __idmap_text_end[];extern char __entry_text_start[];extern char __entry_text_end[]; -extern char __hyp_idmap_text_start[]; -extern char __hyp_idmap_text_end[];static inline bool in_entry_text (unsigned long addr) {
@@ -22,9 +20,7 @@ static inline bool in_entry_text(unsigned long addr)static inline bool in_idmap_text (unsigned long addr) {void *a = (void *)addr; -return memory_contains (__idmap_text_start, __idmap_text_end, a,1 ) || -memory_contains (__hyp_idmap_text_start, __hyp_idmap_text_end, - a,1 ); +return memory_contains (__idmap_text_start, __idmap_text_end, a,1 ); }#endif /* _ASM_ARM_SECTIONS_H */
arch/arm/include/asm/virt.h +0 -7
@@ -67,13 +67,6 @@ static inline bool is_kernel_in_hyp_mode(void) return false; } -/* The section containing the hypervisor idmap text */ -extern char __hyp_idmap_text_start[]; -extern char __hyp_idmap_text_end[]; - -/* The section containing the hypervisor text */ -extern char __hyp_text_start[]; -extern char __hyp_text_end[];#endif #else
arch/arm/kernel/vmlinux-xip.lds.S +0 -8
@@ -162,14 +162,6 @@ SECTIONS ASSERT((__proc_info_end - __proc_info_begin), "missing CPU support") ASSERT((__arch_info_end - __arch_info_begin), "no machine record defined") -/* - * The HYP init code can't be more than a page long, - * and should not cross a page boundary. - * The above comment applies as well. - */ -ASSERT(__hyp_idmap_text_end - (__hyp_idmap_text_start & PAGE_MASK) <= PAGE_SIZE, - "HYP init code too big or misaligned") - #ifdef CONFIG_XIP_DEFLATED_DATA /* * The .bss is used as a stack area for __inflate_kernel_data() whose stack
arch/arm/kernel/vmlinux.lds.S +0 -8
@@ -170,12 +170,4 @@ __start_rodata_section_aligned = ALIGN(__start_rodata, 1 << SECTION_SHIFT); ASSERT((__proc_info_end - __proc_info_begin), "missing CPU support") ASSERT((__arch_info_end - __arch_info_begin), "no machine record defined") -/* - * The HYP init code can't be more than a page long, - * and should not cross a page boundary. - * The above comment applies as well. - */ -ASSERT(__hyp_idmap_text_end - (__hyp_idmap_text_start & PAGE_MASK) <= PAGE_SIZE, - "HYP init code too big or misaligned") - #endif /* CONFIG_XIP_KERNEL */
arch/arm/kernel/vmlinux.lds.h +0 -10
@@ -31,20 +31,11 @@ *(.proc.info.init) \ __proc_info_end = .; -#define HYPERVISOR_TEXT \ - __hyp_text_start = .; \ - *(.hyp.text) \ - __hyp_text_end = .; -#define IDMAP_TEXT \ ALIGN_FUNCTION(); \ __idmap_text_start = .; \ *(.idmap.text) \ __idmap_text_end = .; \ - . = ALIGN(PAGE_SIZE); \ - __hyp_idmap_text_start = .; \ - *(.hyp.idmap.text) \ - __hyp_idmap_text_end = .;#define ARM_DISCARD \ *(.ARM.exidx.exit.text) \
@@ -72,7 +63,6 @@SCHED_TEXT \ CPUIDLE_TEXT \LOCK_TEXT \ - HYPERVISOR_TEXT \ KPROBES_TEXT \ *(.gnu.warning) \ *(.glue_7) \
arch/arm/mm/mmu.c +0 -26
@@ -63,9 +63,6 @@ static unsigned int cachepolicy __initdata = CPOLICY_WRITEBACK;static unsigned int ecc_mask__initdata =0 ;pgprot_t pgprot_user;pgprot_t pgprot_kernel; -pgprot_t pgprot_hyp_device; -pgprot_t pgprot_s2; -pgprot_t pgprot_s2_device;EXPORT_SYMBOL (pgprot_user);EXPORT_SYMBOL (pgprot_kernel);
@@ -75,15 +72,8 @@ struct cachepolicy {unsigned int cr_mask;pmdval_t pmd;pteval_t pte; -pteval_t pte_s2; }; -#ifdef CONFIG_ARM_LPAE -#define s2_policy (policy) policy -#else -#define s2_policy (policy) 0 -#endif -unsigned long kimage_voffset__ro_after_init ;static struct cachepolicy cache_policies[]__initdata = {
@@ -92,31 +82,26 @@ static struct cachepolicy cache_policies[] __initdata = { .cr_mask = CR_W|CR_C, .pmd = PMD_SECT_UNCACHED, .pte = L_PTE_MT_UNCACHED, - .pte_s2 = s2_policy(L_PTE_S2_MT_UNCACHED), }, { .policy = "buffered", .cr_mask = CR_C, .pmd = PMD_SECT_BUFFERED, .pte = L_PTE_MT_BUFFERABLE, - .pte_s2 = s2_policy(L_PTE_S2_MT_UNCACHED), }, { .policy = "writethrough", .cr_mask = 0, .pmd = PMD_SECT_WT, .pte = L_PTE_MT_WRITETHROUGH, - .pte_s2 = s2_policy(L_PTE_S2_MT_WRITETHROUGH), }, { .policy = "writeback", .cr_mask = 0, .pmd = PMD_SECT_WB, .pte = L_PTE_MT_WRITEBACK, - .pte_s2 = s2_policy(L_PTE_S2_MT_WRITEBACK), }, { .policy = "writealloc", .cr_mask = 0, .pmd = PMD_SECT_WBWA, .pte = L_PTE_MT_WRITEALLOC, - .pte_s2 = s2_policy(L_PTE_S2_MT_WRITEBACK), } };
@@ -246,9 +231,6 @@ static struct mem_type mem_types[] __ro_after_init = { [MT_DEVICE] = { /* Strongly ordered / ARMv6 shared device */ .prot_pte =PROT_PTE_DEVICE |L_PTE_MT_DEV_SHARED | L_PTE_SHARED, - .prot_pte_s2 =s2_policy (PROT_PTE_S2_DEVICE ) | -s2_policy (L_PTE_S2_MT_DEV_SHARED ) | - L_PTE_SHARED, .prot_l1 = PMD_TYPE_TABLE, .prot_sect = PROT_SECT_DEVICE | PMD_SECT_S, .domain = DOMAIN_IO,
@@ -434,7 +416,6 @@ static void __init build_mem_type_table(void)struct cachepolicy *cp;unsigned int cr =get_cr ();pteval_t user_pgprot, kern_pgprot, vecs_pgprot; -pteval_t hyp_device_pgprot, s2_pgprot, s2_device_pgprot;int cpu_arch =cpu_architecture ();int i;
@@ -558,9 +539,6 @@ static void __init build_mem_type_table(void)*/ cp = &cache_policies[cachepolicy]; vecs_pgprot = kern_pgprot = user_pgprot = cp->pte; - s2_pgprot = cp->pte_s2; - hyp_device_pgprot = mem_types[MT_DEVICE ].prot_pte; - s2_device_pgprot = mem_types[MT_DEVICE ].prot_pte_s2;#ifndef CONFIG_ARM_LPAE /*
@@ -604,7 +582,6 @@ static void __init build_mem_type_table(void) user_pgprot |=L_PTE_SHARED ; kern_pgprot |=L_PTE_SHARED ; vecs_pgprot |=L_PTE_SHARED ; - s2_pgprot |=L_PTE_SHARED ; mem_types[MT_DEVICE_WC ].prot_sect |=PMD_SECT_S ; mem_types[MT_DEVICE_WC ].prot_pte |=L_PTE_SHARED ; mem_types[MT_DEVICE_CACHED ].prot_sect |=PMD_SECT_S ;
@@ -666,9 +643,6 @@ static void __init build_mem_type_table(void) pgprot_user =__pgprot (L_PTE_PRESENT |L_PTE_YOUNG | user_pgprot); pgprot_kernel =__pgprot (L_PTE_PRESENT |L_PTE_YOUNG |L_PTE_DIRTY | kern_pgprot); - pgprot_s2 =__pgprot (L_PTE_PRESENT |L_PTE_YOUNG | s2_pgprot); - pgprot_s2_device =__pgprot (s2_device_pgprot); - pgprot_hyp_device =__pgprot (hyp_device_pgprot); mem_types[MT_LOW_VECTORS ].prot_l1 |= ecc_mask; mem_types[MT_HIGH_VECTORS ].prot_l1 |= ecc_mask;
Signature · 1 line
2.25.0
Marc Zyngier
maintainerPATCH 6/15 arm: Remove GICv3 vgic compatibility macros
In reply to Marc ZyngierWe used to use a set of macros to provide support of vgic-v3 to 32bit without duplicating everything. We don't need it anymore, so drop it.
--- arch/arm/include/asm/arch_gicv3.h | 114 ------------------------------ 1 file changed, 114 deletions(-)
arch/arm/include/asm/arch_gicv3.h +0 -114
@@ -38,71 +38,6 @@#define ICC_AP1R2 __ICC_AP1Rx(2)#define ICC_AP1R3 __ICC_AP1Rx(3) -#define ICC_HSRE __ACCESS_CP15(c12, 4, c9, 5) - -#define ICH_VSEIR __ACCESS_CP15(c12, 4, c9, 4) -#define ICH_HCR __ACCESS_CP15(c12, 4, c11, 0) -#define ICH_VTR __ACCESS_CP15(c12, 4, c11, 1) -#define ICH_MISR __ACCESS_CP15(c12, 4, c11, 2) -#define ICH_EISR __ACCESS_CP15(c12, 4, c11, 3) -#define ICH_ELRSR __ACCESS_CP15(c12, 4, c11, 5) -#define ICH_VMCR __ACCESS_CP15(c12, 4, c11, 7) - -#define __LR0 (x) __ACCESS_CP15(c12, 4, c12, x) -#define __LR8 (x) __ACCESS_CP15(c12, 4, c13, x) - -#define ICH_LR0 __LR0(0) -#define ICH_LR1 __LR0(1) -#define ICH_LR2 __LR0(2) -#define ICH_LR3 __LR0(3) -#define ICH_LR4 __LR0(4) -#define ICH_LR5 __LR0(5) -#define ICH_LR6 __LR0(6) -#define ICH_LR7 __LR0(7) -#define ICH_LR8 __LR8(0) -#define ICH_LR9 __LR8(1) -#define ICH_LR10 __LR8(2) -#define ICH_LR11 __LR8(3) -#define ICH_LR12 __LR8(4) -#define ICH_LR13 __LR8(5) -#define ICH_LR14 __LR8(6) -#define ICH_LR15 __LR8(7) - -/* LR top half */ -#define __LRC0 (x) __ACCESS_CP15(c12, 4, c14, x) -#define __LRC8 (x) __ACCESS_CP15(c12, 4, c15, x) - -#define ICH_LRC0 __LRC0(0) -#define ICH_LRC1 __LRC0(1) -#define ICH_LRC2 __LRC0(2) -#define ICH_LRC3 __LRC0(3) -#define ICH_LRC4 __LRC0(4) -#define ICH_LRC5 __LRC0(5) -#define ICH_LRC6 __LRC0(6) -#define ICH_LRC7 __LRC0(7) -#define ICH_LRC8 __LRC8(0) -#define ICH_LRC9 __LRC8(1) -#define ICH_LRC10 __LRC8(2) -#define ICH_LRC11 __LRC8(3) -#define ICH_LRC12 __LRC8(4) -#define ICH_LRC13 __LRC8(5) -#define ICH_LRC14 __LRC8(6) -#define ICH_LRC15 __LRC8(7) - -#define __ICH_AP0Rx (x) __ACCESS_CP15(c12, 4, c8, x) -#define ICH_AP0R0 __ICH_AP0Rx(0) -#define ICH_AP0R1 __ICH_AP0Rx(1) -#define ICH_AP0R2 __ICH_AP0Rx(2) -#define ICH_AP0R3 __ICH_AP0Rx(3) - -#define __ICH_AP1Rx (x) __ACCESS_CP15(c12, 4, c9, x) -#define ICH_AP1R0 __ICH_AP1Rx(0) -#define ICH_AP1R1 __ICH_AP1Rx(1) -#define ICH_AP1R2 __ICH_AP1Rx(2) -#define ICH_AP1R3 __ICH_AP1Rx(3) - -/* A32-to-A64 mappings used by VGIC save/restore */ -#define CPUIF_MAP (a32, a64) \ static inline void write_ ## a64(u32 val) \ { \
@@ -113,21 +48,6 @@ static inline u32 read_ ## a64(void) \return read_sysreg (a32); \ } \ -#define CPUIF_MAP_LO_HI (a32lo, a32hi, a64) \ -static inline void write_ ## a64(u64 val) \ -{ \ - write_sysreg(lower_32_bits(val), a32lo);\ - write_sysreg(upper_32_bits(val), a32hi);\ -} \ -static inline u64 read_ ## a64(void) \ -{ \ - u64 val = read_sysreg(a32lo); \ - \ - val |= (u64)read_sysreg(a32hi) << 32; \ - \ - return val; \ -} - CPUIF_MAP(ICC_PMR, ICC_PMR_EL1) CPUIF_MAP(ICC_AP0R0, ICC_AP0R0_EL1)CPUIF_MAP (ICC_AP0R1 ,ICC_AP0R1_EL1 )
@@ -138,40 +58,6 @@ CPUIF_MAP(ICC_AP1R1, ICC_AP1R1_EL1) CPUIF_MAP(ICC_AP1R2, ICC_AP1R2_EL1) CPUIF_MAP(ICC_AP1R3, ICC_AP1R3_EL1) -CPUIF_MAP(ICH_HCR, ICH_HCR_EL2) -CPUIF_MAP(ICH_VTR, ICH_VTR_EL2) -CPUIF_MAP(ICH_MISR, ICH_MISR_EL2) -CPUIF_MAP(ICH_EISR, ICH_EISR_EL2) -CPUIF_MAP(ICH_ELRSR, ICH_ELRSR_EL2) -CPUIF_MAP(ICH_VMCR, ICH_VMCR_EL2) -CPUIF_MAP(ICH_AP0R3, ICH_AP0R3_EL2) -CPUIF_MAP(ICH_AP0R2, ICH_AP0R2_EL2) -CPUIF_MAP(ICH_AP0R1, ICH_AP0R1_EL2) -CPUIF_MAP(ICH_AP0R0, ICH_AP0R0_EL2) -CPUIF_MAP(ICH_AP1R3, ICH_AP1R3_EL2) -CPUIF_MAP(ICH_AP1R2, ICH_AP1R2_EL2) -CPUIF_MAP(ICH_AP1R1, ICH_AP1R1_EL2) -CPUIF_MAP(ICH_AP1R0, ICH_AP1R0_EL2) -CPUIF_MAP(ICC_HSRE, ICC_SRE_EL2) -CPUIF_MAP(ICC_SRE, ICC_SRE_EL1) - -CPUIF_MAP_LO_HI(ICH_LR15, ICH_LRC15, ICH_LR15_EL2) -CPUIF_MAP_LO_HI(ICH_LR14, ICH_LRC14, ICH_LR14_EL2) -CPUIF_MAP_LO_HI(ICH_LR13, ICH_LRC13, ICH_LR13_EL2) -CPUIF_MAP_LO_HI(ICH_LR12, ICH_LRC12, ICH_LR12_EL2) -CPUIF_MAP_LO_HI(ICH_LR11, ICH_LRC11, ICH_LR11_EL2) -CPUIF_MAP_LO_HI(ICH_LR10, ICH_LRC10, ICH_LR10_EL2) -CPUIF_MAP_LO_HI(ICH_LR9, ICH_LRC9, ICH_LR9_EL2) -CPUIF_MAP_LO_HI(ICH_LR8, ICH_LRC8, ICH_LR8_EL2) -CPUIF_MAP_LO_HI(ICH_LR7, ICH_LRC7, ICH_LR7_EL2) -CPUIF_MAP_LO_HI(ICH_LR6, ICH_LRC6, ICH_LR6_EL2) -CPUIF_MAP_LO_HI(ICH_LR5, ICH_LRC5, ICH_LR5_EL2) -CPUIF_MAP_LO_HI(ICH_LR4, ICH_LRC4, ICH_LR4_EL2) -CPUIF_MAP_LO_HI(ICH_LR3, ICH_LRC3, ICH_LR3_EL2) -CPUIF_MAP_LO_HI(ICH_LR2, ICH_LRC2, ICH_LR2_EL2) -CPUIF_MAP_LO_HI(ICH_LR1, ICH_LRC1, ICH_LR1_EL2) -CPUIF_MAP_LO_HI(ICH_LR0, ICH_LRC0, ICH_LR0_EL2) -#define read_gicreg (r) read_##r()#define write_gicreg (v, r) write_##r(v)
Signature · 1 line
2.25.0
Marc Zyngier
maintainerPATCH 7/15 arm: Remove the ability to set HYP vectors outside of the decompressor
In reply to Marc ZyngierAlthough we have to bounce between HYP and SVC to decompress and relocate the kernel, we don't need to be able to use it in the kernel itself. So let's drop the functionnality.
Since the vectors are never changed, there is no need to reset them either, and nobody calls that stub anyway. The last function (SOFT_RESTART) is still present in order to support kexec.
--- arch/arm/include/asm/virt.h | 5 ----- arch/arm/kernel/hyp-stub.S | 39 ++++++++----------------------------- 2 files changed, 8 insertions(+), 36 deletions(-)
arch/arm/include/asm/virt.h +0 -5
@@ -39,8 +39,6 @@ static inline void sync_boot_mode(void) sync_cache_r(&__boot_cpu_mode); } -void __hyp_set_vectors (unsigned long phys_vector_base); -void __hyp_reset_vectors (void );#else #define __boot_cpu_mode (SVC_MODE)#define sync_boot_mode ()
@@ -75,9 +73,6 @@ static inline bool is_kernel_in_hyp_mode(void)#define HVC_SET_VECTORS 0#define HVC_SOFT_RESTART 1 -#define HVC_RESET_VECTORS 2 - -#define HVC_STUB_HCALL_NR 3#endif /* __ASSEMBLY__ */
arch/arm/kernel/hyp-stub.S +8 -31
@@ -189,19 +189,19 @@ ARM_BE8(orr r7, r7, #(1 << 25)) @ HSCTLR.EE ENDPROC(__hyp_stub_install_secondary) __hyp_stub_do_trap: +#ifdef ZIMAGE teq r0, #HVC_SET_VECTORS bne 1f + /* Only the ZIMAGE stubs can change the HYP vectors */ mcr p15, 4, r1, c12, c0, 0 @ set HVBAR b __hyp_stub_exit +#endif 1: teq r0, #HVC_SOFT_RESTART - bne 1f + bne 2f bx r1 -1: teq r0, #HVC_RESET_VECTORS - beq __hyp_stub_exit - - ldr r0, =HVC_STUB_ERR +2: ldr r0, =HVC_STUB_ERR __ERET __hyp_stub_exit:
@@ -210,26 +210,9 @@ __hyp_stub_exit: ENDPROC(__hyp_stub_do_trap) /* - * __hyp_set_vectors: Call this after boot to set the initial hypervisor - * vectors as part of hypervisor installation. On an SMP system, this should - * be called on each CPU. - * - * r0 must be the physical address of the new vector table (which must lie in - * the bottom 4GB of physical address space. - * - * r0 must be 32-byte aligned. - * - * Before calling this, you must check that the stub hypervisor is installed - * everywhere, by waiting for any secondary CPUs to be brought up and then - * checking that BOOT_CPU_MODE_HAVE_HYP(__boot_cpu_mode) is true. - * - * If not, there is a pre-existing hypervisor, some CPUs failed to boot, or - * something else went wrong... in such cases, trying to install a new - * hypervisor is unlikely to work as desired. - * - * When you call into your shiny new hypervisor, sp_hyp will contain junk, - * so you will need to set that to something sensible at the new hypervisor's - * initialisation entry point. + * __hyp_set_vectors is only used when ZIMAGE must bounce between HYP + * and SVC. For the kernel itself, the vectors are set once and for + * all by the stubs. */ ENTRY(__hyp_set_vectors) mov r1, r0
@@ -245,12 +228,6 @@ ENTRY(__hyp_soft_restart) ret lr ENDPROC(__hyp_soft_restart) -ENTRY(__hyp_reset_vectors) - mov r0, #HVC_RESET_VECTORS - __HVC(0) - ret lr -ENDPROC(__hyp_reset_vectors) - #ifndef ZIMAGE .align 2 .L__boot_cpu_mode_offset:
Signature · 1 line
2.25.0
Marc Zyngier
maintainerPATCH 8/15 MAINTAINERS: RIP KVM/arm
In reply to Marc ZyngierDrop the KVM/arm entries from the MAINTAINERS file.
--- MAINTAINERS | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
MAINTAINERS +1 -4
@@ -9164,7 +9164,7 @@ F: virt/kvm/* F: tools/kvm/ F: tools/testing/selftests/kvm/ -KERNEL VIRTUAL MACHINE FOR ARM/ARM64 (KVM/arm, KVM/arm64) +KERNEL VIRTUAL MACHINE FOR ARM64 (KVM/arm64) M: Marc Zyngier <[email protected]> R: James Morse <[email protected]> R: Julien Thierry <[email protected]>
@@ -9173,9 +9173,6 @@ L: [email protected] (moderated for non-subscribers) L: [email protected] T: git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git S: Maintained -F: arch/arm/include/uapi/asm/kvm* -F: arch/arm/include/asm/kvm* -F: arch/arm/kvm/ F: arch/arm64/include/uapi/asm/kvm* F: arch/arm64/include/asm/kvm* F: arch/arm64/kvm/
Signature · 1 line
2.25.0
Marc Zyngier
maintainerPATCH 9/15 KVM: arm64: GICv4.1: Let doorbells be auto-enabled
In reply to Marc ZyngierAs GICv4.1 understands the life cycle of doorbells (instead of just randomly firing them at the most inconvenient time), just enable them at irq_request time, and be done with it.
--- virt/kvm/arm/vgic/vgic-v4.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
virt/kvm/arm/vgic/vgic-v4.c +8 -1
@@ -141,6 +141,7 @@ int vgic_v4_init(struct kvm *kvm)kvm_for_each_vcpu (i, vcpu, kvm) {int irq = dist->its_vm.vpes[i]->irq; +unsigned long irq_flags =DB_IRQ_FLAGS ;/* * Don't automatically enable the doorbell, as we're
@@ -148,8 +149,14 @@ int vgic_v4_init(struct kvm *kvm)* blocked. Also disable the lazy disabling, as the * doorbell could kick us out of the guest too * early... +* +* On GICv4.1, the doorbell is managed in HW and must +* be left enabled. */ -irq_set_status_flags (irq,DB_IRQ_FLAGS ); +if (kvm_vgic_global_state.has_gicv4_1) + irq_flags &= ~IRQ_NOAUTOEN ; +irq_set_status_flags (irq, irq_flags); + ret =request_irq (irq, vgic_v4_doorbell_handler,0 ,"vcpu" , vcpu);if (ret) {
Signature · 1 line
2.25.0
Marc Zyngier
maintainerPATCH 4/15 arm: Remove 32bit KVM host support
In reply to Marc ZyngierThat's it. Remove all references to KVM itself, and document that although it is no more, the ABI between SVC and HYP still exists.
--- Documentation/virt/kvm/arm/hyp-abi.rst | 5 + arch/arm/include/asm/kvm_arm.h | 239 ---- arch/arm/include/asm/kvm_asm.h | 77 -- arch/arm/include/asm/kvm_coproc.h | 36 - arch/arm/include/asm/kvm_emulate.h | 372 ------ arch/arm/include/asm/kvm_host.h | 456 -------- arch/arm/include/asm/kvm_hyp.h | 127 --- arch/arm/include/asm/kvm_mmu.h | 435 ------- arch/arm/include/asm/kvm_ras.h | 14 - arch/arm/include/asm/stage2_pgtable.h | 75 -- arch/arm/include/asm/virt.h | 5 - arch/arm/include/uapi/asm/kvm.h | 314 ----- arch/arm/kernel/asm-offsets.c | 11 - arch/arm/kvm/Kconfig | 59 - arch/arm/kvm/Makefile | 43 - arch/arm/kvm/coproc.c | 1455 ------------------------ arch/arm/kvm/coproc.h | 130 --- arch/arm/kvm/coproc_a15.c | 39 - arch/arm/kvm/coproc_a7.c | 42 - arch/arm/kvm/emulate.c | 166 --- arch/arm/kvm/guest.c | 387 ------- arch/arm/kvm/handle_exit.c | 175 --- arch/arm/kvm/hyp/Makefile | 34 - arch/arm/kvm/hyp/banked-sr.c | 70 -- arch/arm/kvm/hyp/cp15-sr.c | 72 -- arch/arm/kvm/hyp/entry.S | 121 -- arch/arm/kvm/hyp/hyp-entry.S | 295 ----- arch/arm/kvm/hyp/s2-setup.c | 22 - arch/arm/kvm/hyp/switch.c | 242 ---- arch/arm/kvm/hyp/tlb.c | 68 -- arch/arm/kvm/hyp/vfp.S | 57 - arch/arm/kvm/init.S | 157 --- arch/arm/kvm/interrupts.S | 36 - arch/arm/kvm/irq.h | 16 - arch/arm/kvm/reset.c | 86 -- arch/arm/kvm/trace.h | 86 -- arch/arm/kvm/vgic-v3-coproc.c | 27 - 37 files changed, 5 insertions(+), 6046 deletions(-) delete mode 100644 arch/arm/include/asm/kvm_arm.h delete mode 100644 arch/arm/include/asm/kvm_asm.h delete mode 100644 arch/arm/include/asm/kvm_coproc.h delete mode 100644 arch/arm/include/asm/kvm_emulate.h delete mode 100644 arch/arm/include/asm/kvm_host.h delete mode 100644 arch/arm/include/asm/kvm_hyp.h delete mode 100644 arch/arm/include/asm/kvm_mmu.h delete mode 100644 arch/arm/include/asm/kvm_ras.h delete mode 100644 arch/arm/include/asm/stage2_pgtable.h delete mode 100644 arch/arm/include/uapi/asm/kvm.h delete mode 100644 arch/arm/kvm/Kconfig delete mode 100644 arch/arm/kvm/Makefile delete mode 100644 arch/arm/kvm/coproc.c delete mode 100644 arch/arm/kvm/coproc.h delete mode 100644 arch/arm/kvm/coproc_a15.c delete mode 100644 arch/arm/kvm/coproc_a7.c delete mode 100644 arch/arm/kvm/emulate.c delete mode 100644 arch/arm/kvm/guest.c delete mode 100644 arch/arm/kvm/handle_exit.c delete mode 100644 arch/arm/kvm/hyp/Makefile delete mode 100644 arch/arm/kvm/hyp/banked-sr.c delete mode 100644 arch/arm/kvm/hyp/cp15-sr.c delete mode 100644 arch/arm/kvm/hyp/entry.S delete mode 100644 arch/arm/kvm/hyp/hyp-entry.S delete mode 100644 arch/arm/kvm/hyp/s2-setup.c delete mode 100644 arch/arm/kvm/hyp/switch.c delete mode 100644 arch/arm/kvm/hyp/tlb.c delete mode 100644 arch/arm/kvm/hyp/vfp.S delete mode 100644 arch/arm/kvm/init.S delete mode 100644 arch/arm/kvm/interrupts.S delete mode 100644 arch/arm/kvm/irq.h delete mode 100644 arch/arm/kvm/reset.c delete mode 100644 arch/arm/kvm/trace.h delete mode 100644 arch/arm/kvm/vgic-v3-coproc.c
Documentation/virt/kvm/arm/hyp-abi.rst +5 -0
@@ -11,6 +11,11 @@ hypervisor when running as a guest (under Xen, KVM or any other hypervisor), or any hypervisor-specific interaction when the kernel is used as a host. +Note: KVM/arm has been removed from the kernel. The API described +here is still valid though, as it allows the kernel to kexec when +booted at HYP. It can also be used by a hypervisor other than KVM +if necessary. + On arm and arm64 (without VHE), the kernel doesn't run in hypervisor mode, but still needs to interact with it, allowing a built-in hypervisor to be either installed or torn down.
arch/arm/include/asm/kvm_arm.h deleted +0 -239
239 lines not on this page · raw message
arch/arm/include/asm/kvm_asm.h deleted +0 -77
77 lines not on this page · raw message
arch/arm/include/asm/kvm_coproc.h deleted +0 -36
@@ -1,36 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* -* Copyright (C) 2012 Rusty Russell IBM Corporation -*/ - -#ifndef __ARM_KVM_COPROC_H__ -#define __ARM_KVM_COPROC_H__ -#include <linux/kvm_host.h> - -void kvm_reset_coprocs (struct kvm_vcpu *vcpu); - -struct kvm_coproc_target_table { -unsigned target; -const struct coproc_reg *table; -size_t num; -}; -void kvm_register_target_coproc_table (struct kvm_coproc_target_table *table); - -int kvm_handle_cp10_id (struct kvm_vcpu *vcpu,struct kvm_run *run); -int kvm_handle_cp_0_13_access (struct kvm_vcpu *vcpu,struct kvm_run *run); -int kvm_handle_cp14_load_store (struct kvm_vcpu *vcpu,struct kvm_run *run); -int kvm_handle_cp14_32 (struct kvm_vcpu *vcpu,struct kvm_run *run); -int kvm_handle_cp14_64 (struct kvm_vcpu *vcpu,struct kvm_run *run); -int kvm_handle_cp15_32 (struct kvm_vcpu *vcpu,struct kvm_run *run); -int kvm_handle_cp15_64 (struct kvm_vcpu *vcpu,struct kvm_run *run); - -unsigned long kvm_arm_num_guest_msrs (struct kvm_vcpu *vcpu); -int kvm_arm_copy_msrindices (struct kvm_vcpu *vcpu,u64 __user *uindices); -void kvm_coproc_table_init (void ); - -struct kvm_one_reg ; -int kvm_arm_copy_coproc_indices (struct kvm_vcpu *vcpu,u64 __user *uindices); -int kvm_arm_coproc_get_reg (struct kvm_vcpu *vcpu,const struct kvm_one_reg *); -int kvm_arm_coproc_set_reg (struct kvm_vcpu *vcpu,const struct kvm_one_reg *); -unsigned long kvm_arm_num_coproc_regs (struct kvm_vcpu *vcpu); -#endif /* __ARM_KVM_COPROC_H__ */
arch/arm/include/asm/kvm_emulate.h deleted +0 -372
372 lines not on this page · raw message
arch/arm/include/asm/kvm_host.h deleted +0 -456
456 lines not on this page · raw message
arch/arm/include/asm/kvm_hyp.h deleted +0 -127
127 lines not on this page · raw message
arch/arm/include/asm/kvm_mmu.h deleted +0 -435
435 lines not on this page · raw message
arch/arm/include/asm/kvm_ras.h deleted +0 -14
@@ -1,14 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* Copyright (C) 2018 - Arm Ltd */ - -#ifndef __ARM_KVM_RAS_H__ -#define __ARM_KVM_RAS_H__ - -#include <linux/types.h> - -static inline int kvm_handle_guest_sea (phys_addr_t addr,unsigned int esr) -{ -return -1 ; -} - -#endif /* __ARM_KVM_RAS_H__ */
arch/arm/include/asm/stage2_pgtable.h deleted +0 -75
75 lines not on this page · raw message
arch/arm/include/asm/virt.h +0 -5
@@ -67,11 +67,6 @@ static inline bool is_kernel_in_hyp_mode(void)return false; } -static inline bool has_vhe (void ) -{ -return false; -} -/* The section containing the hypervisor idmap text */ extern char __hyp_idmap_text_start[];extern char __hyp_idmap_text_end[];
arch/arm/include/uapi/asm/kvm.h deleted +0 -314
314 lines not on this page · raw message
arch/arm/kernel/asm-offsets.c +0 -11
@@ -11,9 +11,6 @@#include <linux/sched.h> #include <linux/mm.h> #include <linux/dma-mapping.h> -#ifdef CONFIG_KVM_ARM_HOST -#include <linux/kvm_host.h> -#endif #include <asm/cacheflush.h> #include <asm/glue-df.h> #include <asm/glue-pf.h>
@@ -167,14 +164,6 @@ int main(void)DEFINE (CACHE_WRITEBACK_ORDER , __CACHE_WRITEBACK_ORDER);DEFINE (CACHE_WRITEBACK_GRANULE , __CACHE_WRITEBACK_GRANULE);BLANK (); -#ifdef CONFIG_KVM_ARM_HOST - DEFINE(VCPU_GUEST_CTXT, offsetof(struct kvm_vcpu, arch.ctxt)); - DEFINE(VCPU_HOST_CTXT, offsetof(struct kvm_vcpu, arch.host_cpu_context)); -DEFINE (CPU_CTXT_VFP , offsetof(struct kvm_cpu_context , vfp)); -DEFINE (CPU_CTXT_GP_REGS , offsetof(struct kvm_cpu_context , gp_regs)); -DEFINE (GP_REGS_USR , offsetof(struct kvm_regs , usr_regs)); -#endif -BLANK ();#ifdef CONFIG_VDSO DEFINE (VDSO_DATA_SIZE ,sizeof (union vdso_data_store ));#endif
arch/arm/kvm/Kconfig deleted +0 -59
59 lines not on this page · raw message
arch/arm/kvm/Makefile deleted +0 -43
43 lines not on this page · raw message
arch/arm/kvm/coproc.c deleted +0 -1455
708 lines not on this page · raw message
arch/arm/kvm/coproc.h deleted +0 -130
130 lines not on this page · raw message
arch/arm/kvm/coproc_a7.c deleted +0 -42
42 lines not on this page · raw message
arch/arm/kvm/emulate.c deleted +0 -166
166 lines not on this page · raw message
arch/arm/kvm/guest.c deleted +0 -387
387 lines not on this page · raw message
arch/arm/kvm/handle_exit.c deleted +0 -175
175 lines not on this page · raw message
arch/arm/kvm/hyp/banked-sr.c deleted +0 -70
70 lines not on this page · raw message
arch/arm/kvm/hyp/cp15-sr.c deleted +0 -72
72 lines not on this page · raw message
arch/arm/kvm/hyp/entry.S deleted +0 -121
121 lines not on this page · raw message
arch/arm/kvm/hyp/hyp-entry.S deleted +0 -295
295 lines not on this page · raw message
arch/arm/kvm/hyp/switch.c deleted +0 -242
242 lines not on this page · raw message
arch/arm/kvm/hyp/tlb.c deleted +0 -68
68 lines not on this page · raw message
arch/arm/kvm/hyp/vfp.S deleted +0 -57
57 lines not on this page · raw message
arch/arm/kvm/init.S deleted +0 -157
157 lines not on this page · raw message
arch/arm/kvm/reset.c deleted +0 -86
86 lines not on this page · raw message
arch/arm/kvm/trace.h deleted +0 -86
86 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 6 lines
2.25.0 _______________________________________________ kvmarm mailing list [email protected] https://lists.cs.columbia.edu/mailman/listinfo/kvmarm
Part of the diff is not shown here. View the raw message.
Marc Zyngier
maintainerPATCH 11/15 KVM: arm64: GICv4.1: Allow SGIs to switch between HW and SW interrupts
In reply to Marc ZyngierIn order to let a guest buy in the new, active-less SGIs, we need to be able to switch between the two modes.
Handle this by stopping all guest activity, transfer the state from one mode to the other, and resume the guest. Nothing calls this code so far, but a later patch will plug it into the MMIO emulation.
--- include/kvm/arm_vgic.h | 3 ++ virt/kvm/arm/vgic/vgic-v4.c | 98 +++++++++++++++++++++++++++++++++++++ virt/kvm/arm/vgic/vgic.h | 1 + 3 files changed, 102 insertions(+)
include/kvm/arm_vgic.h +3 -0
@@ -231,6 +231,9 @@ struct vgic_dist {/* distributor enabled */ bool enabled; +/* Wants SGIs without active state */ +bool nassgireq; +struct vgic_irq *spis;struct vgic_io_device dist_iodev;
virt/kvm/arm/vgic/vgic-v4.c +98 -0
104 lines not on this page · raw message
virt/kvm/arm/vgic/vgic.h +1 -0
@@ -316,5 +316,6 @@ void vgic_its_invalidate_cache(struct kvm *kvm);bool vgic_supports_direct_msis (struct kvm *kvm);int vgic_v4_init (struct kvm *kvm);void vgic_v4_teardown (struct kvm *kvm); +void vgic_v4_configure_vsgis (struct kvm *kvm);#endif
Signature · 1 line
2.25.0
Marc Zyngier
maintainerPATCH 12/15 KVM: arm64: GICv4.1: Plumb SGI implementation selection in the distributor
In reply to Marc ZyngierThe GICv4.1 architecture gives the hypervisor the option to let the guest choose whether it wants the good old SGIs with an active state, or the new, HW-based ones that do not have one.
For this, plumb the configuration of SGIs into the GICv3 MMIO handling, present the GICD_TYPER2.nASSGIcap to the guest, and handle the GICD_CTLR.nASSGIreq setting.
In order to be able to deal with the restore of a guest, also apply the GICD_CTLR.nASSGIreq setting at first run so that we can move the restored SGIs to the HW if that's what the guest had selected in a previous life.
--- virt/kvm/arm/vgic/vgic-mmio-v3.c | 49 ++++++++++++++++++++++++++++++-- virt/kvm/arm/vgic/vgic-v3.c | 2 ++ 2 files changed, 49 insertions(+), 2 deletions(-)
virt/kvm/arm/vgic/vgic-mmio-v3.c +47 -2
@@ -3,6 +3,7 @@* VGICv3 MMIO handling functions */ +#include <linux/bitfield.h> #include <linux/irqchip/arm-gic-v3.h> #include <linux/kvm.h> #include <linux/kvm_host.h>
@@ -70,6 +71,8 @@ static unsigned long vgic_mmio_read_v3_misc(struct kvm_vcpu *vcpu,if (vgic->enabled) value |=GICD_CTLR_ENABLE_SS_G1 ; value |=GICD_CTLR_ARE_NS |GICD_CTLR_DS ; +if (vgic->nassgireq) + value |= GICD_CTLR_nASSGIreq;break ;case GICD_TYPER : value = vgic->nr_spis +VGIC_NR_PRIVATE_IRQS ;
@@ -81,6 +84,10 @@ static unsigned long vgic_mmio_read_v3_misc(struct kvm_vcpu *vcpu, value |= (INTERRUPT_ID_BITS_SPIS -1 ) <<19 ; }break ; +case GICD_TYPER2 : +if (kvm_vgic_global_state.has_gicv4_1) + value = GICD_TYPER2_nASSGIcap; +break ;case GICD_IIDR : value = (PRODUCT_ID_KVM <<GICD_IIDR_PRODUCT_ID_SHIFT ) | (vgic->implementation_rev << GICD_IIDR_REVISION_SHIFT) |
@@ -98,17 +105,43 @@ static void vgic_mmio_write_v3_misc(struct kvm_vcpu *vcpu, unsigned long val) {struct vgic_dist *dist = &vcpu->kvm->arch.vgic; -bool was_enabled = dist->enabled;switch (addr &0x0c ) { -case GICD_CTLR : +case GICD_CTLR : { +bool was_enabled, is_hwsgi; + +mutex_lock (&vcpu->kvm->lock); + + was_enabled = dist->enabled; + is_hwsgi = dist->nassgireq; + dist->enabled = val &GICD_CTLR_ENABLE_SS_G1 ; +/* Not a GICv4.1? No HW SGIs */ +if (!kvm_vgic_global_state.has_gicv4_1) + val &= ~GICD_CTLR_nASSGIreq; + +/* Dist stays enabled? nASSGIreq is RO */ +if (was_enabled && dist->enabled) { + val &= ~GICD_CTLR_nASSGIreq; + val |=FIELD_PREP (GICD_CTLR_nASSGIreq, is_hwsgi); + } + +/* Switching HW SGIs? */ + dist->nassgireq = val & GICD_CTLR_nASSGIreq; +if (is_hwsgi != dist->nassgireq) +vgic_v4_configure_vsgis (vcpu->kvm); +if (!was_enabled && dist->enabled)vgic_kick_vcpus (vcpu->kvm); + +mutex_unlock (&vcpu->kvm->lock);break ; + }case GICD_TYPER : +case GICD_TYPER2 :case GICD_IIDR : +/* This is at best for documentation purposes... */ return ; } }
@@ -117,10 +150,22 @@ static int vgic_mmio_uaccess_write_v3_misc(struct kvm_vcpu *vcpu, gpa_t addr, unsigned int len, unsigned long val) { + struct vgic_dist *dist = &vcpu->kvm->arch.vgic; +switch (addr &0x0c ) { +case GICD_TYPER2 :case GICD_IIDR :if (val !=vgic_mmio_read_v3_misc (vcpu, addr, len))return -EINVAL ; +return 0 ; +case GICD_CTLR : +/* Not a GICv4.1? No HW SGIs */ +if (!kvm_vgic_global_state.has_gicv4_1) + val &= ~GICD_CTLR_nASSGIreq; + + dist->enabled = val &GICD_CTLR_ENABLE_SS_G1 ; + dist->nassgireq = val & GICD_CTLR_nASSGIreq; +return 0 ; }vgic_mmio_write_v3_misc (vcpu, addr, len, val);
virt/kvm/arm/vgic/vgic-v3.c +2 -0
@@ -540,6 +540,8 @@ int vgic_v3_map_resources(struct kvm *kvm) goto out; } +if (kvm_vgic_global_state.has_gicv4_1) +vgic_v4_configure_vsgis (kvm); dist->ready = true; out:
Signature · 1 line
2.25.0
Marc Zyngier
maintainerPATCH 10/15 KVM: arm64: GICv4.1: Add direct injection capability to SGI registers
In reply to Marc ZyngierMost of the GICv3 emulation code that deals with SGIs now has to be aware of the v4.1 capabilities in order to benefit from it.
Add such support, keyed on the interrupt having the hw flag set and being a SGI.
--- virt/kvm/arm/vgic/vgic-mmio-v3.c | 27 ++++++++-- virt/kvm/arm/vgic/vgic-mmio.c | 88 ++++++++++++++++++++++++++++++-- 2 files changed, 107 insertions(+), 8 deletions(-)
virt/kvm/arm/vgic/vgic-mmio-v3.c +24 -3
@@ -6,6 +6,7 @@#include <linux/irqchip/arm-gic-v3.h> #include <linux/kvm.h> #include <linux/kvm_host.h> +#include <linux/interrupt.h> #include <kvm/iodev.h> #include <kvm/arm_vgic.h>
@@ -257,8 +258,18 @@ static unsigned long vgic_v3_uaccess_read_pending(struct kvm_vcpu *vcpu,*/ for (i =0 ; i < len *8 ; i++) {struct vgic_irq *irq =vgic_get_irq (vcpu->kvm, vcpu, intid + i); +bool state = irq->pending_latch; -if (irq->pending_latch) +if (irq->hw &&vgic_irq_is_sgi (irq->intid)) { +int err; + + err =irq_get_irqchip_state (irq->host_irq, +IRQCHIP_STATE_PENDING , + &state); +WARN_ON (err); + } + +if (state) value |= (1U << i);vgic_put_irq (vcpu->kvm, irq);
@@ -942,8 +953,18 @@ void vgic_v3_dispatch_sgi(struct kvm_vcpu *vcpu, u64 reg, bool allow_group1)* generate interrupts of either group. */ if (!irq->group || allow_group1) { - irq->pending_latch = true; -vgic_queue_irq_unlock (vcpu->kvm, irq, flags); +if (!irq->hw) { + irq->pending_latch = true; +vgic_queue_irq_unlock (vcpu->kvm, irq, flags); + }else { +/* HW SGI? Ask the GIC to inject it */ +int err; + err =irq_set_irqchip_state (irq->host_irq, +IRQCHIP_STATE_PENDING , + true); +WARN_RATELIMIT (err,"IRQ %d" , irq->host_irq); +raw_spin_unlock_irqrestore (&irq->irq_lock, flags); + } }else {raw_spin_unlock_irqrestore (&irq->irq_lock, flags); }
virt/kvm/arm/vgic/vgic-mmio.c +83 -5
151 lines not on this page · raw message
Signature · 1 line
2.25.0
Marc Zyngier
maintainerPATCH 13/15 KVM: arm64: GICv4.1: Reload VLPI configuration on distributor enable/disable
In reply to Marc ZyngierEach time a Group-enable bit gets flipped, the state of these bits needs to be forwarded to the hardware. This is a pretty heavy handed operation, requiring all vcpus to reload their GICv4 configuration. It is thus implemented as a new request type.
These enable bits are programmed into the HW by setting the VGrp{0,1}En fields of GICR_VPENDBASER when the vPEs are made resident again.
Of course, we only support Group-1 for now...
--- arch/arm/include/asm/kvm_host.h | 1 + arch/arm64/include/asm/kvm_host.h | 1 + virt/kvm/arm/arm.c | 8 ++++++++ virt/kvm/arm/vgic/vgic-mmio-v3.c | 5 ++++- 4 files changed, 14 insertions(+), 1 deletion(-)
arch/arm/include/asm/kvm_host.h +1 -0
@@ -39,6 +39,7 @@#define KVM_REQ_IRQ_PENDING KVM_ARCH_REQ(1)#define KVM_REQ_VCPU_RESET KVM_ARCH_REQ(2)#define KVM_REQ_RECORD_STEAL KVM_ARCH_REQ(3) +#define KVM_REQ_RELOAD_GICv4 KVM_ARCH_REQ(4)DECLARE_STATIC_KEY_FALSE (userspace_irqchip_in_use);
arch/arm64/include/asm/kvm_host.h +1 -0
@@ -44,6 +44,7 @@#define KVM_REQ_IRQ_PENDING KVM_ARCH_REQ(1)#define KVM_REQ_VCPU_RESET KVM_ARCH_REQ(2)#define KVM_REQ_RECORD_STEAL KVM_ARCH_REQ(3) +#define KVM_REQ_RELOAD_GICv4 KVM_ARCH_REQ(4)DECLARE_STATIC_KEY_FALSE (userspace_irqchip_in_use);
virt/kvm/arm/arm.c +8 -0
@@ -625,6 +625,14 @@ static void check_vcpu_requests(struct kvm_vcpu *vcpu)if (kvm_check_request (KVM_REQ_RECORD_STEAL , vcpu))kvm_update_stolen_time (vcpu); + +if (kvm_check_request (KVM_REQ_RELOAD_GICv4, vcpu)) { +/* The distributor enable bits were changed */ +preempt_disable (); +vgic_v4_put (vcpu, false); +vgic_v4_load (vcpu); +preempt_enable (); + } } }
virt/kvm/arm/vgic/vgic-mmio-v3.c +4 -1
@@ -132,7 +132,10 @@ static void vgic_mmio_write_v3_misc(struct kvm_vcpu *vcpu,if (is_hwsgi != dist->nassgireq)vgic_v4_configure_vsgis (vcpu->kvm); -if (!was_enabled && dist->enabled) +if (kvm_vgic_global_state.has_gicv4_1 && + was_enabled != dist->enabled) +kvm_make_all_cpus_request (vcpu->kvm, KVM_REQ_RELOAD_GICv4); +else if (!was_enabled && dist->enabled)vgic_kick_vcpus (vcpu->kvm);mutex_unlock (&vcpu->kvm->lock);
Signature · 1 line
2.25.0
Marc Zyngier
maintainerPATCH 15/15 KVM: arm64: GICv4.1: Expose HW-based SGIs in debugfs
In reply to Marc ZyngierThe vgic-state debugfs file could do with showing the pending state of the HW-backed SGIs. Plug it into the low-level code.
--- virt/kvm/arm/vgic/vgic-debug.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-)
virt/kvm/arm/vgic/vgic-debug.c +13 -1
@@ -178,6 +178,8 @@ static void print_irq_state(struct seq_file *s, struct vgic_irq *irq, struct kvm_vcpu *vcpu) {char *type; +bool pending; +if (irq->intid <VGIC_NR_SGIS ) type ="SGI" ;else if (irq->intid <VGIC_NR_PRIVATE_IRQS )
@@ -190,6 +192,16 @@ static void print_irq_state(struct seq_file *s, struct vgic_irq *irq,if (irq->intid ==0 || irq->intid ==VGIC_NR_PRIVATE_IRQS )print_header (s, irq, vcpu); + pending = irq->pending_latch; +if (irq->hw &&vgic_irq_is_sgi (irq->intid)) { +int err; + + err =irq_get_irqchip_state (irq->host_irq, +IRQCHIP_STATE_PENDING , + &pending); +WARN_ON_ONCE (err); + } +seq_printf (s," %s %4d " " %2d " "%d%d%d%d%d%d%d "
@@ -201,7 +213,7 @@ static void print_irq_state(struct seq_file *s, struct vgic_irq *irq,"\n" , type, irq->intid, (irq->target_vcpu) ? irq->target_vcpu->vcpu_id :-1 , - irq->pending_latch, + pending, irq->line_level, irq->active, irq->enabled,
Signature · 1 line
2.25.0
Marc Zyngier
maintainerPATCH 14/15 KVM: arm64: GICv4.1: Allow non-trapping WFI when using HW SGIs
In reply to Marc ZyngierJust like for VLPIs, it is beneficial to avoid trapping on WFI when the vcpu is using the GICv4.1 SGIs.
Add such a check to vcpu_clear_wfx_traps().
--- arch/arm64/include/asm/kvm_emulate.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm64/include/asm/kvm_emulate.h +2 -1
@@ -89,7 +89,8 @@ static inline unsigned long *vcpu_hcr(struct kvm_vcpu *vcpu)static inline void vcpu_clear_wfx_traps (struct kvm_vcpu *vcpu) { vcpu->arch.hcr_el2 &= ~HCR_TWE ; -if (atomic_read (&vcpu->arch.vgic_cpu.vgic_v3.its_vpe.vlpi_count)) +if (atomic_read (&vcpu->arch.vgic_cpu.vgic_v3.its_vpe.vlpi_count) || + vcpu->kvm->arch.vgic.nassgireq) vcpu->arch.hcr_el2 &= ~HCR_TWI ;else vcpu->arch.hcr_el2 |=HCR_TWI ;
Signature · 1 line
2.25.0
Paolo Bonzini
maintainerQuoted 1 line · Marc Zyngier
git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.gitkvmarm-5.7
Pulled, thanks.
Paolo