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 6CA9BC433FE for ; Fri, 22 Oct 2021 14:49:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5143360F02 for ; Fri, 22 Oct 2021 14:49:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233325AbhJVOwO (ORCPT ); Fri, 22 Oct 2021 10:52:14 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:41751 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233380AbhJVOvf (ORCPT ); Fri, 22 Oct 2021 10:51:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1634914157; 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=RX6jaJktqv2W8OR8OtyKZMYHtETKMEP1Tp6j1XQKDg0=; b=IECsgKSlkxW/PVVu7pt4a/pOD4zbNQHJwYIVc5oA/+cegeademlIU09V+LVNR+wDLytkgP WCgzMsCrAxQCxh2tk1FZqO874GAf/twn4xuNSYAe15hyLozxrqbiD0BUyicW3+FEh6+nDa hQ23nqsR0oeZ1HIB+Cp1C5MAHAmVJ5c= 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-402-prV7buTNOuyQXKqfKZ945A-1; Fri, 22 Oct 2021 10:49:14 -0400 X-MC-Unique: prV7buTNOuyQXKqfKZ945A-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 46142801FCE; Fri, 22 Oct 2021 14:49:13 +0000 (UTC) Received: from starship (unknown [10.40.192.246]) by smtp.corp.redhat.com (Postfix) with ESMTP id 91DAF69203; Fri, 22 Oct 2021 14:49:09 +0000 (UTC) Message-ID: <096baddf9171b341ee0f7beccb8de527f12dcf3c.camel@redhat.com> Subject: Re: [PATCH v3 6/8] nSVM: introduce struct vmcb_ctrl_area_cached 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: Fri, 22 Oct 2021 17:49:08 +0300 In-Reply-To: <20211011143702.1786568-7-eesposit@redhat.com> References: <20211011143702.1786568-1-eesposit@redhat.com> <20211011143702.1786568-7-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.11 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 2021-10-11 at 10:37 -0400, Emanuele Giuseppe Esposito wrote: > This structure will replace vmcb_control_area in > svm_nested_state, providing only the fields that are actually > used by the nested state. This avoids having and copying around > uninitialized fields. The cost of this, however, is that all > functions (in this case vmcb_is_intercept) expect the old > structure, so they need to be duplicated. > > Introduce also nested_copy_vmcb_cache_to_control(), useful to copy > vmcb_ctrl_area_cached fields in vmcb_control_area. This will > be used in the next patch. > > Signed-off-by: Emanuele Giuseppe Esposito > --- > arch/x86/kvm/svm/nested.c | 32 ++++++++++++++++++++++++++++++++ > arch/x86/kvm/svm/svm.h | 31 +++++++++++++++++++++++++++++++ > 2 files changed, 63 insertions(+) > > diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c > index e08f2c31beae..c84cded1dcf6 100644 > --- a/arch/x86/kvm/svm/nested.c > +++ b/arch/x86/kvm/svm/nested.c > @@ -1213,6 +1213,38 @@ int nested_svm_exit_special(struct vcpu_svm *svm) > return NESTED_EXIT_CONTINUE; > } > > +/* Inverse operation of nested_copy_vmcb_control_to_cache(). asid is copied too. */ > +static void nested_copy_vmcb_cache_to_control(struct vmcb_control_area *dst, > + struct vmcb_ctrl_area_cached *from) > +{ > + unsigned int i; > + > + for (i = 0; i < MAX_INTERCEPT; i++) > + dst->intercepts[i] = from->intercepts[i]; > + > + dst->iopm_base_pa = from->iopm_base_pa; > + dst->msrpm_base_pa = from->msrpm_base_pa; > + dst->tsc_offset = from->tsc_offset; > + dst->asid = from->asid; > + dst->tlb_ctl = from->tlb_ctl; > + dst->int_ctl = from->int_ctl; > + dst->int_vector = from->int_vector; > + dst->int_state = from->int_state; > + dst->exit_code = from->exit_code; > + dst->exit_code_hi = from->exit_code_hi; > + dst->exit_info_1 = from->exit_info_1; > + dst->exit_info_2 = from->exit_info_2; > + dst->exit_int_info = from->exit_int_info; > + dst->exit_int_info_err = from->exit_int_info_err; > + dst->nested_ctl = from->nested_ctl; > + dst->event_inj = from->event_inj; > + dst->event_inj_err = from->event_inj_err; > + dst->nested_cr3 = from->nested_cr3; > + dst->virt_ext = from->virt_ext; > + dst->pause_filter_count = from->pause_filter_count; > + dst->pause_filter_thresh = from->pause_filter_thresh; > +} Nitpick: Just in case I would 'memset to zero' the dst, to avoid potentionally having undefined values in fields which we don't copy. > + > static int svm_get_nested_state(struct kvm_vcpu *vcpu, > struct kvm_nested_state __user *user_kvm_nested_state, > u32 user_data_size) > diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h > index 3c950aeca646..78006245e334 100644 > --- a/arch/x86/kvm/svm/svm.h > +++ b/arch/x86/kvm/svm/svm.h > @@ -116,6 +116,31 @@ struct vmcb_save_area_cached { > u64 dr6; > }; > > +struct vmcb_ctrl_area_cached { > + u32 intercepts[MAX_INTERCEPT]; > + u16 pause_filter_thresh; > + u16 pause_filter_count; > + u64 iopm_base_pa; > + u64 msrpm_base_pa; > + u64 tsc_offset; > + u32 asid; > + u8 tlb_ctl; > + u32 int_ctl; > + u32 int_vector; > + u32 int_state; > + u32 exit_code; > + u32 exit_code_hi; > + u64 exit_info_1; > + u64 exit_info_2; > + u32 exit_int_info; > + u32 exit_int_info_err; > + u64 nested_ctl; > + u32 event_inj; > + u32 event_inj_err; > + u64 nested_cr3; > + u64 virt_ext; > +}; This looks great. > + > struct svm_nested_state { > struct kvm_vmcb_info vmcb02; > u64 hsave_msr; > @@ -308,6 +333,12 @@ static inline bool vmcb_is_intercept(struct vmcb_control_area *control, u32 bit) > return test_bit(bit, (unsigned long *)&control->intercepts); > } > > +static inline bool vmcb12_is_intercept(struct vmcb_ctrl_area_cached *control, u32 bit) > +{ > + WARN_ON_ONCE(bit >= 32 * MAX_INTERCEPT); > + return test_bit(bit, (unsigned long *)&control->intercepts); > +} > + > static inline void set_dr_intercepts(struct vcpu_svm *svm) > { > struct vmcb *vmcb = svm->vmcb01.ptr; So other than the nitpick: Reviewed-by: Maxim Levitsky Best regards, Maxim Levitsky