From nobody Thu Nov 6 14:39:36 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 1541502884187637.1067741593113; Tue, 6 Nov 2018 03:14:44 -0800 (PST) Received: from localhost ([::1]:40337 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gJzJf-0008Pk-1u for importer@patchew.org; Tue, 06 Nov 2018 06:14:39 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48954) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gJzBk-0006QQ-Vv for qemu-devel@nongnu.org; Tue, 06 Nov 2018 06:06:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gJzBf-0000w3-6r for qemu-devel@nongnu.org; Tue, 06 Nov 2018 06:06:28 -0500 Received: from greensocs.com ([193.104.36.180]:46658) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gJzBT-0000nL-HW; Tue, 06 Nov 2018 06:06:11 -0500 Received: from localhost (localhost [127.0.0.1]) by greensocs.com (Postfix) with ESMTP id 7BD615C026F; Tue, 6 Nov 2018 12:06:07 +0100 (CET) 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 S4XD4UlDYq4L; Tue, 6 Nov 2018 12:06:06 +0100 (CET) Received: by greensocs.com (Postfix, from userid 998) id 0696D5C0265; Tue, 6 Nov 2018 12:06:05 +0100 (CET) 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 798B64F7670; Tue, 6 Nov 2018 12:06:05 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=greensocs.com; s=mail; t=1541502367; bh=fPhNMVOgnILrdu8vEVGAW8FkOUJiKmx8HxmopOK4UcM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Xc+g5M3C7P/BztBVLy43aWCs9d7ADonE9UidVq5frKlOlGsRliz+uQOAX3OcFOnKx eDbC2ElSeWYOfD5HfsDK8uQGheD1VLAjA/FEi2u0PrSwfjszLLEy1y5nwDJRpG5vPZ l88TGRIxoSw/m8i9tO6vVQnEqGr6s9XHoX6LG53Q= 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=x8cBPrJ7; dkim=pass (1024-bit key) header.d=greensocs.com header.b=Ny2x58aS DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=greensocs.com; s=mail; t=1541502366; bh=fPhNMVOgnILrdu8vEVGAW8FkOUJiKmx8HxmopOK4UcM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=x8cBPrJ7bqrLBfdO1Eu8yw08s8iS311rFd1Q0dygNMVwVdhY8IQZ1kxInjp2ugEYZ zA/iSXIeZ5pt7f+9PYl2LkKvEXW2v7716UDnItLcz884vI23PPMgRNZQYzXHEwPvKu 0jBNcKG+KhoS5ScExWOpY/Xb/uFeCTQVRq8kLgFE= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=greensocs.com; s=mail; t=1541502365; bh=fPhNMVOgnILrdu8vEVGAW8FkOUJiKmx8HxmopOK4UcM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Ny2x58aSgF6vEg1GLF04m+K22H4WgRwJk4Rp4hQtk214vfTywtUZQNXYMgj3JMyhG 237fYsYLb90I2P3EKAp35g4icSccV09/geZEf1567z+YyGN4rt0dEn5g1WWMcHN2mx JoZLvA8ft078fKdeERJQ7ym7iM9WsuF0YAtKNW3A= From: Luc Michel To: qemu-devel@nongnu.org Date: Tue, 6 Nov 2018 12:05:35 +0100 Message-Id: <20181106110548.4209-4-luc.michel@greensocs.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181106110548.4209-1-luc.michel@greensocs.com> References: <20181106110548.4209-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 v4 03/16] gdbstub: add multiprocess support to '?' packets 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 , Eduardo Habkost , 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 3 invalid signatures) Content-Type: text/plain; charset="utf-8" The gdb_get_cpu_pid() function does the PID lookup for the given CPU. It checks if the CPU is a direct child of a CPU cluster. If it is, the returned PID is the cluster ID plus one (cluster IDs start at 0, GDB PIDs at 1). When the CPU is not a child of such a container, the PID of the first process is returned. The gdb_fmt_thread_id() function generates the string to be used to identify a given thread, in a response packet for the peer. This function supports generating thread IDs when multiprocess mode is enabled (in the form `p.'). Use them in the reply to a '?' request. Signed-off-by: Luc Michel Acked-by: Alistair Francis --- gdbstub.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 58 insertions(+), 2 deletions(-) diff --git a/gdbstub.c b/gdbstub.c index 0d70b89598..d26bad4b67 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -638,10 +638,52 @@ static int memtox(char *buf, const char *mem, int len) } } return p - buf; } =20 +static uint32_t gdb_get_cpu_pid(const GDBState *s, CPUState *cpu) +{ +#ifndef CONFIG_USER_ONLY + gchar *path, *name; + Object *obj; + CPUClusterState *cluster; + uint32_t ret; + + path =3D object_get_canonical_path(OBJECT(cpu)); + name =3D object_get_canonical_path_component(OBJECT(cpu)); + + if (path =3D=3D NULL) { + ret =3D s->processes[0].pid; + goto out; + } + + /* + * Retrieve the CPU parent path by removing the last '/' and the CPU n= ame + * from the CPU canonical path. */ + path[strlen(path) - strlen(name) - 1] =3D '\0'; + + obj =3D object_resolve_path_type(path, TYPE_CPU_CLUSTER, NULL); + + if (obj =3D=3D NULL) { + ret =3D s->processes[0].pid; + goto out; + } + + cluster =3D CPU_CLUSTER(obj); + ret =3D cluster->cluster_id + 1; + +out: + g_free(name); + g_free(path); + + return ret; + +#else + return s->processes[0].pid; +#endif +} + static const char *get_feature_xml(const char *p, const char **newp, CPUClass *cc) { size_t len; int i; @@ -907,10 +949,23 @@ static CPUState *find_cpu(uint32_t thread_id) } =20 return NULL; } =20 +static char *gdb_fmt_thread_id(const GDBState *s, CPUState *cpu, + char *buf, size_t buf_size) +{ + if (s->multiprocess) { + snprintf(buf, buf_size, "p%02x.%02x", + gdb_get_cpu_pid(s, cpu), cpu_gdb_index(cpu)); + } else { + snprintf(buf, buf_size, "%02x", cpu_gdb_index(cpu)); + } + + return buf; +} + static int is_query_packet(const char *p, const char *query, char separato= r) { unsigned int query_len =3D strlen(query); =20 return strncmp(p, query, query_len) =3D=3D 0 && @@ -1018,22 +1073,23 @@ static int gdb_handle_packet(GDBState *s, const cha= r *line_buf) const char *p; uint32_t thread; int ch, reg_size, type, res; uint8_t mem_buf[MAX_PACKET_LENGTH]; char buf[sizeof(mem_buf) + 1 /* trailing NUL */]; + char thread_id[16]; uint8_t *registers; target_ulong addr, len; =20 trace_gdbstub_io_command(line_buf); =20 p =3D line_buf; ch =3D *p++; switch(ch) { case '?': /* TODO: Make this return the correct value for user-mode. */ - snprintf(buf, sizeof(buf), "T%02xthread:%02x;", GDB_SIGNAL_TRAP, - cpu_gdb_index(s->c_cpu)); + snprintf(buf, sizeof(buf), "T%02xthread:%s;", GDB_SIGNAL_TRAP, + gdb_fmt_thread_id(s, s->c_cpu, thread_id, sizeof(thread_i= d))); put_packet(s, buf); /* Remove all the breakpoints when this query is issued, * because gdb is doing and initial connect and the state * should be cleaned up. */ --=20 2.19.1