From patchwork Fri Oct 6 09:05:51 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: 1844312 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4S22ld5GDsz1yqH for ; Fri, 6 Oct 2023 20:13:17 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qogn8-00087I-F9; Fri, 06 Oct 2023 05:06:38 -0400 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 1qogn6-00086X-3r for qemu-devel@nongnu.org; Fri, 06 Oct 2023 05:06:36 -0400 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 1qogmy-0000wT-EQ for qemu-devel@nongnu.org; Fri, 06 Oct 2023 05:06:35 -0400 Received: (qmail 19558 invoked by uid 484); 6 Oct 2023 09:06:25 -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 4e-06 secs); 06 Oct 2023 09:06:25 -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 ; 6 Oct 2023 09:06:23 -0000 From: Nicolas Eder To: qemu-devel@nongnu.org Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Christian.Boenig@lauterbach.com, =?utf-8?q?Alex_Benn=C3=A9e?= , Nicolas Eder Subject: [PATCH v2 10/29] handler for resets added Date: Fri, 6 Oct 2023 11:05:51 +0200 Message-Id: <20231006090610.26171-11-nicolas.eder@lauterbach.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231006090610.26171-1-nicolas.eder@lauterbach.com> References: <20231006090610.26171-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 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: neder --- mcdstub/internals.h | 14 ++++---- mcdstub/mcd_shared_defines.h | 4 +++ mcdstub/mcdstub.c | 65 ++++++++++++++++++++++++++++-------- 3 files changed, 63 insertions(+), 20 deletions(-) diff --git a/mcdstub/internals.h b/mcdstub/internals.h index a4d49a4a84..0de8d8fd07 100644 --- a/mcdstub/internals.h +++ b/mcdstub/internals.h @@ -25,6 +25,7 @@ // schema defines #define ARG_SCHEMA_QRYHANDLE 'q' #define ARG_SCHEMA_STRING 's' +#define ARG_SCHEMA_INT 'd' #define ARG_SCHEMA_CORENUM 'c' // resets @@ -34,8 +35,8 @@ // more #define QUERY_TOTAL_NUMBER 11 //FIXME: set this to a usefull value in the end -#define CMD_SCHEMA_LENGTH 2 -#define MCD_MAX_CORES 128 +#define CMD_SCHEMA_LENGTH 3 +#define MAX_SCHEMA_ARGS CMD_SCHEMA_LENGTH-1 #define MCD_SYSTEM_NAME "qemu-system" // tcp query packet values templates #define DEVICE_NAME_TEMPLATE(s) "qemu-" #s "-device" @@ -77,17 +78,17 @@ typedef enum MCDThreadIdKind { } MCDThreadIdKind; typedef union MCDCmdVariant { - const char *data; + const char *data; + int data_int; + int query_handle; + int cpu_id; struct { MCDThreadIdKind kind; uint32_t pid; uint32_t tid; } thread_id; - int query_handle; - int cpu_id; - } MCDCmdVariant; #define get_param(p, i) (&g_array_index(p, MCDCmdVariant, i)) @@ -277,6 +278,7 @@ void handle_query_regs_f(GArray *params, void *user_ctx); void handle_query_regs_c(GArray *params, void *user_ctx); void handle_open_server(GArray *params, void *user_ctx); void parse_reg_xml(const char *xml, int size, GArray* registers); +void handle_reset(GArray *params, void *user_ctx); // arm specific functions int mcd_arm_store_mem_spaces(CPUState *cpu, GArray* memspaces); diff --git a/mcdstub/mcd_shared_defines.h b/mcdstub/mcd_shared_defines.h index e0b27ce5e6..7e96129cdf 100644 --- a/mcdstub/mcd_shared_defines.h +++ b/mcdstub/mcd_shared_defines.h @@ -11,6 +11,7 @@ #define TCP_CHAR_CLOSE_SERVER 'D' #define TCP_CHAR_CLOSE_CORE 'd' #define TCP_CHAR_KILLQEMU 'k' +#define TCP_CHAR_RESET 'r' // tcp protocol chars #define TCP_ACKNOWLEDGED '+' @@ -54,4 +55,7 @@ #define TCP_ARGUMENT_OPTION "option" #define TCP_ARGUMENT_ACTION "action" +// for packets sent to qemu +#define ARGUMENT_SEPARATOR ';' + #endif diff --git a/mcdstub/mcdstub.c b/mcdstub/mcdstub.c index a0c4c2794f..85e0c3a219 100644 --- a/mcdstub/mcdstub.c +++ b/mcdstub/mcdstub.c @@ -508,6 +508,16 @@ int mcd_handle_packet(const char *line_buf) cmd_parser = &close_core_cmd_desc; } break; + case TCP_CHAR_RESET: + { + static MCDCmdParseEntry reset_cmd_desc = { + .handler = handle_reset, + }; + reset_cmd_desc.cmd = (char[2]) { (char) TCP_CHAR_RESET, '\0' }; + strcpy(reset_cmd_desc.schema, (char[3]) { (char) ARG_SCHEMA_INT, ARG_SCHEMA_INT, '\0' }); + cmd_parser = &reset_cmd_desc; + } + break; default: // could not perform the command (because its unknown) mcd_put_packet(""); @@ -564,24 +574,42 @@ void run_cmd_parser(const char *data, const MCDCmdParseEntry *cmd) } int cmd_parse_params(const char *data, const char *schema, GArray *params) { - MCDCmdVariant this_param; - + char data_buffer[64] = {0}; - if (schema[0] == ARG_SCHEMA_STRING) { - this_param.data = data; - g_array_append_val(params, this_param); - } - else if (schema[0] == ARG_SCHEMA_QRYHANDLE) { - strncat(data_buffer, data, strlen(data)); - this_param.query_handle = atoi(data_buffer); - g_array_append_val(params, this_param); + char *separator = strchr(data_buffer, ARGUMENT_SEPARATOR); + int seperator_index = (int)(separator - data); + + if (separator) { + // we got two arguments + strncpy(data_buffer, data, seperator_index); } - else if (schema[0] == ARG_SCHEMA_CORENUM) { - strncat(data_buffer, data, strlen(data)); - this_param.cpu_id = atoi(data_buffer); - g_array_append_val(params, this_param); + else { + strncpy(data_buffer, data, strlen(data)); } + for (int i = 0; idata_int; + int bool_halt_after_reset = get_param(params, 1)->data_int; + if (reset_id>=0 && bool_halt_after_reset) { + //fun for the compiler + } + +}