Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1581374 > unrolled thread

[PATCH] KVM: VMX: use vmcs_set/clear_bits for CPU-based execution controls

Started byPaolo Bonzini <pbonzini@redhat.com>
First post2017-02-15 15:50 +0100
Last post2017-02-17 18:30 +0100
Articles 6 — 4 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH] KVM: VMX: use vmcs_set/clear_bits for CPU-based execution controls Paolo Bonzini <pbonzini@redhat.com> - 2017-02-15 15:50 +0100
    Re: [PATCH] KVM: VMX: use vmcs_set/clear_bits for CPU-based  execution controls Radim Krčmář <rkrcmar@redhat.com> - 2017-02-16 17:30 +0100
    Re: [PATCH] KVM: VMX: use vmcs_set/clear_bits for CPU-based execution  controls David Hildenbrand <david@redhat.com> - 2017-02-16 20:30 +0100
    Re: [PATCH] KVM: VMX: use vmcs_set/clear_bits for CPU-based execution controls Bandan Das <bsd@redhat.com> - 2017-02-17 01:10 +0100
      Re: [PATCH] KVM: VMX: use vmcs_set/clear_bits for CPU-based  execution controls Paolo Bonzini <pbonzini@redhat.com> - 2017-02-17 09:50 +0100
        Re: [PATCH] KVM: VMX: use vmcs_set/clear_bits for CPU-based execution controls Bandan Das <bsd@redhat.com> - 2017-02-17 18:30 +0100

#1581374 — [PATCH] KVM: VMX: use vmcs_set/clear_bits for CPU-based execution controls

FromPaolo Bonzini <pbonzini@redhat.com>
Date2017-02-15 15:50 +0100
Subject[PATCH] KVM: VMX: use vmcs_set/clear_bits for CPU-based execution controls
Message-ID<tb946-1ef-21@gated-at.bofh.it>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 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

[toc] | [next] | [standalone]

#1582688 — Re: [PATCH] KVM: VMX: use vmcs_set/clear_bits for CPU-based execution controls

FromRadim Krčmář <rkrcmar@redhat.com>
Date2017-02-16 17:30 +0100
SubjectRe: [PATCH] KVM: VMX: use vmcs_set/clear_bits for CPU-based execution controls
Message-ID<tbx6q-px-9@gated-at.bofh.it>
In reply to#1581374
2017-02-15 15:44+0100, Paolo Bonzini:
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Reviewed-by: Radim Krčmář <rkrcmar@redhat.com>

> ---
>  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
>

[toc] | [prev] | [next] | [standalone]

#1582882 — Re: [PATCH] KVM: VMX: use vmcs_set/clear_bits for CPU-based execution controls

FromDavid Hildenbrand <david@redhat.com>
Date2017-02-16 20:30 +0100
SubjectRe: [PATCH] KVM: VMX: use vmcs_set/clear_bits for CPU-based execution controls
Message-ID<tbzUC-2oT-13@gated-at.bofh.it>
In reply to#1581374
Am 15.02.2017 um 15:44 schrieb Paolo Bonzini:
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  arch/x86/kvm/vmx.c | 30 ++++++++----------------------
>  1 file changed, 8 insertions(+), 22 deletions(-)
> 

Reviewed-by: David Hildenbrand <david@redhat.com>

-- 
Thanks,

David

[toc] | [prev] | [next] | [standalone]

#1582993

FromBandan Das <bsd@redhat.com>
Date2017-02-17 01:10 +0100
Message-ID<tbEhz-5gH-3@gated-at.bofh.it>
In reply to#1581374
Paolo Bonzini <pbonzini@redhat.com> writes:

> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---

I took a quick look and found these two potential
consumers of these set/clear wrappers.

vmcs_set_secondary_exec_control()
vmx_set_virtual_x2apic_mode()

Since this has been reviewed already, 
we can just have them later in a follow up
(unless you left them out intentionally).

Bandan

>  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);

[toc] | [prev] | [next] | [standalone]

#1583211 — Re: [PATCH] KVM: VMX: use vmcs_set/clear_bits for CPU-based execution controls

FromPaolo Bonzini <pbonzini@redhat.com>
Date2017-02-17 09:50 +0100
SubjectRe: [PATCH] KVM: VMX: use vmcs_set/clear_bits for CPU-based execution controls
Message-ID<tbMoO-1Y8-25@gated-at.bofh.it>
In reply to#1582993

----- Original Message -----
> From: "Bandan Das" <bsd@redhat.com>
> To: "Paolo Bonzini" <pbonzini@redhat.com>
> Cc: linux-kernel@vger.kernel.org, kvm@vger.kernel.org
> Sent: Friday, February 17, 2017 1:04:14 AM
> Subject: Re: [PATCH] KVM: VMX: use vmcs_set/clear_bits for CPU-based execution controls
> 
> Paolo Bonzini <pbonzini@redhat.com> writes:
> 
> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> > ---
> 
> I took a quick look and found these two potential
> consumers of these set/clear wrappers.
> 
> vmcs_set_secondary_exec_control()
> vmx_set_virtual_x2apic_mode()
> 
> Since this has been reviewed already,
> we can just have them later in a follow up
> (unless you left them out intentionally).

Both of these can both set and clear bits, so they could be the
consumer of a new function

void vmcs_write_bits(u16 field, u32 value, u32 mask)

but I don't see much benefit in introducing it; the cognitive
load is higher than vmcs_{set,clear}_bits.

Paolo

[toc] | [prev] | [next] | [standalone]

#1583618

FromBandan Das <bsd@redhat.com>
Date2017-02-17 18:30 +0100
Message-ID<tbUw1-7dc-15@gated-at.bofh.it>
In reply to#1583211
Paolo Bonzini <pbonzini@redhat.com> writes:

> ----- Original Message -----
>> From: "Bandan Das" <bsd@redhat.com>
>> To: "Paolo Bonzini" <pbonzini@redhat.com>
>> Cc: linux-kernel@vger.kernel.org, kvm@vger.kernel.org
>> Sent: Friday, February 17, 2017 1:04:14 AM
>> Subject: Re: [PATCH] KVM: VMX: use vmcs_set/clear_bits for CPU-based execution controls
>> 
>> Paolo Bonzini <pbonzini@redhat.com> writes:
>> 
>> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
>> > ---
>> 
>> I took a quick look and found these two potential
>> consumers of these set/clear wrappers.
>> 
>> vmcs_set_secondary_exec_control()
>> vmx_set_virtual_x2apic_mode()
>> 
>> Since this has been reviewed already,
>> we can just have them later in a follow up
>> (unless you left them out intentionally).
>
> Both of these can both set and clear bits, so they could be the
> consumer of a new function
>
> void vmcs_write_bits(u16 field, u32 value, u32 mask)
>
> but I don't see much benefit in introducing it; the cognitive
> load is higher than vmcs_{set,clear}_bits.

Yes, agreed. Thanks!

> Paolo

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web