From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754394AbdJPPi7 (ORCPT ); Mon, 16 Oct 2017 11:38:59 -0400 Received: from mail-cys01nam02on0072.outbound.protection.outlook.com ([104.47.37.72]:39104 "EHLO NAM02-CY1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754024AbdJPPez (ORCPT ); Mon, 16 Oct 2017 11:34:55 -0400 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; From: Brijesh Singh To: x86@kernel.org Cc: bp@alien8.de, Tom Lendacky , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Borislav Petkov , Andy Lutomirski , John Ogness , Matt Fleming , Laura Abbott , Dan Williams , "Kirill A. Shutemov" , linux-kernel@vger.kernel.org, Brijesh Singh Subject: [Part1 PATCH v6 06/17] x86/mm: Include SEV for encryption memory attribute changes Date: Mon, 16 Oct 2017 10:34:12 -0500 Message-Id: <20171016153423.2980-7-brijesh.singh@amd.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20171016153423.2980-1-brijesh.singh@amd.com> References: <20171016153423.2980-1-brijesh.singh@amd.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: BN6PR16CA0015.namprd16.prod.outlook.com (10.172.212.153) To SN1PR12MB0158.namprd12.prod.outlook.com (10.162.3.145) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9cce8499-b420-44d1-f24b-08d514ab6ffb X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(2017030254152)(48565401081)(2017052603199)(201703131423075)(201703031133081)(201702281549075);SRVR:SN1PR12MB0158; X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0158;3:lbrGb65cHmWSYOIhAnyURJmoYTuhGXuoqDsIUDg++SWwuZIN0Q9PdG7+JsR7NF/kVNDUsYksbD9bdX9umkBshQDxFb/K8t7pyD0dG4oz3NvuGLn2D5S5AhmEcvXHs5MZ5C16QrsUQMxAdHPqGjeS70FAXxn+R0Zv6yQd2TTuQ5q4vHv5Udmb77PzzdwlRlFw4k/vVHkKc/ra/pyNhihjUG/nMVPyt9z2jDmPe4XCVopxxvNeByliEIyPwWmNgwqL;25:GhKJZTWrhUOxSrIwfkCcBvK2J3ZhK4znaG0fMg50TxCV2fWzLURCQP5C92UOLjd5V0VyeGORdJzt01Ntvr2qj0Qs+RsyonjcqmeXdzvW2J0pX2M+MMRmjZWeXktGFFAozpI7PbG8nd6O5h3Fm0VuhM8rO12A/Glsn2t1vZJsvA531+1i45cN90XYmxQd7l2DCMPG1ZB7FE22FwSOhGAvrspAqeWsKVyLl7Bmf2VuncvWQjhmJZ+rIxBKitCN8P+//0ny8hhEGs6aFugycqpRxy8A+fkJiiu1YywS+ShaCTNDOa2KoexyxmCv1rCWo2qTBIXAPhVHgPCD2zYczlzkmQ==;31:l/WBUgUo+S7xJaNNfpPjHj8kT6qpG1lLFwr7BOXPyXIeugTXvow7yzJlSZkgjS7YLD24gXvq/YT7wbwqK3UBkVHigDpA8eLSE5CVuOgtbqxJSO8Nai5W/ae72IMZtSsM8DMhdecrn1eJebtWPjbi8U7O2QCe2iNWK+2Rn2qyaizTyTRG/5sQJeFA03iIzv2olvxivfUVvTVrWnLFF0Ts3j2EFomFWco1+N7vVQX4ru8= X-MS-TrafficTypeDiagnostic: SN1PR12MB0158: X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0158;20:4UdD7Lma2KbGdcYeXxh4wYHP+9GPSQGlIBQtCrF4EBWM9/9eik9rusW0AgVAnVspf2yGgm2xfeYdYcqSZDcNn88k6GFaiL0ixKvtRSlDaKtRtiqqp5gStK2tCYC5hIFy7enROl91h6EmtjDIKI3NfKSlykX2Dbbsxun3rJ9rfsKFPPiPxTXuVu09G0TkfXA6LvL9NvPOdgdeeenpQlWw3pMvFCN2rjyVnd6GT8CxB7MA7fwa1R4/s4q1E7631cdZJ92UYPcNOa1nBIiTmPpc8ilQvghUhnMABMPY5JqUok2aheHmplky7M0d8m9J0IYCug2ShFPMfQ06YzEpt3QN9KOpCViFnoxXFVgJ7skPnMPlw96LFLdsCaV4qknm+knOcbmO+CzVfw/ETUs53GJSxgUChEWK+wRplStIoPJ3iVfeIlF64aqKz7dbSdospfSpuY+tWKSX1m7LYdKSw4al4FTU9PgnXlGmLvCFkD8x2lez0ebg+CaaRU+fhQ83F59T;4:8l1XhHF9IC6zv2q3QoykzOBU3ZDmmLWDEo7XINREz4hkrWVCcUZhewcoLdJdsb5oQ+nttT/vJPpLnDhwggZOxfuUz28RL0h7bvPb4URAtOVOBJV4h8Lz4AbHAV4jvso16hZ/QQsfes1440wOh6NHEBfOn4SIZql51M00B2jh+LAkJd1VTrQNOOqn0ZG8S0X26ZDetXJk3wfQW3UlAwSIc7SiL4eTkwemev7ZeUixYjIsoMHZDbj4+ZgYYcI0KpF3RVBQq2SNcP33gn+e1oE1kJsk6LSzan2stsudqFobfUUuCUpVl4GlE6oEOSCzrX+elN6Bqb1lnfe7niGrW4spdB9WDCYuyCU7lW9xP9FC/gE= 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)(8121501046)(5005006)(93006095)(93001095)(100000703101)(100105400095)(3002001)(10201501046)(6055026)(6041248)(20161123562025)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(20161123564025)(20161123560025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:SN1PR12MB0158;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:SN1PR12MB0158; X-Forefront-PRVS: 0462918D61 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(6009001)(346002)(376002)(199003)(189002)(54906003)(7416002)(1076002)(316002)(5660300001)(16586007)(68736007)(2906002)(4326008)(16526018)(7736002)(47776003)(305945005)(6666003)(53936002)(86362001)(33646002)(2950100002)(6916009)(66066001)(189998001)(97736004)(76176999)(106356001)(101416001)(8676002)(53416004)(105586002)(36756003)(3846002)(6486002)(6116002)(8936002)(50226002)(81166006)(81156014)(25786009)(48376002)(478600001)(50986999)(2351001)(5003940100001)(2361001)(50466002);DIR:OUT;SFP:1101;SCL:1;SRVR:SN1PR12MB0158;H:ubuntu-010236106000.amd.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;SN1PR12MB0158;23:CAlzBGXEXbg8huy+U9Zwk3kcMaXyEuEIlez4CFe81?= =?us-ascii?Q?MPryJ9j2LEJW18QlPI0VLmL9V3+f1YIcVauSv3QMGdM8IPmvCFlY2TEfb2w0?= =?us-ascii?Q?N2BTA7XEGBkUbUzUkjKOTIRwwLvKCgfFJewoMrb8WH2PnP/7goYhoPbQQjJB?= =?us-ascii?Q?puxztpFSw1F12DqK2xOXkxs5VKvdlDZbilmOrmx7yzmWXZOxPHQUAp4Pue7T?= =?us-ascii?Q?NLhnJ18aLEe5jf1vdDa2MihdYCyhwlQ4+5oBNcG6bfene+mBHsIHG9o4ZPvC?= =?us-ascii?Q?i8q8k8xffGSlt6XX/yygCGqMgTwKr/G9H89VeF4heBubiTmH+edHK8cdovlS?= =?us-ascii?Q?j+dhbyzcpW/CqEXZRdgWvfwrxTblICDIC6TqqzjRUUu49jk1bHwfsKyPutot?= =?us-ascii?Q?RYPBa9BoomeIxOMiWpPEbqCGLXverRry6tQO/9NkUBk86lXWrjAMmfhAtakX?= =?us-ascii?Q?hqnWi/lsWm2zO4Xi7hIvxZ7yhWL8FXWrSqAshNFH9YvpJIzJgpAMHpJP3+1A?= =?us-ascii?Q?E3yHNqrBAH0F02qtMtSd2uhGze/Plx/LZfLiFRF3G128Oo8H0uUJiKikEoMW?= =?us-ascii?Q?0GyXFgjors5ZzMyhZN9DfP7rFqzYyGfDWwTNsU+XFN2+DV4hRP8Zi9B92TQB?= =?us-ascii?Q?mq9UlN7AYhnVolLg/u+n8vOFFmh+AvQRRggdiVzNC/5oAtEY1H33TQC/0YDl?= =?us-ascii?Q?WPZnhmJ3SV9SLF9Z4h38uAFQaZRCgxsqVMoC58EY/a2WmqoY5UwYEeNx0fFi?= =?us-ascii?Q?AZj6HcoAzl0VyfcrTHB5P35k483Ot/8jzcjggD0fWS8iWJ4vYC7yg6Dtsy3C?= =?us-ascii?Q?lmUERJdIUJWLhtEaOs/kPFs/mETJX+eK1H4ySm8Gob7snx83z5HFsTnGHEle?= =?us-ascii?Q?q7bgWhLApYFlwo9i6q5r0ck2fDWWqixtfjO/AmcgnpFn3G+eOhldtbTix7tF?= =?us-ascii?Q?PXx5vALaYrPo3+X0o3ultZjrf0bh+vEiY+PMg4cZ8T2OjQq3SFikuHsNC2qB?= =?us-ascii?Q?vwh0r9OKsr+5GcGDGRxUZcVv+JcJIw+r2E0SSbqtz+O7kydHCyDiXL6qodEU?= =?us-ascii?Q?b4tWQtXGZXbFhREQjyHpUv8XVj84QViZYYEK7vQM+mEWDOIstCl8f3XF9XrB?= =?us-ascii?Q?7PpDDnVPWIz9s355gn7II5HbmlWWyhq?= X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0158;6:eqVHk0TY+A47MTEfizJ7LXTC53QNYaIZfKzEcG4bIgp0Eo/3N+Jo65zGoe/2UgDFgXHiq5/80IEu4P8DaVtMTBZbAwMPT5KrQ3dGiEgvYB3d+as5q2UNTGX7Q1m/GWDXVVPpigAUYzcRJsNpIZL9wmmuNAcPmqrT9RhNPfbxVgo5T5mgEBS1miP2CO8Lt5LONIHyPGTo2A95gzgr2mUlAKhj+kBKImOyh7HI4wmv2hm0FnIB5Loj26AbpRJZpJCoPm52wUyqil0KG8VwEb7WsLfU0PVCl+tEYC9k3yT4oV+Ml299TCXgNmLfn5Buj1E7YyLvG/BoupwyOyopy8kCgw==;5:jQ+j4mECFBPBWynYqFm8voP794nAjgG4vq2ytnGomsqHAuIUZ7aZtaevlgB8jPTqr/XCXVhxol+TKPLO4IN69F/OWq8Qbz1nfwjw15ZrcdIv55DKA3IVUBUKrF1SOLMqj9TSMxQrs7mNLpPMkstOvw==;24:490Rtxhju8vcSfO+U64RJ9rvCjs6KtXRdrhpEq8WZ6weMpFCqP2b37H9+8tiGT664UXnxDgK3SPB6mDZ52bsR0j95774pzbf3ly953WrxBc=;7:bYrqm1t/8eTVpbdKTrbwcW2xFNRXHD4IHgifHXKfgZTn6z34LQLqquOmIHmsMcq2n5mOynp4R5OgixzaMzeOteM7vtvuJyLS4e1yjeSXbbzpPXiGQLjMmrSuiPEkd6wiSYNM6ba62OD08GcLLZLGc7szh3d8HXV4OTAk12Y69DZTW6Hs4AycbRgAq0uTp3spwglaEscR7FcXbjw5tLTmLyoQbtq9YtzHaD+pMlN/EXk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;SN1PR12MB0158;20:QPicGYcglvdmxFYUpmjI7bF9+RtVzfGGqOa63YeMZNRcLAXKK9hakB+uljrts3e9Yw9fd32rhnRp9oTAshF2yo8SgTLDH/TmFVM+rWFa8ESGxZ5sTFGQKyHV2Qqmnwk4aUf+l3Bx1sSofGagCGGR34hFo+WnK34SxKyak76f3mmr9Y5W8H+CuWIcK8hTgd2y80AQlxItZrPGJ1Fc2qOgr37ebIsnCdhewpipz/dljnbV4zpcgoNs4EoMtP4XONog X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Oct 2017 15:34:48.1820 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB0158 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