KVM: selftests: use X86_MEMTYPE_WB instead of VMX_BASIC_MEM_TYPE_WB

[PATCH] KVM: selftests: use X86_MEMTYPE_WB instead of VMX_BASIC_MEM_TYPE_WB

Posted by John Sperbeck 2 weeks, 4 days ago

In 08a7d2525511 ("tools arch x86: Sync the msr-index.h copy with the
kernel sources"), VMX_BASIC_MEM_TYPE_WB was removed.  Use X86_MEMTYPE_WB
instead.

Fixes: 08a7d2525511 ("tools arch x86: Sync the msr-index.h copy with the
kernel sources")
Signed-off-by: John Sperbeck <jsperbeck@google.com>
---
 tools/testing/selftests/kvm/lib/x86_64/vmx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/testing/selftests/kvm/lib/x86_64/vmx.c b/tools/testing/selftests/kvm/lib/x86_64/vmx.c
index 089b8925b6b2..d7ac122820bf 100644
--- a/tools/testing/selftests/kvm/lib/x86_64/vmx.c
+++ b/tools/testing/selftests/kvm/lib/x86_64/vmx.c
@@ -200,7 +200,7 @@ static inline void init_vmcs_control_fields(struct vmx_pages *vmx)
 	if (vmx->eptp_gpa) {
 		uint64_t ept_paddr;
 		struct eptPageTablePointer eptp = {
-			.memory_type = VMX_BASIC_MEM_TYPE_WB,
+			.memory_type = X86_MEMTYPE_WB,
 			.page_walk_length = 3, /* + 1 */
 			.ad_enabled = ept_vpid_cap_supported(VMX_EPT_VPID_CAP_AD_BITS),
 			.address = vmx->eptp_gpa >> PAGE_SHIFT_4K,
-- 
2.47.0.277.g8800431eea-goog

Re: [PATCH] KVM: selftests: use X86_MEMTYPE_WB instead of VMX_BASIC_MEM_TYPE_WB

Posted by Paolo Bonzini 2 weeks, 1 day ago

Queued, thanks.

Paolo

Re: [PATCH] KVM: selftests: use X86_MEMTYPE_WB instead of VMX_BASIC_MEM_TYPE_WB

Posted by Sean Christopherson 2 weeks, 3 days ago

On Tue, Nov 05, 2024, John Sperbeck wrote:
> In 08a7d2525511 ("tools arch x86: Sync the msr-index.h copy with the
> kernel sources"), VMX_BASIC_MEM_TYPE_WB was removed.  Use X86_MEMTYPE_WB
> instead.

Drat.  For all my talk about KVM selftests not caring about kernel headers, that's
obviously not entirely true.  Most of the selftests code is standalone, e.g. CR4
and xfeature bits are all manually defined.  But redefining the myriad MSR #defines
does seem like a complete waste of time and effort.

> Fixes: 08a7d2525511 ("tools arch x86: Sync the msr-index.h copy with the
> kernel sources")

Unnecessary newline, i.e. don't wrap metadata tags.

> Signed-off-by: John Sperbeck <jsperbeck@google.com>

Acked-by: Sean Christopherson <seanjc@google.com>

Paolo, can you grab this for 6.12-rc7?  And fixup the Fixes.  I'll mention this
again in the pull request I have planned for later today.

> ---
>  tools/testing/selftests/kvm/lib/x86_64/vmx.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/testing/selftests/kvm/lib/x86_64/vmx.c b/tools/testing/selftests/kvm/lib/x86_64/vmx.c
> index 089b8925b6b2..d7ac122820bf 100644
> --- a/tools/testing/selftests/kvm/lib/x86_64/vmx.c
> +++ b/tools/testing/selftests/kvm/lib/x86_64/vmx.c
> @@ -200,7 +200,7 @@ static inline void init_vmcs_control_fields(struct vmx_pages *vmx)
>  	if (vmx->eptp_gpa) {
>  		uint64_t ept_paddr;
>  		struct eptPageTablePointer eptp = {
> -			.memory_type = VMX_BASIC_MEM_TYPE_WB,
> +			.memory_type = X86_MEMTYPE_WB,
>  			.page_walk_length = 3, /* + 1 */
>  			.ad_enabled = ept_vpid_cap_supported(VMX_EPT_VPID_CAP_AD_BITS),
>  			.address = vmx->eptp_gpa >> PAGE_SHIFT_4K,
> -- 
> 2.47.0.277.g8800431eea-goog
>