From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Thu, 18 Oct 2018 10:30:27 +0000 (+0100)
Subject: x86/cpuid: Tie SMAP to NX, for the shadow pagetable code
X-Git-Tag: archive/raspbian/4.14.0+80-gd101b417b7-1+rpi1^2~63^2~2975
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=27bd5ef5c8ac2791ee8bc8033ee8d994ec6a496f;p=xen.git

x86/cpuid: Tie SMAP to NX, for the shadow pagetable code

NX support in the host is required for the shadow pagetable code to handle
SMAP correctly for guests.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
---

diff --git a/xen/tools/gen-cpuid.py b/xen/tools/gen-cpuid.py
index 3fecae86d4..31fdee951e 100755
--- a/xen/tools/gen-cpuid.py
+++ b/xen/tools/gen-cpuid.py
@@ -239,6 +239,11 @@ def crunch_numbers(state):
         # absence of any enabled xstate.
         AVX: [FMA, FMA4, F16C, AVX2, XOP],
 
+        # This dependency exists solely for the shadow pagetable code.  If the
+        # host doesn't have NX support, the shadow pagetable code can't handle
+        # SMAP correctly for guests.
+        NX: [SMAP],
+
         # CX16 is only encodable in Long Mode.  LAHF_LM indicates that the
         # SAHF/LAHF instructions are reintroduced in Long Mode.  1GB
         # superpages, PCID and PKU are only available in 4 level paging.