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=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,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 62BD3C3F2D1 for ; Tue, 3 Mar 2020 01:10:27 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 37D9F2465E for ; Tue, 3 Mar 2020 01:10:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 37D9F2465E Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:40690 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8w4o-00063w-En for qemu-devel@archiver.kernel.org; Mon, 02 Mar 2020 20:10:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48220) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8w3q-0005I0-4Z for qemu-devel@nongnu.org; Mon, 02 Mar 2020 20:09:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j8w3o-0004Ay-Nz for qemu-devel@nongnu.org; Mon, 02 Mar 2020 20:09:26 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:3255 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j8w3o-00049h-Ai for qemu-devel@nongnu.org; Mon, 02 Mar 2020 20:09:24 -0500 Received: from DGGEMS401-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 8A5AB7692DDADCC4DEEF; Tue, 3 Mar 2020 09:09:20 +0800 (CST) Received: from [127.0.0.1] (10.173.221.228) by DGGEMS401-HUB.china.huawei.com (10.3.19.201) with Microsoft SMTP Server id 14.3.439.0; Tue, 3 Mar 2020 09:09:14 +0800 Subject: Re: [PATCH v2] hw/smbios: add options for type 4 max-speed and current-speed To: Igor Mammedov References: <20200302092910.31533-1-guoheyi@huawei.com> <20200302145203.559ade3b@redhat.com> From: Heyi Guo Message-ID: Date: Tue, 3 Mar 2020 09:09:13 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 MIME-Version: 1.0 In-Reply-To: <20200302145203.559ade3b@redhat.com> Content-Type: text/plain; charset="utf-8"; format=flowed X-Originating-IP: [10.173.221.228] X-CFilter-Loop: Reflected Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 45.249.212.191 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: wanghaibin.wang@huawei.com, =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= , qemu-devel@nongnu.org, "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 2020/3/2 21:52, Igor Mammedov wrote: > On Mon, 2 Mar 2020 17:29:10 +0800 > Heyi Guo wrote: > >> Common VM users sometimes care about CPU speed, so we add two new >> options to allow VM vendors to present CPU speed to their users. >> Normally these information can be fetched from host smbios. >> >> Strictly speaking, the "max speed" and "current speed" in type 4 >> are not really for the max speed and current speed of processor, for >> "max speed" identifies a capability of the system, and "current speed" >> identifies the processor's speed at boot (see smbios spec), but some >> applications do not tell the differences. >> >> Signed-off-by: Heyi Guo > With comment fixed as suggested below: > Reviewed-by: Igor Mammedov Thanks; I've fixed that in v3 and add your R-b :) > > PS: > pls add/extend test cases for these options (default and custom setting= s). > (see test_smbios_structs() for example) > I'd do it as an additional patch. Let me take some time to learn how to write such test cases :) Thanks, Heyi > > >> --- >> Cc: "Michael S. Tsirkin" >> Cc: Igor Mammedov >> Cc: Philippe Mathieu-Daud=C3=A9 >> >> v1 -> v2: >> - change "_" in option names to "-" >> - check if option value is too large to fit in SMBIOS type 4 speed fie= lds. >> >> --- >> hw/smbios/smbios.c | 28 +++++++++++++++++++++++++--- >> qemu-options.hx | 3 ++- >> 2 files changed, 27 insertions(+), 4 deletions(-) >> >> diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c >> index ffd98727ee..77135a1eca 100644 >> --- a/hw/smbios/smbios.c >> +++ b/hw/smbios/smbios.c >> @@ -94,6 +94,8 @@ static struct { >> =20 >> static struct { >> const char *sock_pfx, *manufacturer, *version, *serial, *asset, = *part; >> + uint32_t max_speed; >> + uint32_t current_speed; >> } type4; >> =20 >> static struct { >> @@ -272,6 +274,14 @@ static const QemuOptDesc qemu_smbios_type4_opts[]= =3D { >> .name =3D "version", >> .type =3D QEMU_OPT_STRING, >> .help =3D "version number", >> + },{ >> + .name =3D "max-speed", >> + .type =3D QEMU_OPT_NUMBER, >> + .help =3D "max speed in MHz", >> + },{ >> + .name =3D "current-speed", >> + .type =3D QEMU_OPT_NUMBER, >> + .help =3D "speed at system boot in MHz", >> },{ >> .name =3D "serial", >> .type =3D QEMU_OPT_STRING, >> @@ -586,9 +596,8 @@ static void smbios_build_type_4_table(MachineState= *ms, unsigned instance) >> SMBIOS_TABLE_SET_STR(4, processor_version_str, type4.version); >> t->voltage =3D 0; >> t->external_clock =3D cpu_to_le16(0); /* Unknown */ >> - /* SVVP requires max_speed and current_speed to not be unknown. *= / >> - t->max_speed =3D cpu_to_le16(2000); /* 2000 MHz */ >> - t->current_speed =3D cpu_to_le16(2000); /* 2000 MHz */ >> + t->max_speed =3D cpu_to_le16(type4.max_speed); >> + t->current_speed =3D cpu_to_le16(type4.current_speed); >> t->status =3D 0x41; /* Socket populated, CPU enabled */ >> t->processor_upgrade =3D 0x01; /* Other */ >> t->l1_cache_handle =3D cpu_to_le16(0xFFFF); /* N/A */ >> @@ -1129,6 +1138,19 @@ void smbios_entry_add(QemuOpts *opts, Error **e= rrp) >> save_opt(&type4.serial, opts, "serial"); >> save_opt(&type4.asset, opts, "asset"); >> save_opt(&type4.part, opts, "part"); >> + /* >> + * SVVP requires max_speed and current_speed to not be un= known, and > double negation is hard to read, so > > s/ > to not be unknown > / > to be set and not being 0 which counts as unknown (SMBIOS 3.1.0/Table 2= 1) > / > >> + * we set the default value to 2000MHz as we did before. > s/,and we set/. Set/ > >> + */ >> + type4.max_speed =3D qemu_opt_get_number(opts, "max-speed"= , 2000); >> + type4.current_speed =3D qemu_opt_get_number(opts, "curren= t-speed", >> + 2000); >> + if (type4.max_speed > UINT16_MAX || >> + type4.current_speed > UINT16_MAX) { >> + error_setg(errp, "SMBIOS CPU speed is too large (> %d= )", >> + UINT16_MAX); >> + } >> + >> return; >> case 11: >> qemu_opts_validate(opts, qemu_smbios_type11_opts, &err); >> diff --git a/qemu-options.hx b/qemu-options.hx >> index ac315c1ac4..7a2f7c1f66 100644 >> --- a/qemu-options.hx >> +++ b/qemu-options.hx >> @@ -2233,6 +2233,7 @@ DEF("smbios", HAS_ARG, QEMU_OPTION_smbios, >> " specify SMBIOS type 3 fields\n" >> "-smbios type=3D4[,sock_pfx=3Dstr][,manufacturer=3Dstr][,version= =3Dstr][,serial=3Dstr]\n" >> " [,asset=3Dstr][,part=3Dstr]\n" >> + " [,max-speed=3D%d][,current-speed=3D%d]\n" >> " specify SMBIOS type 4 fields\n" >> "-smbios type=3D17[,loc_pfx=3Dstr][,bank=3Dstr][,manufacturer=3D= str][,serial=3Dstr]\n" >> " [,asset=3Dstr][,part=3Dstr][,speed=3D%d]\n" >> @@ -2255,7 +2256,7 @@ Specify SMBIOS type 2 fields >> @item -smbios type=3D3[,manufacturer=3D@var{str}][,version=3D@var{st= r}][,serial=3D@var{str}][,asset=3D@var{str}][,sku=3D@var{str}] >> Specify SMBIOS type 3 fields >> =20 >> -@item -smbios type=3D4[,sock_pfx=3D@var{str}][,manufacturer=3D@var{st= r}][,version=3D@var{str}][,serial=3D@var{str}][,asset=3D@var{str}][,part=3D= @var{str}] >> +@item -smbios type=3D4[,sock_pfx=3D@var{str}][,manufacturer=3D@var{st= r}][,version=3D@var{str}][,serial=3D@var{str}][,asset=3D@var{str}][,part=3D= @var{str}][,max-speed=3D@var{%d}][,current-speed=3D@var{%d}] >> Specify SMBIOS type 4 fields >> =20 >> @item -smbios type=3D17[,loc_pfx=3D@var{str}][,bank=3D@var{str}][,ma= nufacturer=3D@var{str}][,serial=3D@var{str}][,asset=3D@var{str}][,part=3D= @var{str}][,speed=3D@var{%d}] > > .