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=-3.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=no 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 E3FF5C433E1 for ; Thu, 20 Aug 2020 11:56:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B7CF622B4E for ; Thu, 20 Aug 2020 11:56:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="QMbqis+B" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729870AbgHTLzo (ORCPT ); Thu, 20 Aug 2020 07:55:44 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:53892 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1730434AbgHTKCY (ORCPT ); Thu, 20 Aug 2020 06:02:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1597917743; 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=MP/JNWR1yLBisgN4+PEfbtEeM9N/uel00En3KvNqgSw=; b=QMbqis+BrmfZPUATvl3OaErsaowb+CVIQdpNmqwnv3yDNStOvZU5bFVkSUlNNA+2ffunng WdHasYJQfwjMYw1Ovbx8G/vq3LHNBQLuFB8nNjvzCCW61TYg8eJmZwyBzu5DmJny8USsbs l+7btbQW1DeOdw6rSBR10zSt6o8Hd2E= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-59-urWTE_gTNuekkPMYyCy3Yg-1; Thu, 20 Aug 2020 06:02:21 -0400 X-MC-Unique: urWTE_gTNuekkPMYyCy3Yg-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 08AD3801ADD; Thu, 20 Aug 2020 10:02:20 +0000 (UTC) Received: from starship (unknown [10.35.206.173]) by smtp.corp.redhat.com (Postfix) with ESMTP id CF03F5D9E8; Thu, 20 Aug 2020 10:02:16 +0000 (UTC) Message-ID: Subject: Re: [PATCH 5/8] KVM: nSVM: implement ondemand allocation of the nested state From: Maxim Levitsky To: Paolo Bonzini , kvm@vger.kernel.org Cc: Jim Mattson , Joerg Roedel , Borislav Petkov , Thomas Gleixner , "H. Peter Anvin" , Vitaly Kuznetsov , "open list:X86 ARCHITECTURE (32-BIT AND 64-BIT)" , "maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT)" , Ingo Molnar , Wanpeng Li , Sean Christopherson Date: Thu, 20 Aug 2020 13:02:15 +0300 In-Reply-To: <476eecc8-a861-203c-40f5-46707d8c0237@redhat.com> References: <20200820091327.197807-1-mlevitsk@redhat.com> <20200820091327.197807-6-mlevitsk@redhat.com> <476eecc8-a861-203c-40f5-46707d8c0237@redhat.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.36.3 (3.36.3-1.fc32) MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 2020-08-20 at 11:58 +0200, Paolo Bonzini wrote: > On 20/08/20 11:13, Maxim Levitsky wrote: > > @@ -3912,6 +3914,14 @@ static int svm_pre_leave_smm(struct kvm_vcpu *vcpu, const char *smstate) > > vmcb_gpa = GET_SMSTATE(u64, smstate, 0x7ee0); > > > > if (guest) { > > + /* > > + * This can happen if SVM was not enabled prior to #SMI, > > + * but guest corrupted the #SMI state and marked it as > > + * enabled it there > > + */ > > + if (!svm->nested.initialized) > > + return 1; > > + > > if (kvm_vcpu_map(&svm->vcpu, gpa_to_gfn(vmcb_gpa), &map) == -EINVAL) > > return 1; > > This can also happen if you live migrate while in SMM (EFER.SVME=0). > You need to check for the SVME bit in the SMM state save area, and: > > 1) triple fault if it is clear > > 2) call svm_allocate_nested if it is set. > > Paolo > Makes sense, will do. Best regards, Maxim Levitsky