From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932652AbdBPQY6 (ORCPT ); Thu, 16 Feb 2017 11:24:58 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41768 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754622AbdBPQY5 (ORCPT ); Thu, 16 Feb 2017 11:24:57 -0500 Date: Thu, 16 Feb 2017 17:24:54 +0100 From: Radim =?utf-8?B?S3LEjW3DocWZ?= To: Paolo Bonzini Cc: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Subject: Re: [PATCH] KVM: VMX: use vmcs_set/clear_bits for CPU-based execution controls Message-ID: <20170216162453.GA12224@potion> References: <1487169866-14989-1-git-send-email-pbonzini@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1487169866-14989-1-git-send-email-pbonzini@redhat.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Thu, 16 Feb 2017 16:24:58 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2017-02-15 15:44+0100, Paolo Bonzini: > Signed-off-by: Paolo Bonzini Reviewed-by: Radim Krčmář > --- > arch/x86/kvm/vmx.c | 30 ++++++++---------------------- > 1 file changed, 8 insertions(+), 22 deletions(-) > > diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c > index bca60665d55d..0e0b5d09597e 100644 > --- a/arch/x86/kvm/vmx.c > +++ b/arch/x86/kvm/vmx.c > @@ -5459,26 +5459,20 @@ static bool nested_exit_on_nmi(struct kvm_vcpu *vcpu) > > static void enable_irq_window(struct kvm_vcpu *vcpu) > { > - u32 cpu_based_vm_exec_control; > - > - cpu_based_vm_exec_control = vmcs_read32(CPU_BASED_VM_EXEC_CONTROL); > - cpu_based_vm_exec_control |= CPU_BASED_VIRTUAL_INTR_PENDING; > - vmcs_write32(CPU_BASED_VM_EXEC_CONTROL, cpu_based_vm_exec_control); > + vmcs_set_bits(CPU_BASED_VM_EXEC_CONTROL, > + CPU_BASED_VIRTUAL_INTR_PENDING); > } > > static void enable_nmi_window(struct kvm_vcpu *vcpu) > { > - u32 cpu_based_vm_exec_control; > - > if (!cpu_has_virtual_nmis() || > vmcs_read32(GUEST_INTERRUPTIBILITY_INFO) & GUEST_INTR_STATE_STI) { > enable_irq_window(vcpu); > return; > } > > - cpu_based_vm_exec_control = vmcs_read32(CPU_BASED_VM_EXEC_CONTROL); > - cpu_based_vm_exec_control |= CPU_BASED_VIRTUAL_NMI_PENDING; > - vmcs_write32(CPU_BASED_VM_EXEC_CONTROL, cpu_based_vm_exec_control); > + vmcs_set_bits(CPU_BASED_VM_EXEC_CONTROL, > + CPU_BASED_VIRTUAL_NMI_PENDING); > } > > static void vmx_inject_irq(struct kvm_vcpu *vcpu) > @@ -6137,12 +6131,8 @@ static int handle_tpr_below_threshold(struct kvm_vcpu *vcpu) > > static int handle_interrupt_window(struct kvm_vcpu *vcpu) > { > - u32 cpu_based_vm_exec_control; > - > - /* clear pending irq */ > - cpu_based_vm_exec_control = vmcs_read32(CPU_BASED_VM_EXEC_CONTROL); > - cpu_based_vm_exec_control &= ~CPU_BASED_VIRTUAL_INTR_PENDING; > - vmcs_write32(CPU_BASED_VM_EXEC_CONTROL, cpu_based_vm_exec_control); > + vmcs_clear_bits(CPU_BASED_VM_EXEC_CONTROL, > + CPU_BASED_VIRTUAL_INTR_PENDING); > > kvm_make_request(KVM_REQ_EVENT, vcpu); > > @@ -6408,12 +6398,8 @@ static int handle_ept_misconfig(struct kvm_vcpu *vcpu) > > static int handle_nmi_window(struct kvm_vcpu *vcpu) > { > - u32 cpu_based_vm_exec_control; > - > - /* clear pending NMI */ > - cpu_based_vm_exec_control = vmcs_read32(CPU_BASED_VM_EXEC_CONTROL); > - cpu_based_vm_exec_control &= ~CPU_BASED_VIRTUAL_NMI_PENDING; > - vmcs_write32(CPU_BASED_VM_EXEC_CONTROL, cpu_based_vm_exec_control); > + vmcs_clear_bits(CPU_BASED_VM_EXEC_CONTROL, > + CPU_BASED_VIRTUAL_NMI_PENDING); > ++vcpu->stat.nmi_window_exits; > kvm_make_request(KVM_REQ_EVENT, vcpu); > > -- > 1.8.3.1 >