RISC-V KVM virtualize AIA CSRs
Subsystems (3)
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-RC1/riscv-interrupts-1.0-RC1.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/kvmtoo.git
These patches can also be found in the riscv_kvm_aia_csr_v1 branch at:
https://github.com/avpatel/linux.git
Anup Patel (7):
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: Add ONE_REG interface for AIA CSRs
RISC-V: KVM: Virtualize per-HART AIA CSRs
RISC-V: KVM: Implement guest external interrupt line management
arch/riscv/include/asm/csr.h | 101 ++++- 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 | 22 +- arch/riscv/kernel/cpu.c | 2 + arch/riscv/kernel/cpufeature.c | 2 + arch/riscv/kvm/Makefile | 1 + arch/riscv/kvm/aia.c | 624 ++++++++++++++++++++++++++++++ arch/riscv/kvm/main.c | 14 + arch/riscv/kvm/mmu.c | 3 +- arch/riscv/kvm/vcpu.c | 185 +++++++-- arch/riscv/kvm/vcpu_insn.c | 4 +- arch/riscv/kvm/vm.c | 4 + arch/riscv/kvm/vmid.c | 4 +- 15 files changed, 1072 insertions(+), 53 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 1/7 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 | 93 ++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+)
arch/riscv/include/asm/csr.h +93 -0
@@ -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 ((_AC(1, UL) << IRQ_LOCAL_MAX) - 1)/* 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 _AC(0xfff, UL) +#define TOPI_IPRIO_MASK _AC(0xff, UL) +#define TOPI_IPRIO_BITS 8 + +#define TOPEI_ID_SHIFT 16 +#define TOPEI_ID_MASK _AC(0x7ff, UL) +#define TOPEI_PRIO_MASK _AC(0x7ff, UL) + +#define ISELECT_IPRIO0 0x30 +#define ISELECT_IPRIO15 0x3f +#define ISELECT_MASK _AC(0x1ff, UL) + +#define HVICTL_VTI _AC(0x40000000, UL) +#define HVICTL_IID _AC(0x0fff0000, UL) +#define HVICTL_IID_SHIFT 16 +#define HVICTL_DPR _AC(0x00000200, UL) +#define HVICTL_IPRIOM _AC(0x00000100, UL) +#define HVICTL_IPRIO _AC(0x000000ff, UL) +/* 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
Re: [PATCH 1/7] RISC-V: Add AIA related CSR defines
Quoted 14 lines · Anup Patel
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.
Signed-off-by Anup Patel <[email protected]>--- arch/riscv/include/asm/csr.h | 93 ++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+)arch/riscv/include/asm/csr.h +0
-0
arch/riscv/include/asm/csr.h line 79
Quoted 7 lines
arch/riscv/include/asm/csr.h +3
-0@@ -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 ((_AC(1, UL) << IRQ_LOCAL_MAX) - 1)
How about instead of the above two defines we do
#define IRQ_LOCAL_MASK GENMASK(13, 0)
And in general it might be nice to put GENMASK to work for all the new masks below.
Quoted 12 lines
arch/riscv/include/asm/csr.h +5
-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 _AC(0xfff, UL) +#define TOPI_IPRIO_MASK _AC(0xff, UL) +#define TOPI_IPRIO_BITS 8
arch/riscv/include/asm/csr.h line 176
Quoted 10 lines
arch/riscv/include/asm/csr.h +10
-0+ +#define TOPEI_ID_SHIFT 16 +#define TOPEI_ID_MASK _AC(0x7ff, UL) +#define TOPEI_PRIO_MASK _AC(0x7ff, UL) + +#define ISELECT_IPRIO0 0x30 +#define ISELECT_IPRIO15 0x3f +#define ISELECT_MASK _AC(0x1ff, UL) + +#define HVICTL_VTI _AC(0x40000000, UL)
I'd rather read this as '1 << 30' to match the spec and other bit masks in this file. Actually, it'd be nice if BIT() was used throughout this file, e.g. #define HVICTL_VTI BIT(30)
Quoted 118 lines
arch/riscv/include/asm/csr.h +75
-0+#define HVICTL_IID _AC(0x0fff0000, UL) +#define HVICTL_IID_SHIFT 16 +#define HVICTL_DPR _AC(0x00000200, UL) +#define HVICTL_IPRIOM _AC(0x00000100, UL) +#define HVICTL_IPRIO _AC(0x000000ff, UL) +/* 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_SPPSignature · 1 line
2.34.1
Besides my preference for GENMASK and BIT, this looks good to me.
Thanks,
drew
Re: [PATCH 1/7] RISC-V: Add AIA related CSR defines
Quoted 179 lines · Andrew Jones
Quoted 14 lines · Anup Patel
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.
Signed-off-by Anup Patel <[email protected]>--- arch/riscv/include/asm/csr.h | 93 ++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+)arch/riscv/include/asm/csr.h +0
-0arch/riscv/include/asm/csr.h line 79
Quoted 7 lines
arch/riscv/include/asm/csr.h +3
-0@@ -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 ((_AC(1, UL) << IRQ_LOCAL_MAX) - 1)How about instead of the above two defines we do
#define IRQ_LOCAL_MASK GENMASK(13, 0)And in general it might be nice to put GENMASK to work for all the new masks below.
Quoted 12 lines
arch/riscv/include/asm/csr.h +5
-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 _AC(0xfff, UL) +#define TOPI_IPRIO_MASK _AC(0xff, UL) +#define TOPI_IPRIO_BITS 8arch/riscv/include/asm/csr.h line 176
Quoted 10 lines
arch/riscv/include/asm/csr.h +10
-0+ +#define TOPEI_ID_SHIFT 16 +#define TOPEI_ID_MASK _AC(0x7ff, UL) +#define TOPEI_PRIO_MASK _AC(0x7ff, UL) + +#define ISELECT_IPRIO0 0x30 +#define ISELECT_IPRIO15 0x3f +#define ISELECT_MASK _AC(0x1ff, UL) + +#define HVICTL_VTI _AC(0x40000000, UL)I'd rather read this as '1 << 30' to match the spec and other bit masks in this file. Actually, it'd be nice if
BIT()was used throughout this file, e.g. #defineHVICTL_VTIBIT(30)Quoted 116 lines
arch/riscv/include/asm/csr.h +75
-1+#define HVICTL_IID _AC(0x0fff0000, UL) +#define HVICTL_IID_SHIFT 16 +#define HVICTL_DPR _AC(0x00000200, UL) +#define HVICTL_IPRIOM _AC(0x00000100, UL) +#define HVICTL_IPRIO _AC(0x000000ff, UL) +/* 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 --Quoted 2 lines
2.34.1
Besides my preference for GENMASK and BIT, this looks good to me.
Quoted 1 line
Reviewed-by Andrew Jones <[email protected]>
Thanks, I will address all your comments in v2.
Regards,
Anup
PATCH 2/7 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 | 8 ++++++++ arch/riscv/kernel/cpu.c | 2 ++ arch/riscv/kernel/cpufeature.c | 2 ++ 3 files changed, 12 insertions(+)
arch/riscv/include/asm/hwcap.h +8 -0
@@ -59,10 +59,18 @@ enum riscv_isa_ext_id {RISCV_ISA_EXT_ZIHINTPAUSE ,RISCV_ISA_EXT_SSTC ,RISCV_ISA_EXT_SVINVAL , +RISCV_ISA_EXT_SSAIA , +RISCV_ISA_EXT_SMAIA , RISCV_ISA_EXT_ID_MAX };static_assert (RISCV_ISA_EXT_ID_MAX <=RISCV_ISA_EXT_MAX ); +#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 +/* * This enum represents the logical ID for each RISC-V ISA extension static * keys. We can use static key to optimize code path if some ISA extensions
arch/riscv/kernel/cpu.c +2 -0
@@ -162,6 +162,8 @@ arch_initcall(riscv_cpuinfo_init);* extensions by an underscore. */ static struct riscv_isa_ext_data isa_ext_arr[] = { +__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
@@ -228,6 +228,8 @@ void __init riscv_fill_hwcap(void)SET_ISA_EXT_MAP ("zihintpause" ,RISCV_ISA_EXT_ZIHINTPAUSE );SET_ISA_EXT_MAP ("sstc" ,RISCV_ISA_EXT_SSTC );SET_ISA_EXT_MAP ("svinval" ,RISCV_ISA_EXT_SVINVAL ); +SET_ISA_EXT_MAP ("smaia" ,RISCV_ISA_EXT_SMAIA ); +SET_ISA_EXT_MAP ("ssaia" ,RISCV_ISA_EXT_SSAIA ); }#undef SET_ISA_EXT_MAP }
Signature · 1 line
2.34.1
Re: [PATCH 2/7] RISC-V: Detect AIA CSRs from ISA string
Quoted 17 lines · Anup Patel
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]>--- arch/riscv/include/asm/hwcap.h | 8 ++++++++ arch/riscv/kernel/cpu.c | 2 ++ arch/riscv/kernel/cpufeature.c | 2 ++ 3 files changed, 12 insertions(+)arch/riscv/include/asm/hwcap.h +0
-0
arch/riscv/include/asm/hwcap.h enum riscv_isa_ext_id { · line 63
Quoted 5 lines
arch/riscv/include/asm/hwcap.h +2
-0@@ -59,10 +59,18 @@ enum riscv_isa_ext_id {RISCV_ISA_EXT_ZIHINTPAUSE ,RISCV_ISA_EXT_SSTC ,RISCV_ISA_EXT_SVINVAL , +RISCV_ISA_EXT_SSAIA , + RISCV_ISA_EXT_SMAIA,
These will change a couple different ways due other other patches in flight, but let's put the pair in alphabetical order now so they get moved together that way.
arch/riscv/include/asm/hwcap.h enum riscv_isa_ext_id { · line 72
Quoted 9 lines
arch/riscv/include/asm/hwcap.h +5
-0RISCV_ISA_EXT_ID_MAX };static_assert (RISCV_ISA_EXT_ID_MAX <=RISCV_ISA_EXT_MAX ); +#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
This isn't used in this patch, so should probably be introduced in a later patch when it is.
Quoted 33 lines
arch/riscv/include/asm/hwcap.h +1
-0+/* * This enum represents the logical ID for each RISC-V ISA extension static * keys. We can use static key to optimize code path if some ISA extensions arch/riscv/kernel/cpu.c +2
-0@@ -162,6 +162,8 @@ arch_initcall(riscv_cpuinfo_init);* extensions by an underscore. */ static struct riscv_isa_ext_data isa_ext_arr[] = { +__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@@ -228,6 +228,8 @@ void __init riscv_fill_hwcap(void)SET_ISA_EXT_MAP ("zihintpause" ,RISCV_ISA_EXT_ZIHINTPAUSE );SET_ISA_EXT_MAP ("sstc" ,RISCV_ISA_EXT_SSTC );SET_ISA_EXT_MAP ("svinval" ,RISCV_ISA_EXT_SVINVAL ); +SET_ISA_EXT_MAP ("smaia" ,RISCV_ISA_EXT_SMAIA ); +SET_ISA_EXT_MAP ("ssaia" ,RISCV_ISA_EXT_SSAIA ); }#undef SET_ISA_EXT_MAP }Signature · 1 line
2.34.1
Otherwise,
Thanks,
drew
Re: [PATCH 2/7] RISC-V: Detect AIA CSRs from ISA string
Quoted 14 lines · Andrew Jones
Quoted 12 lines · Anup Patel
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]>--- arch/riscv/include/asm/hwcap.h | 8 ++++++++ arch/riscv/kernel/cpu.c | 2 ++ arch/riscv/kernel/cpufeature.c | 2 ++ 3 files changed, 12 insertions(+)
Quoted 14 lines
arch/riscv/include/asm/hwcap.h enum riscv_isa_ext_id { · line 63
Quoted 10 lines
arch/riscv/include/asm/hwcap.h +2
-0@@ -59,10 +59,18 @@ enum riscv_isa_ext_id {RISCV_ISA_EXT_ZIHINTPAUSE ,RISCV_ISA_EXT_SSTC ,RISCV_ISA_EXT_SVINVAL , +RISCV_ISA_EXT_SSAIA , + RISCV_ISA_EXT_SMAIA,These will change a couple different ways due other other patches in flight, but let's put the pair in alphabetical order now so they get moved together that way.
Okay, I will update.
Quoted 5 lines
Quoted 5 lines
arch/riscv/include/asm/hwcap.h +0
-0RISCV_ISA_EXT_ID_MAX };static_assert (RISCV_ISA_EXT_ID_MAX <=RISCV_ISA_EXT_MAX );
Quoted 8 lines
arch/riscv/include/asm/hwcap.h enum riscv_isa_ext_id { · line 72
Quoted 5 lines
arch/riscv/include/asm/hwcap.h +5
-0+#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 This isn't used in this patch, so should probably be introduced in a later patch when it is.
Okay, I will move this to the patch where it is used.
Quoted 37 lines
Quoted 32 lines
arch/riscv/include/asm/hwcap.h +1
-0+/* * This enum represents the logical ID for each RISC-V ISA extension static * keys. We can use static key to optimize code path if some ISA extensions arch/riscv/kernel/cpu.c +2
-0@@ -162,6 +162,8 @@ arch_initcall(riscv_cpuinfo_init);* extensions by an underscore. */ static struct riscv_isa_ext_data isa_ext_arr[] = { +__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@@ -228,6 +228,8 @@ void __init riscv_fill_hwcap(void)SET_ISA_EXT_MAP ("zihintpause" ,RISCV_ISA_EXT_ZIHINTPAUSE );SET_ISA_EXT_MAP ("sstc" ,RISCV_ISA_EXT_SSTC );SET_ISA_EXT_MAP ("svinval" ,RISCV_ISA_EXT_SVINVAL ); +SET_ISA_EXT_MAP ("smaia" ,RISCV_ISA_EXT_SMAIA ); +SET_ISA_EXT_MAP ("ssaia" ,RISCV_ISA_EXT_SSAIA ); }#undef SET_ISA_EXT_MAP } --Quoted 2 lines
2.34.1
Otherwise,
Quoted 2 lines
Reviewed-by Andrew Jones <[email protected]>
Thanks,
Anup
PATCH 3/7 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.
--- arch/riscv/include/asm/csr.h | 8 ++++---- arch/riscv/kvm/mmu.c | 3 +-- arch/riscv/kvm/vmid.c | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-)
arch/riscv/include/asm/csr.h +4 -4
@@ -131,12 +131,12 @@#define HGATP32_MODE_SHIFT 31#define HGATP32_VMID_SHIFT 22 -#define HGATP32_VMID_MASK _AC(0x1FC00000, UL) +#define HGATP32_VMID _AC(0x1FC00000, UL)#define HGATP32_PPN _AC(0x003FFFFF, UL)#define HGATP64_MODE_SHIFT 60#define HGATP64_VMID_SHIFT 44 -#define HGATP64_VMID_MASK _AC(0x03FFF00000000000, UL) +#define HGATP64_VMID _AC(0x03FFF00000000000, UL)#define HGATP64_PPN _AC(0x00000FFFFFFFFFFF, UL)#define HGATP_PAGE_SHIFT 12
@@ -144,12 +144,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
@@ -748,8 +748,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 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
Re: [PATCH 3/7] RISC-V: KVM: Drop the _MASK suffix from hgatp.VMID mask defines
Quoted 79 lines · Anup Patel
The 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_MASKsuffix.Signed-off-by Anup Patel <[email protected]>--- arch/riscv/include/asm/csr.h | 8 ++++---- arch/riscv/kvm/mmu.c | 3 +-- arch/riscv/kvm/vmid.c | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-)arch/riscv/include/asm/csr.h +4
-4@@ -131,12 +131,12 @@#define HGATP32_MODE_SHIFT 31#define HGATP32_VMID_SHIFT 22 -#define HGATP32_VMID_MASK _AC(0x1FC00000, UL) +#define HGATP32_VMID _AC(0x1FC00000, UL)#define HGATP32_PPN _AC(0x003FFFFF, UL)#define HGATP64_MODE_SHIFT 60#define HGATP64_VMID_SHIFT 44 -#define HGATP64_VMID_MASK _AC(0x03FFF00000000000, UL) +#define HGATP64_VMID _AC(0x03FFF00000000000, UL)#define HGATP64_PPN _AC(0x00000FFFFFFFFFFF, UL)#define HGATP_PAGE_SHIFT 12@@ -144,12 +144,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@@ -748,8 +748,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 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
Could switch to GENMASK too at the same time :-)
Anyway,
Thanks,
drew
Re: [PATCH 3/7] RISC-V: KVM: Drop the _MASK suffix from hgatp.VMID mask defines
Quoted 78 lines · Andrew Jones
Quoted 76 lines · Anup Patel
The 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_MASKsuffix.Signed-off-by Anup Patel <[email protected]>--- arch/riscv/include/asm/csr.h | 8 ++++---- arch/riscv/kvm/mmu.c | 3 +-- arch/riscv/kvm/vmid.c | 4 ++-- 3 files changed, 7 insertions(+), 8 deletions(-)arch/riscv/include/asm/csr.h +4
-4@@ -131,12 +131,12 @@#define HGATP32_MODE_SHIFT 31#define HGATP32_VMID_SHIFT 22 -#define HGATP32_VMID_MASK _AC(0x1FC00000, UL) +#define HGATP32_VMID _AC(0x1FC00000, UL)#define HGATP32_PPN _AC(0x003FFFFF, UL)#define HGATP64_MODE_SHIFT 60#define HGATP64_VMID_SHIFT 44 -#define HGATP64_VMID_MASK _AC(0x03FFF00000000000, UL) +#define HGATP64_VMID _AC(0x03FFF00000000000, UL)#define HGATP64_PPN _AC(0x00000FFFFFFFFFFF, UL)#define HGATP_PAGE_SHIFT 12@@ -144,12 +144,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@@ -748,8 +748,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 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);
Quoted 5 lines
Quoted 3 lines
--
2.34.1Could switch to GENMASK too at the same time :-)
Okay, I will update.
Quoted 5 lines
Anyway,
Reviewed-by Andrew Jones <[email protected]>
Thanks,
Anup
PATCH 4/7 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/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 | 13 ++++ arch/riscv/kvm/vcpu.c | 40 ++++++++++- arch/riscv/kvm/vcpu_insn.c | 4 +- arch/riscv/kvm/vm.c | 4 ++ 8 files changed, 240 insertions(+), 4 deletions(-) create mode 100644 arch/riscv/include/asm/kvm_aia.h create mode 100644 arch/riscv/kvm/aia.c
arch/riscv/include/asm/kvm_aia.h new file +109 -0
@@ -0,0 +1,109 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Copyright (C) 2021 Western Digital Corporation or its affiliates. +* Copyright (C) 2022 Ventana Micro Systems Inc. +* +* Authors: +* Anup Patel <[email protected]> +*/ + +#ifndef __KVM_RISCV_AIA_H +#define __KVM_RISCV_AIA_H + +#include <linux/jump_label.h> +#include <linux/kvm_types.h> + +struct kvm_aia { +/* In-kernel irqchip created */ +bool in_kernel; + +/* In-kernel irqchip initialized */ +bool initialized; +}; + +struct kvm_vcpu_aia { +}; + +#define kvm_riscv_aia_initialized (k) (!!((k)->arch.aia.initialized)) + +#define irqchip_in_kernel (k) (!!((k)->arch.aia.in_kernel)) + +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) +{ +} + +static inline int kvm_riscv_vcpu_aia_get_csr (struct kvm_vcpu *vcpu, +unsigned long reg_num, +unsigned long *out_val) +{ + *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) +{ +return 0 ; +} + +#define KVM_RISCV_VCPU_AIA_CSR_FUNCS + +static inline int kvm_riscv_vcpu_aia_update (struct kvm_vcpu *vcpu) +{ +return 1 ; +} + +static inline void kvm_riscv_vcpu_aia_reset (struct kvm_vcpu *vcpu) +{ +} + +static inline int kvm_riscv_vcpu_aia_init (struct kvm_vcpu *vcpu) +{ +return 0 ; +} + +static inline void kvm_riscv_vcpu_aia_deinit (struct kvm_vcpu *vcpu) +{ +} + +static inline void kvm_riscv_aia_init_vm (struct kvm *kvm) +{ +} + +static inline void kvm_riscv_aia_destroy_vm (struct kvm *kvm) +{ +} + +void kvm_riscv_aia_enable (void ); +void kvm_riscv_aia_disable (void ); +int kvm_riscv_aia_init (void ); +void kvm_riscv_aia_exit (void ); + +#endif
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>
@@ -93,6 +94,9 @@ struct kvm_arch {/* Guest Timer */ struct kvm_guest_timer timer; + +/* AIA Guest/VM context */ +struct kvm_aia aia; };struct kvm_cpu_trap {
@@ -220,6 +224,9 @@ struct kvm_vcpu_arch {/* SBI context */ struct kvm_vcpu_sbi_context sbi_context; +/* AIA VCPU context */ +struct kvm_vcpu_aia aia; +/* Cache pages needed to program page tables with spinlock held */ struct kvm_mmu_memory_cache mmu_page_cache;
arch/riscv/kvm/Makefile +1 -0
@@ -25,3 +25,4 @@ kvm-y += vcpu_sbi_base.o kvm-y += vcpu_sbi_replace.o kvm-y += vcpu_sbi_hsm.o kvm-y += vcpu_timer.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 +13 -0
@@ -53,11 +53,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
@@ -72,6 +76,7 @@ void kvm_arch_hardware_disable(void)int kvm_arch_init (void *opaque) { +int rc;const char *str;if (!riscv_isa_extension_available (NULL , h)) {
@@ -93,6 +98,10 @@ int kvm_arch_init(void *opaque)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 ()) {
@@ -115,11 +124,15 @@ int kvm_arch_init(void *opaque)kvm_info ("VMID %ld bits available\n" ,kvm_riscv_gstage_vmid_bits ()); +if (kvm_riscv_aia_available ()) +kvm_info ("AIA available\n" ); +return 0 ; }void kvm_arch_exit (void ) { +kvm_riscv_aia_exit (); }static int __init riscv_kvm_init (void )
arch/riscv/kvm/vcpu.c +37 -3
@@ -135,6 +135,8 @@ static void kvm_riscv_reset_vcpu(struct kvm_vcpu *vcpu)kvm_riscv_vcpu_timer_reset (vcpu); +kvm_riscv_vcpu_aia_reset (vcpu); +WRITE_ONCE (vcpu->arch.irqs_pending,0 );WRITE_ONCE (vcpu->arch.irqs_pending_mask,0 );
@@ -155,6 +157,7 @@ int kvm_arch_vcpu_precreate(struct kvm *kvm, unsigned int id)int kvm_arch_vcpu_create (struct kvm_vcpu *vcpu) { +int rc;struct kvm_cpu_context *cntx;struct kvm_vcpu_csr *reset_csr = &vcpu->arch.guest_reset_csr;unsigned long host_isa, i;
@@ -194,6 +197,11 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu)/* Setup VCPU timer */ kvm_riscv_vcpu_timer_init (vcpu); +/* Setup VCPU AIA */ + rc =kvm_riscv_vcpu_aia_init (vcpu); +if (rc) +return rc; +/* Reset VCPU */ kvm_riscv_reset_vcpu (vcpu);
@@ -213,6 +221,9 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)void kvm_arch_vcpu_destroy (struct kvm_vcpu *vcpu) { +/* Cleanup VCPU AIA context */ +kvm_riscv_vcpu_aia_deinit (vcpu); +/* Cleanup VCPU timer */ kvm_riscv_vcpu_timer_deinit (vcpu);
@@ -730,6 +741,9 @@ void kvm_riscv_vcpu_flush_interrupts(struct kvm_vcpu *vcpu) csr->hvip &= ~mask; csr->hvip |= val; } + +/* Flush AIA high interrupts */ +kvm_riscv_vcpu_aia_flush_interrupts (vcpu); }void kvm_riscv_vcpu_sync_interrupts (struct kvm_vcpu *vcpu)
@@ -755,6 +769,9 @@ void kvm_riscv_vcpu_sync_interrupts(struct kvm_vcpu *vcpu) } } +/* Sync-up AIA high interrupts */ +kvm_riscv_vcpu_aia_sync_interrupts (vcpu); +/* Sync-up timer CSRs */ kvm_riscv_vcpu_timer_sync (vcpu); }
@@ -791,10 +808,15 @@ int kvm_riscv_vcpu_unset_interrupt(struct kvm_vcpu *vcpu, unsigned int irq)bool kvm_riscv_vcpu_has_interrupts (struct kvm_vcpu *vcpu,unsigned long mask) { -unsigned long ie = ((vcpu->arch.guest_csr.vsie &VSIP_VALID_MASK ) - <<VSIP_TO_HVIP_SHIFT ) & mask; +unsigned long ie; + + ie = ((vcpu->arch.guest_csr.vsie &VSIP_VALID_MASK ) + <<VSIP_TO_HVIP_SHIFT ) & mask; +if (READ_ONCE (vcpu->arch.irqs_pending) & ie) +return true; -return (READ_ONCE (vcpu->arch.irqs_pending) & ie) ? true : false; +/* Check AIA high interrupts */ +return kvm_riscv_vcpu_aia_has_interrupts (vcpu, mask); }void kvm_riscv_vcpu_power_off (struct kvm_vcpu *vcpu)
@@ -890,6 +912,8 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)kvm_riscv_vcpu_guest_fp_restore (&vcpu->arch.guest_context, vcpu->arch.isa); +kvm_riscv_vcpu_aia_load (vcpu, cpu); + vcpu->cpu = cpu; }
@@ -899,6 +923,8 @@ void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu) vcpu->cpu =-1 ; +kvm_riscv_vcpu_aia_put (vcpu); +kvm_riscv_vcpu_guest_fp_save (&vcpu->arch.guest_context, vcpu->arch.isa);kvm_riscv_vcpu_host_fp_restore (&vcpu->arch.host_context);
@@ -966,6 +992,7 @@ static void kvm_riscv_update_hvip(struct kvm_vcpu *vcpu)struct kvm_vcpu_csr *csr = &vcpu->arch.guest_csr;csr_write (CSR_HVIP , csr->hvip); +kvm_riscv_vcpu_aia_update_hvip (vcpu); }/*
@@ -1040,6 +1067,13 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu)local_irq_disable (); +/* Update AIA HW state before entering guest */ + ret =kvm_riscv_vcpu_aia_update (vcpu); +if (ret <=0 ) { +local_irq_enable (); +continue ; + } +/* * Ensure we set mode to IN_GUEST_MODE after we disable * interrupts and before the final VCPU requests check.
arch/riscv/kvm/vcpu_insn.c +3 -1
@@ -213,7 +213,9 @@ struct csr_func { unsigned long wr_mask); }; -static const struct csr_func csr_funcs[] = { }; +static const struct csr_func csr_funcs[] = { +KVM_RISCV_VCPU_AIA_CSR_FUNCS +};/** * kvm_riscv_vcpu_csr_return -- Handle CSR read/write after user space
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
Re: [PATCH 4/7] RISC-V: KVM: Initial skeletal support for AIA
Quoted 43 lines · Anup Patel
To 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.
Signed-off-by Anup Patel <[email protected]>--- 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 | 13 ++++ arch/riscv/kvm/vcpu.c | 40 ++++++++++- arch/riscv/kvm/vcpu_insn.c | 4 +- arch/riscv/kvm/vm.c | 4 ++ 8 files changed, 240 insertions(+), 4 deletions(-) create mode 100644 arch/riscv/include/asm/kvm_aia.h create mode 100644 arch/riscv/kvm/aia.carch/riscv/include/asm/kvm_aia.h new file +19
-0@@ -0,0 +1,109 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Copyright (C) 2021 Western Digital Corporation or its affiliates. +* Copyright (C) 2022 Ventana Micro Systems Inc. +* +* Authors: +* Anup Patel <[email protected]> +*/ + +#ifndef __KVM_RISCV_AIA_H +#define __KVM_RISCV_AIA_H + +#include <linux/jump_label.h> +#include <linux/kvm_types.h> + +struct kvm_aia { + /* In-kernel irqchip created */ + bool in_kernel; +
arch/riscv/include/asm/kvm_aia.h line 29
Quoted 10 lines
arch/riscv/include/asm/kvm_aia.h new file +10
-0+/* In-kernel irqchip initialized */ +bool initialized; +}; + +struct kvm_vcpu_aia { +}; + +#define kvm_riscv_aia_initialized (k) (!!((k)->arch.aia.initialized)) + +#define irqchip_in_kernel (k) (!!((k)->arch.aia.in_kernel))
No need for the '!!' operator in the above two defines since in both cases the type it's operating on is bool.
Quoted 103 lines
arch/riscv/include/asm/kvm_aia.h new file +80
-0+ +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) +{ +} + +static inline int kvm_riscv_vcpu_aia_get_csr (struct kvm_vcpu *vcpu, +unsigned long reg_num, +unsigned long *out_val) +{ + *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) +{ +return 0 ; +} + +#define KVM_RISCV_VCPU_AIA_CSR_FUNCS + +static inline int kvm_riscv_vcpu_aia_update (struct kvm_vcpu *vcpu) +{ +return 1 ; +} + +static inline void kvm_riscv_vcpu_aia_reset (struct kvm_vcpu *vcpu) +{ +} + +static inline int kvm_riscv_vcpu_aia_init (struct kvm_vcpu *vcpu) +{ +return 0 ; +} + +static inline void kvm_riscv_vcpu_aia_deinit (struct kvm_vcpu *vcpu) +{ +} + +static inline void kvm_riscv_aia_init_vm (struct kvm *kvm) +{ +} + +static inline void kvm_riscv_aia_destroy_vm (struct kvm *kvm) +{ +} + +void kvm_riscv_aia_enable (void ); +void kvm_riscv_aia_disable (void ); +int kvm_riscv_aia_init (void ); +void kvm_riscv_aia_exit (void ); + +#endif arch/riscv/include/asm/kvm_host.h +4
-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> @@ -93,6 +94,9 @@ struct kvm_arch {/* Guest Timer */ struct kvm_guest_timer timer; + +/* AIA Guest/VM context */ +struct kvm_aia aia; };struct kvm_cpu_trap {
arch/riscv/include/asm/kvm_host.h struct kvm_vcpu_arch { · line 228
Quoted 5 lines
arch/riscv/include/asm/kvm_host.h +2
-0@@ -220,6 +224,9 @@ struct kvm_vcpu_arch {/* SBI context */ struct kvm_vcpu_sbi_context sbi_context; +/* AIA VCPU context */ +struct kvm_vcpu_aia aia;
Maybe name this one vcpu_aia?
arch/riscv/kvm/Makefile kvm-y += vcpu_sbi_base.o · line 28
Quoted 13 lines
arch/riscv/include/asm/kvm_host.h +1
-0+/* Cache pages needed to program page tables with spinlock held */ struct kvm_mmu_memory_cache mmu_page_cache;arch/riscv/kvm/Makefile +1
-0@@ -25,3 +25,4 @@ kvm-y += vcpu_sbi_base.o kvm-y += vcpu_sbi_replace.o kvm-y += vcpu_sbi_hsm.o kvm-y += vcpu_timer.o +kvm-y += aia.o
Shouldn't the compilation of aia.c depend on the same config(s) as the rest of the kernel's AIA support?
Quoted 11 lines
arch/riscv/kvm/aia.c new file +5
-0@@ -0,0 +1,66 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (C) 2021 Western Digital Corporation or its affiliates. +* Copyright (C) 2022 Ventana Micro Systems Inc. +*
arch/riscv/kvm/aia.c line 15
Quoted 10 lines
arch/riscv/kvm/aia.c new file +10
-0+* Authors: +* Anup Patel <[email protected]> +*/ + +#include <linux/kvm_host.h> +#include <asm/hwcap.h> + +DEFINE_STATIC_KEY_FALSE (kvm_riscv_aia_available); + +static inline void aia_set_hvictl (bool ext_irq_pending)
I'd drop the 'inline' from functions in .c files and let the compiler fully decide.
arch/riscv/kvm/aia.c line 25
Quoted 10 lines
arch/riscv/kvm/aia.c new file +10
-0+{ +unsigned long hvictl; + +/* +* HVICTL.IID == 9 and HVICTL.IPRIO == 0 represents +* no interrupt in HVICTL. +*/ + + hvictl = (IRQ_S_EXT <<HVICTL_IID_SHIFT ) &HVICTL_IID ; + hvictl |= (ext_irq_pending) ?1 :0 ;
ext_irq_pending is bool, so this can just be 'hvictl |= ext_irq_pending'.
Quoted 258 lines
arch/riscv/kvm/aia.c new file +41
-0+csr_write (CSR_HVICTL , hvictl); +} + +void kvm_riscv_aia_enable (void ) +{ +if (!kvm_riscv_aia_available ()) +return ; + +aia_set_hvictl (false); +csr_write (CSR_HVIPRIO1 ,0x0 ); +csr_write (CSR_HVIPRIO2 ,0x0 ); +#ifdef CONFIG_32BIT +csr_write (CSR_HVIPH ,0x0 ); +csr_write (CSR_HIDELEGH ,0x0 ); +csr_write (CSR_HVIPRIO1H ,0x0 ); +csr_write (CSR_HVIPRIO2H ,0x0 ); +#endif +} + +void kvm_riscv_aia_disable (void ) +{ +if (!kvm_riscv_aia_available ()) +return ; + +aia_set_hvictl (false); +} + +int kvm_riscv_aia_init (void ) +{ +if (!riscv_isa_extension_available (NULL , SxAIA)) +return -ENODEV ; + +/* Enable KVM AIA support */ +static_branch_enable (&kvm_riscv_aia_available); + +return 0 ; +} + +void kvm_riscv_aia_exit (void ) +{ +}arch/riscv/kvm/main.c +13
-0@@ -53,11 +53,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 @@ -72,6 +76,7 @@ void kvm_arch_hardware_disable(void)int kvm_arch_init (void *opaque) { +int rc;const char *str;if (!riscv_isa_extension_available (NULL , h)) {@@ -93,6 +98,10 @@ int kvm_arch_init(void *opaque)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 ()) {@@ -115,11 +124,15 @@ int kvm_arch_init(void *opaque)kvm_info ("VMID %ld bits available\n" ,kvm_riscv_gstage_vmid_bits ()); +if (kvm_riscv_aia_available ()) +kvm_info ("AIA available\n" ); +return 0 ; }void kvm_arch_exit (void ) { +kvm_riscv_aia_exit (); }static int __init riscv_kvm_init (void )arch/riscv/kvm/vcpu.c +37
-3@@ -135,6 +135,8 @@ static void kvm_riscv_reset_vcpu(struct kvm_vcpu *vcpu)kvm_riscv_vcpu_timer_reset (vcpu); +kvm_riscv_vcpu_aia_reset (vcpu); +WRITE_ONCE (vcpu->arch.irqs_pending,0 );WRITE_ONCE (vcpu->arch.irqs_pending_mask,0 );@@ -155,6 +157,7 @@ int kvm_arch_vcpu_precreate(struct kvm *kvm, unsigned int id)int kvm_arch_vcpu_create (struct kvm_vcpu *vcpu) { +int rc;struct kvm_cpu_context *cntx;struct kvm_vcpu_csr *reset_csr = &vcpu->arch.guest_reset_csr;unsigned long host_isa, i;@@ -194,6 +197,11 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu)/* Setup VCPU timer */ kvm_riscv_vcpu_timer_init (vcpu); +/* Setup VCPU AIA */ + rc =kvm_riscv_vcpu_aia_init (vcpu); +if (rc) +return rc; +/* Reset VCPU */ kvm_riscv_reset_vcpu (vcpu);@@ -213,6 +221,9 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)void kvm_arch_vcpu_destroy (struct kvm_vcpu *vcpu) { +/* Cleanup VCPU AIA context */ +kvm_riscv_vcpu_aia_deinit (vcpu); +/* Cleanup VCPU timer */ kvm_riscv_vcpu_timer_deinit (vcpu);@@ -730,6 +741,9 @@ void kvm_riscv_vcpu_flush_interrupts(struct kvm_vcpu *vcpu) csr->hvip &= ~mask; csr->hvip |= val; } + +/* Flush AIA high interrupts */ +kvm_riscv_vcpu_aia_flush_interrupts (vcpu); }void kvm_riscv_vcpu_sync_interrupts (struct kvm_vcpu *vcpu)@@ -755,6 +769,9 @@ void kvm_riscv_vcpu_sync_interrupts(struct kvm_vcpu *vcpu) } } +/* Sync-up AIA high interrupts */ +kvm_riscv_vcpu_aia_sync_interrupts (vcpu); +/* Sync-up timer CSRs */ kvm_riscv_vcpu_timer_sync (vcpu); }@@ -791,10 +808,15 @@ int kvm_riscv_vcpu_unset_interrupt(struct kvm_vcpu *vcpu, unsigned int irq)bool kvm_riscv_vcpu_has_interrupts (struct kvm_vcpu *vcpu,unsigned long mask) { -unsigned long ie = ((vcpu->arch.guest_csr.vsie &VSIP_VALID_MASK ) - <<VSIP_TO_HVIP_SHIFT ) & mask; +unsigned long ie; + + ie = ((vcpu->arch.guest_csr.vsie &VSIP_VALID_MASK ) + <<VSIP_TO_HVIP_SHIFT ) & mask; +if (READ_ONCE (vcpu->arch.irqs_pending) & ie) +return true; -return (READ_ONCE (vcpu->arch.irqs_pending) & ie) ? true : false; +/* Check AIA high interrupts */ +return kvm_riscv_vcpu_aia_has_interrupts (vcpu, mask); }void kvm_riscv_vcpu_power_off (struct kvm_vcpu *vcpu)@@ -890,6 +912,8 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)kvm_riscv_vcpu_guest_fp_restore (&vcpu->arch.guest_context, vcpu->arch.isa); +kvm_riscv_vcpu_aia_load (vcpu, cpu); + vcpu->cpu = cpu; }@@ -899,6 +923,8 @@ void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu) vcpu->cpu =-1 ; +kvm_riscv_vcpu_aia_put (vcpu); +kvm_riscv_vcpu_guest_fp_save (&vcpu->arch.guest_context, vcpu->arch.isa);kvm_riscv_vcpu_host_fp_restore (&vcpu->arch.host_context);@@ -966,6 +992,7 @@ static void kvm_riscv_update_hvip(struct kvm_vcpu *vcpu)struct kvm_vcpu_csr *csr = &vcpu->arch.guest_csr;csr_write (CSR_HVIP , csr->hvip); +kvm_riscv_vcpu_aia_update_hvip (vcpu); }/* @@ -1040,6 +1067,13 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu)local_irq_disable (); +/* Update AIA HW state before entering guest */ + ret =kvm_riscv_vcpu_aia_update (vcpu); +if (ret <=0 ) { +local_irq_enable (); +continue ; + } +/* * Ensure we set mode to IN_GUEST_MODE after we disable * interrupts and before the final VCPU requests check. arch/riscv/kvm/vcpu_insn.c +3
-1@@ -213,7 +213,9 @@ struct csr_func { unsigned long wr_mask); }; -static const struct csr_func csr_funcs[] = { }; +static const struct csr_func csr_funcs[] = { +KVM_RISCV_VCPU_AIA_CSR_FUNCS +};/** * kvm_riscv_vcpu_csr_return -- Handle CSR read/write after user space 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
Thanks,
drew
Re: [PATCH 4/7] RISC-V: KVM: Initial skeletal support for AIA
Quoted 50 lines · Andrew Jones
Quoted 48 lines · Anup Patel
To 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.
Signed-off-by Anup Patel <[email protected]>--- 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 | 13 ++++ arch/riscv/kvm/vcpu.c | 40 ++++++++++- arch/riscv/kvm/vcpu_insn.c | 4 +- arch/riscv/kvm/vm.c | 4 ++ 8 files changed, 240 insertions(+), 4 deletions(-) create mode 100644 arch/riscv/include/asm/kvm_aia.h create mode 100644 arch/riscv/kvm/aia.carch/riscv/include/asm/kvm_aia.h new file +24
-0@@ -0,0 +1,109 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Copyright (C) 2021 Western Digital Corporation or its affiliates. +* Copyright (C) 2022 Ventana Micro Systems Inc. +* +* Authors: +* Anup Patel <[email protected]> +*/ + +#ifndef __KVM_RISCV_AIA_H +#define __KVM_RISCV_AIA_H + +#include <linux/jump_label.h> +#include <linux/kvm_types.h> + +struct kvm_aia { +/* In-kernel irqchip created */ +bool in_kernel; + +/* In-kernel irqchip initialized */ +bool initialized; +}; + +struct kvm_vcpu_aia {
Quoted 8 lines
arch/riscv/include/asm/kvm_aia.h line 29
Quoted 5 lines
arch/riscv/include/asm/kvm_aia.h new file +5
-0+}; + +#define kvm_riscv_aia_initialized (k) (!!((k)->arch.aia.initialized)) + +#define irqchip_in_kernel (k) (!!((k)->arch.aia.in_kernel))No need for the '!!' operator in the above two defines since in both cases the type it's operating on is bool.
Okay, I will update.
Quoted 107 lines
Quoted 107 lines
arch/riscv/include/asm/kvm_aia.h new file +80
-0+ +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) +{ +} + +static inline int kvm_riscv_vcpu_aia_get_csr (struct kvm_vcpu *vcpu, +unsigned long reg_num, +unsigned long *out_val) +{ + *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) +{ +return 0 ; +} + +#define KVM_RISCV_VCPU_AIA_CSR_FUNCS + +static inline int kvm_riscv_vcpu_aia_update (struct kvm_vcpu *vcpu) +{ +return 1 ; +} + +static inline void kvm_riscv_vcpu_aia_reset (struct kvm_vcpu *vcpu) +{ +} + +static inline int kvm_riscv_vcpu_aia_init (struct kvm_vcpu *vcpu) +{ +return 0 ; +} + +static inline void kvm_riscv_vcpu_aia_deinit (struct kvm_vcpu *vcpu) +{ +} + +static inline void kvm_riscv_aia_init_vm (struct kvm *kvm) +{ +} + +static inline void kvm_riscv_aia_destroy_vm (struct kvm *kvm) +{ +} + +void kvm_riscv_aia_enable (void ); +void kvm_riscv_aia_disable (void ); +int kvm_riscv_aia_init (void ); +void kvm_riscv_aia_exit (void ); + +#endif arch/riscv/include/asm/kvm_host.h +4
-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> @@ -93,6 +94,9 @@ struct kvm_arch {/* Guest Timer */ struct kvm_guest_timer timer; + +/* AIA Guest/VM context */ +struct kvm_aia aia; };struct kvm_cpu_trap {@@ -220,6 +224,9 @@ struct kvm_vcpu_arch {/* SBI context */ struct kvm_vcpu_sbi_context sbi_context;
Quoted 4 lines
arch/riscv/include/asm/kvm_host.h struct kvm_vcpu_arch { · line 228
Quoted 2 lines
arch/riscv/include/asm/kvm_host.h +2
-0+/* AIA VCPU context */ +struct kvm_vcpu_aia aia;Maybe name this one
vcpu_aia?
To be consistent with a few other variables in struct kvm_vcpu_arch, I will add "_context" suffix to aia variable name.
Quoted 5 lines
Quoted 5 lines
arch/riscv/include/asm/kvm_host.h +1
-0+/* Cache pages needed to program page tables with spinlock held */ struct kvm_mmu_memory_cache mmu_page_cache;
Quoted 12 lines
arch/riscv/kvm/Makefile kvm-y += vcpu_sbi_base.o · line 28
Quoted 9 lines
arch/riscv/kvm/Makefile +1
-0@@ -25,3 +25,4 @@ kvm-y += vcpu_sbi_base.o kvm-y += vcpu_sbi_replace.o kvm-y += vcpu_sbi_hsm.o kvm-y += vcpu_timer.o +kvm-y += aia.oShouldn't the compilation of
aia.cdepend on the same config(s) as the rest of the kernel's AIA support?
The AIA CSRs are just like other ISA extensions which we detect from the host ISA string. A kconfig option is not required for AIA CSRs since users can always disable AIA CSRs from their ISA strings in DT.
Quoted 17 lines
Quoted 17 lines
arch/riscv/kvm/aia.c new file +10
-0@@ -0,0 +1,66 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (C) 2021 Western Digital Corporation or its affiliates. +* Copyright (C) 2022 Ventana Micro Systems Inc. +* +* Authors: +* Anup Patel <[email protected]> +*/ + +#include <linux/kvm_host.h>
Quoted 8 lines
arch/riscv/kvm/aia.c line 15
Quoted 5 lines
arch/riscv/kvm/aia.c new file +5
-0+#include <asm/hwcap.h> + +DEFINE_STATIC_KEY_FALSE (kvm_riscv_aia_available); + +static inline void aia_set_hvictl (bool ext_irq_pending)I'd drop the 'inline' from functions in .c files and let the compiler fully decide.
Okay, I will update.
Quoted 13 lines
arch/riscv/kvm/aia.c line 25
Quoted 11 lines
arch/riscv/kvm/aia.c new file +10
-0+{ +unsigned long hvictl; + +/* +* HVICTL.IID == 9 and HVICTL.IPRIO == 0 represents +* no interrupt in HVICTL. +*/ + + hvictl = (IRQ_S_EXT <<HVICTL_IID_SHIFT ) &HVICTL_IID ; + hvictl |= (ext_irq_pending) ?1 :0 ;
ext_irq_pendingis bool, so this can just be 'hvictl |=ext_irq_pending'.
Okay, I will update.
Quoted 255 lines
Quoted 255 lines
arch/riscv/kvm/aia.c new file +41
-0+csr_write (CSR_HVICTL , hvictl); +} + +void kvm_riscv_aia_enable (void ) +{ +if (!kvm_riscv_aia_available ()) +return ; + +aia_set_hvictl (false); +csr_write (CSR_HVIPRIO1 ,0x0 ); +csr_write (CSR_HVIPRIO2 ,0x0 ); +#ifdef CONFIG_32BIT +csr_write (CSR_HVIPH ,0x0 ); +csr_write (CSR_HIDELEGH ,0x0 ); +csr_write (CSR_HVIPRIO1H ,0x0 ); +csr_write (CSR_HVIPRIO2H ,0x0 ); +#endif +} + +void kvm_riscv_aia_disable (void ) +{ +if (!kvm_riscv_aia_available ()) +return ; + +aia_set_hvictl (false); +} + +int kvm_riscv_aia_init (void ) +{ +if (!riscv_isa_extension_available (NULL , SxAIA)) +return -ENODEV ; + +/* Enable KVM AIA support */ +static_branch_enable (&kvm_riscv_aia_available); + +return 0 ; +} + +void kvm_riscv_aia_exit (void ) +{ +}arch/riscv/kvm/main.c +13
-0@@ -53,11 +53,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 @@ -72,6 +76,7 @@ void kvm_arch_hardware_disable(void)int kvm_arch_init (void *opaque) { +int rc;const char *str;if (!riscv_isa_extension_available (NULL , h)) {@@ -93,6 +98,10 @@ int kvm_arch_init(void *opaque)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 ()) {@@ -115,11 +124,15 @@ int kvm_arch_init(void *opaque)kvm_info ("VMID %ld bits available\n" ,kvm_riscv_gstage_vmid_bits ()); +if (kvm_riscv_aia_available ()) +kvm_info ("AIA available\n" ); +return 0 ; }void kvm_arch_exit (void ) { +kvm_riscv_aia_exit (); }static int __init riscv_kvm_init (void )arch/riscv/kvm/vcpu.c +37
-3@@ -135,6 +135,8 @@ static void kvm_riscv_reset_vcpu(struct kvm_vcpu *vcpu)kvm_riscv_vcpu_timer_reset (vcpu); +kvm_riscv_vcpu_aia_reset (vcpu); +WRITE_ONCE (vcpu->arch.irqs_pending,0 );WRITE_ONCE (vcpu->arch.irqs_pending_mask,0 );@@ -155,6 +157,7 @@ int kvm_arch_vcpu_precreate(struct kvm *kvm, unsigned int id)int kvm_arch_vcpu_create (struct kvm_vcpu *vcpu) { +int rc;struct kvm_cpu_context *cntx;struct kvm_vcpu_csr *reset_csr = &vcpu->arch.guest_reset_csr;unsigned long host_isa, i;@@ -194,6 +197,11 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu)/* Setup VCPU timer */ kvm_riscv_vcpu_timer_init (vcpu); +/* Setup VCPU AIA */ + rc =kvm_riscv_vcpu_aia_init (vcpu); +if (rc) +return rc; +/* Reset VCPU */ kvm_riscv_reset_vcpu (vcpu);@@ -213,6 +221,9 @@ void kvm_arch_vcpu_postcreate(struct kvm_vcpu *vcpu)void kvm_arch_vcpu_destroy (struct kvm_vcpu *vcpu) { +/* Cleanup VCPU AIA context */ +kvm_riscv_vcpu_aia_deinit (vcpu); +/* Cleanup VCPU timer */ kvm_riscv_vcpu_timer_deinit (vcpu);@@ -730,6 +741,9 @@ void kvm_riscv_vcpu_flush_interrupts(struct kvm_vcpu *vcpu) csr->hvip &= ~mask; csr->hvip |= val; } + +/* Flush AIA high interrupts */ +kvm_riscv_vcpu_aia_flush_interrupts (vcpu); }void kvm_riscv_vcpu_sync_interrupts (struct kvm_vcpu *vcpu)@@ -755,6 +769,9 @@ void kvm_riscv_vcpu_sync_interrupts(struct kvm_vcpu *vcpu) } } +/* Sync-up AIA high interrupts */ +kvm_riscv_vcpu_aia_sync_interrupts (vcpu); +/* Sync-up timer CSRs */ kvm_riscv_vcpu_timer_sync (vcpu); }@@ -791,10 +808,15 @@ int kvm_riscv_vcpu_unset_interrupt(struct kvm_vcpu *vcpu, unsigned int irq)bool kvm_riscv_vcpu_has_interrupts (struct kvm_vcpu *vcpu,unsigned long mask) { -unsigned long ie = ((vcpu->arch.guest_csr.vsie &VSIP_VALID_MASK ) - <<VSIP_TO_HVIP_SHIFT ) & mask; +unsigned long ie; + + ie = ((vcpu->arch.guest_csr.vsie &VSIP_VALID_MASK ) + <<VSIP_TO_HVIP_SHIFT ) & mask; +if (READ_ONCE (vcpu->arch.irqs_pending) & ie) +return true; -return (READ_ONCE (vcpu->arch.irqs_pending) & ie) ? true : false; +/* Check AIA high interrupts */ +return kvm_riscv_vcpu_aia_has_interrupts (vcpu, mask); }void kvm_riscv_vcpu_power_off (struct kvm_vcpu *vcpu)@@ -890,6 +912,8 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu)kvm_riscv_vcpu_guest_fp_restore (&vcpu->arch.guest_context, vcpu->arch.isa); +kvm_riscv_vcpu_aia_load (vcpu, cpu); + vcpu->cpu = cpu; }@@ -899,6 +923,8 @@ void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu) vcpu->cpu =-1 ; +kvm_riscv_vcpu_aia_put (vcpu); +kvm_riscv_vcpu_guest_fp_save (&vcpu->arch.guest_context, vcpu->arch.isa);kvm_riscv_vcpu_host_fp_restore (&vcpu->arch.host_context);@@ -966,6 +992,7 @@ static void kvm_riscv_update_hvip(struct kvm_vcpu *vcpu)struct kvm_vcpu_csr *csr = &vcpu->arch.guest_csr;csr_write (CSR_HVIP , csr->hvip); +kvm_riscv_vcpu_aia_update_hvip (vcpu); }/* @@ -1040,6 +1067,13 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu)local_irq_disable (); +/* Update AIA HW state before entering guest */ + ret =kvm_riscv_vcpu_aia_update (vcpu); +if (ret <=0 ) { +local_irq_enable (); +continue ; + } +/* * Ensure we set mode to IN_GUEST_MODE after we disable * interrupts and before the final VCPU requests check. arch/riscv/kvm/vcpu_insn.c +3
-1@@ -213,7 +213,9 @@ struct csr_func { unsigned long wr_mask); }; -static const struct csr_func csr_funcs[] = { }; +static const struct csr_func csr_funcs[] = { +KVM_RISCV_VCPU_AIA_CSR_FUNCS +};/** * kvm_riscv_vcpu_csr_return -- Handle CSR read/write after user space 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); }
Quoted 7 lines
Quoted 4 lines
arch/riscv/kvm/vm.c +0
-1int kvm_vm_ioctl_check_extension (struct kvm *kvm,long ext) --2.34.1
Thanks,
drew
Thanks,
Anup
PATCH 5/7 RISC-V: KVM: Add ONE_REG interface for AIA CSRs
In reply to Anup PatelWe extend the CSR ONE_REG interface to access both general CSRs and AIA CSRs. To achieve this, we introduce "subtype" field in the ONE_REG id which can be used for grouping registers within a particular "type" of ONE_REG registers.
--- arch/riscv/include/uapi/asm/kvm.h | 15 ++++- arch/riscv/kvm/vcpu.c | 96 ++++++++++++++++++++++++------- 2 files changed, 89 insertions(+), 22 deletions(-)
arch/riscv/include/uapi/asm/kvm.h +13 -2
@@ -64,7 +64,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;
@@ -78,6 +78,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;
@@ -105,6 +109,7 @@ enum KVM_RISCV_ISA_EXT_ID {KVM_RISCV_ISA_EXT_SVINVAL ,KVM_RISCV_ISA_EXT_ZIHINTPAUSE ,KVM_RISCV_ISA_EXT_ZICBOM , +KVM_RISCV_ISA_EXT_SSAIA , KVM_RISCV_ISA_EXT_MAX, };
@@ -134,6 +139,8 @@ enum KVM_RISCV_SBI_EXT_ID {/* If you need to interpret the index values, here is the key: */ #define KVM_REG_RISCV_TYPE_MASK 0x00000000FF000000#define KVM_REG_RISCV_TYPE_SHIFT 24 +#define KVM_REG_RISCV_SUBTYPE_MASK 0x0000000000FF0000 +#define KVM_REG_RISCV_SUBTYPE_SHIFT 16/* Config registers are mapped as type 1 */ #define KVM_REG_RISCV_CONFIG (0x01 << KVM_REG_RISCV_TYPE_SHIFT)
@@ -147,8 +154,12 @@ 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 +#define KVM_REG_RISCV_CSR_AIA 0x1#define KVM_REG_RISCV_CSR_REG (name) \ - (offsetof(struct kvm_riscv_csr, name) / sizeof(unsigned long)) + (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 +76 -20
149 lines not on this page · raw message
Signature · 1 line
2.34.1
Re: [PATCH 5/7] RISC-V: KVM: Add ONE_REG interface for AIA CSRs
Quoted 44 lines · Anup Patel
We extend the CSR
ONE_REGinterface to access both general CSRs and AIA CSRs. To achieve this, we introduce "subtype" field in theONE_REGid which can be used for grouping registers within a particular "type" ofONE_REGregisters.Signed-off-by Anup Patel <[email protected]>--- arch/riscv/include/uapi/asm/kvm.h | 15 ++++- arch/riscv/kvm/vcpu.c | 96 ++++++++++++++++++++++++------- 2 files changed, 89 insertions(+), 22 deletions(-)arch/riscv/include/uapi/asm/kvm.h +6
-1@@ -64,7 +64,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;@@ -78,6 +78,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;@@ -105,6 +109,7 @@ enum KVM_RISCV_ISA_EXT_ID {KVM_RISCV_ISA_EXT_SVINVAL ,KVM_RISCV_ISA_EXT_ZIHINTPAUSE ,KVM_RISCV_ISA_EXT_ZICBOM , +KVM_RISCV_ISA_EXT_SSAIA , KVM_RISCV_ISA_EXT_MAX, };
arch/riscv/include/uapi/asm/kvm.h enum KVM_RISCV_SBI_EXT_ID { · line 143
Quoted 5 lines
arch/riscv/include/uapi/asm/kvm.h +2
-0@@ -134,6 +139,8 @@ enum KVM_RISCV_SBI_EXT_ID {/* If you need to interpret the index values, here is the key: */ #define KVM_REG_RISCV_TYPE_MASK 0x00000000FF000000#define KVM_REG_RISCV_TYPE_SHIFT 24 +#define KVM_REG_RISCV_SUBTYPE_MASK 0x0000000000FF0000 +#define KVM_REG_RISCV_SUBTYPE_SHIFT 16
We could just define a new AIA_CSR type, rather than introduce CSR subtypes. While grouping all CSRs together under the CSR type also makes sense, having to teach all userspaces about subtypes may not be worth the organizational benefits.
Quoted 177 lines
arch/riscv/include/uapi/asm/kvm.h +5
-1/* Config registers are mapped as type 1 */ #define KVM_REG_RISCV_CONFIG (0x01 << KVM_REG_RISCV_TYPE_SHIFT)@@ -147,8 +154,12 @@ 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 +#define KVM_REG_RISCV_CSR_AIA 0x1#define KVM_REG_RISCV_CSR_REG (name) \ - (offsetof(struct kvm_riscv_csr, name) / sizeof(unsigned long)) + (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 +76
-20@@ -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),@@ -96,6 +97,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 :@@ -451,30 +453,79 @@ static int kvm_riscv_vcpu_set_reg_core(struct kvm_vcpu *vcpu,return 0 ; } +static int kvm_riscv_vcpu_general_get_csr (struct kvm_vcpu *vcpu, +unsigned long reg_num, +unsigned long *out_val) +{ +struct kvm_vcpu_csr *csr = &vcpu->arch.guest_csr; + +if (reg_num >=sizeof (struct kvm_riscv_csr ) /sizeof (unsigned long )) +return -EINVAL ; + +if (reg_num ==KVM_REG_RISCV_CSR_REG (sip)) { +kvm_riscv_vcpu_flush_interrupts (vcpu); + *out_val = (csr->hvip >>VSIP_TO_HVIP_SHIFT ) &VSIP_VALID_MASK ; + }else + *out_val = ((unsigned long *)csr)[reg_num]; + +return 0 ; +} +static int kvm_riscv_vcpu_get_reg_csr (struct kvm_vcpu *vcpu,const struct kvm_one_reg *reg) { -struct kvm_vcpu_csr *csr = &vcpu->arch.guest_csr; +int rc;unsigned long __user *uaddr = (unsigned long __user *)(unsigned long )reg->addr;unsigned long reg_num = reg->id & ~(KVM_REG_ARCH_MASK |KVM_REG_SIZE_MASK |KVM_REG_RISCV_CSR ); -unsigned long reg_val; +unsigned long reg_val, reg_subtype;if (KVM_REG_SIZE (reg->id) !=sizeof (unsigned long ))return -EINVAL ; + + reg_subtype = (reg_num &KVM_REG_RISCV_SUBTYPE_MASK ) + >>KVM_REG_RISCV_SUBTYPE_SHIFT ; + reg_num &= ~KVM_REG_RISCV_SUBTYPE_MASK ; +switch (reg_subtype) { +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 ; + } +if (rc) +return rc; + +if (copy_to_user (uaddr, ®_val,KVM_REG_SIZE (reg->id))) +return -EFAULT ; + +return 0 ; +} + +static inline int kvm_riscv_vcpu_general_set_csr (struct kvm_vcpu *vcpu, +unsigned long reg_num, +unsigned long reg_val) +{ +struct kvm_vcpu_csr *csr = &vcpu->arch.guest_csr; +if (reg_num >=sizeof (struct kvm_riscv_csr ) /sizeof (unsigned long ))return -EINVAL ;if (reg_num ==KVM_REG_RISCV_CSR_REG (sip)) { -kvm_riscv_vcpu_flush_interrupts (vcpu); - reg_val = (csr->hvip >>VSIP_TO_HVIP_SHIFT ) &VSIP_VALID_MASK ; - }else - reg_val = ((unsigned long *)csr)[reg_num]; + reg_val &=VSIP_VALID_MASK ; + reg_val <<=VSIP_TO_HVIP_SHIFT ; + } -if (copy_to_user (uaddr, ®_val,KVM_REG_SIZE (reg->id))) -return -EFAULT ; + ((unsigned long *)csr)[reg_num] = reg_val; + +if (reg_num ==KVM_REG_RISCV_CSR_REG (sip)) +WRITE_ONCE (vcpu->arch.irqs_pending_mask,0 );return 0 ; }@@ -482,31 +533,36 @@ static int kvm_riscv_vcpu_get_reg_csr(struct kvm_vcpu *vcpu,static int kvm_riscv_vcpu_set_reg_csr (struct kvm_vcpu *vcpu,const struct kvm_one_reg *reg) { -struct kvm_vcpu_csr *csr = &vcpu->arch.guest_csr; +int rc;unsigned long __user *uaddr = (unsigned long __user *)(unsigned long )reg->addr;unsigned long reg_num = reg->id & ~(KVM_REG_ARCH_MASK |KVM_REG_SIZE_MASK |KVM_REG_RISCV_CSR ); -unsigned long reg_val; +unsigned long reg_val, reg_subtype;if (KVM_REG_SIZE (reg->id) !=sizeof (unsigned long ))return -EINVAL ; -if (reg_num >=sizeof (struct kvm_riscv_csr ) /sizeof (unsigned long )) -return -EINVAL ;if (copy_from_user (®_val, uaddr,KVM_REG_SIZE (reg->id)))return -EFAULT ; -if (reg_num ==KVM_REG_RISCV_CSR_REG (sip)) { - reg_val &=VSIP_VALID_MASK ; - reg_val <<=VSIP_TO_HVIP_SHIFT ; + reg_subtype = (reg_num &KVM_REG_RISCV_SUBTYPE_MASK ) + >>KVM_REG_RISCV_SUBTYPE_SHIFT ; + reg_num &= ~KVM_REG_RISCV_SUBTYPE_MASK ; +switch (reg_subtype) { +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 ; } - - ((unsigned long *)csr)[reg_num] = reg_val; - -if (reg_num ==KVM_REG_RISCV_CSR_REG (sip)) -WRITE_ONCE (vcpu->arch.irqs_pending_mask,0 ); +if (rc) +return rc;return 0 ; }Signature · 1 line
2.34.1
Thanks,
drew
Re: [PATCH 5/7] RISC-V: KVM: Add ONE_REG interface for AIA CSRs
Quoted 45 lines · Andrew Jones
Quoted 43 lines · Anup Patel
We extend the CSR
ONE_REGinterface to access both general CSRs and AIA CSRs. To achieve this, we introduce "subtype" field in theONE_REGid which can be used for grouping registers within a particular "type" ofONE_REGregisters.Signed-off-by Anup Patel <[email protected]>--- arch/riscv/include/uapi/asm/kvm.h | 15 ++++- arch/riscv/kvm/vcpu.c | 96 ++++++++++++++++++++++++------- 2 files changed, 89 insertions(+), 22 deletions(-)arch/riscv/include/uapi/asm/kvm.h +6
-1@@ -64,7 +64,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;@@ -78,6 +78,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;@@ -105,6 +109,7 @@ enum KVM_RISCV_ISA_EXT_ID {KVM_RISCV_ISA_EXT_SVINVAL ,KVM_RISCV_ISA_EXT_ZIHINTPAUSE ,KVM_RISCV_ISA_EXT_ZICBOM , +KVM_RISCV_ISA_EXT_SSAIA , KVM_RISCV_ISA_EXT_MAX, };
Quoted 11 lines
arch/riscv/include/uapi/asm/kvm.h enum KVM_RISCV_SBI_EXT_ID { · line 143
Quoted 6 lines
arch/riscv/include/uapi/asm/kvm.h +2
-0@@ -134,6 +139,8 @@ enum KVM_RISCV_SBI_EXT_ID {/* If you need to interpret the index values, here is the key: */ #define KVM_REG_RISCV_TYPE_MASK 0x00000000FF000000#define KVM_REG_RISCV_TYPE_SHIFT 24 +#define KVM_REG_RISCV_SUBTYPE_MASK 0x0000000000FF0000 +#define KVM_REG_RISCV_SUBTYPE_SHIFT 16We could just define a new
AIA_CSRtype, rather than introduce CSR subtypes. While grouping all CSRs together under the CSR type also makes sense, having to teach all userspaces about subtypes may not be worth the organizational benefits.
My main concern is that we have chosen a 8-bit wide "type" field in ONE_REG id which can't be changed now and it will be consumed very fast if we start adding separate "type" for each ISA extension. This "type" field is shared with SBI extensions and we will be also having separate nested CSR state for various ISA extensions.
Since KVM RISC-V is young, I think it is better to introduce a "subtype" field now so that we have ample space for the future.
Also, both ONE_REG "type" and "subtype" are arch specific fields of ONE_REG id so all KVM user space changes will be contained in RISC-V specific code.
Quoted 181 lines
Quoted 176 lines
arch/riscv/include/uapi/asm/kvm.h +5
-1/* Config registers are mapped as type 1 */ #define KVM_REG_RISCV_CONFIG (0x01 << KVM_REG_RISCV_TYPE_SHIFT)@@ -147,8 +154,12 @@ 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 +#define KVM_REG_RISCV_CSR_AIA 0x1#define KVM_REG_RISCV_CSR_REG (name) \ - (offsetof(struct kvm_riscv_csr, name) / sizeof(unsigned long)) + (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 +76
-21@@ -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),@@ -96,6 +97,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 :@@ -451,30 +453,79 @@ static int kvm_riscv_vcpu_set_reg_core(struct kvm_vcpu *vcpu,return 0 ; } +static int kvm_riscv_vcpu_general_get_csr (struct kvm_vcpu *vcpu, +unsigned long reg_num, +unsigned long *out_val) +{ +struct kvm_vcpu_csr *csr = &vcpu->arch.guest_csr; + +if (reg_num >=sizeof (struct kvm_riscv_csr ) /sizeof (unsigned long )) +return -EINVAL ; + +if (reg_num ==KVM_REG_RISCV_CSR_REG (sip)) { +kvm_riscv_vcpu_flush_interrupts (vcpu); + *out_val = (csr->hvip >>VSIP_TO_HVIP_SHIFT ) &VSIP_VALID_MASK ; + }else + *out_val = ((unsigned long *)csr)[reg_num]; + +return 0 ; +} +static int kvm_riscv_vcpu_get_reg_csr (struct kvm_vcpu *vcpu,const struct kvm_one_reg *reg) { -struct kvm_vcpu_csr *csr = &vcpu->arch.guest_csr; +int rc;unsigned long __user *uaddr = (unsigned long __user *)(unsigned long )reg->addr;unsigned long reg_num = reg->id & ~(KVM_REG_ARCH_MASK |KVM_REG_SIZE_MASK |KVM_REG_RISCV_CSR ); -unsigned long reg_val; +unsigned long reg_val, reg_subtype;if (KVM_REG_SIZE (reg->id) !=sizeof (unsigned long ))return -EINVAL ; + + reg_subtype = (reg_num &KVM_REG_RISCV_SUBTYPE_MASK ) + >>KVM_REG_RISCV_SUBTYPE_SHIFT ; + reg_num &= ~KVM_REG_RISCV_SUBTYPE_MASK ; +switch (reg_subtype) { +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 ; + } +if (rc) +return rc; + +if (copy_to_user (uaddr, ®_val,KVM_REG_SIZE (reg->id))) +return -EFAULT ; + +return 0 ; +} + +static inline int kvm_riscv_vcpu_general_set_csr (struct kvm_vcpu *vcpu, +unsigned long reg_num, +unsigned long reg_val) +{ +struct kvm_vcpu_csr *csr = &vcpu->arch.guest_csr; +if (reg_num >=sizeof (struct kvm_riscv_csr ) /sizeof (unsigned long ))return -EINVAL ;if (reg_num ==KVM_REG_RISCV_CSR_REG (sip)) { -kvm_riscv_vcpu_flush_interrupts (vcpu); - reg_val = (csr->hvip >>VSIP_TO_HVIP_SHIFT ) &VSIP_VALID_MASK ; - }else - reg_val = ((unsigned long *)csr)[reg_num]; + reg_val &=VSIP_VALID_MASK ; + reg_val <<=VSIP_TO_HVIP_SHIFT ; + } -if (copy_to_user (uaddr, ®_val,KVM_REG_SIZE (reg->id))) -return -EFAULT ; + ((unsigned long *)csr)[reg_num] = reg_val; + +if (reg_num ==KVM_REG_RISCV_CSR_REG (sip)) +WRITE_ONCE (vcpu->arch.irqs_pending_mask,0 );return 0 ; }@@ -482,31 +533,36 @@ static int kvm_riscv_vcpu_get_reg_csr(struct kvm_vcpu *vcpu,static int kvm_riscv_vcpu_set_reg_csr (struct kvm_vcpu *vcpu,const struct kvm_one_reg *reg) { -struct kvm_vcpu_csr *csr = &vcpu->arch.guest_csr; +int rc;unsigned long __user *uaddr = (unsigned long __user *)(unsigned long )reg->addr;unsigned long reg_num = reg->id & ~(KVM_REG_ARCH_MASK |KVM_REG_SIZE_MASK |KVM_REG_RISCV_CSR ); -unsigned long reg_val; +unsigned long reg_val, reg_subtype;if (KVM_REG_SIZE (reg->id) !=sizeof (unsigned long ))return -EINVAL ; -if (reg_num >=sizeof (struct kvm_riscv_csr ) /sizeof (unsigned long )) -return -EINVAL ;if (copy_from_user (®_val, uaddr,KVM_REG_SIZE (reg->id)))return -EFAULT ; -if (reg_num ==KVM_REG_RISCV_CSR_REG (sip)) { - reg_val &=VSIP_VALID_MASK ; - reg_val <<=VSIP_TO_HVIP_SHIFT ; + reg_subtype = (reg_num &KVM_REG_RISCV_SUBTYPE_MASK ) + >>KVM_REG_RISCV_SUBTYPE_SHIFT ; + reg_num &= ~KVM_REG_RISCV_SUBTYPE_MASK ; +switch (reg_subtype) { +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 ; } - - ((unsigned long *)csr)[reg_num] = reg_val; - -if (reg_num ==KVM_REG_RISCV_CSR_REG (sip)) -WRITE_ONCE (vcpu->arch.irqs_pending_mask,0 ); +if (rc) +return rc;return 0 ; } --Quoted 2 lines
2.34.1
Thanks,
drew
PATCH 6/7 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/asm/kvm_host.h | 7 +- arch/riscv/include/uapi/asm/kvm.h | 7 + arch/riscv/kvm/aia.c | 317 ++++++++++++++++++++++++++++++ arch/riscv/kvm/vcpu.c | 53 +++-- 5 files changed, 415 insertions(+), 57 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/asm/kvm_host.h +4 -3
@@ -203,8 +203,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;
@@ -331,7 +332,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/include/uapi/asm/kvm.h +7 -0
@@ -80,6 +80,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 +317 -0
323 lines not on this page · raw message
arch/riscv/kvm/vcpu.c +34 -19
115 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH 7/7 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 | 241 +++++++++++++++++++++++++++++++ arch/riscv/kvm/main.c | 3 +- arch/riscv/kvm/vcpu.c | 2 + 4 files changed, 255 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 +241 -0
295 lines not on this page · raw message
arch/riscv/kvm/main.c +2 -1
@@ -125,7 +125,8 @@ int kvm_arch_init(void *opaque)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);return 0 ; }
arch/riscv/kvm/vcpu.c +2 -0
@@ -240,10 +240,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