From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.9 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 272F0C46470 for ; Wed, 8 May 2019 14:45:16 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id D820C2177B for ; Wed, 8 May 2019 14:45:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D820C2177B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 1E81F6B026B; Wed, 8 May 2019 10:44:43 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1C1256B026E; Wed, 8 May 2019 10:44:43 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0B22B6B026F; Wed, 8 May 2019 10:44:43 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f197.google.com (mail-pg1-f197.google.com [209.85.215.197]) by kanga.kvack.org (Postfix) with ESMTP id B613E6B026B for ; Wed, 8 May 2019 10:44:42 -0400 (EDT) Received: by mail-pg1-f197.google.com with SMTP id d7so7324659pgc.8 for ; Wed, 08 May 2019 07:44:42 -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:mime-version :content-transfer-encoding; bh=sM37wl1NnlRkUU+xXEZgDRNuEPDgwwOxsEwMR2MysS0=; b=knbsbnIgiJ9D1krJbEW1HemoIE0zq3xmzAGCgS02PmQOvoINhrG4QumD9M2//PNDio RRJgnZGdIxvFGgcGCyaXrwTy+iAzs4E5bCLh2F4xl9u9mS0HCjJJZ1Uj8mBIp4YJhoNb EW2h61AmJJJ1YXUXHE815qcTncJwRw/wkvsZP+jf2qY31KHb7KF1bIcLahtWmsnLcXoo A1aedL2oD2xJPzJTj1gKqVizTcjeMwVF5d8pnikYHg6/uePXYDd/eGmYbLsFbw6axobu WrcoYEwP+UHRHOKlsRGzs8u+swBwzmK9e7kuWhZr8/4IlQOZ4s4gyCneI9WmMVvfC60G HkLw== 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.20 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: APjAAAV9k0QcJxmBB6TfN+rXni+bRkYhOFKBsEZZBF1xPeHcOU3BDwqP Zc1K22HnMd3p73CqRG0w0L6d4SQ06c4KbXOCP6cHPo782I10fHZ0fbpiHmFUdIubCqtqPwHxc64 quJpB5g5uouJI6YN73o/2MyVQAk+gE2s14updfK8SO/nLRtnIpEJ0fNzFtfedRbd+jQ== X-Received: by 2002:a63:ca0b:: with SMTP id n11mr46269068pgi.442.1557326682341; Wed, 08 May 2019 07:44:42 -0700 (PDT) X-Google-Smtp-Source: APXvYqzygp4zGPDIH1VHh3vvlv8lDzcZZkpa+7Pl7UBKLR8TmG4y2hXqTB1ZsG9fIJMWHZUapZx/ X-Received: by 2002:a63:ca0b:: with SMTP id n11mr46268913pgi.442.1557326680855; Wed, 08 May 2019 07:44:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557326680; cv=none; d=google.com; s=arc-20160816; b=CF3XzC6MeYCFqAH0/uN8vgB5nOWYZwiJV6N5Zl/nCx23owccRtlZwgVrTRh+JmNrSF VSNtG5aWT+E9aSoC3s4pZBIogu3SBEcBxTnjkaTcWsSgJbzYH2f5rww2y+DDTdt+8PU8 T6DlUmlmMZ5giU8FEDwYwOMKWnnOsivSsMuw/aZIkyuZIJf19N/IPPa9OGgujJIegIaC aDi86+s0MjTypHpjsFZQb357lW4PAtzakQsnoT89M7Mf0zeKI4YAd2Ksuym/Twqz++Uy RTiByoW8IpP25j9Twny5Dc6DCvp4nMQT6cWRMSGJulUtwNmloYwbrAqsgl0i6Jfm5UtD S8HQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=sM37wl1NnlRkUU+xXEZgDRNuEPDgwwOxsEwMR2MysS0=; b=z5ljH/hLrkswXp2tkCOAO20nQ8heT/ZQfDQ+OutIpKOLWboBKwVCnyK+RIAOJrb1VC wwivJbN9e/fRPaECxmAZVTaq2J9lTyl/kMRDuMnRA4BjrapGEYVEZeSjY4ugw2Ab/dj/ FrX7Jf7cERkMZEJZWduay/oWxZh4WRI9eMF29JULJpLNFn+kn8xYiOulT6Xerp9EOSAR RjUTNgzqViOgiEPZKyXsGThn3U4cRYnUIf3CG8+eh8k1A1ayICc14eE2T4gcoNcL1Ynu flf8pKuX98zlg/nvufnKumIxeSye/TuKht6uqRkZ/KYouvwolNhBEsHAOSsjTN5+LEGq VoFg== 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.20 as permitted sender) smtp.mailfrom=kirill.shutemov@linux.intel.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga02.intel.com (mga02.intel.com. [134.134.136.20]) by mx.google.com with ESMTPS id f6si24524459plf.90.2019.05.08.07.44.40 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 May 2019 07:44:40 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of kirill.shutemov@linux.intel.com designates 134.134.136.20 as permitted sender) client-ip=134.134.136.20; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of kirill.shutemov@linux.intel.com designates 134.134.136.20 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 orsmga005.jf.intel.com ([10.7.209.41]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 May 2019 07:44:40 -0700 X-ExtLoop1: 1 Received: from black.fi.intel.com ([10.237.72.28]) by orsmga005.jf.intel.com with ESMTP; 08 May 2019 07:44:35 -0700 Received: by black.fi.intel.com (Postfix, from userid 1000) id 323C8739; Wed, 8 May 2019 17:44:29 +0300 (EEST) From: "Kirill A. Shutemov" To: Andrew Morton , x86@kernel.org, Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Borislav Petkov , Peter Zijlstra , Andy Lutomirski , David Howells Cc: Kees Cook , Dave Hansen , Kai Huang , Jacob Pan , Alison Schofield , linux-mm@kvack.org, kvm@vger.kernel.org, keyrings@vger.kernel.org, linux-kernel@vger.kernel.org, "Kirill A. Shutemov" Subject: [PATCH, RFC 11/62] x86/mm: Add a helper to retrieve KeyID for a page Date: Wed, 8 May 2019 17:43:31 +0300 Message-Id: <20190508144422.13171-12-kirill.shutemov@linux.intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190508144422.13171-1-kirill.shutemov@linux.intel.com> References: <20190508144422.13171-1-kirill.shutemov@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: page_ext allows to store additional per-page information without growing main struct page. The additional space can be requested at boot time. Store KeyID in bits 31:16 of extended page flags. These bits are unused. page_keyid() returns zero until page_ext is ready. page_ext initializer enables a static branch to indicate that page_keyid() can use page_ext. The same static branch will gate MKTME readiness in general. We don't yet set KeyID for the page. It will come in the following patch that implements prep_encrypted_page(). All pages have KeyID-0 for now. page_keyid() will be used by KVM which can be built as a module. We need to export mktme_enabled_key to be able to inline page_keyid(). Signed-off-by: Kirill A. Shutemov --- arch/x86/include/asm/mktme.h | 28 ++++++++++++++++++++++++++++ arch/x86/include/asm/page.h | 1 + arch/x86/mm/mktme.c | 21 +++++++++++++++++++++ include/linux/mm.h | 2 +- include/linux/page_ext.h | 11 ++++++++++- mm/page_ext.c | 3 +++ 6 files changed, 64 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/mktme.h b/arch/x86/include/asm/mktme.h index df31876ec48c..51f831b94179 100644 --- a/arch/x86/include/asm/mktme.h +++ b/arch/x86/include/asm/mktme.h @@ -2,15 +2,43 @@ #define _ASM_X86_MKTME_H #include +#include +#include #ifdef CONFIG_X86_INTEL_MKTME extern phys_addr_t mktme_keyid_mask; extern int mktme_nr_keyids; extern int mktme_keyid_shift; + +DECLARE_STATIC_KEY_FALSE(mktme_enabled_key); +static inline bool mktme_enabled(void) +{ + return static_branch_unlikely(&mktme_enabled_key); +} + +extern struct page_ext_operations page_mktme_ops; + +#define page_keyid page_keyid +static inline int page_keyid(const struct page *page) +{ + if (!mktme_enabled()) + return 0; + + return lookup_page_ext(page)->keyid; +} + + #else #define mktme_keyid_mask ((phys_addr_t)0) #define mktme_nr_keyids 0 #define mktme_keyid_shift 0 + +#define page_keyid(page) 0 + +static inline bool mktme_enabled(void) +{ + return false; +} #endif #endif diff --git a/arch/x86/include/asm/page.h b/arch/x86/include/asm/page.h index 7555b48803a8..39af59487d5f 100644 --- a/arch/x86/include/asm/page.h +++ b/arch/x86/include/asm/page.h @@ -19,6 +19,7 @@ struct page; #include +#include extern struct range pfn_mapped[]; extern int nr_pfn_mapped; diff --git a/arch/x86/mm/mktme.c b/arch/x86/mm/mktme.c index 91a415612519..9dc256e3654b 100644 --- a/arch/x86/mm/mktme.c +++ b/arch/x86/mm/mktme.c @@ -9,3 +9,24 @@ phys_addr_t mktme_keyid_mask; int mktme_nr_keyids; /* Shift of KeyID within physical address. */ int mktme_keyid_shift; + +DEFINE_STATIC_KEY_FALSE(mktme_enabled_key); +EXPORT_SYMBOL_GPL(mktme_enabled_key); + +static bool need_page_mktme(void) +{ + /* Make sure keyid doesn't collide with extended page flags */ + BUILD_BUG_ON(__NR_PAGE_EXT_FLAGS > 16); + + return !!mktme_nr_keyids; +} + +static void init_page_mktme(void) +{ + static_branch_enable(&mktme_enabled_key); +} + +struct page_ext_operations page_mktme_ops = { + .need = need_page_mktme, + .init = init_page_mktme, +}; diff --git a/include/linux/mm.h b/include/linux/mm.h index 07c36f4673f6..2684245f8503 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1607,7 +1607,7 @@ static inline int vma_keyid(struct vm_area_struct *vma) #endif #ifndef page_keyid -static inline int page_keyid(struct page *page) +static inline int page_keyid(const struct page *page) { return 0; } diff --git a/include/linux/page_ext.h b/include/linux/page_ext.h index f84f167ec04c..d9c5aae9523f 100644 --- a/include/linux/page_ext.h +++ b/include/linux/page_ext.h @@ -23,6 +23,7 @@ enum page_ext_flags { PAGE_EXT_YOUNG, PAGE_EXT_IDLE, #endif + __NR_PAGE_EXT_FLAGS }; /* @@ -33,7 +34,15 @@ enum page_ext_flags { * then the page_ext for pfn always exists. */ struct page_ext { - unsigned long flags; + union { + unsigned long flags; +#ifdef CONFIG_X86_INTEL_MKTME + struct { + unsigned short __pad; + unsigned short keyid; + }; +#endif + }; }; extern void pgdat_page_ext_init(struct pglist_data *pgdat); diff --git a/mm/page_ext.c b/mm/page_ext.c index d8f1aca4ad43..1af8b82087f2 100644 --- a/mm/page_ext.c +++ b/mm/page_ext.c @@ -68,6 +68,9 @@ static struct page_ext_operations *page_ext_ops[] = { #if defined(CONFIG_IDLE_PAGE_TRACKING) && !defined(CONFIG_64BIT) &page_idle_ops, #endif +#ifdef CONFIG_X86_INTEL_MKTME + &page_mktme_ops, +#endif }; static unsigned long total_usage; -- 2.20.1