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 1A5F1C4332F for ; Wed, 3 Nov 2021 17:04:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 021E661076 for ; Wed, 3 Nov 2021 17:04:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233082AbhKCRGx (ORCPT ); Wed, 3 Nov 2021 13:06:53 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:20675 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232985AbhKCRGs (ORCPT ); Wed, 3 Nov 2021 13:06:48 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635959051; 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=RhyNlcQTtItdzLKiKcw3dhTyVZjE7ucYL4TYcGsm9oc=; b=AEbuDWdx68QYQnJzXSBKBmXiD1lYstkIIU8Cgiu2Pg2HPV6OOFKMelmDqWyyNXufAzwLmS 3Dc7AUsutdKgbbSwxlhK7roD5QJL+jvwzDCvSrZQ1O5LqH8ArTyazzpJUfVG+pMZQnD9BD hA3oH4KrBykrhi0MrXZrZNoUKMPbrqg= 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-560-8JsqJgDlPjaKN51DpH_ouA-1; Wed, 03 Nov 2021 13:04:08 -0400 X-MC-Unique: 8JsqJgDlPjaKN51DpH_ouA-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 9C96DEC1A7; Wed, 3 Nov 2021 17:04:06 +0000 (UTC) Received: from starship (unknown [10.40.194.243]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5E6955D9D3; Wed, 3 Nov 2021 17:03:55 +0000 (UTC) Message-ID: <9743cd8aa1e2dd8ddb0caa1be1de608fb19c19d6.camel@redhat.com> Subject: Re: [PATCH v5 4/7] nSVM: use vmcb_save_area_cached in nested_vmcb_valid_sregs() From: Maxim Levitsky To: Emanuele Giuseppe Esposito , kvm@vger.kernel.org Cc: Paolo Bonzini , Sean Christopherson , Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, "H. Peter Anvin" , linux-kernel@vger.kernel.org Date: Wed, 03 Nov 2021 19:03:54 +0200 In-Reply-To: <20211103140527.752797-5-eesposit@redhat.com> References: <20211103140527.752797-1-eesposit@redhat.com> <20211103140527.752797-5-eesposit@redhat.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.36.5 (3.36.5-2.fc32) MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 2021-11-03 at 10:05 -0400, Emanuele Giuseppe Esposito wrote: > Now that struct vmcb_save_area_cached contains the required > vmcb fields values (done in nested_load_save_from_vmcb12()), > check them to see if they are correct in nested_vmcb_valid_sregs(). > > While at it, rename nested_vmcb_valid_sregs in nested_vmcb_check_save. > _nested_vmcb_check_save takes the additional @save parameter, so it > is helpful when we want to check a non-svm save state, like in > svm_set_nested_state. The reason for that is that save is the L1 > state, not L2, so we just check it. > > Signed-off-by: Emanuele Giuseppe Esposito > --- > arch/x86/kvm/svm/nested.c | 18 ++++++++++++++---- > 1 file changed, 14 insertions(+), 4 deletions(-) > > diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c > index 162b338a6c74..64fb43234e06 100644 > --- a/arch/x86/kvm/svm/nested.c > +++ b/arch/x86/kvm/svm/nested.c > @@ -245,8 +245,8 @@ static bool nested_vmcb_check_controls(struct kvm_vcpu *vcpu, > } > > /* Common checks that apply to both L1 and L2 state. */ > -static bool nested_vmcb_valid_sregs(struct kvm_vcpu *vcpu, > - struct vmcb_save_area *save) > +static bool _nested_vmcb_check_save(struct kvm_vcpu *vcpu, > + struct vmcb_save_area_cached *save) > { > /* > * FIXME: these should be done after copying the fields, > @@ -286,6 +286,14 @@ static bool nested_vmcb_valid_sregs(struct kvm_vcpu *vcpu, > return true; > } > > +static bool nested_vmcb_check_save(struct kvm_vcpu *vcpu) > +{ > + struct vcpu_svm *svm = to_svm(vcpu); > + struct vmcb_save_area_cached *save = &svm->nested.save; > + > + return _nested_vmcb_check_save(vcpu, save); > +} > + > static > void _nested_copy_vmcb_control_to_cache(struct vmcb_control_area *to, > struct vmcb_control_area *from) > @@ -694,7 +702,7 @@ int nested_svm_vmrun(struct kvm_vcpu *vcpu) > nested_copy_vmcb_control_to_cache(svm, &vmcb12->control); > nested_copy_vmcb_save_to_cache(svm, &vmcb12->save); > > - if (!nested_vmcb_valid_sregs(vcpu, &vmcb12->save) || > + if (!nested_vmcb_check_save(vcpu) || > !nested_vmcb_check_controls(vcpu, &svm->nested.ctl)) { > vmcb12->control.exit_code = SVM_EXIT_ERR; > vmcb12->control.exit_code_hi = 0; > @@ -1330,6 +1338,7 @@ static int svm_set_nested_state(struct kvm_vcpu *vcpu, > &user_kvm_nested_state->data.svm[0]; > struct vmcb_control_area *ctl; > struct vmcb_save_area *save; > + struct vmcb_save_area_cached save_cached; > unsigned long cr0; > int ret; > > @@ -1397,10 +1406,11 @@ static int svm_set_nested_state(struct kvm_vcpu *vcpu, > * Validate host state saved from before VMRUN (see > * nested_svm_check_permissions). > */ > + _nested_copy_vmcb_save_to_cache(&save_cached, save); Nitpick: here I would probalby add a comment that we are dealing here with L1 save area and we just want to check it and not cache it. Also suddenly the name _nested_copy_vmcb_save_to_cache sounds a bit off, but I don't have any better idea so I don't mind leaving it as is. Anyway, Reviewed-by: Maxim Levitsky Best regards, Maxim Levitsky > if (!(save->cr0 & X86_CR0_PG) || > !(save->cr0 & X86_CR0_PE) || > (save->rflags & X86_EFLAGS_VM) || > - !nested_vmcb_valid_sregs(vcpu, save)) > + !_nested_vmcb_check_save(vcpu, &save_cached)) > goto out_free; > > /*