From nobody Sat Oct 11 05:08:35 2025 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 4ckBTc1PmVz6Ccrs; Sat, 11 Oct 2025 05:08:36 +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 4ckBTb5cDgz4FFZ; Sat, 11 Oct 2025 05:08:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760159315; 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=z9OUgzEsMqFkuDcd2tkCyIndytLb5FKIHNtKfWdCVVA=; b=Rr5nLRpINeMRtiTJ7jGK4ifrQ6o4W61uajh3skEMB+Oj/Mr1QNO9OSspM7ATn6NUjwt9Dt TVX1xhU3o8DC0BtHwTqZh5QYaNXzvkFbHVrWFAj9Dyu3Qg4CyTnvdgaYDJ+B5ckNgWjK3q V20aY8sVd+bkQ2fWCueQ6OBipFPKlW1Ab9F9DeV4SdK2TWkrxIvjZ43rjK+43JddnfaJrx Qb/X6ZkBcq36JFaMpWiUoeHAu+hVCl5yDGPs3S5lYuK4O41tQQTQzoX7wkmxZexKYUBwCm AMpsg16s4zWgIcYIlm1AAGFp2NNSJKaLS0BguYt6tecBos6s9s4ZE7D03ByCbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760159315; 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=z9OUgzEsMqFkuDcd2tkCyIndytLb5FKIHNtKfWdCVVA=; b=mkWE5FF6TsNvZOnJn8OzVrUSe69mxb30SpskZIJv+AKRuIjrSME5HSpEcINgu7qyS6B4vR JNLHkGpejm+ZjISY8vpNS3SAHxFmCaduo4T77zJRrVsFpu3uRxVvsfEd+0a/V8jp09bqef 1U0tRmuGszUCswmjVIlGYIVbEOuLGJw/WJWJBNO/D+AKn7rHmKRk64VeJRjdIrBJKFVhWY 3/pHtJ0WAHCoOWMUI/ue1ORGN9r7dWHFpzJVIeJUPVs1mkD6uxuH9Q31j9saBTFaRgtJn7 MmgA86TlYmudd4TuuQSHdwwDt7QzDFqAOb6FqPL7H/W8/H7Sw9qk+NMx5UjuwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760159315; a=rsa-sha256; cv=none; b=Vza+GVd8F+U7JITq19kJAzUoUdS6XTRZFGq6NgabgR/ot+Ulvdg/Mhkf+c8dv4Ar1fMBNZ O/z3XZ53/Nh+78JwgnXeOUqJwVUE3JVB6EASo7Uhq+CPi7B+h+SGjUMypRC1OteWXfAkm8 ZwIYq7CLnhFy0t2oWZXOb7cQzR6/uU3FHHvPdRXCTMuvpxVN07/OhRtvm6bShIo+b762jW hl5is653gPituw8ydAF9QUwBH9GevfHVG+FlYq7BfVdrx2ABAzdBZW82cjMiXXrR0nEG8Y Ze2NcIUnYAmucktLrIrTDlUf3XJR1xi3NVRXT61eIaOSwgpn15Tn5zLO9cNW6g== 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 4ckBTb58gsz4J9; Sat, 11 Oct 2025 05:08:35 +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 59B58ZqW051340; Sat, 11 Oct 2025 05:08:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59B58ZXp051337; Sat, 11 Oct 2025 05:08:35 GMT (envelope-from git) Date: Sat, 11 Oct 2025 05:08:35 GMT Message-Id: <202510110508.59B58ZXp051337@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: 0188344fc3ec - stable/15 - vm_fault: add vm_fault_might_be_cow() helper 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0188344fc3ec94b55b2fa628a5339ed88c25d897 Auto-Submitted: auto-generated The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0188344fc3ec94b55b2fa628a5339ed88c25d897 commit 0188344fc3ec94b55b2fa628a5339ed88c25d897 Author: Konstantin Belousov AuthorDate: 2025-08-14 03:39:05 +0000 Commit: Konstantin Belousov CommitDate: 2025-10-11 05:08:13 +0000 vm_fault: add vm_fault_might_be_cow() helper (cherry picked from commit 5bd4c04a4e7f7bda657e6027e64675d0caf50715) --- sys/vm/vm_fault.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/sys/vm/vm_fault.c b/sys/vm/vm_fault.c index 63a1e7ac0675..0039a8786387 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -258,6 +258,12 @@ vm_fault_unlock_vp(struct faultstate *fs) } } +static bool +vm_fault_might_be_cow(struct faultstate *fs) +{ + return (fs->object != fs->first_object); +} + static void vm_fault_deallocate(struct faultstate *fs) { @@ -265,7 +271,7 @@ vm_fault_deallocate(struct faultstate *fs) vm_fault_page_release(&fs->m_cow); vm_fault_page_release(&fs->m); vm_object_pip_wakeup(fs->object); - if (fs->object != fs->first_object) { + if (vm_fault_might_be_cow(fs)) { VM_OBJECT_WLOCK(fs->first_object); vm_fault_page_free(&fs->first_m); VM_OBJECT_WUNLOCK(fs->first_object); @@ -1002,7 +1008,7 @@ vm_fault_cow(struct faultstate *fs) { bool is_first_object_locked; - KASSERT(fs->object != fs->first_object, + KASSERT(vm_fault_might_be_cow(fs), ("source and target COW objects are identical")); /* @@ -1166,7 +1172,7 @@ vm_fault_zerofill(struct faultstate *fs) * If there's no object left, fill the page in the top * object with zeros. */ - if (fs->object != fs->first_object) { + if (vm_fault_might_be_cow(fs)) { vm_object_pip_wakeup(fs->object); fs->object = fs->first_object; fs->pindex = fs->first_pindex; @@ -1430,7 +1436,7 @@ vm_fault_busy_sleep(struct faultstate *fs, int allocflags) * likely to reclaim it. */ vm_page_aflag_set(fs->m, PGA_REFERENCED); - if (fs->object != fs->first_object) { + if (vm_fault_might_be_cow(fs)) { vm_fault_page_release(&fs->first_m); vm_object_pip_wakeup(fs->first_object); } @@ -1728,7 +1734,7 @@ found: * top-level object, we have to copy it into a new page owned by the * top-level object. */ - if (fs.object != fs.first_object) { + if (vm_fault_might_be_cow(&fs)) { /* * We only really need to copy if we want to write it. */