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 E84E12FCBFC; Tue, 30 Sep 2025 15:12:44 +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=1759245165; cv=none; b=iAmNDCP5dE02TTJGnoYXHIzkuZ/meHYKdWoK2Q6VAxDEIO89z3rmWnZqveQusLKj/pstU/S7SnHsWGJ7rEcJ1q4aGJdZA0qCAgasfI8h1DKKubRs9q3/cAtPWL2cAexGm0oarbU7JudlUBtWzmh8QiMHVtYH0s4hrIU+mDIjUrY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759245165; c=relaxed/simple; bh=pYPcmN7KJ6wHXYQRKHFnWgJn7aBWC3bmerZOJ2WWQXA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ax/hMUVqE+e5yfnS96Bir9arTnvH/6xyO3FPAIfjmnIS4eBJjqw7GB88mhHKHPdiq+SJBz4TocwLSnNNEmxXPcKqkJW+xwqBQj51fQallrQ+C2qBlkdyz8EZrZDmgk0nops7C9EpSrE+8Tngk1DIf9Y4/XALtTPxwRKBBnJELHY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=hEPiTcYp; 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="hEPiTcYp" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 60B19C4CEF0; Tue, 30 Sep 2025 15:12:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1759245164; bh=pYPcmN7KJ6wHXYQRKHFnWgJn7aBWC3bmerZOJ2WWQXA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hEPiTcYpQjmho/N0qWfBju+qqG8GFIsEQXcMj2aetqpum45mt41N8Hayh3oXQ7IG2 VgQCs66o3bp3dBfscQSMv2gXfDf/xxGy5GO0r8ppWkSFYjGwKbJ9LsWnmcPd5BqaMR 7m8HErQ0k8iIDTVcsQjq2n52CGA8XKlvUBD8janw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "Maciej S. Szmigiero" , "Naveen N Rao (AMD)" , Sean Christopherson Subject: [PATCH 5.15 083/151] KVM: SVM: Sync TPR from LAPIC into VMCB::V_TPR even if AVIC is active Date: Tue, 30 Sep 2025 16:46:53 +0200 Message-ID: <20250930143830.901156825@linuxfoundation.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250930143827.587035735@linuxfoundation.org> References: <20250930143827.587035735@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 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Maciej S. Szmigiero commit d02e48830e3fce9701265f6c5a58d9bdaf906a76 upstream. Commit 3bbf3565f48c ("svm: Do not intercept CR8 when enable AVIC") inhibited pre-VMRUN sync of TPR from LAPIC into VMCB::V_TPR in sync_lapic_to_cr8() when AVIC is active. AVIC does automatically sync between these two fields, however it does so only on explicit guest writes to one of these fields, not on a bare VMRUN. This meant that when AVIC is enabled host changes to TPR in the LAPIC state might not get automatically copied into the V_TPR field of VMCB. This is especially true when it is the userspace setting LAPIC state via KVM_SET_LAPIC ioctl() since userspace does not have access to the guest VMCB. Practice shows that it is the V_TPR that is actually used by the AVIC to decide whether to issue pending interrupts to the CPU (not TPR in TASKPRI), so any leftover value in V_TPR will cause serious interrupt delivery issues in the guest when AVIC is enabled. Fix this issue by doing pre-VMRUN TPR sync from LAPIC into VMCB::V_TPR even when AVIC is enabled. Fixes: 3bbf3565f48c ("svm: Do not intercept CR8 when enable AVIC") Cc: stable@vger.kernel.org Signed-off-by: Maciej S. Szmigiero Reviewed-by: Naveen N Rao (AMD) Link: https://lore.kernel.org/r/c231be64280b1461e854e1ce3595d70cde3a2e9d.1756139678.git.maciej.szmigiero@oracle.com [sean: tag for stable@] Signed-off-by: Sean Christopherson Signed-off-by: Greg Kroah-Hartman --- arch/x86/kvm/svm/svm.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -3666,8 +3666,7 @@ static inline void sync_lapic_to_cr8(str struct vcpu_svm *svm = to_svm(vcpu); u64 cr8; - if (nested_svm_virtualize_tpr(vcpu) || - kvm_vcpu_apicv_active(vcpu)) + if (nested_svm_virtualize_tpr(vcpu)) return; cr8 = kvm_get_cr8(vcpu);