From patchwork Wed Jan 17 18:03:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 10170369 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3704560386 for ; Wed, 17 Jan 2018 18:06:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2457A2866D for ; Wed, 17 Jan 2018 18:06:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 229702869C; Wed, 17 Jan 2018 18:06:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 28284289A2 for ; Wed, 17 Jan 2018 18:03:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752731AbeAQSDv (ORCPT ); Wed, 17 Jan 2018 13:03:51 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:43842 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752285AbeAQSDu (ORCPT ); Wed, 17 Jan 2018 13:03:50 -0500 Received: by mail-wm0-f68.google.com with SMTP id g1so16900845wmg.2 for ; Wed, 17 Jan 2018 10:03:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id; bh=l7sbNVdfNMrEytYxTSXFkMoN+pD3u4hg8bLS80BRbVE=; b=uxPnT1hPpm5EvQ6dJhhiyvUlbqIlM1izcTj1uJN/jXS4+19ZOLJOk3cTl5L90FpFZw guXCmTZ87bE778UD1ogoufS/Y9OW7oijSZMVfw6H4JlMdIA3+QF/rL55J5/y4V9YW9J6 RnfB1Kzg+44WSG821vhknLUjAzPClJIkxNXgD2K3BnBjF9tMVgW3WuX+wB8uZ1BGRegP Z9Z5EwoMjeMvH1+FoOUH4nmk7Kk6ugOvxCKLZImm4C0aHMQcFpgdSDdJ/Uwqp7B4HJWf 1ka9aVgj4IfCWpkjlfUDLDVWWyTEvl/RF9iHHl+jX9Jsvlp8EQd1w+IWnbROYACnxybA OhdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id; bh=l7sbNVdfNMrEytYxTSXFkMoN+pD3u4hg8bLS80BRbVE=; b=eEkqLIYdjWpX4uFfdtA+Rf9MAehH7qV5W7NC+iEccmyDSBvj2/af9oPoO4Aw87haHJ ODl02sD0J2QbEcXEqISE34pAu8uXUDVTKYbVsNIoTHPTHv/t+5nWIAP/v6ditRvbTJiB BMZYDKVC3LQJt/dfQ1a2Zqr4a7AcweL6YbWiUu+bEAJQ/cKMaSRsySRVIg8pN5coFcoJ h95NtguYfL7ZXdowKbQ0Q2l9q0f1YwvzwMlFGWAz27UVB2dKH2EmsdLHtjhJRhAWWl19 XfDam8noquZgjocUpuFY9ZSiqKH5Nygh8B6OyCXpL8Z8k5E1ToMo6dMUasp3wxlC1+fn xeVQ== X-Gm-Message-State: AKwxytcYgPQYiJ+Z2Bf70OnHttcG2li2psFuJUSGAyIp7WRPAhT0qcl3 AKsmg0iMSQ+3KFS33SJ7ACiVpk83 X-Google-Smtp-Source: ACJfBot8oMN6O582QeDm9nW9wGGbNS+G63M0cSoGtyJii+IUgXlZef/CuntRFl1W7SohRmLmqv3a/g== X-Received: by 10.28.165.4 with SMTP id o4mr2784769wme.66.1516212228388; Wed, 17 Jan 2018 10:03:48 -0800 (PST) Received: from 640k.lan (dynamic-adsl-78-12-229-84.clienti.tiscali.it. [78.12.229.84]) by smtp.gmail.com with ESMTPSA id s127sm3736865wmf.28.2018.01.17.10.03.47 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Jan 2018 10:03:47 -0800 (PST) From: Paolo Bonzini To: kvm@vger.kernel.org Subject: [PATCH kvm-unit-tests] vmx: give more memory to VMX tests Date: Wed, 17 Jan 2018 19:03:44 +0100 Message-Id: <1516212225-37393-1-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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