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

[PATCH] nestedsvm: Don't set CR2 while injecting VMEXIT_EXCEPTION_PF


  • To: xen-devel@xxxxxxxxxxxxxxxxxxxx
  • From: Ross Lagerwall <ross.lagerwall@xxxxxxxxxx>
  • Date: Fri, 13 Nov 2026 17:24:44 +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=ujUoh3DTPndiwqg8qLuRPQyAvO/J67PQolpsbCicH4E=; b=lYpKb6gNEWO92u1IxrOVtzVITyF3a1ZT08CJBP1nmGL+1TXm1+ogEj7KO+yC/t7hb9UrssDdtPcyxMgeR8b7NXfLh8C9Dapu0ZdQxjeCsdEGcRGGZAAPG0qOg5vWNFyDeD8G+Gzjg4Z4Jdw+/FmCM/aJl9puEfGKZN+EsUGzk1QvQYxzdp4nTlVZJYo0reTIJUCxZGfExZU/guUMSq9PofZf7HQ6g/cYhZWpEi/a+AtOGAucg7iL4uo0RtK32MBVXALiEog1Uf3VHaOaq/449ZigqkRuX61xhzG22dGscd+0otdHbEFMXZrwcBbRPFL6jD2hamXr3WT2or4iy5kwcg==
  • Arc-seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=GpKWaBv6CbMdpRVxHduudZuYHnH8sXuNrdll1JagYXIocaRzlPVkaHpzH3QBFEtw5DgfR3FCZJmvzDDFWdduqUgErdLjqXXdMb5diJGtju4F69CKrmg6tuPMfdst7ShMaVgn3t51olHqF5d3A9f74iotJhLA7ZwlQ9U1SXNeDI3KEcumaRp9XVmO5HKcBDWD5aC7gx2T3yUqVLMmdYDOi0vGxXC4bYAqNt6+yuk0uPVXusaSBpLDdGkpMcQTnYjF3KydkCE8p6bcfPGHO4UCULaK4AIuUIfHhKUCE6A8RRBuU37e2UQmhmk48gn3sAgpB0gr7pfdlCWEmvXnGFVQIg==
  • 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, 13 Nov 2026 18:28:14 +0000
  • List-id: Xen developer discussion <xen-devel.lists.xenproject.org>

According to the APM, the #PF intercept is tested before CR2 is written
so don't write CR2 while injecting VMEXIT_EXCEPTION_PF into L1.
The faulting address is available to L1 in EXITINFO2.

Fixes: 9a779e4fc161 ("Implement SVM specific part for Nested Virtualization")
Signed-off-by: Ross Lagerwall <ross.lagerwall@xxxxxxxxxx>
---
 xen/arch/x86/hvm/svm/nestedsvm.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/xen/arch/x86/hvm/svm/nestedsvm.c b/xen/arch/x86/hvm/svm/nestedsvm.c
index 81cae929dd05..366178ff54a7 100644
--- a/xen/arch/x86/hvm/svm/nestedsvm.c
+++ b/xen/arch/x86/hvm/svm/nestedsvm.c
@@ -741,8 +741,6 @@ nsvm_vcpu_vmexit_inject(struct vcpu *v, struct 
cpu_user_regs *regs,
                 ns_vmcb->exit_int_info = ns_vmcb->event_inj;
             break;
         case VMEXIT_EXCEPTION_PF:
-            ns_vmcb->_cr2 = ns_vmcb->ei.exc.cr2;
-            fallthrough;
         case VMEXIT_NPF:
             ns_vmcb->exitinfo2 = svm->ns_vmexit.exitinfo2;
             fallthrough;
-- 
2.56.0




 


Rackspace

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