release/5.2.40/kvm-x86-relocate-constants-from-mmu.c-to-mmu.h-for-s.patch

From 7134629abfad0a71d8176bab79552b5760aab14c Mon Sep 17 00:00:00 2001
From: Paul Gortmaker <paul.gortmaker@windriver.com>
Date: Thu, 14 May 2020 11:07:09 -0400
Subject: [PATCH] kvm: x86: relocate constants from mmu.c to mmu.h for sharing

In the older code base, x86/kvm/x86.c still existed, and backports
with code originally in that file needs access to these constants.

So we make a stable-specific commit to move them from mmu.c to the
mmu.h where they can also be shared with the legacy x86.c file.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index 8614dae82270..d80af60cffba 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -154,11 +154,6 @@ module_param(dbg, bool, 0644);
 #define PT64_PERM_MASK (PT_PRESENT_MASK | PT_WRITABLE_MASK | shadow_user_mask \
 			| shadow_x_mask | shadow_nx_mask | shadow_me_mask)
 
-#define ACC_EXEC_MASK    1
-#define ACC_WRITE_MASK   PT_WRITABLE_MASK
-#define ACC_USER_MASK    PT_USER_MASK
-#define ACC_ALL          (ACC_EXEC_MASK | ACC_WRITE_MASK | ACC_USER_MASK)
-
 /* The mask for the R/X bits in EPT PTEs */
 #define PT64_EPT_READABLE_MASK			0x1ull
 #define PT64_EPT_EXECUTABLE_MASK		0x4ull
diff --git a/arch/x86/kvm/mmu.h b/arch/x86/kvm/mmu.h
index 4610230ddaea..87185302a53d 100644
--- a/arch/x86/kvm/mmu.h
+++ b/arch/x86/kvm/mmu.h
@@ -43,6 +43,11 @@
 #define PT32_ROOT_LEVEL 2
 #define PT32E_ROOT_LEVEL 3
 
+#define ACC_EXEC_MASK	1
+#define ACC_WRITE_MASK	PT_WRITABLE_MASK
+#define ACC_USER_MASK	PT_USER_MASK
+#define ACC_ALL		(ACC_EXEC_MASK | ACC_WRITE_MASK | ACC_USER_MASK)
+
 static inline u64 rsvd_bits(int s, int e)
 {
 	if (e < s)
-- 
2.7.4