Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp1513731ybz; Thu, 16 Apr 2020 10:28:14 -0700 (PDT) X-Google-Smtp-Source: APiQypKwtexqC2OVtLxHPGhRauthh34kBtX4+ncH4SQSH5S9Tco9dzjkV+Z8VtErwaSBh3VPMUUQ X-Received: by 2002:a17:906:4ecb:: with SMTP id i11mr10359534ejv.79.1587058094011; Thu, 16 Apr 2020 10:28:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587058094; cv=none; d=google.com; s=arc-20160816; b=Yw7n+MSfGUUAIOrIAcL/DHdUtBCQ7EwCvPexbUuStIl+zagfNiPyvCUNbRKAfXNaRn HEBQfF+IGBCpt1oEdZZqMgpynjlkAqd6tEiZhlZ9r9CdPgv7zrqz0VFFeqsCyrVEyw9G RYxIxwJuVeE4+ZrKvV4wttvRNDxK2uREMDYn3VKR+WT/vadR3BjsRWtHnb9+RXGsY367 efUF9SEmS7GBjpkFLe/EifNvGBnK5MHfrXB5pxMuHA+wgCJBEorfdLsmZc6vaWdT29Ae /CngM9S/2nao2vBZR52cJvdCkk2vvhth+7AxFhKyss+mdNyS5HcLQIzNn7cfBSMKVkNj iVoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :ironport-sdr:ironport-sdr; bh=aHgQqZjDynoOLbqUE6RT5IbP3W4EJ65cVAIf/UbdgQw=; b=e1aF2rCMs+8jgffoSqKZsZT9yyicmqqfMRrNZVuCacBGqySzj8lL0S23LTA8snv/H4 wRJFYVFj0tziA2zvFxu+k2F7r8xY5Q0GvqKhInlS1LltSfBLM/zZuDu0ePeHCCK8D9kA 2nDwsgMcElmOfbeHgnKcMlhU+ys/X1FYIfB5UV1XpLq1kFo8kApw4/f9anqDPPT7PD9G WEtTiy5eLb7LgrZJM/M8ynl6DZa8Rl8eOqDk6vUlcWVrYUhCpH0yPADnaB+1zKjZXwGr 7M2i0EyWyxDw8vVO8jpsK3wLtAxax4uKDwf+g7X+cXh62kQ5e6hvGEAeg9+dWQVpQedK ufkQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p31si11779182edb.495.2020.04.16.10.27.50; Thu, 16 Apr 2020 10:28:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2506589AbgDPLp7 (ORCPT + 99 others); Thu, 16 Apr 2020 07:45:59 -0400 Received: from mga01.intel.com ([192.55.52.88]:46619 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2504914AbgDPKdi (ORCPT ); Thu, 16 Apr 2020 06:33:38 -0400 IronPort-SDR: CBFc0+RD/rxjCamx/CRPEvlO6bTrJVUX4OIwq8jHiIvt3Rvp6XRL3YygupM8qsk+0JJ4zR+pQB qT1GHhZyJ7JA== 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:27 -0700 IronPort-SDR: GM7QgTRxLZxNtY5oDGeuldEujPWqCiRNQBU2Z1aqO/DnlR2z2n87sj4SRohvLHQLhs+KMo2hax VASDiE9UKVsA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,390,1580803200"; d="scan'208";a="277947896" Received: from lxy-clx-4s.sh.intel.com ([10.239.43.132]) by fmsmga004.fm.intel.com with ESMTP; 16 Apr 2020 03:33:26 -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 1/3] kvm: x86: Rename KVM_DEBUGREG_RELOAD to KVM_DEBUGREG_NEED_RELOAD Date: Thu, 16 Apr 2020 18:15:07 +0800 Message-Id: <20200416101509.73526-2-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 To make it more clear that the flag means DRn (except DR7) need to be reloaded before vm entry. Signed-off-by: Xiaoyao Li --- arch/x86/include/asm/kvm_host.h | 2 +- arch/x86/kvm/x86.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index c7da23aed79a..f465c76e6e5a 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -511,7 +511,7 @@ struct kvm_pmu_ops; enum { KVM_DEBUGREG_BP_ENABLED = 1, KVM_DEBUGREG_WONT_EXIT = 2, - KVM_DEBUGREG_RELOAD = 4, + KVM_DEBUGREG_NEED_RELOAD = 4, }; struct kvm_mtrr_range { diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index de77bc9bd0d7..cce926658d10 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -1067,7 +1067,7 @@ static void kvm_update_dr0123(struct kvm_vcpu *vcpu) if (!(vcpu->guest_debug & KVM_GUESTDBG_USE_HW_BP)) { for (i = 0; i < KVM_NR_DB_REGS; i++) vcpu->arch.eff_db[i] = vcpu->arch.db[i]; - vcpu->arch.switch_db_regs |= KVM_DEBUGREG_RELOAD; + vcpu->arch.switch_db_regs |= KVM_DEBUGREG_NEED_RELOAD; } } @@ -8407,7 +8407,7 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu) set_debugreg(vcpu->arch.eff_db[2], 2); set_debugreg(vcpu->arch.eff_db[3], 3); set_debugreg(vcpu->arch.dr6, 6); - vcpu->arch.switch_db_regs &= ~KVM_DEBUGREG_RELOAD; + vcpu->arch.switch_db_regs &= ~KVM_DEBUGREG_NEED_RELOAD; } kvm_x86_ops.run(vcpu); @@ -8424,7 +8424,7 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu) kvm_update_dr0123(vcpu); kvm_update_dr6(vcpu); kvm_update_dr7(vcpu); - vcpu->arch.switch_db_regs &= ~KVM_DEBUGREG_RELOAD; + vcpu->arch.switch_db_regs &= ~KVM_DEBUGREG_NEED_RELOAD; } /* -- 2.20.1