RISC-V AIA irqchip and Svnapot support
Subsystems (6)
v3 cover RISC-V AIA irqchip and Svnapot support
The latest KVM in Linux-6.5 has support for:
1) Svnapot ISA extension support
2) AIA in-kernel irqchip support
This series adds corresponding changes in KVMTOOL to use the above mentioned features for Guest/VM.
These patches can also be found in the riscv_aia_v3 branch at:
https://github.com/avpatel/kvmtool.git
Changes since v2:
- Updated PATCH1 to sync header with released Linux-6.6
- Addressed Drew's comments in PATCH3, PATCH4, and PATCH5
Changes since v1:
- Rebased on commit 9cb1b46cb765972326a46bdba867d441a842af56
- Updated PATCH1 to sync header with released Linux-6.5
Anup Patel (6):
Sync-up header with Linux-6.6 for KVM RISC-V
riscv: Add Svnapot extension support
riscv: Make irqchip support pluggable
riscv: Add IRQFD support for in-kernel AIA irqchip
riscv: Use AIA in-kernel irqchip whenever KVM RISC-V supports
riscv: Fix guest/init linkage for multilib toolchain
Makefile | 3 + include/linux/kvm.h | 19 ++- include/linux/virtio_net.h | 14 ++ riscv/aia.c | 227 ++++++++++++++++++++++++++++ riscv/fdt.c | 15 +- riscv/include/asm/kvm.h | 97 ++++++++++++ riscv/include/kvm/fdt-arch.h | 8 +- riscv/include/kvm/kvm-arch.h | 37 ++++- riscv/include/kvm/kvm-config-arch.h | 3 + riscv/irq.c | 145 +++++++++++++++++- riscv/kvm.c | 2 + riscv/pci.c | 32 ++-- riscv/plic.c | 61 ++++---- 13 files changed, 609 insertions(+), 54 deletions(-) create mode 100644 riscv/aia.c
Signature · 1 line
2.34.1
PATCH v3 1/6 Sync-up header with Linux-6.6 for KVM RISC-V
We sync-up Linux headers to get latest KVM RISC-V headers having V, Svnapot, AIA and other extensions.
--- include/linux/kvm.h | 19 ++++++-- include/linux/virtio_net.h | 14 ++++++ riscv/include/asm/kvm.h | 97 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 126 insertions(+), 4 deletions(-)
include/linux/kvm.h +15 -4
@@ -1190,6 +1190,8 @@ struct kvm_ppc_resize_hpt {#define KVM_CAP_DIRTY_LOG_RING_WITH_BITMAP 225#define KVM_CAP_PMU_EVENT_MASKED_EVENTS 226#define KVM_CAP_COUNTER_OFFSET 227 +#define KVM_CAP_ARM_EAGER_SPLIT_CHUNK_SIZE 228 +#define KVM_CAP_ARM_SUPPORTED_BLOCK_SIZES 229#ifdef KVM_CAP_IRQ_ROUTING
@@ -1416,9 +1418,16 @@ struct kvm_device_attr {__u64 addr;/* userspace address of attr data */ }; -#define KVM_DEV_VFIO_GROUP 1 -#define KVM_DEV_VFIO_GROUP_ADD 1 -#define KVM_DEV_VFIO_GROUP_DEL 2 +#define KVM_DEV_VFIO_FILE 1 + +#define KVM_DEV_VFIO_FILE_ADD 1 +#define KVM_DEV_VFIO_FILE_DEL 2 + +/* KVM_DEV_VFIO_GROUP aliases are for compile time uapi compatibility */ +#define KVM_DEV_VFIO_GROUP KVM_DEV_VFIO_FILE + +#define KVM_DEV_VFIO_GROUP_ADD KVM_DEV_VFIO_FILE_ADD +#define KVM_DEV_VFIO_GROUP_DEL KVM_DEV_VFIO_FILE_DEL#define KVM_DEV_VFIO_GROUP_SET_SPAPR_TCE 3enum kvm_device_type {
@@ -1442,6 +1451,8 @@ enum kvm_device_type {#define KVM_DEV_TYPE_XIVE KVM_DEV_TYPE_XIVE KVM_DEV_TYPE_ARM_PV_TIME,#define KVM_DEV_TYPE_ARM_PV_TIME KVM_DEV_TYPE_ARM_PV_TIME + KVM_DEV_TYPE_RISCV_AIA, +#define KVM_DEV_TYPE_RISCV_AIA KVM_DEV_TYPE_RISCV_AIA KVM_DEV_TYPE_MAX, };
@@ -1613,7 +1624,7 @@ struct kvm_s390_ucas_mapping {#define KVM_GET_DEBUGREGS _IOR(KVMIO, 0xa1, struct kvm_debugregs)#define KVM_SET_DEBUGREGS _IOW(KVMIO, 0xa2, struct kvm_debugregs)/* -* vcpu version available with KVM_ENABLE_CAP +* vcpu version available with KVM_CAP_ENABLE_CAP * vm version available with KVM_CAP_ENABLE_CAP_VM */ #define KVM_ENABLE_CAP _IOW(KVMIO, 0xa3, struct kvm_enable_cap)
include/linux/virtio_net.h +14 -0
@@ -56,6 +56,7 @@#define VIRTIO_NET_F_MQ 22/* Device supports Receive Flow * Steering */ #define VIRTIO_NET_F_CTRL_MAC_ADDR 23/* Set MAC address */ +#define VIRTIO_NET_F_VQ_NOTF_COAL 52/* Device supports virtqueue notification coalescing */ #define VIRTIO_NET_F_NOTF_COAL 53/* Device supports notifications coalescing */ #define VIRTIO_NET_F_GUEST_USO4 54/* Guest can handle USOv4 in. */ #define VIRTIO_NET_F_GUEST_USO6 55/* Guest can handle USOv6 in. */
@@ -391,5 +392,18 @@ struct virtio_net_ctrl_coal_rx { };#define VIRTIO_NET_CTRL_NOTF_COAL_RX_SET 1 +#define VIRTIO_NET_CTRL_NOTF_COAL_VQ_SET 2 +#define VIRTIO_NET_CTRL_NOTF_COAL_VQ_GET 3 + +struct virtio_net_ctrl_coal { +__le32 max_packets; +__le32 max_usecs; +}; + +struct virtio_net_ctrl_coal_vq { +__le16 vqn; +__le16 reserved; +struct virtio_net_ctrl_coal coal; +};#endif /* _UAPI_LINUX_VIRTIO_NET_H */
riscv/include/asm/kvm.h +97 -0
127 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v3 2/6 riscv: Add Svnapot extension support
In reply to Anup PatelWhen the Svnapot extension is available expose it to the guest via device tree so that guest can use it.
--- riscv/fdt.c | 1 + riscv/include/kvm/kvm-config-arch.h | 3 +++ 2 files changed, 4 insertions(+)
riscv/fdt.c +1 -0
@@ -19,6 +19,7 @@ struct isa_ext_info isa_info_arr[] = { {"ssaia", KVM_RISCV_ISA_EXT_SSAIA}, {"sstc", KVM_RISCV_ISA_EXT_SSTC}, {"svinval", KVM_RISCV_ISA_EXT_SVINVAL}, + {"svnapot", KVM_RISCV_ISA_EXT_SVNAPOT}, {"svpbmt", KVM_RISCV_ISA_EXT_SVPBMT}, {"zbb", KVM_RISCV_ISA_EXT_ZBB}, {"zicbom", KVM_RISCV_ISA_EXT_ZICBOM},
riscv/include/kvm/kvm-config-arch.h +3 -0
@@ -34,6 +34,9 @@ struct kvm_config_arch {OPT_BOOLEAN ('\0' ,"disable-svinval" , \ &(cfg)->ext_disabled[KVM_RISCV_ISA_EXT_SVINVAL ], \"Disable Svinval Extension" ), \ +OPT_BOOLEAN ('\0' ,"disable-svnapot" , \ + &(cfg)->ext_disabled[KVM_RISCV_ISA_EXT_SVNAPOT ], \ +"Disable Svnapot Extension" ), \OPT_BOOLEAN ('\0' ,"disable-svpbmt" , \ &(cfg)->ext_disabled[KVM_RISCV_ISA_EXT_SVPBMT ], \ "Disable Svpbmt Extension"), \
Signature · 1 line
2.34.1
PATCH v3 3/6 riscv: Make irqchip support pluggable
In reply to Anup PatelWe will be having different types of irqchip:
1) PLIC emulated by user-space
2) AIA APLIC and IMSIC provided by in-kernel KVM module
To support above, we de-couple PLIC specific code from generic RISC-V code (such as FDT generation) so that we can easily add other types of irqchip. As part of the PLIC de-coupling, we introduce various riscv_irqchip_xyz global variable to describe the chosen irqchip hence PLIC is no longer required to register itself using device__register().
--- riscv/fdt.c | 14 ++++++-- riscv/include/kvm/kvm-arch.h | 25 ++++++++++++--- riscv/irq.c | 62 ++++++++++++++++++++++++++++++++++-- riscv/kvm.c | 2 ++ riscv/pci.c | 32 +++++++++++++------ riscv/plic.c | 61 +++++++++++++++++------------------ 6 files changed, 147 insertions(+), 49 deletions(-)
riscv/fdt.c +11 -3
@@ -209,19 +209,26 @@ static int setup_fdt(struct kvm *kvm)/* CPUs */ generate_cpu_nodes (fdt, kvm); +/* IRQCHIP */ +if (!riscv_irqchip_generate_fdt_node) +die ("No way to generate IRQCHIP FDT node\n" ); +riscv_irqchip_generate_fdt_node (fdt, kvm); +/* Simple Bus */ _FDT (fdt_begin_node (fdt,"smb" ));_FDT (fdt_property_string (fdt,"compatible" ,"simple-bus" ));_FDT (fdt_property_cell (fdt,"#address-cells" ,0x2 ));_FDT (fdt_property_cell (fdt,"#size-cells" ,0x2 )); -_FDT (fdt_property_cell (fdt,"interrupt-parent" ,PHANDLE_PLIC )); +_FDT (fdt_property_cell (fdt,"interrupt-parent" , + riscv_irqchip_phandle));_FDT (fdt_property (fdt,"ranges" ,NULL ,0 ));/* Virtio MMIO devices */ dev_hdr =device__first_dev (DEVICE_BUS_MMIO );while (dev_hdr) { generate_mmio_fdt_nodes = dev_hdr->data; -generate_mmio_fdt_nodes (fdt, dev_hdr, plic__generate_irq_prop); +generate_mmio_fdt_nodes (fdt, dev_hdr, + riscv__generate_irq_prop); dev_hdr =device__next_dev (dev_hdr); }
@@ -229,7 +236,8 @@ static int setup_fdt(struct kvm *kvm) dev_hdr =device__first_dev (DEVICE_BUS_IOPORT );while (dev_hdr) { generate_mmio_fdt_nodes = dev_hdr->data; -generate_mmio_fdt_nodes (fdt, dev_hdr, plic__generate_irq_prop); +generate_mmio_fdt_nodes (fdt, dev_hdr, + riscv__generate_irq_prop); dev_hdr =device__next_dev (dev_hdr); }
riscv/include/kvm/kvm-arch.h +21 -4
@@ -10,8 +10,8 @@#define RISCV_IOPORT 0x00000000ULL#define RISCV_IOPORT_SIZE SZ_64K -#define RISCV_PLIC 0x0c000000ULL -#define RISCV_PLIC_SIZE SZ_64M +#define RISCV_IRQCHIP 0x08000000ULL +#define RISCV_IRQCHIP_SIZE SZ_128M#define RISCV_MMIO 0x10000000ULL#define RISCV_MMIO_SIZE SZ_512M#define RISCV_PCI 0x30000000ULL
@@ -84,10 +84,27 @@ static inline bool riscv_addr_in_ioport_region(u64 phys_addr)enum irq_type ; -void plic__generate_irq_prop (void *fdt,u8 irq,enum irq_type irq_type); +enum irqchip_type { +IRQCHIP_UNKNOWN =0 , +IRQCHIP_PLIC , +IRQCHIP_AIA +}; + +extern enum irqchip_type riscv_irqchip; +extern bool riscv_irqchip_inkernel; +extern void (*riscv_irqchip_trigger)(struct kvm *kvm,int irq, +int level,bool edge); +extern void (*riscv_irqchip_generate_fdt_node)(void *fdt,struct kvm *kvm); +extern u32 riscv_irqchip_phandle; +extern u32 riscv_irqchip_msi_phandle; +extern bool riscv_irqchip_line_sensing; -void plic__irq_trig (struct kvm *kvm,int irq,int level,bool edge); +void plic__create (struct kvm *kvm);void pci__generate_fdt_nodes (void *fdt); +void riscv__generate_irq_prop (void *fdt,u8 irq,enum irq_type irq_type); + +void riscv__irqchip_create (struct kvm *kvm); +#endif /* KVM__KVM_ARCH_H */
riscv/irq.c +60 -2
73 lines not on this page · raw message
riscv/kvm.c +2 -0
@@ -96,6 +96,8 @@ void kvm__arch_init(struct kvm *kvm)madvise (kvm->arch.ram_alloc_start, kvm->arch.ram_alloc_size,MADV_HUGEPAGE ); + +riscv__irqchip_create (kvm); }#define FDT_ALIGN SZ_4M
riscv/pci.c +23 -9
@@ -7,20 +7,21 @@/* * An entry in the interrupt-map table looks like: -* <pci unit address> <pci interrupt pin> <plic phandle> <plic interrupt> +* <pci unit address> <pci interrupt pin> <irqchip phandle> <irqchip line> */ struct of_interrupt_map_entry {struct of_pci_irq_mask pci_irq_mask; -u32 plic_phandle; -u32 plic_irq; +u32 irqchip_phandle; +u32 irqchip_line; +u32 irqchip_sense; } __attribute__((packed));void pci__generate_fdt_nodes (void *fdt) {struct device_header *dev_hdr;struct of_interrupt_map_entry irq_map[OF_PCI_IRQ_MAP_MAX ]; -unsigned nentries =0 ; +unsigned nentries =0 , nsize;/* Bus range */ u32 bus_range[] = {cpu_to_fdt32 (0 ),cpu_to_fdt32 (1 ), };/* Configuration Space */
@@ -48,6 +49,11 @@ void pci__generate_fdt_nodes(void *fdt) }, }; +/* Find size of each interrupt map entery */ + nsize =sizeof (struct of_interrupt_map_entry ); +if (!riscv_irqchip_line_sensing) + nsize -=sizeof (u32); +/* Boilerplate PCI properties */ _FDT (fdt_begin_node (fdt,"pci" ));_FDT (fdt_property_string (fdt,"device_type" ,"pci" ));
@@ -64,12 +70,13 @@ void pci__generate_fdt_nodes(void *fdt)/* Generate the interrupt map ... */ dev_hdr =device__first_dev (DEVICE_BUS_PCI );while (dev_hdr && nentries <ARRAY_SIZE (irq_map)) { -struct of_interrupt_map_entry *entry = &irq_map[nentries]; +struct of_interrupt_map_entry *entry;struct pci_device_header *pci_hdr = dev_hdr->data;u8 dev_num = dev_hdr->dev_num;u8 pin = pci_hdr->irq_pin;u8 irq = pci_hdr->irq_line; + entry = (void *)irq_map + nsize * nentries; *entry = (struct of_interrupt_map_entry ) { .pci_irq_mask = { .pci_addr = {
@@ -79,16 +86,18 @@ void pci__generate_fdt_nodes(void *fdt) }, .pci_pin = cpu_to_fdt32(pin), }, - .plic_phandle = cpu_to_fdt32(PHANDLE_PLIC), - .plic_irq = cpu_to_fdt32(irq), + .irqchip_phandle = cpu_to_fdt32(riscv_irqchip_phandle), + .irqchip_line = cpu_to_fdt32(irq), }; +if (riscv_irqchip_line_sensing) + entry->irqchip_sense =cpu_to_fdt32 (IRQ_TYPE_LEVEL_HIGH ); + nentries++; dev_hdr =device__next_dev (dev_hdr); } -_FDT (fdt_property (fdt,"interrupt-map" , irq_map, -sizeof (struct of_interrupt_map_entry ) * nentries)); +_FDT (fdt_property (fdt,"interrupt-map" , irq_map, nsize * nentries));/* ... and the corresponding mask. */ if (nentries) {
@@ -105,5 +114,10 @@ void pci__generate_fdt_nodes(void *fdt) sizeof(irq_mask))); } +/* Set MSI parent if available */ +if (riscv_irqchip_msi_phandle !=PHANDLE_RESERVED ) +_FDT (fdt_property_cell (fdt,"msi-parent" , + riscv_irqchip_msi_phandle)); +_FDT (fdt_end_node (fdt)); }
riscv/plic.c +30 -31
122 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v3 4/6 riscv: Add IRQFD support for in-kernel AIA irqchip
In reply to Anup PatelTo use irqfd with in-kernel AIA irqchip, we add custom irq__add_irqfd and irq__del_irqfd functions. This allows us to defer actual KVM_IRQFD ioctl() until AIA irqchip is initialized by KVMTOOL.
--- riscv/include/kvm/kvm-arch.h | 11 ++++++ riscv/irq.c | 73 ++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+)
riscv/include/kvm/kvm-arch.h +11 -0
@@ -98,11 +98,22 @@ extern void (*riscv_irqchip_generate_fdt_node)(void *fdt, struct kvm *kvm);extern u32 riscv_irqchip_phandle;extern u32 riscv_irqchip_msi_phandle;extern bool riscv_irqchip_line_sensing; +extern bool riscv_irqchip_irqfd_ready;void plic__create (struct kvm *kvm);void pci__generate_fdt_nodes (void *fdt); +int riscv__add_irqfd (struct kvm *kvm,unsigned int gsi,int trigger_fd, +int resample_fd); + +void riscv__del_irqfd (struct kvm *kvm,unsigned int gsi,int trigger_fd); + +#define irq__add_irqfd riscv__add_irqfd +#define irq__del_irqfd riscv__del_irqfd + +int riscv__setup_irqfd_lines (struct kvm *kvm); +void riscv__generate_irq_prop (void *fdt,u8 irq,enum irq_type irq_type);void riscv__irqchip_create (struct kvm *kvm);
riscv/irq.c +73 -0
85 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH v3 5/6 riscv: Use AIA in-kernel irqchip whenever KVM RISC-V supports
In reply to Anup PatelThe KVM RISC-V kernel module supports AIA in-kernel irqchip when underlying host has AIA support. We detect and use AIA in-kernel irqchip whenever possible otherwise we fallback to PLIC emulated in user-space.
--- Makefile | 1 + riscv/aia.c | 227 +++++++++++++++++++++++++++++++++++ riscv/include/kvm/fdt-arch.h | 8 +- riscv/include/kvm/kvm-arch.h | 1 + riscv/irq.c | 20 ++- 5 files changed, 251 insertions(+), 6 deletions(-) create mode 100644 riscv/aia.c
Makefile +1 -0
@@ -220,6 +220,7 @@ ifeq ($(ARCH),riscv) OBJS += riscv/kvm-cpu.o OBJS += riscv/pci.o OBJS += riscv/plic.o + OBJS += riscv/aia.o ifeq ($(RISCV_XLEN),32) CFLAGS += -mabi=ilp32d -march=rv32gc endif
riscv/aia.c new file +227 -0
227 lines not on this page · raw message
riscv/include/kvm/fdt-arch.h +7 -1
@@ -1,7 +1,13 @@#ifndef KVM__KVM_FDT_H #define KVM__KVM_FDT_H -enum phandles {PHANDLE_RESERVED =0 ,PHANDLE_PLIC ,PHANDLES_MAX }; +enum phandles { +PHANDLE_RESERVED =0 , +PHANDLE_PLIC , +PHANDLE_AIA_APLIC , +PHANDLE_AIA_IMSIC , +PHANDLES_MAX +};#define PHANDLE_CPU_INTC_BASE PHANDLES_MAX
riscv/include/kvm/kvm-arch.h +1 -0
@@ -100,6 +100,7 @@ extern u32 riscv_irqchip_msi_phandle;extern bool riscv_irqchip_line_sensing;extern bool riscv_irqchip_irqfd_ready; +void aia__create (struct kvm *kvm);void plic__create (struct kvm *kvm);void pci__generate_fdt_nodes (void *fdt);
riscv/irq.c +15 -5
@@ -133,12 +133,22 @@ void riscv__generate_irq_prop(void *fdt, u8 irq, enum irq_type irq_type)_FDT (fdt_property (fdt,"interrupts" , prop, size)); } +static void (*riscv__irqchip_create_funcs[])(struct kvm *kvm) = { + aia__create, + plic__create, +}; +void riscv__irqchip_create (struct kvm *kvm) { -/* Try PLIC irqchip */ -plic__create (kvm); +unsigned int i; + +/* Try irqchip.create function one after another */ +for (i =0 ; i <ARRAY_SIZE (riscv__irqchip_create_funcs); i++) { + riscv__irqchip_create_funcs[i](kvm); +if (riscv_irqchip !=IRQCHIP_UNKNOWN ) +return ; + } -/* Fail if irqchip unknown */ -if (riscv_irqchip ==IRQCHIP_UNKNOWN ) -die ("No IRQCHIP found\n" ); +/* Fail since irqchip is unknown */ +die ("No IRQCHIP found\n" ); }
Signature · 1 line
2.34.1
PATCH v3 6/6 riscv: Fix guest/init linkage for multilib toolchain
In reply to Anup PatelFor RISC-V multilib toolchains, we must specify -mabi and -march options when linking guest/init.
--- Makefile | 2 ++ 1 file changed, 2 insertions(+)
Makefile +2 -0
@@ -223,9 +223,11 @@ ifeq ($(ARCH),riscv) OBJS += riscv/aia.o ifeq ($(RISCV_XLEN),32) CFLAGS += -mabi=ilp32d -march=rv32gc + GUEST_INIT_FLAGS += -mabi=ilp32d -march=rv32gc endif ifeq ($(RISCV_XLEN),64) CFLAGS += -mabi=lp64d -march=rv64gc + GUEST_INIT_FLAGS += -mabi=lp64d -march=rv64gc endif ARCH_WANT_LIBFDT := y
Signature · 1 line
2.34.1
Will Deacon
AppliedQuoted 8 lines · Anup Patel
The latest KVM in Linux-6.5 has support for:
1) Svnapot ISA extension support
2) AIA in-kernel irqchip supportThis series adds corresponding changes in KVMTOOL to use the above mentioned features for Guest/VM.
[...]
Applied to kvmtool (master), thanks!
[1/6] Sync-up header with Linux-6.6 for KVM RISC-V
https://git.kernel.org/will/kvmtool/c/26c85896bc3a [2/6] riscv: Add Svnapot extension support https://git.kernel.org/will/kvmtool/c/56e2d678f578 [3/6] riscv: Make irqchip support pluggable https://git.kernel.org/will/kvmtool/c/0dff350174f8 [4/6] riscv: Add IRQFD support for in-kernel AIA irqchip https://git.kernel.org/will/kvmtool/c/17aab306ad14 [5/6] riscv: Use AIA in-kernel irqchip whenever KVM RISC-V supports https://git.kernel.org/will/kvmtool/c/328f0879eeae [6/6] riscv: Fix guest/init linkage for multilib toolchain https://git.kernel.org/will/kvmtool/c/095773e707ae
Cheers,
Signature · 5 lines
Will https://fixes.arm64.dev https://next.arm64.dev https://will.arm64.dev