From patchwork Tue Jun 26 14:22:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "kirill.shutemov@linux.intel.com" X-Patchwork-Id: 10489169 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 5F624602D8 for ; Tue, 26 Jun 2018 14:23:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4E7E528A58 for ; Tue, 26 Jun 2018 14:23:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4267028A68; Tue, 26 Jun 2018 14:23:21 +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 B0EE328A58 for ; Tue, 26 Jun 2018 14:23:20 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 48D516B0275; 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 3EF7F6B0274; 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 240B56B0275; 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-f70.google.com (mail-pg0-f70.google.com [74.125.83.70]) by kanga.kvack.org (Postfix) with ESMTP id DDD0B6B026E for ; Tue, 26 Jun 2018 10:22:57 -0400 (EDT) Received: by mail-pg0-f70.google.com with SMTP id e1-v6so6516028pgp.20 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=rYMWfSoXuMb2oWqDHGe0r6iG6Cw+ogj7+GlnAOZFbRY=; b=fiOgFyx6wgQMJaCc//JS2VEPx8iW3Ck0pwM5Iz/h4uZfVU8qWQwVueoJsXhs9fAT/7 cWPzm2aC59/ukfjlfLmURGd0eaa1kULTw3FZDtzrCsbNNng56dQS8zuu8u5ewisrwFCo EH+oh6qF3PKdFdaHMf4gd8n8n6kuMxae5Oz3ukMsfvelc172YXGI4ViM4mb945M36DUc ZpREsCpCKlsHi7CqNfSXCu+4XHA9w49OAC13deQAxagP5u4CKDg+Rgoulnauaw383ue6 /Yf07qNRtKqx/SwJd4leOp8aIyfyWNzjq3xmN7BXaHTLDcA9afi1H3AbDn21jGWAzAdw isww== 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: APt69E0nkJgkmMktnMTjxPbXS89vdf66U0laxB/s62K6kxAN+8OC+Ha+ ayPwM77rJmkhrbh17NWV0rMv4afeaYyw9oOOJx1gMSBIdbNL4+9WmrIHxuRPl5mNm220RS5sRCq OyyOq5on0Q6zRfigBaKEgTpZ4N+mqvZOsY8nxPZYkw7/ydh5Sus3q0leXrosfzk+7UQ== X-Received: by 2002:a63:9345:: with SMTP id w5-v6mr1647508pgm.212.1530022977575; Tue, 26 Jun 2018 07:22:57 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJ2rkkkz1TwgcGxkGo4570sr10wg/cu9lcU1WKHglPzSiMk3OqhdLOaJjoSPAuz5LlRmkeh X-Received: by 2002:a63:9345:: with SMTP id w5-v6mr1647425pgm.212.1530022976023; 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=sEUaT75jUAMIYxwwl4g/7V5SqmSgOyawVOGtOtOl9PB1MdumRMSxkKqTP5hm03zY2r zACV0cd5P4HU6AAGhS/FlZrzm/kLXmF4/4j00s/TbDPspGokxLk9jp+tOzkG7PrGwepZ RDCtq/GR+TQP64VVAOg6DClZg6bcctk2FW+zREC19ffVbFvCYqcmuktCuqcVfVvPi7lv OeonbS+jpwLU4cX4ELihSELBQVqEN4u6gS3NnpK+xdC1m9i8yFd+uaVuJTKBDnCGfAGl WtrixfWNBFa0/7PTXGtVb1l1GHPLzUzHCUoerGiyCJdTnldqHVrojfMV5Dpc7R7M8ctM BgsQ== 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=rYMWfSoXuMb2oWqDHGe0r6iG6Cw+ogj7+GlnAOZFbRY=; b=On6SpkrJrj5DJKRprO3YKwGtR7V4bOz7E/Mp77a6HHWQq32wCJx78zkYRqPY4qxK8+ OQ+k/LIeAvXMrLW4cC7FRd0G3x28C4tRZPGp+ny7W5LzN0ABLzcFYiTWMOos0SmwOSa9 4NbnCTHE2ZN2k/z8cYvuuYJfsjvuVPKAp1bz4bs9syPQh57Tk7uG9iBEQoJDo6Z+rqmA I9315jFDrOj+ajgjsZR9XnEJSa1KI/p4W25fD/+rBk+u0tbjzviJeNXtKMtv7HrR3xSC 4FAGdvYXAqNpuuRWlbHZm4jRN0QeVovcjgtWF9EBbZP1+as6VrGwzfx/HhKOCNbHMshR xd2Q== 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 f40-v6si1709260plb.504.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:55 -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="240770212" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga006.fm.intel.com with ESMTP; 26 Jun 2018 07:22:52 -0700 Received: by black.fi.intel.com (Postfix, from userid 1000) id DF2D6743; 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 09/18] x86/mm: Implement page_keyid() using page_ext Date: Tue, 26 Jun 2018 17:22:36 +0300 Message-Id: <20180626142245.82850-10-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 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 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. Signed-off-by: Kirill A. Shutemov --- arch/x86/include/asm/mktme.h | 7 +++++++ arch/x86/include/asm/page.h | 1 + arch/x86/mm/mktme.c | 34 ++++++++++++++++++++++++++++++++++ include/linux/page_ext.h | 11 ++++++++++- mm/page_ext.c | 3 +++ 5 files changed, 55 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/mktme.h b/arch/x86/include/asm/mktme.h index df31876ec48c..7266494b4f0a 100644 --- a/arch/x86/include/asm/mktme.h +++ b/arch/x86/include/asm/mktme.h @@ -2,11 +2,18 @@ #define _ASM_X86_MKTME_H #include +#include #ifdef CONFIG_X86_INTEL_MKTME extern phys_addr_t mktme_keyid_mask; extern int mktme_nr_keyids; extern int mktme_keyid_shift; + +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 467f1b26c737..09cbff678b9f 100644 --- a/arch/x86/mm/mktme.c +++ b/arch/x86/mm/mktme.c @@ -3,3 +3,37 @@ phys_addr_t mktme_keyid_mask; int mktme_nr_keyids; int mktme_keyid_shift; + +static DEFINE_STATIC_KEY_FALSE(mktme_enabled_key); + +static inline bool mktme_enabled(void) +{ + return static_branch_unlikely(&mktme_enabled_key); +} + +int page_keyid(const struct page *page) +{ + if (!mktme_enabled()) + return 0; + + return lookup_page_ext(page)->keyid; +} +EXPORT_SYMBOL(page_keyid); + +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/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;