From nobody Thu Nov 6 00:37:59 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1538395751718326.16354813838086; Mon, 1 Oct 2018 05:09:11 -0700 (PDT) Received: from localhost ([::1]:37902 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g6x0g-0005O7-DW for importer@patchew.org; Mon, 01 Oct 2018 08:09:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35052) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g6wpT-0002RA-Ac for qemu-devel@nongnu.org; Mon, 01 Oct 2018 07:57:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g6wpQ-0005oJ-Lu for qemu-devel@nongnu.org; Mon, 01 Oct 2018 07:57:35 -0400 Received: from greensocs.com ([193.104.36.180]:40117) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g6wpM-0005gV-PN; Mon, 01 Oct 2018 07:57:29 -0400 Received: from localhost (localhost [127.0.0.1]) by greensocs.com (Postfix) with ESMTP id 2BBF2511C7A; Mon, 1 Oct 2018 13:57:12 +0200 (CEST) Received: from greensocs.com ([127.0.0.1]) by localhost (gs-01.greensocs.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VAD6mHau484w; Mon, 1 Oct 2018 13:57:06 +0200 (CEST) Received: by greensocs.com (Postfix, from userid 998) id 807EC511C51; Mon, 1 Oct 2018 13:57:06 +0200 (CEST) Received: from michell-laptop.home.lmichel.fr (LFbn-1-8165-82.w90-112.abo.wanadoo.fr [90.112.74.82]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: luc.michel@greensocs.com) by greensocs.com (Postfix) with ESMTPSA id 1FA14511C65; Mon, 1 Oct 2018 13:57:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=greensocs.com; s=mail; t=1538395032; bh=hzryMaDN826qZv17hcBHWGh1oUXnmV+3gYFiqx3y/A4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=HFtilpIgZ34nUP+6TxGNLA1gKT0iR2/LY8PFx1M3uMAVLJx0YN6VQRKyPhRp9npYE 1gf6tDM3sZlToEL9B3eDcdfx1SmLlBbYa5vPofgWotLINauukBfMQfBLHX4Ki4Y5IA ISqO3sa+yl+6MMnUzmL4iqSs/8xGkp+6K3MXCV80= X-Virus-Scanned: amavisd-new at greensocs.com Authentication-Results: gs-01.greensocs.com (amavisd-new); dkim=pass (1024-bit key) header.d=greensocs.com header.b=msNoUMsc; dkim=pass (1024-bit key) header.d=greensocs.com header.b=msNoUMsc DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=greensocs.com; s=mail; t=1538395026; bh=hzryMaDN826qZv17hcBHWGh1oUXnmV+3gYFiqx3y/A4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=msNoUMscEPj/dVyefRvWE89dCVIfYRDDOiivPs1M0z3fnwbo3i5fjSkuJ3BVy92lp gRi1ETQQ2aFQlbQAJgRL2eexaxqYIGZhQr1uezlwUwRnKLsIhuRU+/IYGGHQi9NmxH ncTX5VUNQ6Pozhto0s3x9NGFc7DPIPiwhHCtbHhA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=greensocs.com; s=mail; t=1538395026; bh=hzryMaDN826qZv17hcBHWGh1oUXnmV+3gYFiqx3y/A4=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=msNoUMscEPj/dVyefRvWE89dCVIfYRDDOiivPs1M0z3fnwbo3i5fjSkuJ3BVy92lp gRi1ETQQ2aFQlbQAJgRL2eexaxqYIGZhQr1uezlwUwRnKLsIhuRU+/IYGGHQi9NmxH ncTX5VUNQ6Pozhto0s3x9NGFc7DPIPiwhHCtbHhA= From: Luc Michel To: qemu-devel@nongnu.org Date: Mon, 1 Oct 2018 13:56:50 +0200 Message-Id: <20181001115704.701-2-luc.michel@greensocs.com> X-Mailer: git-send-email 2.19.0 In-Reply-To: <20181001115704.701-1-luc.michel@greensocs.com> References: <20181001115704.701-1-luc.michel@greensocs.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 193.104.36.180 Subject: [Qemu-devel] [PATCH v2 01/15] gdbstub: introduce GDB processes 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: Peter Maydell , alistair@alistair23.me, mark.burton@greensocs.com, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , saipava@xilinx.com, edgari@xilinx.com, qemu-arm@nongnu.org, Luc Michel Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (found 2 invalid signatures) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" Add a structure GDBProcess that represent processes from the GDB semantic point of view. CPUs can be split into different processes, by grouping them under a QOM container named after the GDB_CPU_GROUP_NAME macro (`gdb-group[*]'). Each occurrence of such a container implies the existence of the corresponding process in the GDB stub. The gdb_cpu_group_container_get() function can be used to create a new container. When no such container are found, all the CPUs are put in a unique GDB process (create_unique_process()). This is also the case when compiled in user mode, where multi-processes do not make much sense for now. Signed-off-by: Luc Michel --- include/exec/gdbstub.h | 8 +++++ gdbstub.c | 67 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) diff --git a/include/exec/gdbstub.h b/include/exec/gdbstub.h index 08363969c1..a3e4159bf4 100644 --- a/include/exec/gdbstub.h +++ b/include/exec/gdbstub.h @@ -1,8 +1,10 @@ #ifndef GDBSTUB_H #define GDBSTUB_H =20 +#include "qom/object.h" + #define DEFAULT_GDBSTUB_PORT "1234" =20 /* GDB breakpoint/watchpoint types */ #define GDB_BREAKPOINT_SW 0 #define GDB_BREAKPOINT_HW 1 @@ -129,6 +131,12 @@ void gdbserver_cleanup(void); extern bool gdb_has_xml; =20 /* in gdbstub-xml.c, generated by scripts/feature_to_c.sh */ extern const char *const xml_builtin[][2]; =20 +#define GDB_CPU_GROUP_NAME "gdb-group" + +static inline Object *gdb_cpu_group_container_get(Object *parent) +{ + return container_get(parent, "/" GDB_CPU_GROUP_NAME "[*]"); +} #endif diff --git a/gdbstub.c b/gdbstub.c index d6ab95006c..5c86218f49 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -295,10 +295,17 @@ typedef struct GDBRegisterState { gdb_reg_cb set_reg; const char *xml; struct GDBRegisterState *next; } GDBRegisterState; =20 +typedef struct GDBProcess { + uint32_t pid; + bool attached; + + char target_xml[1024]; +} GDBProcess; + enum RSState { RS_INACTIVE, RS_IDLE, RS_GETLINE, RS_GETLINE_ESC, @@ -323,10 +330,13 @@ typedef struct GDBState { int running_state; #else CharBackend chr; Chardev *mon_chr; #endif + bool multiprocess; + GDBProcess *processes; + int process_num; char syscall_buf[256]; gdb_syscall_complete_cb current_syscall_cb; } GDBState; =20 /* By default use no IRQs and no timers while single stepping so as to @@ -1750,10 +1760,24 @@ void gdb_exit(CPUArchState *env, int code) #ifndef CONFIG_USER_ONLY qemu_chr_fe_deinit(&s->chr, true); #endif } =20 +/* + * Create a unique process containing all the CPUs. + */ +static void create_unique_process(GDBState *s) +{ + GDBProcess *process; + + s->processes =3D g_malloc0(sizeof(GDBProcess)); + s->process_num =3D 1; + process =3D &s->processes[0]; + + process->pid =3D 1; +} + #ifdef CONFIG_USER_ONLY int gdb_handlesig(CPUState *cpu, int sig) { GDBState *s; @@ -1847,10 +1871,11 @@ static bool gdb_accept(void) } =20 s =3D g_malloc0(sizeof(GDBState)); s->c_cpu =3D first_cpu; s->g_cpu =3D first_cpu; + create_unique_process(s); s->fd =3D fd; gdb_has_xml =3D false; =20 gdbserver_state =3D s; return true; @@ -2003,10 +2028,48 @@ static const TypeInfo char_gdb_type_info =3D { .name =3D TYPE_CHARDEV_GDB, .parent =3D TYPE_CHARDEV, .class_init =3D char_gdb_class_init, }; =20 +static void create_processes(GDBState *s) +{ + Object *container; + int i =3D 0; + char process_str[16]; + + container =3D object_resolve_path(GDB_CPU_GROUP_NAME "[0]", NULL); + + while (container) { + s->processes =3D g_renew(GDBProcess, s->processes, i + 1); + + GDBProcess *process =3D &s->processes[i]; + + /* GDB process IDs -1 and 0 are reserved */ + process->pid =3D i + 1; + process->attached =3D false; + process->target_xml[0] =3D '\0'; + + i++; + snprintf(process_str, sizeof(process_str), GDB_CPU_GROUP_NAME "[%d= ]", i); + container =3D object_resolve_path(process_str, NULL); + } + + if (!s->processes) { + /* No CPU group specified by the machine */ + create_unique_process(s); + } else { + s->process_num =3D i; + } +} + +static void cleanup_processes(GDBState *s) +{ + g_free(s->processes); + s->process_num =3D 0; + s->processes =3D NULL; +} + int gdbserver_start(const char *device) { trace_gdbstub_op_start(device); =20 GDBState *s; @@ -2055,15 +2118,19 @@ int gdbserver_start(const char *device) NULL, &error_abort); monitor_init(mon_chr, 0); } else { qemu_chr_fe_deinit(&s->chr, true); mon_chr =3D s->mon_chr; + cleanup_processes(s); memset(s, 0, sizeof(GDBState)); s->mon_chr =3D mon_chr; } s->c_cpu =3D first_cpu; s->g_cpu =3D first_cpu; + + create_processes(s); + if (chr) { qemu_chr_fe_init(&s->chr, chr, &error_abort); qemu_chr_fe_set_handlers(&s->chr, gdb_chr_can_receive, gdb_chr_rec= eive, gdb_chr_event, NULL, NULL, NULL, true); } --=20 2.19.0