[PATCH kvm-unit-tests] vmx: give more memory to VMX tests

[PATCH kvm-unit-tests] vmx: give more memory to VMX tests

[Paolo Bonzini]

VMX tests need to allocate 1G-aligned memory to set up a huge page.
However, with a 2 GiB guest there is exactly one such page, exactly at
top of memory.  Now that vmalloc now uses the page allocator, tests
fail; just give them more memory.

Fixes:

    FAIL: x86/vmx_tests.c:2616: Assertion failed: data->hva
            STACK: 407050 40922a 401e4d 403ac4 400312

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 x86/unittests.cfg | 50 +++++++++++++++++++++++++-------------------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/x86/unittests.cfg b/x86/unittests.cfg
index 91d1c75..c6a383b 100644
--- a/x86/unittests.cfg
+++ b/x86/unittests.cfg
@@ -211,7 +211,7 @@ arch = x86_64
 
 [vmx]
 file = vmx.flat
-extra_params = -cpu host,+vmx -m 2048 -append -exit_monitor_from_l2_test
+extra_params = -cpu host,+vmx -m 2560 -append -exit_monitor_from_l2_test
 arch = x86_64
 groups = vmx
 
@@ -397,145 +397,145 @@ groups = vmx
 
 [vmx_ept_access_test_not_present]
 file = vmx.flat
-extra_params = -cpu host,+vmx -m 2048 -append ept_access_test_not_present
+extra_params = -cpu host,+vmx -m 2560 -append ept_access_test_not_present
 arch = x86_64
 groups = vmx
 
 [vmx_ept_access_test_read_only]
 file = vmx.flat
-extra_params = -cpu host,+vmx -m 2048 -append ept_access_test_read_only
+extra_params = -cpu host,+vmx -m 2560 -append ept_access_test_read_only
 arch = x86_64
 groups = vmx
 
 [vmx_ept_access_test_write_only]
 file = vmx.flat
-extra_params = -cpu host,+vmx -m 2048 -append ept_access_test_write_only
+extra_params = -cpu host,+vmx -m 2560 -append ept_access_test_write_only
 arch = x86_64
 groups = vmx
 
 [vmx_ept_access_test_read_write]
 file = vmx.flat
-extra_params = -cpu host,+vmx -m 2048 -append ept_access_test_read_write
+extra_params = -cpu host,+vmx -m 2560 -append ept_access_test_read_write
 arch = x86_64
 groups = vmx
 
 [vmx_ept_access_test_execute_only]
 file = vmx.flat
-extra_params = -cpu host,+vmx -m 2048 -append ept_access_test_execute_only
+extra_params = -cpu host,+vmx -m 2560 -append ept_access_test_execute_only
 arch = x86_64
 groups = vmx
 
 [vmx_ept_access_test_read_execute]
 file = vmx.flat
-extra_params = -cpu host,+vmx -m 2048 -append ept_access_test_read_execute
+extra_params = -cpu host,+vmx -m 2560 -append ept_access_test_read_execute
 arch = x86_64
 groups = vmx
 
 [vmx_ept_access_test_write_execute]
 file = vmx.flat
-extra_params = -cpu host,+vmx -m 2048 -append ept_access_test_write_execute
+extra_params = -cpu host,+vmx -m 2560 -append ept_access_test_write_execute
 arch = x86_64
 groups = vmx
 
 [vmx_ept_access_test_read_write_execute]
 file = vmx.flat
-extra_params = -cpu host,+vmx -m 2048 -append ept_access_test_read_write_execute
+extra_params = -cpu host,+vmx -m 2560 -append ept_access_test_read_write_execute
 arch = x86_64
 groups = vmx
 
 [vmx_ept_access_test_reserved_bits]
 file = vmx.flat
-extra_params = -cpu host,+vmx -m 2048 -append ept_access_test_reserved_bits
+extra_params = -cpu host,+vmx -m 2560 -append ept_access_test_reserved_bits
 arch = x86_64
 groups = vmx
 
 [vmx_ept_access_test_ignored_bits]
 file = vmx.flat
-extra_params = -cpu host,+vmx -m 2048 -append ept_access_test_ignored_bits
+extra_params = -cpu host,+vmx -m 2560 -append ept_access_test_ignored_bits
 arch = x86_64
 groups = vmx
 
 [vmx_ept_access_test_paddr_not_present_ad_disabled]
 file = vmx.flat
-extra_params = -cpu host,+vmx -m 2048 -append ept_access_test_paddr_not_present_ad_disabled
+extra_params = -cpu host,+vmx -m 2560 -append ept_access_test_paddr_not_present_ad_disabled
 arch = x86_64
 groups = vmx
 
 [vmx_ept_access_test_paddr_not_present_ad_enabled]
 file = vmx.flat
-extra_params = -cpu host,+vmx -m 2048 -append ept_access_test_paddr_not_present_ad_enabled
+extra_params = -cpu host,+vmx -m 2560 -append ept_access_test_paddr_not_present_ad_enabled
 arch = x86_64
 groups = vmx
 
 [vmx_ept_access_test_paddr_read_only_ad_disabled]
 file = vmx.flat
-extra_params = -cpu host,+vmx -m 2048 -append ept_access_test_paddr_read_only_ad_disabled
+extra_params = -cpu host,+vmx -m 2560 -append ept_access_test_paddr_read_only_ad_disabled
 arch = x86_64
 groups = vmx
 
 [vmx_ept_access_test_paddr_read_only_ad_enabled]
 file = vmx.flat
-extra_params = -cpu host,+vmx -m 2048 -append ept_access_test_paddr_read_only_ad_enabled
+extra_params = -cpu host,+vmx -m 2560 -append ept_access_test_paddr_read_only_ad_enabled
 arch = x86_64
 groups = vmx
 
 [vmx_ept_access_test_paddr_read_write]
 file = vmx.flat
-extra_params = -cpu host,+vmx -m 2048 -append ept_access_test_paddr_read_write
+extra_params = -cpu host,+vmx -m 2560 -append ept_access_test_paddr_read_write
 arch = x86_64
 groups = vmx
 
 [vmx_ept_access_test_paddr_read_write_execute]
 file = vmx.flat
-extra_params = -cpu host,+vmx -m 2048 -append ept_access_test_paddr_read_write_execute
+extra_params = -cpu host,+vmx -m 2560 -append ept_access_test_paddr_read_write_execute
 arch = x86_64
 groups = vmx
 
 [vmx_ept_access_test_paddr_read_execute_ad_disabled]
 file = vmx.flat
-extra_params = -cpu host,+vmx -m 2048 -append ept_access_test_paddr_read_execute_ad_disabled
+extra_params = -cpu host,+vmx -m 2560 -append ept_access_test_paddr_read_execute_ad_disabled
 arch = x86_64
 groups = vmx
 
 [vmx_ept_access_test_paddr_read_execute_ad_enabled]
 file = vmx.flat
-extra_params = -cpu host,+vmx -m 2048 -append ept_access_test_paddr_read_execute_ad_enabled
+extra_params = -cpu host,+vmx -m 2560 -append ept_access_test_paddr_read_execute_ad_enabled
 arch = x86_64
 groups = vmx
 
 [vmx_ept_access_test_paddr_not_present_page_fault]
 file = vmx.flat
-extra_params = -cpu host,+vmx -m 2048 -append ept_access_test_paddr_not_present_page_fault
+extra_params = -cpu host,+vmx -m 2560 -append ept_access_test_paddr_not_present_page_fault
 arch = x86_64
 groups = vmx
 
 [vmx_ept_access_test_force_2m_page]
 file = vmx.flat
-extra_params = -cpu host,+vmx -m 2048 -append ept_access_test_force_2m_page
+extra_params = -cpu host,+vmx -m 2560 -append ept_access_test_force_2m_page
 arch = x86_64
 groups = vmx
 
 [vmx_invvpid]
 file = vmx.flat
-extra_params = -cpu host,+vmx -m 2048 -append invvpid_test_v2
+extra_params = -cpu host,+vmx -m 2560 -append invvpid_test_v2
 arch = x86_64
 groups = vmx
 
 [vmx_controls]
 file = vmx.flat
-extra_params = -cpu host,+vmx -m 2048 -append vmx_controls_test
+extra_params = -cpu host,+vmx -m 2560 -append vmx_controls_test
 arch = x86_64
 groups = vmx
 
 [vmx_vmentry_movss_shadow_test]
 file = vmx.flat
-extra_params = -cpu host,+vmx -m 2048 -append vmentry_movss_shadow_test
+extra_params = -cpu host,+vmx -m 2560 -append vmentry_movss_shadow_test
 arch = x86_64
 groups = vmx
 
 [vmx_cr_load_test]
 file = vmx.flat
-extra_params = -cpu host,+vmx -m 2048 -append vmx_cr_load_test
+extra_params = -cpu host,+vmx -m 2560 -append vmx_cr_load_test
 arch = x86_64
 groups = vmx
 
-- 
1.8.3.1

Re: [PATCH kvm-unit-tests] vmx: give more memory to VMX tests

[Radim Krčmář]

2018-01-17 19:03+0100, Paolo Bonzini:
> VMX tests need to allocate 1G-aligned memory to set up a huge page.
> However, with a 2 GiB guest there is exactly one such page, exactly at
> top of memory.  Now that vmalloc now uses the page allocator, tests
> fail; just give them more memory.
> 
> Fixes:
> 
>     FAIL: x86/vmx_tests.c:2616: Assertion failed: data->hva
>             STACK: 407050 40922a 401e4d 403ac4 400312
> 
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  x86/unittests.cfg | 50 +++++++++++++++++++++++++-------------------------
>  1 file changed, 25 insertions(+), 25 deletions(-)
> 
> diff --git a/x86/unittests.cfg b/x86/unittests.cfg
> index 91d1c75..c6a383b 100644
> --- a/x86/unittests.cfg
> +++ b/x86/unittests.cfg
> @@ -211,7 +211,7 @@ arch = x86_64
>  
>  [vmx]
>  file = vmx.flat
> -extra_params = -cpu host,+vmx -m 2048 -append -exit_monitor_from_l2_test
> +extra_params = -cpu host,+vmx -m 2560 -append -exit_monitor_from_l2_test
>  arch = x86_64
>  groups = vmx

Applied, thanks.