Skip to content

Commit 3ec4350

Browse files
cyanyang-sifivebonzini
authored andcommitted
RISCV: KVM: use raw_spinlock for critical section in imsic
For the external interrupt updating procedure in imsic, there was a spinlock to protect it already. But since it should not be preempted in any cases, we should turn to use raw_spinlock to prevent any preemption in case PREEMPT_RT was enabled. Signed-off-by: Cyan Yang <cyan.yang@sifive.com> Reviewed-by: Yong-Xuan Wang <yongxuan.wang@sifive.com> Reviewed-by: Anup Patel <anup@brainfault.org> Message-ID: <20240919160126.44487-1-cyan.yang@sifive.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
1 parent 773cca1 commit 3ec4350

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

arch/riscv/kvm/aia_imsic.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ struct imsic {
5555
/* IMSIC SW-file */
5656
struct imsic_mrif *swfile;
5757
phys_addr_t swfile_pa;
58-
spinlock_t swfile_extirq_lock;
58+
raw_spinlock_t swfile_extirq_lock;
5959
};
6060

6161
#define imsic_vs_csr_read(__c) \
@@ -622,15 +622,15 @@ static void imsic_swfile_extirq_update(struct kvm_vcpu *vcpu)
622622
* interruptions between reading topei and updating pending status.
623623
*/
624624

625-
spin_lock_irqsave(&imsic->swfile_extirq_lock, flags);
625+
raw_spin_lock_irqsave(&imsic->swfile_extirq_lock, flags);
626626

627627
if (imsic_mrif_atomic_read(mrif, &mrif->eidelivery) &&
628628
imsic_mrif_topei(mrif, imsic->nr_eix, imsic->nr_msis))
629629
kvm_riscv_vcpu_set_interrupt(vcpu, IRQ_VS_EXT);
630630
else
631631
kvm_riscv_vcpu_unset_interrupt(vcpu, IRQ_VS_EXT);
632632

633-
spin_unlock_irqrestore(&imsic->swfile_extirq_lock, flags);
633+
raw_spin_unlock_irqrestore(&imsic->swfile_extirq_lock, flags);
634634
}
635635

636636
static void imsic_swfile_read(struct kvm_vcpu *vcpu, bool clear,
@@ -1051,7 +1051,7 @@ int kvm_riscv_vcpu_aia_imsic_init(struct kvm_vcpu *vcpu)
10511051
}
10521052
imsic->swfile = page_to_virt(swfile_page);
10531053
imsic->swfile_pa = page_to_phys(swfile_page);
1054-
spin_lock_init(&imsic->swfile_extirq_lock);
1054+
raw_spin_lock_init(&imsic->swfile_extirq_lock);
10551055

10561056
/* Setup IO device */
10571057
kvm_iodevice_init(&imsic->iodev, &imsic_iodoev_ops);

0 commit comments

Comments
 (0)