From patchwork Tue Jun 26 14:22:34 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: 10489183 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 7377D6031B for ; Tue, 26 Jun 2018 14:23:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 643652876C for ; Tue, 26 Jun 2018 14:23:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 590BD288F4; Tue, 26 Jun 2018 14:23:44 +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 D29CB2876C for ; Tue, 26 Jun 2018 14:23:43 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 79E2F6B0281; 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 5A8236B0280; 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 23AC76B0283; 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-f200.google.com (mail-pf0-f200.google.com [209.85.192.200]) by kanga.kvack.org (Postfix) with ESMTP id 989946B027E for ; Tue, 26 Jun 2018 10:23:04 -0400 (EDT) Received: by mail-pf0-f200.google.com with SMTP id z9-v6so8770526pfe.23 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=9VqySwQJImLAdaNYXwDhI6AlgFwRVoub/o3twYLSqac=; b=esfWFz0sLLgAZGFl+h5DJFRACohmvZK4rzOOyNcr+PjFMuTZ2mJxbmbycUJzNZo9nM FXLT5d2JM+xDlTcCE0zqjlMsDnf/bqXFOS8I2XCQedlntS07TPNmVJNj+PYcTfUgEi8x /+UmsLK/UL2d7Mytk3GUwm6C70ekPTUyZca90hHo/T0SL5zcgMj/I4GhjF4ed9MrZcuM FuyHbQv8ne1qfQmSG4gCk8z/lCysU36cqQOFuhZtlpDIWZ/eaVN6jfhr052Yzdsl+EXC frzd5GdHabunF2ADiQnwNxjcwyLxJFfZiaRnCt0OYyZxRYV4f0nA0aaa3bexW19dIvic gwXg== 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.115 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: APt69E0yO9iyRy6qVVKd0IpGCgF0QJOfQbCHKgkHICGQImVCr9A6gdP9 Yu3FIKpCi0GhzdHYkHE3VLo4zYaIuZNWNONm4xkT2TZ0rgqlsHc3405NRm68bMfVu4Zse8zjxnm 5YFOho2t6Brk8fzy4SC841qmRBURq3MJt1wbfhO4CwRVCGXspM2i67504YzbLoDbOMw== X-Received: by 2002:a17:902:24c7:: with SMTP id l7-v6mr1882684plg.170.1530022984306; Tue, 26 Jun 2018 07:23:04 -0700 (PDT) X-Google-Smtp-Source: ADUXVKI4nFWqznPHgjDgMZ2Lc1L44fcpIhsjR49e4YOMK21c6nz3XokBT+UkZ9fOIzNJ/QVbS7jq X-Received: by 2002:a17:902:24c7:: with SMTP id l7-v6mr1882184plg.170.1530022976260; 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=a7ej3NS6xCeUetUNerY5HtxDPdZ74xzT96tRzhSfEErC+uSeYNmARjN2ks3blxoQ84 3CGZthHmD5ywlwou+hyZ8YuoPg8vnBRilMZ/1x52fyTlPsQn+i6B4N42RihS17myIEzk kUrfqVw9xVorzkeTT4hEErXV8vSpvVvE9CRBwo4EsjiUjkPwZK2j9TpuZGYIz5Ph+lBb 89P9m2rdfbUkZuZRJHUsCLO+0hEqjrLs4uZBgc/KS13lXn3MuDrHiTU22atENRXsoRdD 57O+EBEzF5oBlW+07/hT5ro36wkgd2h3m8lf4+lMte6hiFdx3Qh2GsFC2c4Ss7NGIs5Q nT9Q== 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=9VqySwQJImLAdaNYXwDhI6AlgFwRVoub/o3twYLSqac=; b=jPCU50EeYPkdmqtb23+q0RzB92XxeNkD4EgAkKSYqAOcN7CJHbNlPoXWVtfTEMpT+B +7S9+mDRzuQFKfHIr+24mXGgmM2qPGbZvNixDk878Is2zFMWnuh6bX59rP4Hv+pNUqZc 2cCrXpj+HVRPl5sPCCaSx1i+y5m0T9bO0xxnasMK26xOyVuyEGNEf61POOQUp9R6InaZ UpnpVlk7qK2dRw4+8j5gCOSSMti5kqSlqv76BRzmzz2ZmLcfYZCHa46CH+HspkrBMTWj xAQ6rXt7ga0xxXnuf7JBehVzeBlApY3fujP3wVXN1bGF+yrJx636WItJPEVUd7umjglz p/gQ== 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.115 as permitted sender) smtp.mailfrom=kirill.shutemov@linux.intel.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga14.intel.com (mga14.intel.com. [192.55.52.115]) by mx.google.com with ESMTPS id q9-v6si1709520pll.370.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 192.55.52.115 as permitted sender) client-ip=192.55.52.115; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of kirill.shutemov@linux.intel.com designates 192.55.52.115 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 fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga103.fm.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="240416052" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga005.fm.intel.com with ESMTP; 26 Jun 2018 07:22:52 -0700 Received: by black.fi.intel.com (Postfix, from userid 1000) id C09F8714; Tue, 26 Jun 2018 17:22:51 +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 07/18] x86/mm: Introduce variables to store number, shift and mask of KeyIDs Date: Tue, 26 Jun 2018 17:22:34 +0300 Message-Id: <20180626142245.82850-8-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 mktme_nr_keyids holds number of KeyIDs available for MKTME, excluding KeyID zero which used by TME. MKTME KeyIDs start from 1. mktme_keyid_shift holds shift of KeyID within physical address. mktme_keyid_mask holds mask to extract KeyID from physical address. Signed-off-by: Kirill A. Shutemov --- arch/x86/include/asm/mktme.h | 16 ++++++++++++++++ arch/x86/kernel/cpu/intel.c | 12 ++++++++---- arch/x86/mm/Makefile | 2 ++ arch/x86/mm/mktme.c | 5 +++++ 4 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 arch/x86/include/asm/mktme.h create mode 100644 arch/x86/mm/mktme.c diff --git a/arch/x86/include/asm/mktme.h b/arch/x86/include/asm/mktme.h new file mode 100644 index 000000000000..df31876ec48c --- /dev/null +++ b/arch/x86/include/asm/mktme.h @@ -0,0 +1,16 @@ +#ifndef _ASM_X86_MKTME_H +#define _ASM_X86_MKTME_H + +#include + +#ifdef CONFIG_X86_INTEL_MKTME +extern phys_addr_t mktme_keyid_mask; +extern int mktme_nr_keyids; +extern int mktme_keyid_shift; +#else +#define mktme_keyid_mask ((phys_addr_t)0) +#define mktme_nr_keyids 0 +#define mktme_keyid_shift 0 +#endif + +#endif diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index bf2caf9d52dd..efc9e9fc47d4 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c @@ -573,6 +573,9 @@ static void detect_tme(struct cpuinfo_x86 *c) #ifdef CONFIG_X86_INTEL_MKTME if (mktme_status == MKTME_ENABLED && nr_keyids) { + mktme_nr_keyids = nr_keyids; + mktme_keyid_shift = c->x86_phys_bits - keyid_bits; + /* * Mask out bits claimed from KeyID from physical address mask. * @@ -580,10 +583,8 @@ static void detect_tme(struct cpuinfo_x86 *c) * and number of bits claimed for KeyID is 6, bits 51:46 of * physical address is unusable. */ - phys_addr_t keyid_mask; - - keyid_mask = GENMASK_ULL(c->x86_phys_bits - 1, c->x86_phys_bits - keyid_bits); - physical_mask &= ~keyid_mask; + mktme_keyid_mask = GENMASK_ULL(c->x86_phys_bits - 1, mktme_keyid_shift); + physical_mask &= ~mktme_keyid_mask; } else { /* * Reset __PHYSICAL_MASK. @@ -591,6 +592,9 @@ static void detect_tme(struct cpuinfo_x86 *c) * between CPUs. */ physical_mask = (1ULL << __PHYSICAL_MASK_SHIFT) - 1; + mktme_keyid_mask = 0; + mktme_keyid_shift = 0; + mktme_nr_keyids = 0; } #endif diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile index 4b101dd6e52f..4ebee899c363 100644 --- a/arch/x86/mm/Makefile +++ b/arch/x86/mm/Makefile @@ -53,3 +53,5 @@ obj-$(CONFIG_PAGE_TABLE_ISOLATION) += pti.o obj-$(CONFIG_AMD_MEM_ENCRYPT) += mem_encrypt.o obj-$(CONFIG_AMD_MEM_ENCRYPT) += mem_encrypt_identity.o obj-$(CONFIG_AMD_MEM_ENCRYPT) += mem_encrypt_boot.o + +obj-$(CONFIG_X86_INTEL_MKTME) += mktme.o diff --git a/arch/x86/mm/mktme.c b/arch/x86/mm/mktme.c new file mode 100644 index 000000000000..467f1b26c737 --- /dev/null +++ b/arch/x86/mm/mktme.c @@ -0,0 +1,5 @@ +#include + +phys_addr_t mktme_keyid_mask; +int mktme_nr_keyids; +int mktme_keyid_shift;