From patchwork Wed Feb 7 16:06:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brijesh Singh X-Patchwork-Id: 10205589 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B84FF6020F for ; Wed, 7 Feb 2018 16:20:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A5A4829058 for ; Wed, 7 Feb 2018 16:20:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A44A029065; Wed, 7 Feb 2018 16:20:10 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9313429080 for ; Wed, 7 Feb 2018 16:20:09 +0000 (UTC) Received: from localhost ([::1]:55950 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ejSS8-0000aT-52 for patchwork-qemu-devel@patchwork.kernel.org; Wed, 07 Feb 2018 11:20:08 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51530) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ejSFa-0005ix-1A for qemu-devel@nongnu.org; Wed, 07 Feb 2018 11:07:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ejSFW-0006pI-O2 for qemu-devel@nongnu.org; Wed, 07 Feb 2018 11:07:10 -0500 Received: from mail-by2nam01on0072.outbound.protection.outlook.com ([104.47.34.72]:60830 helo=NAM01-BY2-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 1ejSFW-0006ob-Gh for qemu-devel@nongnu.org; Wed, 07 Feb 2018 11:07: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=Z1nIyD6UX11ZiW2OJrwdwXRbqr3zr2TplM5mRDeJOVY=; b=n1vNklPsGmFym34lkl5srkAc0F0yR07+PEmQcscVTLEHDl11yrpov2PDOv6mHr3WNNRn9bZgKxiMtUc2+YY5iQhQh9rcgh/yRvdwX/8Hy3NfxbE9pW0k3NO/h/dESGQex2vmWygPdEHc0arzwbO0e5BsZhAGbcxnB1tzuqbuYBA= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=brijesh.singh@amd.com; Received: from wsp141597wss.amd.com (165.204.78.1) by CY1PR12MB0152.namprd12.prod.outlook.com (10.161.173.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.464.11; Wed, 7 Feb 2018 16:07:01 +0000 From: Brijesh Singh To: qemu-devel@nongnu.org Date: Wed, 7 Feb 2018 10:06:14 -0600 Message-Id: <20180207160638.98872-2-brijesh.singh@amd.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180207160638.98872-1-brijesh.singh@amd.com> References: <20180207160638.98872-1-brijesh.singh@amd.com> MIME-Version: 1.0 X-Originating-IP: [165.204.78.1] X-ClientProxiedBy: DM3PR12CA0071.namprd12.prod.outlook.com (10.161.151.143) To CY1PR12MB0152.namprd12.prod.outlook.com (10.161.173.22) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: d69494b7-b89f-4df6-9c5e-08d56e44d328 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(2017052603307)(7153060)(7193020); SRVR:CY1PR12MB0152; X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0152; 3:SJsqpJmo7PKKSZq1N4gHv/E2z1ArBvuhcUrSSfChWA4jMJlnqg0E8V+h5qjMaDatxjn0KdRMXzxWauI2Vz6edg0ZM2gAL1Pc8RprARA99QBTZp3Ntf/qbSOU0kKibTPPOqul+pliZD4SPzV9kAs2RasfIh/1XFPzV3q2xJ2kPZwYa5HDyFcACuNJT6AaxiuGlpC/C7dqIvim5u/zjL7B7+jpbqcT+GAv2EsPPpMszyNh03maNm4OeadsZ52ITsTl; 25:LGmiVjQO4iHdRvXJ3BgQ57DgIy/H9dLWSkxc7/PIo1VgLKNyINQhREPLoAImwoIQN/Gyu1zANKkmLsa0vbSAk1fXLJ0AUYY7NwpRjK38CqDqsabmNP+GkYum9qPqvPteJ6POIzgstr8sa/oBaNILdHNviFZ98HE+oSltuOw8gUGKY1L4jsqkh0NPURxcLj/WWtEzIm8Dg6uIdzK9+OibNTBuVGSp2ewl3GilNHSCs5PyUXd7BrvEYAAZVn28sgEAmo528kcloWk0ig6DQ8rqxwsDb2CmmMHt7SJWQH85MUXLFcHjW29AsyrZEb9PLaQ0z/Sw9aNZ1Rfgr/TynfAEJw==; 31:H/uipf+X5Mihby88/8sp1ESJEZKr+4708uIphqkcdsYEB2S12z74pxLue4wmXlJgVQ6ZnL+ggB975WY7HphhBhk4PTq4FHeGRM0u/+0dYwKz03R/E3q3iiocWDcbA2jx8ZtlGdhG+XckRdR7gNv9rEbp3kvxCg57oy8MJRbcBm2Qfo150MWBIoFkX91kV1pfqd9/JzjcZDF7nGGv/lZ18kaTY9/8y6Thoq5+nrbrvj0= X-MS-TrafficTypeDiagnostic: CY1PR12MB0152: X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0152; 20:UdnNy7z+lvVHfWP06FdPE2CeXk3oAOrVxA/h8/UpcBvGRMDMFL/UmWNf9PH7d0YNXVC8T4sncaS3kTXkQpI4rR3zFSZF42iv1poogrS3NKahwXsFY6zd1pcy8zsXayoY46fRyJgUicoOWUuU2Tu75onvtR1vfqC2BQ49Em/0X0+H+rt6+mw3Pi1z13NnOhA3WqikHhXua89ge7EHGoJhGG9Ok62ZpsN5sFg33mYqTZmgcNTs/UNiZ0056BiDa1ra/UzCIHXdaGSzocrY1e8tihUfA8wF8uk0hxcgqcvP6afRNAMDMSozXkGQ/nxevxLZhXTxqYYKN/R06eVwAlmoe8uDG0pYRRohTDPTaBtWrJLDvZEZpHI1V7SeAp3yoMHpzBs5nneYch66S7jdykXl0rmddTxrcm3KB3gwd+/eYu46GoZuOkm4XjJfh+XJN4X6ncPl7Bj04weSJNmYr3Vh/msxCFw+6BKuyXpTC2zwuPI1cmLqkjjJcPzRjIwIGGrE; 4:GDSfpXeL0NmRPIdmNia+py4Y3ty+y4qwM0A6eDXGcMfAT3hvJRxxUN9PxOBAXyaTAw2E2e8wPbr4FBq0DXIbm7iYeZQpETD77yZoS95r11NP6WNB/fjFPGBQ5PE3Tlu8SwHr5jmjQ+Y1p1Dl2jQJiEzIDMKO963TK63Wuq7MwDnc60oo4Km/ygvQhwAbq20bPgvZC2FXxWIWTUf9qzqfrHWsKiTmdVRe4YLcqykKP5QaK4B5siwpTyVsWLEsnxGiZMz6mkXEKBUIHi9cSl10W6J6BMlMg0S0ZuuD7HfQNL28i5/cjkoFPnFtInFKg6TjInJBMRwRzo5qZx6kcxmUgg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(85827821059158)(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040501)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(10201501046)(3231101)(2400082)(944501161)(6055026)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123562045)(20161123558120)(20161123564045)(20161123560045)(6072148)(201708071742011); SRVR:CY1PR12MB0152; BCL:0; PCL:0; RULEID:; SRVR:CY1PR12MB0152; X-Forefront-PRVS: 0576145E86 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(39860400002)(366004)(39380400002)(346002)(396003)(376002)(199004)(189003)(50226002)(68736007)(8666007)(51416003)(6916009)(7696005)(16526019)(1076002)(50466002)(6486002)(53416004)(7736002)(305945005)(53936002)(8656006)(8936002)(8676002)(7416002)(86362001)(4326008)(81156014)(81166006)(52116002)(6666003)(2950100002)(478600001)(2351001)(66066001)(16586007)(2906002)(54906003)(5660300001)(106356001)(2361001)(47776003)(48376002)(105586002)(3846002)(59450400001)(6116002)(36756003)(386003)(316002)(39060400002)(26005)(97736004)(186003)(76176011)(25786009); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR12MB0152; 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; CY1PR12MB0152; 23:OhTFKMJ3iiRHXmKpSzWsP083JpNji2gd3MZ4dlvVE?= =?us-ascii?Q?Y0Om0Y1zF9ctAMoe3FL39OyTQbPbMjc1SVSV3BSKRvZIUhcjnzO8z+1gBorR?= =?us-ascii?Q?0bCwHiYYqG8zPgs8WI8kHdpAdrhtPGpHwkcszo6eoW+NKnPBPfyan/pMFxmB?= =?us-ascii?Q?w4hFL60Z7LfgQVzSN2Y2gMjoHlRlhzT+xJRnigIr1RYnzXGu4F/3qfrqaa39?= =?us-ascii?Q?XN12+yzB1tBerL0h5iKArwhSS2lHF30NAxzOC3JsRXXN4yzD4BW3fBSqfB0x?= =?us-ascii?Q?Sqf9QwVqixf9Zn1ALNnJT75gUftm/DRKedVWgWSkKxSU84VXksOTZgkx2Uww?= =?us-ascii?Q?BHLI1w0mcde3ARaAMS+2eBI3RFxKVzagREsmhDwEtov2djTt1jcU2FO1LyQu?= =?us-ascii?Q?y7iyAJo/nHzAUh2Nr6BTtAIdS0PtAIu30HrGJqf3BcsQJceqqdm6Hm6frGej?= =?us-ascii?Q?ZIl9MWKFoFfrzJ+wracZ6uMSyXGATCk/kk3BKpvrWDAMbbTG7TrGzoGBfxZ3?= =?us-ascii?Q?/aHrV0I8892zOmBZZ00M79FRrEvnd9CqTQLI1qjH591ukQrQDzI6pZq/l8he?= =?us-ascii?Q?9GLyL3KZxZvwFufGqSIWs9zHMDFUTkm8ImBntbeW9Qe32wg2u2AJxLYDJMBA?= =?us-ascii?Q?FUBZzkLYDyoxdm0zU/NDTwQj38YtMV99xLJD/TEslDbJFb8Cj59XYHSKH0k4?= =?us-ascii?Q?EkEcOAVSPiL93kRm+cE0bzQuSzw9A+4nVpilwsHRp21XUtNnpMjrX5BXG175?= =?us-ascii?Q?vPxGeKRswKkkQOTs8Pecv5ZE06zACvNJ9zbwC57HU4DddO1IQh1SUwngFqvj?= =?us-ascii?Q?s7Lax8HwQZsXBadjiCSKIjeo2VkSKUa70Bh/X2PmamlpONFG7MpWWM327JJl?= =?us-ascii?Q?ort7s4BcYEb1RmPDabt0L9qfWCiZ9RkdKbrkeVOdo284DIHgqq8EDhBfO2iO?= =?us-ascii?Q?n27ePlIvoSOyjTYeZDGmwZ+zXIvy+EKOIUFbOlB0HIru5UliQHhNzYvbI0Xq?= =?us-ascii?Q?sIyIqYsidp6oF98Se9TkALId9JxvNXFPaFZfSTggFSYRFFinV5xl/EoUxVTR?= =?us-ascii?Q?j937XadLVyN/vUbfH1wULbWLYp2EfgDCvuU3ndoFzhn57iKzCDCqD/dWzfHE?= =?us-ascii?Q?Uc3do0RF0jKY91SRoOibw5tj7uCwj5Ko0kOPGEe7fOm/Unz/rOI+hWg8geft?= =?us-ascii?Q?UUTXlrpG6M4+5Uoo/J1CCcuBe4CmgmiXgntRUHW+l1DijQtLRKg0KlW23hPk?= =?us-ascii?Q?lq2vbWa/UAtEiphUQLrm3PgYThtMOMPlgbcrJVXYcAx4miy/s3qi1iGXl4Q0?= =?us-ascii?B?Zz09?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0152; 6:vto49hwAIEggLP/TLfXUdRSesMCImeZHuInRmikuklS7PtFLzANm5F5pf1JrJW35yq1ePXlklTtKAyjmcmN+O/xToUAyRvcfP1GKy/h+IdU1ccQ1Smsy/V/MKYFmZVqy5HeQQ6EQnlG/ldpWE/372jYEhCJxin0klZoJpLEdhWEEbgHAdE7MS3XodxOXDq1Uc0AHoityCmUBhm+AspU5gb1MIHoNJH4Vyo1mhPOOkJQEjaKqyVGNVZG9fKM/I95et7PZM4KLw5H4QyzqEGjBdm37HkeKgeu4z55eGvtnemWozsTDAHiiD3cjsfpeY49O1FY/5J0/kbowxBxAT+pnyeMrhqFqaiW5ToCHr0ab+Tc=; 5:EVXMZLtkX41rRZTTVlSwAoUWWqLMmL6gS+MZ1/qTADMh0Un/CsXdoMhQLqQyw+0F2xUHy+6Oaa/lICDvx3cKpJPe+xk5gNw1XWCRMH0ZSapPZ7zF6DZ7bpy7mwC1PKCIkrkrkSGHiD1VoPAQprDVL7KpB4AGtnKTEF/G0MVMz+8=; 24:JHZ6zysQ3RU0t5Ws672fsKgETyATLr58KdxNU0eRHSscpGVTYK/s3r3/KzEhOkxwrrHNweRfcMJMLP7yKZBnYi0h+DXVJjC5+VAul3xvYcI=; 7:3WWStmQQWnYtfzoD5/U5U8lAtucHKmtvpzZ2nCR0uMrmMF33m2YtcDaz7Cy4RvtdxQR4Hs8efROCL5TlC5JlzhlF9YSdvXqilVTKLHjf+DKUsa3h3fdzg5GFYY9BvwBYG5fLv30txoNCiYj1vUCNQlhDVXQNENz2UaOSnxOSqfSQlm2A/jho9Dy8imAaCiJeZ7oehz46MX4JbH4EFQTvzYEYToworV6AZCtcwmnz/nYp0d6IEEwXOlVRO97jBW31 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR12MB0152; 20:R0Ffs/HNPmiShMMhQ3TV4CFfFetFBt0XWNPGJnxPRbs2tGcjOPZ0mDFoe3VgJHi8q3KEHPP+2d21FPhzSTpqmGP2bPKajD4l57CzhEeEMOCopwCWjo0YVsaVpw6SpyxhkT1+JYHgPwHbB/iHWZwQZ+i7ObzF7brRDtmcxMi3wUXut2orOhSQfUQ6V9hv7VwjYDvOoiRDF5Dz42rLvfyxLFhWPRrLZiAlWopXGbiXUf1Ixsm+2OADjp4zwbcdAjCI X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Feb 2018 16:07:01.2747 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d69494b7-b89f-4df6-9c5e-08d56e44d328 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR12MB0152 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 104.47.34.72 Subject: [Qemu-devel] [PATCH v7 02/26] 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: "Edgar E. Iglesias" , Peter Maydell , Eduardo Habkost , kvm@vger.kernel.org, "Michael S. Tsirkin" , Marcel Apfelbaum , Markus Armbruster , Peter Crosthwaite , 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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 | 66 ++++++++++++++++++++++++++++++++++++++------------- include/exec/memory.h | 28 ++++++++++++++++++++++ 2 files changed, 78 insertions(+), 16 deletions(-) diff --git a/exec.c b/exec.c index 629a5083851d..1919052b7385 100644 --- a/exec.c +++ b/exec.c @@ -3050,7 +3050,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); } @@ -3148,7 +3152,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) { @@ -3218,11 +3226,13 @@ void cpu_physical_memory_rw(hwaddr addr, uint8_t *buf, enum write_rom_type { WRITE_DATA, + READ_DATA, FLUSH_CACHE, }; -static inline void cpu_physical_memory_write_rom_internal(AddressSpace *as, - hwaddr addr, const uint8_t *buf, int len, enum write_rom_type type) +static inline void cpu_physical_memory_rw_internal(AddressSpace *as, + hwaddr addr, uint8_t *buf, int len, MemTxAttrs attrs, + enum write_rom_type type) { hwaddr l; uint8_t *ptr; @@ -3237,12 +3247,33 @@ static inline void cpu_physical_memory_write_rom_internal(AddressSpace *as, if (!(memory_region_is_ram(mr) || memory_region_is_romd(mr))) { l = memory_access_size(mr, l, addr1); + /* Pass MMIO down to address address_space_rw */ + switch (type) { + case READ_DATA: + case WRITE_DATA: + address_space_rw(as, addr1, attrs, buf, l, + type == WRITE_DATA); + break; + case FLUSH_CACHE: + break; + } } else { /* ROM/RAM case */ ptr = qemu_map_ram_ptr(mr->ram_block, addr1); switch (type) { + case READ_DATA: + if (mr->ram_debug_ops) { + mr->ram_debug_ops->read(buf, ptr, l, attrs); + } else { + memcpy(buf, ptr, l); + } + break; 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: @@ -3261,7 +3292,8 @@ 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_rw_internal(as, addr, (uint8_t *)buf, len, + MEMTXATTRS_UNSPECIFIED, WRITE_DATA); } void cpu_flush_icache_range(hwaddr start, int len) @@ -3276,8 +3308,10 @@ 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_rw_internal(&address_space_memory, + start, NULL, len, + MEMTXATTRS_UNSPECIFIED, + FLUSH_CACHE); } typedef struct { @@ -3583,6 +3617,7 @@ int cpu_memory_rw_debug(CPUState *cpu, target_ulong addr, int l; hwaddr phys_addr; target_ulong page; + int type = is_write ? WRITE_DATA : READ_DATA; cpu_synchronize_state(cpu); while (len > 0) { @@ -3592,6 +3627,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; @@ -3599,14 +3638,9 @@ int cpu_memory_rw_debug(CPUState *cpu, target_ulong addr, if (l > len) 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); - } else { - address_space_rw(cpu->cpu_ases[asidx].as, phys_addr, - MEMTXATTRS_UNSPECIFIED, - buf, l, 0); - } + cpu_physical_memory_rw_internal(cpu->cpu_ases[asidx].as, + phys_addr, buf, l, attrs, + type); len -= l; buf += l; addr += l; diff --git a/include/exec/memory.h b/include/exec/memory.h index 07c5d6d59796..43445cb9e45d 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -215,6 +215,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; @@ -254,6 +266,7 @@ struct MemoryRegion { const char *name; unsigned ioeventfd_nb; MemoryRegionIoeventfd *ioeventfds; + const MemoryRegionRAMReadWriteOps *ram_debug_ops; }; struct IOMMUMemoryRegion { @@ -623,6 +636,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.