From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751708AbdF0PDx (ORCPT ); Tue, 27 Jun 2017 11:03:53 -0400 Received: from mail-by2nam01on0057.outbound.protection.outlook.com ([104.47.34.57]:54352 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752121AbdF0O7c (ORCPT ); Tue, 27 Jun 2017 10:59:32 -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 18/38] x86/efi: Update EFI pagetable creation to work with SME 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 09:59:22 -0500 Message-ID: <20170627145922.15908.65516.stgit@tlendack-t1.amdoffice.net> In-Reply-To: <20170627145607.15908.26571.stgit@tlendack-t1.amdoffice.net> References: <20170627145607.15908.26571.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.77.1] X-ClientProxiedBy: BN6PR03CA0027.namprd03.prod.outlook.com (10.175.124.13) To CY4PR12MB1142.namprd12.prod.outlook.com (10.168.163.150) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7c41c568-cf12-4722-886e-08d4bd6d1ccc 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:CY4PR12MB1142; X-Microsoft-Exchange-Diagnostics: 1;CY4PR12MB1142;3:23xLNYUme8xwi48/xT/ciW37mehEwySIgq06bPP051lAQLE36KYMTUkPFjF/DLnVOleSQ2IG9uHTc4LcDsrAG/l4RM3lRDAkgPvhr54mAayr6XkDpFnFCdK9aDt+8HT6CirxD6VSkyMcyRpYDwwafotEt2+EOiM7yRczhxqe35lS8BSB1tQNkIKNCDFIWxVg0t73w1a19FjXvbSYoaswpP1tLvIamoUvbaeV8bStsKYlRXLfiSmStrintCtUgJas4eC591+1pUVYndUAymZsS4I3EeY6Vu9b/T8lnC2pr8h21ZlLqC616XUmkBHqVkOI2I4jxEjhRTAWjdxLLJeOeA7SMoOl6YbylWcVC6LoCSV368OkTgEJWuov9rbAGnmDQyOs1lZI1jdXH/msPdMrp+AOh5+kxjr/gLoqnhwpzLmAqU+uYnk3lPal82vNyJgcGK0nx9WJ1GLSt38TTiCbttWC6OI+f2XlAaL7Jo0cHHfrcUpFaJlchvBDJoJ1htCQWSsRFP5aD6WRoSUmdLVE/QhXn0Xl+ZqIXe7DxKhamVCWGdTzrmBd+f18XutpHKJB8ea7qZOiP5+zgAHW01pfr0XoZm0tQTpDkgME+efAKo4J9hpesjMVe/763JCPKDdMn05cloQkpKKuI1avicvh/qEKPISXiLVjw/pxAupzMpKCO5vEd8NTA1YpsxgYU/7n4jT2xyE7Bhpvd058by8h9w== X-MS-TrafficTypeDiagnostic: CY4PR12MB1142: X-Microsoft-Exchange-Diagnostics: 1;CY4PR12MB1142;25:wsGYG2bhA70zR8V6MtnabDI/P2yYfM14Xwq2GpeD1LHk3Cvxs9+aCR4RXvZyZiBmw0d9X0B0XYewQgfTJTkxwFRcLhwi0W0eypR8Sg/KOELPkkKTdu0DFHPvWQb0e8e9rFWfPJYfEssOME6AnyxeQyxzqccDw6Qxc+hHkAgwaUn0E2cwck6VUlPjHQqLvB7YVz9PRzieQnsjnVL2aWR9Ewazsdue0a5k2b7YNioVLBVRAJeuyWg0Hu5zTGwstXHus23ffA/AWrmqrgC/OH9FUsRx9q4W8RX0WNFe9NlIvDAl1mRUMhaSJstpPdm3Iwn4W+a1ZrmgNOK4y6/wDWe1UTsCJVILoVYYvXR4aihkF9N1yxFWjLCEPhF8Bt5RP6gE8b3rwMKlDzLG3l9peElHIxpaw77OzwQcybcuEDQlJun/skiDif1QEi4Hd98H/6aFpOIOX50/dqRXnflJkHwLF48zQs80zEKPDcrXSxU+CVmeq8A/MgLYK9V17zK1XfekxALoWEMDXeXNGnuewvGP18n8W3bPTsgFBeuHIDnrTMCnaIBdgVkmF5MNEqN4YojJPgx3or6cxA4VIoLVNEshVqlPSVri64MEWvkLqbs2uPsO1qbdLrVYe2DyUCWfkmhzKPZrZYhGGjKawh4A2b/YxluKVIlsMYNM1I98vLFm+9jd7i7DRdHqhut9Wj5H4U48g34FVmPgLkngl7bbA2H8wpYS9fVXPCdp12YwjO0j4sJYmueTTj9q/CdyL7oBmmN5tkUzKRhEq+MP3+Vy5ohGF89Vgv3mOJIDMzxEajT8tNyprnssh4DpPCXCuvnG/0IFTIxS5+Ez711vM5/N2vW77tfuCZCIe1nOjXF4rpIAZbZQQ/079XtxYeOrhmeFQvDrrt1i9tbc0u9h9lQ0pXsX2JiL9IkhPZDs+q07rGrOdWc= X-Microsoft-Exchange-Diagnostics: 1;CY4PR12MB1142;31:g6HpEWqFcyzPJuuplfVj1SGYtQJDsBTZv1iR/sZh/V9MdV5M8St/zJGp5rzeTEIfFjtZ7svgxOLUCUnPutY+go6XscGlM51Hosx9via9X79AIaPfeC3yGxFlFAa68qTEnB0dbxlX6hVlvaK3wsvxrN7zUYObKzZjsZ0zli5OQfa5S2y7Awmy1Y8HFNoNlUUVp9NiJcSMUDJuCYVmx2ruID9ylv0BqS9k9Q97UOszrO+QX0ULbcMSZO55nLw7y6UczGUmrAZBiN2ameQFegDVWNM6R7ljiFLUo0uTsjlu4BAMx0oeBOuGjI9sHy3HAOPwKBKgifl+2iz48Alw8YAHCTswMnRWcU+IbGtJ4ykO6x1N01CXeX1GNLv0DMmSasE00BM80+/7YAO8DlBE2gf+z2FuC6ldw981mVridtBk8Nc88VyOz0tb/kO4PYQ6Z4E1YAMwaDQniy/4vKMKOqal5i6w3d1vMAa8XLUYw7OVS5RpErxwyIpWhNEehjwI3H+iO2Crz4iUHZJ/4AUpxZQETgiYXtXH5Gm0brMjqPHlopBewoJtDzXbthyC0cTdjqEaI6nsu1ECvC0yOSQubZ3esgr0zpUqOQXrMuCexggbz7croaw4XSCDZifN4qHYW3K/DZZtv/oiNZ62mwUSbNtfDGvAEcV/TCse78wfxQWWjV8= X-Microsoft-Exchange-Diagnostics: 1;CY4PR12MB1142;20:iU8OqVp38R28R8MvGBWhvagIa5my6ElNDGJ4vOI2NPO1iLAbjlJB6KKHY8gxy4sKeG/R1oP230qi+9jzf8IhTvMYTLX3//GDA2YMgXlJWUnAJ12uLlrS4BwrAq4o058r3wSRVmUR19yvyP/DZDu7rdVh2QglZInBTm+1Tj3K59E1s3QjPinht1+ul7ab9KXzj0ccKfQQJkuwOzKkxAoPkcvKEZXy0up5wmkuR+NcVmfOvJHPBPUzdK0B25eegM66Jdtb7hAYwrJVue/+FJqdjV783IP6a/9LzFljRBZTkYfYFlZjpyaTYweiyk6DOMQBfKa9hQwkKzztrZcXm1SbX/gqAjS0453J03btFYhFZYGcub+/aF5/OwjiZPq3w2162XsxYgwbRzgu/MnFDHKVitxH3rQbhG573nCW/vr1XCzGRTT8IJTy7hioOXSjlGxQZHdqUGgCL/V7pMZ66fdVbKjtltrqC5KqyKJGJzmFUjfTRDZN8oCmwuhZJNbiK1pt X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(236129657087228)(767451399110)(148574349560750)(167848164394848); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(5005006)(8121501046)(100000703101)(100105400095)(10201501046)(93006095)(93001095)(3002001)(6055026)(6041248)(20161123562025)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123555025)(20161123558100)(6072148)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:CY4PR12MB1142;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:CY4PR12MB1142; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtDWTRQUjEyTUIxMTQyOzQ6aDV0OTVMcWF5cDkraDF5MGg3WGhpSUtYci9V?= =?utf-8?B?TGZnaGQ5UEZHVnhIOHZ4R0k3b3NOQkNBdXRxUU1OSDZkVk9RV04yUGRGeTda?= =?utf-8?B?NHZNN3FUY2h4OExlU3RVVW9zRXhyR28yeUdoK1VHQ0Z3RTFTdkpxVnQrZGpt?= =?utf-8?B?SWlXckZBRkIycGhaekhWTHh4VmJ6V244cExaQVdEWDNOYmdoME5oUXdiV1o0?= =?utf-8?B?akxKeGY4TGsvamgyL1liYzBZRjRNblEzcmpYWlRrTE5ZeUJmRFYyRCtRVTNi?= =?utf-8?B?M1BCRkV1YkVrS0ZpSGtwaXo2N1M4cllydVd4NzF3R3BjOVR4MVZqckw1QUJo?= =?utf-8?B?OTJJai9mYksrVnI0d2NoNkczWkhFWDFHZWVNOU9nZm1qY0ZYTXZOK2xBdnM2?= =?utf-8?B?YVlCbUhPenJSM0w3Y2YvMUtzb2FTMjFqQ1NEeEcrRXcyblF5S2ZlbW5rWjVV?= =?utf-8?B?RVFkWnBNMHc5MzJBNTI5b21YdnJjcklyQnlPWUFhSVg4SkhVcEcyV1FYY0cv?= =?utf-8?B?dGpVZ2Uvc0VmMnlqRHdaRndvOWZML3ZOLzh0Z05mRWU4Uzk2RCtCL0Q1N2M1?= =?utf-8?B?YllPMkJib0QxcjJjU3ZzZE1EWXdEQVJSRnJvTVhwMS9vTzJ2OGUxWlcvcjk4?= =?utf-8?B?cUEyeE50dVZmUzB6cXZiUlh5SjNyWFRGeU9rZlJZN0p1U0dKaEJuaUg0UDI4?= =?utf-8?B?VmMreExJMERNMENUZ3ZEWXgyWVJUVGN0cHVFZW1TSmZCZG5SaGg0QVpxRk42?= =?utf-8?B?b2JRVUZtRXlHZWFTRUJNTWlrYVRFSUdJQU45dk9XOFV3U0cyUVlWVVRzSmN0?= =?utf-8?B?L0ZIYksray9pL2hZRnp6OUxOR0R6dkFwL2pYTGtnOGQ0SzRSalhvRE9Mbm5P?= =?utf-8?B?Z0M4eHB2VjFiSEFldDBVWUljdVdGR0VCelBnRGVtT2I0KzdSM3BwelJXU3Jw?= =?utf-8?B?emxMeDJiaGd3SjZFOUlKZXp4ckxUNG0zM0FsdGRxbDBYYlpQVWFxN1d1SEhT?= =?utf-8?B?dGxCcC9PaUhxazNFbTlvUHlLU0V1MUdBYkt0TGtoV1dhSmlpeUZuYWxDV1gy?= =?utf-8?B?UGN0RWNYNGxsK3BRMFh1K0JIcHJsaXh3czc2UnduT2M0YXlKNmV0elhib1BD?= =?utf-8?B?Z3V2TlJsNjZsN29CRnY3dktrR2VYRlk3UWpieHBSV1Q0Uk5PcmlmeDZSUGZu?= =?utf-8?B?VnVRRmJoQ1lBKzRVNy9jZnJBZStTRkRBQ2p1SXBrT1ZQSGZiRUhyOE04c0Vz?= =?utf-8?B?c01xRDdrQmRGaDV0Rzd6bG5FMkQvL1pMSVE3bzluNGx6cVQrSHc2d21VczQ1?= =?utf-8?B?RFN4WkMxcCtrR2FYa25idHZCWDdxTTl6SkZsQ1l6QjQrSE53S2FSbXZ5eSt6?= =?utf-8?B?N0ljNDVxNEgyZGdXa0JWcHo2TWs3b3MxU05sVDM5TVY5QXRQRVhSOEdGTjlD?= =?utf-8?B?S25PQ3gvZUlwQXRGVGJBMVpodmVRckRkdXNWWlEzeUVOYVJoOEd5ZmhTcXdV?= =?utf-8?B?MmZFZkFxSEhpOVk4b09naWVTblJZbmJxVFhOM0VJRk9KLzdDS2tPQ1VPblNY?= =?utf-8?B?OUdHbnBGcEFiNFFFTGMzRzdvZ29BM3FtaU1yY3NabTVEN3ZhcjdTaC9zRXpF?= =?utf-8?B?eGU4eWtJZDhDSm1CRHhLNGdKQ2FrZUdYaWNXeW5EZFJGM0VLa3htYnh1cll6?= =?utf-8?B?WTczNlp6ZE9Pd1RzbmVYYjhGcTFTWVVzcEFSS2N1eEkzZTljQ21SSGZFSHEv?= =?utf-8?Q?5jxLmqbt70KYCls9RzI1KlacoDSK8qbc2cfo=3D?= X-Forefront-PRVS: 0351D213B3 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6009001)(39410400002)(39400400002)(39860400002)(39850400002)(39450400003)(39840400002)(83506001)(23676002)(33646002)(50466002)(478600001)(25786009)(53416004)(4326008)(42186005)(50986999)(76176999)(103116003)(15650500001)(72206003)(305945005)(54356999)(38730400002)(6666003)(5660300001)(110136004)(2906002)(47776003)(66066001)(4001350100001)(7416002)(189998001)(1076002)(55016002)(2950100002)(7736002)(53936002)(9686003)(7406005)(86362001)(6116002)(230700001)(81166006)(3846002)(97746001)(8676002)(6506006)(54906002)(921003)(1121003);DIR:OUT;SFP:1101;SCL:1;SRVR:CY4PR12MB1142;H:tlendack-t1.amdoffice.net;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtDWTRQUjEyTUIxMTQyOzIzOlVaUEplWUlRdE9ETXkrcG9LRXBkV3BtaWdY?= =?utf-8?B?eWQ2R2FKNTNBeHhMdFRCdEJVTVJUbnlNa0RyNndhVmlUZ3QvV29jOE9KQ1Y0?= =?utf-8?B?SERZb0pvVVZ3VmVCWlBuS0RhYkxEUzBpN1VyTEozNjdmVkxGaTcra3Q5Ump4?= =?utf-8?B?bEVuSFVTemt0dzhpbGJscURDKzNXSFJJOTN6TWdGQ25IN2dJRVVHQkZsQ0ls?= =?utf-8?B?Y3FWYkJsYndzbS9KM0w0Vk5hRjh5QWI1dUFTN1pSSEJQWFBub3NJdW1HMjVk?= =?utf-8?B?bUNWVTJRNnY2d01QRE5FZVJ5UTlFbjExTVYvTC8rNGVidlFWZzFvNGpESkt5?= =?utf-8?B?Mm5zaTdsR2N5S2hGVFN6L0JTY2RsK0Vqb0tXZFRMajMyVUxoRWF2enlTZ01s?= =?utf-8?B?NGgwSHRSVWsvZFBFajd6YVA2K0thdHZ5N0J4R1Y1bjJyZEtFOHN3UWVLOXhl?= =?utf-8?B?VE1rNW9vN2RDbnRGcm5tcE1pb3c5MUZCZnJmRUM5cm5VdWlRT042WXltemlU?= =?utf-8?B?TlB2UWN2cjJ5OE1tekFveXoyaktWMVJiOTFzZTRvS2Rnank0enNJUWtpMmRx?= =?utf-8?B?YVArV3ZKelRtZDcxNnVDdFBpaFlBMy9hSDJNeUZaTEg0cVI1WElRN3o2bFVr?= =?utf-8?B?ckN2L2tCOWpGWkpqY2g2RXRsUkljcmluNVJ0WGFla2paWmRUaVFZdUFJT093?= =?utf-8?B?YWM1ZnJ3RlFxcTlIb0lOd1hLSEpTRmNlZjFxRE5pMVV3UDdvWklRVVpqOTRK?= =?utf-8?B?MlI4K1Y5aEZtQWo2V3hUWVcyMUJEVERIbFZUTHNPUnZJUk1Uc1VES0JSSDhm?= =?utf-8?B?aEE0RHRtL3drT1pnTDZmMi9YMTFxN1lqSmNxTDQxTTFnN1MwQTZ5cnZKYXEw?= =?utf-8?B?eU03Z3RwcGVqbnNwbGdYNnVIL2NnQzExbVhRb3MwbWhsZHFWN0hNN0ZPR1R1?= =?utf-8?B?Qk9tSWVITFhHbUtnTXdiQ0Jmd2s4VDI0bEU3YjNsc05ONFVQNGZNMithN1p5?= =?utf-8?B?M09UT0MzQlhJOE5xOUREOVZTOGlIUjNjK2EzMVNaNDdkdHBvTUVHQTF4OGw3?= =?utf-8?B?ZVJWVHZBV21YSzRwTVNWcUpvQUY2RitZOUUrNy9mSnRrcEFnZFRnYmFOV3k1?= =?utf-8?B?ZUliN0poUzJrbzZBZk44ek1HK29GSTc0TWgrUVZIMmpMb3VJRVFrdWV6Q3lO?= =?utf-8?B?Zk9NVkwyVElsOFNlYTlmMUQ5U0NiRFJpVWRjVENsN28zMkc4WEVNdW1oMnlE?= =?utf-8?B?RmxNTlJWNGYyUldsSUorTk9BbldrK2ZhUUhobmZHMWNjb3hRalhUM3pPdFBC?= =?utf-8?B?RXN0QmgxYW5MMkRnWDZnYkFCNUttZ1VvQVNPMW1CcnZVVlYrQUFyeGRQbFdE?= =?utf-8?B?aXg1NDhGaDA1cHpBTEp1U2hqbUNsc25SNExVTWR0UDZvUG1JRWpCSGFLaUN1?= =?utf-8?B?eEFIRkdsSFN3UkViRk5MNVpFNk9QT1QzdzZYYzhFdzYwQXMxWFo1K3BqOXoz?= =?utf-8?B?dnMxbE5nT25lWklVQ01QNG85U3duaDJXVjZCZnJDeGNqbHBTMEZXMkZaVmFC?= =?utf-8?B?RkhDdlp5SnhMcVZXeEkwNU0yMW4wcGppL3RTR2ZCU0N3YWFlLytUN2NsdGk0?= =?utf-8?B?WDRPQS91RUVJMkdHdjcvcDhMWkFaRWx0VFViZmdvTFRSVHR3b3BDN2tXWVVC?= =?utf-8?B?WkVLUWpEVjBnOFlITWJQUExLK04vZy8zM1hrZHd5ZUlRMmh2RWlTNVM0TlRt?= =?utf-8?B?MTlQNWRhNEFQMFV1dWRWUT09?= X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtDWTRQUjEyTUIxMTQyOzY6NURIWS93WmI1YXRLSE9SVUhHaCtWMWNXN3p2?= =?utf-8?B?VzFVU1BNMi92QWJnTktVL3EyT1MreGxQdGpLQ1RmYXUrR21YakUvREhVM3Fl?= =?utf-8?B?TGkzOHdLdkNOM1o1NnU0Y0RVRlJyMllHUW9KTG0zdmVZT3pZOHJPNittZlVI?= =?utf-8?B?ZFZ5Mlg4NXcraFVkc29tN0lnWUxlMHNWNG1XaUdxT1FCanJiNTZVY3NvU2Iz?= =?utf-8?B?OC9DWjE3RmNZUmZXUXdSelFMMTZnUnlxWGRwQkZxRVpOUTdIK2U2WXhMYndO?= =?utf-8?B?U1ZvZ3l0VlBFY2hrVkJkTlJ6elN4RWMzNDFUaTFtRElsdXJCVVZaYkhONERw?= =?utf-8?B?ZWFoYXQrLy9GNGlQMzI0UTRpWm9vNHFRWmZ4WlpOYmtqdkFFcXp6WTNjdFcv?= =?utf-8?B?YjdzeEJSeFhnd001UjhZYmorUjZCak4zcUNncDJTWk1EdTNOUit5cklVQmMv?= =?utf-8?B?b2x6Sm9ka3pERWMxbTNjZlhFZXhyY2M5VzZsTTF0cUdYMmkzMjVmNWtIUzdH?= =?utf-8?B?MWFQaG8yNTJjUUY0Z0ZDWnJ3ZmkzR3pTRnUvekJtK3JvYjR5dm5GMGJ0bklY?= =?utf-8?B?WmxZNDNqaERiYUMyVzhWY29zVVJtLytTRnZvWXpTNkpuUlFDT2QwV0hEV3FV?= =?utf-8?B?S2xDaFFaUjV0VmVlZWFUK1ZjR2wwb0pLVUVZbjQwWFlKMnd1TFR6Z3B5Ymh5?= =?utf-8?B?WThFWFBzTzNDTmczQ2R5dGVTUkpYY2ZvMTNxWWxIT3E5WWRhV3BxR0MzOEQv?= =?utf-8?B?ajYyTjN1clIzdXFOeU9PNmRkUkdhKzdPNWdINHRhbjMzMXR2b04xdjZzY1di?= =?utf-8?B?SC9PNXhjZG40ZldGVllBVFhvRm1WSXlQaUFTSTFaOFNxTFZsWStwZDVuYWZI?= =?utf-8?B?cERNWm5HTkpqQXY4TjlQS0RZZzJMVUdJN2xWRU1WSXNxVzZrbjBsajJaVE40?= =?utf-8?B?WTlZd1RSclhXcFB6SnB0OVZsbDlJWVVSdkJhRVU5UEU2VkZML2MyOHhvVzlK?= =?utf-8?B?ckFQQWFuT1ErQW00M0tMTUV4L1RuSlRRYUlQZHNpelFHRjJrZzdqY2Y0MzBr?= =?utf-8?B?TmJrZTZMcmc3Q3B2TTVtSEhyVEdzTnFFQUIrSkhyZ29kNXROSGphSjl3Z2VF?= =?utf-8?B?M3piWk9TN0xSNDJ1OGtBRm03ZlRXTWF0RUp5OUtoTkoyWWlUaEJjaGtWU1dz?= =?utf-8?B?dTcwU2dwMGpJbVluMFVEZWxBWkZYK2FpRWlHaW10UWlpM2F2blhWQkdPV3RN?= =?utf-8?B?S0tnQm01em9mTXdTd01PajczQkpLRU10TzdaYjdETjB2cVR6eDNiWi9zdjNB?= =?utf-8?B?blg1WmYweVdsUC9VZWdob0pCZjRWU0VZQW9sL2lGdzd0MXJIZmdpTzdZWjdx?= =?utf-8?Q?RTIokWy?= X-Microsoft-Exchange-Diagnostics: 1;CY4PR12MB1142;5:AUfBzV+goFWlhCAQDcd5ibAQ1WqxvHEk/NlDsxN7GVNOFmhLwGrf8zUFhuwgA1LN1PD7cB/HHjLnhHQjAyxUFKTq22D5m4MJ4ZXfBWNpmGaHbLrvTBGBzp6Ophze1QcOwoAiUJSj8uIwLGdtIPcdh8DvlmBEtRne3kjlmpx+pnx3TwxYOO/BbQoO0WVxFTs9F7VWvANf/o6zVsaRnFQbH2yFwzZZfvtKcLtn/t0BzD9ZvfuhqWnCrFOHXrSqRy3GdxddvljON3zyMwSiftnKYqF2O9Bs3F4X//3pj4fqSwzFcfMr9bGs79rLnof0V39Oqz04pFULVKCbz7HxDWYiLhE78XKt9Ul7RxwDgWWbNBG36X2O6krx2plVsFu8cIOCZR4aEsITfJ7qQ0Uw5MxYRmYnBKgdtyp9J5IvzgGp1CICpElbUv8nD3561X6BOiGrkx/CFdEHQs2AiSOINAUnty3j8Hoj6j6J7MfVMD3bub8sdrmC39Een5USkyD35f2y;24:RlQ4FI9Q0pm/RdJiIevjaIY1qluVl9xU6nSUHIT3HURtL7tnZdHHJLt0w/VFscr86KMAOpd6lckPjPlTOX9aIGvmr3Tjcx7jPFM2J9Dl3E4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;CY4PR12MB1142;7:eC//EiuFDiUZiJQ3BWAyHdsKkb5Xrs3avtPHLf6N2Wodqm6CrUitaGzUUg+48s0q8wHqYh3pfEjrYn2NVP6W1/QwRzcl+h4f/pfBpCIHdX/xHI3DdppF33ZHNw3oamS4T51qDjA/Qv9FLIJHpkEAlYwDL824xffu/H+rP+rWbM/FvzB7BR5ePaN5BKM/MCwiENmazEhdu2bd7F2Q4UMwO1ySAs83ndAo+vCrxlaSQE93Cwn90Z+vxZk99ZpBBwyu3FoINYMgriJqCGkLF0+Vy1QPqNxmMJ7EYTdOKns/OqSXyFEvgfdEEervrDYwBZPWYnXVZ/kk010iqs1koaFEZv5elzj7p/veZ+UrW93s8VFP/HzaL0Ne8Qi6KlDZlCKW6tPpJx485cI6G8fFz+75HTNoJ9m50XJmRBvgKMYWSg67b0v6wgARAL8mskUZyEmrrbXCYOGYg3LGn2G6egusEYCPDeKjATrj8/hrDvwKo/b14hItK0EBpGhuWwi3GYCt+Dgo1XRSaNBMfqwPfQKFPvCy4/wjWCBUNXowrN5jaf/Ag325gkAdSSMZgbnQDxakWaP8aDvR3KHjhT93RiPQEgkDCn5/9w/BYXIgXsyCDucagspNnNZHfrt701SenYzZUsRm/7rFHWet72jS+bNhOIxgh1/jM/9H6cAUAFtmFxPBePqJng/46i2Jktixq68HFKAPcG+yfnDGd8fgI3E5h7G1X3yTZxNPYCpbFBvn6OF4CDdKoTxUYEjwwukJmwlLMGvtPZErIVoIp+UDD7N08S0jUS84kUr4Ks3lPGM4HVI= X-Microsoft-Exchange-Diagnostics: 1;CY4PR12MB1142;20:VsQMk78anCBMQM4JIqKzjvAHFZuzzFMUskFQZKqScp8CuDlCQtuKW+HthgI05oZ8IP8BDUibFpznDAMm0T5vjfuJR7GofFOVoOI1Ls6KS6PXcHKg+L0Qe7RuSWPP5KC0dEIc7Ae1H3gut2RTjQnbnWklvp0C0MdRp2xgs3dApXczbcGb8wZV9mrBXb1XICNw/iwxNsvZtoOwu71ovE0xoy/cymK4hqAJNMHKCH6D45Y0tHYlq3Ex/Uo1XsunlxiF X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2017 14:59:26.1927 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1142 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When SME is active, pagetable entries created for EFI need to have the encryption mask set as necessary. When the new pagetable pages are allocated they are mapped encrypted. So, update the efi_pgt value that will be used in cr3 to include the encryption mask so that the PGD table can be read successfully. The pagetable mapping as well as the kernel are also added to the pagetable mapping as encrypted. All other EFI mappings are mapped decrypted (tables, etc.). Reviewed-by: Matt Fleming Reviewed-by: Borislav Petkov Signed-off-by: Tom Lendacky --- arch/x86/platform/efi/efi_64.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c index 9bf72f5..12e8388 100644 --- a/arch/x86/platform/efi/efi_64.c +++ b/arch/x86/platform/efi/efi_64.c @@ -327,7 +327,7 @@ void efi_sync_low_kernel_mappings(void) int __init efi_setup_page_tables(unsigned long pa_memmap, unsigned num_pages) { - unsigned long pfn, text; + unsigned long pfn, text, pf; struct page *page; unsigned npages; pgd_t *pgd; @@ -335,7 +335,12 @@ int __init efi_setup_page_tables(unsigned long pa_memmap, unsigned num_pages) if (efi_enabled(EFI_OLD_MEMMAP)) return 0; - efi_scratch.efi_pgt = (pgd_t *)__pa(efi_pgd); + /* + * Since the PGD is encrypted, set the encryption mask so that when + * this value is loaded into cr3 the PGD will be decrypted during + * the pagetable walk. + */ + efi_scratch.efi_pgt = (pgd_t *)__sme_pa(efi_pgd); pgd = efi_pgd; /* @@ -345,7 +350,8 @@ int __init efi_setup_page_tables(unsigned long pa_memmap, unsigned num_pages) * phys_efi_set_virtual_address_map(). */ pfn = pa_memmap >> PAGE_SHIFT; - if (kernel_map_pages_in_pgd(pgd, pfn, pa_memmap, num_pages, _PAGE_NX | _PAGE_RW)) { + pf = _PAGE_NX | _PAGE_RW | _PAGE_ENC; + if (kernel_map_pages_in_pgd(pgd, pfn, pa_memmap, num_pages, pf)) { pr_err("Error ident-mapping new memmap (0x%lx)!\n", pa_memmap); return 1; } @@ -388,7 +394,8 @@ int __init efi_setup_page_tables(unsigned long pa_memmap, unsigned num_pages) text = __pa(_text); pfn = text >> PAGE_SHIFT; - if (kernel_map_pages_in_pgd(pgd, pfn, text, npages, _PAGE_RW)) { + pf = _PAGE_RW | _PAGE_ENC; + if (kernel_map_pages_in_pgd(pgd, pfn, text, npages, pf)) { pr_err("Failed to map kernel text 1:1\n"); return 1; }