diff mbox series

[PATCHv2,11/59] x86/mm: Detect MKTME early

Message ID	20190731150813.26289-12-kirill.shutemov@linux.intel.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <kvm-owner@kernel.org> From: "Kirill A. Shutemov" <kirill@shutemov.name> To: Andrew Morton <akpm@linux-foundation.org>, x86@kernel.org, Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>, Borislav Petkov <bp@alien8.de>, Peter Zijlstra <peterz@infradead.org>, Andy Lutomirski <luto@amacapital.net>, David Howells <dhowells@redhat.com> Cc: Kees Cook <keescook@chromium.org>, Dave Hansen <dave.hansen@intel.com>, Kai Huang <kai.huang@linux.intel.com>, Jacob Pan <jacob.jun.pan@linux.intel.com>, Alison Schofield <alison.schofield@intel.com>, linux-mm@kvack.org, kvm@vger.kernel.org, keyrings@vger.kernel.org, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> Subject: [PATCHv2 11/59] x86/mm: Detect MKTME early Date: Wed, 31 Jul 2019 18:07:25 +0300 Message-Id: <20190731150813.26289-12-kirill.shutemov@linux.intel.com> In-Reply-To: <20190731150813.26289-1-kirill.shutemov@linux.intel.com> References: <20190731150813.26289-1-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: kvm-owner@vger.kernel.org Precedence: bulk
Series	Intel MKTME enabling \| expand [PATCHv2,00/59] Intel MKTME enabling [PATCHv2,01/59] mm: Do no merge VMAs with different encryption KeyIDs [PATCHv2,02/59] mm: Add helpers to setup zero page mappings [PATCHv2,03/59] mm/ksm: Do not merge pages with different KeyIDs [PATCHv2,04/59] mm/page_alloc: Unify alloc_hugepage_vma() [PATCHv2,05/59] mm/page_alloc: Handle allocation for encrypted memory [PATCHv2,06/59] mm/khugepaged: Handle encrypted pages [PATCHv2,07/59] x86/mm: Mask out KeyID bits from page table entry pfn [PATCHv2,08/59] x86/mm: Introduce helpers to read number, shift and mask of KeyIDs [PATCHv2,09/59] x86/mm: Store bitmask of the encryption algorithms supported by MKTME [PATCHv2,10/59] x86/mm: Preserve KeyID on pte_modify() and pgprot_modify() [PATCHv2,11/59] x86/mm: Detect MKTME early [PATCHv2,12/59] x86/mm: Add a helper to retrieve KeyID for a page [PATCHv2,13/59] x86/mm: Add a helper to retrieve KeyID for a VMA [PATCHv2,14/59] x86/mm: Add hooks to allocate and free encrypted pages [PATCHv2,15/59] x86/mm: Map zero pages into encrypted mappings correctly [PATCHv2,16/59] x86/mm: Rename CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING [PATCHv2,17/59] x86/mm: Allow to disable MKTME after enumeration [PATCHv2,18/59] x86/mm: Calculate direct mapping size [PATCHv2,19/59] x86/mm: Implement syncing per-KeyID direct mappings [PATCHv2,20/59] x86/mm: Handle encrypted memory in page_to_virt() and __pa() [PATCHv2,21/59] mm/page_ext: Export lookup_page_ext() symbol [PATCHv2,22/59] mm/rmap: Clear vma->anon_vma on unlink_anon_vmas() [PATCHv2,23/59] x86/pconfig: Set an activated algorithm in all MKTME commands [PATCHv2,24/59] keys/mktme: Introduce a Kernel Key Service for MKTME [PATCHv2,25/59] keys/mktme: Preparse the MKTME key payload [PATCHv2,26/59] keys/mktme: Instantiate MKTME keys [PATCHv2,27/59] keys/mktme: Destroy MKTME keys [PATCHv2,28/59] keys/mktme: Move the MKTME payload into a cache aligned structure [PATCHv2,29/59] keys/mktme: Set up PCONFIG programming targets for MKTME keys [PATCHv2,30/59] keys/mktme: Program MKTME keys into the platform hardware [PATCHv2,31/59] keys/mktme: Set up a percpu_ref_count for MKTME keys [PATCHv2,32/59] keys/mktme: Clear the key programming from the MKTME hardware [PATCHv2,33/59] keys/mktme: Require CAP_SYS_RESOURCE capability for MKTME keys [PATCHv2,34/59] acpi: Remove __init from acpi table parsing functions [PATCHv2,35/59] acpi/hmat: Determine existence of an ACPI HMAT [PATCHv2,36/59] keys/mktme: Require ACPI HMAT to register the MKTME Key Service [PATCHv2,37/59] acpi/hmat: Evaluate topology presented in ACPI HMAT for MKTME [PATCHv2,38/59] keys/mktme: Do not allow key creation in unsafe topologies [PATCHv2,39/59] keys/mktme: Support CPU hotplug for MKTME key service [PATCHv2,40/59] keys/mktme: Block memory hotplug additions when MKTME is enabled [PATCHv2,41/59] mm: Generalize the mprotect implementation to support extensions [PATCHv2,42/59] syscall/x86: Wire up a system call for MKTME encryption keys [PATCHv2,43/59] x86/mm: Set KeyIDs in encrypted VMAs for MKTME [PATCHv2,44/59] mm: Add the encrypt_mprotect() system call for MKTME [PATCHv2,45/59] x86/mm: Keep reference counts on hardware key usage for MKTME [PATCHv2,46/59] mm: Restrict MKTME memory encryption to anonymous VMAs [PATCHv2,47/59] kvm, x86, mmu: setup MKTME keyID to spte for given PFN [PATCHv2,48/59] iommu/vt-d: Support MKTME in DMA remapping [PATCHv2,49/59] x86/mm: introduce common code for mem encryption [PATCHv2,50/59] x86/mm: Use common code for DMA memory encryption [PATCHv2,51/59] x86/mm: Disable MKTME on incompatible platform configurations [PATCHv2,52/59] x86/mm: Disable MKTME if not all system memory supports encryption [PATCHv2,53/59] x86: Introduce CONFIG_X86_INTEL_MKTME [PATCHv2,54/59] x86/mktme: Overview of Multi-Key Total Memory Encryption [PATCHv2,55/59] x86/mktme: Document the MKTME provided security mitigations [PATCHv2,56/59] x86/mktme: Document the MKTME kernel configuration requirements [PATCHv2,57/59] x86/mktme: Document the MKTME Key Service API [PATCHv2,58/59] x86/mktme: Document the MKTME API for anonymous memory encryption [PATCHv2,59/59] x86/mktme: Demonstration program using the MKTME APIs

Commit Message

Kirill A . Shutemov July 31, 2019, 3:07 p.m. UTC

We need to know the number of KeyIDs before page_ext is initialized.
We are going to use page_ext to store KeyID and it would be handly to
avoid page_ext allocation if there's no MKMTE in the system.

page_ext initialization happens before full CPU initizliation is complete.
Move detect_tme() call to early_init_intel().

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
---
 arch/x86/kernel/cpu/intel.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff mbox series

Patch

diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index 991bdcb2a55a..4c2d70287eb4 100644
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -187,6 +187,8 @@  static bool bad_spectre_microcode(struct cpuinfo_x86 *c)
 	return false;
 }
 
+static void detect_tme(struct cpuinfo_x86 *c);
+
 static void early_init_intel(struct cpuinfo_x86 *c)
 {
 	u64 misc_enable;
@@ -338,6 +340,9 @@  static void early_init_intel(struct cpuinfo_x86 *c)
 	 */
 	if (detect_extended_topology_early(c) < 0)
 		detect_ht_early(c);
+
+	if (cpu_has(c, X86_FEATURE_TME))
+		detect_tme(c);
 }
 
 #ifdef CONFIG_X86_32
@@ -793,9 +798,6 @@  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_misc_features(c);
 }