From nobody Wed Nov 5 16:41:00 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=virtuozzo.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1535546742090551.3242668548936; Wed, 29 Aug 2018 05:45:42 -0700 (PDT) Received: from localhost ([::1]:42922 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fuzqu-0007Ib-42 for importer@patchew.org; Wed, 29 Aug 2018 08:45:40 -0400 Received: from eggs.gnu.org ([208.118.235.92]:42924) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fuzow-00069q-W9 for qemu-devel@nongnu.org; Wed, 29 Aug 2018 08:43:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fuznn-00033L-T7 for qemu-devel@nongnu.org; Wed, 29 Aug 2018 08:42:31 -0400 Received: from mail-eopbgr40104.outbound.protection.outlook.com ([40.107.4.104]:8016 helo=EUR03-DB5-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 1fuznn-00032U-Ix for qemu-devel@nongnu.org; Wed, 29 Aug 2018 08:42:27 -0400 Received: from vp-pc.sw.ru (185.231.240.5) by DB7PR08MB3611.eurprd08.prod.outlook.com (2603:10a6:10:4a::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1080.17; Wed, 29 Aug 2018 12:42:25 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=WBTOJKxIndOHop7AT64KAOq+uBy2uJ2i8RZa5JDr37Q=; b=UzPn+Y1mx2dqSx8s7UPow3SyzBCgyYrAVULEGZpwMcJUeoio+n1EWmuTfysiCL/ogsdwkWxh8HpA6Zk2r8jARXronZ5IO2i0Wja6xuZx5jUEhopVfA0axrdpJ5r6OWNSe956fX8BKL6R2uDbse/ROFlDqLCoNKu2yvkp3IJYOfg= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=viktor.prutyanov@virtuozzo.com; From: Viktor Prutyanov To: qemu-devel@nongnu.org Date: Wed, 29 Aug 2018 15:41:28 +0300 Message-Id: <1535546488-30208-6-git-send-email-viktor.prutyanov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1535546488-30208-1-git-send-email-viktor.prutyanov@virtuozzo.com> References: <1535546488-30208-1-git-send-email-viktor.prutyanov@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [185.231.240.5] X-ClientProxiedBy: AM5PR0102CA0003.eurprd01.prod.exchangelabs.com (2603:10a6:206::16) To DB7PR08MB3611.eurprd08.prod.outlook.com (2603:10a6:10:4a::13) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bb3ad3ae-0a46-43aa-3d65-08d60dacdfba X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:DB7PR08MB3611; X-Microsoft-Exchange-Diagnostics: 1; DB7PR08MB3611; 3:I9vBdfmnRcQKg4Ok30QDoDqin7LZHdgsc1tuThhs85ucJG/LpE/nXk0s1DIoemJCBJ6DKQNsyp9Qig60Qe8vdNVUk0zsy/TlKyeuPZbZF/XzRnxYjFl6d5ob9bGZLVjqQ00p2O7f6tuE+wb0TjK8bgaccUzIfEcrRo+y4R/WQs/Nz1ocEhINwkFVdhQ/Of7U+R6kWLB8dIo+wbksF7rLinCQ9fewBxI4OFopPSkxxuM2kT9fMPThwTWVrUTM6ATD; 25:30iPCafd9H7MshQWxryNTdKlO2xup5Vr2Td461oP/4ggkn3mnSQK46aDfciPTeJqtPRErrOuA9eavYZg0ISqYtvkAGipa+fp+X2MkQv7nor1F1sNLn1v5VBr5y9m6K2F+87/f0Z0jNYQIkO8ydcjg8K9L1J75lhf5q0HmTj/l3CyO9nWZ9ansCUXko0pKraSEcElPt8a/nKz2kZ+11sG07NqYlX7ar/AI6A9MYjCLhRcZOtcNkx0we/JhOe9U/UlaKaa+64zKykKEIj61DcNFihyhSuGCTVMOoCFFK6WyMIEmCnNbDQVHBqnKxtw/KpXUJv+Yne2KfImwiig5+b5nQ==; 31:qU0r9YKPu4X65IHTlN+fE501qM1zyT6wcgUw9mKdv/f4V2gfGd95+kXQlU5ofSow/aTigAgbenWEGR6z8YqBgChzw0T/I/lohiNYT71wnsQfoJrFBYFF9pUSV3/pUgc2jVMCkGDxRnLdkYWOBjhmkuewwtMg5P+gE/rmn+/0Pgr7gxpwEEEHzwI9nrAJxU3uH/iaWxNliSiOEizeJidGHZq6YXPJmjACwWqxmgYsNKI= X-MS-TrafficTypeDiagnostic: DB7PR08MB3611: X-Microsoft-Exchange-Diagnostics: 1; DB7PR08MB3611; 20:KZYhIdxIiwTIkbnKI0loXcRQsIeFMvDX2av9MMZBWaHVyPEWPSW3Iu7tNwmoVhN/QF+xXQIU5uMkfL/pk7StyvvMW1cZuCWGBqYiz1QmOXHu3/5UQ1sbQ+6P2kl+VZC77GG9McBoGQFhzwKq8ZfRwCquz/I352epb63IvOFLFOIgqFyXFJu3OQL2YATVvnH90Qnecyl429/b6UJnRf6mp7YasrK1ZVBVehxMnLcq8ZiDt9QSnslMLhKrjz4SaSxjKUX6PWIF1yUXQi8qXSaINsgHVouqs7umJnP0T8chi/J3YzhhGvE2j3RkwtpdwFsNIYieHVxlJ+pththUjIC0OYvc69o+AlGgId7SnyFOsdgyc8GAXp0jF/Y5atQ50TTSHpbPoeN5eakM6YECo7Ml33NacrOYxeOh9DxsDjGUGJZRIRbM4HhWkut1OiptVs5EUXKZkUGvquNy7wToOj9q9tNr+5jJxOjzjLEoPMnX6MtWAW7nwaJLXhsYR4A7kPaT; 4:rF6WBsH0CIVf5birmO/3DtKYFnzPhV+JFIPYFl0xUJnmZX9DWil0mov+sknhgWE4c9hkO4R+4lvlFBahC0yO/ER+JXzool5J6icspgmaQnw0Ml7mFGObx9SlIPfACWYgtSu1QauvrZlzYg6EMsrXPg9I3vBrRp32baSWKxUMjLZA7BzGbhdZ0MyXFfJMx7SNEKDnBs7XLYyvMRUlBMPdf8D5VhTcYUZriq0gVhZexUKPAufNF+kib7KpC/7TUgahHJPlRqiB108zHyzdvmLY3Q== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(8121501046)(5005006)(3002001)(10201501046)(93006095)(93001095)(3231311)(944501410)(52105095)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123562045)(20161123560045)(20161123564045)(201708071742011)(7699016); SRVR:DB7PR08MB3611; BCL:0; PCL:0; RULEID:; SRVR:DB7PR08MB3611; X-Forefront-PRVS: 077929D941 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(39840400004)(396003)(136003)(346002)(376002)(366004)(189003)(199004)(51416003)(97736004)(5660300001)(105586002)(50226002)(25786009)(76176011)(4326008)(386003)(6506007)(6512007)(68736007)(53416004)(6486002)(2906002)(52116002)(69596002)(53936002)(107886003)(8676002)(36756003)(81156014)(48376002)(8936002)(50466002)(16586007)(956004)(81166006)(2361001)(6916009)(446003)(478600001)(2616005)(11346002)(86362001)(3846002)(486006)(26005)(186003)(316002)(16526019)(476003)(305945005)(106356001)(47776003)(66066001)(6116002)(44832011)(2351001)(7736002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:DB7PR08MB3611; H:vp-pc.sw.ru; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB7PR08MB3611; 23:RB0a+gvXORsC7bG5cs99PYMXp3Ou/W5qlAeXnd+kn?= =?us-ascii?Q?UB2u94IipFQfGuAWZS1eHEAG6vv5uiduuJOWlAjUsTd3aBHoYW67tb6WUX8Y?= =?us-ascii?Q?mtinlZwnG6170ivjgnYkvSIBQ6B0t/N2sNSJOuFgYDA8hhIHJiy4QfMUR9X+?= =?us-ascii?Q?araYmUsoTqcBiloKESPgQmA2jnCpzRtOlx4bFWnilsgdCewU6xzPAUtTlSv0?= =?us-ascii?Q?PcRRlxQYAR4eokLbpl/d29h/y59eXpcwvlFht4QoKKDYQUZ6yXG1afky60Lb?= =?us-ascii?Q?0tZ9V1leGb4NoBEwgmlzRqpk6PnQMMFu/JBGAAla8m1tBIc30d+RkpKhmE+8?= =?us-ascii?Q?CU+OO+IsCVg0R4E7czQMH66qlL+2Dz2cTYCd2lFQsV7rqNrKahWCZsQepGQ+?= =?us-ascii?Q?+aNAgL6cW2OVmoDhe/KMYKQG7VT3/EmdF8WIi8NJdCZS+w03APsU5lStYSkm?= =?us-ascii?Q?8ETQbnO9jV1NiIgYgOmsz3aXrVmE6xOrnpvBOorPhoqjo+Iv2SzgYJKM07yt?= =?us-ascii?Q?st37cQvqNnq4eDxA8mbJdmKCyR2MCDCtAJnzgyAyi+KYx86euR0SFHrEJ3sg?= =?us-ascii?Q?/w4/dGVYTIiActiF+BSrmqzFiRE2uhHndAGX+oac238lkZObg/0sPw2/TRQQ?= =?us-ascii?Q?t1oNyx0xSS868ghFdUJzi70o9raaOpIIsko+uhYv9Zv8FEu1F7nG4JabQfvg?= =?us-ascii?Q?+Ru8yFQW69gdm6XdtFDZbSw5U2DK80yokJOBZPdClWBMtTlBNe9m1t2KGy8t?= =?us-ascii?Q?YbiycjsyhmQyo/sMRxMhO40zWZvVm8Ri3Y7y2lBOL6x4+OT82r2oHPYp89OU?= =?us-ascii?Q?OTk+2e9srRFlE+sVsjIWV98kord4zN5Quw+rmqeL5HEV4lC24qw8u8UjxgkH?= =?us-ascii?Q?dnL5wr0BpioFT4G0NCpD0oh5iyX+Cj0vJmvS+0L/eDX4KmzwvEII4D9Xuojz?= =?us-ascii?Q?dux21cWcH4cOgfwIWoqgV5FpLiSHzaS9tE/X48CsuojQjzw/d5cPzqU5QuE8?= =?us-ascii?Q?LwqpoJtjUlXiPz2iahFHwcNWMtyIYPJe1SWDtDKKOxH97dCrvHVwARlsMP1R?= =?us-ascii?Q?eQQG1+L1HEcoIl0ZAglLSBOLAwfj9kYWE+yF0d4EQ/Nsnp68uFNvPoA62Xim?= =?us-ascii?Q?nSGSb5fObiP2pvqujcVZNLNJBiuCDZxRO802lpfOjmXs4lYLgTKP7uaxMwQK?= =?us-ascii?Q?CMrFhgXUhkZiQ/aAjcBfZL4Rf3/V7f1XDMIb3Lg5uFl025wEHK4kfJrjHYbL?= =?us-ascii?Q?gOzvq1TM7N9ELNExNliGj8acb8+XynFqI9MtptsTpf5my7jeA/WE0l05V/me?= =?us-ascii?B?dz09?= X-Microsoft-Antispam-Message-Info: wIIuLg6X/xy7lBbKZ44Tm+gQWDamfNQuZlNHBwltMkV17m4+Y12sDVqhauScEoxsVs8X0zgTLq+tU17XZxJmiMHKEzWlqYkQ/bkifvwRDssa8jfIfHgaLyOAUWcDSAdG2+wJYfKdYFi4Eo/PgACTf5XVNc/K1UlVp5hD3KBfnt/9miitRp5Xj2FuNKROQ+iNqEZxJ9yTYCd/1VUY2Emp34jIS0LOL44AMxp6IlPE1wFC09LMsH5780VDRYjlK4IiVesQbdXjEupCb4jCxtrEsQLiEmNO9SmdFa6ruh507KMMdM+BkTr7JG49X0hTcMDXteDqpYU0h+oOCPZ7R5Yz6hJWj19S0TnKibhjPmMVj9M= X-Microsoft-Exchange-Diagnostics: 1; DB7PR08MB3611; 6:VC6z9GAeJK7NwL+2fmM9Br+5s/Vp8BWJptRf0m/+CR0CRr978ZF1dSgN6PHEkpGNAxgvk3SWmPdqix46ZN4tz6mBwWWIP4bGkJDX4FlQdxixGkv5gUlOGdmbhzyBKkoB8IYD6gOvmySagnkChWEPOv3MjWF7dDZcJuPQC3hfYjSaM3DdbPZtI3VToTauNMVUkia1HCwD7+CnErRQ5ep1zbSicg7/PSh8z3J+Su7dL5KTIpIvphHC4bLR2MegIQBPOaXftmFIflRM4b7ejXcOfsTFponLsE/ftJrONhWSOMROKUYukAD5RKS/fbfGr0Pkzp9ku+l+mHpECTB0ZukKvE0hI37XJ25kNX26dryG8SoZXDg5h8HZzAVY43XUcGhzT35mSD8ksP4AVXfoUyz6r8os10xLnYpPK6LywV6C1/Gzy2DYFts51lbSiVD73swIDtWx6pBtXGS50oxr4kKD6A==; 5:zKMHXzDKtHvpC8Zpw+lE5JHdLmAl3ft3fplSuYJWy5hU7+GBP5JHh3YZaBxWvaYXPV9ghLlOhBjNa6UJjwNL2nk2nTZxLhbD46hpwTbgUmum59qlKuzc5+PuPAN8aUTliEi5lykYZBcXQXwXxdDFoveZ5eBnXg01o5zU/7+5yAQ=; 7:7MY7Rm7vSX8aLePB97URX6mxpvzoQxkFCpjGNkXl3fRlzN3eAzKdfWFV9a7bVqvA74p5/5urqrqQxQmxpN/uSqawd8P90pz6K5E7ybG3xhWSU+MPYrX6wksM0BNPDOBF0xKiuTM2ClDaTQoYdoCwBQh5qSoSYNSnr4w6NlS7h4tn/mKjGPsWgYQFPOQk8fbeiZE1xmO+CkeKkL65/eCOYSpR/FEKwNwacClMWhDHZPTExA22LgisX6UgswSkZZ2V SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB7PR08MB3611; 20:rErqh/6/bKgRQigPX33M3katnS1pAS5zDVbPowrGcD9lrpRi42Xs6TKYVcLi9dl/4cACPTRrX7X13MysYHii3v0fiq6A0NCkSWdoHcz7J96vBI/d4YNgsV0PJwfjhf+hQ38Fftmbj+7HfDKooCa91mqrfqFQtxWI/p0AE+jRlBs= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Aug 2018 12:42:25.2314 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bb3ad3ae-0a46-43aa-3d65-08d60dacdfba X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR08MB3611 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 40.107.4.104 Subject: [Qemu-devel] [PATCH 5/5] contrib/elf2dmp: add 1GB and 2MB pages support 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: viktor.prutyanov@phystech.edu, armbru@redhat.com, dgilbert@redhat.com, Viktor Prutyanov , rkagan@virtuozzo.com, pbonzini@redhat.com, marcandre.lureau@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDMRC_1 RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" After this patch 1GB and 2MB pages are being correctly processed during virtual address resolving. Signed-off-by: Viktor Prutyanov --- contrib/elf2dmp/addrspace.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/contrib/elf2dmp/addrspace.c b/contrib/elf2dmp/addrspace.c index 70f4271..f36e749 100644 --- a/contrib/elf2dmp/addrspace.c +++ b/contrib/elf2dmp/addrspace.c @@ -145,6 +145,21 @@ static bool is_present(uint64_t entry) return entry & 0x1; } =20 +static bool page_size_flag(uint64_t entry) +{ + return entry & (1 << 7); +} + +static uint64_t get_1GB_paddr(uint64_t va, uint64_t pdpte) +{ + return (pdpte & 0xfffffc0000000) | (va & 0x3fffffff); +} + +static uint64_t get_2MB_paddr(uint64_t va, uint64_t pgd_entry) +{ + return (pgd_entry & 0xfffffffe00000) | (va & 0x00000001fffff); +} + static uint64_t va_space_va2pa(struct va_space *vs, uint64_t va) { uint64_t pml4e, pdpe, pgd, pte; @@ -159,11 +174,19 @@ static uint64_t va_space_va2pa(struct va_space *vs, u= int64_t va) return INVALID_PA; } =20 + if (page_size_flag(pdpe)) { + return get_1GB_paddr(va, pdpe); + } + pgd =3D get_pgd(vs, va, pdpe); if (!is_present(pgd)) { return INVALID_PA; } =20 + if (page_size_flag(pgd)) { + return get_2MB_paddr(va, pgd); + } + pte =3D get_pte(vs, va, pgd); if (!is_present(pte)) { return INVALID_PA; --=20 2.7.4