From patchwork Tue Jun 26 14:22:37 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: 10489193 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 F00006031B for ; Tue, 26 Jun 2018 14:23:54 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E16D11FE8B for ; Tue, 26 Jun 2018 14:23:54 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D5CD31FF1E; Tue, 26 Jun 2018 14:23:54 +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=unavailable 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 8829F1FE8B for ; Tue, 26 Jun 2018 14:23:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0BBB16B027F; Tue, 26 Jun 2018 10:23:06 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id C7AAC6B0283; 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 7950C6B027D; 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-pl0-f72.google.com (mail-pl0-f72.google.com [209.85.160.72]) by kanga.kvack.org (Postfix) with ESMTP id 0AB1F6B0281 for ; Tue, 26 Jun 2018 10:23:05 -0400 (EDT) Received: by mail-pl0-f72.google.com with SMTP id c6-v6so10156144pll.4 for ; Tue, 26 Jun 2018 07:23:05 -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=+iL4oijNKpTNW3lrWT/HfOVJIAiXHqKSeh8gVOe0sxU=; b=a9GN99oXapt8FKum8SxSH+tYPN30Ct5mWmwHu7Zex7PZ7xx0zr6flwOkoQY7ASyqmZ sQvGsstezlFcdrqVRBkUHOeYc4P63tWk54Cg+uOZIXM4VBAMZ6gjWjy3gWaLU4CqCarM +JLjPZMaxBfluX+GUCsBo9CfIXlk6IiSQIG/FeTYBhhb7VAXyypUZAAJVT7DD135GaKK W65Damf+f5lt/JNaH1H1i4CTy637SXX8u5E4MBh9mQeItBZrB2uZfk+PAFOX0tVFymIa 1s8pkWNL9b8JEStsNCS5zAKT22qrMq3UQeX3pOCzGxb6mZK9/vHcCFxPUXXutW3VdUF1 CtYA== 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.136 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: APt69E0D9ynyawTnG5AO7DAyLR33aonXzUcOtpFEHhmjv7XSAWn6VnNI YJCtO2zlYBSvooGmXzRy0DIc84nnNr993bIolO3hEK6tnUMtLGKnFiTPzLI8GfYb6hBWyD6Hi0N TPPfk8qCaQ5dr3PetTl/FkWVZ7rK3opOsz3X2HbegMXFigY300WQLc18M641OaOpHTA== X-Received: by 2002:aa7:82d9:: with SMTP id f25-v6mr1772155pfn.218.1530022984537; Tue, 26 Jun 2018 07:23:04 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcwPf0BHQDHybx5tPh+1mR0WTfl9p40h8lX8vPGZ57uk88FLmHBjOkgiYrCZ8Fd0YmLzH4P X-Received: by 2002:aa7:82d9:: with SMTP id f25-v6mr1771873pfn.218.1530022979906; Tue, 26 Jun 2018 07:22:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530022979; cv=none; d=google.com; s=arc-20160816; b=ogg87lkKA1HggEtH7mCgyDw4qJ/rASmLNWpAHndkdj/JCvyH4aXPvx/FwnLfFLN3mI s44NcsR8huqGjGFI6aWZgRofrIGMPj8fJ+TRSkJ2akQp/99DDdiWiCXWDGW2m7Ubg6pd aY0tgCJllzaRzvkLzTWCt9iqyCNpnzQ0QdCye5FMfY53GquRTOg5gJIq3r2psmdR6kfm RBq+6Y0jCXw0s32c5Pirq3qFQaOewJ7t/38znF7cduHjkgZ9SnyxwFLG/zGklvozbW6i ajcQWTr6+TorWx79JSKUxUeFfGg7/KbU5NvTLZV3wmillehBtGZNQwyBZC+45sKNnGeO e/JA== 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=+iL4oijNKpTNW3lrWT/HfOVJIAiXHqKSeh8gVOe0sxU=; b=GOJyo538FMH1fL39DXKnK6k6e6IdOePFGXV2SAOYhhyqmTWQhhwF2zUw+uV8zBiFpP ifcL/BdD/uzp4nQ0lD3K7iWC+1lLLrTatCo8yR6W2XtFqru9XufjepGgCw2sPnT8za3y CHbykqErwOtFEpQJqfud2OlrlbTkMn5Sjmg1oOnjVLhxBNHqGyBrbRccCZsKVSxfA9MP D3IXLS3mxg9a+Hzo7G1ygp008Vuk0nCz98Sxl7NIsWLFf6KJCFzm6rX9UMKkO+KUESCc KBKDe210djkpbR0J5dySnlcitHxwQfpZMs194xq5AhcC14zKE+G1HGvx4/iHnL7CPU3O WAQA== 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.136 as permitted sender) smtp.mailfrom=kirill.shutemov@linux.intel.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga12.intel.com (mga12.intel.com. [192.55.52.136]) by mx.google.com with ESMTPS id w61-v6si1638713plb.502.2018.06.26.07.22.59 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 26 Jun 2018 07:22:59 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of kirill.shutemov@linux.intel.com designates 192.55.52.136 as permitted sender) client-ip=192.55.52.136; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of kirill.shutemov@linux.intel.com designates 192.55.52.136 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 fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Jun 2018 07:22:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,274,1526367600"; d="scan'208";a="66458367" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga004.fm.intel.com with ESMTP; 26 Jun 2018 07:22:54 -0700 Received: by black.fi.intel.com (Postfix, from userid 1000) id EEAE078C; 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 10/18] x86/mm: Implement vma_keyid() Date: Tue, 26 Jun 2018 17:22:37 +0300 Message-Id: <20180626142245.82850-11-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 We store KeyID in upper bits for vm_page_prot that match position of KeyID in PTE. vma_keyid() extracts KeyID from vm_page_prot. With KeyID in vm_page_prot we don't need to modify any page table helper to propagate the KeyID to page table entires. Signed-off-by: Kirill A. Shutemov --- arch/x86/include/asm/mktme.h | 5 +++++ arch/x86/mm/mktme.c | 12 ++++++++++++ 2 files changed, 17 insertions(+) diff --git a/arch/x86/include/asm/mktme.h b/arch/x86/include/asm/mktme.h index 7266494b4f0a..f0b7844e36a4 100644 --- a/arch/x86/include/asm/mktme.h +++ b/arch/x86/include/asm/mktme.h @@ -4,6 +4,8 @@ #include #include +struct vm_area_struct; + #ifdef CONFIG_X86_INTEL_MKTME extern phys_addr_t mktme_keyid_mask; extern int mktme_nr_keyids; @@ -14,6 +16,9 @@ extern struct page_ext_operations page_mktme_ops; #define page_keyid page_keyid int page_keyid(const struct page *page); +#define vma_keyid vma_keyid +int vma_keyid(struct vm_area_struct *vma); + #else #define mktme_keyid_mask ((phys_addr_t)0) #define mktme_nr_keyids 0 diff --git a/arch/x86/mm/mktme.c b/arch/x86/mm/mktme.c index 09cbff678b9f..a1f40ee61b25 100644 --- a/arch/x86/mm/mktme.c +++ b/arch/x86/mm/mktme.c @@ -1,3 +1,4 @@ +#include #include phys_addr_t mktme_keyid_mask; @@ -37,3 +38,14 @@ struct page_ext_operations page_mktme_ops = { .need = need_page_mktme, .init = init_page_mktme, }; + +int vma_keyid(struct vm_area_struct *vma) +{ + pgprotval_t prot; + + if (!mktme_enabled()) + return 0; + + prot = pgprot_val(vma->vm_page_prot); + return (prot & mktme_keyid_mask) >> mktme_keyid_shift; +}