From patchwork Mon Jan 7 16:30:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 154921 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3676678ljp; Mon, 7 Jan 2019 08:41:23 -0800 (PST) X-Google-Smtp-Source: ALg8bN73oT6vEFkGnlhS5v+3um7Gi3s005Yg8CN7SZv0z4W7I2z8JedhXCo3a2QwFxc90qlngP4G X-Received: by 2002:a1c:c70f:: with SMTP id x15mr9319486wmf.130.1546879283639; Mon, 07 Jan 2019 08:41:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546879283; cv=none; d=google.com; s=arc-20160816; b=dFSiABxRf09N8beBJzspBTsllWgWnETcn2vn8txAgiCEljs5wP7gb0p+7nT7XfVouL rxMN+yVvDS7lYGD3i6T3vEPEcPuHk0ZBCgdXVoK5OQgF8hOjSbNhq5Wy+3FLe60dqLrI 32URcauyzVnyyHEeOpFrAkWzL3OKR0l6uo1l/h9rbV7RnYI5TlLQqPqW5DBZXaNzLaH3 pGqscWNdVQu3p6BFZUsDkm9PSfN7gpBSz6Cvkq6xBmEjcEyc+3DBVPHwCDUuvAcz2Ben Im570LhnPDE9kGceTb4WxkDKiyw0lu/GfsmxMbfk2HvClQCqjDM8l7LkRmD3JkVnD/o1 GypQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=6Q1htC/UokkIYz5uiEFuAKSsnFkHc99ED2dIgHQgmjw=; b=aIuQS+LA5ghSPpQ16+e+Nc/krDZqwxWOT96mhdvt8Sr89LPz86s2F/E+Ik05A8mhRB EiaQu+Z7UBFpRjmgMYelGeQ0/aGKstt32dsCL1g+YS/KBl5IEq/+wyIHoQ4Pk/hj0fpl 8RDbNBXlFLquVgHwfZ1K66JeDe8kXh74NlbRuO0jTqE3QvTQtBglBCsAx/hnR/I+euAm P12nFc40qDSbFMv5B0TvKHy0dHyLqqwSDAG+hSMzknMxeUqrS5of0YnhWhMP9xzo0oqi MG21NXJLnz0FI8pWn6VU6SLrdVQd9AfP8NiyEkfyPKcrnbEQV3igJcEqDEDs3o0JShGX dX8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=CdO74wg9; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id y68si5300970wmc.147.2019.01.07.08.41.23 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 07 Jan 2019 08:41:23 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=CdO74wg9; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:44700 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ggXxq-00045L-IH for patch@linaro.org; Mon, 07 Jan 2019 11:41:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:46125) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ggXoP-0004tM-VD for qemu-devel@nongnu.org; Mon, 07 Jan 2019 11:31:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ggXoM-0001nT-BH for qemu-devel@nongnu.org; Mon, 07 Jan 2019 11:31:36 -0500 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:42843) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ggXoK-0001hp-AO for qemu-devel@nongnu.org; Mon, 07 Jan 2019 11:31:34 -0500 Received: by mail-wr1-x42c.google.com with SMTP id q18so1047302wrx.9 for ; Mon, 07 Jan 2019 08:31:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=6Q1htC/UokkIYz5uiEFuAKSsnFkHc99ED2dIgHQgmjw=; b=CdO74wg9/aSczH0jPqUFE1Z4GOIlaew0fUX8gEoKWharc7NwwYeu+xyfqZ/p6MyYrH hNecfC7NUlrZ94vY2983IvOenSlb424GQaijg9Av1eDUj/RFf4IpicDZonhBX7iBrDP2 b/WXkzVfeFHNMIaZh/hF3BCzrXZDqe4xWjkkw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6Q1htC/UokkIYz5uiEFuAKSsnFkHc99ED2dIgHQgmjw=; b=kQSEdG0y6LpbP493ONO8K8xCchBtofb2UtLrnzhzgqvWiYlw4EGFUAjI2vszTuiBVk 1OkCcVM+KKDbsqsiU5YSL2e5ouaL3Kkdtq9hR8q+OIJe3onISwgfz03fvTYeGJ0fdik0 OZrEoFGXOVEsxAhgh+WcemzFCv1HJQR34+COgbugkSkG7T06y/0uD7yo9V5VMqgfYnxM xn6/FHK8wRNf0H7XDXW6nBsj7pM5jY5H3AY7X4XJYu/dE/sCNoG1XEPQQ8SqWq9cAWQk 4kDjELIjZ0aKa9xS5aeqBscp4LkfYiVEQUdHa+AXmT6WzOdRmS62fR3ARjGpjThuGXIm iKUw== X-Gm-Message-State: AJcUukfQBopMYb2BkFJlxoLFNHdk6KPelGd6MRKsJ+HcRQw8p7vPnhkC rV29drFm3dqajb7uCD+0bF2kW9LDzDhDCg== X-Received: by 2002:a5d:6450:: with SMTP id d16mr52214294wrw.64.1546878690219; Mon, 07 Jan 2019 08:31:30 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id j14sm46039759wrv.96.2019.01.07.08.31.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 07 Jan 2019 08:31:29 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 7 Jan 2019 16:30:47 +0000 Message-Id: <20190107163117.16269-8-peter.maydell@linaro.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20190107163117.16269-1-peter.maydell@linaro.org> References: <20190107163117.16269-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::42c Subject: [Qemu-devel] [PULL 07/37] gdbstub: add multiprocess support to vCont 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Luc Michel Add the gdb_first_attached_cpu() and gdb_next_attached_cpu() to iterate over all the CPUs in currently attached processes. Add the gdb_first_cpu_in_process() and gdb_next_cpu_in_process() to iterate over CPUs of a given process. Use them to add multiprocess extension support to vCont packets. Signed-off-by: Luc Michel Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Edgar E. Iglesias Acked-by: Alistair Francis Message-id: 20181207090135.7651-6-luc.michel@greensocs.com [PMM: corrected checkpatch comment style nit] Signed-off-by: Peter Maydell --- gdbstub.c | 115 +++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 100 insertions(+), 15 deletions(-) -- 2.19.2 diff --git a/gdbstub.c b/gdbstub.c index 644377db9f5..09114ea7769 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -724,6 +724,36 @@ static CPUState *find_cpu(uint32_t thread_id) return NULL; } +static CPUState *get_first_cpu_in_process(const GDBState *s, + GDBProcess *process) +{ + CPUState *cpu; + + CPU_FOREACH(cpu) { + if (gdb_get_cpu_pid(s, cpu) == process->pid) { + return cpu; + } + } + + return NULL; +} + +static CPUState *gdb_next_cpu_in_process(const GDBState *s, CPUState *cpu) +{ + uint32_t pid = gdb_get_cpu_pid(s, cpu); + cpu = CPU_NEXT(cpu); + + while (cpu) { + if (gdb_get_cpu_pid(s, cpu) == pid) { + break; + } + + cpu = CPU_NEXT(cpu); + } + + return cpu; +} + static CPUState *gdb_get_cpu(const GDBState *s, uint32_t pid, uint32_t tid) { GDBProcess *process; @@ -753,6 +783,35 @@ static CPUState *gdb_get_cpu(const GDBState *s, uint32_t pid, uint32_t tid) return cpu; } +/* Return the cpu following @cpu, while ignoring unattached processes. */ +static CPUState *gdb_next_attached_cpu(const GDBState *s, CPUState *cpu) +{ + cpu = CPU_NEXT(cpu); + + while (cpu) { + if (gdb_get_cpu_process(s, cpu)->attached) { + break; + } + + cpu = CPU_NEXT(cpu); + } + + return cpu; +} + +/* Return the first attached cpu */ +static CPUState *gdb_first_attached_cpu(const GDBState *s) +{ + CPUState *cpu = first_cpu; + GDBProcess *process = gdb_get_cpu_process(s, cpu); + + if (!process->attached) { + return gdb_next_attached_cpu(s, cpu); + } + + return cpu; +} + static const char *get_feature_xml(const char *p, const char **newp, CPUClass *cc) { @@ -1091,10 +1150,12 @@ static int is_query_packet(const char *p, const char *query, char separator) */ static int gdb_handle_vcont(GDBState *s, const char *p) { - int res, idx, signal = 0; + int res, signal = 0; char cur_action; char *newstates; unsigned long tmp; + uint32_t pid, tid; + GDBProcess *process; CPUState *cpu; #ifdef CONFIG_USER_ONLY int max_cpus = 1; /* global variable max_cpus exists only in system mode */ @@ -1137,25 +1198,48 @@ static int gdb_handle_vcont(GDBState *s, const char *p) res = -ENOTSUP; goto out; } - /* thread specification. special values: (none), -1 = all; 0 = any */ - if ((p[0] == ':' && p[1] == '-' && p[2] == '1') || (p[0] != ':')) { - if (*p == ':') { - p += 3; - } - for (idx = 0; idx < max_cpus; idx++) { - if (newstates[idx] == 1) { - newstates[idx] = cur_action; + + if (*p++ != ':') { + res = -ENOTSUP; + goto out; + } + + switch (read_thread_id(p, &p, &pid, &tid)) { + case GDB_READ_THREAD_ERR: + res = -EINVAL; + goto out; + + case GDB_ALL_PROCESSES: + cpu = gdb_first_attached_cpu(s); + while (cpu) { + if (newstates[cpu->cpu_index] == 1) { + newstates[cpu->cpu_index] = cur_action; } + + cpu = gdb_next_attached_cpu(s, cpu); } - } else if (*p == ':') { - p++; - res = qemu_strtoul(p, &p, 16, &tmp); - if (res) { + break; + + case GDB_ALL_THREADS: + process = gdb_get_process(s, pid); + + if (!process->attached) { + res = -EINVAL; goto out; } - /* 0 means any thread, so we pick the first valid CPU */ - cpu = tmp ? find_cpu(tmp) : first_cpu; + cpu = get_first_cpu_in_process(s, process); + while (cpu) { + if (newstates[cpu->cpu_index] == 1) { + newstates[cpu->cpu_index] = cur_action; + } + + cpu = gdb_next_cpu_in_process(s, cpu); + } + break; + + case GDB_ONE_THREAD: + cpu = gdb_get_cpu(s, pid, tid); /* invalid CPU/thread specified */ if (!cpu) { @@ -1167,6 +1251,7 @@ static int gdb_handle_vcont(GDBState *s, const char *p) if (newstates[cpu->cpu_index] == 1) { newstates[cpu->cpu_index] = cur_action; } + break; } } s->signal = signal;