diff mbox series

[v3,45/45] windbg: implemented kd_api_get_context_ex and kd_api_set_context_ex

Message ID 151127349122.6888.9523124333246477608.stgit@Misha-PC.lan02.inno
State New
Headers show
Series Windbg supporting | expand

Commit Message

Mikhail Abakumov Nov. 21, 2017, 2:11 p.m. UTC 
Signed-off-by: Mihail Abakumov <mikhail.abakumov@ispras.ru>
Signed-off-by: Pavel Dovgalyuk <dovgaluk@ispras.ru>
Signed-off-by: Dmitriy Koltunov <koltunov@ispras.ru>
---
 include/exec/windbgstub-utils.h |    2 +
 target/i386/windbgstub.c        |  129 ++++++++++++++++++++++++++++-----------
 windbgstub.c                    |   14 +++-
 3 files changed, 105 insertions(+), 40 deletions(-)

Comments

Ladi Prosek Nov. 28, 2017, 12:44 p.m. UTC | #1 
On Tue, Nov 21, 2017 at 3:11 PM, Mihail Abakumov
<mikhail.abakumov@ispras.ru> wrote:
[...]
> diff --git a/windbgstub.c b/windbgstub.c
> index 36372c0ea5..3bcf6a8cbb 100755
> --- a/windbgstub.c
> +++ b/windbgstub.c
> @@ -224,6 +224,14 @@ static void windbg_process_manipulate_packet(ParsingContext *ctx)
>          kd_api_query_memory(cpu, &ctx->data);
>          break;
>
> +    case DbgKdGetContextExApi:
> +        kd_api_get_context_ex(cpu, &ctx->data);
> +        break;
> +
> +    case DbgKdSetContextExApi:
> +        kd_api_set_context_ex(cpu, &ctx->data);
> +        break;
> +
>      default:
>          kd_api_unsupported(cpu, &ctx->data);
>          break;
> @@ -262,12 +270,12 @@ static void windbg_process_control_packet(ParsingContext *ctx)
>
>      case PACKET_TYPE_KD_RESET:
>      {
> -        SizedBuf buf = kd_gen_load_symbols_sc(qemu_get_cpu(0));
> +        windbg_send_control_packet(ctx->packet.PacketType);
> +        windbg_state->ctrl_packet_id = INITIAL_PACKET_ID;

You didn't mention it in the cover email so I'd like to be sure. This
is what fixed the initial handshake so it works without -b now, is
that correct? Thanks!

> +        SizedBuf buf = kd_gen_load_symbols_sc(qemu_get_cpu(0));
>          windbg_send_data_packet(buf.data, buf.size,
>                                  PACKET_TYPE_KD_STATE_CHANGE64);
> -        windbg_send_control_packet(ctx->packet.PacketType);
> -        windbg_state->ctrl_packet_id = INITIAL_PACKET_ID;
>          SBUF_FREE(buf);
>          break;
>      }
>
Mikhail Abakumov Dec. 5, 2017, 11:28 a.m. UTC | #2 
Ladi Prosek писал 2017-11-28 15:44:
> On Tue, Nov 21, 2017 at 3:11 PM, Mihail Abakumov
> <mikhail.abakumov@ispras.ru> wrote:
> [...]
>> diff --git a/windbgstub.c b/windbgstub.c
>> index 36372c0ea5..3bcf6a8cbb 100755
>> --- a/windbgstub.c
>> +++ b/windbgstub.c
>> @@ -224,6 +224,14 @@ static void 
>> windbg_process_manipulate_packet(ParsingContext *ctx)
>>          kd_api_query_memory(cpu, &ctx->data);
>>          break;
>> 
>> +    case DbgKdGetContextExApi:
>> +        kd_api_get_context_ex(cpu, &ctx->data);
>> +        break;
>> +
>> +    case DbgKdSetContextExApi:
>> +        kd_api_set_context_ex(cpu, &ctx->data);
>> +        break;
>> +
>>      default:
>>          kd_api_unsupported(cpu, &ctx->data);
>>          break;
>> @@ -262,12 +270,12 @@ static void 
>> windbg_process_control_packet(ParsingContext *ctx)
>> 
>>      case PACKET_TYPE_KD_RESET:
>>      {
>> -        SizedBuf buf = kd_gen_load_symbols_sc(qemu_get_cpu(0));
>> +        windbg_send_control_packet(ctx->packet.PacketType);
>> +        windbg_state->ctrl_packet_id = INITIAL_PACKET_ID;
> 
> You didn't mention it in the cover email so I'd like to be sure. This
> is what fixed the initial handshake so it works without -b now, is
> that correct? Thanks!
> 
Yes. It seems for me more logical to send a response first, then a state 
packet.
Apparently, before that I made a typo. Now Windbg connects immediately, 
and
for stopping it is necessary to press ctrl+break. But now the option 
'-b' does
not work in the old version.

>> +        SizedBuf buf = kd_gen_load_symbols_sc(qemu_get_cpu(0));
>>          windbg_send_data_packet(buf.data, buf.size,
>>                                  PACKET_TYPE_KD_STATE_CHANGE64);
>> -        windbg_send_control_packet(ctx->packet.PacketType);
>> -        windbg_state->ctrl_packet_id = INITIAL_PACKET_ID;
>>          SBUF_FREE(buf);
>>          break;
>>      }
>>
diff mbox series

Patch

diff --git a/include/exec/windbgstub-utils.h b/include/exec/windbgstub-utils.h
index fa1ebbb6d2..ea6828b973 100755
--- a/include/exec/windbgstub-utils.h
+++ b/include/exec/windbgstub-utils.h
@@ -106,6 +106,8 @@  void kd_api_search_memory(CPUState *cpu, PacketData *pd);
 void kd_api_fill_memory(CPUState *cpu, PacketData *pd);
 void kd_api_unsupported(CPUState *cpu, PacketData *pd);
 void kd_api_query_memory(CPUState *cpu, PacketData *pd);
+void kd_api_get_context_ex(CPUState *cpu, PacketData *pd);
+void kd_api_set_context_ex(CPUState *cpu, PacketData *pd);
 
 SizedBuf kd_gen_exception_sc(CPUState *cpu);
 SizedBuf kd_gen_load_symbols_sc(CPUState *cpu);
diff --git a/target/i386/windbgstub.c b/target/i386/windbgstub.c
index 735b2edd5f..aca4bfedec 100755
--- a/target/i386/windbgstub.c
+++ b/target/i386/windbgstub.c
@@ -899,6 +899,52 @@  static int windbg_write_ks_regs(CPUState *cpu, uint8_t *buf, int buf_size,
     return 0;
 }
 
+static int windbg_rw_context_ex(CPUState *cpu, uint8_t *buf, int buf_size,
+                                int offset, int len, bool is_read)
+{
+    uint32_t context_len;
+    uint32_t ks_regs_len;
+    int err = -1;
+
+    if (offset < sizeof(CPU_KPROCESSOR_STATE)) {
+        len = MIN(len, sizeof(CPU_KPROCESSOR_STATE) - offset);
+
+        context_len = MAX(0, (int) (sizeof(CPU_CONTEXT) - offset));
+        ks_regs_len = len - context_len;
+
+        if (context_len > 0) {
+            if (is_read) {
+                err = windbg_read_context(cpu, buf, context_len, offset,
+                                          context_len);
+            } else {
+                err = windbg_write_context(cpu, buf, context_len, offset,
+                                           context_len);
+            }
+
+            if (err) {
+                return err;
+            }
+        }
+
+        if (ks_regs_len > 0) {
+            offset += context_len - sizeof(CPU_CONTEXT);
+            if (is_read) {
+                err = windbg_read_ks_regs(cpu, buf + context_len, ks_regs_len,
+                                          offset, ks_regs_len);
+            } else {
+                err = windbg_write_ks_regs(cpu, buf + context_len, ks_regs_len,
+                                           offset, ks_regs_len);
+            }
+
+            if (err) {
+                return err;
+            }
+        }
+    }
+
+    return err;
+}
+
 void kd_api_get_context(CPUState *cpu, PacketData *pd)
 {
     int err;
@@ -930,31 +976,14 @@  void kd_api_read_control_space(CPUState *cpu, PacketData *pd)
 {
     DBGKD_READ_MEMORY64 *mem = &pd->m64.u.ReadMemory;
     uint32_t len;
-    uint32_t context_len;
-    uint32_t ks_regs_len;
     target_ulong addr;
-    int err = -1;
+    int err;
 
     len = MIN(ldl_p(&mem->TransferCount),
               PACKET_MAX_SIZE - sizeof(DBGKD_MANIPULATE_STATE64));
     addr = ldtul_p(&mem->TargetBaseAddress);
 
-    if (addr < sizeof(CPU_KPROCESSOR_STATE)) {
-        len = MIN(len, sizeof(CPU_KPROCESSOR_STATE) - addr);
-
-        context_len = MAX(0, (int) (sizeof(CPU_CONTEXT) - addr));
-        ks_regs_len = len - context_len;
-
-        if (context_len > 0) {
-            err = windbg_read_context(cpu, pd->extra, context_len, addr,
-                                      context_len);
-        }
-        if (ks_regs_len > 0) {
-            addr = addr - sizeof(CPU_CONTEXT) + context_len;
-            err = windbg_read_ks_regs(cpu, pd->extra + context_len,
-                                      ks_regs_len, addr, ks_regs_len);
-        }
-    }
+    err = windbg_rw_context_ex(cpu, pd->extra, len, addr, len, true);
 
     if (err) {
         len = 0;
@@ -969,38 +998,64 @@  void kd_api_write_control_space(CPUState *cpu, PacketData *pd)
 {
     DBGKD_WRITE_MEMORY64 *mem = &pd->m64.u.WriteMemory;
     uint32_t len;
-    uint32_t context_len;
-    uint32_t ks_regs_len;
     target_ulong addr;
-    int err = -1;
+    int err;
 
     len = MIN(ldl_p(&mem->TransferCount), pd->extra_size);
     addr = ldtul_p(&mem->TargetBaseAddress);
 
-    if (addr < sizeof(CPU_KPROCESSOR_STATE)) {
-        len = MIN(len, sizeof(CPU_KPROCESSOR_STATE) - addr);
+    err = windbg_rw_context_ex(cpu, pd->extra, len, addr, len, false);
 
-        context_len = MAX(0, (int) (sizeof(CPU_CONTEXT) - addr));
-        ks_regs_len = len - context_len;
+    if (err) {
+        len = 0;
+        pd->m64.ReturnStatus = STATUS_UNSUCCESSFUL;
+    }
 
-        if (context_len > 0) {
-            err = windbg_write_context(cpu, pd->extra, context_len, addr,
-                                       context_len);
-        }
-        if (ks_regs_len > 0) {
-            addr = addr - sizeof(CPU_CONTEXT) + context_len;
-            err = windbg_write_ks_regs(cpu, pd->extra + context_len,
-                                       ks_regs_len, addr, ks_regs_len);
-        }
+    pd->extra_size = 0;
+    stl_p(&mem->ActualBytesWritten, len);
+}
+
+void kd_api_get_context_ex(CPUState *cpu, PacketData *pd)
+{
+    DBGKD_CONTEXT_EX *ctx = &pd->m64.u.ContextEx;
+    uint32_t offset;
+    uint32_t len;
+    int err;
+
+    len = MIN(ldl_p(&ctx->ByteCount),
+              PACKET_MAX_SIZE - sizeof(DBGKD_MANIPULATE_STATE64));
+    offset = ldl_p(&ctx->Offset);
+
+    err = windbg_rw_context_ex(cpu, pd->extra, len, offset, len, true);
+
+    if (err) {
+        len = 0;
+        pd->m64.ReturnStatus = STATUS_UNSUCCESSFUL;
     }
 
+    pd->extra_size = len;
+    stl_p(&ctx->BytesCopied, len);
+}
+
+void kd_api_set_context_ex(CPUState *cpu, PacketData *pd)
+{
+    DBGKD_CONTEXT_EX *ctx = &pd->m64.u.ContextEx;
+    uint32_t offset;
+    uint32_t len;
+    int err;
+
+    len = MIN(ldl_p(&ctx->ByteCount), pd->extra_size);
+    offset = ldl_p(&ctx->Offset);
+
+    err = windbg_rw_context_ex(cpu, pd->extra, len, offset, len, false);
+
     if (err) {
-        mem->ActualBytesWritten = 0;
+        len = 0;
         pd->m64.ReturnStatus = STATUS_UNSUCCESSFUL;
     }
 
     pd->extra_size = 0;
-    stl_p(&mem->ActualBytesWritten, len);
+    stl_p(&ctx->BytesCopied, len);
 }
 
 void kd_api_read_msr(CPUState *cpu, PacketData *pd)
diff --git a/windbgstub.c b/windbgstub.c
index 36372c0ea5..3bcf6a8cbb 100755
--- a/windbgstub.c
+++ b/windbgstub.c
@@ -224,6 +224,14 @@  static void windbg_process_manipulate_packet(ParsingContext *ctx)
         kd_api_query_memory(cpu, &ctx->data);
         break;
 
+    case DbgKdGetContextExApi:
+        kd_api_get_context_ex(cpu, &ctx->data);
+        break;
+
+    case DbgKdSetContextExApi:
+        kd_api_set_context_ex(cpu, &ctx->data);
+        break;
+
     default:
         kd_api_unsupported(cpu, &ctx->data);
         break;
@@ -262,12 +270,12 @@  static void windbg_process_control_packet(ParsingContext *ctx)
 
     case PACKET_TYPE_KD_RESET:
     {
-        SizedBuf buf = kd_gen_load_symbols_sc(qemu_get_cpu(0));
+        windbg_send_control_packet(ctx->packet.PacketType);
+        windbg_state->ctrl_packet_id = INITIAL_PACKET_ID;
 
+        SizedBuf buf = kd_gen_load_symbols_sc(qemu_get_cpu(0));
         windbg_send_data_packet(buf.data, buf.size,
                                 PACKET_TYPE_KD_STATE_CHANGE64);
-        windbg_send_control_packet(ctx->packet.PacketType);
-        windbg_state->ctrl_packet_id = INITIAL_PACKET_ID;
         SBUF_FREE(buf);
         break;
     }