From patchwork Wed Dec 6 20:03:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brijesh Singh X-Patchwork-Id: 845322 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) 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="5hKNuXkY"; dkim-atps=neutral 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 3ysVG25J7lz9s72 for ; Thu, 7 Dec 2017 07:14:50 +1100 (AEDT) Received: from localhost ([::1]:57561 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eMg5g-0000ri-R6 for incoming@patchwork.ozlabs.org; Wed, 06 Dec 2017 15:14:48 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50193) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eMfwI-0006oO-3e for qemu-devel@nongnu.org; Wed, 06 Dec 2017 15:05:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eMfwE-0002uf-ND for qemu-devel@nongnu.org; Wed, 06 Dec 2017 15:05:05 -0500 Received: from mail-dm3nam03on0073.outbound.protection.outlook.com ([104.47.41.73]:18336 helo=NAM03-DM3-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 1eMfwE-0002tn-Db for qemu-devel@nongnu.org; Wed, 06 Dec 2017 15:05:02 -0500 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=VicULQEp07AxJLBRA0+wcgnbxTeOYvPh2LjOq3uzn1I=; b=5hKNuXkYzhFhscrdPXOifYFG7eRopYSSwCN+zGQZg6WOc13hMyPb9sjzPZhj/TQrZ3Ve3j09skJfIQm/kky5fFsmFjlEGl91Xh7YmnECsaUL9sW/SW6QCiX2Z61dW4TdTh/bNpY1alwownSsIG1KAt6RlNdtjPa0Pf2Lg7lHXmI= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; Received: from wsp141597wss.amd.com (165.204.78.1) by SN1PR12MB0158.namprd12.prod.outlook.com (10.162.3.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.282.5; Wed, 6 Dec 2017 20:04:56 +0000 From: Brijesh Singh To: qemu-devel@nongnu.org Date: Wed, 6 Dec 2017 14:03:45 -0600 Message-Id: <20171206200346.116537-23-brijesh.singh@amd.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20171206200346.116537-1-brijesh.singh@amd.com> References: <20171206200346.116537-1-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: BN6PR14CA0035.namprd14.prod.outlook.com (10.171.172.149) To SN1PR12MB0158.namprd12.prod.outlook.com (10.162.3.145) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 236f4abc-699b-4602-d4fa-08d53ce4a091 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(2017052603286); SRVR:SN1PR12MB0158; X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0158; 3:7OBwKlFadiC1WQZcfDs62sGFuQ60FbqG5oknuiu8XKF8oZXOHQc/TlSg+lF6TPZAFnsz+1irXatWCxXvh2c5sSXADfts1vn6ulbCOnYf9Q4C/tmFX1I1qZnC3AhwUVU+RWW8u9aaNyUcieNgwebNn0CfWR7qbgBq7pCAglQvvX0cEQDXJwGeZi+bnKhWG4q260bfaeV2wPPyiYrn0fjS6CdM9tg4SUMnFlzYannaegYQZOs3DiWYPI55+lsmkEHL; 25:WaTaLngOssNSGsK7ZpZ/b2KTfYkcSs4D6jZKG6VYyI0FpGci8rnWPXFRJ8+ti+NksYjgODncq6Qi5/6lazkPjz8ZwxAmvCq8lz9qM0rOuA3TCl+rd11tjBNRfI5QlUQ2jpD0WJ8xOqoyyN2+WW2tbZGS/E5CE9SygEAoHt8t7FYE8qLxYzXajV3VSixpMw3/LRK9che9oQ6l0wsfEUdbefsaduJWjlmCe+MwvsNoVL58HNl5H5TVFOnwtevzYqlS8BLrkCmfKP0RSiVqTEeya/ckzVx26qQoOan5Edgl3yxtYQ3zxgpHxuFlk9ds4FET94tWV1yJhnmhapU/gFHZSA==; 31:5u7Z+Ly0qiUYTZ0Kk/4O0xnIiD7ORufr1aPoqZhvWDaBqw2O7A7fch1I6d1BnuM2smUNxCV81Qbl88csisuSwm7jPTQAR75zLSOaQ5C/LWyJsdTn1rZ+6p1Ye6jEVI45aibocAFXyHQuAo649TbH+9wLxWQIZwdLcfKGD/2C9IjgFm9qHwQFmkm2M1I0wFWxMqMaj4zPTS0Nz1HEiCY28qJvAs8DLEDsYB635d/BehM= X-MS-TrafficTypeDiagnostic: SN1PR12MB0158: X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0158; 20:H+Per96LcJVr2d/bOnbHbnQb+dyc5i3WgWayXKW9UelqOx8YMgoGYN61B+FQXEwD59hn9ORrxElFfYh9Dav9QCkI3k8DYT3lxa183z2Y6Lsqbf4fgXbphGaHb83EQjWWZ/S7iLDgQffIF083b8ysi/KAKqsxnN4Vn+8D5Kug/CT4QsLlYJEwxeA9Kh/7J6w/6Te20jshieTIMqp/dSeY60hNbMW3DUwOMkHR9VX6r4ivM4k267JevQ2Lz7BntzZC0V9VSjBnMQsjfaMEDJlf4l7d70LXNogkEbNi3aJJPlDE36Lnz4Rk6YW/sxMTiyHhDn4aigOjyvWFbARbUyNZ73emUx2RNUgEGjD8iHTS5XZwNQ2iZfLr68hxN/BLK4cSXTLAEcbs0R4bLSAjDDmRDPWnlQE/HXECRlOvBgEoiqLmO4pCSsZP+11JyLS+q6uwPd9mRKSt2Y4xieXvH73/Um2P0fe9xkfPtBZO+P7egbq1hqAuYnSsCUmCIXgvOE7r; 4:JnvW/NL6Al0EMugoRKnWDkauQBuiDAR23kwE8KR0tz5siUmo5b5EgCWL1fiCbf7BzCLr3gAMnKMXxRLvZyQEf6NFvGs7RCTJ1h9oGUWpvM0EYF1nBRtehQmo7fkB7tUFXNtMUqHkSF/MSILpNn9aJYHb2ku5GgUw4hV/IxWeq26TEnUp2F9QmIxMmxqfBH4ILj8ZxuCaIMFVJNC4JYBJyxn5niE2+bUiWn64raeqFYNLUITDIm36qnF16xeFPWdKUAodlbdvuCiIlnVeRPy3+depu11+SCnkVJXiULIwEUmi37txKKCySAMKwCHEP9ff X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3002001)(3231022)(6055026)(6041248)(20161123555025)(20161123558100)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123564025)(6072148)(201708071742011); SRVR:SN1PR12MB0158; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:SN1PR12MB0158; X-Forefront-PRVS: 05134F8B4F X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(376002)(39860400002)(346002)(366004)(199004)(189003)(16526018)(16586007)(33646002)(53416004)(105586002)(39060400002)(4326008)(305945005)(2351001)(106356001)(2361001)(7736002)(7696005)(86362001)(52116002)(8936002)(316002)(53936002)(97736004)(76176011)(51416003)(36756003)(66066001)(1076002)(3846002)(25786009)(6116002)(47776003)(50226002)(68736007)(54906003)(6916009)(2950100002)(478600001)(6666003)(8666007)(5660300001)(8656006)(8676002)(101416001)(81156014)(81166006)(2906002)(7416002)(48376002)(6486002)(50466002); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR12MB0158; H:wsp141597wss.amd.com; 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: =?us-ascii?Q?1; SN1PR12MB0158; 23:iXP+xo4MMkC90PXFwx0+D8BtRqyq7h9MiMPuDPq8U?= palDLgjBzj5dQbpNeoxwIqL7AdWHsgZxqa14/AkscMERiKHBsfN2BwB+DzyNifpwTCSSKzOO1bK4rVET35IRuZG5CH72xZwdbkoOVZywGY875m6+P0Cyi/UJJKyCP5BvrLA3ahTJHsB8j6hcUiQ+SIyVTiU+4GvVJxPph4nqfi+qPwlLAQ+KhrEoK3TeCBdXVyjvYFH56Q8lp0WGrd1yMhjtQkaKxNWNj5xtPMV3hG13EuNslEgPRz8b/wfHMqlzwOiFes55fwzJPHaHSP8m4R/1M+V+i8jeRMu9CxkPE6iIBCiV+kJw8wywVkLyxhMRqQQv33LsFlY/E0usPsKlhzTN9gbuL4NnMSWF3YTzO3ChJFMyJjlrk5s+QWF/D9GjrNlL9iO+r0ZJUUn2mN79gj5ASHs2lWWzQXC4RnGc6zFtnLarYFU3T6VZ8eIt8Nx2/e8N1+1Z2LIw2QggDUAI8epMmfSQFAXT+KbmVRugcLLpDvdLETa8RATh8z8wgYrKytGJUZdEc9buLvwCD8OeWDIPxZHl45PFg90Pm1ZegvAeIZ+rCND5n7hbZCJMSrWBAy1n3cgbyQ7hMjHzPDjGEhq1x1pExA9epBOxagkJ0Ahc0YO9TKE3CzPPmaE4YxONJtRKdGGjSo+IckvuyQajGAoNKgpPIAdpzZZZBMMRI8doZGbmFZyWimqiE+HqLfDyxien1n8zrSgV4gt+UItzhDiXH4QhjzdC+TjorKRjlBGDteku7Ix/3uZg6ukw1w2lGHDO+k+6jG+M1bnFd63qtLoIACBBpXsu+MFvbGge+C7orzAboddi1qNlzqe3jla5oIiJsKgiuZp/HmvPo0a3Z0jldk2OkrTCJFLSwaxQVqM/6hUamjiChCyOxsNrNjxbg3/5ZBTtw/CQu+u2HT/X/6oBVP3HXw6NpE6RN1cj/ERXZ92eEI68905De92C0Gyaqv7Ku1VaJymClKfuHqGJCHo/1ZWUD6NRrBpU/Kv+pdbDKMVkwAEUs7AFGyZ9nYPT7Me1b2rlPxLEiemj/AttGViYxcL/CNv8t1yY7JdBsi0mmQs5Zvy0pvvlEdQQLeJJ4YCbtPx/ddcxaflKzuzITWlxVl47YZVqRURZCAAw3TlAFrBBl6sl1FTr2QdRCRaf5qea1rGehfGdGPIrPnGpYi06OYg4hp3ThddQyQrGnvReQ== X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0158; 6:8WQF/01175sVGF8M78QwZmWDuCRAUT+mF1iIqIw7Z7bBYdEDDyBwP7stOv1yG3u+MCdN6mFdxHTKU21WNd/wdjCwpH3nOVxFP9NATvUyOzicMb4lpPWafaTA3uOjnFWVlLLKp6pLsBPa/SrKcV5QgN/18BuLa+PrBa3Hz71DTF/aQCtZ7SqzYdana21HHTlsPzrCvQSLk8I9OdS5DWxZhnzYehp1PW/Q1CqXEtf4wnpNGmEkfEK9HpwvpwaHN5A0u/jgcxjlLxU+nMWbw3kkXT6WQCgI9CQX5kPGRGcIERqKXRueVM+HhI7HN9GZT2RoGGa7RjVvlWKuoEi9yZLQvu3ub3RPI1IDbf15GFcTmgw=; 5:qzXrLtBOzLCOtkwH0M6hY27/MC1kxdqzrdd1CNYBErp9I66aPhAUJfpnYVjVqT66HGSGIqrkk2HUwo/2aX6DTuUEGGUEaqfPpQKdKVcewvMHcH3Vk80O6R8DfEUKa/nL4S2wHGlsb7kRhNQTwUv9sQzbKBYgjlG8aepXYlScyAA=; 24:tZGeODrxyf37GH1ziuei35/VxBlJurkv86PtJbLzdOf4Q3+isR5zKgfrHeMsVT+su/oex6u66P9rFb8+3ia6+e9psbz6uNC+p5ZaNAoqJLQ=; 7:30jrMCTnCUvausaD32C56Idy7EUtqy6pr7Z0y5eJFcHvfy920bifJcx0ZXjG5y3uhOsWWc2nR8JjKTH5MmhjiJCcdQOeDeMCuGbp9JoTn4Op/45xQszK/yzs9R/1ZvPSy/5h7tKcKatr3CN8tLiDxGW6XwNAMtSFD4l4aIYEVCdGagXavCyoJ1kNr+MKEJ5JGai8X8sSlOXeqX1A03c7Z6Blsx7gGdfmhCvylrLIg7ILcm4d11sce9V+vRsxkA1N SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0158; 20:dO/UCENUlDQpNtx89wFhssX61I+01moZT/QfQF5Z3eRP1XE8U+H0T38P/xcerpYujOXdtoUk3Ld2n+DGygM/d3C5tu6YggkGYcnYR5hYsoKNJl62zAP2fIYXbBHfHt7F8dSTYaUvm5N6hGrmTaRS/CIiE+vtSVaBqfbRAkKyymA3vmODQidWPwpzucBSSYKXgsKLkAQSpemVug0YXdGBWV22ov3Yg5S997s1H6jKUmGnwBpui5RkNEKoAoT3eKz1 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Dec 2017 20:04:56.9884 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 236f4abc-699b-4602-d4fa-08d53ce4a091 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB0158 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.41.73 Subject: [Qemu-devel] [PATCH v5 22/23] target/i386: clear C-bit when walking SEV guest page table 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: "Edgar E . Iglesias " , Peter Maydell , Peter Crosthwaite , Eduardo Habkost , kvm@vger.kernel.org, Marcel Apfelbaum , Markus Armbruster , "Michael S. Tsirkin" , Richard Henderson , "Dr. David Alan Gilbert" , Alistair Francis , Christian Borntraeger , Brijesh Singh , Stefan Hajnoczi , Cornelia Huck , Paolo Bonzini , Thomas Lendacky , Borislav Petkov , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" In SEV-enabled guest the pte entry 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] Cc: Paolo Bonzini Cc: Richard Henderson Cc: Eduardo Habkost Signed-off-by: Brijesh Singh --- target/i386/helper.c | 46 +++++++++++++++++++-------- target/i386/monitor.c | 86 ++++++++++++++++++++++++++++++++++++--------------- 2 files changed, 94 insertions(+), 38 deletions(-) diff --git a/target/i386/helper.c b/target/i386/helper.c index 5dc9e8839bc8..7dbbb9812950 100644 --- a/target/i386/helper.c +++ b/target/i386/helper.c @@ -723,6 +723,22 @@ void cpu_x86_update_cr4(CPUX86State *env, uint32_t new_cr4) } #if !defined(CONFIG_USER_ONLY) +static uint64_t get_me_mask(void) +{ + uint64_t me_mask = 0; + + /* + * When SEV is active, Fn8000_001F[EBX] Bit 0:5 contains the C-bit position + */ + if (kvm_memcrypt_enabled()) { + uint32_t pos; + pos = kvm_arch_get_supported_cpuid(kvm_state, 0x8000001f, 0, R_EBX); + me_mask = (1UL << (pos & 0x3f)); + } + + return ~me_mask; +} + hwaddr x86_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) { X86CPU *cpu = X86_CPU(cs); @@ -732,6 +748,9 @@ hwaddr x86_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) int32_t a20_mask; uint32_t page_offset; int page_size; + uint64_t me_mask; + + me_mask = get_me_mask(); a20_mask = x86_get_a20_mask(env); if (!(env->cr[0] & CR0_PG_MASK)) { @@ -755,25 +774,25 @@ hwaddr x86_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) } if (la57) { - pml5e_addr = ((env->cr[3] & ~0xfff) + + pml5e_addr = ((env->cr[3] & ~0xfff & me_mask) + (((addr >> 48) & 0x1ff) << 3)) & a20_mask; - pml5e = ldq_phys_debug(cs, pml5e_addr); + pml5e = ldq_phys_debug(cs, pml5e_addr) & me_mask; if (!(pml5e & PG_PRESENT_MASK)) { return -1; } } else { - pml5e = env->cr[3]; + pml5e = env->cr[3] & me_mask; } pml4e_addr = ((pml5e & PG_ADDRESS_MASK) + (((addr >> 39) & 0x1ff) << 3)) & 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)) & a20_mask; - pdpe = x86_ldq_phys(cs, pdpe_addr); + pdpe = ldq_phys_debug(cs, pdpe_addr) & me_mask; if (!(pdpe & PG_PRESENT_MASK)) { return -1; } @@ -786,16 +805,16 @@ hwaddr x86_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) } else #endif { - pdpe_addr = ((env->cr[3] & ~0x1f) + ((addr >> 27) & 0x18)) & - a20_mask; - pdpe = ldq_phys_debug(cs, pdpe_addr); + pdpe_addr = ((env->cr[3] & ~0x1f & me_mask) + ((addr >> 27) & 0x18)) + & a20_mask; + 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)) & 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; } @@ -808,7 +827,7 @@ hwaddr x86_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) pte_addr = ((pde & PG_ADDRESS_MASK) + (((addr >> 12) & 0x1ff) << 3)) & 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; @@ -817,8 +836,9 @@ hwaddr x86_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) uint32_t pde; /* page directory entry */ - pde_addr = ((env->cr[3] & ~0xfff) + ((addr >> 20) & 0xffc)) & a20_mask; - pde = ldl_phys_debug(cs, pde_addr); + pde_addr = ((env->cr[3] & ~0xfff & me_mask) + ((addr >> 20) & 0xffc)) + & a20_mask; + 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)) { @@ -827,7 +847,7 @@ hwaddr x86_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) } else { /* page directory entry */ pte_addr = ((pde & ~0xfff) + ((addr >> 10) & 0xffc)) & 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 96890547f6b4..0b290f004a21 100644 --- a/target/i386/monitor.c +++ b/target/i386/monitor.c @@ -59,6 +59,22 @@ static void print_pte(Monitor *mon, CPUArchState *env, hwaddr addr, pte & PG_RW_MASK ? 'W' : '-'); } +static uint64_t get_me_mask(void) +{ + uint64_t me_mask = 0; + + /* + * When SEV is active, Fn8000_001F[EBX] Bit 0:5 contains the C-bit position + */ + if (kvm_memcrypt_enabled()) { + uint32_t pos; + pos = kvm_arch_get_supported_cpuid(kvm_state, 0x8000001f, 0, R_EBX); + me_mask = (1UL << (pos & 0x3f)); + } + + return ~me_mask; +} + static void tlb_info_32(Monitor *mon, CPUArchState *env) { unsigned int l1, l2; @@ -93,16 +109,20 @@ static void tlb_info_pae32(Monitor *mon, CPUArchState *env) unsigned int l1, l2, l3; uint64_t pdpe, pde, pte; uint64_t pdp_addr, pd_addr, pt_addr; + uint64_t me_mask; + + me_mask = get_me_mask(); pdp_addr = env->cr[3] & ~0x1f; + pdp_addr &= me_mask; for (l1 = 0; l1 < 4; l1++) { cpu_physical_memory_read_debug(pdp_addr + l1 * 8, &pdpe, 8); - pdpe = le64_to_cpu(pdpe); + pdpe = le64_to_cpu(pdpe & me_mask); if (pdpe & PG_PRESENT_MASK) { pd_addr = pdpe & 0x3fffffffff000ULL; for (l2 = 0; l2 < 512; l2++) { cpu_physical_memory_read_debug(pd_addr + l2 * 8, &pde, 8); - pde = le64_to_cpu(pde); + pde = le64_to_cpu(pde & me_mask); if (pde & PG_PRESENT_MASK) { if (pde & PG_PSE_MASK) { /* 2M pages with PAE, CR4.PSE is ignored */ @@ -113,7 +133,7 @@ static void tlb_info_pae32(Monitor *mon, CPUArchState *env) for (l3 = 0; l3 < 512; l3++) { cpu_physical_memory_read_debug(pt_addr + l3 * 8, &pte, 8); - pte = le64_to_cpu(pte); + pte = le64_to_cpu(pte & me_mask); if (pte & PG_PRESENT_MASK) { print_pte(mon, env, (l1 << 30) + (l2 << 21) + (l3 << 12), @@ -135,10 +155,13 @@ static void tlb_info_la48(Monitor *mon, CPUArchState *env, uint64_t l1, l2, l3, l4; uint64_t pml4e, pdpe, pde, pte; uint64_t pdp_addr, pd_addr, pt_addr; + uint64_t me_mask; + + me_mask = get_me_mask(); for (l1 = 0; l1 < 512; l1++) { cpu_physical_memory_read_debug(pml4_addr + l1 * 8, &pml4e, 8); - pml4e = le64_to_cpu(pml4e); + pml4e = le64_to_cpu(pml4e & me_mask); if (!(pml4e & PG_PRESENT_MASK)) { continue; } @@ -146,7 +169,7 @@ static void tlb_info_la48(Monitor *mon, CPUArchState *env, pdp_addr = pml4e & 0x3fffffffff000ULL; for (l2 = 0; l2 < 512; l2++) { cpu_physical_memory_read_debug(pdp_addr + l2 * 8, &pdpe, 8); - pdpe = le64_to_cpu(pdpe); + pdpe = le64_to_cpu(pdpe & me_mask); if (!(pdpe & PG_PRESENT_MASK)) { continue; } @@ -161,7 +184,7 @@ static void tlb_info_la48(Monitor *mon, CPUArchState *env, pd_addr = pdpe & 0x3fffffffff000ULL; for (l3 = 0; l3 < 512; l3++) { cpu_physical_memory_read_debug(pd_addr + l3 * 8, &pde, 8); - pde = le64_to_cpu(pde); + pde = le64_to_cpu(pde & me_mask); if (!(pde & PG_PRESENT_MASK)) { continue; } @@ -176,7 +199,7 @@ static void tlb_info_la48(Monitor *mon, CPUArchState *env, pt_addr = pde & 0x3fffffffff000ULL; for (l4 = 0; l4 < 512; l4++) { cpu_physical_memory_read_debug(pt_addr + l4 * 8, &pte, 8); - pte = le64_to_cpu(pte); + pte = le64_to_cpu(pte & me_mask); if (pte & PG_PRESENT_MASK) { print_pte(mon, env, (l0 << 48) + (l1 << 39) + (l2 << 30) + (l3 << 21) + (l4 << 12), @@ -193,11 +216,14 @@ static void tlb_info_la57(Monitor *mon, CPUArchState *env) uint64_t l0; uint64_t pml5e; uint64_t pml5_addr; + uint64_t me_mask; + + me_mask = get_me_mask(); - pml5_addr = env->cr[3] & 0x3fffffffff000ULL; + pml5_addr = env->cr[3] & 0x3fffffffff000ULL & me_mask; for (l0 = 0; l0 < 512; l0++) { cpu_physical_memory_read_debug(pml5_addr + l0 * 8, &pml5e, 8); - pml5e = le64_to_cpu(pml5e); + pml5e = le64_to_cpu(pml5e & me_mask); if (pml5e & PG_PRESENT_MASK) { tlb_info_la48(mon, env, l0, pml5e & 0x3fffffffff000ULL); } @@ -225,7 +251,8 @@ void hmp_info_tlb(Monitor *mon, const QDict *qdict) if (env->cr[4] & CR4_LA57_MASK) { tlb_info_la57(mon, env); } else { - tlb_info_la48(mon, env, 0, env->cr[3] & 0x3fffffffff000ULL); + tlb_info_la48(mon, env, 0, env->cr[3] & 0x3fffffffff000ULL & + get_me_mask()); } } else #endif @@ -309,19 +336,22 @@ static void mem_info_pae32(Monitor *mon, CPUArchState *env) uint64_t pdpe, pde, pte; uint64_t pdp_addr, pd_addr, pt_addr; hwaddr start, end; + uint64_t me_mask; - pdp_addr = env->cr[3] & ~0x1f; + me_mask = get_me_mask(); + + pdp_addr = env->cr[3] & ~0x1f & me_mask; last_prot = 0; start = -1; for (l1 = 0; l1 < 4; l1++) { cpu_physical_memory_read_debug(pdp_addr + l1 * 8, &pdpe, 8); - pdpe = le64_to_cpu(pdpe); + pdpe = le64_to_cpu(pdpe & me_mask); end = l1 << 30; if (pdpe & PG_PRESENT_MASK) { pd_addr = pdpe & 0x3fffffffff000ULL; for (l2 = 0; l2 < 512; l2++) { cpu_physical_memory_read_debug(pd_addr + l2 * 8, &pde, 8); - pde = le64_to_cpu(pde); + pde = le64_to_cpu(pde & me_mask); end = (l1 << 30) + (l2 << 21); if (pde & PG_PRESENT_MASK) { if (pde & PG_PSE_MASK) { @@ -333,7 +363,7 @@ static void mem_info_pae32(Monitor *mon, CPUArchState *env) for (l3 = 0; l3 < 512; l3++) { cpu_physical_memory_read_debug(pt_addr + l3 * 8, &pte, 8); - pte = le64_to_cpu(pte); + pte = le64_to_cpu(pte & me_mask); end = (l1 << 30) + (l2 << 21) + (l3 << 12); if (pte & PG_PRESENT_MASK) { prot = pte & pde & (PG_USER_MASK | PG_RW_MASK | @@ -366,19 +396,22 @@ static void mem_info_la48(Monitor *mon, CPUArchState *env) uint64_t l1, l2, l3, l4; 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 = env->cr[3] & 0x3fffffffff000ULL & me_mask; last_prot = 0; start = -1; for (l1 = 0; l1 < 512; l1++) { cpu_physical_memory_read_debug(pml4_addr + l1 * 8, &pml4e, 8); - pml4e = le64_to_cpu(pml4e); + pml4e = le64_to_cpu(pml4e & me_mask); end = l1 << 39; if (pml4e & PG_PRESENT_MASK) { pdp_addr = pml4e & 0x3fffffffff000ULL; for (l2 = 0; l2 < 512; l2++) { cpu_physical_memory_read_debug(pdp_addr + l2 * 8, &pdpe, 8); - pdpe = le64_to_cpu(pdpe); + pdpe = le64_to_cpu(pdpe & me_mask); end = (l1 << 39) + (l2 << 30); if (pdpe & PG_PRESENT_MASK) { if (pdpe & PG_PSE_MASK) { @@ -391,7 +424,7 @@ static void mem_info_la48(Monitor *mon, CPUArchState *env) for (l3 = 0; l3 < 512; l3++) { cpu_physical_memory_read_debug(pd_addr + l3 * 8, &pde, 8); - pde = le64_to_cpu(pde); + pde = le64_to_cpu(pde & me_mask); end = (l1 << 39) + (l2 << 30) + (l3 << 21); if (pde & PG_PRESENT_MASK) { if (pde & PG_PSE_MASK) { @@ -405,7 +438,7 @@ static void mem_info_la48(Monitor *mon, CPUArchState *env) cpu_physical_memory_read_debug(pt_addr + l4 * 8, &pte, 8); - pte = le64_to_cpu(pte); + pte = le64_to_cpu(pte & me_mask); end = (l1 << 39) + (l2 << 30) + (l3 << 21) + (l4 << 12); if (pte & PG_PRESENT_MASK) { @@ -444,13 +477,16 @@ static void mem_info_la57(Monitor *mon, CPUArchState *env) uint64_t l0, l1, l2, l3, l4; uint64_t pml5e, pml4e, pdpe, pde, pte; uint64_t pml5_addr, pml4_addr, pdp_addr, pd_addr, pt_addr, start, end; + uint64_t me_mask; + + me_mask = get_me_mask(); - pml5_addr = env->cr[3] & 0x3fffffffff000ULL; + pml5_addr = env->cr[3] & 0x3fffffffff000ULL & me_mask; last_prot = 0; start = -1; for (l0 = 0; l0 < 512; l0++) { cpu_physical_memory_read_debug(pml5_addr + l0 * 8, &pml5e, 8); - pml5e = le64_to_cpu(pml5e); + pml5e = le64_to_cpu(pml5e & me_mask); end = l0 << 48; if (!(pml5e & PG_PRESENT_MASK)) { prot = 0; @@ -461,7 +497,7 @@ static void mem_info_la57(Monitor *mon, CPUArchState *env) pml4_addr = pml5e & 0x3fffffffff000ULL; for (l1 = 0; l1 < 512; l1++) { cpu_physical_memory_read_debug(pml4_addr + l1 * 8, &pml4e, 8); - pml4e = le64_to_cpu(pml4e); + pml4e = le64_to_cpu(pml4e & me_mask); end = (l0 << 48) + (l1 << 39); if (!(pml4e & PG_PRESENT_MASK)) { prot = 0; @@ -472,7 +508,7 @@ static void mem_info_la57(Monitor *mon, CPUArchState *env) pdp_addr = pml4e & 0x3fffffffff000ULL; for (l2 = 0; l2 < 512; l2++) { cpu_physical_memory_read_debug(pdp_addr + l2 * 8, &pdpe, 8); - pdpe = le64_to_cpu(pdpe); + pdpe = le64_to_cpu(pdpe & me_mask); end = (l0 << 48) + (l1 << 39) + (l2 << 30); if (pdpe & PG_PRESENT_MASK) { prot = 0; @@ -491,7 +527,7 @@ static void mem_info_la57(Monitor *mon, CPUArchState *env) pd_addr = pdpe & 0x3fffffffff000ULL; for (l3 = 0; l3 < 512; l3++) { cpu_physical_memory_read_debug(pd_addr + l3 * 8, &pde, 8); - pde = le64_to_cpu(pde); + pde = le64_to_cpu(pde & me_mask); end = (l0 << 48) + (l1 << 39) + (l2 << 30) + (l3 << 21); if (pde & PG_PRESENT_MASK) { prot = 0; @@ -510,7 +546,7 @@ static void mem_info_la57(Monitor *mon, CPUArchState *env) pt_addr = pde & 0x3fffffffff000ULL; for (l4 = 0; l4 < 512; l4++) { cpu_physical_memory_read_debug(pt_addr + l4 * 8, &pte, 8); - pte = le64_to_cpu(pte); + pte = le64_to_cpu(pte & me_mask); end = (l0 << 48) + (l1 << 39) + (l2 << 30) + (l3 << 21) + (l4 << 12); if (pte & PG_PRESENT_MASK) {