From patchwork Tue Jun 26 14:22:32 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: 10489163 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 BBEE16031B for ; Tue, 26 Jun 2018 14:23:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AB96A28A58 for ; Tue, 26 Jun 2018 14:23:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A020328A68; Tue, 26 Jun 2018 14:23:14 +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 49DA628A58 for ; Tue, 26 Jun 2018 14:23:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5D9456B0272; Tue, 26 Jun 2018 10:22:57 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 40F006B0274; Tue, 26 Jun 2018 10:22:57 -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 15CA06B026E; Tue, 26 Jun 2018 10:22:57 -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 A98C86B026A for ; Tue, 26 Jun 2018 10:22:56 -0400 (EDT) Received: by mail-pg0-f70.google.com with SMTP id e1-v6so6516007pgp.20 for ; Tue, 26 Jun 2018 07:22:56 -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=tXB0MAERWqhQTJHOYbkHnyZRKYry6eAWdp7dsRRwjyY=; b=hvOIBeYqFE5eSQZNAAv1HO4rqFl8RRFtiAxwDUJh3i9m8OPfuL1mdnctgx4VSMhwmY ABvxpcFK90euq13mQdXdEULj4P5oWOZ5GbwPh5g6WhmxjAcRhKGLBZENmdl6TL0FcYfT rwTvmL/CwvXlurPPSQy29Geww/npFC80Q+XlGelDXdqMpr97Mk8bLcTRzGqWw0Kpyv1s IISbog/W/s5eaM9wnQltO621wiC8PxKlwn1CpANRv+6zXhTpdbBftvvQeoByAw06vBYf YJcoo7mel+qPe9PqXg5CtnPtapSis9NEQl62B+1pE8GRWUrR+70swXKACzMiThpgOcI6 Ah4A== 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.88 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: APt69E3+z203LTYQKZmz/2fYeIXiEAZoqT94S/pjTsqf5t3jjU1g4TWK JpYo7zFFa2XRXSg9MukQ6KuDeguh6eCvJ2j7MY8x6yP9LMADRlzrsYq8w7tBdbUU/9qtG7GhRsm 8Sk838H0ly8DDWL3+rrGJcWua39KvidZrcYLuHOCj7Z3qoedR6oCgBfOu56rzlqW1nQ== X-Received: by 2002:a62:494f:: with SMTP id w76-v6mr1789334pfa.152.1530022976376; Tue, 26 Jun 2018 07:22:56 -0700 (PDT) X-Google-Smtp-Source: AAOMgped1gDAMcAI5XUvx7XB0/DCZsIORrnHARtVw105qKKZdRsrS9PUJYIqjbZ/XIgU4CNitJQ6 X-Received: by 2002:a62:494f:: with SMTP id w76-v6mr1789289pfa.152.1530022975634; Tue, 26 Jun 2018 07:22:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530022975; cv=none; d=google.com; s=arc-20160816; b=jcU04I8nVCj73cHDCQfPh5PD1SOIfYWYD1vtsXVdIFKvCiO3ELKuknXSBZUDEgLc9H y6oCbZusBhXvd/66FgiU5Wt8ZPQTxvHbTy3Bdb0kzSYH3zBleSqOZQ04zcSezvFGB0Y9 MvIv3n2IQykHgvgf9HWmbs41M9+Wnk3TUh8YelklyuLbpehN4C2KW5i5ldoAiFX5elWM eXb1KQUTd24s76W27G5Veodlmb5ySpX9nOs0J0A6bRWkDo+MN4HNHPXrG0KFFHxTDuwH 0Ye7BS6f468zmhWRDGJowao9WSs6IuPMn+UQDZ+jzVsmTMG7sMx/uV2n1XKOBK6RM36d 2koA== 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=tXB0MAERWqhQTJHOYbkHnyZRKYry6eAWdp7dsRRwjyY=; b=Y6+HoRaDFwyJQUPwSSGeKTGx8iPTUHHwPbJyoDqSmrNSN+wgxSE8meqyGH2ha+oQDI 3icqpQUsWRvPHyci7B2JiEiSSeGcayP3h65EQiaN4Okv7tBB58Jejau5hKGXxNyLrzM4 +DkCmWQXY6BGgxRvUZkBMOWjJN3KjmoYOmYUqD2zL0UWCo5RdpwjvyGX3rF9RJlrLegv bNLkJCQr7mQa0yhwZXF8TW4CvaD+02otTVys13b211aEBtPom430G4KjuH97nf0ypVxa vsxLAhogwVDylwoRz573br5J3K5nECfE8gYs8gW4ZsWJqwdHCbocP0pHA8PTmLCQwYM6 LGHw== 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.88 as permitted sender) smtp.mailfrom=kirill.shutemov@linux.intel.com; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from mga01.intel.com (mga01.intel.com. [192.55.52.88]) by mx.google.com with ESMTPS id x3-v6si1202539pfj.289.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 192.55.52.88 as permitted sender) client-ip=192.55.52.88; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of kirill.shutemov@linux.intel.com designates 192.55.52.88 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 fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga101.fm.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="50032946" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga007.fm.intel.com with ESMTP; 26 Jun 2018 07:22:52 -0700 Received: by black.fi.intel.com (Postfix, from userid 1000) id A45615D1; 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 05/18] mm/khugepaged: Handle encrypted pages Date: Tue, 26 Jun 2018 17:22:32 +0300 Message-Id: <20180626142245.82850-6-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 khugepaged allocates page in advance, before we found a VMA for collapse. We don't yet know which KeyID to use for the allocation. The page is allocated with KeyID-0. Once we know that the VMA is suitable for collapsing, we prepare the page for KeyID we need, based on vma_keyid(). Signed-off-by: Kirill A. Shutemov --- mm/khugepaged.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index d7b2a4bf8671..4dff3c114501 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -1056,6 +1056,16 @@ static void collapse_huge_page(struct mm_struct *mm, */ anon_vma_unlock_write(vma->anon_vma); + /* + * At this point new_page is allocated as non-encrypted. + * If VMA's KeyID is non-zero, we need to prepare it to be encrypted + * before coping data. + */ + if (vma_keyid(vma)) { + prep_encrypted_page(new_page, HPAGE_PMD_ORDER, + vma_keyid(vma), false); + } + __collapse_huge_page_copy(pte, new_page, vma, address, pte_ptl); pte_unmap(pte); __SetPageUptodate(new_page);