From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AF081C10F27 for ; Mon, 9 Mar 2020 15:52:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 88F4A208C3 for ; Mon, 9 Mar 2020 15:52:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="GvZT5/J4" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727231AbgCIPwi (ORCPT ); Mon, 9 Mar 2020 11:52:38 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:50263 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727194AbgCIPwg (ORCPT ); Mon, 9 Mar 2020 11:52:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583769155; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kEZnDQ3EPN69hzxp+XwMgJi39q3+ALjlYK44BICSftw=; b=GvZT5/J4pkkznu2EBQOZY/Bs6XiUBrRRBJuKY6WWCwST1YFVv5nIvcDGyXseJjyT+8UGp/ GLtsLA0E/9kC9L6m+/TGtjUD3IkUF+IdeuRmEpX8Hts3e0AvZsS+ZEKiISpxFwGKDPK+XV 1HhTHICsmQRfUN7ojIraYEGb97ZdYYM= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-224-0b6d9wbyN5OKsFhtunTu2Q-1; Mon, 09 Mar 2020 11:52:33 -0400 X-MC-Unique: 0b6d9wbyN5OKsFhtunTu2Q-1 Received: by mail-wr1-f71.google.com with SMTP id b12so5437938wro.4 for ; Mon, 09 Mar 2020 08:52:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=kEZnDQ3EPN69hzxp+XwMgJi39q3+ALjlYK44BICSftw=; b=HEzcQNOZnATfPo82gcFnA4tIGRiPpk8hdS1295MDPE4UxKDl5SYCK4iTe17pLXybz/ 9LwFd54ywpkql9PXP9wI3a1JyI0lXt7DSEsXVMkoOis8jlVXXieOmM72Y6adLjtnlgTj F0u+3Ja0huIJGHbFYUb206+Zeo2nIaLEVbO8Y+2I+xoDGW9LRmW1qSpjLBqN38VR9mQh aU4ICYTNO52CirtVzcVIoT4PQ22JZyQDdDvHIpg4ZK+tdaFA+GCGjSEf+6pj2zBfoH1z lqPGGKKA01Iczeb6a++g3CHpQ7UYtXNnNbpUZAtzVt17otSZ2VLobcqHyXu9eN+bOt43 ryVg== X-Gm-Message-State: ANhLgQ3Q3AVSRGnGmvqz3U/GRp/8UaU9UtRUNuYQct20FzPlB8uF5oIY qCfmRB9LQLE48AZBKYdx3iqufARpCaxM4hsu8Z4WyPVQwBCN7igOh2F0FIvGQ5/fktqzXLdASNS 2q88GBQkwI67Mpby4FF9A3Y0F X-Received: by 2002:a1c:a345:: with SMTP id m66mr21683098wme.114.1583769152547; Mon, 09 Mar 2020 08:52:32 -0700 (PDT) X-Google-Smtp-Source: ADFU+vuBsFwL/38WqBZvYsDczlUIj4JLSMvzr77wkabrGWT0xBQqHgpF8sih91f14RuhC/Y3HCPJng== X-Received: by 2002:a1c:a345:: with SMTP id m66mr21683080wme.114.1583769152339; Mon, 09 Mar 2020 08:52:32 -0700 (PDT) Received: from vitty.brq.redhat.com (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id q4sm17294521wro.56.2020.03.09.08.52.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2020 08:52:30 -0700 (PDT) From: Vitaly Kuznetsov To: Paolo Bonzini Cc: Jim Mattson , Sean Christopherson , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Liran Alon , Miaohe Lin Subject: [PATCH 5/6] KVM: selftests: test enlightened vmenter with wrong eVMCS version Date: Mon, 9 Mar 2020 16:52:15 +0100 Message-Id: <20200309155216.204752-6-vkuznets@redhat.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200309155216.204752-1-vkuznets@redhat.com> References: <20200309155216.204752-1-vkuznets@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Check that VMfailInvalid happens when eVMCS revision is is invalid. Signed-off-by: Vitaly Kuznetsov --- tools/testing/selftests/kvm/x86_64/evmcs_test.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/kvm/x86_64/evmcs_test.c b/tools/testing/selftests/kvm/x86_64/evmcs_test.c index 92915e6408e7..10e9c158dc96 100644 --- a/tools/testing/selftests/kvm/x86_64/evmcs_test.c +++ b/tools/testing/selftests/kvm/x86_64/evmcs_test.c @@ -21,10 +21,10 @@ void l2_guest_code(void) { - GUEST_SYNC(6); - GUEST_SYNC(7); + GUEST_SYNC(8); + /* Done, exit to L1 and never come back. */ vmcall(); } @@ -50,12 +50,17 @@ void l1_guest_code(struct vmx_pages *vmx_pages) GUEST_SYNC(5); GUEST_ASSERT(vmptrstz() == vmx_pages->enlightened_vmcs_gpa); + current_evmcs->revision_id = -1u; + GUEST_ASSERT(vmlaunch()); + current_evmcs->revision_id = EVMCS_VERSION; + GUEST_SYNC(6); + GUEST_ASSERT(!vmlaunch()); GUEST_ASSERT(vmptrstz() == vmx_pages->enlightened_vmcs_gpa); - GUEST_SYNC(8); + GUEST_SYNC(9); GUEST_ASSERT(!vmresume()); GUEST_ASSERT(vmreadz(VM_EXIT_REASON) == EXIT_REASON_VMCALL); - GUEST_SYNC(9); + GUEST_SYNC(10); } void guest_code(struct vmx_pages *vmx_pages) -- 2.24.1