From patchwork Tue Jun 26 14:22:44 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: 10489177 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 6D5826031B for ; Tue, 26 Jun 2018 14:23:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5C1B42876C for ; Tue, 26 Jun 2018 14:23:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4F088288F4; Tue, 26 Jun 2018 14:23:32 +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 012742876C for ; Tue, 26 Jun 2018 14:23:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C2AC06B0274; Tue, 26 Jun 2018 10:23:00 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id BD7C16B0277; Tue, 26 Jun 2018 10:23:00 -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 A558C6B0279; Tue, 26 Jun 2018 10:23:00 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf0-f199.google.com (mail-pf0-f199.google.com [209.85.192.199]) by kanga.kvack.org (Postfix) with ESMTP id 5F9556B0274 for ; Tue, 26 Jun 2018 10:23:00 -0400 (EDT) Received: by mail-pf0-f199.google.com with SMTP id f24-v6so4756548pfn.10 for ; Tue, 26 Jun 2018 07:23:00 -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=fIXhAJkjvcnKWXCxWtK7pzyZj97J5QrQaSJ9bxRNPEk=; b=j9VJzVGeo6AN6qaitMNonj4cOUq6kaRzqjmkoaIvhqeiq1lkCW01Cf883pXJx5vf72 Pm90ZAYIh6yGm+Kvo9P9LyROczHndZGD48eVlttpUDD3BpihPbKPmOw917n0u+1YTU9l LhbwRNJ85l7yA9LhCBrr8YKD5jFz/Q8WtfnNtM1+flBeCOVTqLXXp/YIqWXTjmoyexD1 L/03jj2uq6r/9tsNZr/iJiK8H36NE7rGUS6HbbSC6Ioys65gndGk/NqJdd18xj7AIJcJ ZcwfZGtsLDQuqcpFaEZN9kpjV9faJVZZzS49el9RE5aK8CXA4mDNjcBVci2pBOuJjCUH BK8A== 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.24 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: APt69E3ApQvQ2OQZIOV0uk5TxCFpklRFsY1hUZ+19b6sW3xpYb5QDC6+ Ch9JQoE9wvIyLun4d3gOWeppwoDp48wnwOPnLY45YGvFh/zim58eMnaKystDIYDXTfPkG5PZhiJ XgPSCgdrr96b19iu6/kPwdSIncjBe7Ep8yXOpgnNO9kyDyRc+U5Qg03/bPy36ow8nlg== X-Received: by 2002:a65:6517:: with SMTP id x23-v6mr1622341pgv.268.1530022980066; Tue, 26 Jun 2018 07:23:00 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJ13XVpj+HEsSwhnk/RBlnR4nZrMhbtOvAJbSjlRDGaB6Hr5BGfwzXmff6iYlhTrXRcJd/+ X-Received: by 2002:a65:6517:: with SMTP id x23-v6mr1622291pgv.268.1530022979257; 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=g1iAXfQpqo0/byfLkXrVrPqKUqaoZpg8KhCdeA7s81RfeYctkeUb9Hhymx72ObvbX2 NtowurBdC1gLnBZXROO7hJLniyWGV9Z2pRW5Pq3YZeo1v2RoCqjaGSM0m9/qBJZsJiAw pm2R7HGEBeaCR4Tx1KlBYc7EvXAKhdpb10IvaJDfi0bkhO9ZyJYPzYuDKV3xp6A5GeXM gM7kbdiVgXMqi4sCb3EyGunzrolvrARkCKvPY+y/SaPqrAi8HipImuK80/KLZDr2g3s7 4jmqJ/i/zat025Z/FfSnxiNjBlW2q0azPDN8SuW40gp6pxusEYNcpdYqc5GgaV82YHUn RMNg== 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=fIXhAJkjvcnKWXCxWtK7pzyZj97J5QrQaSJ9bxRNPEk=; b=vW46SYCrGEx1BZAWKOKpjudipYwbjwtcPA2jdFXA/YIQPUQWo/fvIVjXlGjF3tFRvj pfx4OwVbS1DNU6UO0iHJHwUiQ53YyvR7FvDgyw+e8t7ZvLDqIvxv1WosAucYorMaZrGs WZhu+PUA9ye8yZr+zk0t+d6jBJWWAFrKhQ03vWuxYqf03XF7Zse6U43XPy9bJgWmk8sf BdOG5GJ7/LMbuIxL1QvOk0lSB9hLgZyx/VeuJIxKic1m9UjWC0VSyAexMN1zWehEq5tn 0Bc+/N0Yiwa65ellySIvqgXaz5xijFNZGKlFsTNMwtn4+mpCwcysOUSDS39be12Pai3y daPw== 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.24 as permitted sender) smtp.mailfrom=kirill.shutemov@linux.intel.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga09.intel.com (mga09.intel.com. [134.134.136.24]) by mx.google.com with ESMTPS id b125-v6si1501171pgc.514.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 134.134.136.24 as permitted sender) client-ip=134.134.136.24; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of kirill.shutemov@linux.intel.com designates 134.134.136.24 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 orsmga006.jf.intel.com ([10.7.209.51]) by orsmga102.jf.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="53025009" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga006.jf.intel.com with ESMTP; 26 Jun 2018 07:22:56 -0700 Received: by black.fi.intel.com (Postfix, from userid 1000) id 4F4F99C3; Tue, 26 Jun 2018 17:22:52 +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 17/18] x86/mm: Handle encrypted memory in page_to_virt() and __pa() Date: Tue, 26 Jun 2018 17:22:44 +0300 Message-Id: <20180626142245.82850-18-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 Per-KeyID direct mappings require changes into how we find the right virtual address for a page and virt-to-phys address translations. page_to_virt() definition overwrites default macros provided by . We only overwrite the macros if MTKME is enabled compile-time. Signed-off-by: Kirill A. Shutemov --- arch/x86/include/asm/mktme.h | 3 +++ arch/x86/include/asm/page_64.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/mktme.h b/arch/x86/include/asm/mktme.h index ba83fba4f9b3..dbfbd955da98 100644 --- a/arch/x86/include/asm/mktme.h +++ b/arch/x86/include/asm/mktme.h @@ -29,6 +29,9 @@ void arch_free_page(struct page *page, int order); int sync_direct_mapping(void); +#define page_to_virt(x) \ + (__va(PFN_PHYS(page_to_pfn(x))) + page_keyid(x) * direct_mapping_size) + #else #define mktme_keyid_mask ((phys_addr_t)0) #define mktme_nr_keyids 0 diff --git a/arch/x86/include/asm/page_64.h b/arch/x86/include/asm/page_64.h index 53c32af895ab..ffad496aadad 100644 --- a/arch/x86/include/asm/page_64.h +++ b/arch/x86/include/asm/page_64.h @@ -23,7 +23,7 @@ static inline unsigned long __phys_addr_nodebug(unsigned long x) /* use the carry flag to determine if x was < __START_KERNEL_map */ x = y + ((x > y) ? phys_base : (__START_KERNEL_map - PAGE_OFFSET)); - return x; + return x % direct_mapping_size; } #ifdef CONFIG_DEBUG_VIRTUAL