From patchwork Tue Nov 7 13:03:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "nicolas.eder@lauterbach.com" X-Patchwork-Id: 13448628 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 1A2D2C4167B for ; Tue, 7 Nov 2023 13:10:13 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r0Lmg-0002KU-VS; Tue, 07 Nov 2023 08:06:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r0Ll2-0000Ch-VH for qemu-devel@nongnu.org; Tue, 07 Nov 2023 08:04:43 -0500 Received: from smtp1.lauterbach.com ([62.154.241.196]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r0Lkt-00063P-5t for qemu-devel@nongnu.org; Tue, 07 Nov 2023 08:04:40 -0500 Received: (qmail 31517 invoked by uid 484); 7 Nov 2023 13:04:18 -0000 X-Qmail-Scanner-Diagnostics: from nedpc1.intern.lauterbach.com by smtp1.lauterbach.com (envelope-from , uid 484) with qmail-scanner-2.11 (mhr: 1.0. clamdscan: 0.99/21437. spamassassin: 3.4.0. Clear:RC:1(10.2.11.92):. Processed in 0.073339 secs); 07 Nov 2023 13:04:18 -0000 Received: from nedpc1.intern.lauterbach.com (Authenticated_SSL:neder@[10.2.11.92]) (envelope-sender ) by smtp1.lauterbach.com (qmail-ldap-1.03) with TLS_AES_256_GCM_SHA384 encrypted SMTP for ; 7 Nov 2023 13:04:16 -0000 From: Nicolas Eder To: qemu-devel@nongnu.org Cc: "Nicolas Eder" , =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , "Christian Boenig" Subject: [PATCH v3 19/20] mcdstub: break/watchpoints added Date: Tue, 7 Nov 2023 14:03:22 +0100 Message-Id: <20231107130323.4126-20-nicolas.eder@lauterbach.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231107130323.4126-1-nicolas.eder@lauterbach.com> References: <20231107130323.4126-1-nicolas.eder@lauterbach.com> MIME-Version: 1.0 X-Qmail-Scanner-2.11: added fake Content-Type header Received-SPF: pass client-ip=62.154.241.196; envelope-from=nicolas.eder@lauterbach.com; helo=smtp1.lauterbach.com 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, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org --- include/mcdstub/mcdstub.h | 46 +++++++++++++++ mcdstub/mcdstub.c | 116 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 162 insertions(+) diff --git a/include/mcdstub/mcdstub.h b/include/mcdstub/mcdstub.h index c55d52d2a7..53e5926ff5 100644 --- a/include/mcdstub/mcdstub.h +++ b/include/mcdstub/mcdstub.h @@ -785,6 +785,52 @@ int mcd_read_write_memory(CPUState *cpu, AddressSpace *address_space, MemTxAttrs attributes, vaddr addr, uint8_t *buf, uint64_t len, bool is_write); +/** + * handle_breakpoint_insert() - Handler for inserting a break- or watchpoint. + * + * This function extracts the CPU, breakpoint type and address from the + * parameters and calls :c:func:`mcd_breakpoint_insert` to insert the + * breakpoint. + * @params: GArray with all TCP packet parameters. + */ +void handle_breakpoint_insert(GArray *params, void *user_ctx); + +/** + * handle_breakpoint_remove() - Handler for inserting a break- or watchpoint. + * + * This function extracts the CPU, breakpoint type and address from the + * parameters and calls :c:func:`mcd_breakpoint_remove` to insert the + * breakpoint. + * @params: GArray with all TCP packet parameters. + */ +void handle_breakpoint_remove(GArray *params, void *user_ctx); + +/** + * mcd_breakpoint_insert() - Inserts a break- or watchpoint. + * + * This function evaluates the received breakpoint type and translates it + * to a known GDB breakpoint type. + * Then it calls cpu_breakpoint_insert or cpu_watchpoint_insert depending on + * the type. + * @cpu: CPU to which the breakpoint should be added. + * @addr: Address of the breakpoint. + * @type: Breakpoint type. + */ +int mcd_breakpoint_insert(CPUState *cpu, int type, vaddr addr); + +/** + * mcd_breakpoint_remove() - Removes a break- or watchpoint. + * + * This function evaluates the received breakpoint type and translates it + * to a known GDB breakpoint type. + * Then it calls cpu_breakpoint_remove or cpu_watchpoint_remove depending on + * the type. + * @cpu: CPU from which the breakpoint should be removed. + * @addr: Address of the breakpoint. + * @type: Breakpoint type. + */ +int mcd_breakpoint_remove(CPUState *cpu, int type, vaddr addr); + /** * mcd_get_address_space() - Returnes the correct QEMU address space name * @cpu: CPUState diff --git a/mcdstub/mcdstub.c b/mcdstub/mcdstub.c index 8dc1e6a71d..68e9cdf531 100644 --- a/mcdstub/mcdstub.c +++ b/mcdstub/mcdstub.c @@ -570,6 +570,32 @@ int mcd_handle_packet(const char *line_buf) cmd_parser = &write_mem_cmd_desc; } break; + case TCP_CHAR_BREAKPOINT_INSERT: + { + static MCDCmdParseEntry handle_breakpoint_insert_cmd_desc = { + .handler = handle_breakpoint_insert, + }; + handle_breakpoint_insert_cmd_desc.cmd = + (char[2]) { TCP_CHAR_BREAKPOINT_INSERT, '\0' }; + strcpy(handle_breakpoint_insert_cmd_desc.schema, + (char[4]) { ARG_SCHEMA_CORENUM, ARG_SCHEMA_INT, + ARG_SCHEMA_UINT64_T, '\0' }); + cmd_parser = &handle_breakpoint_insert_cmd_desc; + } + break; + case TCP_CHAR_BREAKPOINT_REMOVE: + { + static MCDCmdParseEntry handle_breakpoint_remove_cmd_desc = { + .handler = handle_breakpoint_remove, + }; + handle_breakpoint_remove_cmd_desc.cmd = + (char[2]) { TCP_CHAR_BREAKPOINT_REMOVE, '\0' }; + strcpy(handle_breakpoint_remove_cmd_desc.schema, + (char[4]) { ARG_SCHEMA_CORENUM, ARG_SCHEMA_INT, + ARG_SCHEMA_UINT64_T, '\0' }); + cmd_parser = &handle_breakpoint_remove_cmd_desc; + } + break; default: /* command not supported */ mcd_put_packet(""); @@ -1880,3 +1906,93 @@ void handle_write_memory(GArray *params, void *user_ctx) /* send acknowledge */ mcd_put_packet(TCP_EXECUTION_SUCCESS); } + +int mcd_breakpoint_insert(CPUState *cpu, int type, vaddr addr) +{ + /* translate the type to known gdb types and function call*/ + int bp_type = 0; + CPUClass *cc = CPU_GET_CLASS(cpu); + if (cc->gdb_stop_before_watchpoint) { + /* bp_type |= BP_STOP_BEFORE_ACCESS; */ + } + int return_value = 0; + switch (type) { + case MCD_BREAKPOINT_HW: + return_value = cpu_breakpoint_insert(cpu, addr, BP_GDB, NULL); + return return_value; + case MCD_BREAKPOINT_READ: + bp_type |= BP_GDB | BP_MEM_READ; + return_value = cpu_watchpoint_insert(cpu, addr, 4, bp_type, NULL); + return return_value; + case MCD_BREAKPOINT_WRITE: + bp_type |= BP_GDB | BP_MEM_WRITE; + return_value = cpu_watchpoint_insert(cpu, addr, 4, bp_type, NULL); + return return_value; + case MCD_BREAKPOINT_RW: + bp_type |= BP_GDB | BP_MEM_ACCESS; + return_value = cpu_watchpoint_insert(cpu, addr, 4, bp_type, NULL); + return return_value; + default: + return -ENOSYS; + } +} + +int mcd_breakpoint_remove(CPUState *cpu, int type, vaddr addr) +{ + /* translate the type to known gdb types and function call*/ + int bp_type = 0; + CPUClass *cc = CPU_GET_CLASS(cpu); + if (cc->gdb_stop_before_watchpoint) { + /* bp_type |= BP_STOP_BEFORE_ACCESS; */ + } + int return_value = 0; + switch (type) { + case MCD_BREAKPOINT_HW: + return_value = cpu_breakpoint_remove(cpu, addr, BP_GDB); + return return_value; + case MCD_BREAKPOINT_READ: + bp_type |= BP_GDB | BP_MEM_READ; + return_value = cpu_watchpoint_remove(cpu, addr, 4, bp_type); + return return_value; + case MCD_BREAKPOINT_WRITE: + bp_type |= BP_GDB | BP_MEM_WRITE; + return_value = cpu_watchpoint_remove(cpu, addr, 4, bp_type); + return return_value; + case MCD_BREAKPOINT_RW: + bp_type |= BP_GDB | BP_MEM_ACCESS; + return_value = cpu_watchpoint_remove(cpu, addr, 4, bp_type); + return return_value; + default: + return -ENOSYS; + } +} + +void handle_breakpoint_insert(GArray *params, void *user_ctx) +{ + /* 1. get parameter data */ + uint32_t cpu_id = get_param(params, 0)->cpu_id; + uint32_t type = get_param(params, 1)->data_uint32_t; + uint64_t address = get_param(params, 2)->data_uint64_t; + /* 2. insert breakpoint and send reply */ + CPUState *cpu = mcd_get_cpu(cpu_id); + if (mcd_breakpoint_insert(cpu, type, address) != 0) { + mcd_put_packet(TCP_EXECUTION_ERROR); + } else { + mcd_put_packet(TCP_EXECUTION_SUCCESS); + } +} + +void handle_breakpoint_remove(GArray *params, void *user_ctx) +{ + /* 1. get parameter data */ + uint32_t cpu_id = get_param(params, 0)->cpu_id; + uint32_t type = get_param(params, 1)->data_uint32_t; + uint64_t address = get_param(params, 2)->data_uint64_t; + /* 2. remove breakpoint and send reply */ + CPUState *cpu = mcd_get_cpu(cpu_id); + if (mcd_breakpoint_remove(cpu, type, address) != 0) { + mcd_put_packet(TCP_EXECUTION_ERROR); + } else { + mcd_put_packet(TCP_EXECUTION_SUCCESS); + } +}