Skip to contentSkip to conversation

KVM: selftests: Add x86_64/debug_regs to .gitignore

PATCH Applied Vitaly Kuznetsov 3 participants 5 messages Jun 8, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

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

Add x86_64/debug_regs to .gitignore.

Fixes 449aa906e67e ("KVM: selftests: Add KVM_SET_GUEST_DEBUG test")
---
 tools/testing/selftests/kvm/.gitignore | 1 +
 1 file changed, 1 insertion(+)
tools/testing/selftests/kvm/.gitignore +1 -0
index f159718f90c0..452787152748 100644
@@ -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
Signature · 1 line
2.25.4
#1 lore raw

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

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")
---
 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(-)
tools/testing/selftests/kvm/include/x86_64/vmx.h +0 -4
index ccff3e6e2704..766af9944294 100644
@@ -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);
tools/testing/selftests/kvm/x86_64/vmx_preemption_timer_test.c +4 -0
index cc72b6188ca7..a7737af1224f 100644
@@ -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;
Signature · 1 line
2.25.4
maintainer Applied
#2 lore raw

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

Quoted 54 lines · 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")
---
 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(-)
tools/testing/selftests/kvm/include/x86_64/vmx.h +0 -4
index ccff3e6e2704..766af9944294 100644
@@ -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);
tools/testing/selftests/kvm/x86_64/vmx_preemption_timer_test.c +0 -0
index cc72b6188ca7..a7737af1224f 100644

tools/testing/selftests/kvm/x86_64/vmx_preemption_timer_test.c bool l2_save_restore_done; · line 40

Quoted 10 lines
tools/testing/selftests/kvm/x86_64/vmx_preemption_timer_test.c +4 -0
@@ -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

#3 lore raw

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

Quoted 57 lines · Paolo Bonzini
Quoted 56 lines · 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")
---
 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(-)
tools/testing/selftests/kvm/include/x86_64/vmx.h +0 -4
index ccff3e6e2704..766af9944294 100644
@@ -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);
tools/testing/selftests/kvm/x86_64/vmx_preemption_timer_test.c +0 -0
index cc72b6188ca7..a7737af1224f 100644
@@ -31,6 +31,10 @@ bool l2_save_restore_done;
 static u64 l2_vmx_pt_start;
 volatile u64 l2_vmx_pt_finish;
 
Quoted 10 lines

tools/testing/selftests/kvm/x86_64/vmx_preemption_timer_test.c bool l2_save_restore_done; · line 40

Quoted 8 lines
tools/testing/selftests/kvm/x86_64/vmx_preemption_timer_test.c +4 -0
+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/[email protected]

maintainer
#4 lore raw

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

Quoted 5 lines · Sean Christopherson
Quoted 1 line

Queued both, thanks.

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

https://lkml.kernel.org/r/[email protected]

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