Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp553529iob; Wed, 11 May 2022 22:28:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzlYB4wlTwdCc3RYAVGbO+Bt4DBH3aMQRfaHjPpo24O9p/xYSPITZKgvJU1ahquT93en3ej X-Received: by 2002:a17:90b:694:b0:1d9:6a2e:bc9 with SMTP id m20-20020a17090b069400b001d96a2e0bc9mr9089094pjz.169.1652333282044; Wed, 11 May 2022 22:28:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652333282; cv=none; d=google.com; s=arc-20160816; b=OxddofVzEDXneJKmNGdwl0PtJPU58pCQp6//895PomtuATLB3ClsHJ2dqg5B3QB+8R ozYW2J3VtyBSRpz7dgcOU4sW5eOKrS9vCCznhapAAR4yqd6ldrPgPlp+/irM7HnAQqtt XrYywYnNKpyXtYYZ5wmpaXIj2BYWufW9zD8pNkmwjtGSIxzPM6hnPK22P9tTdYB4IduI MC5urZsPARqfDy128tuKdox9Z5cG/gxwTV3HabwgaRrJ3C++8y8+aGumykIpCzYCZwV5 +siT5U6wgQwOMgbEPAg2qG2I35uVwB1H7HS6nSlcV8inATYarbmMNxBC5e2SJfkN6fRT CoRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:date:cc:to:from:subject :message-id:dkim-signature; bh=wohS2fd8iJK+nOu4KauEQg//cRaTs75yj08GCIBle5g=; b=aHJfnrG0hgH16PnYPoEZngynTLa3IZbMcT2W8b2KhNkAwIqnsy6zbZezAF7OKKSfU3 beW7hrEpjM/Z/+1XLQ5MZ+ARs15wIcYDMxdQYPAurXZG39OYJmxcgY+DSDgqh+sCXCgT tQYoBAzY8JuwUHPVJj98pwZ54/yPAcmeVW7eW/cFaR2BauVn5H5a8RQuhkeT0A1t/Bv8 nge2G6qJDHU+m+OBlm9SJoS7QLJL0cWMYWyuYI1X0wdH6uQi/R+4H1OLQhxaDQe2JSEm 39CLsJvOmmuaN5fTLn1oqPP+EJjsnMRbfGtySUhrs/Zub0DR5OPt4ZO4isfhfSr2UTQt ySag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=AJxXfDCg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a65-20020a639044000000b003aa4d4de736si2098985pge.246.2022.05.11.22.27.49; Wed, 11 May 2022 22:28:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=AJxXfDCg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232202AbiEKLbU (ORCPT + 99 others); Wed, 11 May 2022 07:31:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47882 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237916AbiEKLak (ORCPT ); Wed, 11 May 2022 07:30:40 -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 D0F472415EF for ; Wed, 11 May 2022 04:30:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652268630; 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=wohS2fd8iJK+nOu4KauEQg//cRaTs75yj08GCIBle5g=; b=AJxXfDCgaNzYsH4bF7s9T+X7TPWz/wZ+ERMab7POHimDXheMBC10rLE8MDOf0JORcpLzdk Zr629T+1YO8AXZnDGONQfcDkFTYRNrjqQQVYhTEZxdn6JLx/Js5DRm4XCJ3esiAFzNOPh8 BTlP/UMy+MpFklvO058smzbZACkX3XE= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-642-25UsvugIN9usLHru1ARIcQ-1; Wed, 11 May 2022 07:30:27 -0400 X-MC-Unique: 25UsvugIN9usLHru1ARIcQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 23770801210; Wed, 11 May 2022 11:30:27 +0000 (UTC) Received: from starship (unknown [10.40.192.26]) by smtp.corp.redhat.com (Postfix) with ESMTP id 72C8214693A5; Wed, 11 May 2022 11:30:24 +0000 (UTC) Message-ID: Subject: Re: [PATCH v3 18/34] x86/hyperv: Fix 'struct hv_enlightened_vmcs' definition From: Maxim Levitsky To: Vitaly Kuznetsov , kvm@vger.kernel.org, Paolo Bonzini Cc: Sean Christopherson , Wanpeng Li , Jim Mattson , Michael Kelley , Siddharth Chandrasekaran , linux-hyperv@vger.kernel.org, linux-kernel@vger.kernel.org Date: Wed, 11 May 2022 14:30:23 +0300 In-Reply-To: <20220414132013.1588929-19-vkuznets@redhat.com> References: <20220414132013.1588929-1-vkuznets@redhat.com> <20220414132013.1588929-19-vkuznets@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.85 on 10.11.54.7 X-Spam-Status: No, score=-3.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW, SPF_HELO_NONE,SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 2022-04-14 at 15:19 +0200, Vitaly Kuznetsov wrote: > Section 1.9 of TLFS v6.0b says: > > "All structures are padded in such a way that fields are aligned > naturally (that is, an 8-byte field is aligned to an offset of 8 bytes > and so on)". > > 'struct enlightened_vmcs' has a glitch: > > ... > struct { > u32 nested_flush_hypercall:1; /* 836: 0 4 */ > u32 msr_bitmap:1; /* 836: 1 4 */ > u32 reserved:30; /* 836: 2 4 */ > } hv_enlightenments_control; /* 836 4 */ > u32 hv_vp_id; /* 840 4 */ > u64 hv_vm_id; /* 844 8 */ > u64 partition_assist_page; /* 852 8 */ > ... > > And the observed values in 'partition_assist_page' make no sense at > all. Fix the layout by padding the structure properly. > > Fixes: 68d1eb72ee99 ("x86/hyper-v: define struct hv_enlightened_vmcs and clean field bits") > Reviewed-by: Michael Kelley > Signed-off-by: Vitaly Kuznetsov > --- > arch/x86/include/asm/hyperv-tlfs.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/x86/include/asm/hyperv-tlfs.h b/arch/x86/include/asm/hyperv-tlfs.h > index 5225a85c08c3..e7ddae8e02c6 100644 > --- a/arch/x86/include/asm/hyperv-tlfs.h > +++ b/arch/x86/include/asm/hyperv-tlfs.h > @@ -548,7 +548,7 @@ struct hv_enlightened_vmcs { > u64 guest_rip; > > u32 hv_clean_fields; > - u32 hv_padding_32; > + u32 padding32_1; > u32 hv_synthetic_controls; > struct { > u32 nested_flush_hypercall:1; > @@ -556,7 +556,7 @@ struct hv_enlightened_vmcs { > u32 reserved:30; > } __packed hv_enlightenments_control; > u32 hv_vp_id; > - > + u32 padding32_2; > u64 hv_vm_id; > u64 partition_assist_page; > u64 padding64_4[4]; Makes sense. Reviewed-by: Maxim Levitsky Best regards, Maxim Levitsky