From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751663AbdI0TRv (ORCPT ); Wed, 27 Sep 2017 15:17:51 -0400 Received: from mail-by2nam03on0069.outbound.protection.outlook.com ([104.47.42.69]:3104 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751531AbdI0TRt (ORCPT ); Wed, 27 Sep 2017 15:17:49 -0400 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; From: Brijesh Singh To: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, x86@kernel.org Cc: Tom Lendacky , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Borislav Petkov , Andy Lutomirski , John Ogness , Matt Fleming , Laura Abbott , Dan Williams , "Kirill A. Shutemov" , Brijesh Singh Subject: [Part1 PATCH v5.1 06/17] x86/mm: Include SEV for encryption memory attribute changes Date: Wed, 27 Sep 2017 14:17:02 -0500 Message-Id: <20170927191702.72075-1-brijesh.singh@amd.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20170927151329.70011-7-brijesh.singh@amd.com> References: <20170927151329.70011-7-brijesh.singh@amd.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: CY1PR07CA0011.namprd07.prod.outlook.com (10.166.202.21) To SN1PR12MB0159.namprd12.prod.outlook.com (10.162.3.146) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a20981c6-bae0-41bb-d835-08d505dc6f92 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(2017030254152)(48565401081)(2017052603199)(201703131423075)(201703031133081)(201702281549075);SRVR:SN1PR12MB0159; X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0159;3:AKAoskSDXMN+yDRApMaxj18PaO09j3aIm4fkNlDU/kAeHwFHdpkKkk3PS8qDvHEIo93vyTv57uC51roBb7kT16x5JsshLJcSer7Be0SseORWTD45QEiMa0XhpHXBVxnqpRBRy69omqeBYjIiJbgWT2irtp6PWzfdI7Z93uZVlFylfF90a9BX2p141NhG4DV9/sfWBKe3j26kHDp1SB7rg9mNmriBCJAi9zQNZL0XgrjHjEH7y0hpDLcb/uIVC93C;25:Q9npZ1AjNagwi2U2kZknfs1cKT/jvBIH9w04LNXhlqZIrh2Ib06EKX+ROPi5DwzfTVDAf6EfQmXrc6f7GdK1yyyNqZzalio0nBqKwjAtSSnaGNVFlVRekZ8b6/uysIY5J5DBaO8sPw4Lx2skUR8KMhSicCUrGbKUrx+5mB1YuOW6pVgx9mjcYSatbvs7ZJDJEplBnpWUNSCOhELmptVhUjfnsJD0HiJisKsNxx2G72LcbNNoji8lrdSiwmkK8WMcY5eCs+totkTTp9ZhttILnKhQFPpGLnlDm5LjhcnO1gEXLu9rLOFFnoJmKiRZVj/800KJu3U5RnaFv/nv8CvT3A==;31:OpjgloCNR7HexhbcGODujwZ8NaRZ+ZZmj1uWawmHx246A5bIhcRNdu9owhCH82ZJz/99af5Lp1z5dslNFq/CUVSIkxHlmGEPR7+S3oDaxrwNNfJFRS/Mb0Mr6hZqDFKVyc5gONjjlNoI/RBpzoBW/dJsikYZKEWfM+WJGW2V8Y4TdrVseKqvOYfdtFznm6/ubvLR9xxxmXE3Eed5op8wT//xxuvYYVtG/CDonzWSsJE= X-MS-TrafficTypeDiagnostic: SN1PR12MB0159: X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0159;20:GQMdbT2IKUKWlbKLwLqUVKNpFKqDRCsFYMUivLkPFActJSLqXZJr+kURQMHQMoJ8VU4tbzqV8LZbaMMg8KRSxzmxFPxy6rs7OafrYJe6se0Lygli2F/gEmYaIfMWFY1Z0wlaPXgSlj1/1kw5zitd3yXEF9Wc/TggCu0puUZDdSKKL/PfrQxLMm2Ia5F5Q5/cqXPxe/mXIEFXPkS0rwle2zWJ72TJO+CX/0tGrwipUMRHXav++R9gQg7FFpABJSFEpEfOfKxBB1VKKKJWgBwlChIhgbkyiRXdoiW60NaR3byZCTo9jg0wjQK1U+G2A5TUHyTCGTkrPy7Y1R4SRs2JRjL56t5nSUi7F6rR5UMK2G6QCfcdgNWLC9NyzlrX651sRM+Ad5Vf8TKIE4rEylSL7bjzzuoQHiG9T2zbpmxVEvTfTxxsxtR9+sqrCy/otOKOyVLWF0NZ+oVwdYrTGQSbATdgWx0IulnsvsfZme5jsCgJkcBJwp2AVDi1XRvV4AyX;4:lvp6SdLTTQQiYUWaNU7ahzHP3iZ/+gXtzGCa5vn+HO4knANxQE7ChQzR/EoL2DG1xFIl+xBcLZhYQFatA4Ic73YQYMQVMwGm2BX2TOL7LONy0+3iGLNkELNdFxUf56zRNY5sEsEUVExuBVil1dBdPnh3uoZXV3c9Plw3QeCZM9WXNRlcv+DYVjpXQQxJirOZi6JEUyAv0jZxrw/h+D+TkUK48fUKGA3Aw9FWLQL5lQYP8DG6PXC0ymxiXEmAfDR8zYBJTHtTTE2dFInGzShYX3TJbC/xkNbcQXGjcs07zRFw3kJH9dhy4Vek1Hxb7iMosI009DMAgQY7HMgQRxaxPwfcTkyl0cFUaA7u/CA+jlc= X-Exchange-Antispam-Report-Test: UriScan:(9452136761055)(767451399110)(228905959029699); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(5005006)(8121501046)(10201501046)(3002001)(93006095)(93001095)(100000703101)(100105400095)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123562025)(20161123564025)(20161123560025)(20161123555025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:SN1PR12MB0159;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:SN1PR12MB0159; X-Forefront-PRVS: 04433051BF X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(6009001)(376002)(346002)(39860400002)(199003)(189002)(66066001)(50986999)(76176999)(106356001)(25786009)(478600001)(105586002)(2906002)(101416001)(53416004)(305945005)(5660300001)(86362001)(33646002)(189998001)(50226002)(8936002)(68736007)(7416002)(97736004)(6116002)(3846002)(8676002)(81156014)(81166006)(6486002)(316002)(16526017)(54906003)(4326008)(16586007)(1076002)(47776003)(2950100002)(53936002)(6666003)(5003940100001)(48376002)(7736002)(36756003)(50466002);DIR:OUT;SFP:1101;SCL:1;SRVR:SN1PR12MB0159;H:ubuntu-010236106000.amd.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;SN1PR12MB0159;23:fmLsos26zWyMwGb19PUp6B52rtXZraFicP3E+9FFN?= =?us-ascii?Q?AhWzI91Xrp57/wokyvQ8mFTZxERcaBdJE7jUdEOq/v01J75/YTbgCrgCsLAu?= =?us-ascii?Q?mbvAwGoi0rE0k5k7fCY+PVN5l88v8lkPk21NV+QGkOVSP6tYCsw0Q+hqPI1O?= =?us-ascii?Q?WRT59e0ZY5NtNJCNlXa9NvthVMlyFJXFiALUr0NTZmR91sto3Jier89ETFW+?= =?us-ascii?Q?nONAue1WjlI7cNV3520nW4SC+BUjQ7HdeG/6ZVuDhWz0ZsyGC4dDBLJBK+nd?= =?us-ascii?Q?NfN5k7rb1OYiZO7DvyeiQemzSD3lOJQeuA63C14Q9040AmFGasewyTB/63T0?= =?us-ascii?Q?HN+3cnGPXv9yMHPUoU0MOzvQsnt+gi4Lspu2KsKtZ9QrcCqMEmsZ/I2+jobp?= =?us-ascii?Q?xz/aImCOFM/VIxswbE1mg9rnF9dmfDFkN2JLkJZF/YzOOM1mN5vH457dM3Kg?= =?us-ascii?Q?mVLIwdZnzE0hvf2/BkW/fyk8MdZnhtjiWD59Vl6KmdZmVT2P9kY3LLr2cH+t?= =?us-ascii?Q?rwmLrM/GOrpmhA2NiDKJZUx/Y38Y0vjENOhxXkqtIzj9EVfvDvlK/3f06Y6g?= =?us-ascii?Q?dTa/+ATCP6JCOgcePmBJFUr1h0X2Cp3hPVmafsBsbv9I/cZkfDuBcum0E82g?= =?us-ascii?Q?MVkd5RrX94vU08X8gAPVCg+T5yqJ6X2Tlrgo7kQKQ6vVdMrlT5xjGnchJpqS?= =?us-ascii?Q?dbFoGXztzwGyWmPEpGUTsxI065+AIT/5MEHjQtQRlOPUe9vcDMQ57fi3szYx?= =?us-ascii?Q?6KX6S5rOAMclZs3p69OY48mXDBTeYJ0n1z+WJWDvmFFOv+MIRiC2FhcSONbp?= =?us-ascii?Q?c/ym5NiWMSy47CEqkuM0W8emV2gwPgYUOOmOBavX6ZUZK1/bAy5n7zJxEJRy?= =?us-ascii?Q?eAYqc1lyHw3gOV7A12blKOD4/G9mDMqtE4Atm8yd+4lB2fMq0/jcH1gWwFL6?= =?us-ascii?Q?+ANwBzsrJP/qz7Oy+SHn8eJQ0AfYBd2WxbCP64qYrK4iL9irQ1ji1fdLPY2D?= =?us-ascii?Q?UJ4jYzo94cc9Bv/jF+un+5kJSKLhjbSOY+TXDzsm7lnmZoGpj+94Q/iBqDGS?= =?us-ascii?Q?hHSTs/btpCAj66rGpAtWNcWFdbyXUkvQNrz0jGDch+q65xnpOPhdc57GVpef?= =?us-ascii?Q?Jo1tPkuPME=3D?= X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0159;6:g1ikoYuYQbOvBX7xbSx1res30w4FMrj0Z58WZmMXCwfFOxbgzmHTC0AFy0bVKvJYs7/me0S10e+nG0ZPu2oZNstM/WbklasdalxTiJCWF1UAS4uUaopC6OaJEezDCXWhLqfH1sWOxy4MEVTVbhGoOa5anBlfJXyxk8HznKjixMIv/I44qT7yJjq0lkYMj6eMWhu2k90+K+2FDSMBNdMm03PLXn1z0fPKAZCt0xO+NLtlUTw4yitFkNS1CRZwbQcY0M+fqp7WoSKmC89JhuFA5vbUEwZslAOBW54x7gUWhoNJP3Uiwuk0p52hBpEjYdM6jUTomu2yzbhDv+jgK4ID0A==;5:dQxdmTI/S01R3byWo7x6xk0BLs0XzbhX8hNW5l3Eq0t4pqGjPg7sO0xnZxDCC+jBKqyXbITqK/lCd2M1kF5NWjK/eIAk+XCADoR+Xr+VfIM98l1+WUSV05eOZjv4dL02oVecg3N+OU9ZtLIjtG+ezQ==;24:geuuhraa1ir6GNY7DqGTiJYdAamBiD761iBkG5HmEUMf+F0i0EA7TwIBOtifPLQFiv0L44LeyKQVfEsmMWtcdurGHYFJ0CdF5srBEKeWTTc=;7:BzTsvKGEf+xU7UilTs54BKRDhETwSjZxpDsJEtV3V0lylisZ1GO3AchW8/Sk/fHG91ZoQgIieTrjDCPMVw65GWT5gmT/B9Mv/zCu4oKRXliAY1cO2u3pqY528SwRZETes85F+FMqooyQb+K3vu0ydEQMkbwfdK6gGRuRT7PGjSpvMmuojvGeOGxHqT6rctDNnziC/lNgdeRe6ZXUxenx1e6V/Un4tyHTXQzI/zae4HU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0159;20:uBWoFQ8iBjwTN6sp0Qurrh9a+bSA1RqjROqN5tMisdmcdJ/n6vOOkJm0Zwo6X0hkg54gGalFP2LCFfni0eupEtJc7CmcNSwVLjy1lFXTo7miaHBf6aEoEfXflbu894VtKWFq6Wu5YJVAzBG9MRzMVBuogzIvOAn+ez2U/JH+0GmoJan/qM0sVYPnGsh6P0z6yssG5bqeeMEezbkvGx15KSxy6r8M+iK52qAW1m3l8SmOzyKxcwQXRYtE/MRXo2qU X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2017 19:17:45.5006 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB0159 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Tom Lendacky 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. Cc: Thomas Gleixner Cc: Ingo Molnar Cc: "H. Peter Anvin" Cc: Borislav Petkov Cc: Andy Lutomirski Cc: John Ogness Cc: Matt Fleming Cc: Laura Abbott Cc: Dan Williams Cc: "Kirill A. Shutemov" Cc: linux-kernel@vger.kernel.org Cc: x86@kernel.org Signed-off-by: Tom Lendacky Signed-off-by: Brijesh Singh Reviewed-by: Borislav Petkov --- 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 dfb7d657cf43..3fe68483463c 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 */ -- 2.9.5