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=-6.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, HK_RANDOM_FROM,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,UNWANTED_LANGUAGE_BODY,USER_AGENT_GIT 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 944BFC2BB85 for ; Thu, 16 Apr 2020 10:35:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 721B421973 for ; Thu, 16 Apr 2020 10:35:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2505145AbgDPKfQ (ORCPT ); Thu, 16 Apr 2020 06:35:16 -0400 Received: from mga01.intel.com ([192.55.52.88]:46605 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2505097AbgDPKeC (ORCPT ); Thu, 16 Apr 2020 06:34:02 -0400 IronPort-SDR: tKTQGJ1hQI7xoal+PAS6ZiNdOXg5na9yp4sV3S/Vit4KwF2E3RMt/RB2+7NrsdaGCF3THanvF/ KdtHa8tuQqnw== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Apr 2020 03:33:29 -0700 IronPort-SDR: JvzddcKGvjliYl2cvOvoOesY9Om7KNGV4b/0is+8tvoi2stVDHbVm1Dz10URsWVpRAGtuhOGmr EJcN4MFuyU3A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,390,1580803200"; d="scan'208";a="277947904" Received: from lxy-clx-4s.sh.intel.com ([10.239.43.132]) by fmsmga004.fm.intel.com with ESMTP; 16 Apr 2020 03:33:27 -0700 From: Xiaoyao Li To: Paolo Bonzini , Sean Christopherson , kvm@vger.kernel.org Cc: Nadav Amit , Vitaly Kuznetsov , linux-kernel@vger.kernel.org, Xiaoyao Li Subject: [RFC PATCH 2/3] kvm: x86: Use KVM_DEBUGREG_NEED_RELOAD instead of KVM_DEBUGREG_BP_ENABLED Date: Thu, 16 Apr 2020 18:15:08 +0800 Message-Id: <20200416101509.73526-3-xiaoyao.li@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200416101509.73526-1-xiaoyao.li@intel.com> References: <20200416101509.73526-1-xiaoyao.li@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Once any #BP enabled in DR7, it will set KVM_DEBUGREG_BP_ENABLED, which leads to reload DRn before every VM entry even if none of DRn changed. Drop KVM_DEBUGREG_BP_ENABLED flag and set KVM_DEBUGREG_NEED_RELOAD flag for the cases that DRn need to be reloaded instead, to avoid unnecessary DRn reload. Signed-off-by: Xiaoyao Li --- arch/x86/include/asm/kvm_host.h | 3 +-- arch/x86/kvm/x86.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index f465c76e6e5a..87e2d020351e 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -509,9 +509,8 @@ struct kvm_pmu { struct kvm_pmu_ops; enum { - KVM_DEBUGREG_BP_ENABLED = 1, + KVM_DEBUGREG_NEED_RELOAD = 1, KVM_DEBUGREG_WONT_EXIT = 2, - KVM_DEBUGREG_NEED_RELOAD = 4, }; struct kvm_mtrr_range { diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index cce926658d10..71264df64001 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -1086,9 +1086,8 @@ static void kvm_update_dr7(struct kvm_vcpu *vcpu) else dr7 = vcpu->arch.dr7; kvm_x86_ops.set_dr7(vcpu, dr7); - vcpu->arch.switch_db_regs &= ~KVM_DEBUGREG_BP_ENABLED; if (dr7 & DR7_BP_EN_MASK) - vcpu->arch.switch_db_regs |= KVM_DEBUGREG_BP_ENABLED; + vcpu->arch.switch_db_regs |= KVM_DEBUGREG_NEED_RELOAD; } static u64 kvm_dr6_fixed(struct kvm_vcpu *vcpu) @@ -1128,6 +1127,7 @@ static int __kvm_set_dr(struct kvm_vcpu *vcpu, int dr, unsigned long val) break; } + vcpu->arch.switch_db_regs |= KVM_DEBUGREG_NEED_RELOAD; return 0; } -- 2.20.1