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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id ABDCBC433EF for ; Tue, 12 Jul 2022 11:54:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232952AbiGLLyF (ORCPT ); Tue, 12 Jul 2022 07:54:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36864 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232787AbiGLLxj (ORCPT ); Tue, 12 Jul 2022 07:53:39 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 47055B4BD2 for ; Tue, 12 Jul 2022 04:52:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657626747; 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=dhbH7KElfOyWiL5eIhAtguRUr0eHcXNIg5bb45tjqNE=; b=GB8WWEVuwzD5Fl0s5JrmVm2gkJdIOVUTFp+vfItJbNL6h6wezPaEM0q8VRHnMOEkuELCyW 8Eem/Lbyk/dS3t4GjMaCFfyD8a1g1XmTDlEsxQ88M3vxKrPh4ZvthF8hO9atdnGDtN83cm /ZDFbO9YRVN5tiQ2z4TQScbq+jn/L2Y= Received: from mail-qk1-f197.google.com (mail-qk1-f197.google.com [209.85.222.197]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-612-JEWBG-K8NGugxuSF0-Xfdw-1; Tue, 12 Jul 2022 07:52:26 -0400 X-MC-Unique: JEWBG-K8NGugxuSF0-Xfdw-1 Received: by mail-qk1-f197.google.com with SMTP id n15-20020a05620a294f00b006b5768a0ed0so6893843qkp.7 for ; Tue, 12 Jul 2022 04:52:26 -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:subject:from:to:cc:date:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=dhbH7KElfOyWiL5eIhAtguRUr0eHcXNIg5bb45tjqNE=; b=Bx2Rm9BgF/tBNUCPlQLLoUIjDjBmFyOiHz4N9MqOkULcXqtZG1Mz6BtmWpaPYTUqwn OaG5Mx4ae08VIaq6aH2ngAVVsqCjDJdGQ5BJOa+M2yplqXPwZ909SuZz3H7KfPvGltVw MTL0/gZnIEIymEyclIHJdADZVRVmmxEdEN4SDUPPxRHreTijiqNymOuD0emLOGN8Mkg2 oeRCh9ADb3GqlVVavXuYyrzVVZ9UWHoE4/hSKKDIUp1dS2kLMYGw7twwye42un3EPTWr F0Hygcda/5gQbX/7+QRMrf6vSKoEkVpp8rX3e5ua09VtBRgjdOwuzW2pnDuuahT5KJCv kLJQ== X-Gm-Message-State: AJIora96dVdtQXuDCu4JW+d/fEDTbABEZcSCpmBK4CR/v5DIoEB8UweT DWQtVscEM/VUlBhJ01SZPLlHw25R0a1B6YSMt1Jxre06Dz1HETjqsDp8q/aXKf+E+xVlFFnnY6p MWwuCZ6KF1KUBwclIOMXzutdn X-Received: by 2002:a05:620a:288a:b0:6b5:3d7d:5c22 with SMTP id j10-20020a05620a288a00b006b53d7d5c22mr14480463qkp.603.1657626745946; Tue, 12 Jul 2022 04:52:25 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sEGjmBVqQz0S7Qf0iQ9nIMt3O3IZzz5WmXPQMyFXuPxc6Trhfrnmn1TD7JlrXBV9C5wQe3fA== X-Received: by 2002:a05:620a:288a:b0:6b5:3d7d:5c22 with SMTP id j10-20020a05620a288a00b006b53d7d5c22mr14480447qkp.603.1657626745706; Tue, 12 Jul 2022 04:52:25 -0700 (PDT) Received: from [10.35.4.238] (bzq-82-81-161-50.red.bezeqint.net. [82.81.161.50]) by smtp.gmail.com with ESMTPSA id h19-20020a379e13000000b006b55da43182sm8164931qke.23.2022.07.12.04.52.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Jul 2022 04:52:25 -0700 (PDT) Message-ID: Subject: Re: [PATCH v3 08/25] KVM: selftests: Switch to updated eVMCSv1 definition From: Maxim Levitsky To: Vitaly Kuznetsov , kvm@vger.kernel.org, Paolo Bonzini , Sean Christopherson Cc: Anirudh Rayabharam , Wanpeng Li , Jim Mattson , linux-hyperv@vger.kernel.org, linux-kernel@vger.kernel.org Date: Tue, 12 Jul 2022 14:52:21 +0300 In-Reply-To: <20220708144223.610080-9-vkuznets@redhat.com> References: <20220708144223.610080-1-vkuznets@redhat.com> <20220708144223.610080-9-vkuznets@redhat.com> Content-Type: text/plain; charset="UTF-8" User-Agent: Evolution 3.40.4 (3.40.4-5.fc34) MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 2022-07-08 at 16:42 +0200, Vitaly Kuznetsov wrote: > Update Enlightened VMCS definition in selftests from KVM. > > Signed-off-by: Vitaly Kuznetsov > --- > .../selftests/kvm/include/x86_64/evmcs.h | 45 +++++++++++++++++-- > 1 file changed, 42 insertions(+), 3 deletions(-) > > diff --git a/tools/testing/selftests/kvm/include/x86_64/evmcs.h b/tools/testing/selftests/kvm/include/x86_64/evmcs.h > index 3c9260f8e116..a777711d5474 100644 > --- a/tools/testing/selftests/kvm/include/x86_64/evmcs.h > +++ b/tools/testing/selftests/kvm/include/x86_64/evmcs.h > @@ -203,14 +203,25 @@ struct hv_enlightened_vmcs { > u32 reserved:30; > } hv_enlightenments_control; > u32 hv_vp_id; > - > + u32 padding32_2; This is not just an update, this is a fix - I do see that padding field, in the spec. It is possible that compiler added that padding on its own to pad everything to 8 bytes though. > u64 hv_vm_id; > u64 partition_assist_page; > u64 padding64_4[4]; > u64 guest_bndcfgs; > - u64 padding64_5[7]; > + u64 guest_ia32_perf_global_ctrl; > + u64 guest_ia32_s_cet; > + u64 guest_ssp; > + u64 guest_ia32_int_ssp_table_addr; > + u64 guest_ia32_lbr_ctl; > + u64 padding64_5[2]; Matches the spec. > u64 xss_exit_bitmap; > - u64 padding64_6[7]; > + u64 host_ia32_perf_global_ctrl; > + u64 encls_exiting_bitmap; This is swapped here as well, expains why it was not caught in the testing. > + u64 tsc_multiplier; > + u64 host_ia32_s_cet; > + u64 host_ssp; > + u64 host_ia32_int_ssp_table_addr; > + u64 padding64_6; > }; > > #define HV_VMX_ENLIGHTENED_CLEAN_FIELD_NONE 0 > @@ -656,6 +667,18 @@ static inline int evmcs_vmread(uint64_t encoding, uint64_t *value) > case VIRTUAL_PROCESSOR_ID: > *value = current_evmcs->virtual_processor_id; > break; > + case HOST_IA32_PERF_GLOBAL_CTRL: > + *value = current_evmcs->host_ia32_perf_global_ctrl; > + break; > + case GUEST_IA32_PERF_GLOBAL_CTRL: > + *value = current_evmcs->guest_ia32_perf_global_ctrl; > + break; > + case ENCLS_EXITING_BITMAP: > + *value = current_evmcs->encls_exiting_bitmap; > + break; > + case TSC_MULTIPLIER: > + *value = current_evmcs->tsc_multiplier; > + break; > default: return 1; > } > > @@ -1169,6 +1192,22 @@ static inline int evmcs_vmwrite(uint64_t encoding, uint64_t value) > current_evmcs->virtual_processor_id = value; > current_evmcs->hv_clean_fields &= ~HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_XLAT; > break; > + case HOST_IA32_PERF_GLOBAL_CTRL: > + current_evmcs->host_ia32_perf_global_ctrl = value; > + current_evmcs->hv_clean_fields &= ~HV_VMX_ENLIGHTENED_CLEAN_FIELD_HOST_GRP1; > + break; > + case GUEST_IA32_PERF_GLOBAL_CTRL: > + current_evmcs->guest_ia32_perf_global_ctrl = value; > + current_evmcs->hv_clean_fields &= ~HV_VMX_ENLIGHTENED_CLEAN_FIELD_GUEST_GRP1; > + break; > + case ENCLS_EXITING_BITMAP: > + current_evmcs->encls_exiting_bitmap = value; > + current_evmcs->hv_clean_fields &= ~HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_GRP2; > + break; > + case TSC_MULTIPLIER: > + current_evmcs->tsc_multiplier = value; > + current_evmcs->hv_clean_fields &= ~HV_VMX_ENLIGHTENED_CLEAN_FIELD_CONTROL_GRP2; > + break; > default: return 1; > } > Other than bug in the order of host_ia32_perf_global_ctrl/encls_exiting_bitmap, everything else looks fine to me. So with this bug fixed: Reviewed-by: Maxim Levitsky Best regards, Maxim Levitsky