From nobody Wed Oct 8 18:13:05 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1520513843793955.6697635433902; Thu, 8 Mar 2018 04:57:23 -0800 (PST) Received: from localhost ([::1]:38497 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etv6o-0003Gj-W8 for importer@patchew.org; Thu, 08 Mar 2018 07:57:23 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58755) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1etuzI-0004tU-18 for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:49:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1etuzE-0003fh-Gj for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:49:36 -0500 Received: from mail-co1nam03on0068.outbound.protection.outlook.com ([104.47.40.68]:10675 helo=NAM03-CO1-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 1etuzE-0003cj-6W for qemu-devel@nongnu.org; Thu, 08 Mar 2018 07:49:32 -0500 Received: from wsp141597wss.amd.com (165.204.78.1) by DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.548.13; Thu, 8 Mar 2018 12:49:26 +0000 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=GX88CZz8kwtCmTXXNnOSIBkyyt9UNKXpBcr3LOG/Q9M=; b=4IAMMlUgffYR7CePwPwOKdVlMqiR0njWCuJSCnneYIrshCjfVBKX43dli5xDAGaMjbCuDJgYl0477B71G6TtAMn7fA+Ugsm/9R5Rv2G3boaDt9rPwRMLnq2xygqc5YCEEHHbEoedbWBgJ4mgGY8wwi5Rwha/ePsaBTSBbJQM3ho= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; From: Brijesh Singh To: qemu-devel@nongnu.org Date: Thu, 8 Mar 2018 06:48:35 -0600 Message-Id: <20180308124901.83533-3-brijesh.singh@amd.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180308124901.83533-1-brijesh.singh@amd.com> References: <20180308124901.83533-1-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: BN6PR14CA0031.namprd14.prod.outlook.com (2603:10b6:404:13f::17) To DM2PR12MB0156.namprd12.prod.outlook.com (2a01:111:e400:50ce::19) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: aa9a6598-8170-4536-e97c-08d584f307d9 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7153060)(7193020); SRVR:DM2PR12MB0156; X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 3:qb0y/M+gpb7xXqKJRKyZVWgCeE1gdGh6aaE5p6bVaAVu4Xtje1rC/J0wFI50uOVtR23lmRBPArdn6XCV41Ipw40GtPYK3ekckD8+NYT2wdTDRNLxA/B8AVe21XBeto+b3nvhB+QQHt5Q++XWIMCMqSxNjWLAkEcbaO1S7dvAKObnAPmRTulhO/+VOtCEbvfMe7gE6qTGq40OPpBo+JCm1DYISn4bxCCkntOZvpqHq14c/Nj8JED+qlQh4h0glLdA; 25:N1dTSEW5CyZWhvEEJN+OjVnoepCf3NFv6NSBT0ZmxLmhCm0ZvfQJAUffgvtH5TWN4T2BJQel4hWhEhoQIqqATA3ObzXh6cjq+hFysDZMUTAph42AYr3XkIz7naEZdy1eGNV2s1Czp+oJqrPn3oTZQOf5BCfRfaoWQokD+Mm+XDYtH1tJJst7AwJGAF9m/tJ8w3lh4Pf/WSIaUBiWQFtzixU03n5gZtMAPgByTDubG1ZYcnmfTJsB4PdamVaJJ1kXo3fOYe8cPb6EQI2ifHVQziemdhu30D7FDLflr2q2iBRw9MlvjsFRQFP4X3dSa931TZbdIZsNaBfB7rIihUokTA==; 31:SfDjB/upZ86DMJM29MgT6IcKXKtekJ1HOvv2VvMIGsSzuraqpRNQZ655BBN8y/rP5RVAysMmykbV2stzxQv40NKRqy2SAjchIh2bojhc9iO2Mzp/Ii2wpd+g1SgrIbwqIIjwxyzITKbEdbFd6rkUOcoqrcqjEYQMe5eAq73EFhMXEPCZFjkl0vKrWBLt5Pd1UISFLudxv6mv9YG7dY7rLerZTrmojpLYZrRxEU/dgHM= X-MS-TrafficTypeDiagnostic: DM2PR12MB0156: X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:4AHzmXPsHvgyy+nOnZCeSuNLUDIaO8gMLMzFFjOtfPDGz8lne0GIW1ivJRobqKCOcwX7p9eBhuwQDqegt6pdIaWGlaM9tNhCl/LIOXNlwsRRENU7pM4dV5YaImlsinRkfKFN72BunblbMECv96FKRtbxxjb4RH19ZYE584Lae1eUmWBIvumEfhT09spS7nL2jqYaPJuM5+8dVEpUbuJkhCcEp+gyE/lSTLngdWgMc0fmECUck92m5tVJJuvaa+8ZWxtOp+AZ70JJl1GLl9Fq3OPtGa8VvbFaanVyn1gqTwMUO+mp77T5MgboQ168B12ShrrbMzqUX8ycemGO0llAeiQT7O5XV5keuYFXg+iO0gT742blvpzaMVxm99xDI+Sak+qmEZU5Xlpcljg+Wc88yqWvbHqhIwP57cVQPkhpzX6T4STNRJRokxUCGJf4KBbENHjy4S9PNLwhR+LB7Tqxzr7u24Ue7EezuHsvcPEshMOhPe8wP+MPROOcYDAwP5j7; 4:Z5ayUlFrbnnhy16Ekbi/JugrFoxmkT7QW78cABt2ZlYhotfNhnO0V9d2MYbgMKv4Px+oMhRBFGt7YR6xuQMZobmuLqElGsXDK+vflaKMgfbou7ycgEU/TYyklhGALtakg341QvysKy+Fkpuze/DD5+tgDfN7l4a9sgXyyjkhkwauwKlzWG+kyMNV/fAiXNc4QZV9VFuLlXRkaEE0Kf/iqyJmXOdIlfPK9MZyL+joKcHpkPt80QCxJRIlEHVP4WtelKDb/K2zGx/WNUnlMxLXRL9U35Oks2OKopURQyULsMc9LClW2N77PB9BfX3y9WF3pc6moQGzPXH2UtykLN51bvLUk8xu0qlMpruJTwVEUMM= 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)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123560045)(20161123558120)(20161123562045)(6072148)(201708071742011); SRVR:DM2PR12MB0156; BCL:0; PCL:0; RULEID:; SRVR:DM2PR12MB0156; X-Forefront-PRVS: 060503E79B X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39380400002)(39860400002)(376002)(396003)(346002)(366004)(199004)(189003)(50226002)(53936002)(2950100002)(6916009)(2906002)(2361001)(6666003)(2351001)(106356001)(81156014)(53416004)(8676002)(81166006)(7736002)(36756003)(305945005)(8936002)(105586002)(48376002)(50466002)(68736007)(97736004)(47776003)(66066001)(25786009)(4326008)(39060400002)(6486002)(7416002)(5660300001)(3846002)(478600001)(76176011)(51416003)(7696005)(52116002)(6116002)(16586007)(16526019)(186003)(26005)(1076002)(8656006)(386003)(54906003)(86362001)(575784001)(316002)(59450400001)(8666007); DIR:OUT; SFP:1101; SCL:1; SRVR:DM2PR12MB0156; H:wsp141597wss.amd.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; 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: amd.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR12MB0156; 23:YeAm6BB9CLVlt9xc1nCTtoiJW+VoGSvbMv9jLJqTQ?= =?us-ascii?Q?zBtNeTMgm3lHLMf7yAz5yowf0nfQXSqfwcYLGHrLSJO/tOkANkR8zde6dnQq?= =?us-ascii?Q?IAd3/tcJxfY/wafZwbSgCWo8dzWy5p/2KHvpUwieTcyA+CrujAN90TUF00F8?= =?us-ascii?Q?MBACjznUDafbxwi0K5c4XSzsHO8DQ3OwSg+Xv+2xT3cVCCOaWr9Ekch1yra5?= =?us-ascii?Q?O8sUJSEnLM2La/OXXF1NHszs8TKiKf+LQ/U9odDtb0wAGxrxTEqLf1pQwMXs?= =?us-ascii?Q?ksUVNoHnH2PaSNyEF6MDrkhVAIki6vq+BBoX2dTsp5+9Whi0YKhKXkqIJ6k6?= =?us-ascii?Q?/sPX3X2ld336McsCjdV1tOetXKRK2Dkgd6QVQShKonLcRju31+btON8qUCvD?= =?us-ascii?Q?TU/2r4JBmjRwiTL+uCL1al/GwRnaFN3l6sSEE1rIaQB4GFFQE1erEqtlgSqB?= =?us-ascii?Q?3CjmtbNuSB7XMfM0y5n130ubKv4pT1nktS6buwnoHn4gOsNN50MigIoXjc5I?= =?us-ascii?Q?PXK1lT15A+hZ2YyGalye9d9w59j+gSd+ViFsRkQBAwk6Wf+WjaYUO8XoHWmL?= =?us-ascii?Q?y72Mb3790mT0KhCyT0FWwDYW8rxnWA32zAxTvlYFGDUkhTjsv1D54G9ZnwWN?= =?us-ascii?Q?3+j6YPQh5Tf+6kEn+fujAcIV9AQetCHZA/DqQ0NFi+OFwlr0Y+ne2zlnvp9n?= =?us-ascii?Q?aaiLUEwvc7axrXzKF7v082EWqNcCPWqYrAtElMev9elVZ3Kz0L+qE+J/N7il?= =?us-ascii?Q?/Drlwo3SPmKfpGXUmMhMo20sk52eOhujBndl2u25ysQZnSD60iBlCVXsLZXu?= =?us-ascii?Q?5ky8XVTMVHAR2Pj4LCA365dKP9fopVNGUJzxqzBrn4I/h8lbpLrnEZhCPxhI?= =?us-ascii?Q?yEAMmBVgLYoKrOX55FMQWGkKAzYiiY8+vruMAU4Q7aVjKpzcYx2hTPmrd710?= =?us-ascii?Q?9GLpmIlvVx8BAcMoNtlGrAJqKwok0aVXEbKMaKgcuUR6+ewXuEyKNoN81b9S?= =?us-ascii?Q?6mGrvjd6qeO10MLusZm3FeTPtnStvfb+/2uaikgLaaXZyoPkCkRpYemJ0Wm6?= =?us-ascii?Q?3KZGOZjpdvKwRu00cyhskhKA8Bu+frRVz5vzQXuy6MNplRN+NwBaPOEQp1ts?= =?us-ascii?Q?ccuAaO6nBT6bHtvkrYdaclcs4a6O8cFzNnHIiL0HCrzLoZPuIuPGNtW3BPYo?= =?us-ascii?Q?yghKl0sm27e54XRz0dZFFepJ7JGRccwETv6lXAJ8K/xu1HKUsKM+la/gpUjw?= =?us-ascii?Q?/BwsL2yn9JAralz34SZtpQYTMOGhzZ0HMsgSf4wMtNNWQIjE+dmV9gF4oYw+?= =?us-ascii?Q?soMg8TCql9oEwoBEXYDyDA=3D?= X-Microsoft-Antispam-Message-Info: 8sEqpLJw6DXnCWyC82xVvy4l1q6l0PRHfHR5Xiez34Z547zDSlh42lR/+scIuQbw64zLoIIISjzx4RUghhfW1WVaTdq3zjyYmQ0iuid/McN6yk12a78DMY+OjMFudLpgHRsdS9UNTUXtShIIqg6iMpHospOvrZvS85+7v+qEzClEJKYjZPdN5Eg/7771bgty X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 6:BrpxjpALF3aaK2ivNEHY+EIXWxGp8pUejS8DCFVY+unQkgNnIz4Au9FFtvUaODXzUWV22JTiIfuCk7WY3qQJ7z4rUdUybWMGyOxkXDELJ2jwvDiAqueBMWQPIwonWRJeRrzLCA03sXufV4c6RGuzUeTXa1gvt52xFXF0+MQjpq5pjh8icjuq77EDZF2c+p+ZMhaAg50yXwPrQ+cevyvuJQNaEnFooqNZcTSC+F7NfVxesffP+zsCEuzj/FB+ARGmV28LQLMQmtpBUKiVLJDLMQUNTImhcq5ZHtaZQep8OMj46sBY87UDtKenHVFw+ochjzHM/m2gTQM8WlV1EW2quc4kp/StF8/8Syx9BgTkjkY=; 5:osEK4IaEdOUX6m2cNOs3kByK8Fmh+QSQqbQ3mU5epmLDiOqvbENBm470xo6o6cnoaqkhyaHVxyxhIF+/FFWiLfJC3VrD8zdBO/pzauv1XLAlfMMLhSAaKeZnsMJljxBeujThG3rE+hTeMZOxEqkUpAv1Cp0lJnlb4GILHJVVDac=; 24:4IfnHh20mcHkxh1Rph8xzSUk1lyEXsD6DEotw/dhc5bGvSEMkEmcbvF2yQ20Q8SM4OAxVtSt1uNYHJwt6VAyZ7uYbW9ZumESXEIpTtfCUyw=; 7:CcQHmnqnBbQOIv3/23UFx0KfcAqWMLuYylQPcnrmwP/7oyAetX9T3f13PblC4sFtu1bB7Z71Xv8gsA8naLT7N6oB+nIhblp9LsIT3Oj59Qvva6OtfiTL1IXuuitACLHJapoxSbhODAn59ou8TTR/+KZKUU0AVKmiivzzlmtTrtNBKLsatHZxHaE0TNToFbfCzEPhMyIHgMVT2sn2ey44NQUGvXg4hVVw5259lfWzS+s8yJLke05ieTGHJxAGmhlp SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DM2PR12MB0156; 20:i/RtiuLk6TqINgH0+9Xr7xJ62bUT8+jUOeViBBsQeyrxDIU8LuMtTNBsFu+EkwArUTc1frTAQX92P6Q8G7nBEq1O40CLjcZzc6PWcKIXITnEFszK4JEnlLVcefor8BczZTvbB72G739atrxTldd0qD56kUPBx99gAwr3v3vsXIkjX+wQbndSuVKcLCrLvLWZeXHxzKJiPW8FpMRIafmlCh5wFecjGSZ+9W03CV5QhcIHPQxXE2DT0mceaDoNl67D X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2018 12:49:26.5809 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: aa9a6598-8170-4536-e97c-08d584f307d9 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR12MB0156 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.40.68 Subject: [Qemu-devel] [PATCH v12 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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 =3D mem_read; ops.write =3D 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 604f03c535bc..f69371d30e14 100644 --- a/exec.c +++ b/exec.c @@ -3056,7 +3056,11 @@ static MemTxResult flatview_write_continue(FlatView = *fv, hwaddr addr, } else { /* RAM case */ ptr =3D 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); } =20 @@ -3144,7 +3148,11 @@ MemTxResult flatview_read_continue(FlatView *fv, hwa= ddr addr, } else { /* RAM case */ ptr =3D 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); + } } =20 if (release_lock) { @@ -3237,7 +3245,8 @@ enum write_rom_type { }; =20 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; @@ -3257,7 +3266,11 @@ static inline void cpu_physical_memory_write_rom_int= ernal(AddressSpace *as, ptr =3D 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: @@ -3276,7 +3289,9 @@ static inline void cpu_physical_memory_write_rom_inte= rnal(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); } =20 void cpu_flush_icache_range(hwaddr start, int len) @@ -3291,8 +3306,9 @@ void cpu_flush_icache_range(hwaddr start, int len) return; } =20 - cpu_physical_memory_write_rom_internal(&address_space_memory, - start, NULL, len, FLUSH_CACHE); + cpu_physical_memory_write_rom_internal(&address_space_memory, start, N= ULL, + len, MEMTXATTRS_UNSPECIFIED, + FLUSH_CACHE); } =20 typedef struct { @@ -3612,6 +3628,10 @@ int cpu_memory_rw_debug(CPUState *cpu, target_ulong = addr, page =3D addr & TARGET_PAGE_MASK; phys_addr =3D cpu_get_phys_page_attrs_debug(cpu, page, &attrs); asidx =3D cpu_asidx_from_attrs(cpu, attrs); + + /* set debug attrs to indicate memory access is from the debugger = */ + attrs.debug =3D 1; + /* if no physical page mapped, return an error */ if (phys_addr =3D=3D -1) return -1; @@ -3620,13 +3640,14 @@ int cpu_memory_rw_debug(CPUState *cpu, target_ulong= addr, l =3D len; phys_addr +=3D (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, attr= s, + WRITE_DATA); } else { address_space_rw(cpu->cpu_ases[asidx].as, phys_addr, - MEMTXATTRS_UNSPECIFIED, - buf, l, 0); + attrs, buf, l, 0); } + len -=3D l; buf +=3D l; addr +=3D l; diff --git a/include/exec/memory.h b/include/exec/memory.h index 31eae0a64062..875d39a125c6 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; =20 +/* 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; =20 @@ -262,6 +274,7 @@ struct MemoryRegion { const char *name; unsigned ioeventfd_nb; MemoryRegionIoeventfd *ioeventfds; + const MemoryRegionRAMReadWriteOps *ram_debug_ops; }; =20 struct IOMMUMemoryRegion { @@ -675,6 +688,21 @@ void memory_region_init_rom_device_nomigrate(MemoryReg= ion *mr, uint64_t size, Error **errp); =20 +/** + * 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 du= ring + * debug + */ +static inline void +memory_region_set_ram_debug_ops(MemoryRegion *mr, + const MemoryRegionRAMReadWriteOps *ops) +{ + mr->ram_debug_ops =3D ops; +} + /** * memory_region_init_reservation: Initialize a memory region that reserves * I/O space. @@ -1959,7 +1987,7 @@ MemTxResult address_space_read(AddressSpace *as, hwad= dr addr, MemoryRegion *mr; FlatView *fv; =20 - if (__builtin_constant_p(len)) { + if (__builtin_constant_p(len) && !attrs.debug) { if (len) { rcu_read_lock(); fv =3D address_space_to_flatview(as); --=20 2.14.3