From nobody Sat Oct 11 05:08:39 2025 X-Original-To: dev-commits-src-branches@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 4ckBTg3XyRz6Cd4v; Sat, 11 Oct 2025 05:08:39 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ckBTg1psnz4FLV; Sat, 11 Oct 2025 05:08:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760159319; 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=lSDJpGJbP3qmg0aFTvFR8OOJXHB9VSG5R0dhnGXlChs=; b=bOP2ycLlj2LBfrdZ+vSf8WA3VqOPV/5KKIosft9/huQHouxNyp+RzrlsTzv23Lb/ec1myq gjgfhtIn/x2p29oC97Negxo4O9qSk0cb7XNI2TrR3RuJs+LifoX3NMmtvLgAsC+o2YHPku WuPkHSveix5rnDGRdiobmkmsx8USV8indrqmTJwR4MDcxD6ZxPPAsCr6lUtTHLhOUH2tbr 2p9yB3ydhbwy6ZuBOseNuLhg+DYL+kwAqvq4ODsgW23R248JjE6G4xuDE5+bOLHl2KS/N+ YSB+6XMFUco3rV0Rwbg9o5bYFfvejulIAJEEvdm96q4ctKgsX7rRNJJzMkUwaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760159319; 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=lSDJpGJbP3qmg0aFTvFR8OOJXHB9VSG5R0dhnGXlChs=; b=nd9YWEk5OsiFs5RB/cbdCf43lUr6eiigUdWJGe0CSFiJ3M3A0+u+ppIaLxKVyL4Kx7OVds FtzL4k8SCkyZPYSVBltJv1/RGJfEfaKeYH5LaBn+RW3V0ihrvC/YMzt52IV98y/d84p4hM 8yBBAMi6HX8zXnYNK3oaFaj/nnClVK+2OYREooXMTtWtxuawMF/5yDzZ3G9sI/dYVpXKFZ B5PTWEzMiVnM8eMArAcVaekw4cJMBhgG8WKMjg1+IltUBTfHtcOwooSflRb4IdQwFXEo9P du5/J+xKk4Zch+Zn6uTJXRUivpqaJH4l4L+GZCZYi8rSL5+iX2EmyYTz8kf4fA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760159319; a=rsa-sha256; cv=none; b=mf9fO6s2nd+Y5N12x+Dz2Z8cqDsbi6LTbiTW273GFIzXEM1VrGvrQysv5RxnXde+QBcNcS 192hID01lw3QC+oUcBTJ28KNoxuaRj8qjYZSCSz1rfvz7O8OkF5egv4MeuAJG7WRtkV48P 4IhWoZXRldxKaDBUOFjvYkfHtYj7zRZNu0NPFwlgWAtdqJrDk0lX2P6pH6zUn0CLF4JRpM +lyUSKCS95egcw3Qj6aAjG2pcmg+xPo1wrHsyCusCZGHCMLXbI1Fp6JJkz8z/hBZ6t/LY1 A4edlcOYrWcl3XD4Vj9HA/J+tKAlbLqwGdNGgzWZIlg0e1CFBgwFO+w1VRR+ZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ckBTg17bRz4LG; Sat, 11 Oct 2025 05:08:39 +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 59B58djw051455; Sat, 11 Oct 2025 05:08:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59B58drY051452; Sat, 11 Oct 2025 05:08:39 GMT (envelope-from git) Date: Sat, 11 Oct 2025 05:08:39 GMT Message-Id: <202510110508.59B58drY051452@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 27d5df7c26c2 - stable/15 - vm_fault: assert that first_m is xbusy List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 27d5df7c26c24ca63996ae1582dcbe7fbc167448 Auto-Submitted: auto-generated The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=27d5df7c26c24ca63996ae1582dcbe7fbc167448 commit 27d5df7c26c24ca63996ae1582dcbe7fbc167448 Author: Konstantin Belousov AuthorDate: 2025-08-05 15:46:56 +0000 Commit: Konstantin Belousov CommitDate: 2025-10-11 05:08:13 +0000 vm_fault: assert that first_m is xbusy (cherry picked from commit a38483fa2b3a26414d3409b12dd35ac406c44cea) --- sys/vm/vm_fault.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index 859b1f9e1a94..dfd711ca93ea 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -1802,6 +1802,11 @@ found: /* * A valid page has been found and busied. The object lock * must no longer be held if the page was busied. + * + * Regardless of the busy state of fs.m, fs.first_m is always + * exclusively busied after the first iteration of the loop + * calling vm_fault_object(). This is an ordering point for + * the parallel faults occuring in on the same page. */ vm_page_assert_busied(fs.m); VM_OBJECT_ASSERT_UNLOCKED(fs.object); @@ -1904,6 +1909,9 @@ found: (*fs.m_hold) = fs.m; vm_page_wire(fs.m); } + + KASSERT(fs.first_object == fs.object || vm_page_xbusied(fs.first_m), + ("first_m must be xbusy")); if (vm_page_xbusied(fs.m)) vm_page_xunbusy(fs.m); else