irqchip/riscv-imsic: Adjust vs irq files num according to MMIO resources
Subsystems (5)
PATCH 1/1 irqchip/riscv-imsic: Adjust vs irq files num according to MMIO resources
During initialization, kernel maps the MMIO resources of IMSIC, which is parsed from ACPI or DTS and may not strictly contains all guest interrupt files. Page fault happens when KVM wrongly allocates an unmapped guest interrupt file and writes it.
Thus, during initialization, we calculate the number of available guest interrupt files according to MMIO resources and constrain the number of guest interrupt files that can be allocated by KVM.
--- arch/riscv/kvm/aia.c | 2 +- drivers/irqchip/irq-riscv-imsic-state.c | 7 ++++++- include/linux/irqchip/riscv-imsic.h | 3 +++ 3 files changed, 10 insertions(+), 2 deletions(-)
arch/riscv/kvm/aia.c +1 -1
@@ -630,7 +630,7 @@ int kvm_riscv_aia_init(void)*/ if (gc) kvm_riscv_aia_nr_hgei =min ((ulong )kvm_riscv_aia_nr_hgei, -BIT (gc->guest_index_bits) -1 ); +BIT (gc->nr_guest_files) -1 );else kvm_riscv_aia_nr_hgei =0 ;
drivers/irqchip/irq-riscv-imsic-state.c +6 -1
@@ -794,7 +794,7 @@ static int __init imsic_parse_fwnode(struct fwnode_handle *fwnode,int __init imsic_setup_state (struct fwnode_handle *fwnode,void *opaque) { -u32 i, j, index, nr_parent_irqs, nr_mmios, nr_handlers =0 ; +u32 i, j, index, nr_parent_irqs, nr_mmios, nr_guest_files, nr_handlers =0 ;struct imsic_global_config *global;struct imsic_local_config *local;void __iomem **mmios_va =NULL ;
@@ -888,6 +888,7 @@ int __init imsic_setup_state(struct fwnode_handle *fwnode, void *opaque) }/* Configure handlers for target CPUs */ + global->nr_guest_files =BIT (global->guest_index_bits) -1 ;for (i =0 ; i < nr_parent_irqs; i++) { rc =imsic_get_parent_hartid (fwnode, i, &hartid);if (rc) {
@@ -928,6 +929,10 @@ int __init imsic_setup_state(struct fwnode_handle *fwnode, void *opaque) local->msi_pa = mmios[index].start + reloff; local->msi_va = mmios_va[index] + reloff; + nr_guest_files = (resource_size (&mmios[index]) - reloff) /IMSIC_MMIO_PAGE_SZ -1 ; + global->nr_guest_files = global->nr_guest_files > nr_guest_files ? nr_guest_files : + global->nr_guest_files; + nr_handlers++; }
include/linux/irqchip/riscv-imsic.h +3 -0
@@ -69,6 +69,9 @@ struct imsic_global_config {/* Number of guest interrupt identities */ u32 nr_guest_ids; +/* Number of guest interrupt files per core */ +u32 nr_guest_files; +/* Per-CPU IMSIC addresses */ struct imsic_local_config __percpu *local; };
Signature · 1 line
2.20.1
Quoted 22 lines · Xu Lu
During initialization, kernel maps the MMIO resources of IMSIC, which is parsed from ACPI or DTS and may not strictly contains all guest interrupt files. Page fault happens when KVM wrongly allocates an unmapped guest interrupt file and writes it.
Thus, during initialization, we calculate the number of available guest interrupt files according to MMIO resources and constrain the number of guest interrupt files that can be allocated by KVM.
Signed-off-by Xu Lu <[email protected]>--- arch/riscv/kvm/aia.c | 2 +- drivers/irqchip/irq-riscv-imsic-state.c | 7 ++++++- include/linux/irqchip/riscv-imsic.h | 3 +++ 3 files changed, 10 insertions(+), 2 deletions(-)arch/riscv/kvm/aia.c +0
-0
arch/riscv/kvm/aia.c int kvm_riscv_aia_init(void) · line 633
Quoted 5 lines
arch/riscv/kvm/aia.c +1
-1@@ -630,7 +630,7 @@ int kvm_riscv_aia_init(void)*/ if (gc) kvm_riscv_aia_nr_hgei =min ((ulong )kvm_riscv_aia_nr_hgei, -BIT (gc->guest_index_bits) -1 ); +BIT (gc->nr_guest_files) -1 );
Typo here. I will resend this patch.
Quoted 52 lines
arch/riscv/kvm/aia.c +0
-0else kvm_riscv_aia_nr_hgei =0 ;drivers/irqchip/irq-riscv-imsic-state.c +6
-1@@ -794,7 +794,7 @@ static int __init imsic_parse_fwnode(struct fwnode_handle *fwnode,int __init imsic_setup_state (struct fwnode_handle *fwnode,void *opaque) { -u32 i, j, index, nr_parent_irqs, nr_mmios, nr_handlers =0 ; +u32 i, j, index, nr_parent_irqs, nr_mmios, nr_guest_files, nr_handlers =0 ;struct imsic_global_config *global;struct imsic_local_config *local;void __iomem **mmios_va =NULL ;@@ -888,6 +888,7 @@ int __init imsic_setup_state(struct fwnode_handle *fwnode, void *opaque) }/* Configure handlers for target CPUs */ + global->nr_guest_files =BIT (global->guest_index_bits) -1 ;for (i =0 ; i < nr_parent_irqs; i++) { rc =imsic_get_parent_hartid (fwnode, i, &hartid);if (rc) {@@ -928,6 +929,10 @@ int __init imsic_setup_state(struct fwnode_handle *fwnode, void *opaque) local->msi_pa = mmios[index].start + reloff; local->msi_va = mmios_va[index] + reloff; + nr_guest_files = (resource_size (&mmios[index]) - reloff) /IMSIC_MMIO_PAGE_SZ -1 ; + global->nr_guest_files = global->nr_guest_files > nr_guest_files ? nr_guest_files : + global->nr_guest_files; + nr_handlers++; }include/linux/irqchip/riscv-imsic.h +3
-1@@ -69,6 +69,9 @@ struct imsic_global_config {/* Number of guest interrupt identities */ u32 nr_guest_ids; +/* Number of guest interrupt files per core */ +u32 nr_guest_files; +/* Per-CPU IMSIC addresses */ struct imsic_local_config __percpu *local; }; --2.20.1
Quoted 5 lines · Xu Lu
arch/riscv/kvm/aia.c int kvm_riscv_aia_init(void) · line 633
Quoted 3 lines
kvm_riscv_aia_nr_hgei= min((ulong)kvm_riscv_aia_nr_hgei,arch/riscv/kvm/aia.c +1
-1- BIT(gc->guest_index_bits) - 1); + BIT(gc->nr_guest_files) - 1);Typo here. I will resend this patch.
And please change the subject line to something comprehensible. 'vs irq files num' says absolutely nothing.
Thanks,
tglx