[PATCH 1/2] KVM: selftests: Add x86_64/debug_regs to .gitignore

[PATCH 1/2] KVM: selftests: Add x86_64/debug_regs to .gitignore

[Vitaly Kuznetsov]

Add x86_64/debug_regs to .gitignore.

Reported-by: Marcelo Bandeira Condotta <mcondotta@redhat.com>
Fixes: 449aa906e67e ("KVM: selftests: Add KVM_SET_GUEST_DEBUG test")
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
---
 tools/testing/selftests/kvm/.gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/testing/selftests/kvm/.gitignore b/tools/testing/selftests/kvm/.gitignore
index f159718f90c0..452787152748 100644
--- a/tools/testing/selftests/kvm/.gitignore
+++ b/tools/testing/selftests/kvm/.gitignore
@@ -3,6 +3,7 @@
 /s390x/resets
 /s390x/sync_regs_test
 /x86_64/cr4_cpuid_sync_test
+/x86_64/debug_regs
 /x86_64/evmcs_test
 /x86_64/hyperv_cpuid
 /x86_64/mmio_warning_test
-- 
2.25.4

[PATCH 2/2] KVM: selftests: fix vmx_preemption_timer_test build with GCC10

[Vitaly Kuznetsov]

GCC10 fails to build vmx_preemption_timer_test:

gcc -Wall -Wstrict-prototypes -Wuninitialized -O2 -g -std=gnu99
-fno-stack-protector -fno-PIE -I../../../../tools/include
 -I../../../../tools/arch/x86/include -I../../../../usr/include/
 -Iinclude -Ix86_64 -Iinclude/x86_64 -I..  -pthread  -no-pie
 x86_64/evmcs_test.c ./linux/tools/testing/selftests/kselftest_harness.h
 ./linux/tools/testing/selftests/kselftest.h
 ./linux/tools/testing/selftests/kvm/libkvm.a
 -o ./linux/tools/testing/selftests/kvm/x86_64/evmcs_test
/usr/bin/ld: ./linux/tools/testing/selftests/kvm/libkvm.a(vmx.o):
 ./linux/tools/testing/selftests/kvm/include/x86_64/vmx.h:603:
 multiple definition of `ctrl_exit_rev'; /tmp/ccMQpvNt.o:
 ./linux/tools/testing/selftests/kvm/include/x86_64/vmx.h:603:
 first defined here
/usr/bin/ld: ./linux/tools/testing/selftests/kvm/libkvm.a(vmx.o):
 ./linux/tools/testing/selftests/kvm/include/x86_64/vmx.h:602:
 multiple definition of `ctrl_pin_rev'; /tmp/ccMQpvNt.o:
 ./linux/tools/testing/selftests/kvm/include/x86_64/vmx.h:602:
 first defined here
 ...

ctrl_exit_rev/ctrl_pin_rev/basic variables are only used in
vmx_preemption_timer_test.c, just move them there.

Fixes: 8d7fbf01f9af ("KVM: selftests: VMX preemption timer migration test")
Reported-by: Marcelo Bandeira Condotta <mcondotta@redhat.com>
Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
---
 tools/testing/selftests/kvm/include/x86_64/vmx.h              | 4 ----
 .../testing/selftests/kvm/x86_64/vmx_preemption_timer_test.c  | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/testing/selftests/kvm/include/x86_64/vmx.h b/tools/testing/selftests/kvm/include/x86_64/vmx.h
index ccff3e6e2704..766af9944294 100644
--- a/tools/testing/selftests/kvm/include/x86_64/vmx.h
+++ b/tools/testing/selftests/kvm/include/x86_64/vmx.h
@@ -598,10 +598,6 @@ union vmx_ctrl_msr {
 	};
 };
 
-union vmx_basic basic;
-union vmx_ctrl_msr ctrl_pin_rev;
-union vmx_ctrl_msr ctrl_exit_rev;
-
 struct vmx_pages *vcpu_alloc_vmx(struct kvm_vm *vm, vm_vaddr_t *p_vmx_gva);
 bool prepare_for_vmx_operation(struct vmx_pages *vmx);
 void prepare_vmcs(struct vmx_pages *vmx, void *guest_rip, void *guest_rsp);
diff --git a/tools/testing/selftests/kvm/x86_64/vmx_preemption_timer_test.c b/tools/testing/selftests/kvm/x86_64/vmx_preemption_timer_test.c
index cc72b6188ca7..a7737af1224f 100644
--- a/tools/testing/selftests/kvm/x86_64/vmx_preemption_timer_test.c
+++ b/tools/testing/selftests/kvm/x86_64/vmx_preemption_timer_test.c
@@ -31,6 +31,10 @@ bool l2_save_restore_done;
 static u64 l2_vmx_pt_start;
 volatile u64 l2_vmx_pt_finish;
 
+union vmx_basic basic;
+union vmx_ctrl_msr ctrl_pin_rev;
+union vmx_ctrl_msr ctrl_exit_rev;
+
 void l2_guest_code(void)
 {
 	u64 vmx_pt_delta;
-- 
2.25.4

Re: [PATCH 2/2] KVM: selftests: fix vmx_preemption_timer_test build with GCC10

[Paolo Bonzini]

On 08/06/20 13:23, Vitaly Kuznetsov wrote:
> GCC10 fails to build vmx_preemption_timer_test:
> 
> gcc -Wall -Wstrict-prototypes -Wuninitialized -O2 -g -std=gnu99
> -fno-stack-protector -fno-PIE -I../../../../tools/include
>  -I../../../../tools/arch/x86/include -I../../../../usr/include/
>  -Iinclude -Ix86_64 -Iinclude/x86_64 -I..  -pthread  -no-pie
>  x86_64/evmcs_test.c ./linux/tools/testing/selftests/kselftest_harness.h
>  ./linux/tools/testing/selftests/kselftest.h
>  ./linux/tools/testing/selftests/kvm/libkvm.a
>  -o ./linux/tools/testing/selftests/kvm/x86_64/evmcs_test
> /usr/bin/ld: ./linux/tools/testing/selftests/kvm/libkvm.a(vmx.o):
>  ./linux/tools/testing/selftests/kvm/include/x86_64/vmx.h:603:
>  multiple definition of `ctrl_exit_rev'; /tmp/ccMQpvNt.o:
>  ./linux/tools/testing/selftests/kvm/include/x86_64/vmx.h:603:
>  first defined here
> /usr/bin/ld: ./linux/tools/testing/selftests/kvm/libkvm.a(vmx.o):
>  ./linux/tools/testing/selftests/kvm/include/x86_64/vmx.h:602:
>  multiple definition of `ctrl_pin_rev'; /tmp/ccMQpvNt.o:
>  ./linux/tools/testing/selftests/kvm/include/x86_64/vmx.h:602:
>  first defined here
>  ...
> 
> ctrl_exit_rev/ctrl_pin_rev/basic variables are only used in
> vmx_preemption_timer_test.c, just move them there.
> 
> Fixes: 8d7fbf01f9af ("KVM: selftests: VMX preemption timer migration test")
> Reported-by: Marcelo Bandeira Condotta <mcondotta@redhat.com>
> Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
> ---
>  tools/testing/selftests/kvm/include/x86_64/vmx.h              | 4 ----
>  .../testing/selftests/kvm/x86_64/vmx_preemption_timer_test.c  | 4 ++++
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/tools/testing/selftests/kvm/include/x86_64/vmx.h b/tools/testing/selftests/kvm/include/x86_64/vmx.h
> index ccff3e6e2704..766af9944294 100644
> --- a/tools/testing/selftests/kvm/include/x86_64/vmx.h
> +++ b/tools/testing/selftests/kvm/include/x86_64/vmx.h
> @@ -598,10 +598,6 @@ union vmx_ctrl_msr {
>  	};
>  };
>  
> -union vmx_basic basic;
> -union vmx_ctrl_msr ctrl_pin_rev;
> -union vmx_ctrl_msr ctrl_exit_rev;
> -
>  struct vmx_pages *vcpu_alloc_vmx(struct kvm_vm *vm, vm_vaddr_t *p_vmx_gva);
>  bool prepare_for_vmx_operation(struct vmx_pages *vmx);
>  void prepare_vmcs(struct vmx_pages *vmx, void *guest_rip, void *guest_rsp);
> diff --git a/tools/testing/selftests/kvm/x86_64/vmx_preemption_timer_test.c b/tools/testing/selftests/kvm/x86_64/vmx_preemption_timer_test.c
> index cc72b6188ca7..a7737af1224f 100644
> --- a/tools/testing/selftests/kvm/x86_64/vmx_preemption_timer_test.c
> +++ b/tools/testing/selftests/kvm/x86_64/vmx_preemption_timer_test.c
> @@ -31,6 +31,10 @@ bool l2_save_restore_done;
>  static u64 l2_vmx_pt_start;
>  volatile u64 l2_vmx_pt_finish;
>  
> +union vmx_basic basic;
> +union vmx_ctrl_msr ctrl_pin_rev;
> +union vmx_ctrl_msr ctrl_exit_rev;
> +
>  void l2_guest_code(void)
>  {
>  	u64 vmx_pt_delta;
> 

Queued both, thanks.

Paolo

Re: [PATCH 2/2] KVM: selftests: fix vmx_preemption_timer_test build with GCC10

[Sean Christopherson]

On Mon, Jun 08, 2020 at 01:57:03PM +0200, Paolo Bonzini wrote:
> On 08/06/20 13:23, Vitaly Kuznetsov wrote:
> > GCC10 fails to build vmx_preemption_timer_test:
> > 
> > gcc -Wall -Wstrict-prototypes -Wuninitialized -O2 -g -std=gnu99
> > -fno-stack-protector -fno-PIE -I../../../../tools/include
> >  -I../../../../tools/arch/x86/include -I../../../../usr/include/
> >  -Iinclude -Ix86_64 -Iinclude/x86_64 -I..  -pthread  -no-pie
> >  x86_64/evmcs_test.c ./linux/tools/testing/selftests/kselftest_harness.h
> >  ./linux/tools/testing/selftests/kselftest.h
> >  ./linux/tools/testing/selftests/kvm/libkvm.a
> >  -o ./linux/tools/testing/selftests/kvm/x86_64/evmcs_test
> > /usr/bin/ld: ./linux/tools/testing/selftests/kvm/libkvm.a(vmx.o):
> >  ./linux/tools/testing/selftests/kvm/include/x86_64/vmx.h:603:
> >  multiple definition of `ctrl_exit_rev'; /tmp/ccMQpvNt.o:
> >  ./linux/tools/testing/selftests/kvm/include/x86_64/vmx.h:603:
> >  first defined here
> > /usr/bin/ld: ./linux/tools/testing/selftests/kvm/libkvm.a(vmx.o):
> >  ./linux/tools/testing/selftests/kvm/include/x86_64/vmx.h:602:
> >  multiple definition of `ctrl_pin_rev'; /tmp/ccMQpvNt.o:
> >  ./linux/tools/testing/selftests/kvm/include/x86_64/vmx.h:602:
> >  first defined here
> >  ...
> > 
> > ctrl_exit_rev/ctrl_pin_rev/basic variables are only used in
> > vmx_preemption_timer_test.c, just move them there.
> > 
> > Fixes: 8d7fbf01f9af ("KVM: selftests: VMX preemption timer migration test")
> > Reported-by: Marcelo Bandeira Condotta <mcondotta@redhat.com>
> > Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
> > ---
> >  tools/testing/selftests/kvm/include/x86_64/vmx.h              | 4 ----
> >  .../testing/selftests/kvm/x86_64/vmx_preemption_timer_test.c  | 4 ++++
> >  2 files changed, 4 insertions(+), 4 deletions(-)
> > 
> > diff --git a/tools/testing/selftests/kvm/include/x86_64/vmx.h b/tools/testing/selftests/kvm/include/x86_64/vmx.h
> > index ccff3e6e2704..766af9944294 100644
> > --- a/tools/testing/selftests/kvm/include/x86_64/vmx.h
> > +++ b/tools/testing/selftests/kvm/include/x86_64/vmx.h
> > @@ -598,10 +598,6 @@ union vmx_ctrl_msr {
> >  	};
> >  };
> >  
> > -union vmx_basic basic;
> > -union vmx_ctrl_msr ctrl_pin_rev;
> > -union vmx_ctrl_msr ctrl_exit_rev;
> > -
> >  struct vmx_pages *vcpu_alloc_vmx(struct kvm_vm *vm, vm_vaddr_t *p_vmx_gva);
> >  bool prepare_for_vmx_operation(struct vmx_pages *vmx);
> >  void prepare_vmcs(struct vmx_pages *vmx, void *guest_rip, void *guest_rsp);
> > diff --git a/tools/testing/selftests/kvm/x86_64/vmx_preemption_timer_test.c b/tools/testing/selftests/kvm/x86_64/vmx_preemption_timer_test.c
> > index cc72b6188ca7..a7737af1224f 100644
> > --- a/tools/testing/selftests/kvm/x86_64/vmx_preemption_timer_test.c
> > +++ b/tools/testing/selftests/kvm/x86_64/vmx_preemption_timer_test.c
> > @@ -31,6 +31,10 @@ bool l2_save_restore_done;
> >  static u64 l2_vmx_pt_start;
> >  volatile u64 l2_vmx_pt_finish;
> >  
> > +union vmx_basic basic;
> > +union vmx_ctrl_msr ctrl_pin_rev;
> > +union vmx_ctrl_msr ctrl_exit_rev;
> > +
> >  void l2_guest_code(void)
> >  {
> >  	u64 vmx_pt_delta;
> > 
> 
> Queued both, thanks.

Hmm, someone go awry with your queue a while back?

https://lkml.kernel.org/r/ce6a5284-e09b-2f51-8cb6-baa29b3ac5c3@redhat.com

Re: [PATCH 2/2] KVM: selftests: fix vmx_preemption_timer_test build with GCC10

[Paolo Bonzini]

On 08/06/20 16:38, Sean Christopherson wrote:
>> Queued both, thanks.
> 
> Hmm, someone go awry with your queue a while back?
> 
> https://lkml.kernel.org/r/ce6a5284-e09b-2f51-8cb6-baa29b3ac5c3@redhat.com

Both that one and "x86/kvm: Remove defunct KVM_DEBUG_FS Kconfig" were
queued for 5.7, but Linus released one week earlier so they got lost.

Paolo