From nobody Sat Sep 26 13:09:09 2026 Received: from cstnet.cn (smtp21.cstnet.cn [159.226.251.21]) (using TLSv1.2 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 47F8936728D; Tue, 1 Sep 2026 08:06:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.226.251.21 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788249992; cv=none; b=f+qdXbU07+95McEGUksFTPzL8kYOpeAUxPvestKs8/hH3ZlNaLLCaTJ1k9NrpTYretRcL8b/Wfke1G6314AqsrYVExQXobBQh482Xel4+cF4zYqZEYJAIx0sZWPKWt4As8hvb2u5ei4GwzVnRXUf3YQvtyO1Y9pN4+Ni6Dr8qNA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788249992; c=relaxed/simple; bh=u/xYBa5ikGyxoimV8RlW1cCOmvyniqrsnIpXe4Gpqbs=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=KaHD7zeAMx7DGHfXLOf/682qKzsFqpnRvc35cDfolsm5y7etWbJ+GGIRgeURemq4LkWeFcealxv/m7bYfNcVbzmFFGWBQnev075Ps0EkqSzeNmy2pLTnLkiCHoMLECbcwNOGilyWxY5wSe11kJJHd75jLQoxKIV2NDNmhdnyX3A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iscas.ac.cn; spf=pass smtp.mailfrom=iscas.ac.cn; arc=none smtp.client-ip=159.226.251.21 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=iscas.ac.cn Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=iscas.ac.cn Received: from localhost.localdomain (unknown [111.196.241.250]) by APP-01 (Coremail) with SMTP id qwCowADHYPR1h5ZqTaP9Bg--.30584S2; Tue, 01 Sep 2026 16:06:13 +0800 (CST) From: Pengpeng Hou To: Anup Patel , Atish Patra Cc: Pengpeng Hou , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , kvm@vger.kernel.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] RISC-V: KVM: Preserve LCOFIP when checking pending interrupts Date: Tue, 1 Sep 2026 16:06:08 +0800 Message-ID: <20260901080610.91993-1-pengpeng@iscas.ac.cn> X-Mailer: git-send-email 2.50.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: qwCowADHYPR1h5ZqTaP9Bg--.30584S2 X-Coremail-Antispam: 1UD129KBjvJXoW7CrW7tF1xWF1xCrWfuw47CFg_yoW8Zry7pr 4Ikw1YqrW0qa4Ik342gr40gr1Yg3ykJr43uFZ29a4UJr42qa4ruF4kKa4UAF4rGryF9a4x XryIga45uas8Zw7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9014x267AKxVW8JVW5JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0 rVWrJVCq3wAFIxvE14AKwVWUJVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK02 1l84ACjcxK6xIIjxv20xvE14v26ryj6F1UM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4j 6F4UM28EF7xvwVC2z280aVAFwI0_Cr1j6rxdM28EF7xvwVC2z280aVCY1x0267AKxVW0oV Cq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0 I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r 4UM4x0Y48IcxkI7VAKI48JM4x0x7Aq67IIx4CEVc8vx2IErcIFxwACI402YVCY1x02628v n2kIc2xKxwCY1x0262kKe7AKxVWUtVW8ZwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7x kEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E 67AF67kF1VAFwI0_Jw0_GFylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCw CI42IY6xIIjxv20xvEc7CjxVAFwI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1x MIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIda VFxhVjvjDU0xZFpf9x0JUd-B_UUUUU= X-CM-SenderInfo: pshqw1xhqjqxpvfd2hldfou0/ Content-Type: text/plain; charset="utf-8" KVM injects the guest counter-overflow interrupt into HVIP bit 13 and records the same bit in irqs_pending. The guest enables it through VSIE LCOFIE, also at bit 13. kvm_riscv_vcpu_has_interrupts() shifts the complete VSIP valid mask by VSIP_TO_HVIP_SHIFT before matching it against irqs_pending. That maps SSIP, STIP, and SEIP to VSSIP, VSTIP, and VSEIP, but incorrectly moves LCOFIP from bit 13 to bit 14. The following high-interrupt term excludes all local interrupt bits, so it cannot recover LCOFIP. As a result, kvm_arch_vcpu_runnable() can report false for a vCPU waiting in WFI even though an enabled PMU overflow interrupt is pending. Keep LCOFIP in place while shifting the three interrupt classes that have distinct VS-level bit positions. This makes a vCPU halted in WFI runnable when its PMU overflow interrupt is pending. Fixes: 16b0bde9a37c ("RISC-V: KVM: Add perf sampling support for guests") Signed-off-by: Pengpeng Hou --- arch/riscv/kvm/vcpu.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/riscv/kvm/vcpu.c b/arch/riscv/kvm/vcpu.c index e062ca1..c6eb3bd 100644 --- a/arch/riscv/kvm/vcpu.c +++ b/arch/riscv/kvm/vcpu.c @@ -487,12 +487,14 @@ int kvm_riscv_vcpu_unset_interrupt(struct kvm_vcpu *v= cpu, unsigned int irq) bool kvm_riscv_vcpu_has_interrupts(struct kvm_vcpu *vcpu, u64 mask) { unsigned long flags; - unsigned long ie; + unsigned long ie, vsie; bool ret; =20 raw_spin_lock_irqsave(&vcpu->arch.irqs_pending_lock, flags); - ie =3D ((vcpu->arch.guest_csr.vsie & VSIP_VALID_MASK) - << VSIP_TO_HVIP_SHIFT) & (unsigned long)mask; + vsie =3D vcpu->arch.guest_csr.vsie & VSIP_VALID_MASK; + ie =3D ((vsie & ~SIP_LCOFIP) << VSIP_TO_HVIP_SHIFT) | + (vsie & SIP_LCOFIP); + ie &=3D (unsigned long)mask; ie |=3D vcpu->arch.guest_csr.vsie & ~IRQ_LOCAL_MASK & (unsigned long)mask; ret =3D vcpu->arch.irqs_pending[0] & ie;