From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965064AbdKGOsM (ORCPT ); Tue, 7 Nov 2017 09:48:12 -0500 Received: from terminus.zytor.com ([65.50.211.136]:39139 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934155AbdKGOsK (ORCPT ); Tue, 7 Nov 2017 09:48:10 -0500 Date: Tue, 7 Nov 2017 06:44:53 -0800 From: tip-bot for Tom Lendacky Message-ID: Cc: brijesh.singh@amd.com, kirill.shutemov@linux.intel.com, mingo@kernel.org, thomas.lendacky@amd.com, tglx@linutronix.de, matt@codeblueprint.co.uk, john.ogness@linutronix.de, dan.j.williams@intel.com, labbott@redhat.com, luto@kernel.org, bp@suse.de, bp@alien8.de, linux-kernel@vger.kernel.org, hpa@zytor.com Reply-To: labbott@redhat.com, luto@kernel.org, bp@alien8.de, hpa@zytor.com, linux-kernel@vger.kernel.org, bp@suse.de, mingo@kernel.org, brijesh.singh@amd.com, kirill.shutemov@linux.intel.com, dan.j.williams@intel.com, thomas.lendacky@amd.com, john.ogness@linutronix.de, matt@codeblueprint.co.uk, tglx@linutronix.de In-Reply-To: <20171020143059.3291-7-brijesh.singh@amd.com> References: <20171020143059.3291-7-brijesh.singh@amd.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/asm] x86/mm: Include SEV for encryption memory attribute changes Git-Commit-ID: a72ec5a34dca3b635eb2de3b485d0a1b2e591a5c X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: a72ec5a34dca3b635eb2de3b485d0a1b2e591a5c Gitweb: https://git.kernel.org/tip/a72ec5a34dca3b635eb2de3b485d0a1b2e591a5c Author: Tom Lendacky AuthorDate: Fri, 20 Oct 2017 09:30:48 -0500 Committer: Thomas Gleixner CommitDate: Tue, 7 Nov 2017 15:35:56 +0100 x86/mm: Include SEV for encryption memory attribute changes The current code checks only for sme_active() when determining whether to perform the encryption attribute change. Include sev_active() in this check so that memory attribute changes can occur under SME and SEV. Signed-off-by: Tom Lendacky Signed-off-by: Brijesh Singh Signed-off-by: Thomas Gleixner Reviewed-by: Borislav Petkov Tested-by: Borislav Petkov Cc: Laura Abbott Cc: John Ogness Cc: kvm@vger.kernel.org Cc: Matt Fleming Cc: Borislav Petkov Cc: Andy Lutomirski Cc: Dan Williams Cc: "Kirill A. Shutemov" Link: https://lkml.kernel.org/r/20171020143059.3291-7-brijesh.singh@amd.com --- arch/x86/mm/pageattr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c index dfb7d65..3fe6848 100644 --- a/arch/x86/mm/pageattr.c +++ b/arch/x86/mm/pageattr.c @@ -1781,8 +1781,8 @@ static int __set_memory_enc_dec(unsigned long addr, int numpages, bool enc) unsigned long start; int ret; - /* Nothing to do if the SME is not active */ - if (!sme_active()) + /* Nothing to do if memory encryption is not active */ + if (!mem_encrypt_active()) return 0; /* Should not be working on unaligned addresses */