From patchwork Tue Jun 26 14:22:40 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: 10489171 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 D73676031B for ; Tue, 26 Jun 2018 14:23:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C621B28A58 for ; Tue, 26 Jun 2018 14:23:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B912128A68; Tue, 26 Jun 2018 14:23:24 +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 4919428A58 for ; Tue, 26 Jun 2018 14:23:24 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 716DB6B026E; Tue, 26 Jun 2018 10:22:58 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 685E26B0277; Tue, 26 Jun 2018 10:22:58 -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 487E26B026E; Tue, 26 Jun 2018 10:22:58 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg0-f69.google.com (mail-pg0-f69.google.com [74.125.83.69]) by kanga.kvack.org (Postfix) with ESMTP id ECFB46B0273 for ; Tue, 26 Jun 2018 10:22:57 -0400 (EDT) Received: by mail-pg0-f69.google.com with SMTP id n20-v6so4932090pgv.14 for ; Tue, 26 Jun 2018 07:22:57 -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=LIPDdKhH7YWp8yHq58cdGL7MBL5aq1eBt8+1IMjCr0o=; b=fvsp4r2e7kUukJD0PDnZl7m4FalnKkEy02kBuqduORNpBRwF8TVCTj/vpfIJsVM4am piEn3IHfLM7ZT3HN17FCehZmrSS0OGvdu2QwFDv1H7EE4t7FRHOAWIWRUPewz8xzEoPV KTHxxZqcr9AgfPe8PJQVbbKjfj8VLJzRGeCXgL6VK4nlZcVkG3SLpBNk4eVVFAwrCKYg fo5dXJ89M9PgBX4s2q+vrGSiicP4vwujFZY8PNCbGnMGbdXVhmoxwN1DyPK67Khl5IDO 3LpiZJ1UE1pV6ta2sAER0ipZYER0ryFyiOhhtmqZQBfnlD/haPMridi7YRB7LL1usL+8 ObQw== 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.31 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: APt69E2zn2XukJI8fHQ6ca1UGWmWBBnqsY71VcOr2fSIqWPJlEDCPqmb wUroTB542bXlkGp6JagS8KmtzGWlBJlDojFSc5t5Ko4QR+nuOWU44EbUsX6jfMPhQhuM7UBdWDG 9dLEpVHPyPRuOyVZ3VN9KbViF9ne97b6Pv0jQGWd7u1CsbT0pvGFfEI5A/a3dUNi61A== X-Received: by 2002:a65:51cb:: with SMTP id i11-v6mr1620215pgq.320.1530022977650; Tue, 26 Jun 2018 07:22:57 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLCh94tpiDYregAKslkmjEAf9krCgabeLHZynhnxiENP9GE00BK0Z0LqWbqyysEUEHu7P0J X-Received: by 2002:a65:51cb:: with SMTP id i11-v6mr1620171pgq.320.1530022976773; 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=KTCfOpvmuwCVvffE4ccXfah88XSM0TL94ghD3DCQdNY+n7iBrEN9lmlii4cHMaQIJO /Ikv3uXGzFCPZ2rHeHg3he0tMisp0ha8w0sD8WEpSzDP0vo6tjKOh0pKfJb1It1aP3n4 zoBGtumzAZvbITb/6IfKYZ1I70BAhvAY7fz7nUB9qgO/+TMaveBRw+mGNyky00h80ja5 u/UdPbsKYEfTzw6o2XL68jvtPmKNDQscAOn0rVdy/7q6FN61TySZK2d7fdHX+MaW1FUz AAAYR72nvvXqu86sZcXrb4X1BtaVv6AlwJguw/zO/VqfVmYtXxwadu9cluaTxNVrgFSJ O84g== 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=LIPDdKhH7YWp8yHq58cdGL7MBL5aq1eBt8+1IMjCr0o=; b=LzYYW0xtNTeVoj3HChHI5rO9psMHvmpTb4SdI79RzNwqyVxAU6+V0SSRfFjuDQQcq2 fuM95ZEqmyRdGYBc1OhKm+nHSbUBIFp+SXNZ2DO37+6UVnkcaVElpkd/scKC0HgcEWb3 8+1gPxAUJhco+YhZebxR6DdAxCoDrm2eu9XLTlbsUg0tydbZ8WWn/rp7nkWCjXuN+HYt rZSrjrBJS09UkGM6zWf3sp6PoO/Odstrl2TkTgTdstSC5YctzOy9hGwEGxGJYqRvZwWp suFROHTsULrlUBJXIRhGxqIv5LSnF89dCmaDfzWuWpGfyuLmYziU70Z/K/ey6uB1emDe POVQ== 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.31 as permitted sender) smtp.mailfrom=kirill.shutemov@linux.intel.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga06.intel.com (mga06.intel.com. [134.134.136.31]) by mx.google.com with ESMTPS id b12-v6si1512027pgn.308.2018.06.26.07.22.56 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.31 as permitted sender) client-ip=134.134.136.31; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of kirill.shutemov@linux.intel.com designates 134.134.136.31 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 orsmga001.jf.intel.com ([10.7.209.18]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Jun 2018 07:22:56 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,274,1526367600"; d="scan'208";a="67857595" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga001.jf.intel.com with ESMTP; 26 Jun 2018 07:22:53 -0700 Received: by black.fi.intel.com (Postfix, from userid 1000) id 1CD56801; 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 13/18] x86/mm: Allow to disable MKTME after enumeration Date: Tue, 26 Jun 2018 17:22:40 +0300 Message-Id: <20180626142245.82850-14-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 The new helper mktme_disable() allows to disable MKTME even if it's enumerated successfully. MKTME initialization may fail and this functionality allows system to boot regardless of the failure. MKTME needs per-KeyID direct mapping. It requires a lot more virtual address space which may be a problem in 4-level paging mode. If the system has more physical memory than we can handle with MKTME. The feature allows to fail MKTME, but boot the system successfully. Signed-off-by: Kirill A. Shutemov --- arch/x86/include/asm/mktme.h | 2 ++ arch/x86/kernel/cpu/intel.c | 5 +---- arch/x86/mm/mktme.c | 9 +++++++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/arch/x86/include/asm/mktme.h b/arch/x86/include/asm/mktme.h index 44409b8bbaca..ebbee6a0c495 100644 --- a/arch/x86/include/asm/mktme.h +++ b/arch/x86/include/asm/mktme.h @@ -6,6 +6,8 @@ struct vm_area_struct; +void mktme_disable(void); + #ifdef CONFIG_X86_INTEL_MKTME extern phys_addr_t mktme_keyid_mask; extern int mktme_nr_keyids; diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index efc9e9fc47d4..75e3b2602b4a 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c @@ -591,10 +591,7 @@ static void detect_tme(struct cpuinfo_x86 *c) * Maybe needed if there's inconsistent configuation * between CPUs. */ - physical_mask = (1ULL << __PHYSICAL_MASK_SHIFT) - 1; - mktme_keyid_mask = 0; - mktme_keyid_shift = 0; - mktme_nr_keyids = 0; + mktme_disable(); } #endif diff --git a/arch/x86/mm/mktme.c b/arch/x86/mm/mktme.c index 1194496633ce..bb6210dbcf0e 100644 --- a/arch/x86/mm/mktme.c +++ b/arch/x86/mm/mktme.c @@ -13,6 +13,15 @@ static inline bool mktme_enabled(void) return static_branch_unlikely(&mktme_enabled_key); } +void mktme_disable(void) +{ + physical_mask = (1ULL << __PHYSICAL_MASK_SHIFT) - 1; + mktme_keyid_mask = 0; + mktme_keyid_shift = 0; + mktme_nr_keyids = 0; + static_branch_disable(&mktme_enabled_key); +} + int page_keyid(const struct page *page) { if (!mktme_enabled())