From patchwork Tue Jun 12 14:39:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "kirill.shutemov@linux.intel.com" X-Patchwork-Id: 10460513 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C9B746020F for ; Tue, 12 Jun 2018 14:40:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C3337287AB for ; Tue, 12 Jun 2018 14:40:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B71DF287E2; Tue, 12 Jun 2018 14:40:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C8E20287AB for ; Tue, 12 Jun 2018 14:39:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A3EE66B000D; Tue, 12 Jun 2018 10:39:29 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 9FCFC6B026E; Tue, 12 Jun 2018 10:39:29 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7438E6B026C; Tue, 12 Jun 2018 10:39:29 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl0-f72.google.com (mail-pl0-f72.google.com [209.85.160.72]) by kanga.kvack.org (Postfix) with ESMTP id 139626B000D for ; Tue, 12 Jun 2018 10:39:29 -0400 (EDT) Received: by mail-pl0-f72.google.com with SMTP id q18-v6so9397983pll.3 for ; Tue, 12 Jun 2018 07:39:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references; bh=kEN1Mzc8H+Z6UysbnT0wSNUGmzpJTlfhaAa9RimnztQ=; b=i6X48M3+nrN9ZR70L5FL5F98zg2Is8oYwi31xD+t4s8bKltNJMe7yx/NFxQJoA6SzH s0KY4ATh4F7qDEyI24h2rF3RFJomAGBTMWLVdhX+k/MMhSp0WR0oAKwt7xlWt0UVFf3N z53XUBIKBvFXuxZQoIRAUxAc3Bh1m98fDaiOIHEoB+AbhNZ85HJcP5jROoNZaIg9IKEh tGsMW3mDLzwN8lCM8c0rj9Cg2J90L8+FmOgnPXMJpvDHz9xbgo6ulKth/EOtAhr/7AsZ b8v45rt7zLi8oQA0br2qQ9X3y1F4DJ/NFB6TflA9WGz7L69cHZKRSDvvlJE3THIMt4wq Xpww== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of kirill.shutemov@linux.intel.com designates 192.55.52.136 as permitted sender) smtp.mailfrom=kirill.shutemov@linux.intel.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Gm-Message-State: APt69E0HEagyaA8a+yc7xtlDpfdP/otYkT3RcODCRYhnPOoqcH1X3gMA DUipEpAmy0A0jbE2Q/ctv9pire/WrskgnRDu/cCkY55WuR+mLLbu2kCfsoJq4Qdv1BuzOyiG+6H tqQN7GbxQo0Myw1tbvUEGsQ0d8XrgUsmAWikEoKeXKPxCkCHtdYkdT3BJT3JCcHFqiA== X-Received: by 2002:a62:9c9c:: with SMTP id u28-v6mr724912pfk.90.1528814368752; Tue, 12 Jun 2018 07:39:28 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLdX4HCUmP4Xd5+S0pPTe2fyMOn58VBXzuA4us3GatZKSah0I88xspu89Nk5D6WrpCNPK1M X-Received: by 2002:a62:9c9c:: with SMTP id u28-v6mr724866pfk.90.1528814367941; Tue, 12 Jun 2018 07:39:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528814367; cv=none; d=google.com; s=arc-20160816; b=uh+eOkfId8zVFvgdwT9fM2gWbmFapzG56RnU7ZhmfTyIqb9bngLJE24wjc0O5YODfP elQTWkpHb5KhvmC3aNhhJzdnQuPohwqgSc6k4UbmVCb4E35aXLoUpEYCCAwXoxgqaoZR LfdG4ygXWmiDLIE152oHXhQvtLvkLyzgRadq17aEJJk7/ilL4U+1gUH2rG0B5qgVa90S P1+iZdHwq/h+ztkYR8enVLGdVF4n8CUXLi5vkxW2bqubk4dEQsm0QC3n3Kg7tfuAyRsX 3oLO6bmbEcSu3/uel0NmO9oGtjOn2lJgwTqWY/j/njxCP0/qKcIqESbwrhIspwcbdMpE LGpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=kEN1Mzc8H+Z6UysbnT0wSNUGmzpJTlfhaAa9RimnztQ=; b=jBnoVnnq5PQTTkAyexag2m3YE30HLYmEwFhuvBmCEcecs2gdBNyJDR9VsHKU+oRlZp tBkuLcNVwozEhvPtgEMc58ErGFEiL6hSA8giXxhaHT3xPY85jhFgkwdGI/5ZVGToOzpR WbTrCqZkZAfD0kTtZ5cO92KMAiwb4LLHBFxyeGRlm4NFCBUpYugdAi5Nq0f+eYGjRX7e ZpZu58gZOhvkJTLjGgjpE95HkHz6zed6oZrrQIy0YX9oNJy4SaIP0Poymch+UzWFJ/rQ b24XG0G+xkAioc1SXXYsc/Q/Bxfn4q3Bs9ucNKmE/E1NuJDramFtZy/24hUYO28303Km z8EQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of kirill.shutemov@linux.intel.com designates 192.55.52.136 as permitted sender) smtp.mailfrom=kirill.shutemov@linux.intel.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga12.intel.com (mga12.intel.com. [192.55.52.136]) by mx.google.com with ESMTPS id d191-v6si257904pga.192.2018.06.12.07.39.27 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Jun 2018 07:39:27 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of kirill.shutemov@linux.intel.com designates 192.55.52.136 as permitted sender) client-ip=192.55.52.136; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of kirill.shutemov@linux.intel.com designates 192.55.52.136 as permitted sender) smtp.mailfrom=kirill.shutemov@linux.intel.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 12 Jun 2018 07:39:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,215,1526367600"; d="scan'208";a="48384955" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga007.jf.intel.com with ESMTP; 12 Jun 2018 07:39:24 -0700 Received: by black.fi.intel.com (Postfix, from userid 1000) id 2E9A753F; Tue, 12 Jun 2018 17:39:21 +0300 (EEST) From: "Kirill A. Shutemov" To: Ingo Molnar , x86@kernel.org, Thomas Gleixner , "H. Peter Anvin" , Tom Lendacky Cc: Dave Hansen , Kai Huang , Jacob Pan , linux-kernel@vger.kernel.org, linux-mm@kvack.org, "Kirill A. Shutemov" Subject: [PATCHv3 13/17] x86/mm: Detect MKTME early Date: Tue, 12 Jun 2018 17:39:11 +0300 Message-Id: <20180612143915.68065-14-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180612143915.68065-1-kirill.shutemov@linux.intel.com> References: <20180612143915.68065-1-kirill.shutemov@linux.intel.com> X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP We need to know number of KeyIDs before KALSR is initialized. Number of KeyIDs would determinate how much address space would be needed for per-KeyID direct mapping. KALSR initialization happens before full CPU initizliation is complete. Move detect_tme() call to early_init_intel(). Signed-off-by: Kirill A. Shutemov --- arch/x86/kernel/cpu/intel.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index fb58776513e6..3322b0125353 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c @@ -158,6 +158,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; @@ -301,6 +303,9 @@ static void early_init_intel(struct cpuinfo_x86 *c) } check_mpx_erratum(c); + + if (cpu_has(c, X86_FEATURE_TME)) + detect_tme(c); } #ifdef CONFIG_X86_32 @@ -762,9 +767,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_energy_perf(c); init_intel_misc_features(c);