From nobody Mon Aug 26 18:58:31 2024
X-Original-To: dev-commits-src-main@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 4Wt0Lv4zzrz5TRJW;
Mon, 26 Aug 2024 18:58:31 +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 4Wt0Lv3Kprz4F8f;
Mon, 26 Aug 2024 18:58:31 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1724698711;
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=9WkwvBdUKWMclIGmUu2VEUK6adWQI13e9tczNsXMxRY=;
b=DsT29+my1tnYVD0itLzggiWggQczLHEiJFQGGvs1zeYsXhN/s9snPy9BJPgQ3eWPcih0q7
wq3ybnpnYya0zrfsrg8E82nv2y6mc/VVyxSV/uNY/OyRCLF/hbhMkhtu+35t7/5c8ls8Tn
HgW6524LShMD8fN2IqclJVVAlpbJa3gN5Lg7sZRLFTzFW+RvqAfUUxjxbdkuWD2Eaa+ecR
OiNydbzNF2VyaYUpz62rnxI1aqxu1eh89RpGZ01MjKoldWqBCVBNrhq97aULw/77ldsC4f
WVUgkRDEp9Y4XOf7BKHhpgPiB0hYzbA7t2cg+kfWpZ0rTNa40Rziojn1mubZQw==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1724698711; a=rsa-sha256; cv=none;
b=Lrf04VPCtVkaE0BiAIdilnimORa9omyHvqjqA4bHzUOm92JVYxY/N2umxUC/zUzvGlrJI2
HFMXvyNzNj8PwwytHEC6ZEAFwjaT04PeB2nssVo1RxQHVGu7pGNeTf2ciSLHvSh4sc54nT
b1KLUCxi5IRTE/6prbfbfFmFUa2IgTmJWeQ+YlJX6nnrTDPdPkYj1+HBwRTqkZp+enOshu
JOiYFj9E8kJ9Hoq+CDOhsXPadzqZPF0NH6rI6TT67QHN9o3lqFcnPtsmAsP2jSv42+HaC+
uA8UYGSMH138oq0HW8r5ja4+nk/zgSDjTnujmUWoznSCV3WTjzqZWAZ7ur5tdA==
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=1724698711;
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=9WkwvBdUKWMclIGmUu2VEUK6adWQI13e9tczNsXMxRY=;
b=aWBe9VWLjhDL3LnKXNyJugqdccKefqloJQC9i8iExWSn9eXRz28uidQajQPkqyql84XbMC
p0oEqwbTD0LyRGHn+VQArnNkY/sanyu/vmLzonQ227RrMAP7OnExztDUhDD886AUjkzanS
BuldUh9r9XySQbqVuQrSPEdV4XcqeipHngf48dD5909nvLbN7MadrLosxweIedXYbbxvu1
o5RPbrJVtDrD/RK9+1xbEpZ/kSL+WWK/CWYNHR5fSV3d1QUrXyfdTHCTn3Ge8ckdZFok35
RDJttvJOuYUHHLRtlJlDwEZVoF0EjAGHnJOWqnnt7wLaPJka3mThAdz9IM8Zdw==
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 4Wt0Lv2qbCzHNF;
Mon, 26 Aug 2024 18:58:31 +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 47QIwVPa027599;
Mon, 26 Aug 2024 18:58:31 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47QIwVWk027596;
Mon, 26 Aug 2024 18:58:31 GMT
(envelope-from git)
Date: Mon, 26 Aug 2024 18:58:31 GMT
Message-Id: <202408261858.47QIwVWk027596@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Mark Johnston <markj@FreeBSD.org>
Subject: git: 3df92c972898 - main - vmm: Enable assertions in
vmmdev_lookup()
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
X-BeenThere: dev-commits-src-main@freebsd.org
Sender: owner-dev-commits-src-main@FreeBSD.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: markj
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 3df92c972898be7b4b8dafacfd6708f3a39b2af5
Auto-Submitted: auto-generated
The branch main has been updated by markj:
URL: https://cgit.FreeBSD.org/src/commit/?id=3df92c972898be7b4b8dafacfd6708f3a39b2af5
commit 3df92c972898be7b4b8dafacfd6708f3a39b2af5
Author: Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2024-08-26 18:41:23 +0000
Commit: Mark Johnston <markj@FreeBSD.org>
CommitDate: 2024-08-26 18:41:23 +0000
vmm: Enable assertions in vmmdev_lookup()
The comment has been there since the initial import of the vmm code
and presumably reflected some kind of problem with standalone builds of
vmm.ko. However, I don't see any problems with it, and mtx_assert() is
used elsewhere within the vmm code.
Reviewed by: jhb
Differential Revision: https://reviews.freebsd.org/D46438
---
sys/amd64/vmm/vmm_dev.c | 2 --
sys/arm64/vmm/vmm_dev.c | 2 --
2 files changed, 4 deletions(-)
diff --git a/sys/amd64/vmm/vmm_dev.c b/sys/amd64/vmm/vmm_dev.c
index 46cddce4e4b8..9acbfbb454e0 100644
--- a/sys/amd64/vmm/vmm_dev.c
+++ b/sys/amd64/vmm/vmm_dev.c
@@ -228,9 +228,7 @@ vmmdev_lookup(const char *name)
{
struct vmmdev_softc *sc;
-#ifdef notyet /* XXX kernel is not compiled with invariants */
mtx_assert(&vmmdev_mtx, MA_OWNED);
-#endif
SLIST_FOREACH(sc, &head, link) {
if (strcmp(name, vm_name(sc->vm)) == 0)
diff --git a/sys/arm64/vmm/vmm_dev.c b/sys/arm64/vmm/vmm_dev.c
index 946c6760f7c1..c3c6dcc87d88 100644
--- a/sys/arm64/vmm/vmm_dev.c
+++ b/sys/arm64/vmm/vmm_dev.c
@@ -172,9 +172,7 @@ vmmdev_lookup(const char *name)
{
struct vmmdev_softc *sc;
-#ifdef notyet /* XXX kernel is not compiled with invariants */
mtx_assert(&vmmdev_mtx, MA_OWNED);
-#endif
SLIST_FOREACH(sc, &head, link) {
if (strcmp(name, vm_name(sc->vm)) == 0)