From nobody Wed Nov 27 02:38:10 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1701983188539231.1876174585998; Thu, 7 Dec 2023 13:06:28 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rBLY6-0002mv-8r; Thu, 07 Dec 2023 16:04:46 -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 1rBLY1-0002k9-2X for qemu-devel@nongnu.org; Thu, 07 Dec 2023 16:04:41 -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 1rBLXw-0005oz-3B for qemu-devel@nongnu.org; Thu, 07 Dec 2023 16:04:38 -0500 Received: (qmail 10536 invoked by uid 484); 7 Dec 2023 21:04:21 -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 Dec 2023 21: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.139927 secs); 07 Dec 2023 21:04:21 -0000 From: Nicolas Eder To: qemu-devel@nongnu.org Cc: "Nicolas Eder" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , "Christian Boenig" , =?UTF-8?q?Alex=20Benn=C3=A9e?= Subject: [PATCH v4 13/17] mcdstub: go, step and break added Date: Thu, 7 Dec 2023 22:03:54 +0100 Message-Id: <20231207210358.7409-14-nicolas.eder@lauterbach.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231207210358.7409-1-nicolas.eder@lauterbach.com> References: <20231207210358.7409-1-nicolas.eder@lauterbach.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Qmail-Scanner-2.11: added fake Content-Type header Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1701983189821100011 Content-Type: text/plain; charset="utf-8" --- debug/mcdstub/mcdstub.c | 220 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 220 insertions(+) diff --git a/debug/mcdstub/mcdstub.c b/debug/mcdstub/mcdstub.c index a5256eeb56..83582f7fa5 100644 --- a/debug/mcdstub/mcdstub.c +++ b/debug/mcdstub/mcdstub.c @@ -28,6 +28,7 @@ #include "chardev/char-fe.h" #include "hw/cpu/cluster.h" #include "hw/boards.h" +#include "exec/tb-flush.h" #include "sysemu/cpus.h" #include "sysemu/hw_accel.h" #include "sysemu/runstate.h" @@ -182,6 +183,96 @@ static CPUState *mcd_get_cpu(uint32_t cpu_index) */ static void mcd_vm_state_change(void *opaque, bool running, RunState state) { + CPUState *cpu =3D mcdserver_state.c_cpu; + + if (mcdserver_state.state =3D=3D RS_INACTIVE) { + return; + } + + if (cpu =3D=3D NULL) { + if (running) { + /* + * this is the case if qemu starts the vm + * before a mcd client is connected + */ + const char *mcd_state; + mcd_state =3D CORE_STATE_RUNNING; + const char *info_str; + info_str =3D STATE_STR_INIT_RUNNING; + mcdserver_state.cpu_state.state =3D mcd_state; + mcdserver_state.cpu_state.info_str =3D info_str; + } + return; + } + + const char *mcd_state; + const char *stop_str; + const char *info_str; + uint32_t bp_type =3D 0; + uint64_t bp_address =3D 0; + switch (state) { + case RUN_STATE_RUNNING: + mcd_state =3D CORE_STATE_RUNNING; + info_str =3D STATE_STR_RUNNING(cpu->cpu_index); + stop_str =3D ""; + break; + case RUN_STATE_DEBUG: + mcd_state =3D CORE_STATE_DEBUG; + info_str =3D STATE_STR_DEBUG(cpu->cpu_index); + if (cpu->watchpoint_hit) { + switch (cpu->watchpoint_hit->flags & BP_MEM_ACCESS) { + case BP_MEM_READ: + bp_type =3D MCD_BREAKPOINT_READ; + stop_str =3D STATE_STR_BREAK_READ(cpu->watchpoint_hit->hit= addr); + break; + case BP_MEM_WRITE: + bp_type =3D MCD_BREAKPOINT_WRITE; + stop_str =3D STATE_STR_BREAK_WRITE(cpu->watchpoint_hit->hi= taddr); + break; + case BP_MEM_ACCESS: + bp_type =3D MCD_BREAKPOINT_RW; + stop_str =3D STATE_STR_BREAK_RW(cpu->watchpoint_hit->hitad= dr); + break; + default: + stop_str =3D STATE_STR_BREAK_UNKNOWN; + break; + } + bp_address =3D cpu->watchpoint_hit->hitaddr; + cpu->watchpoint_hit =3D NULL; + } else if (cpu->singlestep_enabled) { + /* we land here when a single step is performed */ + stop_str =3D STATE_STEP_PERFORMED; + } else { + bp_type =3D MCD_BREAKPOINT_HW; + stop_str =3D STATE_STR_BREAK_HW; + tb_flush(cpu); + } + /* deactivate single step */ + cpu_single_step(cpu, 0); + break; + case RUN_STATE_PAUSED: + info_str =3D STATE_STR_HALTED(cpu->cpu_index); + mcd_state =3D CORE_STATE_HALTED; + stop_str =3D ""; + break; + case RUN_STATE_WATCHDOG: + info_str =3D STATE_STR_UNKNOWN(cpu->cpu_index); + mcd_state =3D CORE_STATE_UNKNOWN; + stop_str =3D ""; + break; + default: + info_str =3D STATE_STR_UNKNOWN(cpu->cpu_index); + mcd_state =3D CORE_STATE_UNKNOWN; + stop_str =3D ""; + break; + } + + /* set state for c_cpu */ + mcdserver_state.cpu_state.state =3D mcd_state; + mcdserver_state.cpu_state.bp_type =3D bp_type; + mcdserver_state.cpu_state.bp_address =3D bp_address; + mcdserver_state.cpu_state.stop_str =3D stop_str; + mcdserver_state.cpu_state.info_str =3D info_str; } =20 /** @@ -637,6 +728,104 @@ static void handle_close_core(GArray *params, void *u= ser_ctx) g_array_free(registers, TRUE); } =20 +/** + * mcd_cpu_start() - Starts the selected CPU with the cpu_resume function. + * + * @cpu: The CPU about to be started. + */ +static void mcd_cpu_start(CPUState *cpu) +{ + if (!runstate_needs_reset() && !runstate_is_running() && + !vm_prepare_start(false)) { + mcdserver_state.c_cpu =3D cpu; + qemu_clock_enable(QEMU_CLOCK_VIRTUAL, true); + cpu_resume(cpu); + } +} + +/** + * mcd_cpu_sstep() - Performes a step on the selected CPU. + * + * This function first sets the correct single step flags for the CPU with + * cpu_single_step and then starts the CPU with cpu_resume. + * @cpu: The CPU about to be stepped. + */ +static int mcd_cpu_sstep(CPUState *cpu) +{ + mcdserver_state.c_cpu =3D cpu; + cpu_single_step(cpu, mcdserver_state.sstep_flags); + if (!runstate_needs_reset() && !runstate_is_running() && + !vm_prepare_start(true)) { + qemu_clock_enable(QEMU_CLOCK_VIRTUAL, true); + cpu_resume(cpu); + } + return 0; +} + +/** + * mcd_vm_stop() - Brings all CPUs in debug state with the vm_stop functio= n. + */ +static void mcd_vm_stop(void) +{ + if (runstate_is_running()) { + vm_stop(RUN_STATE_DEBUG); + } +} + +/** + * handle_vm_start() - Handler for the VM start TCP packet. + * + * Evaluates whether all cores or just a perticular core should get starte= d and + * calls :c:func:`mcd_vm_start` or :c:func:`mcd_cpu_start` respectively. + * @params: GArray with all TCP packet parameters. + */ +static void handle_vm_start(GArray *params, void *user_ctx) +{ + uint32_t global =3D get_param(params, 0)->data_uint32_t; + if (global =3D=3D 1) { + mcd_vm_start(); + } else{ + uint32_t cpu_id =3D get_param(params, 1)->cpu_id; + CPUState *cpu =3D mcd_get_cpu(cpu_id); + mcd_cpu_start(cpu); + } +} + +/** + * handle_vm_step() - Handler for the VM step TCP packet. + * + * Calls :c:func:`mcd_cpu_sstep` for the CPU which sould be stepped. + * Stepping all CPUs is currently not supported. + * @params: GArray with all TCP packet parameters. + */ +static void handle_vm_step(GArray *params, void *user_ctx) +{ + uint32_t global =3D get_param(params, 0)->data_uint32_t; + if (global =3D=3D 1) { + /* TODO: add multicore support */ + } else{ + uint32_t cpu_id =3D get_param(params, 1)->cpu_id; + CPUState *cpu =3D mcd_get_cpu(cpu_id); + int return_value =3D mcd_cpu_sstep(cpu); + if (return_value !=3D 0) { + g_assert_not_reached(); + } + } +} + +/** + * handle_vm_stop() - Handler for the VM stop TCP packet. + * + * Always calls :c:func:`mcd_vm_stop` and stops all cores. Stopping indivi= dual + * cores is currently not supported. + * @params: GArray with all TCP packet parameters. + */ +static void handle_vm_stop(GArray *params, void *user_ctx) +{ + /* TODO: add core dependant break option */ + mcd_vm_stop(); +} + /** * mcd_handle_packet() - Evaluates the type of received packet and chooses= the * correct handler. @@ -707,6 +896,37 @@ static int mcd_handle_packet(const char *line_buf) cmd_parser =3D &close_core_cmd_desc; } break; + case TCP_CHAR_GO: + { + static MCDCmdParseEntry go_cmd_desc =3D { + .handler =3D handle_vm_start, + }; + go_cmd_desc.cmd =3D (char[2]) { TCP_CHAR_GO, '\0' }; + strcpy(go_cmd_desc.schema, + (char[3]) { ARG_SCHEMA_INT, ARG_SCHEMA_CORENUM, '\0' }); + cmd_parser =3D &go_cmd_desc; + } + break; + case TCP_CHAR_STEP: + { + static MCDCmdParseEntry step_cmd_desc =3D { + .handler =3D handle_vm_step, + }; + step_cmd_desc.cmd =3D (char[2]) { TCP_CHAR_STEP, '\0' }; + strcpy(step_cmd_desc.schema, + (char[3]) { ARG_SCHEMA_INT, ARG_SCHEMA_CORENUM, '\0' }); + cmd_parser =3D &step_cmd_desc; + } + break; + case TCP_CHAR_BREAK: + { + static MCDCmdParseEntry break_cmd_desc =3D { + .handler =3D handle_vm_stop, + }; + break_cmd_desc.cmd =3D (char[2]) { TCP_CHAR_BREAK, '\0' }; + cmd_parser =3D &break_cmd_desc; + } + break; default: /* command not supported */ mcd_put_packet(""); --=20 2.34.1