[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] KVM: x86: do not fail if software breakpoint has already been re
From: |
Paolo Bonzini |
Subject: |
[PATCH] KVM: x86: do not fail if software breakpoint has already been removed |
Date: |
Mon, 1 Mar 2021 12:17:24 +0100 |
If kvm_arch_remove_sw_breakpoint finds that a software breakpoint does not
have an INT3 instruction, it fails. This can happen if one sets a
software breakpoint in a kernel module and then reloads it. gdb then
thinks the breakpoint cannot be deleted and there is no way to add it
back.
Suggested-by: Maxim Levitsky <mlevitsk@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
target/i386/kvm/kvm.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c
index 0b5755e42b..c8d61daf68 100644
--- a/target/i386/kvm/kvm.c
+++ b/target/i386/kvm/kvm.c
@@ -4352,8 +4352,13 @@ int kvm_arch_remove_sw_breakpoint(CPUState *cs, struct
kvm_sw_breakpoint *bp)
{
uint8_t int3;
- if (cpu_memory_rw_debug(cs, bp->pc, &int3, 1, 0) || int3 != 0xcc ||
- cpu_memory_rw_debug(cs, bp->pc, (uint8_t *)&bp->saved_insn, 1, 1)) {
+ if (cpu_memory_rw_debug(cs, bp->pc, &int3, 1, 0)) {
+ return -EINVAL;
+ }
+ if (int3 != 0xcc) {
+ return 0;
+ }
+ if (cpu_memory_rw_debug(cs, bp->pc, (uint8_t *)&bp->saved_insn, 1, 1)) {
return -EINVAL;
}
return 0;
--
2.29.2
- [PATCH] KVM: x86: do not fail if software breakpoint has already been removed,
Paolo Bonzini <=
- Re: [PATCH] KVM: x86: do not fail if software breakpoint has already been removed, Maxim Levitsky, 2021/03/01
- Re: [PATCH] KVM: x86: do not fail if software breakpoint has already been removed, Stefano Garzarella, 2021/03/02
- Re: [PATCH] KVM: x86: do not fail if software breakpoint has already been removed, Maxim Levitsky, 2021/03/03
- Re: [PATCH] KVM: x86: do not fail if software breakpoint has already been removed, Stefano Garzarella, 2021/03/04
- Re: [PATCH] KVM: x86: do not fail if software breakpoint has already been removed, Maxim Levitsky, 2021/03/11
- Re: [PATCH] KVM: x86: do not fail if software breakpoint has already been removed, Stefano Garzarella, 2021/03/12
- Re: [PATCH] KVM: x86: do not fail if software breakpoint has already been removed, Maxim Levitsky, 2021/03/12