From patchwork Mon Nov 16 18:50:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kalra, Ashish" X-Patchwork-Id: 11910605 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 381621391 for ; Mon, 16 Nov 2020 19:21:53 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C91A820773 for ; Mon, 16 Nov 2020 19:21:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=amdcloud.onmicrosoft.com header.i=@amdcloud.onmicrosoft.com header.b="XWu+ORTb" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C91A820773 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=amd.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Received: from localhost ([::1]:55564 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kek4V-0004Y1-Si for patchwork-qemu-devel@patchwork.kernel.org; Mon, 16 Nov 2020 14:21:51 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42064) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kejb2-00078G-VN for qemu-devel@nongnu.org; Mon, 16 Nov 2020 13:51:25 -0500 Received: from mail-dm6nam08on2057.outbound.protection.outlook.com ([40.107.102.57]:12065 helo=NAM04-DM6-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kejb0-0004H3-S6 for qemu-devel@nongnu.org; Mon, 16 Nov 2020 13:51:24 -0500 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NHDcIJTyDQojriknzaZJqNg/iHq1Z/EKpf2e4oxZvSartXvRjvy3tE0KcfOUv4LolDAQ+ke17tQPbA2U7h0pR/z8okmPzXJLYmGSrDZnq4WQuehB2ho12az51lN09sH5ZvbA81ox5O9iSIr2G1I9tZzfkcVQ6MblcfDhKl3TIRW5VSTTz1GrVxq8//H4YdOc/RMzaj+4FR5RdcrR4Yo82xuxhaebIh9ncYz8yAIlB4e7sGPD1TGNcR/6TwU1vQNneFKGZIR0p5lAnm9MryK8iAS0sLOkXianLRKCdOBzp4SU+mEjRzuJEkvPLXXL9bzBx998nloSc167UDXlo/j1HA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=5mMhshu5C713c2SyfmmeXo3sS+iM6PeuvtkF4Ik78Nw=; b=NYl1IJQsr9swsj+h6zOBkLcsTk/U0POmRGor67/26+czejhrZz+Zxa7O8z24N9virMnCbDB9l55Y059Xgxy4BSAbWxH5HRcm2fZA4VdgOfaZU9zPwCQMvbffb9N99pqh16EZMriHAiPC+H1dLO2wZTvut97sFolmjobulG9p+qMRc9c+mvQeM19E25EV4g/e3a/rn1TXfp59gnWeL56Pj6S4oREO8w+77ztHWtcQCc4Vmq1WxGeXuN1PZjpr7NkFrVgrHe6wKMrZe/6nH/0wWumketgNhlRD3CCJ+e7jWIVcs4hVsWfPqRVzKyHtFPT6tz+BgIfSWoJpBC0zMYd7RA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector2-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=5mMhshu5C713c2SyfmmeXo3sS+iM6PeuvtkF4Ik78Nw=; b=XWu+ORTbUouUgALD3w7nAZ29bymNs4Vf7vMRfbPN9qYMBbVwHd93qPpXn0GELfBycd0i3+hX+xaTbPsyr9aagL7eZzD6Qd8dLtqVTDQ3t/wpm+MmafX4A4X7uPM1Qbnme6P9rpGd7eqp5dv/KyZaMkppDoJEk5lxPykZYXfd/x4= Authentication-Results: redhat.com; dkim=none (message not signed) header.d=none;redhat.com; dmarc=none action=none header.from=amd.com; Received: from SN6PR12MB2767.namprd12.prod.outlook.com (2603:10b6:805:75::23) by SN6PR12MB2782.namprd12.prod.outlook.com (2603:10b6:805:73::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3499.19; Mon, 16 Nov 2020 18:50:46 +0000 Received: from SN6PR12MB2767.namprd12.prod.outlook.com ([fe80::d8f2:fde4:5e1d:afec]) by SN6PR12MB2767.namprd12.prod.outlook.com ([fe80::d8f2:fde4:5e1d:afec%3]) with mapi id 15.20.3541.025; Mon, 16 Nov 2020 18:50:46 +0000 From: Ashish Kalra To: pbonzini@redhat.com Subject: [PATCH 04/11] exec: Add address_space_read and address_space_write debug helpers. Date: Mon, 16 Nov 2020 18:50:34 +0000 Message-Id: <36cda6f0d2f7e58dd7fae518e943653d8a6a559d.1605316268.git.ashish.kalra@amd.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-Originating-IP: [165.204.77.1] X-ClientProxiedBy: DM6PR07CA0090.namprd07.prod.outlook.com (2603:10b6:5:337::23) To SN6PR12MB2767.namprd12.prod.outlook.com (2603:10b6:805:75::23) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from ashkalra_ubuntu_server.amd.com (165.204.77.1) by DM6PR07CA0090.namprd07.prod.outlook.com (2603:10b6:5:337::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3564.21 via Frontend Transport; Mon, 16 Nov 2020 18:50:45 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 596d3351-6689-4114-1440-08d88a60871f X-MS-TrafficTypeDiagnostic: SN6PR12MB2782: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:247; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2DbaXhHFZz1vXTuHfUBJwC5cCTGvPe4NY3qKi8VtrRTe7jRjjquZfPwqCcs5wYw9jkKW8huAIrxBLl6CxncOvuP9gAbuSsr04FUgjrvEQ/Xi/RG+fHHY3/cp50umFlsQ/sdjXR8t1OkJXplNqTlvu4mak6ahcPM2j07xFl17gcO7v0YNwRl5wElm0W6y8lXfV9Nf7Qkt8mnLafB0/MNIi4wMn5pM4HQGeaM7r8vIs7IdCJhu4Rypp0kdKzKG3yoBPTF5qE2YIDXYgnsWrzKxNKl6h2aQ5YYSDEvdQFTsq9jIzh6lTzZe2HJWEyJgjxki X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SN6PR12MB2767.namprd12.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(136003)(376002)(39860400002)(366004)(396003)(346002)(7416002)(6666004)(186003)(83380400001)(478600001)(4326008)(5660300002)(8936002)(2616005)(66556008)(8676002)(66476007)(6916009)(16526019)(66946007)(86362001)(316002)(7696005)(36756003)(52116002)(2906002)(26005)(6486002)(956004); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: rcYfFRDiGWGks1g2BM254n3c4JPkV2mPDQK+MZUg9FoH2PFTy1bbw884FtlF4Yi2BEf5/JNJoMV6BlOUTAH2LLfgxgsrDemgTSmi8M+Gi2ijGWwL7aQEmz0xbQD4b4snrhmLXtzlaVWVfAAeEH0zb9nvOXWXFN6TIOWycTfRE7S31mESDKjk4k+LBcAWKH0DiXDaCihbc9ndBKlnCfGmBjb56/bDBet60Be78M6Hi88SmjP9LbS09Zif0MaeJRD4UIXrBOSHyRGy3scI0dYUOu/gyDDf/XNOc28zMB4StJGkWMdLvRSo2NSSuGSRdTJwVfRsLnZ56XPtfytWq1tlk62hhYDwN00s3IuKFe7KCDHqSJLnpDxq96+7RGFy8R3hHgtLgfT1RwrxPEMz4PssFysy0ozI3iEPFjxAUqeotkpiUrdELZfyC5oMgR7j9M9LCEmlXrgexjVbg3PY9D+6MH/N8vR4ZFkQWh5LhcJ8IC7vSFuWlrJNO1cNSDC6oI1018mkWo4iqiULuE1SR/dDHZhk/7rqOpIY/Fy1yObEi2KbcPABvV89QmjLI0bu5bhAyB5ynzdLqSXDFoCvNFgDWlGu1QaNyH2Xowbxi63kyJSZoj5oqSBqrTXcugHOM0/OzlPBRcxlhe1b776mRpQD8DHvCuAPytfRAgaAVLaANxurwRkz3Buo54dJta3pPjFpkEWsDQlb2Yunx6t1ZhZLQ1DxUv4e/0Eo7uhyZgNjWaTZ/Ozm4XgljwnXZ1WuHFuCl3zY8Ft83DdEjGNKfx8MgLxPl6SAzPurICHQvVOY2AO21UHrIeAIWgx/tj34khd4OY3vlHhDIGZzx/ZI8xcoMRBmHLnbf2bj5sKH3w84HCHaDjqBuvteRDsG3/A9IuAoe6N3dst8D+gPis5y6QdTtw== X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 596d3351-6689-4114-1440-08d88a60871f X-MS-Exchange-CrossTenant-AuthSource: SN6PR12MB2767.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Nov 2020 18:50:46.3018 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 7nk8Dt/TYuE9V4RBkLv5p0liucLyUOk5IM1T2vWgce2FtyEYH3nD8jRgt4hcRIT8vIzyGvGW635kG1zHtqw2Lg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR12MB2782 Received-SPF: none client-ip=40.107.102.57; envelope-from=Ashish.Kalra@amd.com; helo=NAM04-DM6-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/16 13:51:21 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas.Lendacky@amd.com, brijesh.singh@amd.com, ehabkost@redhat.com, kvm@vger.kernel.org, mst@redhat.com, mtosatti@redhat.com, ssg.sos.patches@amd.com, armbru@redhat.com, qemu-devel@nongnu.org, dgilbert@redhat.com, rth@twiddle.net Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" From: Ashish Kalra Add new address_space_read and address_space_write debug helper interfaces which can be invoked by vendor specific guest memory debug assist/hooks to do guest RAM memory accesses using the added MemoryRegion callbacks. Signed-off-by: Ashish Kalra --- include/exec/memory.h | 10 +++++ softmmu/physmem.c | 88 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 98 insertions(+) diff --git a/include/exec/memory.h b/include/exec/memory.h index 2fb4193358..74f2dcec00 100644 --- a/include/exec/memory.h +++ b/include/exec/memory.h @@ -2432,6 +2432,16 @@ typedef struct MemoryDebugOps { void address_space_set_debug_ops(const MemoryDebugOps *ops); +MemTxResult address_space_write_rom_debug(AddressSpace *as, + hwaddr addr, + MemTxAttrs attrs, + const void *ptr, + hwaddr len); + +MemTxResult address_space_read_debug(AddressSpace *as, hwaddr addr, + MemTxAttrs attrs, void *buf, + hwaddr len); + static inline bool memory_access_is_direct(MemoryRegion *mr, bool is_write) { if (is_write) { diff --git a/softmmu/physmem.c b/softmmu/physmem.c index 057d6d4ce1..2c08624ca8 100644 --- a/softmmu/physmem.c +++ b/softmmu/physmem.c @@ -3266,6 +3266,94 @@ void cpu_physical_memory_unmap(void *buffer, hwaddr len, #define RCU_READ_UNLOCK(...) rcu_read_unlock() #include "memory_ldst.c.inc" +MemTxResult address_space_read_debug(AddressSpace *as, hwaddr addr, + MemTxAttrs attrs, void *ptr, + hwaddr len) +{ + uint64_t val; + MemoryRegion *mr; + hwaddr l = len; + hwaddr addr1; + MemTxResult result = MEMTX_OK; + bool release_lock = false; + uint8_t *buf = ptr; + uint8_t *ram_ptr; + + for (;;) { + RCU_READ_LOCK_GUARD(); + mr = address_space_translate(as, addr, &addr1, &l, false, attrs); + if (!memory_access_is_direct(mr, false)) { + /* I/O case */ + release_lock |= prepare_mmio_access(mr); + l = memory_access_size(mr, l, addr1); + result |= memory_region_dispatch_read(mr, addr1, &val, + size_memop(l), attrs); + stn_he_p(buf, l, val); + } else { + /* RAM case */ + fuzz_dma_read_cb(addr, l, mr, false); + ram_ptr = qemu_ram_ptr_length(mr->ram_block, addr1, &l, false); + if (attrs.debug && mr->ram_debug_ops) { + mr->ram_debug_ops->read(buf, ram_ptr, l, attrs); + } else { + memcpy(buf, ram_ptr, l); + } + result = MEMTX_OK; + } + if (release_lock) { + qemu_mutex_unlock_iothread(); + release_lock = false; + } + + len -= l; + buf += l; + addr += l; + + if (!len) { + break; + } + l = len; + } + return result; +} + +inline MemTxResult address_space_write_rom_debug(AddressSpace *as, + hwaddr addr, + MemTxAttrs attrs, + const void *ptr, + hwaddr len) +{ + hwaddr l; + uint8_t *ram_ptr; + hwaddr addr1; + MemoryRegion *mr; + const uint8_t *buf = ptr; + + RCU_READ_LOCK_GUARD(); + while (len > 0) { + l = len; + mr = address_space_translate(as, addr, &addr1, &l, true, attrs); + + if (!(memory_region_is_ram(mr) || + memory_region_is_romd(mr))) { + l = memory_access_size(mr, l, addr1); + } else { + /* ROM/RAM case */ + ram_ptr = qemu_map_ram_ptr(mr->ram_block, addr1); + if (attrs.debug && mr->ram_debug_ops) { + mr->ram_debug_ops->write(ram_ptr, buf, l, attrs); + } else { + memcpy(ram_ptr, buf, l); + } + invalidate_and_set_dirty(mr, addr1, l); + } + len -= l; + buf += l; + addr += l; + } + return MEMTX_OK; +} + int64_t address_space_cache_init(MemoryRegionCache *cache, AddressSpace *as, hwaddr addr,