From patchwork Tue Jun 12 14:39:07 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: 10460517 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 A87A46020F for ; Tue, 12 Jun 2018 14:40:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A1E6B287FE for ; Tue, 12 Jun 2018 14:40:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9671328824; Tue, 12 Jun 2018 14:40:09 +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 06F2628816 for ; Tue, 12 Jun 2018 14:40:09 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EF2246B026B; 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 E90F56B026D; 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 98CDC6B0266; 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-f70.google.com (mail-pl0-f70.google.com [209.85.160.70]) by kanga.kvack.org (Postfix) with ESMTP id 4730A6B0269 for ; Tue, 12 Jun 2018 10:39:29 -0400 (EDT) Received: by mail-pl0-f70.google.com with SMTP id s3-v6so12708669plp.21 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=X4NncAZsfLVXVh81JmLvpu2zI6KspJKOFQy+9eebDbQ=; b=LBcoEmYrjTgmDgzPM1qjH9oyixW33TrNSq56u2f/BxVjGTHlbPZdUPHmoBWmjIm/7g mUI53291QxuG5vFrBFHTMJzqnYfinS3dxIpceWdZVHOkax0sKFPzauDN9qRLCPrkd7Fi hUuZdFHsBLaiEvx5ZqcLOUEGspXKHhFk3CxotbGHwgY0tgPXM9UjLB9bzf9FUEiePcm6 7XgwOyJibd8APdvp6xeR+EXYEqd1yKvPVWFC9mmXKGgR+Axb5u+TPzuMhYqOr2rf6LOC aA/Ei2SdYct/HX6+TtNeYVcaG5GcDjienuFRV307gH3bJfxNYTVp3PqopWvNAccR7L+Z 2qKQ== 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.100 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: APt69E3qmryoT4n/A3l8loNDn6P78fLLVenSQDIdEIVi12hcoL3k//zu SXRGASnJ9mowq+fFp0uP4ujp+6TMT74bzQH8pdbgFWBcV6/W4oBliImPXVQK7awjsm8/iVXdiPS LdpRvqYkeFLK8rI7zDd89hqU2urTa0OvI0aCodOcVS1G/KIKx1nOxSE09RGVFSA4K1A== X-Received: by 2002:a17:902:b494:: with SMTP id y20-v6mr738628plr.136.1528814368985; Tue, 12 Jun 2018 07:39:28 -0700 (PDT) X-Google-Smtp-Source: ADUXVKICKSm+g+LAl09HG4673mPCXaslkRbwJgHVJ4OZQ2+hqadmmZI0GevUnpFzM/mm0objyJb/ X-Received: by 2002:a17:902:b494:: with SMTP id y20-v6mr738571plr.136.1528814367998; 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=PnsTx1O0vJwpLjtG7b1LUhh+sweCsv3Xg8BweDsJev35xpoC/x3tTx8riFOb6/P4MV I0f8gzBn/xYgT5j6kdwYYjZqoNF9b5dWXLpFkJJO9g+0cLKLxhh5x3ahV0ceZXA98s7W HkEOlQtTXyVBUTiTf9ErvmLB9Da7X4IN/p8ydQdn5thmvIXPozH0H0kdH+A6dFEHkz3l fazNpRSolndDN8X1QUbGBjelHm3JfTLYDuYSzHaG6i6mXeiufAU+G+TKcnzGJsVBYPEb Jof00DQqJslA9qg+a6Bw3sVR94qIyip4tjHaoMimEL6a6/xwoVYNOFrBVCMJH5cb49Iz yqtQ== 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=X4NncAZsfLVXVh81JmLvpu2zI6KspJKOFQy+9eebDbQ=; b=UGKhNi/9kA7g8AS0JXfHabhRYQOjSYUgs/KmqioC2bmGIMPifgGIGspBwRZ1yiGpPR +FNUPd+6weXAkVkglGw1qG3RsUxObjgKUs74zo/qe2ACzLrB4uLd4AZgdsWPjUc5jr1X oEXMD4HHtg/Tbk2Tq4UF+8vimDz6A5fYAJuUOeL37R7f2nLcaCMcKOCw2+A2dnH9qYqS 6fDtmkOl7fXQ0mZY1vlst1gOnp8x2kqFFu3M45TEWFjxmzHkYgMLh/eKpsSFeOIlthPW ih0LtyazDmG2L+gghfBWIPN1SQYXPGh+dG8rq4z8oYhVHWm1HUHXRGLcetV7GJgm5bgN Ld1w== 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.100 as permitted sender) smtp.mailfrom=kirill.shutemov@linux.intel.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga07.intel.com (mga07.intel.com. [134.134.136.100]) by mx.google.com with ESMTPS id l5-v6si295495pls.360.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 134.134.136.100 as permitted sender) client-ip=134.134.136.100; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of kirill.shutemov@linux.intel.com designates 134.134.136.100 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 orsmga004.jf.intel.com ([10.7.209.38]) by orsmga105.jf.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="207428844" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga004.jf.intel.com with ESMTP; 12 Jun 2018 07:39:24 -0700 Received: by black.fi.intel.com (Postfix, from userid 1000) id 0631946D; 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 09/17] x86/mm: Implement page_keyid() using page_ext Date: Tue, 12 Jun 2018 17:39:07 +0300 Message-Id: <20180612143915.68065-10-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 Store KeyID in bits 31:16 of extended page flags. These bits are unused. 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. Signed-off-by: Kirill A. Shutemov --- arch/x86/include/asm/mktme.h | 6 ++++++ arch/x86/include/asm/page.h | 1 + arch/x86/mm/mktme.c | 21 +++++++++++++++++++++ include/linux/page_ext.h | 11 ++++++++++- mm/page_ext.c | 3 +++ 5 files changed, 41 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/mktme.h b/arch/x86/include/asm/mktme.h index 08f613953207..0fe0db424e48 100644 --- a/arch/x86/include/asm/mktme.h +++ b/arch/x86/include/asm/mktme.h @@ -2,6 +2,7 @@ #define _ASM_X86_MKTME_H #include +#include struct vm_area_struct; @@ -16,6 +17,11 @@ bool vma_is_encrypted(struct vm_area_struct *vma); #define vma_keyid vma_keyid int vma_keyid(struct vm_area_struct *vma); +extern struct page_ext_operations page_mktme_ops; + +#define page_keyid page_keyid +int page_keyid(const struct page *page); + #else #define mktme_keyid_mask ((phys_addr_t)0) #define mktme_nr_keyids 0 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 3b2f28a21d99..b02d5b9d4339 100644 --- a/arch/x86/mm/mktme.c +++ b/arch/x86/mm/mktme.c @@ -5,6 +5,15 @@ phys_addr_t mktme_keyid_mask; int mktme_nr_keyids; int mktme_keyid_shift; +int page_keyid(const struct page *page) +{ + if (mktme_status != MKTME_ENABLED) + return 0; + + return lookup_page_ext(page)->keyid; +} +EXPORT_SYMBOL(page_keyid); + bool vma_is_encrypted(struct vm_area_struct *vma) { return pgprot_val(vma->vm_page_prot) & mktme_keyid_mask; @@ -20,3 +29,15 @@ int vma_keyid(struct vm_area_struct *vma) prot = pgprot_val(vma->vm_page_prot); return (prot & mktme_keyid_mask) >> mktme_keyid_shift; } + +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 true; +} + +struct page_ext_operations page_mktme_ops = { + .need = need_page_mktme, +}; 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 a9826da84ccb..036658229842 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;