Date: Sat, 25 May 2019 10:17:03 +0000 (UTC) From: "Rodney W. Grimes" <rgrimes@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r348269 - stable/11/usr.sbin/bhyve Message-ID: <201905251017.x4PAH3dR045312@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rgrimes Date: Sat May 25 10:17:03 2019 New Revision: 348269 URL: https://svnweb.freebsd.org/changeset/base/348269 Log: MFC: r346717: Make bhyve SMBIOS table topology aware When the CPU Topology was added to bhyve in r332298 the SMBIOS table was missed, this table passes topology information to the system and was still using the old concept of each vCPU is a socket with 1 core and 1 thread. This code did not even try to use the old sysctl information to adjust this data. Correct that by building a proper SMBios table, mapping the > 254 cases to 0 per the SMBios 2.6 specification that is claimed by the structure. Approved by: re (kib) Modified: stable/11/usr.sbin/bhyve/bhyverun.h stable/11/usr.sbin/bhyve/smbiostbl.c Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.sbin/bhyve/bhyverun.h ============================================================================== --- stable/11/usr.sbin/bhyve/bhyverun.h Sat May 25 07:26:30 2019 (r348268) +++ stable/11/usr.sbin/bhyve/bhyverun.h Sat May 25 10:17:03 2019 (r348269) @@ -36,6 +36,7 @@ struct vmctx; extern int guest_ncpus; +extern uint16_t cores, sockets, threads; extern char *guest_uuid_str; extern char *vmname; Modified: stable/11/usr.sbin/bhyve/smbiostbl.c ============================================================================== --- stable/11/usr.sbin/bhyve/smbiostbl.c Sat May 25 07:26:30 2019 (r348268) +++ stable/11/usr.sbin/bhyve/smbiostbl.c Sat May 25 10:17:03 2019 (r348269) @@ -636,7 +636,7 @@ smbios_type4_initializer(struct smbios_structure *temp { int i; - for (i = 0; i < guest_ncpus; i++) { + for (i = 0; i < sockets; i++) { struct smbios_table_type4 *type4; char *p; int nstrings, len; @@ -655,6 +655,16 @@ smbios_type4_initializer(struct smbios_structure *temp *(*endaddr) = '\0'; (*endaddr)++; type4->socket = nstrings + 1; + /* Revise cores and threads after update to smbios 3.0 */ + if (cores > 254) + type4->cores = 0; + else + type4->cores = cores; + /* This threads is total threads in a socket */ + if ((cores * threads) > 254) + type4->threads = 0; + else + type4->threads = (cores * threads); curaddr = *endaddr; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905251017.x4PAH3dR045312>