From patchwork Fri Jul 7 13:43:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Lendacky X-Patchwork-Id: 9830427 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 D57E2602CA for ; Fri, 7 Jul 2017 13:46:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C8DB82833E for ; Fri, 7 Jul 2017 13:46:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BAEF7285EB; Fri, 7 Jul 2017 13:46:08 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D582B2833E for ; Fri, 7 Jul 2017 13:46:07 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dTTY7-0005uP-GK; Fri, 07 Jul 2017 13:43:59 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dTTY5-0005t6-WD for xen-devel@lists.xen.org; Fri, 07 Jul 2017 13:43:58 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id 7F/B5-01729-D109F595; Fri, 07 Jul 2017 13:43:57 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA1VSa0hTYRjed247xlZf0+htabWVVJKuC1L/kqQ 0SAvC1AzsWKdtsYucM2NBlxULbdQ0rSArMvOWGEKQmpWSNuxmWdGFUooZUZaRVqjZ7RyPpv17 3u+5fS+8LKnLZfQs73bxgoOzGZlJlMVkTIoOL8hMX9zVrVlR1neBikOJgWvDxAa0mbY6spzur bTldGsVnf00yT1Yc4TxoMJVPhTCUthLwi+/yYcmsQgXIbj0vJCUBx32ElB0sBnJKgYvgme93w gfYtlQnAKvgzPl5zBcQkDwJJb1JO5loOnBfUYmCBwOJaXlpNIQCYHBIkrGWpwIBder1TIOkfD 1mv4RrMMJMNRWOuKdhmfBxSdeWtFPhTun3lJyL4kXQm2jSX4m8Wyo7z0zEg94DtQPDDDyHwDn IXhzpZNRMudB8dcOtSKKgED7GUrBSdD3Xu5iJTwX7nqTFe9NAga7ywhlaJeWaT88aoiCytv5t EI8UEPX+aejdUEabvju0IqqjoKzQ8sUbIPm3L7RKD+C/OEApQyvaLh29N1o1i0dBF9cpQtQdP GEZYvHly2esGwJIqvRApEXdvFC9NLYmCzBara47JzVFr1kcWyMnRdFzszbuCwxZpvTfhlJV7F fpUINqDE3uQXNYAnjNO2ndZnpuslZzu27LZxoyRRybLzYguazLC4NHNyopxxOB28EbaNfkk0V eDPv3mG1SVc2pgRWYwzTJuRJtFbM5uyi1axQd5FBP137U/ZhmbDkOP7Zxu7zMYrQh2qRSqXSa bJ5wW51/c/3oOksMoZqq+QUjdXh+pfeIxUTUrHhwBa52MWNU3oPMs1o+KnuWN/Tuq8rQ1xzLK T21e+19zalflffD+v0G7o/BvU7D7XnmVJeJntWb+Y6Ppx4/ScucuXeluXupHePMiJ7yqu+hZL HnG+ndB4fiP3ysCmkQm0wxKex6KMmfk9lKlTUma2LNHWVb4QfaRXnzmas+axKY3bmeRIxRAX7 y9uMlGjhlkSRgsj9BTwdTrWaAwAA X-Env-Sender: Thomas.Lendacky@amd.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1499435034!63061216!1 X-Originating-IP: [104.47.34.77] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 9.4.25; banners=-,-,- X-VirusChecked: Checked Received: (qmail 33493 invoked from network); 7 Jul 2017 13:43:55 -0000 Received: from mail-by2nam01on0077.outbound.protection.outlook.com (HELO NAM01-BY2-obe.outbound.protection.outlook.com) (104.47.34.77) by server-14.tower-206.messagelabs.com with AES256-SHA256 encrypted SMTP; 7 Jul 2017 13:43:55 -0000 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=Qobigysp5vC/y9RkmLyxbxlyLBIlNOTkyeoQQ6w4NCk=; b=a8fRfV+XwG34LZgDmwAwCz/6yzo6IBzR6k//7zMzknK+9OJZTxsUiRygWcQL/27Pz/pWpPsCFn5cVSXunwR4tc27SjlI6ku68ck9fzEEX5WOs+20b5XYJs7Kok3jwdPVMJ8fjDkTMaMVA/HBnmNmi7Gusdv1s1XAA9eBIclrjD4= Received: from tlendack-t1.amdoffice.net (165.204.77.1) by MWHPR12MB1149.namprd12.prod.outlook.com (10.169.204.13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1240.13; Fri, 7 Jul 2017 13:43:49 +0000 From: Tom Lendacky 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 Date: Fri, 07 Jul 2017 08:43:47 -0500 Message-ID: <20170707134346.29711.20203.stgit@tlendack-t1.amdoffice.net> In-Reply-To: <20170707133804.29711.1616.stgit@tlendack-t1.amdoffice.net> References: <20170707133804.29711.1616.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: MWHPR1001CA0019.namprd10.prod.outlook.com (10.174.165.32) To MWHPR12MB1149.namprd12.prod.outlook.com (10.169.204.13) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8ef61f47-a6bb-4d4e-12e4-08d4c53e3412 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)(300000506095)(300135500095); SRVR:MWHPR12MB1149; X-Microsoft-Exchange-Diagnostics: 1; MWHPR12MB1149; 3:YWXmN8/jjEjjOJIcKfI34Abb9egR+QxZfF7Jj5NGJyqeQleJ/wbTwOx9V2ktyBxFZ9v0OnQo8hkM0M6fMT5xd8TC1o2d91YjsVEmrq5/aoOvnZUrJA+o5MsBkdVyNBrjYt2zbpBHstifVjK/jYpGViMV8v2D0MjgkWDgC4Z25V3OUhFpFi9ccSdgoPSpf2ab1rasx+D9lE9VxPUkUzW7l5oUGW6/wfcfvdXh3MP/PiUXp63kzqEL2GptbzQt+DtsxIAROi3r831HZBqShepd3uHRZxGTa3TrK4gPxqX4+JyPICxe4Px37YqEuOVPHmQs4wE+3S2ZyG0Wv0+wGPg6rnJHmiA6TWjDYLYf4IV6yVdlQDmDYElpymhqJerxTPqldtkdvi2hXqVnD19+hB3lEIa3TEECcCwLPdife20CjpMfPdJI0RlxrVEH6L/mHptSdAyO9Z4r0CXBTFhuP6lSmp/Ng59CWzP3cLWBOXTeRcS2c7MJJhjO3uRrr8WnBuwtJzUqvUFE2UWetpGIByv53WfD9cTjHcWnTu/iyIMY2wGZFBFwvOQqi6O+Ft3DJSG/wa3eZ7x18lrI5ezM6GJVtCzcQDztuOSN4r0qj9xnLWqPKuMJOA0xMSjw2w7eHlKjVcJ9lrc4cQbsImYcIbGkrtYtohysFrNUhc26DfOsq24+1C9g+CtSgKig0CAIb0xlK2gXuG7pqUyoUzM/1ZzTji8fMxt8gSIMYtJIH4PA+tNytHLdTxB3KYfeUYMteBDL8Je8Shw3qbo4SFRdMqe36A== X-MS-TrafficTypeDiagnostic: MWHPR12MB1149: X-Microsoft-Exchange-Diagnostics: 1; MWHPR12MB1149; 25:BoLm1kA4LuyY4ziLRALPlmFCt2fbgd7GRGDt/alRfBbuL4OOmZHMkvEYA+sfnFJpmc31V77PCA3Vodo+oprgys/+zUFetXqKFqQJLgiNGUKDkwBEfstqjnEroXHpeDCxwIh+Ze7y5PUAv8gQRXcfHfeix3t2sxlA+X0EndIwZZce0uW/LxMLbHI3K0Zql7gWziTWBEGJSRTIPpFsquxRBh2esiUKBUv35AHEFArrfFPiU4dQSUFBDJ3aLKDpNKrRyRQsaH8u1jTj4BwxM6jTW+IwOhX7UEg6/aodAvtXzDGWTS0MlBREdO2JPnRSdgNsXw8hkLW9ix6iWU7fpdsk4dvXwUCCB+0EiULvYyDGkbQWpxfUDv+QgVG4j9DgV8u3D59Wq9aOXpXrucVnmqbR/oSLtKmkKzjFPsRO3HrNpRIz4G44l2Pf+YllnregEkXNo2PnlgfSCA9WZFvkOcT/clACvcMxMdHIyfPv4HCnAVfWgGHT3Z+HZzU+clp/kvd0l66ufP/ltlfXjyFiAqdCoIeUbvZff5PV388lp5+wimumrry6/Wun5EgX/hEFdaZsIA2ftF2VmM0dwN6Qf6RkmwdVU27A98ORjDOxzI5Ks5kwChVNXu8GCr16cCPWlidqqzUwquXjqPTVNw9orVH5nS8Ch9J+/T07ScPbZn/Oz+AMMDgeKqpJy3uqZ1I/cnRbq7oV3FXokEj5Jr+lTu3xFznIjI7R0QNotuTQi6O7bkPpHBHAdXDHqWKfDO0aDMRIklOQ3315324UKXc8XCchfaHbyZSxY1AkEIdtEhcGOMEJITAJ42dgTyLLGlrc3KNIizjxYmmkT/jBYf0GwWuCOXT3D7ym2xOBuvhFu0iPiCSYHTDiLUBkTKVbXlSP/VkWBj9Ytw+CsrjmFYDh+337AQ== X-Microsoft-Exchange-Diagnostics: 1; MWHPR12MB1149; 31:M0xbWh4CgKZ7i36GtOJIOO+9+nhQUbj0E/6rjPmtyTcOSLzbPvwbtAFPop8Cyb7guMa3eeZx1xwK4waJsSeJcMrVJ/pGS1mmBupPcdgbUYkO6WsUuw5hvEZnlf0VwvnedASHrBvVZA7iCnweNVvp+F4KQAoza2qaFfyZ8vIwj38NKOLQwC2kGmy7uXRLdoi+1jUuniL1vzV8agSfkyusB9dSn8rF7bwe7FIBwEBLsbmBjrQZdYB3y/Dnv0bUxJbdkdjDYn4QwnXfPg5DE+Vlbdr7B1ysM/zXDxAdrwqNVaI8475bZvmtEbjW0Z1+Ze/yv9y7Hdba3PUGUTWgdv24hrDOuikVD55Jmw8tQl94JDCG850Ourj8X5Xa2LTTW+cp9kHH9mMqW2fF8dsvyFXroYOEESsEZxnkIHi3Ki86m3t3Y+DE4M8G0mwEmBckJTf5jx/N3r5TMaRngcVET3IXLfmB86NE3hACLuu5wgzr7uQG0IBRzcIoqXmv7luyo2XnCYTZ9DeGIARQG7hPDua6aF0RnOo3ptbrs84olKL09DCarMn8t89avVm0LKzyANWQie+yK54AmnNFrwZKfewy6MLTJa3iF0NlxdvVtAbC3CsfX+YMOUPeLSJ59HmEtenICqtA54ly9mcw84MpDbPUOdMIo1OtbJ8vUd14EYRds3w= X-Microsoft-Exchange-Diagnostics: 1; MWHPR12MB1149; 20:hzpXxVouQ9PQw+Rpg+1eefxaAhUOjrNLgofN3yq49r8vtn8tmD9guJmu3czew/mKUW+LyHWzOaGkPew7AC2LrSvI+nKgZDJCoSGfZ65aYO2PqgHDZDZxbUtW2HnqztzW9QbXmNguyRp2cfGir6qgxQo1QDnbEyV9AVQQ897wdqe+YWmSo6G1pDedxmCaIgBvqQwqPwGmgLOsdBpm58kYkFKnNcrOksetEdmbZ/ybfCF9QGYXaQusyMV03IxWh1phn2o0n7ZQCMHDa0VaxJJ+zM0w6kCxR2iS4IqoU95vUWVRJfgixIa71vb9wGKLRwNPfL3Wj4FmMTT0hnyd3/8OA33g644zS5q380QHUVtPTIi3qfNhsRaxPO0c1hEv8T4bno7uCPEz/zjg7Bfkvu26JkaP1Tvi4IgmGO4kzs33HjhXcHUXiQLmNFkuM6eJjOskzb7qHHKTr5tR/gKon72Xboc3tL8GUztqGGxWGKp7S37vOPhcXn2fbzNBgzLjvcdU X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(125551606395959)(133145235818549)(236129657087228)(767451399110)(148574349560750)(167848164394848); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(2017060910064)(8121501046)(5005006)(100000703101)(100105400095)(93006095)(93001095)(10201501046)(3002001)(6055026)(6041248)(20161123564025)(20161123558100)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123562025)(6072148)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:MWHPR12MB1149; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:MWHPR12MB1149; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtNV0hQUjEyTUIxMTQ5OzQ6b3Z5MnRuSnJDUWdSdG8wOVFjRlNkMVF5NDZD?= =?utf-8?B?SjM4TkNabHNQZmZwNEZpQVdZaE5WMGFlYXJZaWxqeTRjUm5Ndk1pVnlkL2ty?= =?utf-8?B?cmNhOS9WdjcyZWJ6dTlnK0NIaS9RSnlMTDZkYmJSRzRhbng4SFdoekYzVnM1?= =?utf-8?B?THAwQ01HZzNDQitRbW80Q2F6bS9NdW4vc0tGTlhGcnZzOGFIY2ZObEx3UWZ3?= =?utf-8?B?eWh0M01qSnJFUUtFRmsrdmtmY29sYTU4VUNMSWxGbVlKOWt1dllOUE9NNnhV?= =?utf-8?B?VkVVQXBkMU5PbDdlZm04QlRZNkQ2RTJMR01mb2xZL0FTOUY0ejdmT25ZS3B4?= =?utf-8?B?SDMzbDJISDJMNk9YQy9LS2JZTmJMUkJTWjVHSTN1OFpqS0M5MVVWbmdhaFlJ?= =?utf-8?B?eUd5ZE5EOHJuUWZ5R2JXSFcreDFZa1FEaUJ0UFlicW0zUWhCSUdRZHZQUWRZ?= =?utf-8?B?TW9LN3dUT0lvSjJXQkZ0MHJsOXZ0emhFdVJEdERXZ3JUemZQL1lpQ2k0RTVZ?= =?utf-8?B?L1VKK01YTURuMnpNbmY3M09XOVp1N01IaTdYWU5TNkpJV0YvbmNPRzdwcm9L?= =?utf-8?B?MEppQlF2RlpuV2JJZFZucVNGWWovckZUTmZjUWNmYzFrZGdPeEZoNUZnK3JI?= =?utf-8?B?YVBkVFpBRW5jeXAwRVFqNlM2T3dZcC9lbHYydnRxNEdHYXArQ1hvM2kxQlN1?= =?utf-8?B?bDZsemJlN1NiR0MxTUQwNFhYRFppWUkzOWQ3VHpzeHlrYWN6YlVwWmRGdWFO?= =?utf-8?B?ZjMrMy9xa2lpd25vNkxoNjNqQmg4UGc5bnhMVTcrVzUvTFUrWm03ZG5RUjBo?= =?utf-8?B?NExGb2twVkxtZUloMVYvdmRxdngwa0doM0poR1VieVlvK3Y0VDU3ZTBWSEtD?= =?utf-8?B?ZHk1OFdPVUUyZGxEYVBKb3o5b1VETUM5ME5JejF2OFNQZE5aeWU4elJld25M?= =?utf-8?B?QnBrZXhEWWl1QVNNelM5a0lUTmxkbGp2SnowL2RPaks4NmZMZDM0Tjl5d3hh?= =?utf-8?B?UnBDYTBOV1BNNFJ1cXQzd3UrRSsvYlN3ZURHcDlpeTN4dEV0NFY0MEdCdkhM?= =?utf-8?B?clAzbW9xMUVnYWRVQVdtTGJCNXVTWXlhOWNQREFqMVc1UXpzQ29USGxOc3pv?= =?utf-8?B?dTZnMGtaUEVuS3o5c1FpWWZ3b21vQUs1Y0pFQzBzeTgvN1huZk1qSGNnMENQ?= =?utf-8?B?SkpPYlJxY0U5UXh1T3FnSVZhWEpuMVdQVnM1VFJZQ21xcWhhakQzbzVuKzZy?= =?utf-8?B?TUU2NGpoWkJqaE5xZ2VyVWlBcjhBMTRKNTYvd0Q2S3hUQmdYTWRuNjNVaEhr?= =?utf-8?B?Yk5VSFl1dW9udHM3OWdGWHVoWnVaK3FLdk1xTlB3T1VOQXB0dmQycitabXBR?= =?utf-8?B?b1piYXl1YnRNeGtCbi9IWVY0MVFzU2ZHMGhhcSs4aU12L3phRUE3R09LUW9i?= =?utf-8?B?RkJXaDlUaWQzZDdNZnIxRXVEcXk2OWpUT0xZZGFNMC9oS0NaOEdDdm1FWXlI?= =?utf-8?B?RnpYcDRVNHZsV3ZmQkk1Y2ZCU20vUjg0aWJQd3BHc3VvSHhsOWovdUo1ck5N?= =?utf-8?B?YWZpVVVnUXcxd1pwMjVjalg3ZWV4ajR6YUhMUDZqeTZ3bVFvcmVEMXVnZGUx?= =?utf-8?B?NllOS21KQXZuRTM3eXd6VlZmMlUycnUrY0lHYUY1cUVVM0xqbWFFOWpmV1Nq?= =?utf-8?B?Q1pLLzRNcEZVSjM2cUh3RlE3ODFBOWNHZEhUOFVkdmxIbnRiS3VlMXRMUkhh?= =?utf-8?B?YUlvTzJaYWYxcjBvdHRsRFE3cit5NmNtRjI4bTJpdGgyQnlmek81TUJnbWxy?= =?utf-8?B?ZlJxQi9xelVJVUc4Qm5XWkozaFpuajhmL21CbUcxZWhHY0R1Wkw4SldKMnFa?= =?utf-8?Q?lwGTRsMJbQq0NVzTSGNHodKrkp5SCtf?= X-Forefront-PRVS: 0361212EA8 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(39400400002)(39850400002)(39410400002)(39450400003)(39840400002)(39860400002)(9686003)(54906002)(53936002)(33646002)(47776003)(103116003)(6116002)(3846002)(25786009)(54356999)(76176999)(110136004)(38730400002)(42186005)(1076002)(53416004)(4326008)(50986999)(230700001)(66066001)(6506006)(86362001)(55016002)(2950100002)(2906002)(23676002)(305945005)(189998001)(50466002)(97746001)(478600001)(575784001)(72206003)(81166006)(8676002)(83506001)(7736002)(7406005)(5660300001)(7416002)(921003)(1121003); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR12MB1149; H:tlendack-t1.amdoffice.net; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtNV0hQUjEyTUIxMTQ5OzIzOk53MG1BdVpzV2I2SXpONmpidWovRE9CTWVF?= =?utf-8?B?UUFhTmFQaHozRFVWamVEL0NYV1N4YzVWS1dDTW5PMmszZEJIMDVOTWEwWVNj?= =?utf-8?B?MENENUZzYkhvRHNPRGwrZVUwYm5OL0RhKzZFWHdhdmw2Sno5bXJoenJsRGNw?= =?utf-8?B?c1g0ZWZZRVRFWFVPWndQZ2hSZENRZTRnTmx3MCtqeXhzNGZIZDcvWWJObUdX?= =?utf-8?B?L296K2w0QmhCa2tJaXNTem9jV241ei95OFQwUFBtU0x4czBlK3p3cXlPd2tV?= =?utf-8?B?VTFQL3gzUVlwVVFZeUEvei9EQTM4VUp3V2MweDltOFVGdTdJelA3ZzRSRHkz?= =?utf-8?B?YS8ySFU4bzFTd3JJRFVWd1c5Wi9zRG0vTnVkVVU3bU9FN01hTEJCU0xPZWxX?= =?utf-8?B?QTNIY28rMkw2eE1uMktCbmpVcGZ6TjFHOHIveG16a2lIVFJMRlpZQWtQdXEv?= =?utf-8?B?NzZTRFlsMDU5dEN1czMvelhFR2E4cXJvM2xJTVVtNTVzS0dzbHZqS001MFZL?= =?utf-8?B?WW45bHExbjZXbGdBMCs4aHg3dDg3cmhuOURoalVIVFlxS0RzY251NW83NHRV?= =?utf-8?B?VlozWlNQRThad2FNSTdnekZvUUFGcEF2T0RmbDhVb3hlcmVqZStRb2VBcElM?= =?utf-8?B?SWlIT1ZqTThsaHQ2a3E0cTdFTk5XVjhMMWVmdXFOekZ1K0hONnE1cTc5M01a?= =?utf-8?B?MTVMSGhBK3ZORGd0RGFTYzlQczVSWVlhTFJSS1NhZ2l0RTRucTdOTHI3SytV?= =?utf-8?B?Y1k0WDhWb2ViTzRPcFc4enBRbHJRd3dQV3cyZW9nL2g3UXVTYURNYStNZ24r?= =?utf-8?B?RGNvSHJUSFE3N1dtK3hucDVNZFlyd3MwNlNOTXJkdEVPN2x0TmdNUGFLbUYy?= =?utf-8?B?emFwWDN2ei8rM3ppWTloT0liVzBiY1hRZ0x4UWJ2bThtMXFPYnVQa0tsTXBU?= =?utf-8?B?aWMreDkyM3ZINTc0bEhGSVJQTHVqcndGOFdzMi9YVzRaVTQ4U3J6QmFWODA4?= =?utf-8?B?YnEwSTBDeng2MERBSnF1Vnk3TDhWR29vanlSS1NIZVFjdXpwVUFMcUxGdm5w?= =?utf-8?B?VlpLODUveTRDMGp3ZlpOZGcwR09yaUV1cFZHMkZvbkc4dzdWdDJVeUZjbERH?= =?utf-8?B?NVVHYk5oUUpGRUkvdkFUVklDM1dYMzZUWFFMdGo5WnFzeHA4K2VSRTdoQkxh?= =?utf-8?B?d21JZldKRVR4RUEzZTkvbVd1b2JiSG9uOFZWTTlJTE9sU1RiRmpzQ0ZlSHI1?= =?utf-8?B?dFhBMDlJUVFKNU5QN1prV2ZkMVpEbVlFN2VtZzExY3FPbWxIT1MwRFRBUGx6?= =?utf-8?B?RFhyNDRUNHBzYVhzVGxYNVBVUWZnTWxjN0ppOCttRXdzb1EzdVQweG9sa2pJ?= =?utf-8?B?aEl6QXR3cVlCYXoyeXkyZ3dXWUNpeVlJVWRBTGFGOWpuRGtFZ1ZyaFVpOXFZ?= =?utf-8?B?QzVwdFVvTkJyUDZTYUFEdnhjNDRNV014bTFvUTlOUHkrUGkxMmhVSEpuQnp1?= =?utf-8?B?c2tRdER4SDZsVWluL0FzVlQ2dFprVjlqOEhUdGVqNVpkajN0bEFKcURvY2NI?= =?utf-8?B?blZQRDBOTjJyZUFzRDk2UjlmcEptQ1B2T0NqelE0NGNIZ3MvbjcwT1JIMkFx?= =?utf-8?B?dkNxb3hqWVZUNk1XTk9vVkV1bHpBNTZIV3ZnSmF3YnNtY1ZMaU5tZlZBPT0=?= X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtNV0hQUjEyTUIxMTQ5OzY6b3ZDeDBHZ2hlZWorempZa0lGMjYwZnQ5WFJa?= =?utf-8?B?TFM1T05lWHFndGt0Z2xxV0UwQmpseG8wRkdSWnA2UmlyeHhhZjR2Wkd0SjBi?= =?utf-8?B?aEhPRWJqTHlwN0VzR3RKVTVmdG9Rb1BLYkJ4UnVQdFpEdExXYXcwbmdUN2kz?= =?utf-8?B?cHo4UW55YjY3anhlbVRuS2NzRVl2UEhtMmV3Yms3WGI4YTNOVTNuSGNYY2hm?= =?utf-8?B?Q1BaZ3dXcHd6QUNpcy9lUUMwQzM0RVJRMm93QmJyNVFZM0F0RTJuVUVxaVFr?= =?utf-8?B?RTU2V3Vtdkg1R2pDRHR1aTdBSk0zVzhHM2lweXNaT3ZPMnM2T3VhMzhKUWpR?= =?utf-8?B?eHY3ZEhRSlFZTzlJMlpubFZjREFOSUhJTTFaV1d6Z2MySTlva1lVNWw5WVVR?= =?utf-8?B?MDhDUUNPQjFsNXBLdzUvbWt3YVpLdzlnTWhzL0kxaG9wS0pxb3JKWnZzM21n?= =?utf-8?B?NFpjM1pDNWpGVGxVUWRTME01NVEwU25UTnRYdXBYUFF5aWZIeUxndFJOT0xq?= =?utf-8?B?UEdXaEJJME5hcU1icEppUlE2MEd0R2NvaWFTam9jY1NrMWxJTUhuN0pHc1lV?= =?utf-8?B?YUw4UTkveHp6N3AxdGNiaEV1UFlTaG9HRXhsVDNFTTF5NTFKTjFYb3JoUUwz?= =?utf-8?B?a2RpQ2hnQmJRYmludit6TmxaQ1RidXRzeTFuNzV1ZVNZRUJXKzBwd3BGY2Zx?= =?utf-8?B?QVUrSmNwS0tVM3l1MlZBdTZUMzNxdjRSQ0FCMnhnWDlaMHhVZGdXQ0RUOGVn?= =?utf-8?B?eXVzQXZCdjFrWGQxS0dLUlZPTFVlQ3IrQWZtOUtHRXc5a1pURldZRitYMi9D?= =?utf-8?B?elJqeGtnc29jZ1NNSnJpTVdnWEw2VXg2SENiV0U0aU9wTUhObUNJUGNhV2J1?= =?utf-8?B?cHkvU3FjaVJlcHJIU3ZtMDJEWUlCazZtYUd4Mmtya3RpRmRJcU5kSnJnNFRl?= =?utf-8?B?VHJEbW83VWxGZjRZNFMzTVRrcDlxY3BGM3RIZWVXRmRsV0xRa2czMGVHTEpX?= =?utf-8?B?bkZkNnJ3T1JTVHVFdkR1dFVVam9zNDl3VnhVNmhEYjlBM1VGSi9FZ2ZlUDBB?= =?utf-8?B?SWk1YnFXcTAwYTNhS1o2ZUlXMTdDYXgrVUxQdU5jVjVRaXRnM1NvMG9HdkFD?= =?utf-8?B?US9JVml2Tm1MUEFyZ3VtTGU0WTlnTzNJbVp0akVKb0dCaXB0ZVo0a1M4YVZM?= =?utf-8?B?d0xMYXV4OFhqSnNBSGlwYnFlZGpxQjJmNkFIcktlMkE3amRkaWl3L0VaeWd1?= =?utf-8?B?VU9xYncweG5OK2dLYmdRR3AzcWhtWGFGRDZxdjBnOThpaTJQcWFubitIVDBj?= =?utf-8?B?djNNL1kvZm1xU2hLQWpLditvcENKOUlJdTZIVEk3dys4bmhSSXVUaVE5Q3g2?= =?utf-8?Q?NdUldpN?= X-Microsoft-Exchange-Diagnostics: 1; MWHPR12MB1149; 5:tNK26Q76pfL6rjdM1kRkPwxhR4SYyz1D9C/U+tkxeo+E7I7RHabJWlupYRudxUQ9QNiihx+QlO64eTtTGPrWKGZxdKnV7iQPbH1WcSG6j6CsUsgC7wswJ59EMso2ApahbgiC1PlWqlgpmtDI2V/0suzI8KiC4H8wWV7h9VDAshyQBNq6VwHDCVuBAHbbcp49+nTF/NwMpwHO6gphtuApN4mDP3FfBnICMA5IaeVoEOMCZmo3Ys8MuSmvAHYmfuokXe++oRj8y1C96+sljpKZlvIoGFRJDpefW6fmkkNL5ndlpAgMXnEK2OaVxDgYRVdrCQTJ/LTyKZBX406aXyaoSSJBgSWYSERZZ0aus4wuctX+noEIbMhQF8TTIjKIVBwyzYD6N79ZMql333sslgG6soKTiQDZ3+bFbbW6HggySt3HqMnM5ng2+ZY6L4DQVff0T+LTr+wwfctIiQTrnOSI3200qAP/DRpcubJR6n/0+BCNKrST4VW/2m4FNswYh9rb; 24:oCJNDTWdbIBWobpomFqSg2CGl7k23G3G5/Tb15kXG5cw7KxtFIxgfdHchevrPIOMTab34oEBIGirr23rmew2q2Z0K/qkEi6j6nVMNwPTyng= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; MWHPR12MB1149; 7:ou/F3NoE1mG8LblEdeHmQnRhQLyvGJo0xzKkUvVrFNqezV6/IWxXsXgsvA80wg+G2fLT1CYGCw6jlD6zZShxXJEUpBQCN0EiScG2nioFkZkRIQwgrQ68VlFTry9bNBQ+M6TMzeAAbmABtmRz4qxF2UD6dySs5b9GB5AXV6WJYCQLYcR9bNGipU7gKKtuZeEyPSeef2+PCMoAFdSvv2WwGPVk4f5gne304puOKaaYFcL0ueyRALMQQa/h4k1kJY15wExG9kxWgxOYxkWVEGOSxjYnlEUURefD4zFhCiWZfyIuoXFDkPXTOX0i7+EoALNdKnsvmEnG7S7FOoYtgV5DeLPwAyotwFNhFycpsyJNCHAubF1iQqLMWgCKa0xPF+i/sSTTgWWZ1CSu8WwgBRRjkVCmCoKRKEVDad5DLVOkVTr/FtB1kM+A8nWCrOEU01ljFtsJgqBh02jxE38GY5DkUQNW6QCIrMSjFd/olbl1sjv3RM9HSYAGKTPYyLIwA40brh7UnUzZjJvyRIfBcawMdePC12Dl9Pk5SF4uyIhusequOULPGz3kOifgf+TxSgL2oR+srTWjDHl+G02paz1crPIdFTimUPvKwwYHUEIAt8Vvr1tSsdoRDo4bsDlgPhUkEn52hC7AYb3E79SrMRHjPDZW6q0hamHDex9hDHVejZXBiUNStLGo3PPrhQAyOweWH8/TJ6MXuseFppBkwzceabukH/rV/18kCBgof1cvOFlPC6m4Geci/x9kMHMypv/XDqapbgjOEWQHmUf9Qx5SvGu3m9M++0lBdhddoa5QKcs= X-Microsoft-Exchange-Diagnostics: 1; MWHPR12MB1149; 20:cHVxnr1/z/RFYZCGn/4Ma7zX3VG1W4D+6ib3ZPlrNwxv35GzyKRPZiACGo6/ppzqDp3Cb5wfCURiJTMZYBShV5zhympHmnf3atyb5S5/EHpSb5rfrHkWSFRwepetU8NVeInANk+kQQsUhtboxqptOB1Wh9vvVHCm1m21gXFnYu6IkG8UbWhCO7CoA8VdX9gYp4kFx/E7SXv+NgVEO1VsFpUDsWwxXjGwWO7Sd3sLZu4pYYAC98eZanbfa0Q2Ag71 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Jul 2017 13:43:49.8389 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1149 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 , Borislav Petkov , Andy Lutomirski , Thomas Gleixner , Dmitry Vyukov , Juergen Gross , Paolo Bonzini Subject: [Xen-devel] [PATCH v9 30/38] kvm: x86: svm: Support Secure Memory Encryption within KVM X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Update the KVM support to work with SME. The VMCB has a number of fields where physical addresses are used and these addresses must contain the memory encryption mask in order to properly access the encrypted memory. Also, use the memory encryption mask when creating and using the nested page tables. Reviewed-by: Borislav Petkov Signed-off-by: Tom Lendacky --- arch/x86/include/asm/kvm_host.h | 2 +- arch/x86/kvm/mmu.c | 12 ++++++++---- arch/x86/kvm/mmu.h | 2 +- arch/x86/kvm/svm.c | 35 ++++++++++++++++++----------------- arch/x86/kvm/vmx.c | 3 ++- arch/x86/kvm/x86.c | 3 ++- 6 files changed, 32 insertions(+), 25 deletions(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index 695605e..6d1267f 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -1069,7 +1069,7 @@ struct kvm_arch_async_pf { void kvm_mmu_uninit_vm(struct kvm *kvm); void kvm_mmu_set_mask_ptes(u64 user_mask, u64 accessed_mask, u64 dirty_mask, u64 nx_mask, u64 x_mask, u64 p_mask, - u64 acc_track_mask); + u64 acc_track_mask, u64 me_mask); void kvm_mmu_reset_context(struct kvm_vcpu *vcpu); void kvm_mmu_slot_remove_write_access(struct kvm *kvm, diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index cb82259..e85888c 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -107,7 +107,7 @@ enum { (((address) >> PT32_LEVEL_SHIFT(level)) & ((1 << PT32_LEVEL_BITS) - 1)) -#define PT64_BASE_ADDR_MASK (((1ULL << 52) - 1) & ~(u64)(PAGE_SIZE-1)) +#define PT64_BASE_ADDR_MASK __sme_clr((((1ULL << 52) - 1) & ~(u64)(PAGE_SIZE-1))) #define PT64_DIR_BASE_ADDR_MASK \ (PT64_BASE_ADDR_MASK & ~((1ULL << (PAGE_SHIFT + PT64_LEVEL_BITS)) - 1)) #define PT64_LVL_ADDR_MASK(level) \ @@ -125,7 +125,7 @@ enum { * PT32_LEVEL_BITS))) - 1)) #define PT64_PERM_MASK (PT_PRESENT_MASK | PT_WRITABLE_MASK | shadow_user_mask \ - | shadow_x_mask | shadow_nx_mask) + | shadow_x_mask | shadow_nx_mask | shadow_me_mask) #define ACC_EXEC_MASK 1 #define ACC_WRITE_MASK PT_WRITABLE_MASK @@ -184,6 +184,7 @@ struct kvm_shadow_walk_iterator { static u64 __read_mostly shadow_dirty_mask; static u64 __read_mostly shadow_mmio_mask; static u64 __read_mostly shadow_present_mask; +static u64 __read_mostly shadow_me_mask; /* * The mask/value to distinguish a PTE that has been marked not-present for @@ -317,7 +318,7 @@ static bool check_mmio_spte(struct kvm_vcpu *vcpu, u64 spte) void kvm_mmu_set_mask_ptes(u64 user_mask, u64 accessed_mask, u64 dirty_mask, u64 nx_mask, u64 x_mask, u64 p_mask, - u64 acc_track_mask) + u64 acc_track_mask, u64 me_mask) { if (acc_track_mask != 0) acc_track_mask |= SPTE_SPECIAL_MASK; @@ -330,6 +331,7 @@ void kvm_mmu_set_mask_ptes(u64 user_mask, u64 accessed_mask, shadow_present_mask = p_mask; shadow_acc_track_mask = acc_track_mask; WARN_ON(shadow_accessed_mask != 0 && shadow_acc_track_mask != 0); + shadow_me_mask = me_mask; } EXPORT_SYMBOL_GPL(kvm_mmu_set_mask_ptes); @@ -2398,7 +2400,8 @@ static void link_shadow_page(struct kvm_vcpu *vcpu, u64 *sptep, BUILD_BUG_ON(VMX_EPT_WRITABLE_MASK != PT_WRITABLE_MASK); spte = __pa(sp->spt) | shadow_present_mask | PT_WRITABLE_MASK | - shadow_user_mask | shadow_x_mask | shadow_accessed_mask; + shadow_user_mask | shadow_x_mask | shadow_accessed_mask | + shadow_me_mask; mmu_spte_set(sptep, spte); @@ -2700,6 +2703,7 @@ static int set_spte(struct kvm_vcpu *vcpu, u64 *sptep, pte_access &= ~ACC_WRITE_MASK; spte |= (u64)pfn << PAGE_SHIFT; + spte |= shadow_me_mask; if (pte_access & ACC_WRITE_MASK) { diff --git a/arch/x86/kvm/mmu.h b/arch/x86/kvm/mmu.h index 330bf3a..08b779d 100644 --- a/arch/x86/kvm/mmu.h +++ b/arch/x86/kvm/mmu.h @@ -48,7 +48,7 @@ static inline u64 rsvd_bits(int s, int e) { - return ((1ULL << (e - s + 1)) - 1) << s; + return __sme_clr(((1ULL << (e - s + 1)) - 1) << s); } void kvm_mmu_set_mmio_spte_mask(u64 mmio_mask); diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index 33460fc..c2fcd31 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -1139,9 +1139,9 @@ static void avic_init_vmcb(struct vcpu_svm *svm) { struct vmcb *vmcb = svm->vmcb; struct kvm_arch *vm_data = &svm->vcpu.kvm->arch; - phys_addr_t bpa = page_to_phys(svm->avic_backing_page); - phys_addr_t lpa = page_to_phys(vm_data->avic_logical_id_table_page); - phys_addr_t ppa = page_to_phys(vm_data->avic_physical_id_table_page); + phys_addr_t bpa = __sme_set(page_to_phys(svm->avic_backing_page)); + phys_addr_t lpa = __sme_set(page_to_phys(vm_data->avic_logical_id_table_page)); + phys_addr_t ppa = __sme_set(page_to_phys(vm_data->avic_physical_id_table_page)); vmcb->control.avic_backing_page = bpa & AVIC_HPA_MASK; vmcb->control.avic_logical_id = lpa & AVIC_HPA_MASK; @@ -1204,8 +1204,8 @@ static void init_vmcb(struct vcpu_svm *svm) set_intercept(svm, INTERCEPT_MWAIT); } - control->iopm_base_pa = iopm_base; - control->msrpm_base_pa = __pa(svm->msrpm); + control->iopm_base_pa = __sme_set(iopm_base); + control->msrpm_base_pa = __sme_set(__pa(svm->msrpm)); control->int_ctl = V_INTR_MASKING_MASK; init_seg(&save->es); @@ -1339,9 +1339,9 @@ static int avic_init_backing_page(struct kvm_vcpu *vcpu) return -EINVAL; new_entry = READ_ONCE(*entry); - new_entry = (page_to_phys(svm->avic_backing_page) & - AVIC_PHYSICAL_ID_ENTRY_BACKING_PAGE_MASK) | - AVIC_PHYSICAL_ID_ENTRY_VALID_MASK; + new_entry = __sme_set((page_to_phys(svm->avic_backing_page) & + AVIC_PHYSICAL_ID_ENTRY_BACKING_PAGE_MASK) | + AVIC_PHYSICAL_ID_ENTRY_VALID_MASK); WRITE_ONCE(*entry, new_entry); svm->avic_physical_id_cache = entry; @@ -1609,7 +1609,7 @@ static struct kvm_vcpu *svm_create_vcpu(struct kvm *kvm, unsigned int id) svm->vmcb = page_address(page); clear_page(svm->vmcb); - svm->vmcb_pa = page_to_pfn(page) << PAGE_SHIFT; + svm->vmcb_pa = __sme_set(page_to_pfn(page) << PAGE_SHIFT); svm->asid_generation = 0; init_vmcb(svm); @@ -1637,7 +1637,7 @@ static void svm_free_vcpu(struct kvm_vcpu *vcpu) { struct vcpu_svm *svm = to_svm(vcpu); - __free_page(pfn_to_page(svm->vmcb_pa >> PAGE_SHIFT)); + __free_page(pfn_to_page(__sme_clr(svm->vmcb_pa) >> PAGE_SHIFT)); __free_pages(virt_to_page(svm->msrpm), MSRPM_ALLOC_ORDER); __free_page(virt_to_page(svm->nested.hsave)); __free_pages(virt_to_page(svm->nested.msrpm), MSRPM_ALLOC_ORDER); @@ -2304,7 +2304,7 @@ static u64 nested_svm_get_tdp_pdptr(struct kvm_vcpu *vcpu, int index) u64 pdpte; int ret; - ret = kvm_vcpu_read_guest_page(vcpu, gpa_to_gfn(cr3), &pdpte, + ret = kvm_vcpu_read_guest_page(vcpu, gpa_to_gfn(__sme_clr(cr3)), &pdpte, offset_in_page(cr3) + index * 8, 8); if (ret) return 0; @@ -2316,7 +2316,7 @@ static void nested_svm_set_tdp_cr3(struct kvm_vcpu *vcpu, { struct vcpu_svm *svm = to_svm(vcpu); - svm->vmcb->control.nested_cr3 = root; + svm->vmcb->control.nested_cr3 = __sme_set(root); mark_dirty(svm->vmcb, VMCB_NPT); svm_flush_tlb(vcpu); } @@ -2804,7 +2804,7 @@ static bool nested_svm_vmrun_msrpm(struct vcpu_svm *svm) svm->nested.msrpm[p] = svm->msrpm[p] | value; } - svm->vmcb->control.msrpm_base_pa = __pa(svm->nested.msrpm); + svm->vmcb->control.msrpm_base_pa = __sme_set(__pa(svm->nested.msrpm)); return true; } @@ -4436,7 +4436,7 @@ static int svm_ir_list_add(struct vcpu_svm *svm, struct amd_iommu_pi_data *pi) pr_debug("SVM: %s: use GA mode for irq %u\n", __func__, irq.vector); *svm = to_svm(vcpu); - vcpu_info->pi_desc_addr = page_to_phys((*svm)->avic_backing_page); + vcpu_info->pi_desc_addr = __sme_set(page_to_phys((*svm)->avic_backing_page)); vcpu_info->vector = irq.vector; return 0; @@ -4487,7 +4487,8 @@ static int svm_update_pi_irte(struct kvm *kvm, unsigned int host_irq, struct amd_iommu_pi_data pi; /* Try to enable guest_mode in IRTE */ - pi.base = page_to_phys(svm->avic_backing_page) & AVIC_HPA_MASK; + pi.base = __sme_set(page_to_phys(svm->avic_backing_page) & + AVIC_HPA_MASK); pi.ga_tag = AVIC_GATAG(kvm->arch.avic_vm_id, svm->vcpu.vcpu_id); pi.is_guest_mode = true; @@ -4913,7 +4914,7 @@ static void svm_set_cr3(struct kvm_vcpu *vcpu, unsigned long root) { struct vcpu_svm *svm = to_svm(vcpu); - svm->vmcb->save.cr3 = root; + svm->vmcb->save.cr3 = __sme_set(root); mark_dirty(svm->vmcb, VMCB_CR); svm_flush_tlb(vcpu); } @@ -4922,7 +4923,7 @@ static void set_tdp_cr3(struct kvm_vcpu *vcpu, unsigned long root) { struct vcpu_svm *svm = to_svm(vcpu); - svm->vmcb->control.nested_cr3 = root; + svm->vmcb->control.nested_cr3 = __sme_set(root); mark_dirty(svm->vmcb, VMCB_NPT); /* Also sync guest cr3 here in case we live migrate */ diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index 6dcc487..a0db541 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -6453,7 +6453,8 @@ void vmx_enable_tdp(void) enable_ept_ad_bits ? VMX_EPT_DIRTY_BIT : 0ull, 0ull, VMX_EPT_EXECUTABLE_MASK, cpu_has_vmx_ept_execute_only() ? 0ull : VMX_EPT_READABLE_MASK, - enable_ept_ad_bits ? 0ull : VMX_EPT_RWX_MASK); + enable_ept_ad_bits ? 0ull : VMX_EPT_RWX_MASK, + 0ull); ept_set_mmio_spte_mask(); kvm_enable_tdp(); diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 0e846f0..268fed5 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -54,6 +54,7 @@ #include #include #include +#include #include @@ -6097,7 +6098,7 @@ int kvm_arch_init(void *opaque) kvm_mmu_set_mask_ptes(PT_USER_MASK, PT_ACCESSED_MASK, PT_DIRTY_MASK, PT64_NX_MASK, 0, - PT_PRESENT_MASK, 0); + PT_PRESENT_MASK, 0, sme_me_mask); kvm_timer_init(); perf_register_guest_info_callbacks(&kvm_guest_cbs);