From nobody Tue Mar 04 05:35:36 2025 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 4Z6PXm4xZ1z5pYyJ; Tue, 04 Mar 2025 05:35: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Z6PXm3jq4z3wCs; Tue, 04 Mar 2025 05:35:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741066536; 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=Zm+oJqimgo9SNG3b+x1GQNY00fuY0bfHksiRkqaG8z8=; b=FGN4YTcaI9bWoajSR2ch1LsFmuiCxIEFX5KVJDmD3BYxEHdtr2hZwIE8laQhMxnJCGHOPn 9K/K9xGJHIaYnuq8RnkGZdDp+9tR6x3i0FuCJGJgymU68H75Y+OWIgHnOw1QxCIEhYJMCD DJeJ575AOWpQROE7pNPbH1sxH6fhJpp/6tkAf9t3vpAiV8XhB9DGfTLF09dnkM25NVR5Ho spF+OnP0cBWDvpjDAt0QtrKnetYpdZ5zqX4LJPzMGMI/5ba9F/3dCUSfocg6mPBBp4Kz4z WGs0qpLMZ2FupORHYZ5OyL39QAHJeMysqkag3TE1KyoRWu8fuT7kERR9l8P6xw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741066536; a=rsa-sha256; cv=none; b=NGCBYu6Xrtubnx7EedtOfkVj+Z7JiEKdWpfNo3IwiM6uRjN3qV1V11ss7NOjUtuqN8rxOP dLBBWGkAWGs/Ly5qfiP3GCr19ajtsuZGeOUOyF514QJcTapTSXxSkAxUFe/wjOKZ5Vf3cx JEZdeD3Q14x15TgFFZrFH48Ee/Zvbg4p2SNCAHSlFlLma0Lv/By6VZN0MSCiT9XwWtIwxG k8HZ4fBKoYmCQZ/yFtxAoJ0Sk8jn2RfFKFVgtgSsIfopLhjlWvkjhf4Uhncfh0pjV/hSeE Q7YoN75HEKb+u0RAfUAwegfHZ5qN4nXjxIBnr+lQRTQa9XacnaGzC2qse5D6SA== 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=1741066536; 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=Zm+oJqimgo9SNG3b+x1GQNY00fuY0bfHksiRkqaG8z8=; b=UKqq/Ucl6wT9TK4uUaScbnXjqWn/bYlxZ3ziAl+1AgRkmftHqW2Uzw7+9BgqZ/AuNjaGRm 9q5fMI9XxAAmXx0qLl5W/3rWryf0o8C87NfjOrDShOFr43AMesZDU1MrkfO1HDiTdT3cvu xbsTAyUgP8xdQX11jdQZlr7vMOoDr/iFPlMYLDu8jgc03JLguleU82g41BDnNl6ByvTCab KJFprZZArbG78P88xmgQY45EqAoupmjBnOLrCVpW4Lja4qSK7e4bhHyWIccFheQ6dIb7Yr HXqHHOD5YpySInyFa/tikDGcMkvsn9i+wt6e63O1Al4tp8kEV0QmgAcy8m9WIw== 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 4Z6PXm3J5vz1KD0; Tue, 04 Mar 2025 05:35:36 +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 5245Za1u003708; Tue, 4 Mar 2025 05:35:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5245Zamm003705; Tue, 4 Mar 2025 05:35:36 GMT (envelope-from git) Date: Tue, 4 Mar 2025 05:35:36 GMT Message-Id: <202503040535.5245Zamm003705@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: c6c63b92effd - main - vm_object: don't reset new iterator List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: 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: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c6c63b92effd6d0662977f11bf429127b9dc4407 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=c6c63b92effd6d0662977f11bf429127b9dc4407 commit c6c63b92effd6d0662977f11bf429127b9dc4407 Author: Doug Moore AuthorDate: 2025-03-04 05:31:18 +0000 Commit: Doug Moore CommitDate: 2025-03-04 05:31:18 +0000 vm_object: don't reset new iterator Don't call pctrie_iter_reset on a just-initialized iterator. Let the code jumping back up do the resetting. Add an assertion at the jump destination to check that a reset happened. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D49207 --- sys/sys/pctrie.h | 6 ++++++ sys/vm/device_pager.c | 2 ++ sys/vm/vm_object.c | 9 +++++++-- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/sys/sys/pctrie.h b/sys/sys/pctrie.h index 42473dc8e632..dac18b58498b 100644 --- a/sys/sys/pctrie.h +++ b/sys/sys/pctrie.h @@ -47,6 +47,12 @@ pctrie_iter_reset(struct pctrie_iter *it) it->node = NULL; } +static __inline bool +pctrie_iter_is_reset(struct pctrie_iter *it) +{ + return (it->node == NULL); +} + static __inline void pctrie_iter_init(struct pctrie_iter *it, struct pctrie *ptree) { diff --git a/sys/vm/device_pager.c b/sys/vm/device_pager.c index 0691d43a5946..0b3a2eb54d75 100644 --- a/sys/vm/device_pager.c +++ b/sys/vm/device_pager.c @@ -293,6 +293,8 @@ cdev_mgtdev_pager_free_pages(vm_object_t object) vm_page_iter_init(&pages, object); VM_OBJECT_WLOCK(object); retry: + KASSERT(pctrie_iter_is_reset(&pages), + ("%s: pctrie_iter not reset for retry", __func__)); for (m = vm_radix_iter_lookup_ge(&pages, 0); m != NULL; m = vm_radix_iter_step(&pages)) { if (!vm_page_busy_acquire(m, VM_ALLOC_WAITFAIL)) { diff --git a/sys/vm/vm_object.c b/sys/vm/vm_object.c index 9269103d8d91..79a28c4d77b0 100644 --- a/sys/vm/vm_object.c +++ b/sys/vm/vm_object.c @@ -1576,7 +1576,8 @@ vm_object_split(vm_map_entry_t entry) vm_object_set_flag(orig_object, OBJ_SPLIT); vm_page_iter_limit_init(&pages, orig_object, offidxstart + size); retry: - pctrie_iter_reset(&pages); + KASSERT(pctrie_iter_is_reset(&pages), + ("%s: pctrie_iter not reset for retry", __func__)); for (m = vm_radix_iter_lookup_ge(&pages, offidxstart); m != NULL; m = vm_radix_iter_step(&pages)) { /* @@ -1590,6 +1591,7 @@ retry: VM_OBJECT_WUNLOCK(new_object); if (vm_page_busy_sleep(m, "spltwt", 0)) VM_OBJECT_WLOCK(orig_object); + pctrie_iter_reset(&pages); VM_OBJECT_WLOCK(new_object); goto retry; } @@ -1611,6 +1613,7 @@ retry: VM_OBJECT_WUNLOCK(new_object); VM_OBJECT_WUNLOCK(orig_object); vm_radix_wait(); + pctrie_iter_reset(&pages); VM_OBJECT_WLOCK(orig_object); VM_OBJECT_WLOCK(new_object); goto retry; @@ -1996,7 +1999,8 @@ vm_object_page_remove(vm_object_t object, vm_pindex_t start, vm_pindex_t end, vm_object_pip_add(object, 1); vm_page_iter_limit_init(&pages, object, end); again: - pctrie_iter_reset(&pages); + KASSERT(pctrie_iter_is_reset(&pages), + ("%s: pctrie_iter not reset for retry", __func__)); for (p = vm_radix_iter_lookup_ge(&pages, start); p != NULL; p = vm_radix_iter_step(&pages)) { /* @@ -2025,6 +2029,7 @@ again: if (vm_page_tryxbusy(p) == 0) { if (vm_page_busy_sleep(p, "vmopar", 0)) VM_OBJECT_WLOCK(object); + pctrie_iter_reset(&pages); goto again; } if ((options & OBJPR_VALIDONLY) != 0 && vm_page_none_valid(p)) {