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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C8F57C433EF for ; Wed, 6 Oct 2021 11:22:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AD1DD6109F for ; Wed, 6 Oct 2021 11:22:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238252AbhJFLYN (ORCPT ); Wed, 6 Oct 2021 07:24:13 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:34605 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229824AbhJFLYI (ORCPT ); Wed, 6 Oct 2021 07:24:08 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1633519335; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=v/JfOMi35WLM2+MZzOUHUTk7On4MySnDCb/mEC3ZCeE=; b=CFtC+3Uv3G/BmiCFIJ6DvBDtwYOXmMHwCI2Rj2GwmUe62qp0GyKIJdHWIC0XiCiNEi0H9o yrqViganksXsvjy5PmbLYu2yyuS+Zw+o5Au2CbJt5+tvbUHqI/PmmYqYCH1OWbJumlwONf 0uH1We5wip3zCZkuIP7qHKWEPydr1eM= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-262-o8z1lhE0N3-VZxei36PLtg-1; Wed, 06 Oct 2021 07:22:14 -0400 X-MC-Unique: o8z1lhE0N3-VZxei36PLtg-1 Received: by mail-ed1-f69.google.com with SMTP id z6-20020a50cd06000000b003d2c2e38f1fso2356499edi.1 for ; Wed, 06 Oct 2021 04:22:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=v/JfOMi35WLM2+MZzOUHUTk7On4MySnDCb/mEC3ZCeE=; b=oo1xq7gf1aOAuGiU6kMNeSfH4s3r98Jx29+vEukPLhf7YNC1TLS/2rj6MmjDxee+nS O6HT6246mpc/8a5Jc8SsPB3HCpRy9wJmTInYvRJT69ZzCYdOYAdu3Y3PIiieq1SQt1WK mxo6HHOLlG6K4WQP/m5XYXIRQUJNK/1CTXaUOayvPKZWnbi1EHxfnFNe413mGMCkyN0B brsK8PrQOLZemaiNfIoyEaddm9+CjIvbpHZXm1uV9mI46h6AvzUvbDzBYtNqByaA/FC/ ZvSAK8JXI3txn2NILesVAW1YJ9Qy+b7kVCFdmJ7ixjKSqu1qRxy+Wo/+0BQ9l0wWiclR B0oA== X-Gm-Message-State: AOAM531PZ1gZ/q4Vk7fa+SrtY0j1xYDOYy6VUcJIsGYU/tbsX/YvGnHi 6x7617MigAZ4JheoE//HU08KPGbGnd59DQ/iQK9J1rZ9jKS6m9aJ+mGLM0xrGT+Qk+Upp9G/6UZ AYvqTxyRla+5zcNPtZCeUdGJI X-Received: by 2002:a17:906:254b:: with SMTP id j11mr21131208ejb.513.1633519333535; Wed, 06 Oct 2021 04:22:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJylcfz1yIK5h80nly+MZgOukICPmd/XRFVIy5VZ7eKeiW48E0oVYz9JloSTXJaFKV1/u78H3g== X-Received: by 2002:a17:906:254b:: with SMTP id j11mr21131186ejb.513.1633519333342; Wed, 06 Oct 2021 04:22:13 -0700 (PDT) Received: from ?IPV6:2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e? ([2001:b07:6468:f312:5e2c:eb9a:a8b6:fd3e]) by smtp.gmail.com with ESMTPSA id b17sm2149920edd.77.2021.10.06.04.22.11 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 06 Oct 2021 04:22:12 -0700 (PDT) Message-ID: <689f5883-54aa-51f8-a06b-69d18d6a3c82@redhat.com> Date: Wed, 6 Oct 2021 13:22:10 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.1.0 Subject: Re: [PATCH MANUALSEL 5.10 4/7] KVM: x86: VMX: synthesize invalid VM exit when emulating invalid guest state Content-Language: en-US To: Sasha Levin , linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Maxim Levitsky , Sean Christopherson , tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, x86@kernel.org, kvm@vger.kernel.org References: <20211006111234.264020-1-sashal@kernel.org> <20211006111234.264020-4-sashal@kernel.org> From: Paolo Bonzini In-Reply-To: <20211006111234.264020-4-sashal@kernel.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 06/10/21 13:12, Sasha Levin wrote: > From: Maxim Levitsky > > [ Upstream commit c42dec148b3e1a88835e275b675e5155f99abd43 ] > > Since no actual VM entry happened, the VM exit information is stale. > To avoid this, synthesize an invalid VM guest state VM exit. > > Suggested-by: Sean Christopherson > Signed-off-by: Maxim Levitsky > Message-Id: <20210913140954.165665-6-mlevitsk@redhat.com> > Signed-off-by: Paolo Bonzini > Signed-off-by: Sasha Levin > --- > arch/x86/kvm/vmx/vmx.c | 17 ++++++++++++++--- > 1 file changed, 14 insertions(+), 3 deletions(-) > > diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c > index fcd8bcb7e0ea..e3af56f05a37 100644 > --- a/arch/x86/kvm/vmx/vmx.c > +++ b/arch/x86/kvm/vmx/vmx.c > @@ -6670,10 +6670,21 @@ static fastpath_t vmx_vcpu_run(struct kvm_vcpu *vcpu) > vmx->loaded_vmcs->soft_vnmi_blocked)) > vmx->loaded_vmcs->entry_time = ktime_get(); > > - /* Don't enter VMX if guest state is invalid, let the exit handler > - start emulation until we arrive back to a valid state */ > - if (vmx->emulation_required) > + /* > + * Don't enter VMX if guest state is invalid, let the exit handler > + * start emulation until we arrive back to a valid state. Synthesize a > + * consistency check VM-Exit due to invalid guest state and bail. > + */ > + if (unlikely(vmx->emulation_required)) { > + vmx->fail = 0; > + vmx->exit_reason.full = EXIT_REASON_INVALID_STATE; > + vmx->exit_reason.failed_vmentry = 1; > + kvm_register_mark_available(vcpu, VCPU_EXREG_EXIT_INFO_1); > + vmx->exit_qualification = ENTRY_FAIL_DEFAULT; > + kvm_register_mark_available(vcpu, VCPU_EXREG_EXIT_INFO_2); > + vmx->exit_intr_info = 0; > return EXIT_FASTPATH_NONE; > + } > > if (vmx->ple_window_dirty) { > vmx->ple_window_dirty = false; > NACK for this one. The others are good, I'll ack them individually though. Thanks for setting this up! Paolo