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 81F733EDE47; Tue, 12 May 2026 18:00:35 +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=1778608835; cv=none; b=BFM1sx//lXcfyLMKICykqda8//ZQv0vGGlvaVl9f3TTHbc0f/mAjpBQ6HaQQWTO7UvBVLpPEUM+ZyXjlFn5Oeh2kWqeWwiB+cQe+7NkdNBpt6r37/nqkJzpW8PKYUEV3FZFJa6hCGeOYEe4i3OVqwV27dwtaykPoN4XBaNcPuW0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778608835; c=relaxed/simple; bh=9tAzfOLio3hu6h6zULQ0AUnLTTQiypWXOPZ8slMTJfc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bjqwXX2ReONK82hKtCsWmXjZA/ZnfBkZTUtoVo6ueS/zkQG8K8ka/+266P6VKM3EIEzHWcs0Go2xnS2cKzAgl4E6RLokUsIdudDUUa+13Xc+aMrwYQRC4GRkJX147zuNDPaHFonU4V+ZL8VLUAHzZq/4WIExdeSVJA2nRGd7cKU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Nv/7M5TT; 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="Nv/7M5TT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 19C6CC2BCB0; Tue, 12 May 2026 18:00:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1778608835; bh=9tAzfOLio3hu6h6zULQ0AUnLTTQiypWXOPZ8slMTJfc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Nv/7M5TTWRAYgIfToyca+DWHLFkB62ODUa84ToZujToPCeIn9V2dT423/TDS9lZIT LLeTL9YCS779wRVZc+AFruK6KvtkvIEGA3WqhJl78xEGwHvvrBA43S4Wom2cIImCWd z3b6ofjDktn6nIyEbbh0Rv+84EHS/+CjNUiprDx4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Marc Zyngier Subject: [PATCH 6.18 233/270] KVM: arm64: Wake-up from WFI when iqrchip is in userspace Date: Tue, 12 May 2026 19:40:34 +0200 Message-ID: <20260512173943.349396035@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260512173938.452574370@linuxfoundation.org> References: <20260512173938.452574370@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Marc Zyngier commit 4ce98bf0865c349e7026ad9c14f48da264920953 upstream. 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 Signed-off-by: Greg Kroah-Hartman --- arch/arm64/kvm/arm.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -755,6 +755,10 @@ int kvm_arch_vcpu_runnable(struct kvm_vc { 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); }