Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull x86 mm updates from Ingo Molnar:

 - Extend the memmap= boot parameter syntax to allow the redeclaration
   and dropping of existing ranges, and to support all e820 range types
   (Jan H. Schönherr)

 - Improve the W+X boot time security checks to remove false positive
   warnings on Xen (Jan Beulich)

 - Support booting as Xen PVH guest (Juergen Gross)

 - Improved 5-level paging (LA57) support, in particular it's possible
   now to have a single kernel image for both 4-level and 5-level
   hardware (Kirill A. Shutemov)

 - AMD hardware RAM encryption support (SME/SEV) fixes (Tom Lendacky)

 - Preparatory commits for hardware-encrypted RAM support on Intel CPUs.
   (Kirill A. Shutemov)

 - Improved Intel-MID support (Andy Shevchenko)

 - Show EFI page tables in page_tables debug files (Andy Lutomirski)

 - ... plus misc fixes and smaller cleanups

* 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (56 commits)
  x86/cpu/tme: Fix spelling: "configuation" -> "configuration"
  x86/boot: Fix SEV boot failure from change to __PHYSICAL_MASK_SHIFT
  x86/mm: Update comment in detect_tme() regarding x86_phys_bits
  x86/mm/32: Remove unused node_memmap_size_bytes() & CONFIG_NEED_NODE_MEMMAP_SIZE logic
  x86/mm: Remove pointless checks in vmalloc_fault
  x86/platform/intel-mid: Add special handling for ACPI HW reduced platforms
  ACPI, x86/boot: Introduce the ->reduced_hw_early_init() ACPI callback
  ACPI, x86/boot: Split out acpi_generic_reduce_hw_init() and export
  x86/pconfig: Provide defines and helper to run MKTME_KEY_PROG leaf
  x86/pconfig: Detect PCONFIG targets
  x86/tme: Detect if TME and MKTME is activated by BIOS
  x86/boot/compressed/64: Handle 5-level paging boot if kernel is above 4G
  x86/boot/compressed/64: Use page table in trampoline memory
  x86/boot/compressed/64: Use stack from trampoline memory
  x86/boot/compressed/64: Make sure we have a 32-bit code segment
  x86/mm: Do not use paravirtualized calls in native_set_p4d()
  kdump, vmcoreinfo: Export pgtable_l5_enabled value
  x86/boot/compressed/64: Prepare new top-level page table for trampoline
  x86/boot/compressed/64: Set up trampoline memory
  x86/boot/compressed/64: Save and restore trampoline memory
  ...

1 files changed, 87 insertions, 0 deletions

diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index c3af167d0a70..b9693b80fc21 100644
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -509,6 +509,90 @@ static void detect_vmx_virtcap(struct cpuinfo_x86 *c)
         }
 }
 
+#define MSR_IA32_TME_ACTIVATE           0x982
+
+/* Helpers to access TME_ACTIVATE MSR */
+#define TME_ACTIVATE_LOCKED(x)          (x & 0x1)
+#define TME_ACTIVATE_ENABLED(x)         (x & 0x2)
+
+#define TME_ACTIVATE_POLICY(x)          ((x >> 4) & 0xf)        /* Bits 7:4 */
+#define TME_ACTIVATE_POLICY_AES_XTS_128 0
+
+#define TME_ACTIVATE_KEYID_BITS(x)      ((x >> 32) & 0xf)       /* Bits 35:32 */
+
+#define TME_ACTIVATE_CRYPTO_ALGS(x)     ((x >> 48) & 0xffff)    /* Bits 63:48 */
+#define TME_ACTIVATE_CRYPTO_AES_XTS_128 1
+
+/* Values for mktme_status (SW only construct) */
+#define MKTME_ENABLED                   0
+#define MKTME_DISABLED                  1
+#define MKTME_UNINITIALIZED             2
+static int mktme_status = MKTME_UNINITIALIZED;
+
+static void detect_tme(struct cpuinfo_x86 *c)
+{
+        u64 tme_activate, tme_policy, tme_crypto_algs;
+        int keyid_bits = 0, nr_keyids = 0;
+        static u64 tme_activate_cpu0 = 0;
+
+        rdmsrl(MSR_IA32_TME_ACTIVATE, tme_activate);
+
+        if (mktme_status != MKTME_UNINITIALIZED) {
+                if (tme_activate != tme_activate_cpu0) {
+                        /* Broken BIOS? */
+                        pr_err_once("x86/tme: configuration is inconsistent between CPUs\n");
+                        pr_err_once("x86/tme: MKTME is not usable\n");
+                        mktme_status = MKTME_DISABLED;
+
+                        /* Proceed. We may need to exclude bits from x86_phys_bits. */
+                }
+        } else {
+                tme_activate_cpu0 = tme_activate;
+        }
+
+        if (!TME_ACTIVATE_LOCKED(tme_activate) || !TME_ACTIVATE_ENABLED(tme_activate)) {
+                pr_info_once("x86/tme: not enabled by BIOS\n");
+                mktme_status = MKTME_DISABLED;
+                return;
+        }
+
+        if (mktme_status != MKTME_UNINITIALIZED)
+                goto detect_keyid_bits;
+
+        pr_info("x86/tme: enabled by BIOS\n");
+
+        tme_policy = TME_ACTIVATE_POLICY(tme_activate);
+        if (tme_policy != TME_ACTIVATE_POLICY_AES_XTS_128)
+                pr_warn("x86/tme: Unknown policy is active: %#llx\n", tme_policy);
+
+        tme_crypto_algs = TME_ACTIVATE_CRYPTO_ALGS(tme_activate);
+        if (!(tme_crypto_algs & TME_ACTIVATE_CRYPTO_AES_XTS_128)) {
+                pr_err("x86/mktme: No known encryption algorithm is supported: %#llx\n",
+                                tme_crypto_algs);
+                mktme_status = MKTME_DISABLED;
+        }
+detect_keyid_bits:
+        keyid_bits = TME_ACTIVATE_KEYID_BITS(tme_activate);
+        nr_keyids = (1UL << keyid_bits) - 1;
+        if (nr_keyids) {
+                pr_info_once("x86/mktme: enabled by BIOS\n");
+                pr_info_once("x86/mktme: %d KeyIDs available\n", nr_keyids);
+        } else {
+                pr_info_once("x86/mktme: disabled by BIOS\n");
+        }
+
+        if (mktme_status == MKTME_UNINITIALIZED) {
+                /* MKTME is usable */
+                mktme_status = MKTME_ENABLED;
+        }
+
+        /*
+         * KeyID bits effectively lower the number of physical address
+         * bits.  Update cpuinfo_x86::x86_phys_bits accordingly.
+         */
+        c->x86_phys_bits -= keyid_bits;
+}
+
 static void init_intel_energy_perf(struct cpuinfo_x86 *c)
 {
         u64 epb;
@@ -679,6 +763,9 @@ static void init_intel(struct cpuinfo_x86 *c)
         if (cpu_has(c, X86_FEATURE_VMX))
                 detect_vmx_virtcap(c);
 
+        if (cpu_has(c, X86_FEATURE_TME))
+                detect_tme(c);
+
         init_intel_energy_perf(c);
 
         init_intel_misc_features(c);