irqchip/riscv-imsic: Adjust the number of available guest irq files
Subsystems (5)
PATCH v5 1/1 irqchip/riscv-imsic: Adjust the number of available guest irq files
Currently, KVM assumes the minimum of implemented HGEIE bits and "BIT(gc->guest_index_bits) - 1" as the number of guest files available across all CPUs. This will not work when CPUs have different number of guest files because KVM may incorrectly allocate a guest file on a CPU with fewer guest files.
To address above, during initialization, 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 | 12 +++++++++++- include/linux/irqchip/riscv-imsic.h | 3 +++ 3 files changed, 15 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 ); + gc->nr_guest_files);else kvm_riscv_aia_nr_hgei =0 ;
drivers/irqchip/irq-riscv-imsic-state.c +11 -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,15 @@ 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; +/* +* KVM uses global->nr_guest_files to determine the available guest +* interrupt files on each CPU. Take the minimum number of guest +* interrupt files across all CPUs to avoid KVM incorrectly allocating +* an unexisted or unmapped guest interrupt file on some CPUs. +*/ + nr_guest_files = (resource_size (&mmios[index]) - reloff) /IMSIC_MMIO_PAGE_SZ -1 ; + global->nr_guest_files =min (global->nr_guest_files, 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 11 lines · Xu Lu
Currently, KVM assumes the minimum of implemented HGEIE bits and "
BIT(gc->guest_index_bits)- 1" as the number of guest files available across all CPUs. This will not work when CPUs have different number of guest files because KVM may incorrectly allocate a guest file on a CPU with fewer guest files.To address above, during initialization, 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.
Quoted 6 lines
Signed-off-by Xu Lu <[email protected]>--- arch/riscv/kvm/aia.c | 2 +- drivers/irqchip/irq-riscv-imsic-state.c | 12 +++++++++++- include/linux/irqchip/riscv-imsic.h | 3 +++ 3 files changed, 15 insertions(+), 2 deletions(-)
Thanks,
Nutty
Quoted 64 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 ); + gc->nr_guest_files);else kvm_riscv_aia_nr_hgei =0 ;drivers/irqchip/irq-riscv-imsic-state.c +11
-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,15 @@ 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; +/* +* KVM uses global->nr_guest_files to determine the available guest +* interrupt files on each CPU. Take the minimum number of guest +* interrupt files across all CPUs to avoid KVM incorrectly allocating +* an unexisted or unmapped guest interrupt file on some CPUs. +*/ + nr_guest_files = (resource_size (&mmios[index]) - reloff) /IMSIC_MMIO_PAGE_SZ -1 ; + global->nr_guest_files =min (global->nr_guest_files, 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; };
Anup Patel
maintainerQuoted 7 lines · Xu Lu
Currently, KVM assumes the minimum of implemented HGEIE bits and "
BIT(gc->guest_index_bits)- 1" as the number of guest files available across all CPUs. This will not work when CPUs have different number of guest files because KVM may incorrectly allocate a guest file on a CPU with fewer guest files.
Quoted 6 lines
To address above, during initialization, 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]>
Please carry Reviewed-by and Acked-by tags obtained in previous revisions. Next time, I will not take the patch if previous tags are missing.
Queued this patch for Linux-6.20.
Regards,
Anup
Quoted 74 lines
--- arch/riscv/kvm/aia.c | 2 +- drivers/irqchip/irq-riscv-imsic-state.c | 12 +++++++++++- include/linux/irqchip/riscv-imsic.h | 3 +++ 3 files changed, 15 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 ); + gc->nr_guest_files);else kvm_riscv_aia_nr_hgei =0 ;drivers/irqchip/irq-riscv-imsic-state.c +11
-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,15 @@ 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; +/* +* KVM uses global->nr_guest_files to determine the available guest +* interrupt files on each CPU. Take the minimum number of guest +* interrupt files across all CPUs to avoid KVM incorrectly allocating +* an unexisted or unmapped guest interrupt file on some CPUs. +*/ + nr_guest_files = (resource_size (&mmios[index]) - reloff) /IMSIC_MMIO_PAGE_SZ -1 ; + global->nr_guest_files =min (global->nr_guest_files, 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 14 lines · Anup Patel
Quoted 12 lines · Xu Lu
Currently, KVM assumes the minimum of implemented HGEIE bits and "
BIT(gc->guest_index_bits)- 1" as the number of guest files available across all CPUs. This will not work when CPUs have different number of guest files because KVM may incorrectly allocate a guest file on a CPU with fewer guest files.To address above, during initialization, 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.
Quoted 5 lines
Quoted 1 line
Signed-off-by Xu Lu <[email protected]>Please carry Reviewed-by and Acked-by tags obtained in previous revisions. Next time, I will not take the patch if previous tags are missing.
Sorry about that. I thought the Reviewed-by and Acked-by tags belong to the previous version so didn't carry them.
Quoted 2 lines
Queued this patch for Linux-6.20.
Do I still need to resend the patch with Reviewed-by and Acked-by tags?
Best regards,
Xu Lu
Quoted 78 lines
Regards,
AnupQuoted 74 lines
--- arch/riscv/kvm/aia.c | 2 +- drivers/irqchip/irq-riscv-imsic-state.c | 12 +++++++++++- include/linux/irqchip/riscv-imsic.h | 3 +++ 3 files changed, 15 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 ); + gc->nr_guest_files);else kvm_riscv_aia_nr_hgei =0 ;drivers/irqchip/irq-riscv-imsic-state.c +11
-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,15 @@ 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; +/* +* KVM uses global->nr_guest_files to determine the available guest +* interrupt files on each CPU. Take the minimum number of guest +* interrupt files across all CPUs to avoid KVM incorrectly allocating +* an unexisted or unmapped guest interrupt file on some CPUs. +*/ + nr_guest_files = (resource_size (&mmios[index]) - reloff) /IMSIC_MMIO_PAGE_SZ -1 ; + global->nr_guest_files =min (global->nr_guest_files, 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
Anup Patel
maintainerQuoted 22 lines · Xu Lu
Quoted 14 lines · Anup Patel
Quoted 12 lines · Xu Lu
Currently, KVM assumes the minimum of implemented HGEIE bits and "
BIT(gc->guest_index_bits)- 1" as the number of guest files available across all CPUs. This will not work when CPUs have different number of guest files because KVM may incorrectly allocate a guest file on a CPU with fewer guest files.To address above, during initialization, 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.
Quoted 5 lines
Quoted 1 line
Signed-off-by Xu Lu <[email protected]>Please carry Reviewed-by and Acked-by tags obtained in previous revisions. Next time, I will not take the patch if previous tags are missing.
Quoted 7 lines
Sorry about that. I thought the Reviewed-by and Acked-by tags belong to the previous version so didn't carry them.
Quoted 2 lines
Queued this patch for Linux-6.20.
Do I still need to resend the patch with Reviewed-by and Acked-by tags?
I have included the tags at the time of the merging patch.
Regards,
Anup
Quoted 82 lines
Best regards,
Xu LuQuoted 78 lines
Regards,
AnupQuoted 74 lines
--- arch/riscv/kvm/aia.c | 2 +- drivers/irqchip/irq-riscv-imsic-state.c | 12 +++++++++++- include/linux/irqchip/riscv-imsic.h | 3 +++ 3 files changed, 15 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 ); + gc->nr_guest_files);else kvm_riscv_aia_nr_hgei =0 ;drivers/irqchip/irq-riscv-imsic-state.c +11
-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,15 @@ 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; +/* +* KVM uses global->nr_guest_files to determine the available guest +* interrupt files on each CPU. Take the minimum number of guest +* interrupt files across all CPUs to avoid KVM incorrectly allocating +* an unexisted or unmapped guest interrupt file on some CPUs. +*/ + nr_guest_files = (resource_size (&mmios[index]) - reloff) /IMSIC_MMIO_PAGE_SZ -1 ; + global->nr_guest_files =min (global->nr_guest_files, 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
This patch was applied to riscv/linux.git (fixes) by Anup Patel <[email protected]>:
Hello:
This patch was applied to riscv/linux.git (fixes)
by Anup Patel <[email protected]>:
Quoted 6 lines · On Sun, 4 Jan 2026 21:34:57 +0800 you wrote:
Currently, KVM assumes the minimum of implemented HGEIE bits and "
BIT(gc->guest_index_bits)- 1" as the number of guest files available across all CPUs. This will not work when CPUs have different number of guest files because KVM may incorrectly allocate a guest file on a CPU with fewer guest files.
Quoted 6 lines
To address above, during initialization, 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.
[...]
Here is the summary with links:
- [v5] irqchip/riscv-imsic: Adjust the number of available guest irq files
https://git.kernel.org/riscv/c/376e2f8cca28
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html