From nobody Wed Nov 18 19:27:42 2026 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 4jVBSt5gy2z716HB for ; Wed, 18 Nov 2026 19:27:42 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jVBSt59Bwz3GQy for ; Wed, 18 Nov 2026 19:27:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795030062; 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=Mua1lVhCaqVBnlIh83Ov1nFdAPcU/MEgo8SRWl1uOgE=; b=ygcgMqMbJ23zzu6HjLjffYdc/fVUBFqNOYuGPvpM3MQbtBYu5EC70IxlvN5eLr9VuCcbx5 +VjL7YRfCTG9EC+9ETCRfqGA/SluD3otbOc9nWslKHOI0foyEzzBzZDEJk1JCP0iz4XZ32 LxgBorgCwvL+Hcb++THJcZkIO4AqpomdxILTi1juv/U6NvCBPfRPfgSbjLn/tVEsI55tAj DwEHhaVMNdP+GJLGIy01V5j/AvyqhK2VGBJUALeRtV2sIYvAzEqRqYTMPAsKB+Z9ZObqkQ UOQONAFF8w5lYMF300uW9AzFMbE4wML8Jbc7PpdIL4aUda5ZF9dRMUMNJO0Wfw== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1795030062; b=vsUSXDWNLBbm/oh9xiFNTAUKK1UNy9COVf0Dk2cm4QHZStKU264R4dpY0zIB2CO/4uOTBv Sj7Jl5wOaWzPlikoFobdTZ1K8OFGJuOOZ2eyF7XZH7lhgYb0dPULaFpIvoIpEskUYLXxgS cmye7IQj8CLat1fgZrC1tAa9MKxdV4vr+opyF1kygzF/go7NhaviV+3oFxYLo33KLBU9Fi vJNObBI59ZbJqSyiHmhMcGnLcFj5DoxRH51gkMxkpGyjxrjrAdZ7s99SjyWC353fPChoGm MmSqh4Snzn1gsmzQ4XQVRz0fZnjoU1u5gTjBHk7EQH90v+IBKygHH1W/ADkjSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1795030062; 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=Mua1lVhCaqVBnlIh83Ov1nFdAPcU/MEgo8SRWl1uOgE=; b=Yu6wNw3z5SWE7lSZrWSVY0Wj44bg84JDDPf62djCqQhXcBZZDyTWx6R/x1F52VIbLkrACu FXfwxyuX53ILTp4cjxzrjO1drohedi7VC2/fd3XVJ8XlmhmwEVWUJr1bK5SIKQCDWmKMQK 8vkXsCNXrxAs58wiMxlDtlwlxcL9cbHP4buQsy+aL8G9x6CaLWNcdKzEkKxEvQIATeHpbQ sPBy9xcaxyDRApZg4lIEoA7T51Uv7+SSo/Pah8qQ0uzF81x/CujKY0Rn6qnTskl6jRM0dT e5khq+K9pFSAUx348RD0hSZbvUzReR7RzuKL4Lf631IOt3qW1AJk2dNfozh3IQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4jVBSt4XyyzQwg for ; Wed, 18 Nov 2026 19:27:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 16194 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 18 Nov 2026 19:27:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 09fa4e2293d9 - main - Revert "vm_object: Fix synchronization with teardown in the object list loop" List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org List-Id: Commit messages for all branches of the src repository List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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: 09fa4e2293d964e6c0ec3d14638a3cac51b80b54 Auto-Submitted: auto-generated Date: Wed, 18 Nov 2026 19:27:42 +0000 Message-Id: <6afdfc2e.16194.afb4791@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=09fa4e2293d964e6c0ec3d14638a3cac51b80b54 commit 09fa4e2293d964e6c0ec3d14638a3cac51b80b54 Author: Mark Johnston AuthorDate: 2026-11-18 19:27:22 +0000 Commit: Mark Johnston CommitDate: 2026-11-18 19:27:29 +0000 Revert "vm_object: Fix synchronization with teardown in the object list loop" This was pushed by accident. This reverts commit 4e6e4fa8be9940e711b791073eee5bcfa77ec5d4. --- sys/vm/vm_object.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index b6f5e4983fd4..1e6e25d26a54 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -2523,7 +2523,7 @@ vm_object_list_handler(struct sysctl_req *req, bool swap_only) vm_object_t obj; vm_page_t m; u_long sp; - int count, error, flags; + int count, error; key_t key; unsigned short seq; bool want_path; @@ -2556,13 +2556,12 @@ vm_object_list_handler(struct sysctl_req *req, bool swap_only) */ mtx_lock(&vm_object_list_mtx); TAILQ_FOREACH(obj, &vm_object_list, object_list) { - if (obj->type == OBJT_DEAD || (obj->flags & OBJ_DEAD) != 0 || + if (obj->type == OBJT_DEAD || (swap_only && (obj->flags & (OBJ_ANON | OBJ_SWAP)) == 0)) continue; VM_OBJECT_RLOCK(obj); - flags = obj->flags; - if (obj->type == OBJT_DEAD || (flags & OBJ_DEAD) != 0 || - (swap_only && (flags & (OBJ_ANON | OBJ_SWAP)) == 0)) { + if (obj->type == OBJT_DEAD || + (swap_only && (obj->flags & (OBJ_ANON | OBJ_SWAP)) == 0)) { VM_OBJECT_RUNLOCK(obj); continue; } @@ -2605,7 +2604,7 @@ vm_object_list_handler(struct sysctl_req *req, bool swap_only) NULL); if (vp != NULL) { vref(vp); - } else if ((flags & OBJ_ANON) != 0) { + } else if ((obj->flags & OBJ_ANON) != 0) { MPASS(kvo->kvo_type == KVME_TYPE_SWAP); kvo->kvo_me = (uintptr_t)obj; /* tmpfs objs are reported as vnodes */ @@ -2618,18 +2617,13 @@ vm_object_list_handler(struct sysctl_req *req, bool swap_only) sizeof(kvo->kvo_path)); } VM_OBJECT_RUNLOCK(obj); - - /* - * Note, it is safe to invoke shmobjinfo() and shm_get_path() - * concurrent with teardown of the object. - */ - if ((flags & OBJ_SYSVSHM) != 0) { + if ((obj->flags & OBJ_SYSVSHM) != 0) { kvo->kvo_flags |= KVMO_FLAG_SYSVSHM; shmobjinfo(obj, &key, &seq); kvo->kvo_vn_fileid = key; kvo->kvo_vn_fsid_freebsd11 = seq; } - if ((flags & OBJ_POSIXSHM) != 0) { + if ((obj->flags & OBJ_POSIXSHM) != 0) { kvo->kvo_flags |= KVMO_FLAG_POSIXSHM; shm_get_path(obj, kvo->kvo_path, sizeof(kvo->kvo_path));