Re: [PATCH kvm-unit-tests 8/9] x86/vmx: run EPT tests with MBEC enabled when available

[Paolo Bonzini <pbonzini@redhat.com>]

On 3/26/26 15:50, Paolo Bonzini wrote:
> diff --git a/x86/vmx_tests.c b/x86/vmx_tests.c
> index 023512e6..bf03451a 100644
> --- a/x86/vmx_tests.c
> +++ b/x86/vmx_tests.c
> @@ -1044,6 +1044,8 @@ static int insn_intercept_exit_handler(union exit_reason exit_reason)
>    */
>   static int __setup_ept(u64 hpa, bool enable_ad)
>   {
> +	u64 secondary;
> +
>   	if (!(ctrl_cpu_rev[0].clr & CPU_SECONDARY) ||
>   	    !(ctrl_cpu_rev[1].clr & CPU_EPT)) {
>   		printf("\tEPT is not supported\n");
> @@ -1067,9 +1069,13 @@ static int __setup_ept(u64 hpa, bool enable_ad)
>   	if (enable_ad)
>   		eptp |= EPTP_AD_FLAG;
>   
> +	secondary = vmcs_read(CPU_EXEC_CTRL1) | CPU_EPT;
> +	if (is_mbec_supported())
> +		secondary |= CPU_MODE_BASED_EPT_EXEC;
> +
>   	vmcs_write(EPTP, eptp);
>   	vmcs_write(CPU_EXEC_CTRL0, vmcs_read(CPU_EXEC_CTRL0)| CPU_SECONDARY);
> -	vmcs_write(CPU_EXEC_CTRL1, vmcs_read(CPU_EXEC_CTRL1)| CPU_EPT);
> +	vmcs_write(CPU_EXEC_CTRL1, secondary);
>   
>   	return 0;
>   }

This is missing a hunk:

diff --git a/x86/vmx_tests.c b/x86/vmx_tests.c
index 023512e6..b5994719 100644
--- a/x86/vmx_tests.c
+++ b/x86/vmx_tests.c
@@ -4886,7 +4946,7 @@ static void test_ept_eptp(void)
                 report_prefix_pop();
         }
  
-       secondary &= ~(CPU_EPT | CPU_URG);
+       secondary &= ~(CPU_URG | CPU_EPT | CPU_MODE_BASED_EPT_EXEC);
         vmcs_write(CPU_EXEC_CTRL1, secondary);
         report_prefix_pushf("Enable-EPT disabled, unrestricted-guest disabled");
         test_vmx_valid_controls();

and possibly this as well for consistency:

diff --git a/x86/vmx_tests.c b/x86/vmx_tests.c
index b5994719..cf1022ba 100644
--- a/x86/vmx_tests.c
+++ b/x86/vmx_tests.c
@@ -5068,7 +5068,7 @@ static void test_pml(void)
  
  	primary |= CPU_SECONDARY;
  	vmcs_write(CPU_EXEC_CTRL0, primary);
-	secondary &= ~(CPU_PML | CPU_EPT);
+	secondary &= ~(CPU_PML | CPU_EPT | CPU_MODE_BASED_EPT_EXEC);
  	vmcs_write(CPU_EXEC_CTRL1, secondary);
  	report_prefix_pushf("enable-PML disabled, enable-EPT disabled");
  	test_vmx_valid_controls();

Paolo