From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Mon, 11 May 2015 08:42:35 +0000 (+0200)
Subject: x86/hvm: permit HVM_PARAM_IDENT_PT to be set more than once
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~3268
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=435beb84b5092d304c5ccd343b445010d5a38a4e;p=xen.git

x86/hvm: permit HVM_PARAM_IDENT_PT to be set more than once

There is no conceptual problem with setting this parameter more than once.
Checkpointed migration streams will typically set it once per checkpoint to
the same value.

The parameter is only actually needed on early-generation VT-x which lacked
the unrestricted guest capability, although it could plausibly be used on
newer VT-x with unusual execution control settings.  Short circuit the
expensive operations on non VT-x hardware.

The parameter itself must always be latched to avoid issues if the VM
eventually migrates to a host which needs to use the pagetable.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---

diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
index 78b0efb8bf..689e402e0f 100644
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -5712,13 +5712,15 @@ static int hvmop_set_param(
             rc = -EINVAL;
         break;
     case HVM_PARAM_IDENT_PT:
-        rc = -EINVAL;
-        if ( d->arch.hvm_domain.params[a.index] != 0 )
-            break;
-
-        rc = 0;
-        if ( !paging_mode_hap(d) )
+        /*
+         * Only actually required for VT-x lacking unrestricted_guest
+         * capabilities.  Short circuit the pause if possible.
+         */
+        if ( !paging_mode_hap(d) || !cpu_has_vmx )
+        {
+            d->arch.hvm_domain.params[a.index] = a.value;
             break;
+        }
 
         /*
          * Update GUEST_CR3 in each VMCS to point at identity map.