From: David Hildenbrand <david@redhat.com>
To: Wanpeng Li <kernellwp@gmail.com>,
linux-kernel@vger.kernel.org, kvm@vger.kernel.org
Cc: "Paolo Bonzini" <pbonzini@redhat.com>,
"Radim Krčmář" <rkrcmar@redhat.com>,
"Wanpeng Li" <wanpeng.li@hotmail.com>,
"Dmitry Vyukov" <dvyukov@google.com>
Subject: Re: [PATCH] KVM: X86: Fix host dr6 miss restore
Date: Fri, 8 Dec 2017 13:39:36 +0100 [thread overview]
Message-ID: <036e6e3d-547c-e7b3-8188-b6a1bf29fb72@redhat.com> (raw)
In-Reply-To: <1512724322-11678-1-git-send-email-wanpeng.li@hotmail.com>
On 08.12.2017 10:12, Wanpeng Li wrote:
> From: Wanpeng Li <wanpeng.li@hotmail.com>
>
> Reported by syzkaller:
>
> WARNING: CPU: 0 PID: 12927 at arch/x86/kernel/traps.c:780 do_debug+0x222/0x250
> CPU: 0 PID: 12927 Comm: syz-executor Tainted: G OE 4.15.0-rc2+ #16
> RIP: 0010:do_debug+0x222/0x250
> Call Trace:
> <#DB>
> debug+0x3e/0x70
> RIP: 0010:copy_user_enhanced_fast_string+0x10/0x20
> </#DB>
> _copy_from_user+0x5b/0x90
> SyS_timer_create+0x33/0x80
> entry_SYSCALL_64_fastpath+0x23/0x9a
>
> The syzkaller will mmap a buffer which is also the struct sigevent parameter of
> timer_create(), it will also call perf_event_open() to set a BP for the buffer,
> so when the implementation of timer_create() in kernel tries to get the struct
> sigevent parameter by copy_from_user(), rep movsb triggers the BP. The syzkaller
> testcase also sets the debug registers for the guest, however, the kvm just
> restores host debug registers when we have active breakpoints. I can observe
> the dr6 single step bit is set and !hw_breakpoint_active() sporadically by print
> when running the testcase heavy multithreading. The do_debug() which is triggered
> by rep movsb will splash when (dr6 & DR_STEP && !user_mode(regs)).
>
> This patch fixes it by restoring host dr6 unconditionally before preempt/irq
> enable.
>
> Reported-by: Dmitry Vyukov <dvyukov@google.com>
> Cc: Paolo Bonzini <pbonzini@redhat.com>
> Cc: Radim Krčmář <rkrcmar@redhat.com>
> Cc: David Hildenbrand <david@redhat.com>
> Cc: Dmitry Vyukov <dvyukov@google.com>
> Signed-off-by: Wanpeng Li <wanpeng.li@hotmail.com>
> ---
> arch/x86/kvm/x86.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
> index 0c5d55c..a6370fd 100644
> --- a/arch/x86/kvm/x86.c
> +++ b/arch/x86/kvm/x86.c
> @@ -7065,6 +7065,8 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)
> */
> if (hw_breakpoint_active())
> hw_breakpoint_restore();
> + else
> + set_debugreg(current->thread.debugreg6, 6);
>
> vcpu->arch.last_guest_tsc = kvm_read_l1_tsc(vcpu, rdtsc());
>
>
If you haven't seen it, I analyzed this in
https://lkml.org/lkml/2017/11/7/638 but nobody would respond for now to
my suggestion/question.
--
Thanks,
David / dhildenb
next prev parent reply other threads:[~2017-12-08 12:39 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-08 9:12 [PATCH] KVM: X86: Fix host dr6 miss restore Wanpeng Li
2017-12-08 12:39 ` David Hildenbrand [this message]
2017-12-10 0:44 ` Wanpeng Li
2017-12-11 20:49 ` David Hildenbrand
2017-12-12 15:08 ` Paolo Bonzini
2017-12-13 3:11 ` Wanpeng Li
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=036e6e3d-547c-e7b3-8188-b6a1bf29fb72@redhat.com \
--to=david@redhat.com \
--cc=dvyukov@google.com \
--cc=kernellwp@gmail.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pbonzini@redhat.com \
--cc=rkrcmar@redhat.com \
--cc=wanpeng.li@hotmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).