From nobody Fri May 3 15:49:55 2024 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.zoho.com; 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 1487094530574377.05943721040614; Tue, 14 Feb 2017 09:48:50 -0800 (PST) Received: from localhost ([::1]:36311 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdhDd-0000D0-AI for importer@patchew.org; Tue, 14 Feb 2017 12:48:49 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57328) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdgaA-0005Ds-4D for qemu-devel@nongnu.org; Tue, 14 Feb 2017 12:08:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cdga5-0006aR-3c for qemu-devel@nongnu.org; Tue, 14 Feb 2017 12:08:02 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:50756) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cdga4-0006Z4-R6 for qemu-devel@nongnu.org; Tue, 14 Feb 2017 12:07:57 -0500 Received: from pps.filterd (m0098409.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v1EGxn6B036332 for ; Tue, 14 Feb 2017 12:07:55 -0500 Received: from e06smtp14.uk.ibm.com (e06smtp14.uk.ibm.com [195.75.94.110]) by mx0a-001b2d01.pphosted.com with ESMTP id 28kx6vwj17-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Tue, 14 Feb 2017 12:07:55 -0500 Received: from localhost by e06smtp14.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 14 Feb 2017 17:07:52 -0000 Received: from d06dlp03.portsmouth.uk.ibm.com (9.149.20.15) by e06smtp14.uk.ibm.com (192.168.101.144) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 14 Feb 2017 17:07:51 -0000 Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by d06dlp03.portsmouth.uk.ibm.com (Postfix) with ESMTP id 603A51B08067; Tue, 14 Feb 2017 17:10:46 +0000 (GMT) Received: from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com [9.149.105.232]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v1EH7oYk9503000; Tue, 14 Feb 2017 17:07:50 GMT Received: from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 92F4F52041; Tue, 14 Feb 2017 16:06:31 +0000 (GMT) Received: from p-imbrenda.boeblingen.de.ibm.com (unknown [9.152.224.26]) by d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTPS id 64A265203F; Tue, 14 Feb 2017 16:06:31 +0000 (GMT) From: Claudio Imbrenda To: pbonzini@redhat.com Date: Tue, 14 Feb 2017 18:07:47 +0100 X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487092068-16562-1-git-send-email-imbrenda@linux.vnet.ibm.com> References: <1487092068-16562-1-git-send-email-imbrenda@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 17021417-0016-0000-0000-0000043E7FBE X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17021417-0017-0000-0000-000026710980 Message-Id: <1487092068-16562-2-git-send-email-imbrenda@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-02-14_10:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1612050000 definitions=main-1702140164 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.156.1 Subject: [Qemu-devel] [PATCH v8 1/2] move vm_start to cpus.c 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: borntraeger@de.ibm.com, alex.bennee@linaro.org, qemu-devel@nongnu.org, palves@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This patch: * moves vm_start to cpus.c. * exports qemu_vmstop_requested, since it's needed by vm_start. * extracts vm_prepare_start from vm_start; it does what vm_start did, except restarting the cpus. * vm_start now calls vm_prepare_start and then restarts the cpus. Signed-off-by: Claudio Imbrenda --- cpus.c | 42 ++++++++++++++++++++++++++++++++++++++++++ include/sysemu/sysemu.h | 2 ++ vl.c | 30 +----------------------------- 3 files changed, 45 insertions(+), 29 deletions(-) diff --git a/cpus.c b/cpus.c index 71a82e5..0bcb5b5 100644 --- a/cpus.c +++ b/cpus.c @@ -1578,6 +1578,48 @@ int vm_stop(RunState state) return do_vm_stop(state); } =20 +/** + * Prepare for (re)starting the VM. + * Returns -1 if the vCPUs are not to be restarted (e.g. if they are alrea= dy + * running or in case of an error condition), 0 otherwise. + */ +int vm_prepare_start(void) +{ + RunState requested; + int res =3D 0; + + qemu_vmstop_requested(&requested); + if (runstate_is_running() && requested =3D=3D RUN_STATE__MAX) { + return -1; + } + + /* Ensure that a STOP/RESUME pair of events is emitted if a + * vmstop request was pending. The BLOCK_IO_ERROR event, for + * example, according to documentation is always followed by + * the STOP event. + */ + if (runstate_is_running()) { + qapi_event_send_stop(&error_abort); + res =3D -1; + } else { + replay_enable_events(); + cpu_enable_ticks(); + runstate_set(RUN_STATE_RUNNING); + vm_state_notify(1, RUN_STATE_RUNNING); + } + + /* We are sending this now, but the CPUs will be resumed shortly later= */ + qapi_event_send_resume(&error_abort); + return res; +} + +void vm_start(void) +{ + if (!vm_prepare_start()) { + resume_all_vcpus(); + } +} + /* does a state transition even if the VM is already stopped, current state is forgotten forever */ int vm_stop_force_state(RunState state) diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h index ff8ffb5..0bb0c40 100644 --- a/include/sysemu/sysemu.h +++ b/include/sysemu/sysemu.h @@ -37,6 +37,7 @@ void vm_state_notify(int running, RunState state); #define VMRESET_REPORT true =20 void vm_start(void); +int vm_prepare_start(void); int vm_stop(RunState state); int vm_stop_force_state(RunState state); =20 @@ -60,6 +61,7 @@ void qemu_register_powerdown_notifier(Notifier *notifier); void qemu_system_debug_request(void); void qemu_system_vmstop_request(RunState reason); void qemu_system_vmstop_request_prepare(void); +bool qemu_vmstop_requested(RunState *r); int qemu_shutdown_requested_get(void); int qemu_reset_requested_get(void); void qemu_system_killed(int signal, pid_t pid); diff --git a/vl.c b/vl.c index abb0900..7a32a30 100644 --- a/vl.c +++ b/vl.c @@ -757,7 +757,7 @@ StatusInfo *qmp_query_status(Error **errp) return info; } =20 -static bool qemu_vmstop_requested(RunState *r) +bool qemu_vmstop_requested(RunState *r) { qemu_mutex_lock(&vmstop_lock); *r =3D vmstop_requested; @@ -778,34 +778,6 @@ void qemu_system_vmstop_request(RunState state) qemu_notify_event(); } =20 -void vm_start(void) -{ - RunState requested; - - qemu_vmstop_requested(&requested); - if (runstate_is_running() && requested =3D=3D RUN_STATE__MAX) { - return; - } - - /* Ensure that a STOP/RESUME pair of events is emitted if a - * vmstop request was pending. The BLOCK_IO_ERROR event, for - * example, according to documentation is always followed by - * the STOP event. - */ - if (runstate_is_running()) { - qapi_event_send_stop(&error_abort); - } else { - replay_enable_events(); - cpu_enable_ticks(); - runstate_set(RUN_STATE_RUNNING); - vm_state_notify(1, RUN_STATE_RUNNING); - resume_all_vcpus(); - } - - qapi_event_send_resume(&error_abort); -} - - /***********************************************************/ /* real time host monotonic timer */ =20 --=20 2.7.4 From nobody Fri May 3 15:49:55 2024 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.zoho.com; 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 1487094080565122.37286036983642; Tue, 14 Feb 2017 09:41:20 -0800 (PST) Received: from localhost ([::1]:36213 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdh6N-0001gv-9u for importer@patchew.org; Tue, 14 Feb 2017 12:41:19 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57371) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cdgaE-0005Hs-Fd for qemu-devel@nongnu.org; Tue, 14 Feb 2017 12:08:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cdga9-0006bH-Cn for qemu-devel@nongnu.org; Tue, 14 Feb 2017 12:08:06 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:41332) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cdga9-0006b9-2X for qemu-devel@nongnu.org; Tue, 14 Feb 2017 12:08:01 -0500 Received: from pps.filterd (m0098394.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v1EH1L4p012222 for ; Tue, 14 Feb 2017 12:07:59 -0500 Received: from e06smtp11.uk.ibm.com (e06smtp11.uk.ibm.com [195.75.94.107]) by mx0a-001b2d01.pphosted.com with ESMTP id 28m4wjkg6h-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Tue, 14 Feb 2017 12:07:57 -0500 Received: from localhost by e06smtp11.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 14 Feb 2017 17:07:54 -0000 Received: from d06dlp01.portsmouth.uk.ibm.com (9.149.20.13) by e06smtp11.uk.ibm.com (192.168.101.141) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 14 Feb 2017 17:07:51 -0000 Received: from b06cxnps4076.portsmouth.uk.ibm.com (d06relay13.portsmouth.uk.ibm.com [9.149.109.198]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id 3935117D805A; Tue, 14 Feb 2017 17:10:58 +0000 (GMT) Received: from d06av21.portsmouth.uk.ibm.com (d06av21.portsmouth.uk.ibm.com [9.149.105.232]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v1EH7pwK8585622; Tue, 14 Feb 2017 17:07:51 GMT Received: from d06av21.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C252752043; Tue, 14 Feb 2017 16:06:32 +0000 (GMT) Received: from p-imbrenda.boeblingen.de.ibm.com (unknown [9.152.224.26]) by d06av21.portsmouth.uk.ibm.com (Postfix) with ESMTPS id 938655203F; Tue, 14 Feb 2017 16:06:32 +0000 (GMT) From: Claudio Imbrenda To: pbonzini@redhat.com Date: Tue, 14 Feb 2017 18:07:48 +0100 X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487092068-16562-1-git-send-email-imbrenda@linux.vnet.ibm.com> References: <1487092068-16562-1-git-send-email-imbrenda@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 17021417-0040-0000-0000-00000347462D X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17021417-0041-0000-0000-00001EE5B8D9 Message-Id: <1487092068-16562-3-git-send-email-imbrenda@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-02-14_10:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=3 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1612050000 definitions=main-1702140164 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy] X-Received-From: 148.163.156.1 Subject: [Qemu-devel] [PATCH v8 2/2] gdbstub: Fix vCont behaviour 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: borntraeger@de.ibm.com, alex.bennee@linaro.org, qemu-devel@nongnu.org, palves@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" When GDB issues a "vCont", QEMU was not handling it correctly when multiple VCPUs are active. For vCont, for each thread (VCPU), it can be specified whether to single step, continue or stop that thread. The default is to stop a thread. However, when (for example) "vCont;s:2" is issued, all VCPUs continue to run, although all but VCPU nr 2 are to be stopped. This patch completely rewrites the vCont parsing code. Please note that this improvement only works in system emulation mode, when in userspace emulation mode the old behaviour is preserved. Signed-off-by: Claudio Imbrenda --- gdbstub.c | 209 ++++++++++++++++++++++++++++++++++++++++++++++++----------= ---- 1 file changed, 162 insertions(+), 47 deletions(-) diff --git a/gdbstub.c b/gdbstub.c index de9b62b..0068f0e 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -386,6 +386,60 @@ static inline void gdb_continue(GDBState *s) #endif } =20 +/* + * Resume execution, per CPU actions. For user-mode emulation it's + * equivalent to gdb_continue. + */ +static int gdb_continue_partial(GDBState *s, char *newstates) +{ + CPUState *cpu; + int res =3D 0; +#ifdef CONFIG_USER_ONLY + /* + * This is not exactly accurate, but it's an improvement compared to t= he + * previous situation, where only one CPU would be single-stepped. + */ + CPU_FOREACH(cpu) { + if (newstates[cpu->cpu_index] =3D=3D 's') { + cpu_single_step(cpu, sstep_flags); + } + } + s->running_state =3D 1; +#else + int flag =3D 0; + + if (!runstate_needs_reset()) { + if (vm_prepare_start()) { + return 0; + } + + CPU_FOREACH(cpu) { + switch (newstates[cpu->cpu_index]) { + case 0: + case 1: + break; /* nothing to do here */ + case 's': + cpu_single_step(cpu, sstep_flags); + cpu_resume(cpu); + flag =3D 1; + break; + case 'c': + cpu_resume(cpu); + flag =3D 1; + break; + default: + res =3D -1; + break; + } + } + } + if (flag) { + qemu_clock_enable(QEMU_CLOCK_VIRTUAL, true); + } +#endif + return res; +} + static void put_buffer(GDBState *s, const uint8_t *buf, int len) { #ifdef CONFIG_USER_ONLY @@ -784,6 +838,107 @@ static int is_query_packet(const char *p, const char = *query, char separator) (p[query_len] =3D=3D '\0' || p[query_len] =3D=3D separator); } =20 +/** + * gdb_handle_vcont - Parses and handles a vCont packet. + * returns -ENOTSUP if a command is unsupported, -EINVAL or -ERANGE if the= re is + * a format error, 0 on success. + */ +static int gdb_handle_vcont(GDBState *s, const char *p) +{ + int res, idx, signal =3D 0; + char cur_action; + char *newstates; + unsigned long tmp; + CPUState *cpu; +#ifdef CONFIG_USER_ONLY + int max_cpus =3D 1; /* global variable max_cpus exists only in system = mode */ + + CPU_FOREACH(cpu) { + max_cpus =3D max_cpus <=3D cpu->cpu_index ? cpu->cpu_index + 1 : m= ax_cpus; + } +#endif + /* uninitialised CPUs stay 0 */ + newstates =3D g_new0(char, max_cpus); + + /* mark valid CPUs with 1 */ + CPU_FOREACH(cpu) { + newstates[cpu->cpu_index] =3D 1; + } + + /* + * res keeps track of what error we are returning, with -ENOTSUP meani= ng + * that the command is unknown or unsupported, thus returning an empty + * packet, while -EINVAL and -ERANGE cause an E22 packet, due to inval= id, + * or incorrect parameters passed. + */ + res =3D 0; + while (*p) { + if (*p++ !=3D ';') { + res =3D -ENOTSUP; + goto out; + } + + cur_action =3D *p++; + if (cur_action =3D=3D 'C' || cur_action =3D=3D 'S') { + cur_action =3D tolower(cur_action); + res =3D qemu_strtoul(p + 1, &p, 16, &tmp); + if (res) { + goto out; + } + signal =3D gdb_signal_to_target(tmp); + } else if (cur_action !=3D 'c' && cur_action !=3D 's') { + /* unknown/invalid/unsupported command */ + res =3D -ENOTSUP; + goto out; + } + /* thread specification. special values: (none), -1 =3D all; 0 =3D= any */ + if ((p[0] =3D=3D ':' && p[1] =3D=3D '-' && p[2] =3D=3D '1') || (p[= 0] !=3D ':')) { + if (*p =3D=3D ':') { + p +=3D 3; + } + for (idx =3D 0; idx < max_cpus; idx++) { + if (newstates[idx] =3D=3D 1) { + newstates[idx] =3D cur_action; + } + } + } else if (*p =3D=3D ':') { + p++; + res =3D qemu_strtoul(p, &p, 16, &tmp); + if (res) { + goto out; + } + idx =3D tmp; + /* 0 means any thread, so we pick the first valid CPU */ + if (!idx) { + idx =3D cpu_index(first_cpu); + } + + /* + * If we are in user mode, the thread specified is actually a + * thread id, and not an index. We need to find the actual + * CPU first, and only then we can use its index. + */ + cpu =3D find_cpu(idx); + /* invalid CPU/thread specified */ + if (!idx || !cpu) { + res =3D -EINVAL; + goto out; + } + /* only use if no previous match occourred */ + if (newstates[cpu->cpu_index] =3D=3D 1) { + newstates[cpu->cpu_index] =3D cur_action; + } + } + } + s->signal =3D signal; + gdb_continue_partial(s, newstates); + +out: + g_free(newstates); + + return res; +} + static int gdb_handle_packet(GDBState *s, const char *line_buf) { CPUState *cpu; @@ -829,60 +984,20 @@ static int gdb_handle_packet(GDBState *s, const char = *line_buf) return RS_IDLE; case 'v': if (strncmp(p, "Cont", 4) =3D=3D 0) { - int res_signal, res_thread; - p +=3D 4; if (*p =3D=3D '?') { put_packet(s, "vCont;c;C;s;S"); break; } - res =3D 0; - res_signal =3D 0; - res_thread =3D 0; - while (*p) { - int action, signal; - - if (*p++ !=3D ';') { - res =3D 0; - break; - } - action =3D *p++; - signal =3D 0; - if (action =3D=3D 'C' || action =3D=3D 'S') { - signal =3D gdb_signal_to_target(strtoul(p, (char **)&p= , 16)); - if (signal =3D=3D -1) { - signal =3D 0; - } - } else if (action !=3D 'c' && action !=3D 's') { - res =3D 0; - break; - } - thread =3D 0; - if (*p =3D=3D ':') { - thread =3D strtoull(p+1, (char **)&p, 16); - } - action =3D tolower(action); - if (res =3D=3D 0 || (res =3D=3D 'c' && action =3D=3D 's'))= { - res =3D action; - res_signal =3D signal; - res_thread =3D thread; - } - } + + res =3D gdb_handle_vcont(s, p); + if (res) { - if (res_thread !=3D -1 && res_thread !=3D 0) { - cpu =3D find_cpu(res_thread); - if (cpu =3D=3D NULL) { - put_packet(s, "E22"); - break; - } - s->c_cpu =3D cpu; - } - if (res =3D=3D 's') { - cpu_single_step(s->c_cpu, sstep_flags); + if ((res =3D=3D -EINVAL) || (res =3D=3D -ERANGE)) { + put_packet(s, "E22"); + break; } - s->signal =3D res_signal; - gdb_continue(s); - return RS_IDLE; + goto unknown_command; } break; } else { --=20 2.7.4