From patchwork Tue Jun 12 14:39:05 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: 10460523 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 21AF26020F for ; Tue, 12 Jun 2018 14:40:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1C57328831 for ; Tue, 12 Jun 2018 14:40:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 113AA2882E; Tue, 12 Jun 2018 14:40:19 +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 E29EF287FF for ; Tue, 12 Jun 2018 14:40:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 594FB6B026C; Tue, 12 Jun 2018 10:39:35 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 51A236B026D; Tue, 12 Jun 2018 10:39:35 -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 40D4A6B026F; Tue, 12 Jun 2018 10:39:35 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg0-f72.google.com (mail-pg0-f72.google.com [74.125.83.72]) by kanga.kvack.org (Postfix) with ESMTP id F389B6B026D for ; Tue, 12 Jun 2018 10:39:34 -0400 (EDT) Received: by mail-pg0-f72.google.com with SMTP id i12-v6so4875752pgt.13 for ; Tue, 12 Jun 2018 07:39:34 -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=a9RdJ1aBmonE0SEPZpmqtwBu9+caA2/wVuZWGBSDfys=; b=sErXsO43rexSSfKZVOJVDnbsWv6smQNLphqLBPEythBlY1YpC8thFmFm2A3+k6aR1i DgCXye5QseC8WpUa2fyelyj0qtzdA97deAwAvotU1WCQU/WCqesWo7IE8DpS+uh+8hik Zfqirn3Dnh21vMHso9WL3kltrAzVBy9xj3CMAyEUuorpv0teqAvmSd2Sji7gYgXtu38+ rsTjHCH/2oRBHUhHVE0hnjWJIvEtf1r00ZaF7/BhoRq/DT3zD55eZETEj9vyAO+hyN+G NE+/KeZ5cLIsuHmC4cadr4NsxBCaiuXA7TFXdGeHhrI25pelMdIpkdA6Krfq94FvL9ra QhuA== 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: APt69E2Xe8pujRiiAf2x6L1u6DxZFI15JtlLT+14Y2/eRIUbaAVR0EZp zRYYT67liPhIbZB1K1QwOB8wOT7L3h0U/0Ko6SlMMvMCTh+J68Zqy4Kf22RfsruXl9Nqs58hE3Z HQU+giMr+Nw7nCVL+Y09fzb4xkJUxjZMw5WE92RzdJrxk2yuNPyPjRBqy/0NpB7Jwhg== X-Received: by 2002:a17:902:7888:: with SMTP id q8-v6mr728134pll.79.1528814374698; Tue, 12 Jun 2018 07:39:34 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKRAN8jFjiJnTGHXcDuvzA96DUo8SNF1BOg973RnxWGhbp/bCWvfxv/rltDGOp1CWI0ZJhG X-Received: by 2002:a17:902:7888:: with SMTP id q8-v6mr727716pll.79.1528814368001; Tue, 12 Jun 2018 07:39:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528814367; cv=none; d=google.com; s=arc-20160816; b=qkR9ndIUyyY3znnUnapwG8Sy1YMwFUMdaQD5MNuZ0kA+vz+pdaXZAb8Q3/JtqkDW+t UqsLROGFPy9hTddrm0My6noao99ygqqBrEs1VNPll9whK83W+ufNAkKe7E6qRGM+aKSA TqxtV0E3HOsyf/u3TV06sILau5ph2Ujsivpo2fNNpyS8/ziK23/PIM8Z1s36/kck4+2G 1WIP+zreqW2vGxmH0eAmgMoEODxVrauSqhEWpyDcL3CZGvQPdOdTZkzTUqBoApDf5cUA k1dkIE8yHxWbyOa/BG2676CwgB2RqYuqX4e3TZENzy5jgsUFLC8/62hhOm7tmM/i9RDq ERew== 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=a9RdJ1aBmonE0SEPZpmqtwBu9+caA2/wVuZWGBSDfys=; b=s+xdnSjsOztdCASpJzh0UeUsCEgZharaGIOoppsiDPfOrcXmWZdHq+5uU7co3lNP1H q1j2v3LDYSjZUREmpdr8OV9nuj8oQIKKP/C6QeWb8s439qH9FXt7ewQu9T1Tpl5M62s8 P2IGW8SBGf+sZkg7UUFiySIhRfb9mr57XubTYclgoCj+Yg4iOtexqp6BQzNc8AJBgrrc KMMhxZHluJsuHmNanLKI1sD/7fckNR2SFBKBpRhofe8GqU65P/Jn2VqYgoue1ZyHWPPE SGt09t5abA+Lnnucq/wcwXHWaeMqukdGdwdPXY7gRXjoxH9gfjCtzZDOOViG6xFxnGRR pd1w== 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 r4-v6si224686pgq.583.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="207428842" 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 E1F57405; Tue, 12 Jun 2018 17:39:20 +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 07/17] x86/mm: Preserve KeyID on pte_modify() and pgprot_modify() Date: Tue, 12 Jun 2018 17:39:05 +0300 Message-Id: <20180612143915.68065-8-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 Encrypted VMA will have KeyID stored in vma->vm_page_prot. This way we don't need to do anything special to setup encrypted page table entries and don't need to reserve space for KeyID in a VMA. This patch changes _PAGE_CHG_MASK to include KeyID bits. Otherwise they are going to be stripped from vm_page_prot on the first pgprot_modify(). Define PTE_PFN_MASK_MAX similar to PTE_PFN_MASK but based on __PHYSICAL_MASK_SHIFT. This way we include whole range of bits architecturally available for PFN without referencing physical_mask and mktme_keyid_mask variables. Signed-off-by: Kirill A. Shutemov --- arch/x86/include/asm/pgtable_types.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h index 1e5a40673953..e8ebe760b88d 100644 --- a/arch/x86/include/asm/pgtable_types.h +++ b/arch/x86/include/asm/pgtable_types.h @@ -121,8 +121,13 @@ * protection key is treated like _PAGE_RW, for * instance, and is *not* included in this mask since * pte_modify() does modify it. + * + * It includes full range of PFN bits regardless if they were claimed for KeyID + * or not: we want to preserve KeyID on pte_modify() and pgprot_modify(). */ -#define _PAGE_CHG_MASK (PTE_PFN_MASK | _PAGE_PCD | _PAGE_PWT | \ +#define PTE_PFN_MASK_MAX \ + (((signed long)PAGE_MASK) & ((1ULL << __PHYSICAL_MASK_SHIFT) - 1)) +#define _PAGE_CHG_MASK (PTE_PFN_MASK_MAX | _PAGE_PCD | _PAGE_PWT | \ _PAGE_SPECIAL | _PAGE_ACCESSED | _PAGE_DIRTY | \ _PAGE_SOFT_DIRTY) #define _HPAGE_CHG_MASK (_PAGE_CHG_MASK | _PAGE_PSE)