From patchwork Tue Jun 26 14:22:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kirill A. Shutemov" X-Patchwork-Id: 10489181 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 7A20B602D8 for ; Tue, 26 Jun 2018 14:23:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6A1DB2876C for ; Tue, 26 Jun 2018 14:23:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5ECA2288F4; Tue, 26 Jun 2018 14:23:40 +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 F406C2876C for ; Tue, 26 Jun 2018 14:23:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5A7E96B027B; Tue, 26 Jun 2018 10:23:05 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 488816B027D; Tue, 26 Jun 2018 10:23:05 -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 180D76B027B; Tue, 26 Jun 2018 10:23:05 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf0-f198.google.com (mail-pf0-f198.google.com [209.85.192.198]) by kanga.kvack.org (Postfix) with ESMTP id 77BEC6B027D for ; Tue, 26 Jun 2018 10:23:04 -0400 (EDT) Received: by mail-pf0-f198.google.com with SMTP id d4-v6so8875568pfn.9 for ; Tue, 26 Jun 2018 07:23:04 -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=sRsoGR7nI9fj+DvLdgMQSjhtx2NqQSl7PzkEYyGdBPI=; b=mj9Uvu670mEkgGXRcnZpebPPEACdJX/a4B4Q6dlAhhSkcCuzY3L1uNYm3qbW/8vl2G eoVwuObuU4iGZCmk0KR1OZfYvH4F6K3uzpLvIvtS7cNt2p4VhFXllrUUKocMFHuUVtaZ l1mjd0Ve5Pf9WPpTN1XQEFQ+5yPwToWpCcEcRcEpboVcrRzPysPiln77Lr3nvoxOq5zp waJCBfUzD/9XYAs+ywocuEam4iBnRJF5g9jV9CxXUt6eV2QODvfGL/5CirZ5sw40AiOC FvA9iZC9fH14w6ICsd42/upDVDhYLqAPLNG8P9G8vxjvJbfZrRs65glyOHnJyPXcI32I ROAw== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of kirill.shutemov@linux.intel.com designates 134.134.136.65 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: APt69E3HGtQDpRht+jFD09O+l6Vmio0UzJ8i5jVA4Bp2N9XYDgHEeHL8 cGowK/0w9Elnb8jkhICSPeZPW7bHFlQIIVFD/P1yDjdU5/G0VWZIY9RW9GOGhBLnsuYZP9RF1f4 hPL8fj6P5f4F+ewrgvv+rv15gstkh5CUdQBIMTe1KWRv+ar3XMOKOj66XM5PjYlfP/Q== X-Received: by 2002:a62:284a:: with SMTP id o71-v6mr1792325pfo.67.1530022984169; Tue, 26 Jun 2018 07:23:04 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfDEaU43i+B+9Md4haGluFFkNEzDP9yeolo0uiJ+a9fx/spq6cbSZJu3Ye1LmGXvHdNbGqW X-Received: by 2002:a62:284a:: with SMTP id o71-v6mr1791832pfo.67.1530022976114; Tue, 26 Jun 2018 07:22:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530022976; cv=none; d=google.com; s=arc-20160816; b=exorEDZDFkQ7DlNZgumd+CBvAWhls6NENAHDMKIRw9WLKcKqJB9O3/zknPZCuU/UK6 LEkfwoHlR0vJ0fERXkDwgKJZL0bwazV2gSsU96bfahPOXJ2JI1ZqtaqYjLxZctU7DJt3 iY3NO1eQ7IIJMdkek8Xl+IdPR2xGphjtUiuBNX9BnBuRDB2fxM4RaC8b7eixbGP4fvdv yYKfFC4hc329crT+jE0wIyxnHGbzZDS7yQkDYTvBZ+t5WxoGr6wUD5DsBRARLuGdT8yo FaadjhupThC67n9pgRUneqKrtBVFL88yQwPbbgcu9sJy+aoyBhhFW83nqRMnx2kNnATF VPPg== 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=sRsoGR7nI9fj+DvLdgMQSjhtx2NqQSl7PzkEYyGdBPI=; b=UgS4Pt6ZTBWIL9XyMN7UZBtopCrAG4JPTrM41Yqqg+K9YZeoEYt11Le/Llw7rlfDOm 649X2nOoEYSz5VgyB1lqUJVzgw+NXeHTR2/NxbfFOMsAAlf9tRAGwOnftGsDHq/jf46M 8gUhC/yAdkeDQx5+nJ22TnxbKqtWBLv+3A2JIwNCfaNtLmPuyzsJy+ounTBMwkP1uO9v 7WXxXqjAqyNPEtlSvbx1lJbx5Q2r44/35lqPwX5n2OnGnCBFlBblp2lpc/Ii1INgmmYx 01Lv27IUHF1OimBCryS8Ho6Tv808TnytedoU7fs8vDvECBCcw7+axuvxHMP4TWZG4FDC mZfA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of kirill.shutemov@linux.intel.com designates 134.134.136.65 as permitted sender) smtp.mailfrom=kirill.shutemov@linux.intel.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga03.intel.com (mga03.intel.com. [134.134.136.65]) by mx.google.com with ESMTPS id l190-v6si1524248pgd.375.2018.06.26.07.22.55 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Jun 2018 07:22:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of kirill.shutemov@linux.intel.com designates 134.134.136.65 as permitted sender) client-ip=134.134.136.65; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of kirill.shutemov@linux.intel.com designates 134.134.136.65 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 fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Jun 2018 07:22:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,274,1526367600"; d="scan'208";a="240770221" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga006.fm.intel.com with ESMTP; 26 Jun 2018 07:22:53 -0700 Received: by black.fi.intel.com (Postfix, from userid 1000) id 28CD6951; Tue, 26 Jun 2018 17:22:52 +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: [PATCHv4 14/18] x86/mm: Detect MKTME early Date: Tue, 26 Jun 2018 17:22:41 +0300 Message-Id: <20180626142245.82850-15-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180626142245.82850-1-kirill.shutemov@linux.intel.com> References: <20180626142245.82850-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 75e3b2602b4a..39830806dd42 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 @@ -766,9 +771,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);