From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753291AbdF0PJV (ORCPT ); Tue, 27 Jun 2017 11:09:21 -0400 Received: from mail-co1nam03on0068.outbound.protection.outlook.com ([104.47.40.68]:12832 "EHLO NAM03-CO1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752744AbdF0PIS (ORCPT ); Tue, 27 Jun 2017 11:08:18 -0400 Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=none action=none header.from=amd.com; From: Tom Lendacky Subject: [PATCH v8 RESEND 04/38] x86/CPU/AMD: Add the Secure Memory Encryption CPU feature To: linux-arch@vger.kernel.org, linux-efi@vger.kernel.org, kvm@vger.kernel.org, linux-doc@vger.kernel.org, x86@kernel.org, kexec@lists.infradead.org, linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, xen-devel@lists.xen.org, linux-mm@kvack.org, iommu@lists.linux-foundation.org Cc: Brijesh Singh , Toshimitsu Kani , Radim =?utf-8?b?S3LEjW3DocWZ?= , Matt Fleming , Alexander Potapenko , "H. Peter Anvin" , Larry Woodman , Jonathan Corbet , Joerg Roedel , "Michael S. Tsirkin" , Ingo Molnar , Andrey Ryabinin , Dave Young , Rik van Riel , Arnd Bergmann , Konrad Rzeszutek Wilk , Borislav Petkov , Andy Lutomirski , Boris Ostrovsky , Dmitry Vyukov , Juergen Gross , Thomas Gleixner , Paolo Bonzini Date: Tue, 27 Jun 2017 10:08:02 -0500 Message-ID: <20170627150802.17428.331.stgit@tlendack-t1.amdoffice.net> In-Reply-To: <20170627150718.17428.81813.stgit@tlendack-t1.amdoffice.net> References: <20170627150718.17428.81813.stgit@tlendack-t1.amdoffice.net> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: BN6PR03CA0048.namprd03.prod.outlook.com (10.175.124.34) To BN6PR12MB1139.namprd12.prod.outlook.com (10.168.226.141) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 849b5259-4f56-4c7a-6247-08d4bd6e5174 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(48565401081)(300000503095)(300135400095)(201703131423075)(201703031133081)(300000504095)(300135200095)(300000505095)(300135600095);SRVR:BN6PR12MB1139; X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1139;3:jbQlasXi066cW518QClt27HZ+5czjawg5j+DD8pGh/updr195N2FJmG1BIG+5gXyoOSAMxh4woKiZNtIIoMZhQtj4MR2Ihz7Vj8WFk4Cfll0bPsRJnDgM2Y65gTCnwlU1/7xA27YagLOyuND2FcAozOZhBFtvuCRC2F3n0eXjtelc2Ayp7V/TV2j1LSvExCFdp2q3oL2DzkSVotMYffyLvUH9sr91NePmo3ej0WIZAPc2o6eIivbf1AmcZI+iGG6Q+eJG52vCxq44wh6hnagxdxoECrkY9LB7x3nUoQ4O3oXrlfScq37Vi47Qbo9gO4wp6fD0cjEldSg6qX3qd1j5aboxtcnL6bDUaUu2EbHkxP6Ro+KyN5yLzS2tZsVQ1jws7HWu5RME35UMK0TpDTRCimrhTbbufezYMZZ06VL8+YFl++Gm5P9+HY3TAhROkAWGJ7dCHRxUy6znjxS1+Oirf+743HhAiPkd48K8oFRs5MyP0FbphX1RWmMS0I8BGqOoSxuW8F0vSnPjelO+MNzdAgrqxETY0Fh03XSpzo3UC9sA3zNGqtFFWGXyY4r8oumlVn74YFrcBqhnKdvZz7baK/CJyLzHbXb66Sr95aSBSCvstrENZwD1U4xtbIXasxVtqa2g+SYCnpKeVNQTfo6G080JCNRMtXX0EIolqRUA4TD+9Ejo5D8yl5m+1SPCVb6H0qUaM1gQzWRUbZvYApJLA== X-MS-TrafficTypeDiagnostic: BN6PR12MB1139: X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1139;25:HPwdcH+gCpG02vJQsMjaUUEcHblQezy1yhnA+kp7sVuOblQkSN60YQck12L+WRoy2o8D7WuSCOMdUNYSJABhwL8btLdozKw+hsWuEz3zlY7EpIWBwuP8yhV1r2tuDnkU8Gmoddqhb9qUzXVFYqBxmGRfZCEFln6PUzGv5f5UjtFepUm+099Kbg9F9AL3P8oTF702WTJdfHtJ6km9VY0snf1h37Y30+5UI8eM7lcK8b3pRtkZAOKee0AxU45QxKUHTXSpH/8+b1+kLtIHjY124yi4ohFJ4QQzsUpj0gu2/tZgM7to/LL2CeB0QtQD5YCTYfaZzdqy52SR6Lsczd251e/XI14CT3HNvVYI3Pl/g4C7JC/215sjvV3RHLBOjfbPwpnBSO2i6kHJe8p7NtJUT/p5vpBMVXEgaf+6zOgliVR2zbkfl6sMXjOxfkxs7O3UJwtkqZ+USp0gssfvWfAVCoRTkECTDcvrJ5WezfWd4YS4bTn8tAOGCJcxDzuLRPHQr/2nqbEpLFUfBYaC2NAGEcKheD9mNxpRQBkl0alOfqqRcgJXj5GgCWU6RZy3UFMVFo+LdVc4JUpmX90JK8uL/OxBdpmMJPzVhds9Y+ZoPwAOQdI05H9BF6aTj8Ydonc9SjfxV//CkcGOG+FQGrY2Jl5wDOxzoYRqiLGUdQD+Daw3bgneYiY/d22pvjwkbwreRaEd4nRkdlVD7aun3/cRb0zz4DBYq29WYq/XqjzaXhN6XmrnYMg1HzQap1dPx8+tUiWF+lZh8fnvxnAp/6Psfj+IP1KQqWcxTv1aDnsazEKVdSFEzq9Opttk5d/h8fRK/DikzyalqxVc3tK+GKdOOrkerRoerQpt5jKns2Ij9inRvGiSjYPYUJYak/nm4pKplO2fMLKA6fjvoZwLapgHlS7WKjsqPz7CdZJ8XO2BlRM= X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1139;31:pggntAe2mDRxx/UoTADLOpTfRN3rDs2cuShm9RRuTJH3yzyYaxzjrDRWNKppAaK1nderPas0WfngRWcBiu4fqLq836qZ5w+PmKXgXAfZwzn/yjc9vrQFZ7Jd3QRjQuDtgvQ0Yn34KMV4UNdqymBVmx39EY7a2gIkrBjg0WjrsFPUGpoykt1zvUl40961q/0yiPiruTLE+/VCvJ8Q97dQkiwG3BdIOqsZGH+kBrCPZnhz9Ech1T9V6O66K7SGyqhYfCMT/Ez/evK8aMlPwz6hYNMpebGApAX7pbHxTQoT6ZSNxhEYb+ifFoctrLY8wOaT7Fr4pCTepOWW4hUu8YqMTfUxwWFAR48ozfMpCCKpRcwI937bErDelHsfo3qkaZVt2b1a/2mbeKKoVOXTtfMP8ZK9AhA4hQiU2cmEfgR/dqi5vPKewOtR3MiDi0/7T40X/ECu+c4A6Y1N4rUeflB7SbMssEuCLHrZCFO6buaXrekV+BKoyfSgQUUKa5ng9kYKH9yTRy1tAqYaYJnQDuOgAYqowcNs2/hwsHhQHq79IEF7clpkotgC9GC7vqpT/LHzYaeev+QAaxawBoFxWW34AdrP3p9lBQY43Pw+uTATK7rGCBbjcys8QevWCMyPyFFflL6BUHVTwxbkYZCIgvom0y9GZBshN+nZnHLZAtydotU= X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1139;20:7Jfyi8VPf4Tfxp6Z2l7MRWNDUw4b+VH186xu/3fdrdYpC/DUVG9MK5m6vvMMDvpSSFTp7dgeFyaOAgIyg9CYJW5yTRnvzyx9zvs6dzjREYQwnUoUMeBruDzsEIjykC8LyUUfVuCAqBmkLWzl/jlDqQyB7UfTixRRWByI4/2zHxjuYou5E4Tjs9c5pzuE6cMegUGsuoyHuAB6cOGqPJ1JdeQ8XP2flD41tjHn8KhnpWJ67nbNd45kEuJO/vT+r7303NmH5yDjGKI8lw4fn1fKPr0YsU28RhsCEkwhwzPSPX1iZsw/f//kAYIXjNIkxr+12LK+xc8o4k4TPSKAyn+IL+2YhGVjFJQp3eoOMdQUsnb8dIrsWswW1UZCPzG67uphIkwmMKT0cLzLQWsYdquMLe6rHBz6IvvG8wrrrYHID5iSIjjoLcB1AaKoG3d9GyOq81qtfhhwyWpW91axfdTiWvmE03zSN01TMIxFhjMORe1fk12SJHWzynUq7rUeTKhK X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(125551606395959)(133145235818549)(236129657087228)(767451399110)(167848164394848)(211171220733660); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(5005006)(8121501046)(3002001)(100000703101)(100105400095)(10201501046)(93006095)(93001095)(6055026)(6041248)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123564025)(20161123558100)(20161123560025)(6072148)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:BN6PR12MB1139;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:BN6PR12MB1139; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtCTjZQUjEyTUIxMTM5OzQ6NTVXQXFmdVRjNU1lNGQ1U0t4L1ZxNWVwcm0r?= =?utf-8?B?YkZtaUROeHZDcjBFZGlpTkl4aGcxYkVFUkRnQVAvWk9Nb1ZRdFlSWWxkcUNv?= =?utf-8?B?Tjl0S1ptN28yZDlIaEdMQ3pwOUtiN01jUVRNdHlKdWxNUFpGTTE1SG9kQjVC?= =?utf-8?B?K1d1WWpINkZOV3pnNTNiVE0zVG5WaEw2dWcxajZOYzlndzlGSE1rS1ZkeTl4?= =?utf-8?B?dHRTdXFiYmN4Z0RwcDJFSFZBU0ptNnlKY2lMbU1aeHVMaS9Mc2tpd1JUc2ta?= =?utf-8?B?VUN4MXZ4TlhlbDVJV3h0VDJQelJHY2JJQ1FDWGtUMWNPS0kxYUFmb0d3UkFj?= =?utf-8?B?NEZYRlZGU3ZWTndNZWRvclZ4N1poRzR1amJGWDROR21uYUgySnJJa2QrK0ZZ?= =?utf-8?B?M2x6MGtabmVxR0NnM0pMVHFxeld0cGsyaDd4eTJ6QVJRRGNhL0VRbEM2Y0hH?= =?utf-8?B?M2JhYjhwVnlNSnpIZTZucFRGRXN4YjdUWEZkZktpR3BzcE8reGM2clFDZWl4?= =?utf-8?B?SS90bER6VU1iTTRrT0txRHVqbnZCMmw1VkZUbWErRjZjZHdOR3JIdkFXT1FH?= =?utf-8?B?Z0pmNXp2SWkwVEJXQ0k1VG83Y3JBSXdzNXNqdlA4RURRZnBVUkc2SVJ0R2hi?= =?utf-8?B?ZHljYU01dlEvekc2TVNKQmZMWHU5Z0VrMCt0STEwUFQ0SVlla21OUUc5V252?= =?utf-8?B?UzJwTmRoZWhQcHkwYXdFT04vOUJQaGRBUi8zUHVzaGU4cUI0L2RJWWRscUFY?= =?utf-8?B?QXB2OGxjQlNoSEJjVGZFaHJ0VE9kNzBTeDl5TDRDWHVlZHNXMzY1blVvc2tv?= =?utf-8?B?WG1kMkd5bVZQdlpmaVFvcnI4VmdIblJ4MXVYUGVPaVp5TDFzeGhib0U2cmF4?= =?utf-8?B?WFFlaktYLytIeFh5bjJmOWhnOExzbnN5OC81MlVGSTJIMVF0QWlCeDY1YjR4?= =?utf-8?B?dTAwK04wWExJbmdaR0ZpUFdMeXZkeEFsUUdXd1d5bkdZa1FRNW05MUFRemtu?= =?utf-8?B?SWN4L2s4TWRNVEhNMXBmQVdyTzN3bnZFdGVmZ3cyV3ZHMW9LNXRCZVVxMGV6?= =?utf-8?B?SlR3dTE5RTdPeGpjN2NuKzRGVm9SdmZNbWJpYXdGMlpIYzNYUXo1Qm1PUml4?= =?utf-8?B?UWMyaUx1NkdnbnFRTmIxMFhuOTdZNm5IbGl2VWRVekY2d2xTSmphRjJXSmlz?= =?utf-8?B?aWdQQVRDYzRPNW9zQUx6Y05lQ3lOYy9hQlQwVncrUkYxMWh6Ti96ZUdlS1d0?= =?utf-8?B?YlY2aXhnTjd0eWNMbnc3NlhjaUR3V2pzaXh1QW5STzRjc21oc0F6L2MydWR1?= =?utf-8?B?ZDhHME9yMS9IbGtmSGFxVzRaZHE2WlB2TkRmSmd3OGJ3bEREeGxBRTYzRmNq?= =?utf-8?B?RU9XNGpjT3ZDRmQ4ZWcyRTZwSEIyaDZDU2w3ZlV2bTEyWWtDNUVqWm90LzRx?= =?utf-8?B?WXJGUnlJZUwweDkzbm9MakNZck5UL2J3UlZtaWNTbEJ5VDJJL2YwN2Y3ZmNL?= =?utf-8?B?N2hLb29hU0h1UDRaeG4waDhhSDJuQnVDYU1ML1psUzlXZFJRMWFjbmxsN1hp?= =?utf-8?B?THl3Z3hlUzJBbzkxcEZvV0ZZWVhsV05GVEZMM21rQ2xZbWU1ejJqc2lpZCti?= =?utf-8?B?aFA5NUZXaXYyNHpMbFZTQndmbk1CUjFlYXcxM3NrdWNBU1d3eEQ2OEFHMlFj?= =?utf-8?B?YWFJSDN5ZHN3MTQwOEpUZnhWaXYyZ1RXN0hvZDhsSUM0ME9XeStSd0FEcjVo?= =?utf-8?B?Mk1OZWpaaVJWbTBIY3lFNU93T3RWaVIwZGVuOHIvTmtrNmtCbHBQczZhQ0lL?= =?utf-8?B?dEkrOUxibElEbjRhMkdHT0YreENPTUd6S3dFZUNLa1NIZkt4L1J3MDM3dk14?= =?utf-8?Q?xH5hJektpo=3D?= X-Forefront-PRVS: 0351D213B3 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6009001)(39860400002)(39410400002)(39840400002)(39400400002)(39850400002)(39450400003)(2950100002)(6666003)(4326008)(81166006)(7416002)(7406005)(6506006)(1076002)(25786009)(6116002)(2906002)(3846002)(55016002)(54906002)(9686003)(53936002)(5660300001)(86362001)(76176999)(53416004)(72206003)(54356999)(230700001)(47776003)(189998001)(50986999)(110136004)(50466002)(7736002)(66066001)(103116003)(83506001)(8676002)(23676002)(4001350100001)(478600001)(42186005)(33646002)(38730400002)(97746001)(305945005)(921003)(1121003);DIR:OUT;SFP:1101;SCL:1;SRVR:BN6PR12MB1139;H:tlendack-t1.amdoffice.net;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtCTjZQUjEyTUIxMTM5OzIzOlh3ZE50VlNYSGxnekhWbHg5eW9LU0xENDBy?= =?utf-8?B?YjFuZi9Rd0o0eUdJYm1LUWpCcE1wVkZoRUVPSkc5azQzcFAxa3ZRK29uQ3p1?= =?utf-8?B?L09kcWk1cktpaGxETzZuZXpPY2ZkcjZuNXVjZEhHUFoxRURHTFZPaVZmSjh4?= =?utf-8?B?WFl0d3M2cmVQY3RxK210Qk1FSHMwdGJVVXJGRTVPbVZCZU9HQ3ZBZElsY1Yv?= =?utf-8?B?ZGpZRVE5ZGVnSUJjRHg0NWdMN1pReWp3M3Axek5BUytZcjRZWWpwUVgxc1BP?= =?utf-8?B?Nm1ySTFsOVhibzdML1JuejY5Wk1hOEZOS2NXMXlxanRKU2twU1dHTllJRVQz?= =?utf-8?B?Kzl1ei91U2dHdU9QNmhUKzRlMHZTWE01MXFYbXcrb1BxNEJqQmdPMFhVYTdx?= =?utf-8?B?ckRLSHc5Wk5GNkUrV01JdDFnVm90bkVqcVpiSFlWSytGbENsNUtjWFJwb05x?= =?utf-8?B?TTg3NW5NanorMldkRWE4cTBKY3lPVzVjdzZTbytVaVRiUW8rNGIxUGFwNkND?= =?utf-8?B?R3lXaTZydS9iWHNVM290YjJNMUFyNmJtekRMNW8ycllORU5rcWVBUEM0Y0xx?= =?utf-8?B?alBVaGVaVDNNbXhyVExzbzdJSGwxb3BhY3F0YUR3S1kwd3M4c1RJb25EK0dI?= =?utf-8?B?K2xsTVhtV1hpTVdSU3V6OG8vbXVacm9oSldDNnVxd2JpWnptb0dtU0k0VU95?= =?utf-8?B?ZGxMVVdieFhSZ1kyaVNhYXhyL3dScm8yeFA3VmZsV1JRaXZOVVRrS2pjcWVV?= =?utf-8?B?MHdINVdFa0I1VXpvV2F5VVJoVjZRQzlPOVloZFgyTVdNckV1TnJNV0dTUUx3?= =?utf-8?B?eWttUTVrRmFicCtTTWRySzQ2TXFuaUNuMlFzQW1sRjVKY2J4OUZnd2pPdU1D?= =?utf-8?B?eXYrMVE1WTJOaUtMM0NyUzFodzhTdm5WSm1DYXlnLytmQ2dFZkpHTkU3eGRJ?= =?utf-8?B?R3R5V3BsZnVJa1drcXJaSUVoT3IzWEhMWnBKbENWSjQwVjQ3alNCa0JuTFBC?= =?utf-8?B?MkdsdUExS0FMNVBEQmNZcGNyS09xV3RwaWh4MVM4SGF4cWJId0JydDFIN3BJ?= =?utf-8?B?Rng4RW51VUJ6K1poZTVDdzI1a0Rad1M5MmRvQVlNR3IrWFF3RFQ5S3pjMGNM?= =?utf-8?B?OXdaTjZDVEpWbDYxc2kyQnNheVMrQlJwbS9RMzhJbi9pQ0poRWdGVG9oT1Y0?= =?utf-8?B?S3lxaG1pc3MzRFFHS2JzTEh2cVpYRENuSE94dEsrRmNRbGRVRS9XdW1aWmVy?= =?utf-8?B?NlJDOG5TT0JEMHpReHFmWTA2R0NXOERUckFHWXpZQUl0T1ZNaGk5VTF0THpM?= =?utf-8?B?cUlkUjd3QkZXSGRSWHRaMzlOSlBqNVErRllJbUJNMnF2QUNwbGpoYVdyVHk2?= =?utf-8?B?VUd6cTlIOU1MWmVhdDVkL2dlMDJsUWxqQ0wya0FOeWZzQTdGZC9CN2pEdWdr?= =?utf-8?B?UUNRaVVGWTlQYW1JTVo2cFBnb0RkODROMnQ0K2dmcktBbFhZUUp3S2JkMFdy?= =?utf-8?B?MFFNQ0NGZ2Q4bHVVbktiU3UrT1RJQ0dsUFVISWNoUHYra2psWUN6Rk5abzAr?= =?utf-8?B?eFFKUmJMYlAwR3FGQWZmMm1BK2x3YUwvS0V3Z0hvZzlBUk0xdnhDOHhXb2F4?= =?utf-8?B?a0MyNFg0TTlaU3VJOUszWTIrbDVZNXdrdjVxV3d6ZkZFM3p5SnRldjlMQ1By?= =?utf-8?Q?NAo25cnJh85qEdiEMQ=3D?= X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtCTjZQUjEyTUIxMTM5OzY6b2RyK1hqbFVNNS9kNC9vVlcrR2ZhSGdnaGJx?= =?utf-8?B?YWVmVzByYTB3Uk5tdVp6cWFlM1NzWEU0alJ1bXJJekFvc3VOZVpLYjRUanRx?= =?utf-8?B?RGhHNkwyeDV4QVNVaXZiRmtqTWZSRnpKNEp5bHdxb2RFRDAyUVV4ZXZIRWtQ?= =?utf-8?B?VGxHSnFNbzRzdkJELzBzWVVIUmNMNXl2MXB4cGJkWFdSMTlmVHVGL2twa3Fq?= =?utf-8?B?Vi9kNWZ2Y1FnbkNUYVk5RVF4UE1GSEVkRnowWEs2TFlKUHkrT2FsdXhYb3A5?= =?utf-8?B?dUtBcmVlbS93R0VmMmlXQ2I3QVplOEFONFRiVi9QcXpNV3h1Mk1IRlkvWDlz?= =?utf-8?B?SXhQcHJVMnhFRkhMREdvWjVFZVJldmNDSmFaZG1BcGdKRWdZSlZLQVpOanl0?= =?utf-8?B?MVp3MlI5V1dKa3RRcDdBRnlMSUNVejZDY1ZwbDk0NUllMnAzRmxkVlBKQUV1?= =?utf-8?B?bE4vSExmcVBJVm9nUlEzczRjMEtUdnE4U3htbDZzdlBINk5RWUxVWjJKYTY2?= =?utf-8?B?QXl5VTBNUGtMSFE5elE0TVZZcUZRY2FZbmtqQVhKVXA4NEh5ODNWeGd6N2FP?= =?utf-8?B?c2VBSlpLMGY3Mlc3dHFKcmt3N0RjVmtBV3lETTlENGtEZ280aDluejVtVzZ5?= =?utf-8?B?cmNMUkluQ3hINm9hcHB4V2kyZUM1eXNRblFRK0gzNDF6SDA5ZGZMZHFKR0dP?= =?utf-8?B?eitYQmVGTkw2QnBVZnhVQkxBN1lSZTJqbWErVzJFTTBuTFdYaHByWTJtQUc5?= =?utf-8?B?TGdPUWxTQ0dEUjlkU3dRWWZSVTVZMmdJbmVIb3JncjZQSEd4WWxPZ08xL2Nj?= =?utf-8?B?VHZPaURRa3UvY0d0UWRKd2YxREJ2UFFIMXZTakU2bWNDcEtBY0dzOStZYzNn?= =?utf-8?B?ZFQwQ25SQWVtUmlZMkZsWHgwcjVmV0V5RTRyRUxYNVRaZ2QxWE44S0FMUERV?= =?utf-8?B?V3FFL0U0VUVGaVBCdjBlY3Jtb1FiTHFCVFdLL214RG9PZGJhQnk5aGNsZTlR?= =?utf-8?B?NWxybk1hc3F6NDllVGFVeUtmYXJNaVZXam9lYjBmSW5OSFlHcU0yRTlmbVpM?= =?utf-8?B?bFBzeDFwRDJGeCtQWFpqQ1lFdERYR0wvMFJidWlZM2JPcGZ3ZStOaFJCRFZD?= =?utf-8?B?U0xwZktXME5yTGRmZzcvZVZrdHZreFdFeVA3YVYvVkZBVEROT1pBcXdRTmUy?= =?utf-8?B?bkdtU1Nwd2hSOTJ2Vnc1TkFTWExCd2VWeTd5WjlZdkFjWmxVbjVmdkcwdVpq?= =?utf-8?B?ZWlVUDVFd0FJNG82WWhCQUpqMWdOVUE0R2ttLy9rUGlickJHNWFEMGxEYTJp?= =?utf-8?B?TGpUTDhrTDJwWnU5MHd3bGgwczJWcVFOMEZHdW4ydVlHMjVCV3YxZ0E3RTN5?= =?utf-8?Q?20bcM0O?= X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1139;5:k/dGIJJJ8tDUm48CyIpX+LTaa1ED57quyifXw15o8TzMIkjtdFFTbOy6tD1eHUaWQCuaLrZPTsw5OuCxCfgiNyO3g5CNjmBAAzMqxhN6iV13m1c9NLRKOEbjmXehIrZFnK0qDThpbVx0YK7WkBi770iFk+M8CYkAwGmmRsrxUhaFzFVt6Z3u0C2GnsuIilS0rWUfewRLXjqoVU/KgP5gk30Q4/48+Rfhs9LAhalfu9o378WQr+Pp1fUICz6PT69U3s4RfjxQJC9tvcNQljjGaj18cVa9guoVEp6es0kvAFTh3JvUrXCtssTZZV5nkHsreiWBa0v3rRuKHt4ZNsETBNpit7PEvusYc+EZgRTWSFVjBL/ToVNDHjDN4ntRkjOER/wY1+4v2wvboXiHlZvU7lLoitsH6m2sSYX0mytPwti4JJ3w2DS4ima02j2vXhRaNMlapyZQsM28EdiwhMVgibTJMwY49PAlwb/sFtwCi5iRqY7+j6K/OSRqRBqQd6AH;24:wTP9f5pcMtJdu6voYLhKhWNO/joIHCQmNmTVOsvK/F5zJswE1B7TLcZQL98mBUus5j8AocJ+c7s6ZtQvEaYRBb92brLQ3eigCp2VqnZW6FU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1139;7:KOWpII7dhuuwMWGKYEdE2Ud/eJlOfaFYk3wG1XvuCLKCzo6+DEo+WV+WutTUXKT4/eG3z9Illq6XZ0QG8xLwHwPlRJ6nwJ/I0KQr4bdYLgcb4+ckvBd7bk5a2x6C2U+MCwKfvK2TWUyoa3xkNeGRO+LPWdBALOOabWzGh8nuY9n095kbZ5SiZjEF9Phj1/Tc5F2BIPL/HSaXQ5bQUQSkQ/B1hUoIsximCczz3Y2Ax+u1HPfnC4vH4ebZNqTftPDJS5Wcxgn/rA9x117hKt0SJ6psMYArn51FZdTCaGndwHbkznLWowPRraXxNF2Ka/w69SFtd5l8EUGG2R+FqXCufjrGOf1i9EDA+f5reeF9lIsCC4ojFuCPbHixJIAxeFQ8/AwonEguFK8nidBSRo2PzXq5S2f6nLgk0N4+J1addY3yuX+DSxHHjHJ7E0V6EIXsuN9LmtzoThmY35DQmIUo2oFZ9wqIMyluGL/G+HtcfASzn/O+lHqHOYwoHd+2NJKy3h+aiki4NRkG0jnRzcAIfWWs2zvoZkB+2X3tgOGn7FkSrVU3yQINcC1QUs0lG1VDgLIHGwiONvlZPAQPdWot+ZyE+C90p3yEHTdY+GAqDO001g/PzyjMweYL4hr4VFiS9twuOqXTXascVB9Alqq3yOgeFA97aIFQjU+MHOJxprY67amz3+meOq47qE98uw2EFoTnKA80GFkwb0BJKUhlrYhty+bs0JjjH8Kb7eABTLt8KNOU0rAia+iXWTtL/rcb93k6JHcPsGsZ77xwueukjG0AuCFLUaA2L+mPQVNVS7k= X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1139;20:dnrRqiXbkwwkvhucK/XPttCBJAbLDnb+MdAl0HFBl6GWZwyuI7uo7YJmbqH5Dslcm5L/i69TSyPE8nIxUh4gcOhlG/NFqfpOSNZF3wFEJFVxf13Vli9xhd1vCHqX8ZG7YNBBIsQ0FInoUgntgynbsr+J1LqkI8UqQ2nmTPEf2i/yqxqjpXP56q4t4WPLBKKwMFhvgHUHxZnC+CNpBvoqDfyf+gYJgOOXKj7sG9WfMt3sCU2f5IWPnpDVTnT2HLp/ X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2017 15:08:06.0622 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1139 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Update the CPU features to include identifying and reporting on the Secure Memory Encryption (SME) feature. SME is identified by CPUID 0x8000001f, but requires BIOS support to enable it (set bit 23 of MSR_K8_SYSCFG). Only show the SME feature as available if reported by CPUID and enabled by BIOS. Reviewed-by: Borislav Petkov Signed-off-by: Tom Lendacky --- arch/x86/include/asm/cpufeatures.h | 1 + arch/x86/include/asm/msr-index.h | 2 ++ arch/x86/kernel/cpu/amd.c | 13 +++++++++++++ arch/x86/kernel/cpu/scattered.c | 1 + 4 files changed, 17 insertions(+) diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h index 2701e5f..2b692df 100644 --- a/arch/x86/include/asm/cpufeatures.h +++ b/arch/x86/include/asm/cpufeatures.h @@ -196,6 +196,7 @@ #define X86_FEATURE_HW_PSTATE ( 7*32+ 8) /* AMD HW-PState */ #define X86_FEATURE_PROC_FEEDBACK ( 7*32+ 9) /* AMD ProcFeedbackInterface */ +#define X86_FEATURE_SME ( 7*32+10) /* AMD Secure Memory Encryption */ #define X86_FEATURE_INTEL_PPIN ( 7*32+14) /* Intel Processor Inventory Number */ #define X86_FEATURE_INTEL_PT ( 7*32+15) /* Intel Processor Trace */ diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h index 18b1623..460ac01 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -352,6 +352,8 @@ #define MSR_K8_TOP_MEM1 0xc001001a #define MSR_K8_TOP_MEM2 0xc001001d #define MSR_K8_SYSCFG 0xc0010010 +#define MSR_K8_SYSCFG_MEM_ENCRYPT_BIT 23 +#define MSR_K8_SYSCFG_MEM_ENCRYPT BIT_ULL(MSR_K8_SYSCFG_MEM_ENCRYPT_BIT) #define MSR_K8_INT_PENDING_MSG 0xc0010055 /* C1E active bits in int pending message */ #define K8_INTP_C1E_ACTIVE_MASK 0x18000000 diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index bb5abe8..c47ceee 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -611,6 +611,19 @@ static void early_init_amd(struct cpuinfo_x86 *c) */ if (cpu_has_amd_erratum(c, amd_erratum_400)) set_cpu_bug(c, X86_BUG_AMD_E400); + + /* + * BIOS support is required for SME. If BIOS has not enabled SME + * then don't advertise the feature (set in scattered.c) + */ + if (cpu_has(c, X86_FEATURE_SME)) { + u64 msr; + + /* Check if SME is enabled */ + rdmsrl(MSR_K8_SYSCFG, msr); + if (!(msr & MSR_K8_SYSCFG_MEM_ENCRYPT)) + clear_cpu_cap(c, X86_FEATURE_SME); + } } static void init_amd_k8(struct cpuinfo_x86 *c) diff --git a/arch/x86/kernel/cpu/scattered.c b/arch/x86/kernel/cpu/scattered.c index 23c2350..05459ad 100644 --- a/arch/x86/kernel/cpu/scattered.c +++ b/arch/x86/kernel/cpu/scattered.c @@ -31,6 +31,7 @@ struct cpuid_bit { { X86_FEATURE_HW_PSTATE, CPUID_EDX, 7, 0x80000007, 0 }, { X86_FEATURE_CPB, CPUID_EDX, 9, 0x80000007, 0 }, { X86_FEATURE_PROC_FEEDBACK, CPUID_EDX, 11, 0x80000007, 0 }, + { X86_FEATURE_SME, CPUID_EAX, 0, 0x8000001f, 0 }, { 0, 0, 0, 0, 0 } }; From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tom Lendacky Subject: [PATCH v8 RESEND 04/38] x86/CPU/AMD: Add the Secure Memory Encryption CPU feature Date: Tue, 27 Jun 2017 10:08:02 -0500 Message-ID: <20170627150802.17428.331.stgit@tlendack-t1.amdoffice.net> References: <20170627150718.17428.81813.stgit@tlendack-t1.amdoffice.net> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20170627150718.17428.81813.stgit-qCXWGYdRb2BnqfbPTmsdiZQ+2ll4COg0XqFh9Ls21Oc@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: linux-arch-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, kvm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-doc-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, x86-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, kexec-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, kasan-dev-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org, xen-devel-GuqFBffKawuEi8DpZVb4nw@public.gmane.org, linux-mm-Bw31MaZKKs3YtjvyW6yDsg@public.gmane.org, iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Cc: Brijesh Singh , Toshimitsu Kani , "Michael S. Tsirkin" , Matt Fleming , Alexander Potapenko , "H. Peter Anvin" , Boris Ostrovsky , Jonathan Corbet , Radim =?utf-8?b?S3LEjW3DocWZ?= , Larry Woodman , Ingo Molnar , Andrey Ryabinin , Dave Young , Rik van Riel , Arnd Bergmann , Borislav Petkov , Andy Lutomirski , Thomas Gleixner , Dmitry Vyukov , Juergen Gross , Paolo Bonzini List-Id: linux-efi@vger.kernel.org Update the CPU features to include identifying and reporting on the Secure Memory Encryption (SME) feature. SME is identified by CPUID 0x8000001f, but requires BIOS support to enable it (set bit 23 of MSR_K8_SYSCFG). Only show the SME feature as available if reported by CPUID and enabled by BIOS. Reviewed-by: Borislav Petkov Signed-off-by: Tom Lendacky --- arch/x86/include/asm/cpufeatures.h | 1 + arch/x86/include/asm/msr-index.h | 2 ++ arch/x86/kernel/cpu/amd.c | 13 +++++++++++++ arch/x86/kernel/cpu/scattered.c | 1 + 4 files changed, 17 insertions(+) diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h index 2701e5f..2b692df 100644 --- a/arch/x86/include/asm/cpufeatures.h +++ b/arch/x86/include/asm/cpufeatures.h @@ -196,6 +196,7 @@ #define X86_FEATURE_HW_PSTATE ( 7*32+ 8) /* AMD HW-PState */ #define X86_FEATURE_PROC_FEEDBACK ( 7*32+ 9) /* AMD ProcFeedbackInterface */ +#define X86_FEATURE_SME ( 7*32+10) /* AMD Secure Memory Encryption */ #define X86_FEATURE_INTEL_PPIN ( 7*32+14) /* Intel Processor Inventory Number */ #define X86_FEATURE_INTEL_PT ( 7*32+15) /* Intel Processor Trace */ diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h index 18b1623..460ac01 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -352,6 +352,8 @@ #define MSR_K8_TOP_MEM1 0xc001001a #define MSR_K8_TOP_MEM2 0xc001001d #define MSR_K8_SYSCFG 0xc0010010 +#define MSR_K8_SYSCFG_MEM_ENCRYPT_BIT 23 +#define MSR_K8_SYSCFG_MEM_ENCRYPT BIT_ULL(MSR_K8_SYSCFG_MEM_ENCRYPT_BIT) #define MSR_K8_INT_PENDING_MSG 0xc0010055 /* C1E active bits in int pending message */ #define K8_INTP_C1E_ACTIVE_MASK 0x18000000 diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index bb5abe8..c47ceee 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -611,6 +611,19 @@ static void early_init_amd(struct cpuinfo_x86 *c) */ if (cpu_has_amd_erratum(c, amd_erratum_400)) set_cpu_bug(c, X86_BUG_AMD_E400); + + /* + * BIOS support is required for SME. If BIOS has not enabled SME + * then don't advertise the feature (set in scattered.c) + */ + if (cpu_has(c, X86_FEATURE_SME)) { + u64 msr; + + /* Check if SME is enabled */ + rdmsrl(MSR_K8_SYSCFG, msr); + if (!(msr & MSR_K8_SYSCFG_MEM_ENCRYPT)) + clear_cpu_cap(c, X86_FEATURE_SME); + } } static void init_amd_k8(struct cpuinfo_x86 *c) diff --git a/arch/x86/kernel/cpu/scattered.c b/arch/x86/kernel/cpu/scattered.c index 23c2350..05459ad 100644 --- a/arch/x86/kernel/cpu/scattered.c +++ b/arch/x86/kernel/cpu/scattered.c @@ -31,6 +31,7 @@ struct cpuid_bit { { X86_FEATURE_HW_PSTATE, CPUID_EDX, 7, 0x80000007, 0 }, { X86_FEATURE_CPB, CPUID_EDX, 9, 0x80000007, 0 }, { X86_FEATURE_PROC_FEEDBACK, CPUID_EDX, 11, 0x80000007, 0 }, + { X86_FEATURE_SME, CPUID_EAX, 0, 0x8000001f, 0 }, { 0, 0, 0, 0, 0 } }; From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg0-f70.google.com (mail-pg0-f70.google.com [74.125.83.70]) by kanga.kvack.org (Postfix) with ESMTP id 4DC806B03B6 for ; Tue, 27 Jun 2017 11:08:13 -0400 (EDT) Received: by mail-pg0-f70.google.com with SMTP id g7so29966610pgp.1 for ; Tue, 27 Jun 2017 08:08:13 -0700 (PDT) Received: from NAM03-CO1-obe.outbound.protection.outlook.com (mail-co1nam03on0061.outbound.protection.outlook.com. [104.47.40.61]) by mx.google.com with ESMTPS id z73si2060210pgz.402.2017.06.27.08.08.12 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 27 Jun 2017 08:08:12 -0700 (PDT) From: Tom Lendacky Subject: [PATCH v8 RESEND 04/38] x86/CPU/AMD: Add the Secure Memory Encryption CPU feature Date: Tue, 27 Jun 2017 10:08:02 -0500 Message-ID: <20170627150802.17428.331.stgit@tlendack-t1.amdoffice.net> In-Reply-To: <20170627150718.17428.81813.stgit@tlendack-t1.amdoffice.net> References: <20170627150718.17428.81813.stgit@tlendack-t1.amdoffice.net> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: owner-linux-mm@kvack.org List-ID: To: linux-arch@vger.kernel.org, linux-efi@vger.kernel.org, kvm@vger.kernel.org, linux-doc@vger.kernel.org, x86@kernel.org, kexec@lists.infradead.org, linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, xen-devel@lists.xen.org, linux-mm@kvack.org, iommu@lists.linux-foundation.org Cc: Brijesh Singh , Toshimitsu Kani , Radim =?utf-8?b?S3LEjW3DocWZ?= , Matt Fleming , Alexander Potapenko , "H. Peter Anvin" , Larry Woodman , Jonathan Corbet , Joerg Roedel , "Michael S. Tsirkin" , Ingo Molnar , Andrey Ryabinin , Dave Young , Rik van Riel , Arnd Bergmann , Konrad Rzeszutek Wilk , Borislav Petkov , Andy Lutomirski , Boris Ostrovsky , Dmitry Vyukov , Juergen Gross , Thomas Gleixner , Paolo Bonzini Update the CPU features to include identifying and reporting on the Secure Memory Encryption (SME) feature. SME is identified by CPUID 0x8000001f, but requires BIOS support to enable it (set bit 23 of MSR_K8_SYSCFG). Only show the SME feature as available if reported by CPUID and enabled by BIOS. Reviewed-by: Borislav Petkov Signed-off-by: Tom Lendacky --- arch/x86/include/asm/cpufeatures.h | 1 + arch/x86/include/asm/msr-index.h | 2 ++ arch/x86/kernel/cpu/amd.c | 13 +++++++++++++ arch/x86/kernel/cpu/scattered.c | 1 + 4 files changed, 17 insertions(+) diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h index 2701e5f..2b692df 100644 --- a/arch/x86/include/asm/cpufeatures.h +++ b/arch/x86/include/asm/cpufeatures.h @@ -196,6 +196,7 @@ #define X86_FEATURE_HW_PSTATE ( 7*32+ 8) /* AMD HW-PState */ #define X86_FEATURE_PROC_FEEDBACK ( 7*32+ 9) /* AMD ProcFeedbackInterface */ +#define X86_FEATURE_SME ( 7*32+10) /* AMD Secure Memory Encryption */ #define X86_FEATURE_INTEL_PPIN ( 7*32+14) /* Intel Processor Inventory Number */ #define X86_FEATURE_INTEL_PT ( 7*32+15) /* Intel Processor Trace */ diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h index 18b1623..460ac01 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -352,6 +352,8 @@ #define MSR_K8_TOP_MEM1 0xc001001a #define MSR_K8_TOP_MEM2 0xc001001d #define MSR_K8_SYSCFG 0xc0010010 +#define MSR_K8_SYSCFG_MEM_ENCRYPT_BIT 23 +#define MSR_K8_SYSCFG_MEM_ENCRYPT BIT_ULL(MSR_K8_SYSCFG_MEM_ENCRYPT_BIT) #define MSR_K8_INT_PENDING_MSG 0xc0010055 /* C1E active bits in int pending message */ #define K8_INTP_C1E_ACTIVE_MASK 0x18000000 diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index bb5abe8..c47ceee 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -611,6 +611,19 @@ static void early_init_amd(struct cpuinfo_x86 *c) */ if (cpu_has_amd_erratum(c, amd_erratum_400)) set_cpu_bug(c, X86_BUG_AMD_E400); + + /* + * BIOS support is required for SME. If BIOS has not enabled SME + * then don't advertise the feature (set in scattered.c) + */ + if (cpu_has(c, X86_FEATURE_SME)) { + u64 msr; + + /* Check if SME is enabled */ + rdmsrl(MSR_K8_SYSCFG, msr); + if (!(msr & MSR_K8_SYSCFG_MEM_ENCRYPT)) + clear_cpu_cap(c, X86_FEATURE_SME); + } } static void init_amd_k8(struct cpuinfo_x86 *c) diff --git a/arch/x86/kernel/cpu/scattered.c b/arch/x86/kernel/cpu/scattered.c index 23c2350..05459ad 100644 --- a/arch/x86/kernel/cpu/scattered.c +++ b/arch/x86/kernel/cpu/scattered.c @@ -31,6 +31,7 @@ struct cpuid_bit { { X86_FEATURE_HW_PSTATE, CPUID_EDX, 7, 0x80000007, 0 }, { X86_FEATURE_CPB, CPUID_EDX, 9, 0x80000007, 0 }, { X86_FEATURE_PROC_FEEDBACK, CPUID_EDX, 11, 0x80000007, 0 }, + { X86_FEATURE_SME, CPUID_EAX, 0, 0x8000001f, 0 }, { 0, 0, 0, 0, 0 } }; -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-co1nam03on0080.outbound.protection.outlook.com ([104.47.40.80] helo=NAM03-CO1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dPs6S-0006rG-UF for kexec@lists.infradead.org; Tue, 27 Jun 2017 15:08:34 +0000 From: Tom Lendacky Subject: [PATCH v8 RESEND 04/38] x86/CPU/AMD: Add the Secure Memory Encryption CPU feature Date: Tue, 27 Jun 2017 10:08:02 -0500 Message-ID: <20170627150802.17428.331.stgit@tlendack-t1.amdoffice.net> In-Reply-To: <20170627150718.17428.81813.stgit@tlendack-t1.amdoffice.net> References: <20170627150718.17428.81813.stgit@tlendack-t1.amdoffice.net> MIME-Version: 1.0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "kexec" Errors-To: kexec-bounces+dwmw2=infradead.org@lists.infradead.org To: linux-arch@vger.kernel.org, linux-efi@vger.kernel.org, kvm@vger.kernel.org, linux-doc@vger.kernel.org, x86@kernel.org, kexec@lists.infradead.org, linux-kernel@vger.kernel.org, kasan-dev@googlegroups.com, xen-devel@lists.xen.org, linux-mm@kvack.org, iommu@lists.linux-foundation.org Cc: Brijesh Singh , Toshimitsu Kani , "Michael S. Tsirkin" , Matt Fleming , Alexander Potapenko , "H. Peter Anvin" , Boris Ostrovsky , Jonathan Corbet , Joerg Roedel , Radim =?utf-8?b?S3LEjW3DocWZ?= , Larry Woodman , Ingo Molnar , Andrey Ryabinin , Dave Young , Rik van Riel , Arnd Bergmann , Konrad Rzeszutek Wilk , Borislav Petkov , Andy Lutomirski , Thomas Gleixner , Dmitry Vyukov , Juergen Gross , Paolo Bonzini Update the CPU features to include identifying and reporting on the Secure Memory Encryption (SME) feature. SME is identified by CPUID 0x8000001f, but requires BIOS support to enable it (set bit 23 of MSR_K8_SYSCFG). Only show the SME feature as available if reported by CPUID and enabled by BIOS. Reviewed-by: Borislav Petkov Signed-off-by: Tom Lendacky --- arch/x86/include/asm/cpufeatures.h | 1 + arch/x86/include/asm/msr-index.h | 2 ++ arch/x86/kernel/cpu/amd.c | 13 +++++++++++++ arch/x86/kernel/cpu/scattered.c | 1 + 4 files changed, 17 insertions(+) diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h index 2701e5f..2b692df 100644 --- a/arch/x86/include/asm/cpufeatures.h +++ b/arch/x86/include/asm/cpufeatures.h @@ -196,6 +196,7 @@ #define X86_FEATURE_HW_PSTATE ( 7*32+ 8) /* AMD HW-PState */ #define X86_FEATURE_PROC_FEEDBACK ( 7*32+ 9) /* AMD ProcFeedbackInterface */ +#define X86_FEATURE_SME ( 7*32+10) /* AMD Secure Memory Encryption */ #define X86_FEATURE_INTEL_PPIN ( 7*32+14) /* Intel Processor Inventory Number */ #define X86_FEATURE_INTEL_PT ( 7*32+15) /* Intel Processor Trace */ diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h index 18b1623..460ac01 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -352,6 +352,8 @@ #define MSR_K8_TOP_MEM1 0xc001001a #define MSR_K8_TOP_MEM2 0xc001001d #define MSR_K8_SYSCFG 0xc0010010 +#define MSR_K8_SYSCFG_MEM_ENCRYPT_BIT 23 +#define MSR_K8_SYSCFG_MEM_ENCRYPT BIT_ULL(MSR_K8_SYSCFG_MEM_ENCRYPT_BIT) #define MSR_K8_INT_PENDING_MSG 0xc0010055 /* C1E active bits in int pending message */ #define K8_INTP_C1E_ACTIVE_MASK 0x18000000 diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index bb5abe8..c47ceee 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -611,6 +611,19 @@ static void early_init_amd(struct cpuinfo_x86 *c) */ if (cpu_has_amd_erratum(c, amd_erratum_400)) set_cpu_bug(c, X86_BUG_AMD_E400); + + /* + * BIOS support is required for SME. If BIOS has not enabled SME + * then don't advertise the feature (set in scattered.c) + */ + if (cpu_has(c, X86_FEATURE_SME)) { + u64 msr; + + /* Check if SME is enabled */ + rdmsrl(MSR_K8_SYSCFG, msr); + if (!(msr & MSR_K8_SYSCFG_MEM_ENCRYPT)) + clear_cpu_cap(c, X86_FEATURE_SME); + } } static void init_amd_k8(struct cpuinfo_x86 *c) diff --git a/arch/x86/kernel/cpu/scattered.c b/arch/x86/kernel/cpu/scattered.c index 23c2350..05459ad 100644 --- a/arch/x86/kernel/cpu/scattered.c +++ b/arch/x86/kernel/cpu/scattered.c @@ -31,6 +31,7 @@ struct cpuid_bit { { X86_FEATURE_HW_PSTATE, CPUID_EDX, 7, 0x80000007, 0 }, { X86_FEATURE_CPB, CPUID_EDX, 9, 0x80000007, 0 }, { X86_FEATURE_PROC_FEEDBACK, CPUID_EDX, 11, 0x80000007, 0 }, + { X86_FEATURE_SME, CPUID_EAX, 0, 0x8000001f, 0 }, { 0, 0, 0, 0, 0 } }; _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec