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 lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6180FC77B7A for ; Wed, 7 Jun 2023 14:49:52 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q6uTn-0000uK-29; Wed, 07 Jun 2023 10:49:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6uTk-0000mL-SB for qemu-devel@nongnu.org; Wed, 07 Jun 2023 10:49:40 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6uTj-0008Uc-99 for qemu-devel@nongnu.org; Wed, 07 Jun 2023 10:49:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1686149378; 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=hgO0zuH52WGqOvR/SaIqBE29zG2YkCXeFK6cIY94RRw=; b=UY4fwjKTGVX3RnqIlIDSBS3aUNqNO38j4LP2/U38EBKsNdxGxFpDuEhF7eC2lNFBiLhZPh 5HFD4LtTssz6V6td/Sv3XWkNFnV+7JL0iDl2jsR6k5lw6qt38z/uqTY/SRxP8wHgqCbfAs /Ghp/MlefcczCbLXT+WSkGPGpFxChLA= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-640-vFPChz-KN1C1jXJw8oQCjQ-1; Wed, 07 Jun 2023 10:49:37 -0400 X-MC-Unique: vFPChz-KN1C1jXJw8oQCjQ-1 Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-94a35b0d4ceso573358966b.3 for ; Wed, 07 Jun 2023 07:49:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686149376; x=1688741376; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hgO0zuH52WGqOvR/SaIqBE29zG2YkCXeFK6cIY94RRw=; b=YkkaVL0sKgrqNsj13N263eSIQ7YgVd+zmTl6uKv6kzp43S/vaTLOg/mdBYDQUXRuZH pOelESv6D1vDGpLAxZtJ6AVPGGx056a0WYa7/hqSxcM6owKVJQttwNB4i6WuGg4PuJvq Y5yvcSfk1vHU2gCJlDTm2gwXSoJ3Ri/ffx+e2ZHDJrOtuV9x1myWQpKcti3alsNEUQb1 FB/T2/Z0wLI9QMkv/TQXgsa+NmnQbwWF4BgGeQuHgS+EA8A6KcQaSTbWDk7V/WtAFwbQ OGvDx7oyrVYe8DqRWEj41El+4QkDYZweTGGhw4taBc4wM/zz6zLP1eFBwLvXpBwftUvH xQMw== X-Gm-Message-State: AC+VfDzirVDfMyGXyktH0Ge4AVqIojCNIq5FvEh09wqCmk40qWF/Pw+a lZhdVvN6FfiB6fLoJG3VvKJi7aoVqGlGcAUMgYObFUtXhGMLwKQJ6QAYVcBhc8T3iAKwLUZQHGU qW+dPoF/cGyrpr98= X-Received: by 2002:a17:907:d94:b0:973:afe2:a01 with SMTP id go20-20020a1709070d9400b00973afe20a01mr5364628ejc.75.1686149375731; Wed, 07 Jun 2023 07:49:35 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4FTugzowx9rENKFQlF68JF6Lwp/7geVy+iywg8piVT6LOgKrNgtdDUqP0gI1e5C3WO3hx60Q== X-Received: by 2002:a17:907:d94:b0:973:afe2:a01 with SMTP id go20-20020a1709070d9400b00973afe20a01mr5364599ejc.75.1686149375220; Wed, 07 Jun 2023 07:49:35 -0700 (PDT) Received: from imammedo.users.ipa.redhat.com (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id p5-20020a170906140500b00974612a9837sm7010775ejc.20.2023.06.07.07.49.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Jun 2023 07:49:34 -0700 (PDT) Date: Wed, 7 Jun 2023 16:49:34 +0200 From: Igor Mammedov To: Zhao Liu Cc: "Michael S . Tsirkin" , Ani Sinha , qemu-devel@nongnu.org, Zhenyu Wang , Zhao Liu Subject: Re: [PATCH v2 2/3] hw/smbios: Fix thread count in type4 Message-ID: <20230607164934.51805cb0@imammedo.users.ipa.redhat.com> In-Reply-To: <20230601092952.1114727-3-zhao1.liu@linux.intel.com> References: <20230601092952.1114727-1-zhao1.liu@linux.intel.com> <20230601092952.1114727-3-zhao1.liu@linux.intel.com> X-Mailer: Claws Mail 4.1.1 (GTK 3.24.38; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=imammedo@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On Thu, 1 Jun 2023 17:29:51 +0800 Zhao Liu wrote: > From: Zhao Liu > > From SMBIOS 3.0 specification, thread count field means: > > Thread Count is the total number of threads detected by the BIOS for > this processor socket. It is a processor-wide count, not a > thread-per-core count. [1] > > So here we should use threads per socket other than threads per core. > > [1] SMBIOS 3.0.0, section 7.5.8, Processor Information - Thread Count > > Fixes: c97294ec1b9e ("SMBIOS: Build aggregate smbios tables and entry point") > Signed-off-by: Zhao Liu > --- > Changes since v1: > * Rename cpus_per_socket to threads_per_socket. > * Add the comment about smp.max_cpus. Thread count and core count will > be calculated in 2 ways and will add a sanity check to ensure we > don't miss any topology level. > --- > hw/smbios/smbios.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c > index d67415d44dd8..faf82d4ae646 100644 > --- a/hw/smbios/smbios.c > +++ b/hw/smbios/smbios.c > @@ -713,6 +713,7 @@ static void smbios_build_type_4_table(MachineState *ms, unsigned instance) > { > char sock_str[128]; > size_t tbl_len = SMBIOS_TYPE_4_LEN_V28; > + unsigned threads_per_socket; > > if (smbios_ep_type == SMBIOS_ENTRY_POINT_TYPE_64) { > tbl_len = SMBIOS_TYPE_4_LEN_V30; > @@ -747,17 +748,20 @@ static void smbios_build_type_4_table(MachineState *ms, unsigned instance) > SMBIOS_TABLE_SET_STR(4, asset_tag_number_str, type4.asset); > SMBIOS_TABLE_SET_STR(4, part_number_str, type4.part); > > + /* smp.max_cpus is the total number of threads for the system. */ > + threads_per_socket = ms->smp.max_cpus / ms->smp.sockets; what I dislike here is introducing topo calculations with its own assumptions in random places. I'd suggest to add threads_per_socket (even if it's just a helper field) into topo structure and calculate it with the rest on topology. And then use result here. > + > t->core_count = (ms->smp.cores > 255) ? 0xFF : ms->smp.cores; > t->core_enabled = t->core_count; > > - t->thread_count = (ms->smp.threads > 255) ? 0xFF : ms->smp.threads; > + t->thread_count = (threads_per_socket > 255) ? 0xFF : threads_per_socket; > > t->processor_characteristics = cpu_to_le16(0x02); /* Unknown */ > t->processor_family2 = cpu_to_le16(0x01); /* Other */ > > if (tbl_len == SMBIOS_TYPE_4_LEN_V30) { > t->core_count2 = t->core_enabled2 = cpu_to_le16(ms->smp.cores); > - t->thread_count2 = cpu_to_le16(ms->smp.threads); > + t->thread_count2 = cpu_to_le16(threads_per_socket); > } > > SMBIOS_BUILD_TABLE_POST;