From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752848AbdJTObg (ORCPT ); Fri, 20 Oct 2017 10:31:36 -0400 Received: from mail-dm3nam03on0088.outbound.protection.outlook.com ([104.47.41.88]:47104 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751978AbdJTOba (ORCPT ); Fri, 20 Oct 2017 10:31:30 -0400 From: Brijesh Singh To: x86@kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Borislav Petkov , Tom Lendacky , Brijesh Singh , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Borislav Petkov , Andy Lutomirski , John Ogness , Matt Fleming , Laura Abbott , Dan Williams , "Kirill A. Shutemov" Subject: [Part1 PATCH v7 06/17] x86/mm: Include SEV for encryption memory attribute changes Date: Fri, 20 Oct 2017 09:30:48 -0500 Message-Id: <20171020143059.3291-7-brijesh.singh@amd.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20171020143059.3291-1-brijesh.singh@amd.com> References: <20171020143059.3291-1-brijesh.singh@amd.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: BN6PR14CA0029.namprd14.prod.outlook.com (10.171.172.143) To SN1PR12MB0160.namprd12.prod.outlook.com (10.162.3.147) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 562e2b1e-82ac-42e1-0539-08d517c73c09 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(48565401081)(4534020)(4602075)(4627075)(201703031133081)(201702281549075)(2017052603229);SRVR:SN1PR12MB0160; X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0160;3:I6DsCi0Yg1B/KzEm9+kYOstzAfbVs7jN/N3fKZZwP70k/XbYr3CENAVLwQczXfwIhvtABSPUvx8WaUk2v9uqwVoD3yuPh2NF2xTPBDKLkyfGkphm/UvmJBlqMBRqV1T3DfhB6GYLXDrXQH8z1hZBfHJukafm3T1jNcOMUbQAuNHBOAoDW2aSyMafXxBako2zqylbwHj2zl+xUUlsdJi9JvHOaEDkzu1Hvxr7ysB+yUlQqjF1m0hLgUotSCM5wpCs;25:waWceAYi5QPbIfS4tXoNKz/oeDZ2728lRU31nJUFdPOhVVpdeuZ7sWec/GcdAsCOFFn9+JKcudfQ4jLSpO+GgXYSQh+McmZqxPFOYwScldDHiuF7fDjkWdU8B0c9+7GDdPIs5JFi7VCw/2QCzijrrQoRnYS1W5nfulPaqhzziYVUvr4URGAen2F0RcMmMglNLaggAfR7tn7Fvzzfl7n+q0LPJa4Ecx1ww/XwPquU2e9cAMnWdIu4uqedWluJF6hafKTSU+wsZN/E4Bw5cHozUad8DQvcj6iVwbIezE6x6B7+6g7WAiopylIgPbVFeeBvC+Xctu2aTUQUrM8zpAU0hA==;31:5uoWIV+9zTNBWSrog3s5HFwMRaWDANHfvT5PTKJRX4Uja9cOkKTJMG2dLhUfIP4Xi1I8H1ApNTdLRV9TOtwgH192S/AHiXWtDpd/d6DCxcgeX15zDzwVJvd+FnX15yCIH9L8nMjqz0s/sMCKa5R/2WT8cmEXkDzZ10SCcifgIKipGH9lElQoyn4BZhAFCYyePwBvVIqnqh1Si5Zbi/SyygD/0aBS25cjc71QHYd+Wio= X-MS-TrafficTypeDiagnostic: SN1PR12MB0160: X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0160;20:xWCqJxeO2vw2QEruN5vO+b+QMz8ouADAl6EmMt31TmGb8+4G0964D2y4QzeSHp3+a9jKDqL9a3Vm2MG5/pIOK/eg+sXNNyoar1/T9SBG9hXaBfllUZY+ZoiJ9SGbwpj2mRjHY49wU1/a5+aF3z+1t2Tv0C5EkULGgK/9dWePoJOI839rqcJAWJf+LvazhxrC3w0ivvsgBRXTcOzcB4Rjp2m0TaE+Wr7761a9KUDeyKH+wT2LYsRF02uwPavh0EKJuR0J1T3KUho35fQYrWUqwjImvwU7I+x4e9bpl+KyUmCvRChLUY4ubNwUCxHzcok0ko/RUWaWCpbjnQTOwaUcnT+3PGr2silHE1CU7eJJbFCbNeocXN0hDR01DQ7TXxPx2Gk6Hci8YsiPJg90oFIaSvbDpA+BHJ2IAPmfBsrxKip0kdLkQX2D6q7qX1Cvb7YYWNR5hXQNth+0DMVTaq8UgzmV5b1BO1pl2ZjRYWWyhG8mUygXeLOSn8vWEaKut+8z;4:NZYcaBD6ud9qO6xl7Xkpvc/L79GXFA86ejotwdA4XIzf6PeK1ZoH/ONjYbPa+qPmJkbJrH/wtCW3+rd9MKrKGgbM7n/8+NhJI1gSkMzZ+vroM2XqmTw4mcm1ba3GGvBH8IgutBMd79jl3A5amKHwMY0EFPudXPiEQEuB32Q0rbYTV2gfEKBwFqYISPXqHLAEspOB1QrTKIVTJkdDiNR1s/094AUJfYNLsthUS+UjwQDM5IB95ERWzFDAiSJJG5tPEe2If9+A6au3Mpo4QQKiGq69XGJ4AW2z8jKBfN1eaZg37abV6GglKC5WYpRoWhDN2iYL5UzptQkM4EV4VMdM/07pLkUUNjDy6e/akpqtYbQ= 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)(3002001)(3231020)(93006095)(93001095)(10201501046)(100000703101)(100105400095)(6055026)(6041248)(20161123562025)(20161123564025)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123558100)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:SN1PR12MB0160;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:SN1PR12MB0160; X-Forefront-PRVS: 0466CA5A45 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(6009001)(39860400002)(376002)(346002)(199003)(189002)(54906003)(1076002)(6666003)(189998001)(68736007)(8676002)(305945005)(50226002)(7736002)(101416001)(76176999)(8936002)(97736004)(25786009)(81166006)(81156014)(16526018)(6486002)(478600001)(48376002)(2906002)(50466002)(4326008)(7416002)(47776003)(66066001)(5660300001)(2950100002)(53936002)(106356001)(3846002)(50986999)(16586007)(53416004)(6116002)(5003940100001)(36756003)(33646002)(86362001)(105586002)(316002);DIR:OUT;SFP:1101;SCL:1;SRVR:SN1PR12MB0160;H:ubuntu-010236106000.amd.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;SN1PR12MB0160;23:9fnPTBfVviMWI4EUtNl8gKh6+z4wCW3vPM14BJAK4?= =?us-ascii?Q?L0iKd9nRV/Pkde+9VnlYFxO3OBfB1Qbu66mAScbrnT1c1T3HzF7uatJQaIev?= =?us-ascii?Q?gMh0SlZti4dZMr4PHbzLbbtq60OZuPIPbcbGNajbQu6yS/BAphJ8oFuBgmVn?= =?us-ascii?Q?GfsqVCX69TL9M1RPnPqjddauKwq5NlMo92/3PFAikpp/och9d9zoIEGaMXeP?= =?us-ascii?Q?qD3wZ1K++iwMuCJt81klV+BcjaaADWCq6Bqgwsl76yspKmEqnHbXeps2AIu1?= =?us-ascii?Q?iIOlM7cd//9Y+MKP2fkDoSFu7kL9qAZmcQabr3JXpyLOnGIpBacWR24Kh3/2?= =?us-ascii?Q?9Djz1JjwtOcH02u8UvGRB/7/OaCij8HyUroWuEmgl0ubEpbFyskbX3VoDAJs?= =?us-ascii?Q?aTc7br/Xr3MuS9kXGOmupIKI7IptvNVDKuqF6+yqc6ohuoUDuCGBQ37Cui6F?= =?us-ascii?Q?3pEiBohYkOod7lZSYzesx8ymABxGgxyDmyAn1VDfT/Cy+ztrMp1Bj9ItkjvD?= =?us-ascii?Q?MC5DgJ8gc0RxeFdftctCbRKyyYHHm014gapSuWwZdEW44g0udVW1cdjAOeSV?= =?us-ascii?Q?2IYbi5md5dwIyL/CPVc6R6xDUywTli1/vJc2UF1dQe9qxJVpo9W+uFMVBRJs?= =?us-ascii?Q?ETlNFkdRbT7VnbGp0XQoQM6t0n4thFaOQNdPXq0dljPFfVB3MQ6BoNlH8FtL?= =?us-ascii?Q?iD704LxkWBjWTUUSULTJxMGR15gHBqLjvzwU2b+Cjz4A5EQAQldMNwMS2SSB?= =?us-ascii?Q?arWtTi5zXUmgUK798ougrqJdzdzmFQEAFThZlluatLYzTIdKfvhSHXEtFIEN?= =?us-ascii?Q?WqsqKz8uR9cu6sySBo89T4bG7EQpRPKdC7w+ak+pp+iCLLFaQt0Kv00JS/21?= =?us-ascii?Q?flizyV2seJuab0TCKlzfYyicDpxAI0vwznv7tnsIw0wM7ujR5GXSv0yAxoIt?= =?us-ascii?Q?E7LcUAQszUZabi7BccJBIaN88RAj4gMuyT6XnujAJEtc3ipRlOnojBTi38eD?= =?us-ascii?Q?T6/ziu5uqjVQkJV4t9HAA+MvhimB5Ct2dq6qZCi3cVcdF3BaCJnNmpnzu9oT?= =?us-ascii?Q?rnoxfOIzmz0HuFBCrNeHNK63LQDzjlDNJL2WSZ5fVzsRAyLJpgqKzg7HaQOX?= =?us-ascii?Q?79UxBubVtc=3D?= X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0160;6:0gsZX0HsKatQKzctxMwg+irZNozGR5BfnFzdWvG8nWOETOxmV6us/ygvdaPF1OHrvaOqIg2q+LAf85zxfqCul7hUMXKfyyi5vCCIaAswyqaub223P4Jqszug6Qd6wj7CbzO5raQs/dpWZ3uEtafK6wsMK3EOEBaBnzdHw/gCIiOBsZCxLZiQmKolVJwG2kF2PWhjxDkztcdoqlw0E52+MGzgUqoahl6dwQiiCY5LQhbruJQzJ/AsA4CF5pcqnuAdYczFd0Lt3koc8vPJYiSQwzxeJjX+45YEbxUOPyGeFWHmnOunPiZXwn4dWZqfdI6dUWdqSC7TtJRunT02/Wbicg==;5:3+T9np1TrjANp6p5GQgG74+RlASqSkwYw93Pwoim/Y+ih1PeP4rr8LgaPngLKkN65ocG9vOpKtmKU3uxIdB7KT2n30ESP8mKGBkK7bk/crKNIcviox4DEPm4koUWVBfrtQ6rAs70pUZQ71xRE0KOJQ==;24:gV5/AR9WOoLY0e5XgIz45mldI8BZIcv/qeig/vRlX0DL1rzVR4rldVPAiUiBfbwmo59kYT6leGpbjNcm334tmhADxr9mQWhYwcTx3kBO9fk=;7:cR/CjAZPOO84Unsy4sm2CXEbgnsrEBwV6Q77vNJOiFw/2RWapRueGTsIBpNsEkm75Wkmy4353baJ6srVTlLcSSml/tkkFdTdk1zr5/u3hHpxDupkd3habD8Et1YH5sLd79pmum+lmKNt5u+sCZvcgRXuOTOnn8Sg5XdMGSQAWoSMEwzdthuBbdG07qFVDCZOHY+pTllkI0bz0UnJsZyluK3y13Y3czXqlOgOJi+uFfk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0160;20:lGWIdomKnCC6LIuOg+C3EDf0EDSXvIchVwlG27DiqPbAPlED4TYyazFaUgp7xlQWCM3Y7TVCFHqcSBAWk83k1DOaSkruVcZdJRJ1v4AVHQcC8uN2eBoT3Z1RRPsuxSrCKmQ/cIDBZxTyJfScq00oZJP1Pe+Kg3aSk8mA8f36NXZg2tpICkwZwWfkpa9V+k1s47EhYbZYIe0xRGWZcDO7mABLQQeXoXzGl4tYEiXFfVyFk1v9YTHMm8b9u33ca0ZE X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Oct 2017 14:31:20.3604 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 562e2b1e-82ac-42e1-0539-08d517c73c09 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB0160 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. Signed-off-by: Tom Lendacky Signed-off-by: Brijesh Singh Reviewed-by: Borislav Petkov Tested-by: Borislav Petkov 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 --- 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