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=-6.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS 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 2AF53C3F2D9 for ; Mon, 2 Mar 2020 13:52:54 +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 EA8502467C for ; Mon, 2 Mar 2020 13:52:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="a12Og2TD" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EA8502467C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:33066 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8lV7-0001rJ-0M for qemu-devel@archiver.kernel.org; Mon, 02 Mar 2020 08:52:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:55653) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8lUW-0001Ro-3P for qemu-devel@nongnu.org; Mon, 02 Mar 2020 08:52:17 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j8lUU-0001bH-Mu for qemu-devel@nongnu.org; Mon, 02 Mar 2020 08:52:16 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:41201 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j8lUU-0001bD-Iv for qemu-devel@nongnu.org; Mon, 02 Mar 2020 08:52:14 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1583157134; 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=Np8WMLdSRCmkQgyMMdNimonYMz42GubRzr67KQ6DrY0=; b=a12Og2TDzd1sZ3zc8ownje8EeorK70r1ZwOn8xO476jHEioSPmYCotkb1OCVGikehdueDw Iesw9DZK0UVYKmdNKiV9IVsjhVecQ1z7FP99jmZugzszdG8YW7kwjlL/PsxZH5zq9uYNet azCPHs0PoodreChKhxdkuPeIoKf/FfU= 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-364-_lxNPdrdMSOg54a92DYw8g-1; Mon, 02 Mar 2020 08:52:10 -0500 X-MC-Unique: _lxNPdrdMSOg54a92DYw8g-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9FDDD18CA264; Mon, 2 Mar 2020 13:52:09 +0000 (UTC) Received: from localhost (unknown [10.43.2.114]) by smtp.corp.redhat.com (Postfix) with ESMTP id 780D048; Mon, 2 Mar 2020 13:52:04 +0000 (UTC) Date: Mon, 2 Mar 2020 14:52:03 +0100 From: Igor Mammedov To: Heyi Guo Subject: Re: [PATCH v2] hw/smbios: add options for type 4 max-speed and current-speed Message-ID: <20200302145203.559ade3b@redhat.com> In-Reply-To: <20200302092910.31533-1-guoheyi@huawei.com> References: <20200302092910.31533-1-guoheyi@huawei.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 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, Philippe =?UTF-8?B?TWF0aGlldS1EYXVkw6k=?= , qemu-devel@nongnu.org, "Michael S. Tsirkin" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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. >=20 > 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. >=20 > Signed-off-by: Heyi Guo With comment fixed as suggested below: Reviewed-by: Igor Mammedov PS: pls add/extend test cases for these options (default and custom settings). (see test_smbios_structs() for example) I'd do it as an additional patch. > --- > Cc: "Michael S. Tsirkin" > Cc: Igor Mammedov > Cc: Philippe Mathieu-Daud=C3=A9 >=20 > v1 -> v2: > - change "_" in option names to "-" > - check if option value is too large to fit in SMBIOS type 4 speed fields= . >=20 > --- > hw/smbios/smbios.c | 28 +++++++++++++++++++++++++--- > qemu-options.hx | 3 ++- > 2 files changed, 27 insertions(+), 4 deletions(-) >=20 > 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, *par= t; > + 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 *m= s, 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 **errp= ) > 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 unkno= wn, 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 21) / > + * 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", 2= 000); > + type4.current_speed =3D qemu_opt_get_number(opts, "current-s= peed", > + 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=3Ds= tr][,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=3Dstr]= [,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{str}][= ,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{str}]= [,version=3D@var{str}][,serial=3D@var{str}][,asset=3D@var{str}][,part=3D@va= r{str}] > +@item -smbios type=3D4[,sock_pfx=3D@var{str}][,manufacturer=3D@var{str}]= [,version=3D@var{str}][,serial=3D@var{str}][,asset=3D@var{str}][,part=3D@va= r{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}][,manufa= cturer=3D@var{str}][,serial=3D@var{str}][,asset=3D@var{str}][,part=3D@var{s= tr}][,speed=3D@var{%d}]