From nobody Thu Mar 16 12:29:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pcmmd6pL1z3y3yK; Thu, 16 Mar 2023 12:29:53 +0000 (UTC) (envelope-from yuri@aetern.org) Received: from wout5-smtp.messagingengine.com (wout5-smtp.messagingengine.com [64.147.123.21]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pcmmd1mQFz4MCX; Thu, 16 Mar 2023 12:29:53 +0000 (UTC) (envelope-from yuri@aetern.org) Authentication-Results: mx1.freebsd.org; none Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 0B91C3200948; Thu, 16 Mar 2023 08:29:50 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Thu, 16 Mar 2023 08:29:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=aetern.org; h=cc :cc:content-transfer-encoding:content-type:content-type:date :date:from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to; s=fm1; t= 1678969790; x=1679056190; bh=KuHyTExokoOGXTGn12L71BjNPtz53tNjgSV X7duKzzY=; b=JeWVtrzPzR5p1uwm/kcGE3PjXJuHMvfHJRTMMD7drgXvCAlIZ+7 69t9B1jsr5bTa1ClsTUAauqB3KZlXQpL+nVzzG5tgTXyS0eSPX7bkQKapMbrGkyx IHx8Rc0kRtXkhtCYd+mFlgykhE/H/5itSrzZ4XyUkogVMbT2r3g+3FNo9g2qu/+j ccPZIGh6QMvyZiqc7PM6od8b27TlaXGlBMGlyCeKKgrSg+vrLTqS3IIzl7BxEXVD 0z8mK5NrTygLf197dDO8oPypmSwqGxQBGxk0URCDSB3CD9ZG30sBO145tKApL6fY jRjnEPEAO/S7VJ18HBXZdJ31nF5vIMIc58Q== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:content-type:date:date:feedback-id:feedback-id :from:from:in-reply-to:in-reply-to:message-id:mime-version :references:reply-to:sender:subject:subject:to:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t= 1678969790; x=1679056190; bh=KuHyTExokoOGXTGn12L71BjNPtz53tNjgSV X7duKzzY=; b=NAVqvB1WQ6e+gmReeUxhcXsFmDNwoiqXaRhOrzA8izsp7xN8YAq WnkVEBnPoxSWP5zaQIgsYkMPvMUPx10qBVhfO661wZdNURpqf6hsNyU6rup/YdBn La5z0EZbQudxW9+7nH347xUYVeKYGuACrRsqPq3zsFntlHqpxDWMR74wNUwies7a PVb1mpALwp1S4ZrKzDmssz/PY4hvhmXvbCMOyg4eLAmddNVr9n4JI1b3DyBblPRP tpf5tM/3fs7U7/AkWIwoMGA9HwsP3107FmFUFOR6xF+ERdwapMKzRSLbfdLsFb+v i/FvAPcT8BqhqYDhYmsAHQ6OR3JrBXlq1jg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrvdeftddggedtucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepkfffgggfuffvvehfhfgjtgfgsehtkeertddtfeejnecuhfhrohhmpegjuhhr ihcuoeihuhhrihesrggvthgvrhhnrdhorhhgqeenucggtffrrghtthgvrhhnpedvkedthf ekueeuveelfedutefhgfekiefgteevudeigefgjeeugeehffejfefghfenucffohhmrghi nhepfhhrvggvsghsugdrohhrghenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmh epmhgrihhlfhhrohhmpeihuhhrihesrggvthgvrhhnrdhorhhg X-ME-Proxy: Feedback-ID: i0d79475b:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 16 Mar 2023 08:29:49 -0400 (EDT) Message-ID: Date: Thu, 16 Mar 2023 13:29:48 +0100 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.8.0 Subject: Re: git: 2fee87562948 - main - abstract out the vm detection via smbios.. Content-Language: en-US To: Kyle Evans , John-Mark Gurney Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org References: <202303030055.3230tl3S091663@gitrepo.freebsd.org> From: Yuri In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4Pcmmd1mQFz4MCX X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:29838, ipnet:64.147.123.0/24, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N Kyle Evans wrote: > On Thu, Mar 2, 2023 at 6:55 PM John-Mark Gurney wrote: >> >> The branch main has been updated by jmg: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=2fee8756294820ff9ec6f8d17324e7d8a0a45040 >> >> commit 2fee8756294820ff9ec6f8d17324e7d8a0a45040 >> Author: John-Mark Gurney >> AuthorDate: 2023-02-23 20:59:50 +0000 >> Commit: John-Mark Gurney >> CommitDate: 2023-03-03 00:54:21 +0000 >> >> abstract out the vm detection via smbios.. >> >> This makes the detection of VMs common between platforms that >> have SMBios. >> >> Reviewed by: imp, kib >> Differential Revision: https://reviews.freebsd.org/D38800 >> --- >> sys/amd64/amd64/machdep.c | 3 ++ >> sys/arm64/arm64/machdep.c | 4 ++ >> sys/conf/files.arm64 | 2 + >> sys/conf/files.x86 | 1 + >> sys/dev/smbios/smbios.h | 4 ++ >> sys/dev/smbios/smbios_subr.c | 104 +++++++++++++++++++++++++++++++++++++++++++ >> sys/i386/i386/machdep.c | 3 ++ >> sys/x86/x86/identcpu.c | 57 ------------------------ >> 8 files changed, 121 insertions(+), 57 deletions(-) >> >> diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c >> index f33f2c6509f0..480db1ed2c31 100644 >> --- a/sys/amd64/amd64/machdep.c >> +++ b/sys/amd64/amd64/machdep.c >> [... snip ...] >> @@ -1315,6 +1317,7 @@ hammer_time(u_int64_t modulep, u_int64_t physfree) >> >> identify_cpu1(); >> identify_hypervisor(); >> + identify_hypervisor_smbios(); >> identify_cpu_fixup_bsp(); >> identify_cpu2(); >> initializecpucache(); > > This brings in a behavior change that I don't think you intended. > Previously, we wouldn't let smbios clobber a vm_guest detected from > cpuid due to an early return, but nothing is stopping it from > happening now. I think this call should've been protected behind a > `vm_guest == VM_GUEST_NO || vm_guest == VM_GUEST_VM` (the latter being > "CPUID2_HV was set but we couldn't determine anything useful after > that"), perhaps? (sorry, don't have the original message, replying here) This also seem to have broken Hyper-V VM boot: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=270239. Gen2 VM boots again with this commit reverted.