[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <4AF6FEDE.5030807@web.de>
Date: Sun, 08 Nov 2009 18:24:46 +0100
From: Jan Kiszka <jan.kiszka@....de>
To: Frederic Weisbecker <fweisbec@...il.com>
CC: Ingo Molnar <mingo@...e.hu>, LKML <linux-kernel@...r.kernel.org>,
Li Zefan <lizf@...fujitsu.com>,
Prasad <prasad@...ux.vnet.ibm.com>,
Alan Stern <stern@...land.harvard.edu>,
Peter Zijlstra <peterz@...radead.org>,
Arnaldo Carvalho de Melo <acme@...hat.com>,
Steven Rostedt <rostedt@...dmis.org>,
Jiri Slaby <jirislaby@...il.com>, Avi Kivity <avi@...hat.com>,
Paul Mackerras <paulus@...ba.org>,
Mike Galbraith <efault@....de>,
Masami Hiramatsu <mhiramat@...hat.com>,
Paul Mundt <lethal@...ux-sh.org>,
Arjan van de Ven <arjan@...ux.intel.com>
Subject: Re: [PATCH 5/7 v6] hw-breakpoints: Rewrite the hw-breakpoints layer
on top of perf events
Frederic Weisbecker wrote:
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index fc2974a..22dee7a 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -42,6 +42,7 @@
> #define CREATE_TRACE_POINTS
> #include "trace.h"
>
> +#include <asm/debugreg.h>
> #include <asm/uaccess.h>
> #include <asm/msr.h>
> #include <asm/desc.h>
> @@ -3643,14 +3644,15 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
> trace_kvm_entry(vcpu->vcpu_id);
> kvm_x86_ops->run(vcpu, kvm_run);
>
> - if (unlikely(vcpu->arch.switch_db_regs || test_thread_flag(TIF_DEBUG))) {
> - set_debugreg(current->thread.debugreg[0], 0);
> - set_debugreg(current->thread.debugreg[1], 1);
> - set_debugreg(current->thread.debugreg[2], 2);
> - set_debugreg(current->thread.debugreg[3], 3);
> - set_debugreg(current->thread.debugreg6, 6);
> - set_debugreg(current->thread.debugreg7, 7);
> - }
> + /*
> + * If the guest has used debug registers, at least dr7
> + * will be disabled while returning to the host.
> + * If we don't have active breakpoints in the host, we don't
> + * care about the messed up debug address registers. But if
> + * we have some of them active, restore the old state.
> + */
> + if (__get_cpu_var(dr7) & DR_GLOBAL_ENABLE_MASK)
Looks good, just a minor remark: Would be cleaner to wrap this into an
inline function, say hw_breakpoint_active(), to abstract the precise
condition away from KVM.
> + hw_breakpoint_restore();
>
> set_bit(KVM_REQ_KICK, &vcpu->requests);
> local_irq_enable();
Will see that I can give your series a try the next days, probably
debugging qemu-kvm while running a guest that uses breakpoints. But I
don't expect surprises.
Jan
Download attachment "signature.asc" of type "application/pgp-signature" (258 bytes)
Powered by blists - more mailing lists