[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH v1 2/2] x86/nestedsvm: Handle L2 writing to the L1 APIC TPR


  • To: xen-devel@xxxxxxxxxxxxxxxxxxxx
  • From: Ross Lagerwall <ross.lagerwall@xxxxxxxxxx>
  • Date: Fri, 20 Nov 2026 16:35:03 +0000
  • Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none
  • Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Nb2OZaMYgBFgKKxuzsmEYyjkNljLAe0Cx995xQxk+qM=; b=yYzZg0idhe9VBBgPsHmm2kCyjTFXYenE6bdnj3BLHhlpLSy4YKbHvKx359V7Land3L7DYJwPcftOVAz1DylyvCoz9R0Zpxjrxx6sLTlBsUJMJPBdbkNxyli9aLCZQYZBDMuCfep2SXiglHO/+XP4gaD09zmLJytFUzLFCUnLKbF6/62cgg7majDCEZRSXUc7Gb0u6AOVVZ5niTjflH9MLLo80Zx57DnC/uUVqEbQKstukQuOfyM7382hRTITO5o4jS0lo5MSm+4G/2SLujMwpME3fOKaYfHaCeDY9ne4aOepYmqG9Y5eUXViHWacn2A6pMeXs0arjMiSxNNHTHNDMw==
  • Arc-seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=PRLDWr+fMZjz1JCPYru8N0VdnVZlRJAHhMl4Qx72Gdme4xxWjagn04UsqIERN3uijz2V5/5k4iAA0wyfXb3We1YubgBhwqA71r/xyrduWzRR/1KCm86CCtK89+RTXMmrhvU89ZBOhunEu0H+uT2V5LhvyIhRiPP3iTIAaBsCjSssZx6dBLI192ietVuXtAQ+nLptfJQ1cuSDRXxBIyEzdW82riouXdBoZZk7jy/hsIKwGzliuqC/PDdUTTg1CDfpeHrw1jSMAKXGKzF3j+egrAAZN+eaBAcHAPQpr4/u5wcvywlWVh6G2/QA+RlxjpXOH2qe/HNgFupWeGqHHcL21w==
  • Authentication-results: eu.smtp.expurgate.cloud; dkim=pass header.s=selector1 header.d=citrix.com header.i="@citrix.com" header.h="From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck"
  • Authentication-results: mx.microsoft.com 1; dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=citrix.com;
  • Cc: Ross Lagerwall <ross.lagerwall@xxxxxxxxxx>, Jan Beulich <jbeulich@xxxxxxxx>, Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, Roger Pau Monné <roger@xxxxxxxxxxxxxx>, Jason Andryuk <jason.andryuk@xxxxxxx>, Teddy Astie <teddy.astie@xxxxxxxxxx>
  • Delivery-date: Fri, 20 Nov 2026 16:36:16 +0000
  • List-id: Xen developer discussion <xen-devel.lists.xenproject.org>

L1 may allow L2 to write to its APIC TPR. Handle these changes by always
syncing the APIC TPR to VMCB(0-1) rather than skipping the sync if in
guest mode. This ensures that subsequent L1 accesses to CR8 see the
correct value.

Signed-off-by: Ross Lagerwall <ross.lagerwall@xxxxxxxxxx>
---
 xen/arch/x86/hvm/svm/svm.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c
index 1043f4a988a8..b691fd2ea6d6 100644
--- a/xen/arch/x86/hvm/svm/svm.c
+++ b/xen/arch/x86/hvm/svm/svm.c
@@ -944,6 +944,7 @@ static void noreturn cf_check svm_do_resume(void)
 {
     struct vcpu *v = current;
     struct vmcb *vmcb = v->arch.hvm.svm.vmcb;
+    struct vmcb *n1_vmcb = vcpu_nestedhvm(v).nv_n1vmcx;
     bool debug_state = (v->domain->debugger_attached ||
                         v->domain->arch.monitor.software_breakpoint_enabled ||
                         v->domain->arch.monitor.debug_exception_enabled);
@@ -974,8 +975,8 @@ static void noreturn cf_check svm_do_resume(void)
         vmcb->cleanbits.raw = 0;
     }
 
-    if ( !vcpu_guestmode && !vlapic_hw_disabled(vlapic) )
-        svm_update_tpr(vmcb, vlapic);
+    if ( !vlapic_hw_disabled(vlapic) )
+        svm_update_tpr(n1_vmcb, vlapic);
 
     hvm_do_resume(v);
 
@@ -2521,6 +2522,7 @@ void asmlinkage svm_vmexit_handler(void)
     uint64_t exit_reason;
     struct vcpu *v = current;
     struct vmcb *vmcb = v->arch.hvm.svm.vmcb;
+    struct vmcb *n1_vmcb = vcpu_nestedhvm(v).nv_n1vmcx;
     int insn_len;
     vintr_t intr;
     bool vcpu_guestmode = false;
@@ -3075,10 +3077,10 @@ void asmlinkage svm_vmexit_handler(void)
     }
 
   out:
-    if ( vcpu_guestmode || vlapic_hw_disabled(vlapic) )
+    if ( vlapic_hw_disabled(vlapic) )
         return;
 
-    svm_update_tpr(vmcb, vlapic);
+    svm_update_tpr(n1_vmcb, vlapic);
 }
 
 /*
-- 
2.56.0




 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.