From patchwork Wed Aug 29 18:30:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viktor Prutyanov X-Patchwork-Id: 963603 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; dmarc=fail (p=none dis=none) header.from=virtuozzo.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="cRUs384X"; 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 420vPG1RqZz9s2P for ; Thu, 30 Aug 2018 04:32:32 +1000 (AEST) Received: from localhost ([::1]:44448 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fv5GV-0005Cq-Ja for incoming@patchwork.ozlabs.org; Wed, 29 Aug 2018 14:32:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49699) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fv5Fh-00058N-8z for qemu-devel@nongnu.org; Wed, 29 Aug 2018 14:31:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fv5Fa-00037E-DR for qemu-devel@nongnu.org; Wed, 29 Aug 2018 14:31:37 -0400 Received: from mail-eopbgr60119.outbound.protection.outlook.com ([40.107.6.119]:29434 helo=EUR04-DB3-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 1fv5FZ-00036U-SF for qemu-devel@nongnu.org; Wed, 29 Aug 2018 14:31:30 -0400 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=QeNBLHBHcdehwot25B/NrxWWTvHuWblXN99iyOCk0u4=; b=cRUs384XBzvlWFCi7S8pOC8oJBr/OLnbBRHMZi226s6xFb11XpOG0CQPrp29K1fODmlbmOCJoLrtTLn0S51mSaj9ogtS9advoLQb+HWFwPwIT3xKQQbhJQCoQ3uCMclBtfkkT1T2KKeVhsyZ2c8+Mzyh6mfgwNZQ5dwgNrA4Log= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=viktor.prutyanov@virtuozzo.com; Received: from vp-pc.sw.ru (185.231.240.5) by AM6PR08MB3607.eurprd08.prod.outlook.com (2603:10a6:20b:4c::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1101.14; Wed, 29 Aug 2018 18:31:26 +0000 From: Viktor Prutyanov To: pbonzini@redhat.com Date: Wed, 29 Aug 2018 21:30:56 +0300 Message-Id: <1535567456-6904-1-git-send-email-viktor.prutyanov@virtuozzo.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-Originating-IP: [185.231.240.5] X-ClientProxiedBy: HE1PR09CA0058.eurprd09.prod.outlook.com (2603:10a6:7:3c::26) To AM6PR08MB3607.eurprd08.prod.outlook.com (2603:10a6:20b:4c::12) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: efa2cbe8-f02c-43b9-ca5a-08d60ddda1d8 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:AM6PR08MB3607; X-Microsoft-Exchange-Diagnostics: 1; AM6PR08MB3607; 3:RbrvI/EwwKKE7RXpBHrqwJ7GBhqbbwTba+aH8VjHVDUH1CFIfqRtDnH7YR6ardpBM2w7Tl3sqon12VixLugnrL7pEYIOti7AqV2SsVr6/JMMDLdY1Gy3Hc6TLwL9lw94+eB8yucVrSP1Xt8x12zAg98QgvRavjFkTgJJIuCB85b1knk8kvuo96RPRPVmX0udrtEM/oTbjsf/DQsmWFK/Rdi/24/82c6wyG30E/VDheADu8QD+gvx9eKMYWon2BXG; 25:6hVStpTrdgMolkkzVG0DZRjmXvaVi1jLP+hRqJZXffHzyvIZlCLCrWJdUKmqI26roxzMqBKSrF03hcWwL5VPMZano9jDAytlFfZii7PIQhm/MgydY7JnoZxuRus+OGk37Aliixxq8GS/ONn1htq8OYRHYpEWx/6oYKARwSZgLGIaQ9d8KNsNnfsmhdK6Fh6j9bmgGrGg4Eu4OVgUHtaSldzSnLedDGxx8NXy8+8NFnaLEsHLD6tftyWjtRPTNsJ5FVlNgkvBSIWfFsIKXsI9QCfKz3xkQVPPZ7uDPEoDOhfUdBKl1zpQkZnpS/aBMIyOUFwT5wLIWuRDTW4y/iA6eg==; 31:aYl8PjM4asdq0XpI+KPg72md3YGnVImK/So/vHvSM+sULMzr9/khwdl/UvCyPOk/Bs9zSpcdPhqwNO2XX4XfDVz+uT1jxhcZ/s3hAPiRdzGuNUSHw/PRIg9fnYk71lLs5kx4shRNHlTQmuNvu24WI0GDGtX8E8w5RUvgmLNH1uWSdvnNpM54xyHfCecAzsgWkr+bMIPWVGVSwU/sONPXuL81tLlakrfsGquGHVqtwco= X-MS-TrafficTypeDiagnostic: AM6PR08MB3607: X-Microsoft-Exchange-Diagnostics: 1; AM6PR08MB3607; 20:V/TNx4Y/xQFEv5XqMwGBBRZ0ei5GGFPDKGlYl2Wc+t07CsHHHHufVrevXwJzslQ2Bv8Q2Bd/k07YITn+BKLGjlgZl9IYeJyECyqNK/OOskXVyVMD8Sv30QVzmJX3NEXLQn2f88fysbpbMR8KDnLu6wIlKddmFWcz4a7uLGjD6dAVljqdBcZRqAotCTCJJIb1XvNQCdnXQtNIUghBjf2a4P3UmYt2UsJIrn/82VqSaXYyctyqom1GQy54esIqGzowYHG+SYaPMzyfyroLTVu6wGbXMA2YShVwECUmQP9Pg033DwF4ScU0CvfzhGSnVV7GY9dKWi4D4VNIL5odJi4kEAxT5JEHEyJDCtSf65k4T9Oh8LF+GdbtMvS+KAKfQJRQqzqYqZA6fctyb7B939A9/J3afDfHyzw4SnTh7kXB5C8pyxHh1mI9liWWpfp8akju0zoWNhiBV83195W1TulFjnGQTWl9p6xkYf9jaTWXJpbOs0Rzlaa1vj4xZRCftuBY; 4:T9MyMAxd5FVSdKM8QJQu1QZbQ3vbRrwqbcxTYbirJAhCSJB0EmdubBeaxiKnMJBOe8JRUFQoMR5C5jjUSNEvnmmd0syHTZowlT6QkzBwTYrn70EhEIkxG6bTrQ6ttXpxePd5DiMTU/dFAFOKQ+C223KXi3qLWes7WtEdpI3N4YqfeC18bVGo/nvFF+uBiudSp5DSPmUXFWbrUNiG7pR2Ql8ZlN8NHY8X5W0vpAf9EljYYnIqUTdAyzuCiTDMgcBnH3mbFr2DUJcETrTqmnbMmw== 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)(3231311)(944501410)(52105095)(93006095)(93001095)(3002001)(10201501046)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123564045)(20161123558120)(20161123560045)(201708071742011)(7699016); SRVR:AM6PR08MB3607; BCL:0; PCL:0; RULEID:; SRVR:AM6PR08MB3607; X-Forefront-PRVS: 077929D941 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(396003)(39850400004)(366004)(376002)(346002)(136003)(189003)(199004)(51416003)(6512007)(50226002)(305945005)(478600001)(8936002)(52116002)(3846002)(6116002)(53416004)(486006)(6666003)(6916009)(68736007)(53936002)(66066001)(107886003)(69596002)(48376002)(2361001)(4326008)(5660300001)(2906002)(316002)(50466002)(47776003)(25786009)(16586007)(105586002)(476003)(86362001)(956004)(2616005)(97736004)(6486002)(6506007)(2351001)(44832011)(386003)(1857600001)(16526019)(8676002)(186003)(106356001)(36756003)(7736002)(81156014)(81166006)(26005)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:AM6PR08MB3607; H:vp-pc.sw.ru; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM6PR08MB3607; 23:K1LIxpnKAonShG4on2MbV3KMkbWalx45hZ4Iq+EZT?= AHyxmzNSV5Ue6gOB9CksIgT+UpNNJT1Bl0sR708tfJeo+gLar2TMGCRKTbmW2Wm8LwXdZd37J7lGNTfsmRDohQJGQ+I5AF7Osof7TBf2BzNtj9DFiR2TdGU4ABSCC44Y+KUmfzSt7lo7mdgRueSqPJR5pZPi7EGEOoInHuaymWL1CIuyb4oFzYTmfqfqGUESPcJmzEKTFJDCAf7As+vpL4X89GaahDKoymPw47rZuevU+vU3Azuc/Z/aAA1dORDwcKmC7o/+CCcZdJpNeia3cKUCh+Otd7mwj2+L0yDma3FiJDLRHpPdFbMPztO3cUgHfxkIVOIebJa+bo7twAXC/5k6G5jdZCI+OkCSw6N/ucMI5AvKz+Dpf3EXfVmdsQbzPdKjPv80uf/hQINo7YD8ORxJWkp/RSLa6pOOevWf7oWO0xCTPliG/fpD3MaySDu6nR1aryJTWtzEZ9P9OW4VHyc8PaguSx6a5xNwTC2Rr1YlPUt6pohjcx+XpFzFOXZyHMUf7HrIrzbpAecbdZJ8ETN9x01Vcxh9hl68qCbISUYT+aEBZvk3Bt4qTbUXyIJ7klON62mY3Oe/ZOAylzrwi/mY6eEBidn+LsWo6Z+Vd0SypOSNxqpfmqZTsD3L/nwaxYc8yT25xlqGKjF42Tzbcqz90+TgLlXXvpBjdteVVun5snT/lKw82PN6cbyK2I0iv2cjdJGcWpEjmipejM+nOkUoVYVcqOd932Jr7gcpCE898heqnJYnjoz4affjHjjOkBnF/7X0MkB/gldlUQD5tF8i6z29RZIu9zNxZfzQjNdqblY/E1pdDtrIeWN1mZv4vx/OAsFje8HibyT+X5I0x0ioT9/xd5Ki6lhjpYgThiAuUaeMv0shgqVhiPpqMBDCLxza9mbh26nx9rtLGJf25wW9dA2jOVEmo82EOs2S021Jqtl7krEKQ0hrGpChr3TIBkN/BQhA5BvlESdGG2vZRBERf52yATlCKMldJz2uUyTGXWQWAMngKkW62PvAi9c1+CN+NRZVeGo1DI3GsjLZuEv6B6yAzEQq0IWnOdltJ1q/XKx8j4tLNR07xbHzek7cA5PGTByYDZNgF2HlnWGhalJAuIm2AY4KxZTRwvAdqorCM5EXRroa2i17kXPctc/F2i9Vg6wBH5CeUFXdUTGmyGPd8JWmG9RnP+sAC+y9Qz6+mWx4ubyS0l8FduXkAYnaSA3USNt7/cJy599TYfPRDBruyLNyADDnBszDou3BPfzEA== X-Microsoft-Antispam-Message-Info: nkzWahZpQdn937QctkVB4RwxJsyganrI6rbObuSqRSv6CMvAozllhFLTJaW6TJi18H/Y9I9zUVNMd+IlXF7rKuZ6W8u//Y3/uJgAFK+qg2dwexfe1hnvd9d5sDDWQwDSYVKcImSebI5P0mDwJ/AbrYseDFGR2ssNY2gkhBVFVtBKM00jpXt7mApD00qYDJk0Y32ui998yGBCSFSVSTxXuz1WTr6mN7WO4z8EilXT3IaadhfEpARbEUgOjSX6P77S8HUO9qjzhjymuiL9XxXHgB8BPL+yj/HtgxkJ4+3wkCby72cgD/LFX4HBVP/u01X6o2wCpNyEObb+dAw4IOjtAKveuOVueZnyWVg6iLpEKAA= X-Microsoft-Exchange-Diagnostics: 1; AM6PR08MB3607; 6:Gd0ngsNEC26PQR30BJs0ulSZbU1LvK+wzpkBpnX6Fg3DHA3xzfrnhLLoRvdIygJGxaAXLYWiZ9VJ1kLPvuH2ya8TkKlyH8BuP8DhTMKOvZcTiYYQfg1Iz5XNwMM6pn7uJ3FC/b/OsQwd6Jtj0ouW+TpXHEkRX4IcZtK4la8gqGfpf94yFMleyTnvae9L44ul+NWHgr/+169S8yBg6C0i4W3ZPvfB3Enboi8gYV0oBTae8AEP19u5rbOOfyuNdUBPqd3OOuq65jmRCbZb8FwdvPe3bYkYf3JIzko9hpdqzIoQMVnuSLa5i35z/GUjR7gIXIiwJxamO9PuZRRuRTASOZKHfP4nFuWDbbxvfRyxb9xLfTyZys/HWsJ0P4uTCYu2S7Zq8LA+ShCRr4CqUpSlMojP/bbmEyKFUDmcivnmKFvBDg3d3OB/N8TWDa8x1dpev8Vm4RrJneIcQSK8bM/xig==; 5:/HZkKVTFYNanYzL/4wazH7odzAF59lOehTiHNxG+5LzVSjutzTeDHkl6rFD9JL+vTk66mJm01PtGLHWgSNeZ/e1xWLaAury4H2ECV/cRR+5orQfgesOqy4Xr/q7MpNdE/6zeprx1LykW9oPEcZlsmoUMO2jc0Jjv39KpNBsne2k=; 7:ChVDvd2soWrKFBjSeRTruYEK3sknkjbsCKNa9QOotLxgZEvOW4MlBhb8ZBzSBz54iQYNlwWx4jXyeq99LuIbrgMKmkZdqOGd1hRevlhZXlz9b5PMCLBM4yijjsTOrUOpzuasLALaWrJMoIGZZbnQNDkSuFsKjK2CyUPBeUSlztg2dhxpjTlx4oGzQBxMqHo3AH9IP2XoEZI0wxpahGpadOtIhPHZwBQfoXlCojUEkq2+FiGBU9sskz9GvEd8zihg SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; AM6PR08MB3607; 20:zATM8De7V2Gk8YukdQtEQRvyJchWrELJuokeusORiOTuIEJvDQHu6dOEbWpQKK5bV4TnsYMoAQRGrJuSbT0URV5gyWTwxbmgZPIz9SYymRgs7h5soy2527Jy05muPp8l2VBaSeAvwvLj+kyxwbLZ3iSyMW5hDmYho6LL5gzIH+g= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Aug 2018 18:31:26.8322 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: efa2cbe8-f02c-43b9-ca5a-08d60ddda1d8 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3607 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 40.107.6.119 Subject: [Qemu-devel] [PATCH] dump: fix Windows dump memory run mapping 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 , qemu-devel@nongnu.org, viktor.prutyanov@phystech.edu, rkagan@virtuozzo.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" We should map and use guest memory run by parts if it can't be mapped as a whole. After this patch, continuos guest physical memory blocks which are not continuos in host virtual address space will be processed correctly. Signed-off-by: Viktor Prutyanov --- win_dump.c | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/win_dump.c b/win_dump.c index b15c191..aa39d9c 100644 --- a/win_dump.c +++ b/win_dump.c @@ -30,28 +30,32 @@ static size_t write_run(WinDumpPhyMemRun64 *run, int fd, Error **errp) void *buf; uint64_t addr = run->BasePage << TARGET_PAGE_BITS; uint64_t size = run->PageCount << TARGET_PAGE_BITS; - uint64_t len = size; + uint64_t len, l; + size_t total = 0; - buf = cpu_physical_memory_map(addr, &len, false); - if (!buf) { - error_setg(errp, "win-dump: failed to map run"); - return 0; - } - if (len != size) { - error_setg(errp, "win-dump: failed to map entire run"); - len = 0; - goto out_unmap; - } + while (size) { + len = size; - len = qemu_write_full(fd, buf, len); - if (len != size) { - error_setg(errp, QERR_IO_ERROR); - } + buf = cpu_physical_memory_map(addr, &len, false); + if (!buf) { + error_setg(errp, "win-dump: failed to map physical range" + " 0x%016lx-0x%016lx", addr, addr + size - 1); + return 0; + } + + l = qemu_write_full(fd, buf, len); + cpu_physical_memory_unmap(buf, addr, false, len); + if (l != len) { + error_setg(errp, QERR_IO_ERROR); + return 0; + } -out_unmap: - cpu_physical_memory_unmap(buf, addr, false, len); + addr += l; + size -= l; + total += l; + } - return len; + return total; } static void write_runs(DumpState *s, WinDumpHeader64 *h, Error **errp)