From patchwork Tue Nov 1 15:54:46 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brijesh Singh X-Patchwork-Id: 690020 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3t7bzs4J5Vz9sxS for ; Wed, 2 Nov 2016 03:20:09 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b=poyMgGPu; dkim-atps=neutral Received: from localhost ([::1]:49085 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c1bnC-0001we-Ij for incoming@patchwork.ozlabs.org; Tue, 01 Nov 2016 12:20:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58043) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1c1bOr-0006jE-KF for qemu-devel@nongnu.org; Tue, 01 Nov 2016 11:54:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1c1bOm-0004Cf-Ng for qemu-devel@nongnu.org; Tue, 01 Nov 2016 11:54:57 -0400 Received: from mail-sn1nam01on0060.outbound.protection.outlook.com ([104.47.32.60]:36021 helo=NAM01-SN1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1c1bOm-0004CQ-Ge for qemu-devel@nongnu.org; Tue, 01 Nov 2016 11:54:52 -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=3vCMzr/UZjZZitqpxQSBIjtuBepuoVgDeF/EG6BKV7I=; b=poyMgGPuhPVfWxMWbZc/tiD5ELYWNpedlDqjnAo99TmKygEIBPVbaUgwJh0dyWyMAauNK/1bW3afQnOLeH2U0LECKI7ZHR0HhLXVZp4WS9MsAgU2evc2yRLa5FQ4c/Xq6wcmG/v5FCZZ9UThTiyxB1t1ZhtbPH5J2PVqX23SJH0= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; Received: from [127.0.1.1] (165.204.77.1) by SN1PR12MB0671.namprd12.prod.outlook.com (10.163.208.29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.679.12; Tue, 1 Nov 2016 15:54:49 +0000 From: Brijesh Singh To: , , , , , , , , , Date: Tue, 1 Nov 2016 11:54:46 -0400 Message-ID: <147801568599.18237.15809185364145648409.stgit@brijesh-build-machine> In-Reply-To: <147801550845.18237.12915616525154608660.stgit@brijesh-build-machine> References: <147801550845.18237.12915616525154608660.stgit@brijesh-build-machine> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: BLUPR01CA038.prod.exchangelabs.com (10.160.23.28) To SN1PR12MB0671.namprd12.prod.outlook.com (10.163.208.29) X-MS-Office365-Filtering-Correlation-Id: 5dee3688-7ede-4a8f-e2d8-08d4026f69f5 X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0671; 2:M32MGntbFJxwgduAXEMgQ2pXOfEIqpaJm0WLQUfz2YTRJxsnJs8t+UmaXCP/8ZtcdnQ9CPpWbpDAuAe0xEK8QF2BW3IiRangU54FkpRQzg+Cce53B/dyXLClPPpQGve/lMO5WDr/8tacDR3tm37HoRWyFfxdXEdKUnYXQugOq4x6bbp0qx/rM3Fua1ciFvtJkTa3D23veyg3a6zuFJXfaw==; 3:uyAw1pxP7UGnunF+19mNGu+s4C6Xa0RtutjAM0tY6IeccIUDWdZDrHlXUlIQAXj3pcMKHWmpLr0IppjOTCcsEXSozJIRAfIq3aVPd4Jmy9syggN03zUpxYmddvoP+DWfnqmllOcw81rj3mypBohOJA== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SN1PR12MB0671; X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0671; 25:bl131zegEEXbUehhnjPHIQhV9s1SftxmV2MIwJ7YcyQWucHmSNtpl7SYoY2UiMOQFwtjOWWe+6m9ssC0a1BBJVLQvYfxD0ovE1yf3+V1qMZyNBCK7AXCdqyMLoZsqCHOeWpBzgislOO3gT90xVPktzS+btL6991kEMQtX6Gg9CvU33LRlxVvP0lIoASN1OyCrFQ2Y1GSMKSWg8/bVQsqVCSEDqH/7T6moZgQqZ87p/t8Nr8URC3Xp8tgdzdCVHQAMvZ6s3QV9vawID7tDmlJ9pOdMNUU60wb1jZbIoQB1DRNvcOq6pQeB54SO3q5/slvyMFP+dAnRpPIEz1JgctK1mMQHQ3+VAhOjDYEnyrH1lH8qHlNGY86POe9PEzgWw59uUXSZrn/Us5buj7O/dJLot5Usxkf7JmEAnrtsuJC0DzhEQuTqfRFCO6ILAp5G+1u7Z/nyHfj4sB36tinLEj22lEV/OnGQhcnPQgBWoDf2jLJvr95wQ9S7e/DX9cRIAGcK8wGzhWctEBmh95MbMPoz7r8iKPB+YqVzBB2baq9393hwmt9dJwLaCU89xHmA/CB0Ex+RASsZlDLzyJW+6cDQzmNsTCHMswfu5dSBGAqLjyf2mZACbri7OOZ3TAa5Lj4GzSrqV/EjxeuB2vyyo3WaJftR6EULGMdgtEaNNg5hRfw2gEoFvTeP7swPV0sWKpjtDZG3leOiHxgyNni18KCnpgg98EQQnX91vNyxpV0Yc4= X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0671; 31:ex0ygkN04RIsMLvGm13n/f7819iYfAIiiQU4ZhClia+Wmps8pS4/Uj0r+pNgo27iwM+4vFYig2gEuPH3dDcV44b2nYvwoaXGaYFNhoW/tiVCvKnvp09Ox2dtYrRe10AQ/USAm5ByfOxa8Zfsqx2iOymjSLTRF+qdUckvrh4chcE325H2JMPX+MY1FxBu0IiExGmKib1FJX/JuVj5fkDWc6zaFPx3BOC/HSIONA3u15m349XsJgqvSwOILzEpGdCZCWLa59bPOYx57kpGbAWiIA==; 20:7ptXxus+rmxNTFPe+7gOf7FiVln5QXLhPwYrMaj6C22YlaKxI/CZYz8tkU1oyHn/0Z5x1s91KdtpIIwgnIlNQOHzl/0jx5xcB2RPwi8KatfGIECe+PhTNlskYK4IBLwbcXBTglWP1lssG1dxjckcl9a0KA6EESIj9pdnrtKSC4s4BNqrsS6MNsgCeJSJEVbCzbdoADf7xbn3l4knj9mldh3n0uNabwH3sPFONsUlS9MqelvXpu/4dX1GcwN7dm+PQY3QfNMZKzFLeb198a5byg1f01XyEEUHhol/5uSDLG7cwB2R17i/Am1k7ePPMThSQ4yZ3ic1V+zDUOxGYr9C2LCqWS0YGT4x4Dwmn+qi1lvTbpYUtgBaar9YaTXZ2H40Q4Opj+0Lpb4DQtZFuHrpOZKCdPBu4QiuUytXxYQEwhUpcTCSHCCeHjPDZCtyeDSrSladifD3ZEP3l+q9F84KJw6KrBE3ztxXdZGYt6AsomBFLfW+7XpJ6sTlepzuoySZ X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001)(6055026); SRVR:SN1PR12MB0671; BCL:0; PCL:0; RULEID:; SRVR:SN1PR12MB0671; X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0671; 4:Xgqc1ZhL1qoPKvKF5IQ3Ocega8+YFfFv9s+cqs5FM0EPwucIRyxaQ57GW/2cFEDclYGaV3CxPFysk8Ui/WewjCOBi+f8iuw871g2KeKhwbA7lWaQyNDGVvqAUpu9Pf8U0G/8+3im3Fe0YTUHNq3tGxvEiHJzt1Ld5y7C+E+Xy29tdWsjyt4WCN/ZAwahtSJAC0OQSIqdZvm6e/2Jb9G/ZZ60A8ngOaH9nDd0YAsa36HgDdRDsSIHMWIGVPPKYlOZ/NyDN6AAWhpo7ykDQwXnAuYBrPqv6FL+rpPO59AkR+Z/F83gg6mwqIkPfbuIkdmChfyL3Fu99Ad2hDb9tQ21Rjv9cZy2pk2cn8V+d+30+WmiPiVui0+PmAC8lZnAptM/7Lu5sHJaJYtNvGElEWXSmiX4/z3uBlU1MqbR/AZlRBVlmfWcgOx+k+G9PG+t0ipH/c050KYN9QrAv9RmFTuGnQ== X-Forefront-PRVS: 01136D2D90 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6049001)(6009001)(7916002)(199003)(189002)(229853001)(2201001)(6116002)(3846002)(66066001)(586003)(230700001)(47776003)(68736007)(23676002)(50466002)(2950100002)(9686002)(103116003)(97736004)(189998001)(5001770100001)(5660300001)(4326007)(86362001)(83506001)(6666003)(105586002)(42186005)(19580405001)(19580395003)(33716001)(8676002)(2906002)(50986999)(54356999)(7416002)(81156014)(4001350100001)(33646002)(76176999)(101416001)(106356001)(92566002)(305945005)(81166006)(7736002)(77096005)(7846002)(921003)(217873001)(1121003); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR12MB0671; H:[127.0.1.1]; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; Received-SPF: None (protection.outlook.com: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtTTjFQUjEyTUIwNjcxOzIzOkNCRUcxUGk2TTlvczM2ZVRvV3NnbVlMWURm?= =?utf-8?B?YVZKN01DMXF2MEdYOHh2V3VuNHhHT212MlpEekFaWTZpZ2hOT3N3R00rdm5m?= =?utf-8?B?UEQ3MUNSSlM0K3prTDRMR1BJRzZySnYzcVA1RDIzdWt4OWxRMGQ3TmxzS2NO?= =?utf-8?B?SXVvSVlpQ0xsL0tINTVVZUhSUkNwM0ttMEJVZVVDNHJybkdnRXlnMkhMeDhl?= =?utf-8?B?b2hGWXVJdVE2MFppRUNuVmxKb2l4WjhkcmNtN2M2Q3dMVkM5a21mSGRia1Yy?= =?utf-8?B?UEJyVUI1UUR6alcvMWJVd0gybGk0MDVvcHZEYWNiQWgxNVBVS2tZRS9BOFlL?= =?utf-8?B?V3p2Ykt5bktyM0VSdnJKamtRWlVNcy9pQ2d6RGIrdXQ1U0luK2dMZDZxWFg2?= =?utf-8?B?akZHZlJ3bVlZWUVHZngrcWJhZUc3eXUzMlQ0ZUUwSTV2T2xhOFQ1UVZJYXlL?= =?utf-8?B?QXlQNmxVL1h1MVZCNU4vaW5WeUFNbm5xc2hwVHFOcEFYMUEzYjBGOW5BYmJW?= =?utf-8?B?TFFuaWpSK1dUNVRLT3g3dXB5bHRXVEhBTktKMVQ5WUx1N09PQkkyaFROTmtW?= =?utf-8?B?WklwMnl1UXg3NjFmd0syUHltakFpd3MybFdMMlUwdlZuMm9BTGtidnh4Zysx?= =?utf-8?B?dVNQaGtLL2VQTmF3MGNpUkcyaXF5UUpkQnJ3Q05ZaE9CQUllMEhwQ3BvcWhM?= =?utf-8?B?RVp1YzBSZVcxUW9DVUozOUFpSnNFUlRrUVQ0amhxWWtTTWxYdERnZ2F6T2ht?= =?utf-8?B?czFUNlNuK0tQVHo3VXlvRW12UW1PVkxkaHZmRURjeGt1K29JYUJPNldoTXVS?= =?utf-8?B?SExyOTBaZFVVck10THRMSC9sMWRZY1FIV3AzV1A4NTg3eHdXMnF2dTBKbVo0?= =?utf-8?B?UnhSR09BWWdtVDQrWDJ3Lzd5amFHYWYzalV6ZklPdVoxMVdZaFQ4TmllcEFp?= =?utf-8?B?cS9qOUxxQytLZDBEd0huL2E2VmYrRDJFSFlCZGcrU2E0Y3dsUExqR3VoNVd0?= =?utf-8?B?RzV5dXNJejE0N05kTHlvd0ExaFVzeVFwV3hFZUZaQjdXYmR5OVhFM2dWa2hW?= =?utf-8?B?Y2xPK0VrSUZxbVN5NDdnRmFoYUZZTlQvdDBNZXdjMzRENWM3SDJzT2pPSWtj?= =?utf-8?B?VnFyWkZVOFJZcTB3MTF5RW9Zb1AydDRreEY4Qk9VNnc0U3pWTGxJYk9qVHVy?= =?utf-8?B?MDZFUXExa1EyVDM2RHNxdm9mRytSTmZvaEtXaWZWNlBQbjNSSGFiaDd2U2Jx?= =?utf-8?B?SVJ6cGRoK3BXRlJVK08xZVNnSUx3UEpOZkI3TW4raDhWTjl6T3pqSEIxcVdU?= =?utf-8?B?YmJ6dEtQYTFtRjAvVVhSTllNSWlhQnVCb2d0dU1pQWcwRjQzRGlEM3JQU3lM?= =?utf-8?B?T0Y0T2Z5QkVPcEprdW1LZU1IZXVvSXNicjYxTktWUlVGMUxPT2NmbXZJZVFo?= =?utf-8?B?REVwMGw5YXdsalN5VHVPTlcvemhPTm1DM3hnZWhvRDVranZIeVpQMmFnVmwv?= =?utf-8?B?ZGFkdU51QTd6eTJJVTJYMkk1Y3dRYVdidXFDclI1N3pjY2dwdXRjTTlmOWV6?= =?utf-8?B?a3laSjVON2RMQWZ1c3p5SnRMWCt4bERSaW9TbFQrTCtjY3BpaHpBdnphUWox?= =?utf-8?B?TlkvR3lhMWw2NUhJd0NHZytWOVJuYkxhNUlNOXg2amZUUWczM2dnKy9XakIy?= =?utf-8?B?aVlsWlpBejZLTmNYQ0Fta2ZIb0sraGhPSlE1WnZidTJVL2RoczZUaTRRQWJo?= =?utf-8?B?QlpxZ1E0dzY0QkI3SWF0QT09?= X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0671; 6:x4UY5gk8WOPsFmJe4BgLQnGYGp26FFg8FZjnK7Cbr8jKt/kbpn3WqPNrnyK4LtXyjXI9m1DmCYMN3hnQcWm/cWMpSq6g5G8X9dCKxAipq3KEGg037YmvEXo4I7HciDQ81TDv60B3zH9kkqDX1nO/t8bPjmZlwAcZVO6a5oq0sNf5bhdIvT/wt9J/+mo5BJWvMVmtRmqVplEqBaZqnDDvHKFb+tsbqhcFBI24mOUWErl5i3zhMSp1DswZR7Dff97dlz38ZrbLObftNDb75aPhfy1KYm1/8grOJrox8QutvC4Np1+7Tw2VmKo9Dc062Mi34kRTBxIxXS4BYp4ynf6i9RbwRCgPgdmXf+QzX5fO+Ms=; 5:id2vRXaJvVtFtfRCQcUVwfJFGVig1GODtKramYUnyHhewTdc0WRJd+tXqaIg85X4OhPHMZKhbk3FqA99TFL+1FkhnIl+wsJ3MJpBeK06buK6Y8lWzCR7rFqW4vAKO9ueupIbKIRne0/OpxF5bLF91A==; 24:c9bvDXLyNPfKlW7fBKrzGx6QyPc9elDYZhYK9m5dQXVGxoobi1jLJkMbGnzHzf5m4EQ01h6KeRjE4cWSeJ2wc5YQqsTeoEIc/R7652JgwZs= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0671; 7:BO8riTpSpqhGjxKegAT68wUHa/rdBUh7obZpJ4gsYnpKqpXvcSVDWMjvqJFzo7A4rDTP8qEvjDkvGBkgqKKp2YXPxKbbQZCNtTG13Jvel/UaKXl4yEcKKG71GlfRyIMRK6SkRYPUMgSLe57Y0EghbuKHL3hKKrGiFAs/0+nrzA7I1aSgzK5H/lTGjA9U5/t08y0iK5Y949zqLZZvGWZmrFCUPhCg1TEiC6LECgMOdYWCwfh5oO5k4mL7BdTgXbUxSA0W6JX3oAkPGFKybCDMXmTHtri4jhTB/apKfYHbJy33Ac5SsrDTuYzAYki7WYGq+tB/VeV/vE1xKJFjcqHgr/a1FfdPsjCWQs+MrP4Itjc=; 20:8jmPifN1a72YieDnaapvShUAFr570AB+MYgJ/1emGrGlA/gxg6KRspclIY2GauSUxJGptXwkSIR3ZS8vJAH7S6wECu69fNXbU7R+MEHWj6S58EmZUDJeL7LkSX9d8mazwJtDbHW/Ifhkfc/nNnis3ySGNh6ABbLg8ok2jLS5JBY74BqlpjR8FpHGvrmhZjvbzfNF/GfYMFu+YIj4NFuGv2pXuNlxp76TPqgtUO0lMxCzhHfL+x5E26u5VHb1dyr/ X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Nov 2016 15:54:49.9021 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB0671 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.32.60 Subject: [Qemu-devel] [RFC PATCH v3 17/18] i386: clear C-bit in SEV guest page table walk X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: brijesh.ksingh@gmail.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" In SEV-enabled guest the physical addresses in page table will have C-bit set, we need to clear the C-bit when walking the page table. The C-bit position should be available in cpuid Fn8000_001f[EBX] Signed-off-by: Brijesh Singh --- target-i386/helper.c | 37 ++++++++++++++++++++++++++++++------- target-i386/monitor.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+), 7 deletions(-) diff --git a/target-i386/helper.c b/target-i386/helper.c index e707350..cc5c37c 100644 --- a/target-i386/helper.c +++ b/target-i386/helper.c @@ -22,6 +22,7 @@ #include "exec/exec-all.h" #include "sysemu/kvm.h" #include "kvm_i386.h" +#include "sysemu/sev.h" #ifndef CONFIG_USER_ONLY #include "sysemu/sysemu.h" #include "monitor/monitor.h" @@ -1006,6 +1007,22 @@ do_check_protect_pse36: return 1; } +static uint64_t get_me_mask(void) +{ + uint64_t me_mask = 0; + + /* In SEV guest page tables addresses will have memory encryption bit set, + * C-bit should be cleared while doing the page table walk. + */ + if (sev_enabled()) { + uint32_t pos; + pos = kvm_arch_get_supported_cpuid(kvm_state, 0x8000001f, 0, R_EBX); + me_mask = (1UL << pos); + } + + return ~me_mask; +} + hwaddr x86_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) { X86CPU *cpu = X86_CPU(cs); @@ -1014,6 +1031,12 @@ hwaddr x86_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) uint64_t pte; uint32_t page_offset; int page_size; + uint64_t me_mask; + + me_mask = get_me_mask(); + + /* In SEV guest, CR3 will have memory encryption bit set, clear it */ + env->cr[3] &= me_mask; if (!(env->cr[0] & CR0_PG_MASK)) { pte = addr & env->a20_mask; @@ -1034,13 +1057,13 @@ hwaddr x86_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) } pml4e_addr = ((env->cr[3] & ~0xfff) + (((addr >> 39) & 0x1ff) << 3)) & env->a20_mask; - pml4e = ldq_phys_debug(cs, pml4e_addr); + pml4e = ldq_phys_debug(cs, pml4e_addr) & me_mask; if (!(pml4e & PG_PRESENT_MASK)) { return -1; } pdpe_addr = ((pml4e & PG_ADDRESS_MASK) + (((addr >> 30) & 0x1ff) << 3)) & env->a20_mask; - pdpe = ldq_phys_debug(cs, pdpe_addr); + pdpe = ldq_phys_debug(cs, pdpe_addr) & me_mask; if (!(pdpe & PG_PRESENT_MASK)) { return -1; } @@ -1055,14 +1078,14 @@ hwaddr x86_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) { pdpe_addr = ((env->cr[3] & ~0x1f) + ((addr >> 27) & 0x18)) & env->a20_mask; - pdpe = ldq_phys_debug(cs, pdpe_addr); + pdpe = ldq_phys_debug(cs, pdpe_addr) & me_mask; if (!(pdpe & PG_PRESENT_MASK)) return -1; } pde_addr = ((pdpe & PG_ADDRESS_MASK) + (((addr >> 21) & 0x1ff) << 3)) & env->a20_mask; - pde = ldq_phys_debug(cs, pde_addr); + pde = ldq_phys_debug(cs, pde_addr) & me_mask; if (!(pde & PG_PRESENT_MASK)) { return -1; } @@ -1075,7 +1098,7 @@ hwaddr x86_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) pte_addr = ((pde & PG_ADDRESS_MASK) + (((addr >> 12) & 0x1ff) << 3)) & env->a20_mask; page_size = 4096; - pte = ldq_phys_debug(cs, pte_addr); + pte = ldq_phys_debug(cs, pte_addr) & me_mask; } if (!(pte & PG_PRESENT_MASK)) { return -1; @@ -1085,7 +1108,7 @@ hwaddr x86_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) /* page directory entry */ pde_addr = ((env->cr[3] & ~0xfff) + ((addr >> 20) & 0xffc)) & env->a20_mask; - pde = ldl_phys_debug(cs, pde_addr); + pde = ldl_phys_debug(cs, pde_addr) & me_mask; if (!(pde & PG_PRESENT_MASK)) return -1; if ((pde & PG_PSE_MASK) && (env->cr[4] & CR4_PSE_MASK)) { @@ -1094,7 +1117,7 @@ hwaddr x86_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) } else { /* page directory entry */ pte_addr = ((pde & ~0xfff) + ((addr >> 10) & 0xffc)) & env->a20_mask; - pte = ldl_phys_debug(cs, pte_addr); + pte = ldl_phys_debug(cs, pte_addr) & me_mask; if (!(pte & PG_PRESENT_MASK)) { return -1; } diff --git a/target-i386/monitor.c b/target-i386/monitor.c index 2d125c5..ffb0479 100644 --- a/target-i386/monitor.c +++ b/target-i386/monitor.c @@ -27,6 +27,7 @@ #include "monitor/hmp-target.h" #include "hw/i386/pc.h" #include "sysemu/kvm.h" +#include "sysemu/sev.h" #include "hmp.h" @@ -54,6 +55,22 @@ static void print_pte(Monitor *mon, hwaddr addr, pte & PG_RW_MASK ? 'W' : '-'); } +static uint64_t get_me_mask(void) +{ + uint64_t me_mask = 0; + + /* In SEV guest page tables addresses will have memory encryption bit set, + * C-bit should be cleared while doing the page table walk. + */ + if (sev_enabled()) { + uint32_t pos; + pos = kvm_arch_get_supported_cpuid(kvm_state, 0x8000001f, 0, R_EBX); + me_mask = (1UL << pos); + } + + return ~me_mask; +} + static void tlb_info_32(Monitor *mon, CPUArchState *env) { unsigned int l1, l2; @@ -129,15 +146,21 @@ static void tlb_info_64(Monitor *mon, CPUState *cs) uint64_t l1, l2, l3, l4; uint64_t pml4e, pdpe, pde, pte; uint64_t pml4_addr, pdp_addr, pd_addr, pt_addr; + uint64_t me_mask; + + me_mask = get_me_mask(); pml4_addr = env->cr[3] & 0x3fffffffff000ULL; + pml4_addr &= me_mask; for (l1 = 0; l1 < 512; l1++) { pml4e = ldq_phys_debug(cs, pml4_addr + l1 * 8); + pml4e &= me_mask; pml4e = le64_to_cpu(pml4e); if (pml4e & PG_PRESENT_MASK) { pdp_addr = pml4e & 0x3fffffffff000ULL; for (l2 = 0; l2 < 512; l2++) { pdpe = ldq_phys_debug(cs, pdp_addr + l2 * 8); + pdpe &= me_mask; pdpe = le64_to_cpu(pdpe); if (pdpe & PG_PRESENT_MASK) { if (pdpe & PG_PSE_MASK) { @@ -148,6 +171,7 @@ static void tlb_info_64(Monitor *mon, CPUState *cs) pd_addr = pdpe & 0x3fffffffff000ULL; for (l3 = 0; l3 < 512; l3++) { pde = ldq_phys_debug(cs, pd_addr + l3 * 8); + pde &= me_mask; pde = le64_to_cpu(pde); if (pde & PG_PRESENT_MASK) { if (pde & PG_PSE_MASK) { @@ -160,6 +184,7 @@ static void tlb_info_64(Monitor *mon, CPUState *cs) for (l4 = 0; l4 < 512; l4++) { pte = ldq_phys_debug(cs, pt_addr + l4 * 8); + pte &= me_mask; pte = le64_to_cpu(pte); if (pte & PG_PRESENT_MASK) { print_pte(mon, (l1 << 39) + @@ -338,12 +363,17 @@ static void mem_info_64(Monitor *mon, CPUState *cs) CPUArchState *env = &cpu->env; uint64_t pml4e, pdpe, pde, pte; uint64_t pml4_addr, pdp_addr, pd_addr, pt_addr, start, end; + uint64_t me_mask; + + me_mask = get_me_mask(); pml4_addr = env->cr[3] & 0x3fffffffff000ULL; + pml4_addr &= me_mask; last_prot = 0; start = -1; for (l1 = 0; l1 < 512; l1++) { pml4e = ldq_phys_debug(cs, pml4_addr + l1 * 8); + pml4e &= me_mask; pml4e = le64_to_cpu(pml4e); end = l1 << 39; if (pml4e & PG_PRESENT_MASK) { @@ -351,6 +381,7 @@ static void mem_info_64(Monitor *mon, CPUState *cs) for (l2 = 0; l2 < 512; l2++) { pdpe = ldq_phys_debug(cs, pdp_addr + l2 * 8); pdpe = le64_to_cpu(pdpe); + pdpe &= me_mask; end = (l1 << 39) + (l2 << 30); if (pdpe & PG_PRESENT_MASK) { if (pdpe & PG_PSE_MASK) { @@ -362,6 +393,7 @@ static void mem_info_64(Monitor *mon, CPUState *cs) pd_addr = pdpe & 0x3fffffffff000ULL; for (l3 = 0; l3 < 512; l3++) { pde = ldq_phys_debug(cs, pd_addr + l3 * 8); + pde &= me_mask; pde = le64_to_cpu(pde); end = (l1 << 39) + (l2 << 30) + (l3 << 21); if (pde & PG_PRESENT_MASK) { @@ -375,6 +407,7 @@ static void mem_info_64(Monitor *mon, CPUState *cs) for (l4 = 0; l4 < 512; l4++) { pte = ldq_phys_debug(cs, pt_addr + l4 * 8); + pte &= me_mask; pte = le64_to_cpu(pte); end = (l1 << 39) + (l2 << 30) + (l3 << 21) + (l4 << 12);