From patchwork Wed Mar 7 16:50:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brijesh Singh X-Patchwork-Id: 882683 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=none (p=none dis=none) header.from=amd.com 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="UnRCqZLh"; 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 3zxKS1707Hz9sdv for ; Thu, 8 Mar 2018 03:52:01 +1100 (AEDT) Received: from localhost ([::1]:34340 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etcIJ-0004ch-Vm for incoming@patchwork.ozlabs.org; Wed, 07 Mar 2018 11:52:00 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50175) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etcHW-0004aU-Fw for qemu-devel@nongnu.org; Wed, 07 Mar 2018 11:51:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etcHS-0008AT-BJ for qemu-devel@nongnu.org; Wed, 07 Mar 2018 11:51:10 -0500 Received: from mail-bl2nam02on0081.outbound.protection.outlook.com ([104.47.38.81]:60768 helo=NAM02-BL2-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 1etcHS-00089n-6I for qemu-devel@nongnu.org; Wed, 07 Mar 2018 11:51:06 -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=LyS0CxVns4KUGMBSQGKYy7mSSRP8LkZrSp+9K6ACTig=; b=UnRCqZLhqAaVMvcG2CfzCd9TCTI7IL7cE98RT58y7a/SnZHCL80t1au3RmU4byHMxADpJ2d4/ppj3/sh04EzqXwZ80WzWZN6K3+L8VGwNctI2AFmmoSPKVadg6G54/AzoLQ8Ha/4y8gVBuIT3wT1zhgtFVm/wum3Hj9l6QF+unc= 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 (2a01:111:e400:5144::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Wed, 7 Mar 2018 16:51:02 +0000 From: Brijesh Singh To: qemu-devel@nongnu.org Date: Wed, 7 Mar 2018 10:50:12 -0600 Message-Id: <20180307165038.88640-3-brijesh.singh@amd.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180307165038.88640-1-brijesh.singh@amd.com> References: <20180307165038.88640-1-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: SN4PR0501CA0095.namprd05.prod.outlook.com (2603:10b6:803:22::33) To SN1PR12MB0158.namprd12.prod.outlook.com (2a01:111:e400:5144::17) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 0f7684c9-68fe-4dd4-6329-08d5844b9c91 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:SN1PR12MB0158; X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0158; 3:KbJcnhgLfjXAPsDE/uv7gatxPn8mZV7tJmofHGfZSdyK2ZwNESwtAfbEaifwNFZyZDyck1MY5a4+dknJMB70rj9Dolg9Lz9EpSMXqE0djnV3Oec/LVRLMH+5LJUauqUgWWp+1Cn8gu4oNRUx3wz81W2DUjWv1KCKcyLm4TFgVfRLavvw2OHhKY/s8Eyv6GlcWlhzsI10PMb7T368jZDcHDdsOcDqQ4hQTgA3CYcShki9aSoF/kWigjayisDqNEpq; 25:yQVoYycz2eIRHjQ8sK6CsZ18It3HIYlIt3UlMEAesIjm4uGfR5R27E2U5yCTPWh3PpLME2uocF4uzWn6XAJhNkqNtYJbaOiKncsMZr6br1yAyz+HHZbEX7yjmZby/PwvriE0id093L+Xu0ztg0eE6k/KPcy+DeDVIXShdQWSecyr6jMR7X3SGZa+r5QLRwd1bctteMgU8ddxOXQc/oO3MBrKGHbv/qgTwtxZ7WL8J3FejifwgFDBxz2nwHnMRxQF5uS9XfMAbfNU2UGAxEgq4QA0uttkhyhAKrQFm3qsyZXCrtX0TpSoVmwXRbXS9Bl3SMQMJ5zcIYBcaWkUcF+p6w==; 31:9pSwGjBaA+qbZmtSwRU7uSFi6NtZlVLMtNQr6POblYXjMvIcZFHGhFE4M4KmZkySINF/9hnMlwLnvg9u7oqN6PATriozDmkpA/uoO2cOd5woObv4/rfy785/1XOf4gtX9zCsE4YPUy1GzpA6oQ+DPhdAaOa5WN9jNOdQHAqu5eTx484rWa/fl4e5ihbjKzqHZI0CJK5IpRH00uga8HSUlS6ginb4NnWZLVcYbpo0ViY= X-MS-TrafficTypeDiagnostic: SN1PR12MB0158: X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0158; 20:9PUo57JZMQ3tSb0dnmRRWrKGP5R8RQxYlicLvvl9ZXOERAtYcVuTY0AY36FuXsnwt7pwZd8MPTvbW/89Q0QKw5lincDXItNW9Cxa8Rfq3u1QbcOlhawhiojfydmYRlGrzXVYjueAdmvYnK6mjxnxc/B111AIo71Zl89DixRi7Hf2wRLnRgCuBwMl15hLWZsqsJ3f5ccdBtzHHH7Bx6SMQis0Pgc9wOKYgf8ZrKAyoGmebiFQYks/tgmxHoOUWzZTjY9LRaHcwPC04x1sGHipXuE8RLOd0iyRqy43+EJQt4J3f30jnDPwRSSulL8bziJDiKdcyM/8CXH6Z0jcbQTj9uweddOvcYhGDCBcfZ2IFUpsHKvSdM0wJtoC/xzKCflHRDqn1Ra/rJwwgikW3nMgh3fhviLzbo7Z5s8oAhAtESeHX+jQvmY92hd6smnqMio3o9VHZTdy2DFYn4SbRdrG6PZBYCwbI7Zsf1p5aeu66aokRciXlk+4RtSOtSU2jj5M; 4:XZrAo9IV4I8WXzY6v1hTpsDDbtNnZgOFC95qNHt/Z9eyvdEbNO/klskJhbS0C0A2CJ0zcHZQD3p0wrb+gwhiHlU3AWGSEQl/Gr98gvtEPZ7X1Xbxd2J+JzQ8/LuhPnwOdb27xogm/O7nKtAtgNPh+1GXO7piXGMPjNfF/uhMrzo3Eg4+wZCci6z06r7usUPrHGT9ysyrMlCchejWaYfm3rE5sdytcHa0DaFm1dD0UHUrENVI0lvem+DKiGmfTlg9srKsS4EDc+o5o1reXqew/+HYYH0XeNzNALr8Lz1MjoKx0GPvxpwxJvpai4pMvPnGgpxollsL3dYr38mySSslKoKc/cEx4fgc1FJa73+yAS0= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(85827821059158)(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040501)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3231220)(944501244)(52105095)(3002001)(6055026)(6041288)(20161123562045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123560045)(6072148)(201708071742011); SRVR:SN1PR12MB0158; BCL:0; PCL:0; RULEID:; SRVR:SN1PR12MB0158; X-Forefront-PRVS: 0604AFA86B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(39860400002)(376002)(346002)(396003)(366004)(189003)(199004)(53936002)(8666007)(2950100002)(6486002)(6666003)(6916009)(53416004)(3846002)(1076002)(6116002)(4326008)(54906003)(8656006)(2906002)(25786009)(59450400001)(386003)(68736007)(478600001)(48376002)(50466002)(105586002)(2361001)(2351001)(86362001)(66066001)(106356001)(47776003)(186003)(16526019)(51416003)(76176011)(52116002)(7696005)(26005)(16586007)(316002)(50226002)(8936002)(8676002)(81156014)(81166006)(36756003)(7416002)(97736004)(305945005)(7736002)(39060400002)(5660300001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR12MB0158; H:wsp141597wss.amd.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A: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:tDq4TDFd/8eY4p9bubK/ADTaLCqPGL/LtxCZmWyYt?= IGDQZo3mTpCvxS9ECrpCQSWwtTuDFfo0On7gldIPSmXFzBptIzPxo25whPgtbD2lvIb/0TWYMHX147hvhQJznNEXFKPjuekCEVUvljS+vtp7uEbGOLoI4EMifkdOkaW0PSjqOK0COWu9lPcEnG/sVvrcnzfBWzKenyVlG+FimTK0W0ulbBBnqZ2I5Up5VrQa1x3Gag3eAdK2lEclLbi+xMRWB0JNSmJmxXZfxtnc29eEZ9VYexCwzUD7ayCa3s2/BfqpBBfjbd8QbnZdPXYq7eIo8hwRLTQ2N8aTjaAptR2veJuBgUpTknJ/0dUEJVqMsG2QE4z2Gg8CasgtizkHCttHNWPSntVsPC4WwN/IdnHS3MHiHxSH5+zLARzurgrKF5yWe5QuAVhUDTwFeJwy4P+Uy1J5aVuAT1T5Mu4i2ODAnqDrl0wBB/ltSJka67QQXWxg7VD6OHR4Ct6XL4uRiOWHtof04pPuUhHjKoAeflYAR1Zy63UDBJkaXZKBufckWCk0R+REvKn0Kzm9gwJbCx64hOctlaD7rcqQKSTI+gLM4+HZVyK0ZGjqQ8aKt1KwzbCXYlS7hrz6ypGkpf7Cv+WIDpdZOjRx9BMjg01+rbFzTv96haC+l3ucdZUzOaJ8pVUnBBoNW3bQnGGTeNjEDY6RFNWWB+VBN92po5T1ZCLSGxoj8uSQmX8KuvzmgFrqBVsDCqmrM5SaGDk/mur1VHyHlZhjgTrcl9YTU85gRnpCeuvLnNkGjT2hwmQR/IZWRxYVdv0Bn4+53DLrTAQM8XGz7Ie8xt6fa5EhmfCu/i0xlLL+7HWQkVscR1VAqyGv1EPJ6vm+0o0DYWlpodwFA8Gs3NBbr7+BYZZkWMeutSEAPRUpLZwfUK9gBpunTob2pqiBcfojyczrN3Smf1s7FC7XJoa4c0chdjsCMVQNXPKkW/oDxeIJfM2zOOd4u7+2GPhgK3UYMkhwiZKIrTZVzvvd4U9vw7H7HTZEPCmw7LegVe8Fhz9K3lxPSmGnWh5kNb6591xWq1vcZaQWQnyQYLBEj0BeESuSjZiP3rwAa3+mWbvvaBEZN/FDWxeG05Q6X7BJIcCU5kl7yMjKlkfxe1mi3MMzIHPDAz034z2s4RtpewaCjO7UbdaJZOO3j6Cc4sjzlzfDe5Ev3VqxvY7YZ6zKs9006Vqmn3nft13yDBg50G/R11RGv1F9oII5qr6AGLrR81Ol4xPLTZMMHa3jZyLz+KyIYQaQgSgNbAbzrUI9g== X-Microsoft-Antispam-Message-Info: j21RY6/nvD0vQeq3ihV/T7qab3UPAsfGpUBODh3VWj05DUN1n62gF/4pnmwJGv6UhWQ4eA718OpUMQA/QDZNEbrqGvSR1DRRXo2dMY0sd261hqg75V1IG1pxRxA53hQaTo+N5kh/QRQJ1aBfoqSWNkiCoFzhlvtrjMPBkKjQjj2TMnIHk0nYG4EkBDpnkIAK X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0158; 6:OoObC1oCfEERBo/67ApZwH72gf1DbxPHuHZPRyGcaS5JLcrSJ5gsfB1v02PqiFBNwEtcGHB9oz+pZ1cokGH/JSWhzFvNzGr29arMvblwK7c6mAHMYZdnKgriVFFM+DRfF/IaP1y1wogdmqX+zpMkekvoSNmYFzXUzUIEqI1Q3iQ10IQgvA0+EYwr2UXqPVDTg9SWEg5SyCmQA6XSRJ5LGa79tagx8zExRBN7PJ5QOCBbsWGW93yQDgLnUkj7lv/1CPkN/tOV7oz7ADl7S/Z8uA4s+HxsNhlNocR7wGxA3WkfJ2Rk7Pzplr8uisBrMjnYivlmZyudqajIbYAY8SuO+ejDtF84QfRxfSIfwESBD9E=; 5:6EQq+gHVNpGDu5gDVF8dwn5lgG5ouQdMtX4KIaf7zfDytnE9ywmkclacVHwA4H8jHSKicnmwM7X8ijRH5A5BZkLGi3YTPAayAeykNv/DLHcWLRDx1S4/xWvHaxKXp8CSImKJ6fuGpsNCDtWG+kSHVmFhvy62HBJLo/zEtkRmsN8=; 24:rl+QiW1rehIhjhs0Ujwklrcj78q6JTKXJFO3JKTwTE0C4jvo4vTSWC4hl/ZF6Sbc1liL7YBjwYvqZZLE35f/+NvWdFcv2xobCf2QDRsDygg=; 7:Dqm1WF8dhHoc9papCEi49XszumL4ZIJZwTOgkoxRwtH7DP6hCEPt2wu4DryPu/9xV7ZqMXm6Q459pcd+/6sujcN4tip8bFVDMj6NikvIFpjBbnDC7BPxYiAPdP3yxa0Kel32/TCL4eJxlMg2ThvK3WKiepgqmMaCkklYzE/EELVhJ0S5o9JAax+kY4rMIch2jt2ucnAmcdDEyNnJY2uUfOV9ATnN0I0hD8EQ+QWiqj8ksTvQqCHNOOdsRBsF+Sev SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN1PR12MB0158; 20:2NdC0nN3z9quT5hdbCpsOFYQJtX+lvgeqcTY86xQ4PialTS27F6bWVXVsPBcEgKVRu8bvyanLU9M9kWky3CXAcXlJyWaLzhIpY60+F4eZ4vsESXgLTyuy8A9wMRi0pjlhjdz8EBnm4ejxliddGSGTPHBF/oO3jvzmpv/q5Km4z10HXSjCtJF7+KvmOmYXp1YD0K7HKdktDYf/JJ/lkwANlhMjpUUJ6oy9x+G4zsoSt3OnzY4+NcCUFzOMf++EriX X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Mar 2018 16:51:02.1199 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0f7684c9-68fe-4dd4-6329-08d5844b9c91 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.38.81 Subject: [Qemu-devel] [PATCH v11 02/28] exec: add ram_debug_ops 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: Peter Maydell , Brijesh Singh , kvm@vger.kernel.org, "Michael S. Tsirkin" , Stefan Hajnoczi , Alexander Graf , "Edgar E. Iglesias" , Markus Armbruster , Bruce Rogers , Christian Borntraeger , Marcel Apfelbaum , Borislav Petkov , Thomas Lendacky , Eduardo Habkost , Richard Henderson , "Dr. David Alan Gilbert" , Alistair Francis , Cornelia Huck , Richard Henderson , Peter Crosthwaite , Paolo Bonzini Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Currently, the guest memory access for the debug purpose is performed using the memcpy(). Lets extend the 'struct MemoryRegion' to include ram_debug_ops callbacks. The ram_debug_ops can be used to override memcpy() with something else. The feature can be used by encrypted guest -- which can register callbacks to override memcpy() with memory encryption/decryption APIs. a typical usage: mem_read(uint8_t *dst, uint8_t *src, uint32_t len, MemTxAttrs *attrs); mem_write(uint8_t *dst, uint8_t *src, uint32_t len, MemTxAttrs *attrs); MemoryRegionRAMReadWriteOps ops; ops.read = mem_read; ops.write = mem_write; memory_region_init_ram(mem, NULL, "memory", size, NULL); memory_region_set_ram_debug_ops(mem, ops); Cc: Paolo Bonzini Cc: Peter Crosthwaite Cc: Richard Henderson Signed-off-by: Brijesh Singh --- exec.c | 43 ++++++++++++++++++++++++++++++++----------- include/exec/memory.h | 30 +++++++++++++++++++++++++++++- 2 files changed, 61 insertions(+), 12 deletions(-) diff --git a/exec.c b/exec.c index 4d8addb263a0..4408cd26c989 100644 --- a/exec.c +++ b/exec.c @@ -3054,7 +3054,11 @@ static MemTxResult flatview_write_continue(FlatView *fv, hwaddr addr, } else { /* RAM case */ ptr = qemu_ram_ptr_length(mr->ram_block, addr1, &l, false); - memcpy(ptr, buf, l); + if (attrs.debug && mr->ram_debug_ops) { + mr->ram_debug_ops->write(ptr, buf, l, attrs); + } else { + memcpy(ptr, buf, l); + } invalidate_and_set_dirty(mr, addr1, l); } @@ -3152,7 +3156,11 @@ MemTxResult flatview_read_continue(FlatView *fv, hwaddr addr, } else { /* RAM case */ ptr = qemu_ram_ptr_length(mr->ram_block, addr1, &l, false); - memcpy(buf, ptr, l); + if (attrs.debug && mr->ram_debug_ops) { + mr->ram_debug_ops->read(buf, ptr, l, attrs); + } else { + memcpy(buf, ptr, l); + } } if (release_lock) { @@ -3226,7 +3234,8 @@ enum write_rom_type { }; static inline void cpu_physical_memory_write_rom_internal(AddressSpace *as, - hwaddr addr, const uint8_t *buf, int len, enum write_rom_type type) + hwaddr addr, const uint8_t *buf, int len, MemTxAttrs attrs, + enum write_rom_type type) { hwaddr l; uint8_t *ptr; @@ -3246,7 +3255,11 @@ static inline void cpu_physical_memory_write_rom_internal(AddressSpace *as, ptr = qemu_map_ram_ptr(mr->ram_block, addr1); switch (type) { case WRITE_DATA: - memcpy(ptr, buf, l); + if (mr->ram_debug_ops) { + mr->ram_debug_ops->write(ptr, buf, l, attrs); + } else { + memcpy(ptr, buf, l); + } invalidate_and_set_dirty(mr, addr1, l); break; case FLUSH_CACHE: @@ -3265,7 +3278,9 @@ static inline void cpu_physical_memory_write_rom_internal(AddressSpace *as, void cpu_physical_memory_write_rom(AddressSpace *as, hwaddr addr, const uint8_t *buf, int len) { - cpu_physical_memory_write_rom_internal(as, addr, buf, len, WRITE_DATA); + cpu_physical_memory_write_rom_internal(as, addr, buf, len, + MEMTXATTRS_UNSPECIFIED, + WRITE_DATA); } void cpu_flush_icache_range(hwaddr start, int len) @@ -3280,8 +3295,9 @@ void cpu_flush_icache_range(hwaddr start, int len) return; } - cpu_physical_memory_write_rom_internal(&address_space_memory, - start, NULL, len, FLUSH_CACHE); + cpu_physical_memory_write_rom_internal(&address_space_memory, start, NULL, + len, MEMTXATTRS_UNSPECIFIED, + FLUSH_CACHE); } typedef struct { @@ -3596,6 +3612,10 @@ int cpu_memory_rw_debug(CPUState *cpu, target_ulong addr, page = addr & TARGET_PAGE_MASK; phys_addr = cpu_get_phys_page_attrs_debug(cpu, page, &attrs); asidx = cpu_asidx_from_attrs(cpu, attrs); + + /* set debug attrs to indicate memory access is from the debugger */ + attrs.debug = 1; + /* if no physical page mapped, return an error */ if (phys_addr == -1) return -1; @@ -3604,13 +3624,14 @@ int cpu_memory_rw_debug(CPUState *cpu, target_ulong addr, l = len; phys_addr += (addr & ~TARGET_PAGE_MASK); if (is_write) { - cpu_physical_memory_write_rom(cpu->cpu_ases[asidx].as, - phys_addr, buf, l); + cpu_physical_memory_write_rom_internal(cpu->cpu_ases[asidx].as, + phys_addr, buf, l, attrs, + WRITE_DATA); } else { address_space_rw(cpu->cpu_ases[asidx].as, phys_addr, - MEMTXATTRS_UNSPECIFIED, - buf, l, 0); + attrs, buf, l, 0); } + len -= l; buf += l; addr += l; diff --git a/include/exec/memory.h b/include/exec/memory.h index 15e81113bac9..4a18bb3b38ec 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -223,6 +223,18 @@ typedef struct IOMMUMemoryRegionClass { typedef struct CoalescedMemoryRange CoalescedMemoryRange; typedef struct MemoryRegionIoeventfd MemoryRegionIoeventfd; +/* Memory Region RAM debug callback */ +typedef struct MemoryRegionRAMReadWriteOps MemoryRegionRAMReadWriteOps; + +struct MemoryRegionRAMReadWriteOps { + /* Write data into guest memory */ + int (*write) (uint8_t *dest, const uint8_t *src, + uint32_t len, MemTxAttrs attrs); + /* Read data from guest memory */ + int (*read) (uint8_t *dest, const uint8_t *src, + uint32_t len, MemTxAttrs attrs); +}; + struct MemoryRegion { Object parent_obj; @@ -262,6 +274,7 @@ struct MemoryRegion { const char *name; unsigned ioeventfd_nb; MemoryRegionIoeventfd *ioeventfds; + const MemoryRegionRAMReadWriteOps *ram_debug_ops; }; struct IOMMUMemoryRegion { @@ -655,6 +668,21 @@ void memory_region_init_rom_device_nomigrate(MemoryRegion *mr, uint64_t size, Error **errp); +/** + * memory_region_set_ram_debug_ops: Set debug access ops for a given memory + * region. + * + * @mr: the #MemoryRegion to be initialized + * @ops: a function that will be used for when accessing @target region during + * debug + */ +static inline void +memory_region_set_ram_debug_ops(MemoryRegion *mr, + const MemoryRegionRAMReadWriteOps *ops) +{ + mr->ram_debug_ops = ops; +} + /** * memory_region_init_reservation: Initialize a memory region that reserves * I/O space. @@ -1938,7 +1966,7 @@ MemTxResult flatview_read(FlatView *fv, hwaddr addr, MemTxAttrs attrs, void *ptr; MemoryRegion *mr; - if (__builtin_constant_p(len)) { + if (__builtin_constant_p(len) && !attrs.debug) { if (len) { rcu_read_lock(); l = len;