[v3,4/4] gdbstub: don't fail on vCont; C04:0; c packets

Message ID 20170602130518.22943-5-alex.bennee@linaro.org
State New
Headers show
Series
  • some gdbstub fixes for debug and vcont
Related show

Commit Message

Alex Bennée June 2, 2017, 1:05 p.m.
The thread-id of 0 means any CPU but we then ignore the fact we find
the first_cpu in this case who can have an index of 0. Instead of
bailing out just test if we have managed to match up thread-id to a
CPU.

Otherwise you get:
  gdb_handle_packet: command='vCont;C04:0;c'
  put_packet: reply='E22'

The actual reason for gdb sending vCont;C04:0;c was fixed in a
previous commit where we ensure the first_cpu's tid is correctly
reported to gdb however we should still behave correctly next time it
does send 0.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

Reviewed-by: Greg Kurz <groug@kaod.org>

Reviewed-by: Claudio Imbrenda <imbrenda@linux.vnet.ibm.com>


---
v2
  - used Greg's less convoluted suggestion
  - expand commit message
---
 gdbstub.c | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

-- 
2.13.0

Comments

Philippe Mathieu-Daudé June 5, 2017, 8:56 p.m. | #1
On 06/02/2017 10:05 AM, Alex Bennée wrote:
> The thread-id of 0 means any CPU but we then ignore the fact we find

> the first_cpu in this case who can have an index of 0. Instead of

> bailing out just test if we have managed to match up thread-id to a

> CPU.

>

> Otherwise you get:

>   gdb_handle_packet: command='vCont;C04:0;c'

>   put_packet: reply='E22'

>

> The actual reason for gdb sending vCont;C04:0;c was fixed in a

> previous commit where we ensure the first_cpu's tid is correctly

> reported to gdb however we should still behave correctly next time it

> does send 0.

>

> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

> Reviewed-by: Greg Kurz <groug@kaod.org>

> Reviewed-by: Claudio Imbrenda <imbrenda@linux.vnet.ibm.com>


Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


>

> ---

> v2

>   - used Greg's less convoluted suggestion

>   - expand commit message

> ---

>  gdbstub.c | 15 ++++-----------

>  1 file changed, 4 insertions(+), 11 deletions(-)

>

> diff --git a/gdbstub.c b/gdbstub.c

> index 45a3a0b16b..6b1e72e9f7 100644

> --- a/gdbstub.c

> +++ b/gdbstub.c

> @@ -937,23 +937,16 @@ static int gdb_handle_vcont(GDBState *s, const char *p)

>              if (res) {

>                  goto out;

>              }

> -            idx = tmp;

> +

>              /* 0 means any thread, so we pick the first valid CPU */

> -            if (!idx) {

> -                idx = cpu_gdb_index(first_cpu);

> -            }

> +            cpu = tmp ? find_cpu(tmp) : 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 = find_cpu(idx);

>              /* invalid CPU/thread specified */

> -            if (!idx || !cpu) {

> +            if (!cpu) {

>                  res = -EINVAL;

>                  goto out;

>              }

> +

>              /* only use if no previous match occourred */

>              if (newstates[cpu->cpu_index] == 1) {

>                  newstates[cpu->cpu_index] = cur_action;

>

Patch hide | download patch | download mbox

diff --git a/gdbstub.c b/gdbstub.c
index 45a3a0b16b..6b1e72e9f7 100644
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -937,23 +937,16 @@  static int gdb_handle_vcont(GDBState *s, const char *p)
             if (res) {
                 goto out;
             }
-            idx = tmp;
+
             /* 0 means any thread, so we pick the first valid CPU */
-            if (!idx) {
-                idx = cpu_gdb_index(first_cpu);
-            }
+            cpu = tmp ? find_cpu(tmp) : 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 = find_cpu(idx);
             /* invalid CPU/thread specified */
-            if (!idx || !cpu) {
+            if (!cpu) {
                 res = -EINVAL;
                 goto out;
             }
+
             /* only use if no previous match occourred */
             if (newstates[cpu->cpu_index] == 1) {
                 newstates[cpu->cpu_index] = cur_action;