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.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham 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 651B3C4727E for ; Fri, 25 Sep 2020 21:33:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 28BC12075F for ; Fri, 25 Sep 2020 21:33:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Iq3hL+XB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729092AbgIYVda (ORCPT ); Fri, 25 Sep 2020 17:33:30 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:59978 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728935AbgIYVd3 (ORCPT ); Fri, 25 Sep 2020 17:33:29 -0400 Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601069608; 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=3c4JA853+MUs8W705Chfme2NTUjBzFU4aO/rVsVwkNI=; b=Iq3hL+XBfh2SsM2L7vKIiRahkT+2DtB6wN77PHtNzBP8Zy4RHSFaMXGibVEE5G/8wEWzpw IhTtgKaYy19FHLf3BRbPDbUGa35XYk7x65RSuWQwvaEw/A4rpUvY5XQnMOPd2hvgIHAcqM GdtBjCbnuCbO6apKSIDSPu9UnBVGZBY= 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-188-_cIsFw7DOk2t9jwK2Z9YAA-1; Fri, 25 Sep 2020 17:33:26 -0400 X-MC-Unique: _cIsFw7DOk2t9jwK2Z9YAA-1 Received: by mail-wr1-f71.google.com with SMTP id l9so1570916wrq.20 for ; Fri, 25 Sep 2020 14:33:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=3c4JA853+MUs8W705Chfme2NTUjBzFU4aO/rVsVwkNI=; b=lSQdylTNlHbKpm/mPFgFsJqJe1D1BCFsGBVGIyJ99nRbrHilBpllwzjTAvHnyxPvjE I9cj2gl446+O+N7Rm3AdJUhrzYeiBLvrOJam5eu9096h+KGsOzDz/Yj1fcRzpyo8U+vv KqjldoWAgLZjUlkre3DIGIrzMcpSQrBnEQPMDkg7Xfm0oOZaiB9qOmvb8u2ByuM0MUap 1wTLByt2ZrqFwE3Fx3ga1n7DN+rK9mI8/FXKahSnzgJ6NxjzMg2OSnnkKGDU8BsU9zMa sGZpK6Av07YPAQQY0M8p8pdHlDGpB0Mp9A5NShK8zJaLtKgkEJbY8YVroDaen7PXZ+vS aNNw== X-Gm-Message-State: AOAM532Osdwt2mmmsXZxYn2FRsfEwD2x1cuiY74MSLpKjIBw1XwzQ1gY PK2mHOa96xrKK70sVf3NRxi4Wq0bclmMTG1sWBFEdU7/xTZWrg62PKi3rqJXBm5Fxo+dJfeXrzp z+/QvEhNcC2halj6H3cfsi9b9 X-Received: by 2002:adf:f784:: with SMTP id q4mr6418200wrp.126.1601069605199; Fri, 25 Sep 2020 14:33:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzqHSmLJdak02/gUQl83xsSwS5C5QPIsrVE9XdWg+w1sC7kbYKwff+7HcaHA2ECYOcR5Ugh4w== X-Received: by 2002:adf:f784:: with SMTP id q4mr6418185wrp.126.1601069604992; Fri, 25 Sep 2020 14:33:24 -0700 (PDT) Received: from ?IPv6:2001:b07:6468:f312:ec9b:111a:97e3:4baf? ([2001:b07:6468:f312:ec9b:111a:97e3:4baf]) by smtp.gmail.com with ESMTPSA id h8sm4102707wrw.68.2020.09.25.14.33.23 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 25 Sep 2020 14:33:23 -0700 (PDT) Subject: Re: [PATCH v2 3/7] KVM: nVMX: Explicitly check for valid guest state for !unrestricted guest To: Sean Christopherson Cc: Vitaly Kuznetsov , Wanpeng Li , Jim Mattson , Joerg Roedel , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Dan Cross , Peter Shier References: <20200923184452.980-1-sean.j.christopherson@intel.com> <20200923184452.980-4-sean.j.christopherson@intel.com> From: Paolo Bonzini Message-ID: <0fc761eb-8758-ae96-65b1-90cc4d32f043@redhat.com> Date: Fri, 25 Sep 2020 23:33:23 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.11.0 MIME-Version: 1.0 In-Reply-To: <20200923184452.980-4-sean.j.christopherson@intel.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 23/09/20 20:44, Sean Christopherson wrote: > +bool __vmx_guest_state_valid(struct kvm_vcpu *vcpu) > { > - if (enable_unrestricted_guest) > - return true; > - > /* real mode guest state checks */ > if (!is_protmode(vcpu) || (vmx_get_rflags(vcpu) & X86_EFLAGS_VM)) { > if (!rmode_segment_valid(vcpu, VCPU_SREG_CS)) > diff --git a/arch/x86/kvm/vmx/vmx.h b/arch/x86/kvm/vmx/vmx.h > index d7ec66db5eb8..e147f180350f 100644 > --- a/arch/x86/kvm/vmx/vmx.h > +++ b/arch/x86/kvm/vmx/vmx.h > @@ -343,6 +343,15 @@ void vmx_get_segment(struct kvm_vcpu *vcpu, struct kvm_segment *var, int seg); > void vmx_set_segment(struct kvm_vcpu *vcpu, struct kvm_segment *var, int seg); > u64 construct_eptp(struct kvm_vcpu *vcpu, unsigned long root_hpa, > int root_level); > + > +bool __vmx_guest_state_valid(struct kvm_vcpu *vcpu); > +static inline bool vmx_guest_state_valid(struct kvm_vcpu *vcpu) > +{ > + if (enable_unrestricted_guest) > + return true; > + > + return __vmx_guest_state_valid(vcpu); This is now "if (is_unrestricted_guest (vcpu))", but the patch otherwise applies. Paolo