From nobody Mon Oct 13 00:30:10 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 4clJCR3xRFz6BWrp; Mon, 13 Oct 2025 00:30:11 +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 4clJCR0bq0z495J; Mon, 13 Oct 2025 00:30:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760315411; 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=XCRiAn9nabcD0dJPTWBquWgH96qiKnce6lmJ9JWBGl4=; b=hm8hd+oZAAX4zfZayMz4tk7IIAskf8b+1HsnAYUu3Z1vdFhAtSr/rx41gdIDaRKVFg8ueJ PY4J1beaD5RBNZ1KxlAMdmmc1kUryPl9wAMhkwn4VPRU6TO5OWtoaiX5r2VcZHxbVPiOfZ C1rJGetEGEZTQ/L/WIJnf1os1CDtqBg3Snd3sRqwR8WHGj+kOYKIE/dF1w8XdQyKlX5uWF yPi2SpYvR9/pkDLf9R6yiFeUv1KhBz+/EdTW8hmyTMaZk6hYSyzbEy9IgzH18dg2OSD4Kg jIcWdSZZsxJ28Nou2ZRxurDa5OlzB6DVlOwz7MOxugttYaMwE4l4qffpRVoaFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1760315411; 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=XCRiAn9nabcD0dJPTWBquWgH96qiKnce6lmJ9JWBGl4=; b=cDq5ASrgtOOM7+akyuxBsNiGHo4q8lJW32IP63oT2o3DOLLElRs6Sv/zyDpk0s2asdsnWD pw7dy+FG4Kzc/3qml+DM9QJY/lYa70hTvSHJI4ILxTvn8Cb7GR6AFoXSP5lhun/f2DmK77 6T7vygZeHNVZoAFAoJbKobN9HcC5m2sid/UhaM8gBfjaYRFVV5G9b0QaNJw1C6kx3rUZev vGC7p9BQztBnT3xAvnh1I2yW2O8QSH8vosrTwffuTOFxcPR09IgOerDS+9ebmlpNdvwpyE Fh4hRQCXJ6tidbKTXdi4CMmlTbAdjuzHDPdPa5qBQtGBKZUK61wKDRrsdBNZew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1760315411; a=rsa-sha256; cv=none; b=bzN8WqdF31uQ8EMHD7W8q2k6slyokSVd8j0AZxiEphbrDLTNPlgBCUt5nC5C3zFqUi3SDW pHnP3A/WdsXngOW44aHmRCGNWIEiXU1SbmHMPwMC8BeFFfVx9FeMIX3GGugPIvnPtnTD74 f0ZTyjNyuWK2Py2IdnGHrbfci/Dv1Y8DzVReScKKV9DtqdY7QST93/O0rGwKG8JrXG1PSy Z+q72dyNjH48xQW2EJkjyMNgdZlnsUaQ/bnjJvmjqMp/xsyX9zeVFH4YyqniRJ6UN+VNUe OwTdRC5A//XZIRTm5bvwBKpMWZdon4KgyO0jOpNOrCJnh+K6z6/hKuRi82L7gg== 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 4clJCQ72kBzkFK; Mon, 13 Oct 2025 00:30:10 +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 59D0UAm2044612; Mon, 13 Oct 2025 00:30:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 59D0UA48044606; Mon, 13 Oct 2025 00:30:10 GMT (envelope-from git) Date: Mon, 13 Oct 2025 00:30:10 GMT Message-Id: <202510130030.59D0UA48044606@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: e7422f7dfd0e - stable/14 - vm_fault: add vm_fault_might_be_cow() helper 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/14 X-Git-Reftype: branch X-Git-Commit: e7422f7dfd0e4c1f0db5560f171260d78bad9383 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e7422f7dfd0e4c1f0db5560f171260d78bad9383 commit e7422f7dfd0e4c1f0db5560f171260d78bad9383 Author: Konstantin Belousov AuthorDate: 2025-08-14 03:39:05 +0000 Commit: Konstantin Belousov CommitDate: 2025-10-13 00:23:45 +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 89acbb0095e9..796b4c44b3f9 100644 --- a/sys/vm/vm_fault.c +++ b/sys/vm/vm_fault.c @@ -259,6 +259,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) { @@ -266,7 +272,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); @@ -990,7 +996,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")); /* @@ -1154,7 +1160,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; @@ -1417,7 +1423,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); } @@ -1711,7 +1717,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. */