Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754024AbdLUMy3 (ORCPT ); Thu, 21 Dec 2017 07:54:29 -0500 Received: from userp2120.oracle.com ([156.151.31.85]:38926 "EHLO userp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752553AbdLUMyZ (ORCPT ); Thu, 21 Dec 2017 07:54:25 -0500 Message-ID: <5A3BABE4.7050507@ORACLE.COM> Date: Thu, 21 Dec 2017 14:41:08 +0200 From: Liran Alon User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.5.0 MIME-Version: 1.0 To: Paolo Bonzini , linux-kernel@vger.kernel.org, kvm@vger.kernel.org CC: jmattson@google.com, david@redhat.com Subject: Re: [PATCH 3/3] KVM: VMX: introduce X2APIC_MSR macro References: <1513857062-44013-1-git-send-email-pbonzini@redhat.com> <1513857062-44013-4-git-send-email-pbonzini@redhat.com> In-Reply-To: <1513857062-44013-4-git-send-email-pbonzini@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=8751 signatures=668651 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=975 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1711220000 definitions=main-1712210174 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2686 Lines: 75 On 21/12/17 13:51, Paolo Bonzini wrote: > Remove duplicate expression in nested_vmx_prepare_msr_bitmap, and make > the register names clearer in hardware_setup. > > Suggested-by: Jim Mattson > Reviewed-by: Jim Mattson > Signed-off-by: Paolo Bonzini > --- > arch/x86/kvm/vmx.c | 19 +++++++++---------- > 1 file changed, 9 insertions(+), 10 deletions(-) > > diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c > index 68239aabec52..4771e9a771c4 100644 > --- a/arch/x86/kvm/vmx.c > +++ b/arch/x86/kvm/vmx.c > @@ -5257,6 +5257,8 @@ static void pt_disable_intercept_for_msr(bool flag) > } > } > > +#define X2APIC_MSR(r) (APIC_BASE_MSR + ((r) >> 4)) > + > static void vmx_disable_intercept_msr_x2apic(u32 msr, int type, bool apicv_only) > { > __vmx_disable_intercept_for_msr(vmx_msr_bitmap_legacy_x2apic_apicv, > @@ -7139,7 +7141,7 @@ static __init int hardware_setup(void) > set_bit(0, vmx_vpid_bitmap); /* 0 is reserved for host */ > > for (msr = 0x800; msr <= 0x8ff; msr++) { > - if (msr == 0x839 /* TMCCT */) > + if (msr == X2APIC_MSR(APIC_TMCCT)) > continue; > vmx_disable_intercept_msr_x2apic(msr, MSR_TYPE_R, true); > } > @@ -7148,12 +7150,9 @@ static __init int hardware_setup(void) > * TPR reads and writes can be virtualized even if virtual interrupt > * delivery is not in use. > */ > - vmx_disable_intercept_msr_x2apic(0x808, MSR_TYPE_R | MSR_TYPE_W, false); > - > - /* EOI */ > - vmx_disable_intercept_msr_x2apic(0x80b, MSR_TYPE_W, true); > - /* SELF-IPI */ > - vmx_disable_intercept_msr_x2apic(0x83f, MSR_TYPE_W, true); > + vmx_disable_intercept_msr_x2apic(X2APIC_MSR(APIC_TASKPRI), MSR_TYPE_R | MSR_TYPE_W, false); > + vmx_disable_intercept_msr_x2apic(X2APIC_MSR(APIC_EOI), MSR_TYPE_W, true); > + vmx_disable_intercept_msr_x2apic(X2APIC_MSR(APIC_SELF_IPI), MSR_TYPE_W, true); > > if (enable_ept) > vmx_enable_tdp(); > @@ -10347,17 +10346,17 @@ static inline bool nested_vmx_prepare_msr_bitmap(struct kvm_vcpu *vcpu, > > nested_vmx_disable_intercept_for_msr( > msr_bitmap_l1, msr_bitmap_l0, > - APIC_BASE_MSR + (APIC_TASKPRI >> 4), > + X2APIC_MSR(APIC_TASKPRI), > MSR_TYPE_W); > > if (nested_cpu_has_vid(vmcs12)) { > nested_vmx_disable_intercept_for_msr( > msr_bitmap_l1, msr_bitmap_l0, > - APIC_BASE_MSR + (APIC_EOI >> 4), > + X2APIC_MSR(APIC_EOI), > MSR_TYPE_W); > nested_vmx_disable_intercept_for_msr( > msr_bitmap_l1, msr_bitmap_l0, > - APIC_BASE_MSR + (APIC_SELF_IPI >> 4), > + X2APIC_MSR(APIC_SELF_IPI), > MSR_TYPE_W); > } > kunmap(page); > Reviewed-by: Liran Alon