From nobody Sun Nov 24 05:51:40 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=reject dis=none) header.from=google.com ARC-Seal: i=1; a=rsa-sha256; t=1725663371; cv=none; d=zohomail.com; s=zohoarc; b=WT6nYvp5LfBWeBbPEEq0bTkzTAoRwnRyaGmTw9jr9RqGTj/PmeKGKjW1KcxjSlsZEBQLCp536YyZfiyXJXpddrQZDw+h9HljWxeOEsXj4HlH2SqjdGVr2rDFeH7x3d1h8aLNrTz9xIXDAdt/S0rSb/V9+p2KTo0TF1esvIY9PMs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1725663371; h=Content-Type:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Ykg6BmtRsT6Cx1jWmwUwUzJLj8O9xsEBVsjdsaDi0vE=; b=UhcjGbFzXZjxR6lHb1xK9rsetr6pw8E/5qbRldkHNVeAoDOW7ULOYSiKZ7UeXO/IN5e8aHuceuORBhzCyuoOdFlhGY2UfEq+8vbyjrh3AWqCQj6qOQEk1m87N61xzg+W/z+JNixqOyg4lucxeljY4zjBP0obDgWg+3qLlcud0M8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1725663371292644.112568503656; Fri, 6 Sep 2024 15:56:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1smhr8-0006jT-Ot; Fri, 06 Sep 2024 18:55:06 -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 <3RIjbZgYKCgEsprvfihpphmf.dpnrfnv-efwfmopohov.psh@flex--roqueh.bounces.google.com>) id 1smhr6-0006b4-KA for qemu-devel@nongnu.org; Fri, 06 Sep 2024 18:55:04 -0400 Received: from mail-yw1-x1149.google.com ([2607:f8b0:4864:20::1149]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <3RIjbZgYKCgEsprvfihpphmf.dpnrfnv-efwfmopohov.psh@flex--roqueh.bounces.google.com>) id 1smhr4-0005UH-Sf for qemu-devel@nongnu.org; Fri, 06 Sep 2024 18:55:04 -0400 Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-6d7124939beso83220707b3.2 for ; Fri, 06 Sep 2024 15:55:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1725663300; x=1726268100; darn=nongnu.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=Ykg6BmtRsT6Cx1jWmwUwUzJLj8O9xsEBVsjdsaDi0vE=; b=xQUQ/BSBeJJFgkNZ7ddXubrgZxgcpcbj8NydCi6L0P+wbZI7cM1so0Z0Nud9qS4EsD 2/VUeRE4fL6sk0un0RomykcMOOgY2OaQ8QSGbd6+Egaunc0glUtKGfhJWOPZgIWXeYU5 04T18TAfuivEuz0RcJM2VbXb3trD7NFHmbq/3oOmbTXDs4eTtmsZLInR8gXAYkej0ueR fTi8tQTESSuH3onARZUmGOa4ec7RbDjFRgPVy271c/GQFD3spzn2Rhn2R4dFfBMRf3qK ahPkHgX27IClJN9pG1EKMgyeq8s/EoyZdoGDkjuPDZCp4G3H6a1vYkOcDErpj65Fl/YT G0lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725663300; x=1726268100; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Ykg6BmtRsT6Cx1jWmwUwUzJLj8O9xsEBVsjdsaDi0vE=; b=FgfXMp9bL/Mzwul1tCEv8RhPhl/Z9nT159XLlbTE4ngSOWG+sfVN1tW/TdDslEugCQ gumAgNPIhN4D6WcrYvVQsPCoizCwdyarLiZSQvpCKogESJSmT/kHNyFm3cDUu5ez2+T5 iulaSe23+jDtwStlb30gQ4dMSi+lX60NIok1zMSDwrGI8LHX9CF5gh4JeFrXyp+br5oJ IA05szz98n8Wkh/bpqw5afD47RYvs+CtwQ852DgfZxFVZwAd5i30mg+m3f4E4FNMhyFD 6gYeVasu06aAzxvZVF6ONfBHaJ6Ktv5XxU9Wq6v6RnB73ubTSIr/S9GeOrqSezjQnlF1 sAXg== X-Gm-Message-State: AOJu0YwAlLjjaTEZTFf7RwjyVt1HcgzfaULy5s7LJve2F6Pah/KpoC3E LW0SdbAgPuDjSEGstHJ7AeETl6RowSjI/rl+edXiRyy6Wh5wklpvyG+WgNCR94YIgRdvG1vHagr +1w== X-Google-Smtp-Source: AGHT+IHA1vmtUfE9IH8wEtKZ+5T/G7ccOcXvmDKxMc3TAwaRZEDHYTCitYuMBipBn31m8NhhDXnF0eA4DTQ= X-Received: from roqueh-desktop.svl.corp.google.com ([2620:15c:2a3:200:81f3:7a35:4574:5dc]) (user=roqueh job=sendgmr) by 2002:a25:944:0:b0:e1d:2043:da46 with SMTP id 3f1490d57ef6-e1d348911ddmr38374276.3.1725663300214; Fri, 06 Sep 2024 15:55:00 -0700 (PDT) Date: Fri, 6 Sep 2024 15:54:50 -0700 In-Reply-To: <20240906225451.1039718-1-roqueh@google.com> Mime-Version: 1.0 References: <20240906225451.1039718-1-roqueh@google.com> X-Mailer: git-send-email 2.46.0.469.g59c65b2a67-goog Message-ID: <20240906225451.1039718-2-roqueh@google.com> Subject: [PATCH 1/2] gdbstub: Fix wrong CPUState pointer in breakpoint functions From: Roque Arcudia Hernandez To: richard.henderson@linaro.org, pbonzini@redhat.com, alex.bennee@linaro.org, philmd@linaro.org, slongfield@google.com, komlodi@google.com Cc: qemu-devel@nongnu.org, Roque Arcudia Hernandez 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=2607:f8b0:4864:20::1149; envelope-from=3RIjbZgYKCgEsprvfihpphmf.dpnrfnv-efwfmopohov.psh@flex--roqueh.bounces.google.com; helo=mail-yw1-x1149.google.com X-Spam_score_int: -95 X-Spam_score: -9.6 X-Spam_bar: --------- X-Spam_report: (-9.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, USER_IN_DEF_DKIM_WL=-7.5 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-ZohoMail-DKIM: pass (identity @google.com) X-ZM-MESSAGEID: 1725663373436116600 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In the context of using the remote gdb with multiple processes/inferiors (multiple cluster machine) a given breakpoint will target an specific inferior. If needed the remote protocol will use the packet 'H op thread-id' with op =3D 'g' to change focus to the inferior we want to insert/remove the breakpoint to, for instance 'Hgp3.3' and not 'Hcp3.3'. This is supported by the documentation of the H packets: > 'H op thread-id' > Set thread for subsequent operations ('m', 'M', 'g', 'G', > et.al.). Depending on the operation to be performed, op should be > 'c' for step and continue operations (note that this is > deprecated, supporting the 'vCont' command is a better option), > and 'g' for other operations. This can also be verified in the GDB source code file gdb/remote.c. Functions remote_target::insert_breakpoint and remote_target::remove_breakpoint will eventually call remote_target::set_general_thread if it needs to change the process focus and not remote_target::set_continue_thread. This can be seen around a comment that says: /* Make sure the remote is pointing at the right process, if necessary. */ Google-Bug-Id: 355027002 Signed-off-by: Roque Arcudia Hernandez --- gdbstub/gdbstub.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gdbstub/gdbstub.c b/gdbstub/gdbstub.c index d08568cea0..98574eba68 100644 --- a/gdbstub/gdbstub.c +++ b/gdbstub/gdbstub.c @@ -1148,7 +1148,7 @@ static void handle_insert_bp(GArray *params, void *us= er_ctx) return; } =20 - res =3D gdb_breakpoint_insert(gdbserver_state.c_cpu, + res =3D gdb_breakpoint_insert(gdbserver_state.g_cpu, gdb_get_cmd_param(params, 0)->val_ul, gdb_get_cmd_param(params, 1)->val_ull, gdb_get_cmd_param(params, 2)->val_ull); @@ -1172,7 +1172,7 @@ static void handle_remove_bp(GArray *params, void *us= er_ctx) return; } =20 - res =3D gdb_breakpoint_remove(gdbserver_state.c_cpu, + res =3D gdb_breakpoint_remove(gdbserver_state.g_cpu, gdb_get_cmd_param(params, 0)->val_ul, gdb_get_cmd_param(params, 1)->val_ull, gdb_get_cmd_param(params, 2)->val_ull); --=20 2.46.0.469.g59c65b2a67-goog From nobody Sun Nov 24 05:51:40 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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; dmarc=pass(p=reject dis=none) header.from=google.com ARC-Seal: i=1; a=rsa-sha256; t=1725663371; cv=none; d=zohomail.com; s=zohoarc; b=Lym6sW9ZK0DDyUs0W/HowElOX1vyoJ6IirC+9mOmZPqYpFP14nJtosWwxIbVmKFLr/EY73Aq2/VbfFRqcrsuGKyMZ4PIqp9cCaass+tMCG9EacoNOPDKmOTqQ7Qm+LmLbDgL4QUKN2fSPiWUA6cCorjuejuX+i7UXKWKVptGmxA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1725663371; h=Content-Type:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=nsx3K+Q5vkcw0I1VEsx1ERdK9PHye/j2Qc1UcP0pHjg=; b=Ty0j11ZYf7DxCHuWgbnl2rU8pV62GRPrYvMTfBUioEZ95CHYJW2rPYfQDexjVG8ru3Tu/im5DJENXYq4wuF9wwJC4Yi4IDntTU4Hcd28b7B2PE/hZ3mRrk7nURHcFkvMUVpCeJqGcHXuJPNkcXpSrJNWxC6pJHtlooueb3Z3TP0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 172566337099828.57739256300465; Fri, 6 Sep 2024 15:56:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1smhrA-0006rr-Me; Fri, 06 Sep 2024 18:55:08 -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 <3SIjbZgYKCgUwtvzjmlttlqj.htrvjrz-ij0jqstslsz.twl@flex--roqueh.bounces.google.com>) id 1smhr9-0006mj-F7 for qemu-devel@nongnu.org; Fri, 06 Sep 2024 18:55:07 -0400 Received: from mail-yw1-x114a.google.com ([2607:f8b0:4864:20::114a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <3SIjbZgYKCgUwtvzjmlttlqj.htrvjrz-ij0jqstslsz.twl@flex--roqueh.bounces.google.com>) id 1smhr7-0005fV-Ia for qemu-devel@nongnu.org; Fri, 06 Sep 2024 18:55:07 -0400 Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-6d475205628so86672877b3.0 for ; Fri, 06 Sep 2024 15:55:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1725663304; x=1726268104; darn=nongnu.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=nsx3K+Q5vkcw0I1VEsx1ERdK9PHye/j2Qc1UcP0pHjg=; b=xC6gYxB4exHlPBfZ71AwSMCC95du3CMPb5NfiYojPh+eRK15Ze/onxBRFCExTkqyIj mdAG/8YtrBuvbvdg7IAZNjkjKixg9lYRCuJFYTG4VJ+hx4wBJzJ+GbA9O6Hd0DsGytME rloTFIECmgewHSmop4NUzvd9MZhcbVfHsb2Y4sYD2U+wtwz9/k19HLrLgaB8B/CPO200 FJ1gMhpHQU85XDJwIXzT5IQMrIqoDVOGP4bp7MSgpCdHBKE6jfiPIjFMY2iCwl8o+5Ut kAs37FfcRN+h6z+owe4eEioaWaWZLoS6UwxLs6qw3MX7bDMVVYSGHLmnIV+ryJbni+Ha KNBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725663304; x=1726268104; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=nsx3K+Q5vkcw0I1VEsx1ERdK9PHye/j2Qc1UcP0pHjg=; b=f3jpjAFyh+W3tIho1zU7BnvBfjzV4DQrHQf05eTIcaEyZM2642381383QbPXiSg/lX 3QsSmRf9r24nIp76Glwio6Ya/nLB8ZIJzOd2z8hL96Oor5IjofaSOkfrEOWVTa3c3OQ0 oC6cuk38He9hZQBQUhGlVM9ESqM5MMP8JMhg1OHW1ElIwdEOjVrgs8dqQxIRtLPXcla9 xWeAZ+o9/g1K7Q8UfmcJIfO+fuUMYKIGv8hLMRbrMs4PIZYzwFeCGMIIsTGfJG0F+4ga NWXIKX1WnSglVDxAG3lCljhhsG0yMxnGumhz9JkhvCiLb92c0GgYPWOBuPnTsPb1qqrp 2ocg== X-Gm-Message-State: AOJu0YzfP/EzdrdfURqJVBwN0owEYJE8JA0Ov8WYedwN43IAVKAhBQZn 1KPaSD5WmuK54RmlPGW8XzhzfmJEBIaHLrsiRAhTuEbh8KVOLa/wbf7svL7mts7ACVaBIrltYAL Bgg== X-Google-Smtp-Source: AGHT+IGlx6HfVmML0dB8+Ky8n5zXmOu5pd9zFyp5hfcLRNFvcDxvWC2HqY1+ZRSnTiIrUR72yisQ2qKZd5g= X-Received: from roqueh-desktop.svl.corp.google.com ([2620:15c:2a3:200:81f3:7a35:4574:5dc]) (user=roqueh job=sendgmr) by 2002:a05:690c:610d:b0:6b2:6cd4:7f9a with SMTP id 00721157ae682-6db4526b0f6mr2260267b3.8.1725663304169; Fri, 06 Sep 2024 15:55:04 -0700 (PDT) Date: Fri, 6 Sep 2024 15:54:51 -0700 In-Reply-To: <20240906225451.1039718-1-roqueh@google.com> Mime-Version: 1.0 References: <20240906225451.1039718-1-roqueh@google.com> X-Mailer: git-send-email 2.46.0.469.g59c65b2a67-goog Message-ID: <20240906225451.1039718-3-roqueh@google.com> Subject: [PATCH 2/2] gdbstub: Apply breakpoints only to the selected PID From: Roque Arcudia Hernandez To: richard.henderson@linaro.org, pbonzini@redhat.com, alex.bennee@linaro.org, philmd@linaro.org, slongfield@google.com, komlodi@google.com Cc: qemu-devel@nongnu.org, Roque Arcudia Hernandez 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=2607:f8b0:4864:20::114a; envelope-from=3SIjbZgYKCgUwtvzjmlttlqj.htrvjrz-ij0jqstslsz.twl@flex--roqueh.bounces.google.com; helo=mail-yw1-x114a.google.com X-Spam_score_int: -95 X-Spam_score: -9.6 X-Spam_bar: --------- X-Spam_report: (-9.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, USER_IN_DEF_DKIM_WL=-7.5 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-ZohoMail-DKIM: pass (identity @google.com) X-ZM-MESSAGEID: 1725663371463116600 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In the context of using the remote gdb with multiple processes/inferiors (multi cluster machine) a given breakpoint will target an specific inferior. Current implementation of tcg_insert_breakpoint and tcg_remove_breakpoint apply a given breakpoint to all the cpus available in the system. This is not how gdb expects the remote protocol to behave. If we refer to the current source of gdb, in the function remote_target::insert_breakpoint in the file gdb/remote.c we can see the intention to have the right process selected before breakpoint insertion: int remote_target::insert_breakpoint (struct gdbarch *gdbarch, struct bp_target_info *bp_tgt) { ... /* Make sure the remote is pointing at the right process, if necessary. */ if (!gdbarch_has_global_breakpoints (current_inferior ()->arch ())) set_general_process (); ... } Since most platforms do not have global breakpoints, this typically will result in an 'Hg' Packet sent before 'z/Z', if gdb is not pointing to the desired process. For instance this is a concrete example obtained with a trace dump: gdbstub_io_command Received: Hgp2.2 gdbstub_io_command Received: Z0,4000ded0,4 Only the CPUs associated with the selected process ID should insert or remove the breakpoint. It is important to apply it to all the CPUs in the process ID regardless of the particular thread selected by the 'Hg' packet because even in the case of a thread specific breakpoint. A breakpoint on a specific thread is treated as a conditional break similar to a 'break if'. This can be read in the code and comments of function bpstat_check_breakpoint_conditions in the file gdb/breakpoint.c /* For breakpoints that are currently marked as telling gdb to stop, check conditions (condition proper, frame, thread and ignore count) of breakpoint referred to by BS. If we should not stop for this breakpoint, set BS->stop to 0. */ static void bpstat_check_breakpoint_conditions (bpstat *bs, thread_info *thread) The patch needs to expose the currently private function gdb_get_cpu_pid to the TCG and also expose the value of gdbserver_state.multiprocess. The PID filtering will only be applicable to multiprocess gdb because the PIDs are only defined in that context. Google-Bug-Id: 355027002 Signed-off-by: Roque Arcudia Hernandez --- accel/tcg/tcg-accel-ops.c | 15 +++++++++++++++ gdbstub/gdbstub.c | 7 ++++++- include/exec/gdbstub.h | 15 +++++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/accel/tcg/tcg-accel-ops.c b/accel/tcg/tcg-accel-ops.c index 3c19e68a79..557091c15e 100644 --- a/accel/tcg/tcg-accel-ops.c +++ b/accel/tcg/tcg-accel-ops.c @@ -33,6 +33,7 @@ #include "qemu/guest-random.h" #include "qemu/timer.h" #include "exec/exec-all.h" +#include "exec/gdbstub.h" #include "exec/hwaddr.h" #include "exec/tb-flush.h" #include "gdbstub/enums.h" @@ -132,11 +133,15 @@ static int tcg_insert_breakpoint(CPUState *cs, int ty= pe, vaddr addr, vaddr len) { CPUState *cpu; int err =3D 0; + bool match_pid =3D gdb_is_multiprocess(); =20 switch (type) { case GDB_BREAKPOINT_SW: case GDB_BREAKPOINT_HW: CPU_FOREACH(cpu) { + if (match_pid && gdb_get_cpu_pid(cpu) !=3D gdb_get_cpu_pid(cs)= ) { + continue; + } err =3D cpu_breakpoint_insert(cpu, addr, BP_GDB, NULL); if (err) { break; @@ -147,6 +152,9 @@ static int tcg_insert_breakpoint(CPUState *cs, int type= , vaddr addr, vaddr len) case GDB_WATCHPOINT_READ: case GDB_WATCHPOINT_ACCESS: CPU_FOREACH(cpu) { + if (match_pid && gdb_get_cpu_pid(cpu) !=3D gdb_get_cpu_pid(cs)= ) { + continue; + } err =3D cpu_watchpoint_insert(cpu, addr, len, xlat_gdb_type(cpu, type), NULL); if (err) { @@ -163,11 +171,15 @@ static int tcg_remove_breakpoint(CPUState *cs, int ty= pe, vaddr addr, vaddr len) { CPUState *cpu; int err =3D 0; + bool match_pid =3D gdb_is_multiprocess(); =20 switch (type) { case GDB_BREAKPOINT_SW: case GDB_BREAKPOINT_HW: CPU_FOREACH(cpu) { + if (match_pid && gdb_get_cpu_pid(cpu) !=3D gdb_get_cpu_pid(cs)= ) { + continue; + } err =3D cpu_breakpoint_remove(cpu, addr, BP_GDB); if (err) { break; @@ -178,6 +190,9 @@ static int tcg_remove_breakpoint(CPUState *cs, int type= , vaddr addr, vaddr len) case GDB_WATCHPOINT_READ: case GDB_WATCHPOINT_ACCESS: CPU_FOREACH(cpu) { + if (match_pid && gdb_get_cpu_pid(cpu) !=3D gdb_get_cpu_pid(cs)= ) { + continue; + } err =3D cpu_watchpoint_remove(cpu, addr, len, xlat_gdb_type(cpu, type)); if (err) { diff --git a/gdbstub/gdbstub.c b/gdbstub/gdbstub.c index 98574eba68..628e599692 100644 --- a/gdbstub/gdbstub.c +++ b/gdbstub/gdbstub.c @@ -199,7 +199,12 @@ void gdb_memtox(GString *buf, const char *mem, int len) } } =20 -static uint32_t gdb_get_cpu_pid(CPUState *cpu) +bool gdb_is_multiprocess(void) +{ + return gdbserver_state.multiprocess; +} + +uint32_t gdb_get_cpu_pid(CPUState *cpu) { #ifdef CONFIG_USER_ONLY return getpid(); diff --git a/include/exec/gdbstub.h b/include/exec/gdbstub.h index d73f424f56..a7c95d215b 100644 --- a/include/exec/gdbstub.h +++ b/include/exec/gdbstub.h @@ -138,6 +138,21 @@ GArray *gdb_get_register_list(CPUState *cpu); =20 void gdb_set_stop_cpu(CPUState *cpu); =20 +/** + * gdb_get_cpu_pid() - Get the PID assigned to a CPU + * @cpu - the CPU to query + * + * Return: The PID associated with the cpu + */ +uint32_t gdb_get_cpu_pid(CPUState *cpu); + +/** + * gdb_is_multiprocess() - Tells if the gdb server supports multiple proce= sses + * + * Return: True if supported + */ +bool gdb_is_multiprocess(void); + /* in gdbstub-xml.c, generated by scripts/feature_to_c.py */ extern const GDBFeature gdb_static_features[]; =20 --=20 2.46.0.469.g59c65b2a67-goog