From nobody Tue Feb 10 19:15:35 2026 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.zohomail.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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1513000733875859.2228927005012; Mon, 11 Dec 2017 05:58:53 -0800 (PST) Received: from localhost ([::1]:53205 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eOObT-0006fD-A8 for importer@patchew.org; Mon, 11 Dec 2017 08:58:43 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35072) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eOO5b-0004i0-7h for qemu-devel@nongnu.org; Mon, 11 Dec 2017 08:25:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eOO5a-0004D3-0u for qemu-devel@nongnu.org; Mon, 11 Dec 2017 08:25:47 -0500 Received: from mail.ispras.ru ([83.149.199.45]:44268) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eOO5Z-0004CX-JR for qemu-devel@nongnu.org; Mon, 11 Dec 2017 08:25:45 -0500 Received: from Misha-PC.lan02.inno (unknown [85.142.117.226]) by mail.ispras.ru (Postfix) with ESMTPSA id CAEC754006A; Mon, 11 Dec 2017 16:25:44 +0300 (MSK) From: Mihail Abakumov To: qemu-devel@nongnu.org Date: Mon, 11 Dec 2017 16:25:30 +0300 Message-ID: <151299873015.4808.852301373622214381.stgit@Misha-PC.lan02.inno> In-Reply-To: <151299847127.4808.14646046517426494416.stgit@Misha-PC.lan02.inno> References: <151299847127.4808.14646046517426494416.stgit@Misha-PC.lan02.inno> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 83.149.199.45 Subject: [Qemu-devel] [PATCH v4 44/46] windbg: implemented kd_api_get_context_ex and kd_api_set_context_ex 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: sw@weilnetz.de, lprosek@redhat.com, dovgaluk@ispras.ru, rkagan@virtuozzo.com, pbonzini@redhat.com, den@openvz.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Signed-off-by: Mihail Abakumov Signed-off-by: Pavel Dovgalyuk Signed-off-by: Dmitriy Koltunov --- include/exec/windbgstub-utils.h | 2 + target/i386/windbgstub.c | 130 ++++++++++++++++++++++++++++-------= ---- windbgstub.c | 14 +++- 3 files changed, 106 insertions(+), 40 deletions(-) diff --git a/include/exec/windbgstub-utils.h b/include/exec/windbgstub-util= s.h index 8d36354b7c..d3e737e031 100755 --- a/include/exec/windbgstub-utils.h +++ b/include/exec/windbgstub-utils.h @@ -94,6 +94,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); =20 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 7985dcfaf0..96cb015752 100755 --- a/target/i386/windbgstub.c +++ b/target/i386/windbgstub.c @@ -903,6 +903,52 @@ static int windbg_write_ks_regs(CPUState *cpu, uint8_t= *buf, int buf_size, return 0; } =20 +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 =3D -1; + + if (offset < sizeof(CPU_KPROCESSOR_STATE)) { + len =3D MIN(len, sizeof(CPU_KPROCESSOR_STATE) - offset); + + context_len =3D MAX(0, (int) (sizeof(CPU_CONTEXT) - offset)); + ks_regs_len =3D len - context_len; + + if (context_len > 0) { + if (is_read) { + err =3D windbg_read_context(cpu, buf, context_len, offset, + context_len); + } else { + err =3D windbg_write_context(cpu, buf, context_len, offset, + context_len); + } + + if (err) { + return err; + } + } + + if (ks_regs_len > 0) { + offset +=3D context_len - sizeof(CPU_CONTEXT); + if (is_read) { + err =3D windbg_read_ks_regs(cpu, buf + context_len, ks_reg= s_len, + offset, ks_regs_len); + } else { + err =3D windbg_write_ks_regs(cpu, buf + context_len, ks_re= gs_len, + offset, ks_regs_len); + } + + if (err) { + return err; + } + } + } + + return err; +} + void kd_api_get_context(CPUState *cpu, PacketData *pd) { int err; @@ -934,31 +980,14 @@ void kd_api_read_control_space(CPUState *cpu, PacketD= ata *pd) { DBGKD_READ_MEMORY64 *mem =3D &pd->m64.u.ReadMemory; uint32_t len; - uint32_t context_len; - uint32_t ks_regs_len; target_ulong addr; - int err =3D -1; + int err; =20 len =3D MIN(ldl_p(&mem->TransferCount), PACKET_MAX_SIZE - sizeof(DBGKD_MANIPULATE_STATE64)); addr =3D ldtul_p(&mem->TargetBaseAddress); =20 - if (addr < sizeof(CPU_KPROCESSOR_STATE)) { - len =3D MIN(len, sizeof(CPU_KPROCESSOR_STATE) - addr); - - context_len =3D MAX(0, (int) (sizeof(CPU_CONTEXT) - addr)); - ks_regs_len =3D len - context_len; - - if (context_len > 0) { - err =3D windbg_read_context(cpu, pd->extra, context_len, addr, - context_len); - } - if (ks_regs_len > 0) { - addr =3D addr - sizeof(CPU_CONTEXT) + context_len; - err =3D windbg_read_ks_regs(cpu, pd->extra + context_len, - ks_regs_len, addr, ks_regs_len); - } - } + err =3D windbg_rw_context_ex(cpu, pd->extra, len, addr, len, true); =20 if (err) { len =3D 0; @@ -973,38 +1002,64 @@ void kd_api_write_control_space(CPUState *cpu, Packe= tData *pd) { DBGKD_WRITE_MEMORY64 *mem =3D &pd->m64.u.WriteMemory; uint32_t len; - uint32_t context_len; - uint32_t ks_regs_len; target_ulong addr; - int err =3D -1; + int err; =20 len =3D MIN(ldl_p(&mem->TransferCount), pd->extra_size); addr =3D ldtul_p(&mem->TargetBaseAddress); =20 - if (addr < sizeof(CPU_KPROCESSOR_STATE)) { - len =3D MIN(len, sizeof(CPU_KPROCESSOR_STATE) - addr); + err =3D windbg_rw_context_ex(cpu, pd->extra, len, addr, len, false); =20 - context_len =3D MAX(0, (int) (sizeof(CPU_CONTEXT) - addr)); - ks_regs_len =3D len - context_len; + if (err) { + len =3D 0; + pd->m64.ReturnStatus =3D STATUS_UNSUCCESSFUL; + } =20 - if (context_len > 0) { - err =3D windbg_write_context(cpu, pd->extra, context_len, addr, - context_len); - } - if (ks_regs_len > 0) { - addr =3D addr - sizeof(CPU_CONTEXT) + context_len; - err =3D windbg_write_ks_regs(cpu, pd->extra + context_len, - ks_regs_len, addr, ks_regs_len); - } + pd->extra_size =3D 0; + stl_p(&mem->ActualBytesWritten, len); +} + +void kd_api_get_context_ex(CPUState *cpu, PacketData *pd) +{ + DBGKD_CONTEXT_EX *ctx =3D &pd->m64.u.ContextEx; + uint32_t offset; + uint32_t len; + int err; + + len =3D MIN(ldl_p(&ctx->ByteCount), + PACKET_MAX_SIZE - sizeof(DBGKD_MANIPULATE_STATE64)); + offset =3D ldl_p(&ctx->Offset); + + err =3D windbg_rw_context_ex(cpu, pd->extra, len, offset, len, true); + + if (err) { + len =3D 0; + pd->m64.ReturnStatus =3D STATUS_UNSUCCESSFUL; } =20 + pd->extra_size =3D len; + stl_p(&ctx->BytesCopied, len); +} + +void kd_api_set_context_ex(CPUState *cpu, PacketData *pd) +{ + DBGKD_CONTEXT_EX *ctx =3D &pd->m64.u.ContextEx; + uint32_t offset; + uint32_t len; + int err; + + len =3D MIN(ldl_p(&ctx->ByteCount), pd->extra_size); + offset =3D ldl_p(&ctx->Offset); + + err =3D windbg_rw_context_ex(cpu, pd->extra, len, offset, len, false); + if (err) { - mem->ActualBytesWritten =3D 0; + len =3D 0; pd->m64.ReturnStatus =3D STATUS_UNSUCCESSFUL; } =20 pd->extra_size =3D 0; - stl_p(&mem->ActualBytesWritten, len); + stl_p(&ctx->BytesCopied, len); } =20 #if defined(CONFIG_USER_ONLY) @@ -1334,6 +1389,7 @@ void kd_api_write_msr(CPUState *cpu, PacketData *pd) =20 pd->m64.ReturnStatus =3D STATUS_SUCCESS; } +#endif =20 bool windbg_on_load(void) { diff --git a/windbgstub.c b/windbgstub.c index f0930f20a8..a458b962de 100755 --- a/windbgstub.c +++ b/windbgstub.c @@ -224,6 +224,14 @@ static void windbg_process_manipulate_packet(ParsingCo= ntext *ctx) kd_api_query_memory(cpu, &ctx->data); break; =20 + 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,13 +270,13 @@ static void windbg_process_control_packet(ParsingCont= ext *ctx) =20 case PACKET_TYPE_KD_RESET: { + windbg_send_control_packet(ctx->packet.PacketType); + windbg_state->ctrl_packet_id =3D INITIAL_PACKET_ID; + SizedBuf buf =3D kd_gen_load_symbols_sc(qemu_get_cpu(0)); windbg_send_data_packet(buf.data, buf.size, PACKET_TYPE_KD_STATE_CHANGE64); g_free(buf.data); - - windbg_send_control_packet(ctx->packet.PacketType); - windbg_state->ctrl_packet_id =3D INITIAL_PACKET_ID; break; } default: