RISC-V KVM virtualize AIA CSRs
Subsystems (3)
v4 cover RISC-V KVM virtualize AIA CSRs
The RISC-V AIA specification is now frozen as-per the RISC-V international process. The latest frozen specifcation can be found at:
https://github.com/riscv/riscv-aia/releases/download/1.0-RC3/riscv-interrupts-1.0-RC3.pdf
This series implements first phase of AIA virtualization which targets virtualizing AIA CSRs. This also provides a foundation for the second phase of AIA virtualization which will target in-kernel AIA irqchip (including both IMSIC and APLIC).
The first two patches are shared with the "Linux RISC-V AIA Support" series which adds AIA driver support.
To test this series, use AIA drivers from the "Linux RISC-V AIA Support" series and use KVMTOOL from the riscv_aia_v1 branch at:
https://github.com/avpatel/kvmtool.git
These patches can also be found in the riscv_kvm_aia_csr_v4 branch at:
https://github.com/avpatel/linux.git
Based-on: 20230401112730.2105240-1-apatel at ventanamicro.com
(https://lore.kernel.org/lkml/20230401112730.2105240-1-apatel at ventanamicro.com/)
Based-on: 20230403121527.2286489-1-apatel at ventanamicro.com
(https://lore.kernel.org/lkml/20230403121527.2286489-1-apatel at ventanamicro.com/)
Changes since v3:
- Split PATCH7 into two patches
- Addressed comments in PATCH7, PATCH8 and PATCH9
Changes since v2:
- Rebased on Linux-6.3-rc5
- Split PATCH5 into two separate patches as suggested by Atish.
Changes since v1:
- Addressed from Drew and Conor in PATCH1
- Use alphabetical ordering for SMAIA and SSAIA enum in PATCH2
- Use GENMASK() in PATCH3
Anup Patel (9):
RISC-V: Add AIA related CSR defines
RISC-V: Detect AIA CSRs from ISA string
RISC-V: KVM: Drop the _MASK suffix from hgatp.VMID mask defines
RISC-V: KVM: Initial skeletal support for AIA
RISC-V: KVM: Implement subtype for CSR ONE_REG interface
RISC-V: KVM: Add ONE_REG interface for AIA CSRs
RISC-V: KVM: Use bitmap for irqs_pending and irqs_pending_mask
RISC-V: KVM: Virtualize per-HART AIA CSRs
RISC-V: KVM: Implement guest external interrupt line management
arch/riscv/include/asm/csr.h | 107 ++++- arch/riscv/include/asm/hwcap.h | 8 + arch/riscv/include/asm/kvm_aia.h | 137 +++++++ arch/riscv/include/asm/kvm_host.h | 14 +- arch/riscv/include/uapi/asm/kvm.h | 18 +- arch/riscv/kernel/cpu.c | 2 + arch/riscv/kernel/cpufeature.c | 2 + arch/riscv/kvm/Makefile | 1 + arch/riscv/kvm/aia.c | 627 ++++++++++++++++++++++++++++++ arch/riscv/kvm/main.c | 23 +- arch/riscv/kvm/mmu.c | 3 +- arch/riscv/kvm/vcpu.c | 190 +++++++-- arch/riscv/kvm/vcpu_insn.c | 1 + arch/riscv/kvm/vm.c | 4 + arch/riscv/kvm/vmid.c | 4 +- 15 files changed, 1083 insertions(+), 58 deletions(-) create mode 100644 arch/riscv/include/asm/kvm_aia.h create mode 100644 arch/riscv/kvm/aia.c
Signature · 1 line
2.34.1
PATCH v4 1/9 RISC-V: Add AIA related CSR defines
The RISC-V AIA specification improves handling per-HART local interrupts in a backward compatible manner. This patch adds defines for new RISC-V AIA CSRs.
--- arch/riscv/include/asm/csr.h | 95 +++++++++++++++++++++++++++++++++++- 1 file changed, 94 insertions(+), 1 deletion(-)
arch/riscv/include/asm/csr.h +94 -1
@@ -7,7 +7,7 @@#define _ASM_RISCV_CSR_H#include <asm/asm.h> -#include <linux/const.h> +#include <linux/bits.h> /* Status register flags */ #define SR_SIE _AC(0x00000002, UL)/* Supervisor Interrupt Enable */
@@ -73,7 +73,10 @@#define IRQ_S_EXT 9#define IRQ_VS_EXT 10#define IRQ_M_EXT 11 +#define IRQ_S_GEXT 12#define IRQ_PMU_OVF 13 +#define IRQ_LOCAL_MAX (IRQ_PMU_OVF + 1) +#define IRQ_LOCAL_MASK GENMASK((IRQ_LOCAL_MAX - 1), 0)/* Exception causes */ #define EXC_INST_MISALIGNED 0
@@ -156,6 +159,27 @@ (_AC(1, UL) << IRQ_S_TIMER) | \ (_AC(1, UL) << IRQ_S_EXT)) +/* AIA CSR bits */ +#define TOPI_IID_SHIFT 16 +#define TOPI_IID_MASK GENMASK(11, 0) +#define TOPI_IPRIO_MASK GENMASK(7, 0) +#define TOPI_IPRIO_BITS 8 + +#define TOPEI_ID_SHIFT 16 +#define TOPEI_ID_MASK GENMASK(10, 0) +#define TOPEI_PRIO_MASK GENMASK(10, 0) + +#define ISELECT_IPRIO0 0x30 +#define ISELECT_IPRIO15 0x3f +#define ISELECT_MASK GENMASK(8, 0) + +#define HVICTL_VTI BIT(30) +#define HVICTL_IID GENMASK(27, 16) +#define HVICTL_IID_SHIFT 16 +#define HVICTL_DPR BIT(9) +#define HVICTL_IPRIOM BIT(8) +#define HVICTL_IPRIO GENMASK(7, 0) +/* xENVCFG flags */ #define ENVCFG_STCE (_AC(1, ULL) << 63)#define ENVCFG_PBMTE (_AC(1, ULL) << 62)
@@ -250,6 +274,18 @@#define CSR_STIMECMP 0x14D#define CSR_STIMECMPH 0x15D +/* Supervisor-Level Window to Indirectly Accessed Registers (AIA) */ +#define CSR_SISELECT 0x150 +#define CSR_SIREG 0x151 + +/* Supervisor-Level Interrupts (AIA) */ +#define CSR_STOPEI 0x15c +#define CSR_STOPI 0xdb0 + +/* Supervisor-Level High-Half CSRs (AIA) */ +#define CSR_SIEH 0x114 +#define CSR_SIPH 0x154 +#define CSR_VSSTATUS 0x200#define CSR_VSIE 0x204#define CSR_VSTVEC 0x205
@@ -279,8 +315,32 @@#define CSR_HGATP 0x680#define CSR_HGEIP 0xe12 +/* Virtual Interrupts and Interrupt Priorities (H-extension with AIA) */ +#define CSR_HVIEN 0x608 +#define CSR_HVICTL 0x609 +#define CSR_HVIPRIO1 0x646 +#define CSR_HVIPRIO2 0x647 + +/* VS-Level Window to Indirectly Accessed Registers (H-extension with AIA) */ +#define CSR_VSISELECT 0x250 +#define CSR_VSIREG 0x251 + +/* VS-Level Interrupts (H-extension with AIA) */ +#define CSR_VSTOPEI 0x25c +#define CSR_VSTOPI 0xeb0 + +/* Hypervisor and VS-Level High-Half CSRs (H-extension with AIA) */ +#define CSR_HIDELEGH 0x613 +#define CSR_HVIENH 0x618 +#define CSR_HVIPH 0x655 +#define CSR_HVIPRIO1H 0x656 +#define CSR_HVIPRIO2H 0x657 +#define CSR_VSIEH 0x214 +#define CSR_VSIPH 0x254 +#define CSR_MSTATUS 0x300#define CSR_MISA 0x301 +#define CSR_MIDELEG 0x303#define CSR_MIE 0x304#define CSR_MTVEC 0x305#define CSR_MENVCFG 0x30a
@@ -297,6 +357,25 @@#define CSR_MIMPID 0xf13#define CSR_MHARTID 0xf14 +/* Machine-Level Window to Indirectly Accessed Registers (AIA) */ +#define CSR_MISELECT 0x350 +#define CSR_MIREG 0x351 + +/* Machine-Level Interrupts (AIA) */ +#define CSR_MTOPEI 0x35c +#define CSR_MTOPI 0xfb0 + +/* Virtual Interrupts for Supervisor Level (AIA) */ +#define CSR_MVIEN 0x308 +#define CSR_MVIP 0x309 + +/* Machine-Level High-Half CSRs (AIA) */ +#define CSR_MIDELEGH 0x313 +#define CSR_MIEH 0x314 +#define CSR_MVIENH 0x318 +#define CSR_MVIPH 0x319 +#define CSR_MIPH 0x354 +#ifdef CONFIG_RISCV_M_MODE # define CSR_STATUS CSR_MSTATUS# define CSR_IE CSR_MIE
@@ -307,6 +386,13 @@# define CSR_TVAL CSR_MTVAL# define CSR_IP CSR_MIP +# define CSR_IEH CSR_MIEH +# define CSR_ISELECT CSR_MISELECT +# define CSR_IREG CSR_MIREG +# define CSR_IPH CSR_MIPH +# define CSR_TOPEI CSR_MTOPEI +# define CSR_TOPI CSR_MTOPI +# define SR_IE SR_MIE# define SR_PIE SR_MPIE# define SR_PP SR_MPP
@@ -324,6 +410,13 @@# define CSR_TVAL CSR_STVAL# define CSR_IP CSR_SIP +# define CSR_IEH CSR_SIEH +# define CSR_ISELECT CSR_SISELECT +# define CSR_IREG CSR_SIREG +# define CSR_IPH CSR_SIPH +# define CSR_TOPEI CSR_STOPEI +# define CSR_TOPI CSR_STOPI +# define SR_IE SR_SIE# define SR_PIE SR_SPIE# define SR_PP SR_SPP
Signature · 1 line
2.34.1
PATCH v4 2/9 RISC-V: Detect AIA CSRs from ISA string
In reply to Anup PatelWe have two extension names for AIA ISA support: Smaia (M-mode AIA CSRs) and Ssaia (S-mode AIA CSRs).
We extend the ISA string parsing to detect Smaia and Ssaia extensions.
--- arch/riscv/include/asm/hwcap.h | 2 ++ arch/riscv/kernel/cpu.c | 2 ++ arch/riscv/kernel/cpufeature.c | 2 ++ 3 files changed, 6 insertions(+)
arch/riscv/include/asm/hwcap.h +2 -0
@@ -42,6 +42,8 @@#define RISCV_ISA_EXT_ZBB 30#define RISCV_ISA_EXT_ZICBOM 31#define RISCV_ISA_EXT_ZIHINTPAUSE 32 +#define RISCV_ISA_EXT_SMAIA 33 +#define RISCV_ISA_EXT_SSAIA 34#define RISCV_ISA_EXT_MAX 64#define RISCV_ISA_EXT_NAME_LEN_MAX 32
arch/riscv/kernel/cpu.c +2 -0
@@ -188,6 +188,8 @@ static struct riscv_isa_ext_data isa_ext_arr[] = {__RISCV_ISA_EXT_DATA (zicbom,RISCV_ISA_EXT_ZICBOM ),__RISCV_ISA_EXT_DATA (zihintpause,RISCV_ISA_EXT_ZIHINTPAUSE ),__RISCV_ISA_EXT_DATA (zbb,RISCV_ISA_EXT_ZBB ), +__RISCV_ISA_EXT_DATA (smaia,RISCV_ISA_EXT_SMAIA ), +__RISCV_ISA_EXT_DATA (ssaia,RISCV_ISA_EXT_SSAIA ),__RISCV_ISA_EXT_DATA (sscofpmf,RISCV_ISA_EXT_SSCOFPMF ),__RISCV_ISA_EXT_DATA (sstc,RISCV_ISA_EXT_SSTC ), __RISCV_ISA_EXT_DATA(svinval, RISCV_ISA_EXT_SVINVAL),
arch/riscv/kernel/cpufeature.c +2 -0
@@ -221,6 +221,8 @@ void __init riscv_fill_hwcap(void) } }else {/* sorted alphabetically */ +SET_ISA_EXT_MAP ("smaia" ,RISCV_ISA_EXT_SMAIA ); +SET_ISA_EXT_MAP ("ssaia" ,RISCV_ISA_EXT_SSAIA );SET_ISA_EXT_MAP ("sscofpmf" ,RISCV_ISA_EXT_SSCOFPMF );SET_ISA_EXT_MAP ("sstc" ,RISCV_ISA_EXT_SSTC );SET_ISA_EXT_MAP ("svinval" ,RISCV_ISA_EXT_SVINVAL );
Signature · 1 line
2.34.1
PATCH v4 3/9 RISC-V: KVM: Drop the _MASK suffix from hgatp.VMID mask defines
In reply to Anup PatelThe hgatp.VMID mask defines are used before shifting when extracting VMID value from hgatp CSR value so based on the convention followed in the other parts of asm/csr.h, the hgatp.VMID mask defines should not have a _MASK suffix.
While we are here, let's use GENMASK() for hgatp.VMID and hgatp.PPN.
--- arch/riscv/include/asm/csr.h | 12 ++++++------ arch/riscv/kvm/mmu.c | 3 +-- arch/riscv/kvm/vmid.c | 4 ++-- 3 files changed, 9 insertions(+), 10 deletions(-)
arch/riscv/include/asm/csr.h +6 -6
@@ -131,25 +131,25 @@#define HGATP32_MODE_SHIFT 31#define HGATP32_VMID_SHIFT 22 -#define HGATP32_VMID_MASK _AC(0x1FC00000, UL) -#define HGATP32_PPN _AC(0x003FFFFF, UL) +#define HGATP32_VMID GENMASK(28, 22) +#define HGATP32_PPN GENMASK(21, 0)#define HGATP64_MODE_SHIFT 60#define HGATP64_VMID_SHIFT 44 -#define HGATP64_VMID_MASK _AC(0x03FFF00000000000, UL) -#define HGATP64_PPN _AC(0x00000FFFFFFFFFFF, UL) +#define HGATP64_VMID GENMASK(57, 44) +#define HGATP64_PPN GENMASK(43, 0)#define HGATP_PAGE_SHIFT 12#ifdef CONFIG_64BIT #define HGATP_PPN HGATP64_PPN#define HGATP_VMID_SHIFT HGATP64_VMID_SHIFT -#define HGATP_VMID_MASK HGATP64_VMID_MASK +#define HGATP_VMID HGATP64_VMID#define HGATP_MODE_SHIFT HGATP64_MODE_SHIFT#else #define HGATP_PPN HGATP32_PPN#define HGATP_VMID_SHIFT HGATP32_VMID_SHIFT -#define HGATP_VMID_MASK HGATP32_VMID_MASK +#define HGATP_VMID HGATP32_VMID#define HGATP_MODE_SHIFT HGATP32_MODE_SHIFT#endif
arch/riscv/kvm/mmu.c +1 -2
@@ -755,8 +755,7 @@ void kvm_riscv_gstage_update_hgatp(struct kvm_vcpu *vcpu)unsigned long hgatp = gstage_mode;struct kvm_arch *k = &vcpu->kvm->arch; - hgatp |= (READ_ONCE (k->vmid.vmid) <<HGATP_VMID_SHIFT ) & -HGATP_VMID_MASK ; + hgatp |= (READ_ONCE (k->vmid.vmid) <<HGATP_VMID_SHIFT ) &HGATP_VMID ; hgatp |= (k->pgd_phys >>PAGE_SHIFT ) &HGATP_PPN ;csr_write (CSR_HGATP , hgatp);
arch/riscv/kvm/vmid.c +2 -2
@@ -26,9 +26,9 @@ void __init kvm_riscv_gstage_vmid_detect(void)/* Figure-out number of VMID bits in HW */ old =csr_read (CSR_HGATP ); -csr_write (CSR_HGATP , old |HGATP_VMID_MASK ); +csr_write (CSR_HGATP , old |HGATP_VMID ); vmid_bits =csr_read (CSR_HGATP ); - vmid_bits = (vmid_bits &HGATP_VMID_MASK ) >>HGATP_VMID_SHIFT ; + vmid_bits = (vmid_bits &HGATP_VMID ) >>HGATP_VMID_SHIFT ; vmid_bits =fls_long (vmid_bits);csr_write (CSR_HGATP , old);
Signature · 1 line
2.34.1
PATCH v4 4/9 RISC-V: KVM: Initial skeletal support for AIA
In reply to Anup PatelTo incrementally implement AIA support, we first add minimal skeletal support which only compiles and detects AIA hardware support at the boot-time but does not provide any functionality.
--- arch/riscv/include/asm/hwcap.h | 6 ++ arch/riscv/include/asm/kvm_aia.h | 109 ++++++++++++++++++++++++++++++ arch/riscv/include/asm/kvm_host.h | 7 ++ arch/riscv/kvm/Makefile | 1 + arch/riscv/kvm/aia.c | 66 ++++++++++++++++++ arch/riscv/kvm/main.c | 22 +++++- arch/riscv/kvm/vcpu.c | 45 ++++++++++-- arch/riscv/kvm/vcpu_insn.c | 1 + arch/riscv/kvm/vm.c | 4 ++ 9 files changed, 255 insertions(+), 6 deletions(-) create mode 100644 arch/riscv/include/asm/kvm_aia.h create mode 100644 arch/riscv/kvm/aia.c
arch/riscv/include/asm/hwcap.h +6 -0
@@ -48,6 +48,12 @@#define RISCV_ISA_EXT_MAX 64#define RISCV_ISA_EXT_NAME_LEN_MAX 32 +#ifdef CONFIG_RISCV_M_MODE +#define RISCV_ISA_EXT_SxAIA RISCV_ISA_EXT_SMAIA +#else +#define RISCV_ISA_EXT_SxAIA RISCV_ISA_EXT_SSAIA +#endif +#ifndef __ASSEMBLY__#include <linux/jump_label.h>
arch/riscv/include/asm/kvm_aia.h new file +109 -0
109 lines not on this page · raw message
arch/riscv/include/asm/kvm_host.h +7 -0
@@ -14,6 +14,7 @@#include <linux/kvm_types.h> #include <linux/spinlock.h> #include <asm/hwcap.h> +#include <asm/kvm_aia.h> #include <asm/kvm_vcpu_fp.h> #include <asm/kvm_vcpu_insn.h> #include <asm/kvm_vcpu_sbi.h>
@@ -94,6 +95,9 @@ struct kvm_arch {/* Guest Timer */ struct kvm_guest_timer timer; + +/* AIA Guest/VM context */ +struct kvm_aia aia; };struct kvm_cpu_trap {
@@ -221,6 +225,9 @@ struct kvm_vcpu_arch {/* SBI context */ struct kvm_vcpu_sbi_context sbi_context; +/* AIA VCPU context */ +struct kvm_vcpu_aia aia_context; +/* Cache pages needed to program page tables with spinlock held */ struct kvm_mmu_memory_cache mmu_page_cache;
arch/riscv/kvm/Makefile +1 -0
@@ -26,3 +26,4 @@ kvm-y += vcpu_sbi_replace.o kvm-y += vcpu_sbi_hsm.o kvm-y += vcpu_timer.o kvm-$(CONFIG_RISCV_PMU_SBI) += vcpu_pmu.o vcpu_sbi_pmu.o +kvm-y += aia.o
arch/riscv/kvm/aia.c new file +66 -0
66 lines not on this page · raw message
arch/riscv/kvm/main.c +21 -1
@@ -44,11 +44,15 @@ int kvm_arch_hardware_enable(void)csr_write (CSR_HVIP ,0 ); +kvm_riscv_aia_enable (); +return 0 ; }void kvm_arch_hardware_disable (void ) { +kvm_riscv_aia_disable (); +/* * After clearing the hideleg CSR, the host kernel will receive * spurious interrupts if hvip CSR has pending interrupts and the
@@ -63,6 +67,7 @@ void kvm_arch_hardware_disable(void)static int __init riscv_kvm_init (void ) { +int rc;const char *str;if (!riscv_isa_extension_available (NULL , h)) {
@@ -84,6 +89,10 @@ static int __init riscv_kvm_init(void)kvm_riscv_gstage_vmid_detect (); + rc =kvm_riscv_aia_init (); +if (rc && rc != -ENODEV ) +return rc; +kvm_info ("hypervisor extension available\n" );switch (kvm_riscv_gstage_mode ()) {
@@ -106,12 +115,23 @@ static int __init riscv_kvm_init(void)kvm_info ("VMID %ld bits available\n" ,kvm_riscv_gstage_vmid_bits ()); -return kvm_init (sizeof (struct kvm_vcpu ),0 ,THIS_MODULE ); +if (kvm_riscv_aia_available ()) +kvm_info ("AIA available\n" ); + + rc =kvm_init (sizeof (struct kvm_vcpu ),0 ,THIS_MODULE ); +if (rc) { +kvm_riscv_aia_exit (); +return rc; + } + +return 0 ; }module_init (riscv_kvm_init); static void __exit riscv_kvm_exit(void) { +kvm_riscv_aia_exit (); +kvm_exit (); }module_exit (riscv_kvm_exit);
arch/riscv/kvm/vcpu.c +40 -5
124 lines not on this page · raw message
arch/riscv/kvm/vcpu_insn.c +1 -0
@@ -214,6 +214,7 @@ struct csr_func { };static const struct csr_func csr_funcs[] = { + KVM_RISCV_VCPU_AIA_CSR_FUNCSKVM_RISCV_VCPU_HPMCOUNTER_CSR_FUNCS };
arch/riscv/kvm/vm.c +4 -0
@@ -41,6 +41,8 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)return r; } +kvm_riscv_aia_init_vm (kvm); +kvm_riscv_guest_timer_init (kvm);return 0 ;
@@ -49,6 +51,8 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)void kvm_arch_destroy_vm (struct kvm *kvm) {kvm_destroy_vcpus (kvm); + +kvm_riscv_aia_destroy_vm (kvm); }int kvm_vm_ioctl_check_extension (struct kvm *kvm,long ext)
Signature · 1 line
2.34.1
PATCH v4 5/9 RISC-V: KVM: Implement subtype for CSR ONE_REG interface
In reply to Anup PatelTo make the CSR ONE_REG interface extensible, we implement subtype for the CSR ONE_REG IDs. The existing CSR ONE_REG IDs are treated as subtype = 0 (aka General CSRs).
--- arch/riscv/include/uapi/asm/kvm.h | 3 +- arch/riscv/kvm/vcpu.c | 88 +++++++++++++++++++++++-------- 2 files changed, 69 insertions(+), 22 deletions(-)
arch/riscv/include/uapi/asm/kvm.h +2 -1
@@ -65,7 +65,7 @@ struct kvm_riscv_core {#define KVM_RISCV_MODE_S 1#define KVM_RISCV_MODE_U 0 -/* CSR registers for KVM_GET_ONE_REG and KVM_SET_ONE_REG */ +/* General CSR registers for KVM_GET_ONE_REG and KVM_SET_ONE_REG */ struct kvm_riscv_csr {unsigned long sstatus;unsigned long sie;
@@ -152,6 +152,7 @@ enum KVM_RISCV_SBI_EXT_ID {/* Control and status registers are mapped as type 3 */ #define KVM_REG_RISCV_CSR (0x03 << KVM_REG_RISCV_TYPE_SHIFT) +#define KVM_REG_RISCV_CSR_GENERAL (0x0 << KVM_REG_RISCV_SUBTYPE_SHIFT)#define KVM_REG_RISCV_CSR_REG (name) \ (offsetof(struct kvm_riscv_csr, name) / sizeof(unsigned long))
arch/riscv/kvm/vcpu.c +67 -21
125 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v4 6/9 RISC-V: KVM: Add ONE_REG interface for AIA CSRs
In reply to Anup PatelWe implement ONE_REG interface for AIA CSRs as a separate subtype under the CSR ONE_REG interface.
--- arch/riscv/include/uapi/asm/kvm.h | 8 ++++++++ arch/riscv/kvm/vcpu.c | 8 ++++++++ 2 files changed, 16 insertions(+)
arch/riscv/include/uapi/asm/kvm.h +8 -0
@@ -79,6 +79,10 @@ struct kvm_riscv_csr {unsigned long scounteren; }; +/* AIA CSR registers for KVM_GET_ONE_REG and KVM_SET_ONE_REG */ +struct kvm_riscv_aia_csr { +}; +/* TIMER registers for KVM_GET_ONE_REG and KVM_SET_ONE_REG */ struct kvm_riscv_timer {__u64 frequency;
@@ -107,6 +111,7 @@ enum KVM_RISCV_ISA_EXT_ID {KVM_RISCV_ISA_EXT_ZIHINTPAUSE ,KVM_RISCV_ISA_EXT_ZICBOM ,KVM_RISCV_ISA_EXT_ZBB , +KVM_RISCV_ISA_EXT_SSAIA , KVM_RISCV_ISA_EXT_MAX, };
@@ -153,8 +158,11 @@ enum KVM_RISCV_SBI_EXT_ID {/* Control and status registers are mapped as type 3 */ #define KVM_REG_RISCV_CSR (0x03 << KVM_REG_RISCV_TYPE_SHIFT)#define KVM_REG_RISCV_CSR_GENERAL (0x0 << KVM_REG_RISCV_SUBTYPE_SHIFT) +#define KVM_REG_RISCV_CSR_AIA (0x1 << KVM_REG_RISCV_SUBTYPE_SHIFT)#define KVM_REG_RISCV_CSR_REG (name) \ (offsetof(struct kvm_riscv_csr, name) / sizeof(unsigned long)) +#define KVM_REG_RISCV_CSR_AIA_REG (name) \ + (offsetof(struct kvm_riscv_aia_csr, name) / sizeof(unsigned long))/* Timer registers are mapped as type 4 */ #define KVM_REG_RISCV_TIMER (0x04 << KVM_REG_RISCV_TYPE_SHIFT)
arch/riscv/kvm/vcpu.c +8 -0
@@ -58,6 +58,7 @@ static const unsigned long kvm_isa_ext_arr[] = { [KVM_RISCV_ISA_EXT_I] = RISCV_ISA_EXT_i, [KVM_RISCV_ISA_EXT_M] = RISCV_ISA_EXT_m, +KVM_ISA_EXT_ARR (SSAIA ),KVM_ISA_EXT_ARR (SSTC ),KVM_ISA_EXT_ARR (SVINVAL ), KVM_ISA_EXT_ARR(SVPBMT),
@@ -97,6 +98,7 @@ static bool kvm_riscv_vcpu_isa_disable_allowed(unsigned long ext)case KVM_RISCV_ISA_EXT_C :case KVM_RISCV_ISA_EXT_I :case KVM_RISCV_ISA_EXT_M : +case KVM_RISCV_ISA_EXT_SSAIA :case KVM_RISCV_ISA_EXT_SSTC :case KVM_RISCV_ISA_EXT_SVINVAL :case KVM_RISCV_ISA_EXT_ZIHINTPAUSE :
@@ -520,6 +522,9 @@ static int kvm_riscv_vcpu_get_reg_csr(struct kvm_vcpu *vcpu,case KVM_REG_RISCV_CSR_GENERAL : rc =kvm_riscv_vcpu_general_get_csr (vcpu, reg_num, ®_val);break ; +case KVM_REG_RISCV_CSR_AIA : + rc =kvm_riscv_vcpu_aia_get_csr (vcpu, reg_num, ®_val); +break ;default : rc = -EINVAL ;break ;
@@ -556,6 +561,9 @@ static int kvm_riscv_vcpu_set_reg_csr(struct kvm_vcpu *vcpu,case KVM_REG_RISCV_CSR_GENERAL : rc =kvm_riscv_vcpu_general_set_csr (vcpu, reg_num, reg_val);break ; +case KVM_REG_RISCV_CSR_AIA : + rc =kvm_riscv_vcpu_aia_set_csr (vcpu, reg_num, reg_val); +break ;default : rc = -EINVAL ;break ;
Signature · 1 line
2.34.1
PATCH v4 7/9 RISC-V: KVM: Use bitmap for irqs_pending and irqs_pending_mask
In reply to Anup PatelTo support 64 VCPU local interrupts on RV32 host, we should use bitmap for irqs_pending and irqs_pending_mask in struct kvm_vcpu_arch.
--- arch/riscv/include/asm/kvm_host.h | 7 ++-- arch/riscv/kvm/vcpu.c | 53 ++++++++++++++++++++----------- 2 files changed, 38 insertions(+), 22 deletions(-)
arch/riscv/include/asm/kvm_host.h +4 -3
@@ -204,8 +204,9 @@ struct kvm_vcpu_arch {* in irqs_pending. Our approach is modeled around multiple producer * and single consumer problem where the consumer is the VCPU itself. */ -unsigned long irqs_pending; -unsigned long irqs_pending_mask; +#define KVM_RISCV_VCPU_NR_IRQS 64 +DECLARE_BITMAP (irqs_pending,KVM_RISCV_VCPU_NR_IRQS ); +DECLARE_BITMAP (irqs_pending_mask,KVM_RISCV_VCPU_NR_IRQS );/* VCPU Timer */ struct kvm_vcpu_timer timer;
@@ -334,7 +335,7 @@ int kvm_riscv_vcpu_set_interrupt(struct kvm_vcpu *vcpu, unsigned int irq);int kvm_riscv_vcpu_unset_interrupt (struct kvm_vcpu *vcpu,unsigned int irq);void kvm_riscv_vcpu_flush_interrupts (struct kvm_vcpu *vcpu);void kvm_riscv_vcpu_sync_interrupts (struct kvm_vcpu *vcpu); -bool kvm_riscv_vcpu_has_interrupts (struct kvm_vcpu *vcpu,unsigned long mask); +bool kvm_riscv_vcpu_has_interrupts (struct kvm_vcpu *vcpu,u64 mask);void kvm_riscv_vcpu_power_off (struct kvm_vcpu *vcpu);void kvm_riscv_vcpu_power_on (struct kvm_vcpu *vcpu);
arch/riscv/kvm/vcpu.c +34 -19
115 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v4 8/9 RISC-V: KVM: Virtualize per-HART AIA CSRs
In reply to Anup PatelThe AIA specification introduce per-HART AIA CSRs which primarily support:
* 64 local interrupts on both RV64 and RV32
* priority for each of the 64 local interrupts
* interrupt filtering for local interrupts
This patch virtualize above mentioned AIA CSRs and also extend ONE_REG interface to allow user-space save/restore Guest/VM view of these CSRs.
--- arch/riscv/include/asm/kvm_aia.h | 88 ++++---- arch/riscv/include/uapi/asm/kvm.h | 7 + arch/riscv/kvm/aia.c | 322 ++++++++++++++++++++++++++++++ 3 files changed, 382 insertions(+), 35 deletions(-)
arch/riscv/include/asm/kvm_aia.h +53 -35
@@ -12,6 +12,7 @@#include <linux/jump_label.h> #include <linux/kvm_types.h> +#include <asm/csr.h> struct kvm_aia {/* In-kernel irqchip created */
@@ -21,7 +22,22 @@ struct kvm_aia {bool initialized; }; +struct kvm_vcpu_aia_csr { +unsigned long vsiselect; +unsigned long hviprio1; +unsigned long hviprio2; +unsigned long vsieh; +unsigned long hviph; +unsigned long hviprio1h; +unsigned long hviprio2h; +}; +struct kvm_vcpu_aia { +/* CPU AIA CSR context of Guest VCPU */ +struct kvm_vcpu_aia_csr guest_csr; + +/* CPU AIA CSR context upon Guest VCPU reset */ +struct kvm_vcpu_aia_csr guest_reset_csr; };#define kvm_riscv_aia_initialized (k) ((k)->arch.aia.initialized)
@@ -32,48 +48,50 @@ DECLARE_STATIC_KEY_FALSE(kvm_riscv_aia_available);#define kvm_riscv_aia_available () \ static_branch_unlikely(&kvm_riscv_aia_available) -static inline void kvm_riscv_vcpu_aia_flush_interrupts (struct kvm_vcpu *vcpu) -{ -} - -static inline void kvm_riscv_vcpu_aia_sync_interrupts (struct kvm_vcpu *vcpu) -{ -} - -static inline bool kvm_riscv_vcpu_aia_has_interrupts (struct kvm_vcpu *vcpu, -u64 mask) -{ -return false; -} - -static inline void kvm_riscv_vcpu_aia_update_hvip (struct kvm_vcpu *vcpu) -{ -} - -static inline void kvm_riscv_vcpu_aia_load (struct kvm_vcpu *vcpu,int cpu) -{ -} - -static inline void kvm_riscv_vcpu_aia_put (struct kvm_vcpu *vcpu) +#define KVM_RISCV_AIA_IMSIC_TOPEI (ISELECT_MASK + 1) +static inline int kvm_riscv_vcpu_aia_imsic_rmw (struct kvm_vcpu *vcpu, +unsigned long isel, +unsigned long *val, +unsigned long new_val, +unsigned long wr_mask) { +return 0 ; } -static inline int kvm_riscv_vcpu_aia_get_csr (struct kvm_vcpu *vcpu, -unsigned long reg_num, -unsigned long *out_val) +#ifdef CONFIG_32BIT +void kvm_riscv_vcpu_aia_flush_interrupts (struct kvm_vcpu *vcpu); +void kvm_riscv_vcpu_aia_sync_interrupts (struct kvm_vcpu *vcpu); +#else +static inline void kvm_riscv_vcpu_aia_flush_interrupts (struct kvm_vcpu *vcpu) { - *out_val =0 ; -return 0 ; } - -static inline int kvm_riscv_vcpu_aia_set_csr (struct kvm_vcpu *vcpu, -unsigned long reg_num, -unsigned long val) +static inline void kvm_riscv_vcpu_aia_sync_interrupts (struct kvm_vcpu *vcpu) { -return 0 ; } - -#define KVM_RISCV_VCPU_AIA_CSR_FUNCS +#endif +bool kvm_riscv_vcpu_aia_has_interrupts (struct kvm_vcpu *vcpu,u64 mask); + +void kvm_riscv_vcpu_aia_update_hvip (struct kvm_vcpu *vcpu); +void kvm_riscv_vcpu_aia_load (struct kvm_vcpu *vcpu,int cpu); +void kvm_riscv_vcpu_aia_put (struct kvm_vcpu *vcpu); +int kvm_riscv_vcpu_aia_get_csr (struct kvm_vcpu *vcpu, +unsigned long reg_num, +unsigned long *out_val); +int kvm_riscv_vcpu_aia_set_csr (struct kvm_vcpu *vcpu, +unsigned long reg_num, +unsigned long val); + +int kvm_riscv_vcpu_aia_rmw_topei (struct kvm_vcpu *vcpu, +unsigned int csr_num, +unsigned long *val, +unsigned long new_val, +unsigned long wr_mask); +int kvm_riscv_vcpu_aia_rmw_ireg (struct kvm_vcpu *vcpu,unsigned int csr_num, +unsigned long *val,unsigned long new_val, +unsigned long wr_mask); +#define KVM_RISCV_VCPU_AIA_CSR_FUNCS \ +{ .base = CSR_SIREG, .count = 1, .func = kvm_riscv_vcpu_aia_rmw_ireg }, \ +{ .base = CSR_STOPEI, .count = 1, .func = kvm_riscv_vcpu_aia_rmw_topei },static inline int kvm_riscv_vcpu_aia_update (struct kvm_vcpu *vcpu) {
arch/riscv/include/uapi/asm/kvm.h +7 -0
@@ -81,6 +81,13 @@ struct kvm_riscv_csr {/* AIA CSR registers for KVM_GET_ONE_REG and KVM_SET_ONE_REG */ struct kvm_riscv_aia_csr { +unsigned long siselect; +unsigned long siprio1; +unsigned long siprio2; +unsigned long sieh; +unsigned long siph; +unsigned long siprio1h; +unsigned long siprio2h; };/* TIMER registers for KVM_GET_ONE_REG and KVM_SET_ONE_REG */
arch/riscv/kvm/aia.c +322 -0
334 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v4 9/9 RISC-V: KVM: Implement guest external interrupt line management
In reply to Anup PatelThe RISC-V host will have one guest external interrupt line for each VS-level IMSICs associated with a HART. The guest external interrupt lines are per-HART resources and hypervisor can use HGEIE, HGEIP, and HIE CSRs to manage these guest external interrupt lines.
--- arch/riscv/include/asm/kvm_aia.h | 10 ++ arch/riscv/kvm/aia.c | 239 +++++++++++++++++++++++++++++++ arch/riscv/kvm/main.c | 3 +- arch/riscv/kvm/vcpu.c | 2 + 4 files changed, 253 insertions(+), 1 deletion(-)
arch/riscv/include/asm/kvm_aia.h +10 -0
@@ -44,10 +44,15 @@ struct kvm_vcpu_aia {#define irqchip_in_kernel (k) ((k)->arch.aia.in_kernel) +extern unsigned int kvm_riscv_aia_nr_hgei;DECLARE_STATIC_KEY_FALSE (kvm_riscv_aia_available);#define kvm_riscv_aia_available () \ static_branch_unlikely(&kvm_riscv_aia_available) +static inline void kvm_riscv_vcpu_aia_imsic_release (struct kvm_vcpu *vcpu) +{ +} +#define KVM_RISCV_AIA_IMSIC_TOPEI (ISELECT_MASK + 1) static inline int kvm_riscv_vcpu_aia_imsic_rmw(struct kvm_vcpu *vcpu, unsigned long isel,
@@ -119,6 +124,11 @@ static inline void kvm_riscv_aia_destroy_vm(struct kvm *kvm) { } +int kvm_riscv_aia_alloc_hgei (int cpu,struct kvm_vcpu *owner, +void __iomem **hgei_va,phys_addr_t *hgei_pa); +void kvm_riscv_aia_free_hgei (int cpu,int hgei); +void kvm_riscv_aia_wakeon_hgei (struct kvm_vcpu *owner,bool enable); +void kvm_riscv_aia_enable (void );void kvm_riscv_aia_disable (void );int kvm_riscv_aia_init (void );
arch/riscv/kvm/aia.c +239 -0
293 lines not on this page · raw message
arch/riscv/kvm/main.c +2 -1
@@ -116,7 +116,8 @@ static int __init riscv_kvm_init(void)kvm_info ("VMID %ld bits available\n" ,kvm_riscv_gstage_vmid_bits ());if (kvm_riscv_aia_available ()) -kvm_info ("AIA available\n" ); +kvm_info ("AIA available with %d guest external interrupts\n" , + kvm_riscv_aia_nr_hgei); rc =kvm_init (sizeof (struct kvm_vcpu ),0 ,THIS_MODULE );if (rc) {
arch/riscv/kvm/vcpu.c +2 -0
@@ -249,10 +249,12 @@ int kvm_cpu_has_pending_timer(struct kvm_vcpu *vcpu)void kvm_arch_vcpu_blocking (struct kvm_vcpu *vcpu) { +kvm_riscv_aia_wakeon_hgei (vcpu, true); }void kvm_arch_vcpu_unblocking (struct kvm_vcpu *vcpu) { +kvm_riscv_aia_wakeon_hgei (vcpu, false); }int kvm_arch_vcpu_runnable (struct kvm_vcpu *vcpu)
Signature · 1 line
2.34.1
Re: [PATCH v4 7/9] RISC-V: KVM: Use bitmap for irqs_pending and irqs_pending_mask
In reply to Anup PatelQuoted 9 lines · Anup Patel
To support 64 VCPU local interrupts on RV32 host, we should use bitmap for
irqs_pendingandirqs_pending_maskin structkvm_vcpu_arch.Signed-off-by Anup Patel <[email protected]>--- arch/riscv/include/asm/kvm_host.h | 7 ++-- arch/riscv/kvm/vcpu.c | 53 ++++++++++++++++++++----------- 2 files changed, 38 insertions(+), 22 deletions(-)
Re: [PATCH v4 8/9] RISC-V: KVM: Virtualize per-HART AIA CSRs
In reply to Anup PatelQuoted 10 lines · Anup Patel
The AIA specification introduce per-HART AIA CSRs which primarily support:
* 64 local interrupts on both RV64 and RV32
* priority for each of the 64 local interrupts
* interrupt filtering for local interruptsThis patch virtualize above mentioned AIA CSRs and also extend
ONE_REGinterface to allow user-space save/restore Guest/VM view of these CSRs.
Quoted 7 lines
Signed-off-by Anup Patel <[email protected]>--- arch/riscv/include/asm/kvm_aia.h | 88 ++++---- arch/riscv/include/uapi/asm/kvm.h | 7 + arch/riscv/kvm/aia.c | 322 ++++++++++++++++++++++++++++++ 3 files changed, 382 insertions(+), 35 deletions(-)
Re: [PATCH v4 9/9] RISC-V: KVM: Implement guest external interrupt line management
In reply to Anup PatelQuoted 5 lines · Anup Patel
The RISC-V host will have one guest external interrupt line for each VS-level IMSICs associated with a HART. The guest external interrupt lines are per-HART resources and hypervisor can use HGEIE, HGEIP, and HIE CSRs to manage these guest external interrupt lines.
Quoted 8 lines
Signed-off-by Anup Patel <[email protected]>--- arch/riscv/include/asm/kvm_aia.h | 10 ++ arch/riscv/kvm/aia.c | 239 +++++++++++++++++++++++++++++++ arch/riscv/kvm/main.c | 3 +- arch/riscv/kvm/vcpu.c | 2 + 4 files changed, 253 insertions(+), 1 deletion(-)
Re: [PATCH v4 2/9] RISC-V: Detect AIA CSRs from ISA string
In reply to Anup PatelThanks for fixing up the order Anup.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/kvm-riscv/attachments/20230404/cb23c0a6/attachment-0001.sig>
Anup Patel
maintainerRe: [PATCH v4 2/9] RISC-V: Detect AIA CSRs from ISA string
Quoted 4 lines · On Tue, Apr 4, 2023 at 10:16?PM Conor Dooley <[email protected]> wrote:
Reviewed-by Conor Dooley <[email protected]>Thanks for fixing up the order Anup.
I forgot to mention this in the change log.
Regards,
Anup
Anup Patel
maintainerRe: [PATCH v4 2/9] RISC-V: Detect AIA CSRs from ISA string
In reply to Anup PatelHi Palmer,
Quoted 9 lines · On Tue, Apr 4, 2023 at 9:05?PM Anup Patel <[email protected]> wrote:
We have two extension names for AIA ISA support: Smaia (M-mode AIA CSRs) and Ssaia (S-mode AIA CSRs).
We extend the ISA string parsing to detect Smaia and Ssaia extensions.
Signed-off-by Anup Patel <[email protected]>Reviewed-by Andrew Jones <[email protected]>Reviewed-by Atish Patra <[email protected]>
Can you please ACK this patch so that I can include it in Linux-6.4 PR ?
Regards,
Anup
Quoted 48 lines
--- arch/riscv/include/asm/hwcap.h | 2 ++ arch/riscv/kernel/cpu.c | 2 ++ arch/riscv/kernel/cpufeature.c | 2 ++ 3 files changed, 6 insertions(+)arch/riscv/include/asm/hwcap.h +2
-0@@ -42,6 +42,8 @@#define RISCV_ISA_EXT_ZBB 30#define RISCV_ISA_EXT_ZICBOM 31#define RISCV_ISA_EXT_ZIHINTPAUSE 32 +#define RISCV_ISA_EXT_SMAIA 33 +#define RISCV_ISA_EXT_SSAIA 34#define RISCV_ISA_EXT_MAX 64#define RISCV_ISA_EXT_NAME_LEN_MAX 32arch/riscv/kernel/cpu.c +2
-0@@ -188,6 +188,8 @@ static struct riscv_isa_ext_data isa_ext_arr[] = {__RISCV_ISA_EXT_DATA (zicbom,RISCV_ISA_EXT_ZICBOM ),__RISCV_ISA_EXT_DATA (zihintpause,RISCV_ISA_EXT_ZIHINTPAUSE ),__RISCV_ISA_EXT_DATA (zbb,RISCV_ISA_EXT_ZBB ), +__RISCV_ISA_EXT_DATA (smaia,RISCV_ISA_EXT_SMAIA ), +__RISCV_ISA_EXT_DATA (ssaia,RISCV_ISA_EXT_SSAIA ),__RISCV_ISA_EXT_DATA (sscofpmf,RISCV_ISA_EXT_SSCOFPMF ),__RISCV_ISA_EXT_DATA (sstc,RISCV_ISA_EXT_SSTC ), __RISCV_ISA_EXT_DATA(svinval, RISCV_ISA_EXT_SVINVAL),arch/riscv/kernel/cpufeature.c +2
-1@@ -221,6 +221,8 @@ void __init riscv_fill_hwcap(void) } }else {/* sorted alphabetically */ +SET_ISA_EXT_MAP ("smaia" ,RISCV_ISA_EXT_SMAIA ); +SET_ISA_EXT_MAP ("ssaia" ,RISCV_ISA_EXT_SSAIA );SET_ISA_EXT_MAP ("sscofpmf" ,RISCV_ISA_EXT_SSCOFPMF );SET_ISA_EXT_MAP ("sstc" ,RISCV_ISA_EXT_SSTC );SET_ISA_EXT_MAP ("svinval" ,RISCV_ISA_EXT_SVINVAL ); --2.34.1
Quoted 59 lines · apatel at ventanamicro.com
The RISC-V AIA specification is now frozen as-per the RISC-V international process. The latest frozen specifcation can be found at:
https://github.com/riscv/riscv-aia/releases/download/1.0-RC3/riscv-interrupts-1.0-RC3.pdfThis series implements first phase of AIA virtualization which targets virtualizing AIA CSRs. This also provides a foundation for the second phase of AIA virtualization which will target in-kernel AIA irqchip (including both IMSIC and APLIC).
The first two patches are shared with the "Linux RISC-V AIA Support" series which adds AIA driver support.
To test this series, use AIA drivers from the "Linux RISC-V AIA Support" series and use KVMTOOL from the
riscv_aia_v1branch at:
https://github.com/avpatel/kvmtool.gitThese patches can also be found in the
riscv_kvm_aia_csr_v4branch at:
https://github.com/avpatel/linux.gitBased-on: 20230401112730.2105240-1-apatel at ventanamicro.com
(https://lore.kernel.org/lkml/20230401112730.2105240-1-apatel at ventanamicro.com/)Based-on: 20230403121527.2286489-1-apatel at ventanamicro.com
(https://lore.kernel.org/lkml/20230403121527.2286489-1-apatel at ventanamicro.com/)Changes since v3:
- Split PATCH7 into two patches
- Addressed comments in PATCH7, PATCH8 and PATCH9Changes since v2:
- Rebased on Linux-6.3-rc5
- Split PATCH5 into two separate patches as suggested by Atish.Changes since v1:
- Addressed from Drew and Conor in PATCH1
- Use alphabetical ordering for SMAIA and SSAIA enum in PATCH2
- UseGENMASK()in PATCH3Anup Patel (9):
RISC-V: Add AIA related CSR defines
RISC-V: Detect AIA CSRs from ISA string
RISC-V: KVM: Drop the_MASKsuffix from hgatp.VMID mask defines
RISC-V: KVM: Initial skeletal support for AIA
RISC-V: KVM: Implement subtype for CSRONE_REGinterface
RISC-V: KVM: AddONE_REGinterface for AIA CSRs
RISC-V: KVM: Use bitmap forirqs_pendingandirqs_pending_mask
RISC-V: KVM: Virtualize per-HART AIA CSRs
RISC-V: KVM: Implement guest external interrupt line managementarch/riscv/include/asm/csr.h | 107 ++++- arch/riscv/include/asm/hwcap.h | 8 + arch/riscv/include/asm/kvm_aia.h | 137 +++++++ arch/riscv/include/asm/kvm_host.h | 14 +- arch/riscv/include/uapi/asm/kvm.h | 18 +- arch/riscv/kernel/cpu.c | 2 + arch/riscv/kernel/cpufeature.c | 2 + arch/riscv/kvm/Makefile | 1 + arch/riscv/kvm/aia.c | 627 ++++++++++++++++++++++++++++++ arch/riscv/kvm/main.c | 23 +-
Quoted 8 lines
arch/riscv/kvm/mmu.c | 3 +- arch/riscv/kvm/vcpu.c | 190 +++++++-- arch/riscv/kvm/vcpu_insn.c | 1 + arch/riscv/kvm/vm.c | 4 + arch/riscv/kvm/vmid.c | 4 +- 15 files changed, 1083 insertions(+), 58 deletions(-) create mode 100644 arch/riscv/include/asm/kvm_aia.h create mode 100644 arch/riscv/kvm/aia.c
Quoted 39 lines · On Tue, Apr 4, 2023 at 9:05?PM Anup Patel <[email protected]> wrote:
The RISC-V AIA specification is now frozen as-per the RISC-V international process. The latest frozen specifcation can be found at:
https://github.com/riscv/riscv-aia/releases/download/1.0-RC3/riscv-interrupts-1.0-RC3.pdfThis series implements first phase of AIA virtualization which targets virtualizing AIA CSRs. This also provides a foundation for the second phase of AIA virtualization which will target in-kernel AIA irqchip (including both IMSIC and APLIC).
The first two patches are shared with the "Linux RISC-V AIA Support" series which adds AIA driver support.
To test this series, use AIA drivers from the "Linux RISC-V AIA Support" series and use KVMTOOL from the
riscv_aia_v1branch at:
https://github.com/avpatel/kvmtool.gitThese patches can also be found in the
riscv_kvm_aia_csr_v4branch at:
https://github.com/avpatel/linux.gitBased-on: 20230401112730.2105240-1-apatel at ventanamicro.com
(https://lore.kernel.org/lkml/20230401112730.2105240-1-apatel at ventanamicro.com/)Based-on: 20230403121527.2286489-1-apatel at ventanamicro.com
(https://lore.kernel.org/lkml/20230403121527.2286489-1-apatel at ventanamicro.com/)Changes since v3:
- Split PATCH7 into two patches
- Addressed comments in PATCH7, PATCH8 and PATCH9Changes since v2:
- Rebased on Linux-6.3-rc5
- Split PATCH5 into two separate patches as suggested by Atish.Changes since v1:
- Addressed from Drew and Conor in PATCH1
- Use alphabetical ordering for SMAIA and SSAIA enum in PATCH2
- UseGENMASK()in PATCH3
Quoted 10 lines
Anup Patel (9):
RISC-V: Add AIA related CSR defines
RISC-V: Detect AIA CSRs from ISA string
RISC-V: KVM: Drop the_MASKsuffix from hgatp.VMID mask defines
RISC-V: KVM: Initial skeletal support for AIA
RISC-V: KVM: Implement subtype for CSRONE_REGinterface
RISC-V: KVM: AddONE_REGinterface for AIA CSRs
RISC-V: KVM: Use bitmap forirqs_pendingandirqs_pending_mask
RISC-V: KVM: Virtualize per-HART AIA CSRs
RISC-V: KVM: Implement guest external interrupt line management
I have queued PATCH1 to PATCH8 for Linux-6.4
The PATCH9 depends on "RISC-V IPI Improvements" series so this patch will be sent as separate PR or differed to Linux-6.5
Regards,
Anup
Quoted 23 lines
arch/riscv/include/asm/csr.h | 107 ++++- arch/riscv/include/asm/hwcap.h | 8 + arch/riscv/include/asm/kvm_aia.h | 137 +++++++ arch/riscv/include/asm/kvm_host.h | 14 +- arch/riscv/include/uapi/asm/kvm.h | 18 +- arch/riscv/kernel/cpu.c | 2 + arch/riscv/kernel/cpufeature.c | 2 + arch/riscv/kvm/Makefile | 1 + arch/riscv/kvm/aia.c | 627 ++++++++++++++++++++++++++++++ arch/riscv/kvm/main.c | 23 +- arch/riscv/kvm/mmu.c | 3 +- arch/riscv/kvm/vcpu.c | 190 +++++++-- arch/riscv/kvm/vcpu_insn.c | 1 + arch/riscv/kvm/vm.c | 4 + arch/riscv/kvm/vmid.c | 4 +- 15 files changed, 1083 insertions(+), 58 deletions(-) create mode 100644 arch/riscv/include/asm/kvm_aia.h create mode 100644 arch/riscv/kvm/aia.c--
2.34.1
This series was applied to riscv/linux.git (fixes) by Anup Patel <[email protected]>:
Hello:
This series was applied to riscv/linux.git (fixes) by Anup Patel <[email protected]>:
Quoted 10 lines · On Tue, 4 Apr 2023 21:04:43 +0530 you wrote:
The RISC-V AIA specification is now frozen as-per the RISC-V international process. The latest frozen specifcation can be found at:
https://github.com/riscv/riscv-aia/releases/download/1.0-RC3/riscv-interrupts-1.0-RC3.pdfThis series implements first phase of AIA virtualization which targets virtualizing AIA CSRs. This also provides a foundation for the second phase of AIA virtualization which will target in-kernel AIA irqchip (including both IMSIC and APLIC).
[...]
Here is the summary with links:
- [v4,1/9] RISC-V: Add AIA related CSR defines
https://git.kernel.org/riscv/c/d6f5f6e904be - [v4,2/9] RISC-V: Detect AIA CSRs from ISA string https://git.kernel.org/riscv/c/8fe6f7e14c7e
- [v4,3/9] RISC-V: KVM: Drop the _MASK suffix from hgatp.VMID mask defines (no matching commit)
- [v4,4/9] RISC-V: KVM: Initial skeletal support for AIA
(no matching commit)
- [v4,5/9] RISC-V: KVM: Implement subtype for CSR ONE_REG interface (no matching commit)
- [v4,6/9] RISC-V: KVM: Add ONE_REG interface for AIA CSRs
(no matching commit)
- [v4,7/9] RISC-V: KVM: Use bitmap for irqs_pending and irqs_pending_mask (no matching commit)
- [v4,8/9] RISC-V: KVM: Virtualize per-HART AIA CSRs
(no matching commit)
- [v4,9/9] RISC-V: KVM: Implement guest external interrupt line management (no matching commit)
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html