From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 90A5FC4338F for ; Tue, 10 Aug 2021 10:14:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7768F6108F for ; Tue, 10 Aug 2021 10:14:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239791AbhHJKPG (ORCPT ); Tue, 10 Aug 2021 06:15:06 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:48325 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239780AbhHJKPE (ORCPT ); Tue, 10 Aug 2021 06:15:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1628590482; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=A42WvvsgdwjkwZlZk69nEpIcOnUU9ZyOs8J0bgwxJg8=; b=Ss4fy/PLexcOVUleBPG0nv+WatgqfFkYJYOXspN9Unv0MHnJsnWCukCd+7D/wf5oqxUAHq QQnxF6pNKHdR6PPtzjOtVQtsqpWSjghEcDVRlL7JWEpJUrt6DO9aabyT84jujnErzHBoQk n8uMlnSPpWNjQJTAlRb0J6SKzoPCCeY= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-406-3dN3pw3KNQyeTjHYzb6OUw-1; Tue, 10 Aug 2021 06:14:40 -0400 X-MC-Unique: 3dN3pw3KNQyeTjHYzb6OUw-1 Received: by mail-ed1-f69.google.com with SMTP id p2-20020a50c9420000b02903a12bbba1ebso10491049edh.6 for ; Tue, 10 Aug 2021 03:14:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=A42WvvsgdwjkwZlZk69nEpIcOnUU9ZyOs8J0bgwxJg8=; b=OAt5Z4hWKR3srk0rzgM5f9y/K6ZfScTWc4Q6MhHMbSO8cBltt+bJCtKwdckRexDJuN 8FBed1CHtkpxy1fcJBzMwIvm+lEJJ//QkMSrmFI5xgEg0mFgZKDiOasN/CUO4lALZiuy vf+qusw4LjmdeFdvG+TlqTbhWE52AgLBTUyfjZAYHHe5gEtyHxtoc1HfyIP2Mg5+UIjH PIemQUID3hyETD3vulywLbMC3Ni/wTL5edIYILN/Ewsd9hTagm3PZkrEMY7fnR0njzw3 11vp8YKdgoJlFjbX7kYZnSuHcMHyf3K66Ac3bPIryY2qC9t4PSsilpe/mLBA1DdeGLeh LwLw== X-Gm-Message-State: AOAM531EXhy2E19QxNS05FeKq1XAB1XQJP0YQYEQDtiFkXcP3GD34/UK 0p4/sl5f5s4x2sl1c1gE9sW4P5bgRwZL6i6wAsOF4QiaON0LxUc5aYzEQmcEfKK1EW+YwcPViJx 1HXT17VysoDL6ULBl1+1Nenyc X-Received: by 2002:a17:906:410c:: with SMTP id j12mr4943738ejk.553.1628590479574; Tue, 10 Aug 2021 03:14:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyPsmFryraUujm14vlfLq082aKn28Q0FPYdy2YVFyu0Ghw/NOtkyi4/HcVIa689iLhOoNqCng== X-Received: by 2002:a17:906:410c:: with SMTP id j12mr4943712ejk.553.1628590479302; Tue, 10 Aug 2021 03:14:39 -0700 (PDT) Received: from ?IPv6:2001:b07:6468:f312:63a7:c72e:ea0e:6045? ([2001:b07:6468:f312:63a7:c72e:ea0e:6045]) by smtp.gmail.com with ESMTPSA id bm1sm6713471ejb.38.2021.08.10.03.14.37 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 10 Aug 2021 03:14:38 -0700 (PDT) Subject: Re: [PATCH V2 3/3] KVM: X86: Reset DR6 only when KVM_DEBUGREG_WONT_EXIT To: Lai Jiangshan , linux-kernel@vger.kernel.org Cc: Lai Jiangshan , Sean Christopherson , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, "H. Peter Anvin" , kvm@vger.kernel.org References: <20210809174307.145263-1-jiangshanlai@gmail.com> <20210809174307.145263-3-jiangshanlai@gmail.com> From: Paolo Bonzini Message-ID: Date: Tue, 10 Aug 2021 12:14:37 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <20210809174307.145263-3-jiangshanlai@gmail.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 09/08/21 19:43, Lai Jiangshan wrote: > From: Lai Jiangshan > > The commit efdab992813fb ("KVM: x86: fix escape of guest dr6 to the host") > fixed a bug by reseting DR6 unconditionally when the vcpu being scheduled out. > > But writing to debug registers is slow, and it can be shown in perf results > sometimes even neither the host nor the guest activate breakpoints. > > It'd be better to reset it conditionally and this patch moves the code of > reseting DR6 to the path of VM-exit and only reset it when > KVM_DEBUGREG_WONT_EXIT which is the only case that DR6 is guest value. > > Signed-off-by: Lai Jiangshan > --- > arch/x86/kvm/x86.c | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c > index d2aa49722064..f40cdd7687d8 100644 > --- a/arch/x86/kvm/x86.c > +++ b/arch/x86/kvm/x86.c > @@ -4309,12 +4309,6 @@ void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu) > > static_call(kvm_x86_vcpu_put)(vcpu); > vcpu->arch.last_host_tsc = rdtsc(); > - /* > - * If userspace has set any breakpoints or watchpoints, dr6 is restored > - * on every vmexit, but if not, we might have a stale dr6 from the > - * guest. do_debug expects dr6 to be cleared after it runs, do the same. > - */ > - set_debugreg(0, 6); > } > > static int kvm_vcpu_ioctl_get_lapic(struct kvm_vcpu *vcpu, > @@ -9630,6 +9624,8 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu) > static_call(kvm_x86_sync_dirty_debug_regs)(vcpu); > kvm_update_dr0123(vcpu); > kvm_update_dr7(vcpu); > + /* Reset Dr6 which is guest value. */ > + set_debugreg(DR6_RESERVED, 6); > } > > /* > ... and this should also be done exclusively for VMX, in vmx_sync_dirty_debug_regs: KVM: VMX: Reset DR6 only when KVM_DEBUGREG_WONT_EXIT The commit efdab992813fb ("KVM: x86: fix escape of guest dr6 to the host") fixed a bug by resetting DR6 unconditionally when the vcpu being scheduled out. But writing to debug registers is slow, and it can be visible in perf results sometimes, even if neither the host nor the guest activate breakpoints. Since KVM_DEBUGREG_WONT_EXIT on Intel processors is the only case where DR6 gets the guest value, and it never happens at all on SVM, the register can be cleared in vmx.c right after reading it. Reported-by: Lai Jiangshan Signed-off-by: Paolo Bonzini diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index 21a3ef3012cf..3a91302d05c0 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -5110,6 +5110,12 @@ static void vmx_sync_dirty_debug_regs(struct kvm_vcpu *vcpu) vcpu->arch.switch_db_regs &= ~KVM_DEBUGREG_WONT_EXIT; exec_controls_setbit(to_vmx(vcpu), CPU_BASED_MOV_DR_EXITING); + + /* + * do_debug expects dr6 to be cleared after it runs, avoid that it sees + * a stale dr6 from the guest. + */ + set_debugreg(DR6_RESERVED, 6); } static void vmx_set_dr7(struct kvm_vcpu *vcpu, unsigned long val) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index fbc536b21585..04c393551fb0 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -4313,12 +4313,6 @@ void kvm_arch_vcpu_put(struct kvm_vcpu *vcpu) static_call(kvm_x86_vcpu_put)(vcpu); vcpu->arch.last_host_tsc = rdtsc(); - /* - * If userspace has set any breakpoints or watchpoints, dr6 is restored - * on every vmexit, but if not, we might have a stale dr6 from the - * guest. do_debug expects dr6 to be cleared after it runs, do the same. - */ - set_debugreg(0, 6); } static int kvm_vcpu_ioctl_get_lapic(struct kvm_vcpu *vcpu, Paolo