KVM: arm64: vgic-v5: Add for_each_visible_v5_ppi() iterator

We have multiple instances of iterators walking the vgic_ppi_mask
mask, and the way it is written has a tendency to make one's eyes
bleed.

Factor it as a helper and use that across the code base.

Link: https://lore.kernel.org/r/20260520091949.542365-2-maz@kernel.org
Signed-off-by: Marc Zyngier <maz@kernel.org>

diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c
index 148fc3400ea81559ea630312db4a02bb7a39ba7e..513f5f1429b5fe081206051979e6b2faefbc5512 100644 (file)
--- a/arch/arm64/kvm/sys_regs.c
+++ b/arch/arm64/kvm/sys_regs.c
@@ -751,7 +751,7 @@ static bool access_gicv5_ppi_enabler(struct kvm_vcpu *vcpu,
         * Sync the change in enable states to the vgic_irqs. We consider all
         * PPIs as we don't expose many to the guest.
         */
-       for_each_set_bit(i, mask, VGIC_V5_NR_PRIVATE_IRQS) {
+       for_each_visible_v5_ppi(i, vcpu->kvm) {
                u32 intid = vgic_v5_make_ppi(i);
                struct vgic_irq *irq;
 

diff --git a/arch/arm64/kvm/vgic/vgic-v5.c b/arch/arm64/kvm/vgic/vgic-v5.c
index fdd39ea7f83ec5bd57a441b071d0b73ba067544b..c0d36658ffe7402be497e2d1dbe84828ad8034bf 100644 (file)
--- a/arch/arm64/kvm/vgic/vgic-v5.c
+++ b/arch/arm64/kvm/vgic/vgic-v5.c
@@ -316,7 +316,7 @@ static void vgic_v5_sync_ppi_priorities(struct kvm_vcpu *vcpu)
         * those actually exposed to the guest by first iterating over the mask
         * of exposed PPIs.
         */
-       for_each_set_bit(i, vcpu->kvm->arch.vgic.gicv5_vm.vgic_ppi_mask, VGIC_V5_NR_PRIVATE_IRQS) {
+       for_each_visible_v5_ppi(i, vcpu->kvm) {
                u32 intid = vgic_v5_make_ppi(i);
                struct vgic_irq *irq;
                int pri_idx, pri_reg, pri_bit;
@@ -358,7 +358,7 @@ bool vgic_v5_has_pending_ppi(struct kvm_vcpu *vcpu)
        if (!priority_mask)
                return false;
 
-       for_each_set_bit(i, vcpu->kvm->arch.vgic.gicv5_vm.vgic_ppi_mask, VGIC_V5_NR_PRIVATE_IRQS) {
+       for_each_visible_v5_ppi(i, vcpu->kvm) {
                u32 intid = vgic_v5_make_ppi(i);
                bool has_pending = false;
                struct vgic_irq *irq;
@@ -391,8 +391,7 @@ void vgic_v5_fold_ppi_state(struct kvm_vcpu *vcpu)
        activer = host_data_ptr(vgic_v5_ppi_state)->activer_exit;
        pendr = host_data_ptr(vgic_v5_ppi_state)->pendr;
 
-       for_each_set_bit(i, vcpu->kvm->arch.vgic.gicv5_vm.vgic_ppi_mask,
-                        VGIC_V5_NR_PRIVATE_IRQS) {
+       for_each_visible_v5_ppi(i, vcpu->kvm) {
                u32 intid = vgic_v5_make_ppi(i);
                struct vgic_irq *irq;
 
@@ -429,8 +428,7 @@ void vgic_v5_flush_ppi_state(struct kvm_vcpu *vcpu)
         * ICC_PPI_PENDRx_EL1, however.
         */
        bitmap_zero(pendr, VGIC_V5_NR_PRIVATE_IRQS);
-       for_each_set_bit(i, vcpu->kvm->arch.vgic.gicv5_vm.vgic_ppi_mask,
-                        VGIC_V5_NR_PRIVATE_IRQS) {
+       for_each_visible_v5_ppi(i, vcpu->kvm) {
                u32 intid = vgic_v5_make_ppi(i);
                struct vgic_irq *irq;
 

diff --git a/arch/arm64/kvm/vgic/vgic.h b/arch/arm64/kvm/vgic/vgic.h
index 9d941241c8a2be1214ce5fd2e6c37a197bb0d839..f45f7e3ec4d6eff2471e9909831b3444d6a8ddfa 100644 (file)
--- a/arch/arm64/kvm/vgic/vgic.h
+++ b/arch/arm64/kvm/vgic/vgic.h
@@ -378,6 +378,9 @@ void vgic_v5_get_vmcr(struct kvm_vcpu *vcpu, struct vgic_vmcr *vmcr);
 void vgic_v5_restore_state(struct kvm_vcpu *vcpu);
 void vgic_v5_save_state(struct kvm_vcpu *vcpu);
 
+#define for_each_visible_v5_ppi(__i, __k)              \
+       for_each_set_bit(__i, (__k)->arch.vgic.gicv5_vm.vgic_ppi_mask, VGIC_V5_NR_PRIVATE_IRQS)
+
 static inline int vgic_v3_max_apr_idx(struct kvm_vcpu *vcpu)
 {
        struct vgic_cpu *cpu_if = &vcpu->arch.vgic_cpu;