2023-12-08 02:18:06

by Sean Christopherson

[permalink] [raw]
Subject: [GIT PULL] KVM: selftests: Fixes and cleanups for 6.7-rcN

Please pull selftests fixes/cleanups for 6.7. The big change is adding
__printf() annotation to the guest printf/assert helpers, which is waaay
better than me playing whack-a-mole when tests fail (I'm still laughing
at myself for not realizing what that annotation does).

The following changes since commit e9e60c82fe391d04db55a91c733df4a017c28b2f:

selftests/kvm: fix compilation on non-x86_64 platforms (2023-11-21 11:58:25 -0500)

are available in the Git repository at:

https://github.com/kvm-x86/linux.git tags/kvm-x86-selftests-6.7-rcN

for you to fetch changes up to 1b2658e4c709135fe1910423d3216632f641baf9:

KVM: selftests: Annotate guest ucall, printf, and assert helpers with __printf() (2023-12-01 08:15:41 -0800)

----------------------------------------------------------------
KVM selftests fixes for 6.7-rcN:

- Fix an annoying goof where the NX hugepage test prints out garbage
instead of the magic token needed to run the text.

- Fix build errors when a header is delete/moved due to a missing flag
in the Makefile.

- Detect if KVM bugged/killed a selftest's VM and print out a helpful
message instead of complaining that a random ioctl() failed.

- Annotate the guest printf/assert helpers with __printf(), and fix the
various bugs that were lurking due to lack of said annotation.

----------------------------------------------------------------
David Woodhouse (1):
KVM: selftests: add -MP to CFLAGS

Sean Christopherson (7):
KVM: selftests: Drop the single-underscore ioctl() helpers
KVM: selftests: Add logic to detect if ioctl() failed because VM was killed
KVM: selftests: Remove x86's so called "MMIO warning" test
KVM: selftests: Fix MWAIT error message when guest assertion fails
KVM: selftests: Fix benign %llx vs. %lx issues in guest asserts
KVM: selftests: Fix broken assert messages in Hyper-V features test
KVM: selftests: Annotate guest ucall, printf, and assert helpers with __printf()

angquan yu (1):
KVM: selftests: Actually print out magic token in NX hugepages skip message

tools/testing/selftests/kvm/Makefile | 3 +-
.../testing/selftests/kvm/include/kvm_util_base.h | 75 ++++++++-----
tools/testing/selftests/kvm/include/test_util.h | 2 +-
tools/testing/selftests/kvm/include/ucall_common.h | 7 +-
tools/testing/selftests/kvm/lib/kvm_util.c | 2 +-
.../testing/selftests/kvm/set_memory_region_test.c | 6 +-
.../testing/selftests/kvm/x86_64/hyperv_features.c | 10 +-
.../selftests/kvm/x86_64/mmio_warning_test.c | 121 ---------------------
.../selftests/kvm/x86_64/monitor_mwait_test.c | 6 +-
.../selftests/kvm/x86_64/nx_huge_pages_test.c | 2 +-
.../kvm/x86_64/private_mem_conversions_test.c | 2 +-
.../kvm/x86_64/svm_nested_soft_inject_test.c | 4 +-
.../selftests/kvm/x86_64/vmx_pmu_caps_test.c | 2 +-
.../testing/selftests/kvm/x86_64/xcr0_cpuid_test.c | 8 +-
14 files changed, 78 insertions(+), 172 deletions(-)
delete mode 100644 tools/testing/selftests/kvm/x86_64/mmio_warning_test.c


2023-12-08 18:21:39

by Paolo Bonzini

[permalink] [raw]
Subject: Re: [GIT PULL] KVM: selftests: Fixes and cleanups for 6.7-rcN

On Fri, Dec 8, 2023 at 3:17 AM Sean Christopherson <[email protected]> wrote:
>
> Please pull selftests fixes/cleanups for 6.7. The big change is adding
> __printf() annotation to the guest printf/assert helpers, which is waaay
> better than me playing whack-a-mole when tests fail (I'm still laughing
> at myself for not realizing what that annotation does).
>
> The following changes since commit e9e60c82fe391d04db55a91c733df4a017c28b2f:
>
> selftests/kvm: fix compilation on non-x86_64 platforms (2023-11-21 11:58:25 -0500)

This would be a 6.8 change though.

I singled out "KVM: selftests: Actually print out magic token in NX
hugepages skip message" and "KVM: selftests: add -MP to CFLAGS" and
pulled the rest into kvm/next, which means we'll have a couple dup
commits but nothing too bad.

Paolo

>
> are available in the Git repository at:
>
> https://github.com/kvm-x86/linux.git tags/kvm-x86-selftests-6.7-rcN
>
> for you to fetch changes up to 1b2658e4c709135fe1910423d3216632f641baf9:
>
> KVM: selftests: Annotate guest ucall, printf, and assert helpers with __printf() (2023-12-01 08:15:41 -0800)
>
> ----------------------------------------------------------------
> KVM selftests fixes for 6.7-rcN:
>
> - Fix an annoying goof where the NX hugepage test prints out garbage
> instead of the magic token needed to run the text.
>
> - Fix build errors when a header is delete/moved due to a missing flag
> in the Makefile.
>
> - Detect if KVM bugged/killed a selftest's VM and print out a helpful
> message instead of complaining that a random ioctl() failed.
>
> - Annotate the guest printf/assert helpers with __printf(), and fix the
> various bugs that were lurking due to lack of said annotation.
>
> ----------------------------------------------------------------
> David Woodhouse (1):
> KVM: selftests: add -MP to CFLAGS
>
> Sean Christopherson (7):
> KVM: selftests: Drop the single-underscore ioctl() helpers
> KVM: selftests: Add logic to detect if ioctl() failed because VM was killed
> KVM: selftests: Remove x86's so called "MMIO warning" test
> KVM: selftests: Fix MWAIT error message when guest assertion fails
> KVM: selftests: Fix benign %llx vs. %lx issues in guest asserts
> KVM: selftests: Fix broken assert messages in Hyper-V features test
> KVM: selftests: Annotate guest ucall, printf, and assert helpers with __printf()
>
> angquan yu (1):
> KVM: selftests: Actually print out magic token in NX hugepages skip message
>
> tools/testing/selftests/kvm/Makefile | 3 +-
> .../testing/selftests/kvm/include/kvm_util_base.h | 75 ++++++++-----
> tools/testing/selftests/kvm/include/test_util.h | 2 +-
> tools/testing/selftests/kvm/include/ucall_common.h | 7 +-
> tools/testing/selftests/kvm/lib/kvm_util.c | 2 +-
> .../testing/selftests/kvm/set_memory_region_test.c | 6 +-
> .../testing/selftests/kvm/x86_64/hyperv_features.c | 10 +-
> .../selftests/kvm/x86_64/mmio_warning_test.c | 121 ---------------------
> .../selftests/kvm/x86_64/monitor_mwait_test.c | 6 +-
> .../selftests/kvm/x86_64/nx_huge_pages_test.c | 2 +-
> .../kvm/x86_64/private_mem_conversions_test.c | 2 +-
> .../kvm/x86_64/svm_nested_soft_inject_test.c | 4 +-
> .../selftests/kvm/x86_64/vmx_pmu_caps_test.c | 2 +-
> .../testing/selftests/kvm/x86_64/xcr0_cpuid_test.c | 8 +-
> 14 files changed, 78 insertions(+), 172 deletions(-)
> delete mode 100644 tools/testing/selftests/kvm/x86_64/mmio_warning_test.c
>

2023-12-08 19:04:13

by Sean Christopherson

[permalink] [raw]
Subject: Re: [GIT PULL] KVM: selftests: Fixes and cleanups for 6.7-rcN

On Fri, Dec 08, 2023, Paolo Bonzini wrote:
> On Fri, Dec 8, 2023 at 3:17 AM Sean Christopherson <[email protected]> wrote:
> >
> > Please pull selftests fixes/cleanups for 6.7. The big change is adding
> > __printf() annotation to the guest printf/assert helpers, which is waaay
> > better than me playing whack-a-mole when tests fail (I'm still laughing
> > at myself for not realizing what that annotation does).
> >
> > The following changes since commit e9e60c82fe391d04db55a91c733df4a017c28b2f:
> >
> > selftests/kvm: fix compilation on non-x86_64 platforms (2023-11-21 11:58:25 -0500)
>
> This would be a 6.8 change though.

/facepalm

Sorry. Having to switch to kvm/next to get a sane pull request should have been
a big clue bat for me.