From patchwork Wed Jan 17 18:03:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 10170367 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 9A89E60386 for ; Wed, 17 Jan 2018 18:06:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8E5AF286EE for ; Wed, 17 Jan 2018 18:06:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8C9F7286B6; Wed, 17 Jan 2018 18:06:23 +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 5F7E628996 for ; Wed, 17 Jan 2018 18:03:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752740AbeAQSDw (ORCPT ); Wed, 17 Jan 2018 13:03:52 -0500 Received: from mail-wm0-f65.google.com ([74.125.82.65]:46379 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752641AbeAQSDu (ORCPT ); Wed, 17 Jan 2018 13:03:50 -0500 Received: by mail-wm0-f65.google.com with SMTP id 143so16876724wma.5 for ; Wed, 17 Jan 2018 10:03:50 -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=IYnNWPVgTir+uiJqpCJLJKEUJM/kzHmOZEWsnNv/73A=; b=mmE+xi7TOyaDtzszo0+RmeVPuICMuJMOHkC8EIGp3Rqu17wKklMSnpxqP4TfJpoW7b 7mLeUBUJywsCgfOg+zbDjcd/ZyTEQqB7R9577J/rS6ycv8ribxBi/EwlwWthMfgWSD9U V+3RL5bR7HW7xR6o8r7w1Z/OUpdZRJ1PCT4SfJyoxPje0xFlHZbmHjNanNz/3OSO76uI ao0hNTVFeNNoI/ttwYP2EfC41e+F5AUEcp4bmoHoavgZPvaLCROY9lHQg4SjFh1U93c4 Le/U9/mLUjzGsS7Budf0zF0M1hj9Nk5SIYGKDOZPeFQmeC28UC9le7Xi9ydCh/G/H9YN SfYQ== 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=IYnNWPVgTir+uiJqpCJLJKEUJM/kzHmOZEWsnNv/73A=; b=NJb5ymiHwIpZDffSTWQfA5iyTImnDnLaehIjcr6Z8dq3CNbHvv/sejOnPaqzJ/KZtb yOoDGl81Ru3TfgJ6Kwiov3WYyxBMt29Eav/tXLsJ+ev5G8dmsYTmSWMBaIsi7+4qhSsA bctWe8C0iERELM/YqCwPFEah6iSTkGBT6/rlPCpATb7FBrVx96sXxNEun2C0mFTHRMiQ OKPgjDO7OLGlFw0dh9+dw5w9TmoRqRTjM09OdQf4Da/r25rDEUDkKbtYWkG/q9tfFyu9 sfT1Wyr8FMIhBlf93srkjev+buKwVKm65IS0scbAQGcnixtAGj/cD6i1yaibGnG3tFR9 pCXw== X-Gm-Message-State: AKwxyteyEGHT63SZ4uFn/rzR2mmmGnfONgYWoYoOnk6m4BL7YEctlRUs 8SJuaDl7mcAIErMlpQQy2XOQKFEf X-Google-Smtp-Source: ACJfBosMHY4JMonbSK58WLBtcVXk8EdTp3J7HLe662p8cCHzAXWVuHf2qG7L+sbg7kBigy0PeNWTWA== X-Received: by 10.28.225.133 with SMTP id y127mr2675011wmg.55.1516212229260; Wed, 17 Jan 2018 10:03:49 -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.48 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Jan 2018 10:03:48 -0800 (PST) From: Paolo Bonzini To: kvm@vger.kernel.org Subject: [PATCH kvm-unit-tests] vmx: fixes for MAXPHYADDR requirement Date: Wed, 17 Jan 2018 19:03:45 +0100 Message-Id: <1516212225-37393-2-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 The EPT access tests require at least 41 bits of guest physical address space. This is because the test data needs a separate PML4 entry in the EPT table. However, many consumer-grade processors have only 36 or 39-bit MAXPHYADDR, and the tests fail there with a page fault due to reserved bits set in the guest (GVA->GPA) page tables. Add a test on MAXPHYADDR and skip the tests if they cannot run on the system under test, and only require 40 bits to lower the requirements. Signed-off-by: Paolo Bonzini --- x86/vmx_tests.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/x86/vmx_tests.c b/x86/vmx_tests.c index e8c97f2..0c3b5a7 100644 --- a/x86/vmx_tests.c +++ b/x86/vmx_tests.c @@ -2609,6 +2609,10 @@ static void ept_access_test_setup(void) if (setup_ept(false)) test_skip("EPT not supported"); + /* We use data->gpa = 1 << 39 so that test data has a separate pml4 entry */ + if (cpuid_maxphyaddr() < 40) + test_skip("Test needs MAXPHYADDR >= 40"); + test_set_guest(ept_access_test_guest); test_add_teardown(ept_access_test_teardown, NULL); @@ -2616,7 +2620,7 @@ static void ept_access_test_setup(void) TEST_ASSERT(data->hva); data->hpa = virt_to_phys(data->hva); - data->gpa = 1ul << 40; + data->gpa = 1ul << 39; data->gva = (void *) ALIGN((unsigned long) alloc_vpages(npages * 2), size); TEST_ASSERT(!any_present_pages(page_table, data->gva, size));