From patchwork Tue Jun 27 15:10:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Lendacky X-Patchwork-Id: 9812403 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5FD9B60351 for ; Tue, 27 Jun 2017 15:12:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 52EC428619 for ; Tue, 27 Jun 2017 15:12:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4471A286F1; Tue, 27 Jun 2017 15:12:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CD1E1286BC for ; Tue, 27 Jun 2017 15:12:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752907AbdF0PMC (ORCPT ); Tue, 27 Jun 2017 11:12:02 -0400 Received: from mail-dm3nam03on0075.outbound.protection.outlook.com ([104.47.41.75]:34945 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753161AbdF0PK5 (ORCPT ); Tue, 27 Jun 2017 11:10:57 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector1-amd-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=OqZ94pG0MVlz+MPUAth3J5xX58Y7/VA2nt9nth04rGA=; b=jivMmWEEwI0VgQ1j/wFmHhwW7Rju8+2Vc6JYPSul3S5FgmZlCGb6h6Wdk1LaonQb95O47SZw2O1Cwsf/kPIx1liDCGDnqStB4tNFLny6t/neMETSlPV/LL2YhmhZ0tjuY/qiIlvTM8p/iU10t8Ja81z9E6V22q0j/ZiGGmGsWak= Authentication-Results: vger.kernel.org; dkim=none (message not signed) header.d=none; vger.kernel.org; dmarc=none action=none header.from=amd.com; Received: from tlendack-t1.amdoffice.net (165.204.77.1) by CY4PR12MB1141.namprd12.prod.outlook.com (10.168.163.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1199.15; Tue, 27 Jun 2017 15:10:40 +0000 From: Tom Lendacky Subject: [PATCH v8 RESEND 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 10:10:36 -0500 Message-ID: <20170627151036.17428.14824.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 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: CO2PR05CA0055.namprd05.prod.outlook.com (10.166.88.151) To CY4PR12MB1141.namprd12.prod.outlook.com (10.168.163.149) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7317fb4e-34b0-4eeb-0293-08d4bd6eae14 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:CY4PR12MB1141; X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1141; 3:sHKrbfnNt4E48ZXXGj2U8UgiwYbE0UMOcJtTsp3j3E76SHgmnTJT+ugHHL8w5OTijgkV3sBQY/KnHDCWYye9KYqMhcqJV3BeRk+ZrxOtK85g+3dzojCBorUE6tH93kxna9cxSsF6HlRZfVDjq4MFoV9NG9qEN4i1eAT54FFDgHu0a6yJFPJhmXeSNbfEyFu/5wD0rkW1rz7WFXoJNd8YEaIt9sp/XYvYQYpvv8M6kFTfm+ERPaUr9pDaUAuBBZwsuViSXEur5XSzmHmRPic7j8IS7KGB8pChifkXbwa7VApD1amfvfpBbyXcJ7GhQy1S6J7xfh6W/JxW3Fxpl1jxSqqEvw/7uTeYUJowj7G982w0QuwN69XK+vdB9elw1VRWpa7U153iI9k4ZXTigJeWcAZMVfbbzVqImZwX5z5FhKi6VLX91D91NSAW9duqlpMwULwuYvbOY3pp2UG69nrPiDWE+XdMhw078OhbW22oLmBtpnD+VlReahuvdWUXhJlSC7GXdWrglh04Em+UUJtMYtzukv4fACNCgfnekySM4oBM12zwMkCMEe8Ellc14kA4biWl0y2c0Hf/sEQdioAfDr6gVqnk30N/IkmjSnzmeOcYTxT6F1earbKVUDLLR6oxDLin9ZI9GfYRbOWX+znH41LBlciv+Pl1Zq1Zah2HZWsFDpfZgwM1U70s2EqWeJ3uUIpMStqwKFp9Z98r6AGNJA== X-MS-TrafficTypeDiagnostic: CY4PR12MB1141: X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1141; 25:Tij03JzTday5AWiwOhuJbaaq6vlUXhNH0ceYo9ISGF2aeMupFN4JRxwbQQBpadDRZ64Y4v0Ijvh1WBKfKoV/zIe0LUX07AGeEjPr4n0mNqQNFoW3WTCn5F2WJNGW7i8RnVJN09Vkndo+QW5tbAoIc53jQYalcA4kcQ7up3kffUBHGYt0AA2HPeDS5Obbkr+gEgGBHU0O0JhMArEATk9AUCwVWujHmGPBfXgfUZygVyzCf9Zx9XBPRktIubS/b7QwrgTpdAwwGvcV4U5mrHomPGUOiN9NaPZVreinPc1V2z89H30TwKKtwNJXGD7TR6aXOL5sLAVc/HPZaCASf04zMpS+SlJVuGd1IqsQRAlxC6+iLWEQ5h9ebsWDQwj/exMV6QAufE/esb07B3orNci2kSgYDRvenY7vTwz17pnq5jyjNcR1XsciERO65/u+CuFAQcc1YuQrq2yYEPpk6dR4WvWJgQjRo0ULGKiTincYE9eZ2FvOE+xUq5lBZDDR8JwpQ/Tnls+lQl7+i77E/X994bugmf/GdK57Nf6Yc0aTbZyajNWyKWy4EsYpcRybQ2zZgzgwej0XE/iEdNtaURtkilFmMGwvVck2aMRc+oYSxobt4o3oP3eHRcEX2AleZjqzn2Om6mdZv3t5b4AoyfxZDpZZoee4KR2Xv276bWwxzP7P2ToOK27RUtk0RHw1wn7YuFw5iApgVz2hRcOWOeZC13E5Ry1h3SLXOgBM7FEp8N8PSa31OLICJbKtNzmtrqJY7+BN54irEczPJkCmrg9APm7VJR06r3D3YV7A1FRg1nfFn0CEnABd/9wCwMX0oh11iqWo5g3WtjIF/mJdnzQhylEN9USMVhV0qkbvamsCs6Lp1eGZt6pwtxjeNq8Ns8gIn1yf7sNRtpSyeMog+vf5biUN0GRDy5AI4fb5AmUYw dY= X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1141; 31:5KZqag4ASdhUAUodcw1P8ePZRwZoMWn8HwUTtznq2cY//bJN0fQjy5MUExHvQMqWZTXgPJFjwr4GK+qzEzS4w5BfZVwQbiZLgnvFNIPUwAl66/SsvSqk9pVINa2U59K/DakJbCJQc9r/dzcTPOLypRmmTXH+fjmjYqiKdVH1ususuFEFtscDyJhL5ziyKxa7tp78L1s5NAmK3ceWOv/4yi6eL5R9Vkxu9r+2Rle2UKGOc2TScVwCDTWv1hOpzsdsHTOHUJhamp5z9hCObRG9Czi+wJlLgqE7hHqfpnRU3RJ7i+YMFucxPqCv+dJkw/sEfVDXg9oZXXdiVOb6rXXbIiwXTy79jp9HEceAYiESAHrTn7iP+0ShhtVltm9s3E+5nWXScKCcPqqLtWKSsypjuq6h+W5T9Ytug5aDzwzM4D4Yom905+ycwknODGTqaXMfGr+EzTiljyE0zFVpuaNfNIImqOHIQBoK0gYZSamK89rXtGC+qftt2SmgT9ViqwTycZ9tidhjgsr0Z1JMJw2bh91/5frAPHD6bYHt1CC6LfsoHRd5HUi6iuoqacHHJdUckTQR7Mrto//ebMoOcTnS5U675nJNHAv3T+8JeNoAHL6WGZtL194c5U7zipIvZ5MYWc0G9CV8lGWmTGjZSyJkiAtgALFM2THSxu0/5JD8xtk= X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1141; 20:zCETyG4l/04ABpld/iQez1uD7U77Bs3+traiiqE3la8OEXcO/0Tclk++oSPNXe5Wo9zDxoOLuk8+ujuQAMmCl+1AciFhRTe+OcWAFeSKQ0gP6b7j0W/BM3TwV0KRX/CdFxh+4Aau0AYhyCeXWAjua5Nn2Nf22IvLwgjajz3Mfkkc6aYKti9MwohbVzzsN7HrlXLGbGeDcIwlMxr0z/mDjhiUFioFqzmHTerE8s3FjvShIiHJPD0RPQPPG0JOmZLctSCIZY7LfQIXNNIfHaYziBUwLtE0DiPYkScVxVt25Ru8S4xw2idGix7D0UUUYWqePdv3NBn6KLLivwL7j7JJhkcvI5+keEr6MZtzxs5gN/5rf0zbQfpb2zw4mtwdFuQmqoPsn18o11qtVtCmrWXSc9F7Y6W1RRLqqddReyGToEEuqnje1BWv5uDCETRuo0gBbgjY7BHQR+dpnqbfrKS//xGAGNfgBu2aNku3+YDWfDNeA5IomTnQZPIG9F5Au3i9 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)(3002001)(93006095)(93001095)(10201501046)(100000703101)(100105400095)(6055026)(6041248)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123562025)(20161123555025)(20161123560025)(6072148)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY4PR12MB1141; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY4PR12MB1141; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtDWTRQUjEyTUIxMTQxOzQ6WXVweDBXb0VzQ0dyL1VtMDVEN2xlV1NqUzlO?= =?utf-8?B?cnZiZTh5Wi9vaUJGUnpHRklCbE0yWWdLS01NOFo4M0Zad21DTjJacDdZQU1i?= =?utf-8?B?UHR1bW90K1NFQXJ0Z2s1cmhQL0VJUHkxamJ6eC84VUtsV013c0tiRjhSSC8v?= =?utf-8?B?Z242bnVJM3ZNK0ErVzdsQ2lyeG9GRkYxWFRxOUs3UlZiUHZTV2lCcEk4aTI0?= =?utf-8?B?ekllNTh2bzJYb3lNajhLa1lMRWFBaFlSRUowS2ZycGlxWlBmK0piWjF2Y3Nx?= =?utf-8?B?WVd1azkxM2pac2dJRnpwdUorMmlMMXpHTURFQ3F4MmVLK0Q0OHdXamk1S0tP?= =?utf-8?B?NmNpVVJ0QXlQcVJSM3p0MGZ1UlNrUTRMdTdvamEySTk2UkhrS3NpWmdTSGdt?= =?utf-8?B?RjBNN3Y3eTJSQzE2cEZTQVJXdjRVaXVBSVpUU2g2RmtPb3BadGd6ZzY3ZVRm?= =?utf-8?B?MUhkTlFsZDJ4M1A0K0lrV1FWQi9PMGhESHArZGRjN0svRmJYenJqSVFvTHQ4?= =?utf-8?B?NC9aWk1HYnBhN0hJczdRUG9FSTRXRWVZbzJLZlZZKzFaaERTQTR4SXNuUUI5?= =?utf-8?B?dCthZDI5TG1KMFUzRGUwVXdPL083UmFDbXBEQzFUUzJORHZKVC9ueUd5OUZ2?= =?utf-8?B?U1FTMW5EaUM4OGhyZGF6eW1ZdVBiZHFyN1hNaVFGQm04NVBTa2ZBMXk1U0tS?= =?utf-8?B?bU00eVJ5WmYrYzZ2di9TeFdlOVBjdG5UNGJCQUh6OGNMMW95UVJzVjgxaERq?= =?utf-8?B?bG02OWQvV3BhMHRsSFgyRTI0T1FEU1l1QWVYanlXeWlFcGEvWEhNMzBzcFB3?= =?utf-8?B?M0xRamhQQ1dPRUZnKy9zQWp2b3dySWNkQ0ZsekJqc2g0SEk0V3E2ZXhieWJD?= =?utf-8?B?OWRDVHA2ZFJRQUdUV0NCRkRYdWY2RmZDZ2lVMCt0VzZvQ0daUWtCSEZ5UDQ2?= =?utf-8?B?d283QzFLR3JNQ3RKSTNoaEZHVGxxQ3k0bzEwQlBXV0tuZEp6bDFFSDFGUzZI?= =?utf-8?B?elltVFczZWJaY3F3ZEdYeVZicUNHcE1nYlRTOCtFMHJ6aHc1bU9KZmU1U0Vz?= =?utf-8?B?NmQ2S0E2STF0S3VvbnA4eDh4YURtRlh5cWZTQVMvbHZLc1RXL21vTXVWdHJ1?= =?utf-8?B?RXNJUmcyRERqV0p0RzAxZ3J6N2x2c0lDdFJDVmlaN3MwNXpQNGRpZGxiK2Vy?= =?utf-8?B?V2RmRTlpQy9rTnM5dXBOcWtUcGVWSGIvVEZ3ZjdBSTY1Z1djSm5jak80cDBr?= =?utf-8?B?ajBqa1UzTFl3Y3VTWDk5OWtGZnRmNnVnMzJ3Si9EMEFtQ0FmNDcvREJzZElC?= =?utf-8?B?WGF4ZS9ITUxYVk93YkNERTJBbkh5VnFlKzZScTIweGlIU3U0SmxSdi9VSWF5?= =?utf-8?B?WE45bnJEVVgwZWI5Y3o3RzNlRXlKbmtTc0Fkc0cvMTdTcWFvcmUvTTNXQ0NK?= =?utf-8?B?cEtHSW5LbmZScEJYcHozOXR0dEZmR1M0RUhhQXFxWGJBSEs1eXVWS280d3NW?= =?utf-8?B?V3E0MWhQdHRPaWEybFU2aVBXSzJTRVJJdXErRStMSWl4SCtjYk1PcDVsamZF?= =?utf-8?B?bnphem1MazBkWlI1M25MTTgxSHlQMTA5RG9IYjFKenZFMnNvRnNOMitaOGhx?= =?utf-8?B?eTd5ejF3YWJaVkQ0SkVjNC8vTXpIcFdBTzNscVJHK2hDZW1nNTYzZXZOeTZX?= =?utf-8?B?TGsxK29YWDZDOGJYRjI3VjdJQ2p3YkZHZlplcXh2OVdFdndVYnhaTzlkNEVt?= =?utf-8?Q?v1H3RtkKqdgcRes0WlHshezu5agRJvtW5NNU=3D?= X-Forefront-PRVS: 0351D213B3 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(39840400002)(39400400002)(39450400003)(39410400002)(39850400002)(39860400002)(103116003)(53416004)(97746001)(47776003)(42186005)(66066001)(50466002)(72206003)(81166006)(33646002)(7736002)(86362001)(15650500001)(7416002)(7406005)(6506006)(5660300001)(305945005)(23676002)(8676002)(53936002)(9686003)(55016002)(2950100002)(6116002)(54906002)(6666003)(110136004)(38730400002)(76176999)(2906002)(54356999)(83506001)(3846002)(50986999)(4326008)(1076002)(25786009)(189998001)(230700001)(4001350100001)(478600001)(921003)(1121003); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR12MB1141; H:tlendack-t1.amdoffice.net; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtDWTRQUjEyTUIxMTQxOzIzOnMvU0p2TUJ5cnBWKzdOZTlMQ05RTmRVenhn?= =?utf-8?B?M3NsWFlhaXV4djFqTm9lZ1o1cjRKblJoWEY3WXBFUlpNaWNCQmlsYzBGVmVu?= =?utf-8?B?bHZLeGlVVkxDVVNxa3NSanhlY3VHbXJUQmNncnQrc0pacXVsYjhKeW1xUXJR?= =?utf-8?B?T2x4R0dCVzhhRElCVkdsTGUzZk9nN2dDbWRwTkhpdXdYeU8yWHdGNDdGakdZ?= =?utf-8?B?NUZWZWxUK0pPS0lZOUhCSVE3QytiNm9XUFZmdlZiQ0RvUW5JMC85U25RWmxw?= =?utf-8?B?QXpDaXZ5VHBVVjBSMXdUa3FIZk84WXdqMXdPRTVjc0g3VGYxMko2dy92U0pI?= =?utf-8?B?Y1M1d0xlQm9HekhwSlc1S3JWTlRRVWQ5dzEzWXViZCtEdEFoQUxkcFVhNFR5?= =?utf-8?B?MmgyS2ZMZnBvR0lLTHltc05FeU5VWmlheGJSK0wxRVVuZ2lBb0RrZGV1ZjZB?= =?utf-8?B?UTFWN1lyTE43ZHBmanU3U3JjNHgvVEVkZ05ManJHZGxOVVFwL2ZTRVVUREJ2?= =?utf-8?B?NytoVkxxR3I0V1I3S1hPTnpFSHlSQVBPbjZSaXFGc3Zvam1DOVJkM0RBVmx3?= =?utf-8?B?M1JkNlVENGZEMWJWL29PSjQwRTIrTmZoUnZqZHdmSCtyWEMrSWNIQzFCaVcr?= =?utf-8?B?bTB0dXlyUlgzVzIyaUtlTXdTaTBNclB2dnhEZnc1dzJLWXZTRDNkMnMxd2Ey?= =?utf-8?B?cFdxWkZrUHNUOWF5TUx2UEF0OVVXVEkzcE9BRzVDYXhaN3hlQklTVUQ1QVJm?= =?utf-8?B?OEVsV0JYRExORzZOY3dLUUllTXcwUVJMcURsanhQYmE3eDdqNmtWZEhwcnEw?= =?utf-8?B?cW9SNmhnNU5UUDgyWTArMG5xUWRwbTEvclNOZUVwdHprNGFsbDZxKzR5RVZS?= =?utf-8?B?bnNxVTlvZHhrU2VZbVJ4MGVicEFxWG5SREdBRnQ3NHZ6eUFXZ3I3aEhFbnNQ?= =?utf-8?B?NGIzcmk2MDFXeDdmV0xETzMzQysxUklOVGJQaHV5TVFtK3RoeER0OGdGMk9O?= =?utf-8?B?M0FQVHB1Rm5MQmNLOEU1V2UwclpzaHVnNGxCSEpxV0xJNzlXaGgyRklOcUlG?= =?utf-8?B?aVVYd0ZTeHhsS0pHb3VqZFRwTDhQUFlKVkkrYUluUjFVR1l5bGx3cWhMaG5p?= =?utf-8?B?cytPcjVTd1J2eHk0c3FXcnlKczMvQWNtVFovdEFVZDJpZXlJdEpFN0c2NlhS?= =?utf-8?B?MWx6N2t6bURGNVVoaEQ4ZWtuYlozMlQ5MTFuZTdpcHRla3FOaXlZU25tMWVn?= =?utf-8?B?YzdjWU5xczZtV0pBcklxMFVkZjU2TG1ybWhwQy82K2xLMGl2VTNzbzJzQ0F4?= =?utf-8?B?OWtCbk9GT3dtbEJtZU1FTHhaRWZjRlFYTytzYzVNYzZtbDJlRTdickV3ZHc3?= =?utf-8?B?c21oK3YwYWVRWGtIOGt4MjJFK1ZUN1pZSjdxRzhCeTZGVEZnKzNqMy9NMVBz?= =?utf-8?B?cFFpNktpbC9tYThxSGhybjFoeUhvblcxTjNuUHNodlBBejU0M2xPVUg0T0tR?= =?utf-8?B?WWwzL3NWL2kxTTZUSFEyK1QxdnpSMzB1L1oyVDNXeURaMDdYblNlYit2UTVm?= =?utf-8?B?a0RWN1pkQXFrOFFoOUZnb2d6S3RFQWd4WEJxdmxXY2RncG1UZWg1VkN6a2Mx?= =?utf-8?B?V3JEbTZCZFM3ckZTUVQwUVlDTTdvL3Q3Tjg4SWlzUldkOWl3UGQ1bE03cWp5?= =?utf-8?B?YWd1SURqZTZ0RlBuZEgzTjRVQnNTUnBUM1JzZWtEN2VBb2lYSnRDYmdtSzB0?= =?utf-8?B?VnFmQU5FbDZqamtWbDVWdz09?= X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtDWTRQUjEyTUIxMTQxOzY6ZVJveXhIc0hNZ2FNWEh1SS9hTm5NcEQvblhF?= =?utf-8?B?cFRIbDJ5VE9kb2pmUm1Hd0Fqa1BZN1paTk5QK0lSQXo0Ny9HUVRsMkJuRFh1?= =?utf-8?B?SWVnWmVJd0UxWDdCajdtM1B4VlRLbzltTldjb2VmL1JVeGo0YlBuWUlObi94?= =?utf-8?B?eVk5VjBqazgyazIrbFFLdVVHeURPdkZkbUZTVXpIRXlqR1lpdVBueG5LY1FS?= =?utf-8?B?eUpJbkJGVHd4NTR1b3ZtYlpJUCtxU3QwVlFIWWt2VWtzbFk0WHRaSk8vb09a?= =?utf-8?B?OXdqcERoQlRIMCtyS2lFUTdwdHAwYzRpSC90WTUvTmdwSGFFK2Vnb3U0cVVt?= =?utf-8?B?b1grNnVMRVlTQXJNMkR5UXRNamplQk8rbEViQyt3ZTBPUXdJSytDMjNJU0FD?= =?utf-8?B?SWM5SUZma20rTGUySlBHR1RDSmV3SkZDeUVRdGxtTVVLbUpjNmRWb2RtcDJL?= =?utf-8?B?TkFWTWU1Tmc3VXZ0a1oxamZHOUU1ZFFKbWNmZCtTTktRQVhMak9kcVIxcGFD?= =?utf-8?B?bW51R2Y4MFk4b3dhWG03THlZbkpCbnppRXpMK2l4WGhjeUlyWm5QVDZ1elQx?= =?utf-8?B?VDIwck1rSXl2M0JITFEzVkRpUElVeW52aUZWOFpJUUYwR1hoelowQ01kNUxP?= =?utf-8?B?WEFJVGZtSkNyUUlDRkJia1IxSHJ4WWpmTG5sRUNROU9PNnEzR000UUhDSGxZ?= =?utf-8?B?YnJpWXlOZXdQMEJCTERSRHpCZWFvdjh1Q3gwZVlDMnhNYmpOLzk4SWMvZkhR?= =?utf-8?B?c1JjbGdkZkRjUThwbUN5V3VhUVJXZ1Y1eWxaRGFzamJ4d2c4aXB6T1llV0Z1?= =?utf-8?B?M3JWOTVOMHcxZzZLZ2pOK3UzL1VBemRmRGQ4ZFJ5UENqa2RKUUlQeTJ2OVJC?= =?utf-8?B?c0oxb0h6aitBTzJXTEZIQ1VnMXZsRVdMbXEzTzdybGFOaEtRNmZYSVF0d3FQ?= =?utf-8?B?WnpDYkI1cVY1amFwMFpkT3BqOFAwTHRZZVRDTGZVN0FLNytDOUhmSDRjRHlE?= =?utf-8?B?UHdvVTZnWlVsN29IN1h1aGNPT3ZOb1ZWdzNhb3ZVdlBBNERYbGg1c0dGU2ZL?= =?utf-8?B?ZzA4b0VHMktaN2ZHSERDVHpoMEN3ckY4T2gvRnlVMlRQK1d3ckljMnVvTHYy?= =?utf-8?B?SENTbEd5QURlRVVzUWN4WkU3TXBLSTc0UUZuWDJxbHZwcUo3ZjhVV09JcWhN?= =?utf-8?B?VHZSSUs4RDQ5TmZldVJxVnNiajI3cTNYZ0JtbUE1Ry84OVpXSElYeUNPSWlI?= =?utf-8?B?anNKTVNHNldaY05BWGNoV1N1V0RRYXVSdXNSalUzSlhWWlF3NEpTczRqYUgr?= =?utf-8?B?UlM4Q3Eyc3lNSXRXM2pHRmhUUytONHVGcVZmMTU3cU5PQUJOS3d5OUZOUGRi?= =?utf-8?Q?2+pj3Jg?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1141; 5:ZMIh9p0F58VUE3flpio55/Z9lafSoLx2KJfD4tfM7eRo4gv8mufBdlE9Ba9wtnn0I2jM0xNx8k/qI8dFMGDTqalScQkdXitFgwRliTwoVxCXvrYpMqx9Ab21HbjJk9wiJZoTamMjlqgY6hgnzdkZXzzG2ly/0d7mBol6zePnqiLTIjaQIRDt5vYZC4pM8MUwHg9Wy5qivrRLlGufIqKHbdl9e7o5PQwbRQMFRj4wKzHVw4tQXFPgB3IX+2JtosC2/uIBerOZBo6N6usNIugMtkBELHyOnkO7CS4o3Qg5okKloz5HSybufzbpX2BYwmIzQLKY35dVd5YkI8FA21yGgIH1GnUFxt63WowTEt42x0wPke2sM/LzsNEXLu3TpAA/Uc4p4Zmvsy+zEx4ddvvlBWqUZohu4tZBB2+cM6zQTZwJfLjo4wik/3ZBDRyZlXJXQPyN8JCyGfI2GlGhbDG6q5yQOzgc1tmfwLWGBYOmAuDV/gmYftp4fAdmSZJlH24k; 24:DbKcr0LZhF5JcyUlZOtqsEqyq95mZL8ksxFyMvA1Nq4ffFG2Mk5wqhlIyCzyQk4IY6uowQO8iQ+iOYGXo/qHYb7hXCdeG36LVYT2I+9RBrU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1141; 7:6ZiDHtslT0b8Acw/0zNv4/hMfRPewEZPEGBS44uww0l/NnuCFw77O9XdQTjnx0LLsZu6SDYIvfOzTGrKC+ioAsssNzA0Htak6cham4kXwy0PaF2CLaGvAToc9hU8h59NdM96JSdhH847px03BkWzO+CUznZxBUvVmXZTqesoGeQC5OlCXVZ5nFXfLLCQkL9DNnlDV3Zb7ghBIn/qFUEXM0As1YDGyU7yx8FUnNMTf9nJ9l6dI78Gah5OMoudrSL5wYsVMZ6CrSUzZRHwQAfN3+gYPO8/42uSYzS6SneYiuDw9h64Hq9FQtW8X4X+mpoaM0kGJ/GKr9t6gwgQg5PN83hg+2baoLgk2zcSPPqB0YTD1t5ROiIeReoZeAK7hB7se4ZMAsSmczrF4+FsLjcRtZTkHnhretOri4ZLEML//0frvIibD3f0npCCcGgZf++r1+FWFnvVhW+9GG5AO29pdipQ4eaJDHGvrQdiAt4MzyIXqd8AmUQTzA4TNCE78BYXksHkum64796h4C8B5x/DWWkP+ls3qeFsdPShs3POu5WFc+iDEv/4kp0ea6BT6KB1Zy8c+KtbNrw9Mp9qsjLSaYiZULJT4ERWxxXsM7MpErpAAKnoxMik8yCI6v9bg1GX6Itf2SsG2OPxsJJjb06HdOTqFNqgkCcgolKWWDz9JlGSz2BayQaAll9ibsSvNOMIgy83RUMczmCjPY6FbgEbb/+sj3pRNh82ybHdth0VHjexASA07700sfr3I1T6B2bOBD0g5xGAK50F0TAbWZtcb/5pDZykY2y4YumZ7mCo37w= X-Microsoft-Exchange-Diagnostics: 1; CY4PR12MB1141; 20:mwSAz0nV4GRqbb6tXBrDGx5skEHIYLLnY87mkJepEwpHdiOZDGhtvsSqE3H9FlZ4jy4xZfwYGKZF95cucZDondxdAXn1Nbi1dwJwpmFUC4LjCPy6cSrLnUxmUyQBbUxf80MYKQS27FAudNmO7geNPsS6tJSuNISoxLRT9/lH9GA2bPMbp9SS74475yW4lqKW75Sf5GN4eacSfqZ4+YdNjGaF+EFhz8oBiaACacJZQ+kq5lxEFWh1MKmnm1jIVK1n X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2017 15:10:40.3025 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1141 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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; }