From nobody Wed Sep 04 00:55:43 2024 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 4Wz3vM5cc2z5Mp6q; Wed, 04 Sep 2024 00:55:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Wz3vM56Shz4Yhr; Wed, 4 Sep 2024 00:55:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725411343; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U36518dUvQP0GZfrmjIlvQv70jcBRZ/hgZBeTyJ2aGc=; b=U34NJVQOfVvJQawKIiRRxZuMVTp5uJqcDR6otdtzdNTuoo6sWRm80KYxUf2j7V57NtKRIK QymGoqZyC+ekuIK/0MfYBfYgREIeCKC08g+E8lrLj6yzlt+q11oKiAQG9hSjUnW3TOKo/9 6+FYkCEls39kKpImdMdc+WQp08eSs1F3lVDY/OIc3W0qWopY3bR24c5TrpVSYaoErtFWWU OzKgwqBITLtxXn6Ga5BLnhnz6ZLMEKOLxVMjubTR0fa8zzHb2EbpaLk+8D4hA3C0DO/eQk i7xrA+IESDkL3w6HbRFS3txFT8YxSafl39HyDhG3hVFlSakVaSgH6FSltkHp+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725411343; a=rsa-sha256; cv=none; b=kLmEqPOBIKstPhKH0F9fhANyTepG10s2++tw7LbWLBTGh9CmJBjNgwyuTVYbNNW0Z0aprC c/GEUZhvQb9YN+8VNch74AGpcfucQqzYCXFPcHF1w0S6le0avYBfTrnLCFZjCai9SywcpX KYfdiyyQC35qBVfFxDU7r1XgyOpQ7rtxDbwy8904tiYdd/cahw59LCELSsA4fgbD7VA+vY mOr7skDjuwflmctRLMcTQ8bY4qIY7+jSGYo3RkG39MVphTBHj+YYD7tQ23Gtb6cO5PsiVx 7HGSJXEq+kWakuCiGypwHFtRvhJx53rPRq+FjFYf0+7Dj46OENVW1T4nl3eSpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725411343; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U36518dUvQP0GZfrmjIlvQv70jcBRZ/hgZBeTyJ2aGc=; b=nRt9EaFO7gbOKZFg1uU6Fqk2i/RWOMj/ybcpXz/tssSm76z4Sb+47RyKSM51nz1YPcVxnH I1kify+b78DrJrea9u4dekCLf8pX9O+OifSI/+LXoMTYOjWDXQzZW5JfQWGVYwyZ/pj4EC CCFQ8o0XOGpgauJabjdGW5UfCpQ0Y47W6HX9bmGmJ61CGZ9rhkM4V5loWLEeyBZvF+BFcD 88biwh0oBg8dmn+62276Zvqyls6WDCSTuhLN2D6MWKDj7dmC9DopmcSUpfezmuGIGFgji8 qoLRBlcPfJtXAKqNfVX8Iaep8xNY1HvrWwZOxhmPLiDLZToOaeYLUrNvVHnfXQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Wz3vM4jwQz13WM; Wed, 4 Sep 2024 00:55:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4840thB1090082; Wed, 4 Sep 2024 00:55:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4840thg5090079; Wed, 4 Sep 2024 00:55:43 GMT (envelope-from git) Date: Wed, 4 Sep 2024 00:55:43 GMT Message-Id: <202409040055.4840thg5090079@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 9fe5e83e44d6 - stable/13 - x86: Detect NVMM hypervisor 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9fe5e83e44d6f7dde23b60ed6e09626d31e5c46a Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=9fe5e83e44d6f7dde23b60ed6e09626d31e5c46a commit 9fe5e83e44d6f7dde23b60ed6e09626d31e5c46a Author: Kevin Bowling AuthorDate: 2024-08-28 09:31:35 +0000 Commit: Kevin Bowling CommitDate: 2024-09-04 00:52:30 +0000 x86: Detect NVMM hypervisor (cherry picked from commit f622dc5daecc5c05504cfc605b6f2d66a3bd90e8) --- sys/kern/subr_param.c | 1 + sys/sys/systm.h | 2 +- sys/x86/x86/identcpu.c | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/kern/subr_param.c b/sys/kern/subr_param.c index c2672d98ba8d..0ea2279ef2e6 100644 --- a/sys/kern/subr_param.c +++ b/sys/kern/subr_param.c @@ -162,6 +162,7 @@ static const char *const vm_guest_sysctl_names[] = { [VM_GUEST_BHYVE] = "bhyve", [VM_GUEST_VBOX] = "vbox", [VM_GUEST_PARALLELS] = "parallels", + [VM_GUEST_NVMM] = "nvmm", [VM_LAST] = NULL }; CTASSERT(nitems(vm_guest_sysctl_names) - 1 == VM_LAST); diff --git a/sys/sys/systm.h b/sys/sys/systm.h index d073c87af163..ee432fb0d864 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -81,7 +81,7 @@ extern u_long maxphys; /* max raw I/O transfer size */ */ enum VM_GUEST { VM_GUEST_NO = 0, VM_GUEST_VM, VM_GUEST_XEN, VM_GUEST_HV, VM_GUEST_VMWARE, VM_GUEST_KVM, VM_GUEST_BHYVE, VM_GUEST_VBOX, - VM_GUEST_PARALLELS, VM_LAST }; + VM_GUEST_PARALLELS, VM_GUEST_NVMM, VM_LAST }; #endif /* KERNEL */ diff --git a/sys/x86/x86/identcpu.c b/sys/x86/x86/identcpu.c index 992dbb421aa4..8a5d74ca5a2d 100644 --- a/sys/x86/x86/identcpu.c +++ b/sys/x86/x86/identcpu.c @@ -1388,6 +1388,7 @@ static struct { { "KVMKVMKVM", VM_GUEST_KVM }, /* KVM */ { "bhyve bhyve ", VM_GUEST_BHYVE }, /* bhyve */ { "VBoxVBoxVBox", VM_GUEST_VBOX }, /* VirtualBox */ + { "___ NVMM ___", VM_GUEST_NVMM }, /* NVMM */ }; static void