From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CD74130674C for ; Tue, 12 May 2026 14:24:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778595878; cv=none; b=nBrLGE63KTDbzZouC2Io216wRDlG7/x7jKY419d5g2baR0GRgow8Kt62em9S0mMBSTiXUnTiZQLdg+ZfQqpzaq7QTJ4AFGuqVq72aYvcvQEAw0ZpXbVvls0OFrxkk2afMNzIgdwOWUfAkjL1UnMCf4o/3eqQh0KW0RslVZXSvjE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778595878; c=relaxed/simple; bh=nUJlUTAEj/fL4sN7t/TguP7ByIbj7HxXFNq1kZt0P7A=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=ZSZBkrIZ+KLfbOVhOkIqGtH5rBKkb3JcGJxRdZDFqYYBZTSoaYMvm3pMJJIb2wV1rU+ynJER8lwKGNs/x0JYRr2KrQqEBDmyD56D33uxXiWLEmXvzYY0HS1gxUCQEdIARAcgKv3N7Cy80c7IgGBikiIZguMRsBruxgYVJK3dxHw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=NpcRApIG; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="NpcRApIG" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3BF45C2BCB0; Tue, 12 May 2026 14:24:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778595878; bh=nUJlUTAEj/fL4sN7t/TguP7ByIbj7HxXFNq1kZt0P7A=; h=Subject:To:Cc:From:Date:From; b=NpcRApIGr4+Ei0+XZvdUfd/Y+mjih6aGh3k6b8fQiZE7daNwSgOv6GjiQSQ7PquO1 Be6VAM+Jms3rhZH4aoAMt9+bmsUgYAiCKyjBuTcaYKZ4dDO1mMaIxNGEircjCkgvx7 WXrKAsPwgBBb8mcJgceOQMk+Xhm6OQVsETmnEJ3s= Subject: FAILED: patch "[PATCH] KVM: arm64: Wake-up from WFI when iqrchip is in userspace" failed to apply to 6.1-stable tree To: maz@kernel.org Cc: From: Date: Tue, 12 May 2026 16:24:37 +0200 Message-ID: <2026051236-tribesman-mortuary-f185@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x 4ce98bf0865c349e7026ad9c14f48da264920953 # git commit -s git send-email --to '' --in-reply-to '2026051236-tribesman-mortuary-f185@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 4ce98bf0865c349e7026ad9c14f48da264920953 Mon Sep 17 00:00:00 2001 From: Marc Zyngier Date: Thu, 23 Apr 2026 17:36:07 +0100 Subject: [PATCH] KVM: arm64: Wake-up from WFI when iqrchip is in userspace It appears that there is nothing in the wake-up path that evaluates whether the in-kernel interrupts are pending unless we have a vgic. This means that the userspace irqchip support has been broken for about four years, and nobody noticed. It was also broken before as we wouldn't wake-up on a PMU interrupt, but hey, who cares... It is probably time to remove the feature altogether, because it was a terrible idea 10 years ago, and it still is. Fixes: b57de4ffd7c6d ("KVM: arm64: Simplify kvm_cpu_has_pending_timer()") Link: https://patch.msgid.link/20260423163607.486345-1-maz@kernel.org Signed-off-by: Marc Zyngier Cc: stable@vger.kernel.org diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index 176cbe8baad3..8bb2c7422cc8 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -824,6 +824,10 @@ int kvm_arch_vcpu_runnable(struct kvm_vcpu *v) { bool irq_lines = *vcpu_hcr(v) & (HCR_VI | HCR_VF | HCR_VSE); + irq_lines |= (!irqchip_in_kernel(v->kvm) && + (kvm_timer_should_notify_user(v) || + kvm_pmu_should_notify_user(v))); + return ((irq_lines || kvm_vgic_vcpu_pending_irq(v)) && !kvm_arm_vcpu_stopped(v) && !v->arch.pause); }