From nobody Thu Apr 17 15:54:13 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 4ZdjBF4ZH9z5tL9B; Thu, 17 Apr 2025 15:54:13 +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 4ZdjBF3xdhz45pf; Thu, 17 Apr 2025 15:54:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744905253; 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=97tg/LNLYGiQq2EJqn6tM5p84muc3A06buBuEDbycvo=; b=C5oJ88hEVibNQM8iJKfXILPfHzSrHOYvyKPEEht8jxNIZvDk6ONEB8N3dlu+Nw4+XNM1WD huShWuJ8CJFZFMuCbFsqDipoS+TE1yPg6qz/Q2yFOl9+fg30giYl+Jdb0Ih4ZgedGKSlqL 1QfXN+6pyFfrKpB5ZZdQACQb5v5ZbaeHH3qUQwaNBZBKhAiZxoi6TBlPXYHksqqE9W/N3X AftetLSjYaL2VFG2d/qnLeSyqzPB/oiHFhzkbr4O+SMVAj7SWTlc2A/8rq1ZwZvRDQSz8M B7DDa4800I4VnHX4XSMS1HejsXMZ5CZVeDGznEkqeEU8sOZmIpYJrdpkfWSJ+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744905253; a=rsa-sha256; cv=none; b=XpHyKKCyN/tHPFivY1Gs8jHsWm3vE5GWSqr1cxgKGV5s2AtKHYZJT0hWBzAyRZpciUKjBi KHlpqzxt90d7A5EA2b1dy9WgB5O7Uomd/FwvLL7LfsxSrZBY6Ki6Y8XxQw6Ez8GAijOPLa Q84rvwioqZVcZ3YoKzedT6JwMOAWNg9Mw4z5mRw8SxQ+v2duG9cxo6o353T7xvpbQETUrd bZ+jUZhWRFOBt1Q/J5I0i/voy2WrbhKm2iNLM9pRRNnAwFeuLqZT5mx3i/Q5a6y3iUBuDE do8f795P/G7CA7U94C3oxRkHpOXYwBH8LSOvO5RBaYkxA1k+953cP/91G/4BJw== 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=1744905253; 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=97tg/LNLYGiQq2EJqn6tM5p84muc3A06buBuEDbycvo=; b=iIJYQe2TNYcao2des5JFwuQjTl2U0xyP6Q22IR3QzkZaTl2zu3hax3Fuy23vri7Yontz4K X5xDjkm8m5f867jpI1+3L35fNkUItbYaaGPUt8wcSjS/oay/232mbKLoS/haIkwZxuLg3Y Ctpyeolomtp6+1gGUfgvbl9O935VN2lyHmixxFK6iFwEqhAz5thIqeP8EV7VbqOR6J7KgK yWkkbbC+Ut/n6Eg1exU8obIIZnAIeLJ3vxhRpdD/Og3snG8UgIqShyrCxU7/hS+rOE+C7Z GzVVgyMMk0K9ve/qY4pZ8DguEzKLFEgX6zVx+UUeleP5aONP28PgTRHFlllKDg== 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 4ZdjBF3TxTztmm; Thu, 17 Apr 2025 15:54:13 +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 53HFsDL8028477; Thu, 17 Apr 2025 15:54:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53HFsDlN028474; Thu, 17 Apr 2025 15:54:13 GMT (envelope-from git) Date: Thu, 17 Apr 2025 15:54:13 GMT Message-Id: <202504171554.53HFsDlN028474@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: 983723943a5b - main - vm_pageout: rewrite cluster() 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: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 983723943a5b7f1f249ba8f646b20e57ad524fed Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=983723943a5b7f1f249ba8f646b20e57ad524fed commit 983723943a5b7f1f249ba8f646b20e57ad524fed Author: Doug Moore AuthorDate: 2025-04-17 15:52:34 +0000 Commit: Doug Moore CommitDate: 2025-04-17 15:52:34 +0000 vm_pageout: rewrite cluster() Implement vm_pageout_cluster using iterators instead of vm_page_next() and vm_page_prev(), and without gotos. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D49848 --- sys/vm/vm_pageout.c | 64 +++++++++++++++++++++++++++-------------------------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c index e2efa11842b5..7b303d7d905f 100644 --- a/sys/vm/vm_pageout.c +++ b/sys/vm/vm_pageout.c @@ -108,6 +108,7 @@ #include #include #include +#include #include #include #include @@ -366,15 +367,16 @@ vm_pageout_flushable(vm_page_t m) static int vm_pageout_cluster(vm_page_t m) { + struct pctrie_iter pages; vm_page_t mc[2 * vm_pageout_page_count - 1]; - int alignment, num_ends, page_base, pageout_count; + int alignment, page_base, pageout_count; VM_OBJECT_ASSERT_WLOCKED(m->object); vm_page_assert_xbusied(m); + vm_page_iter_init(&pages, m->object); alignment = m->pindex % vm_pageout_page_count; - num_ends = 0; page_base = nitems(mc) / 2; pageout_count = 1; mc[page_base] = m; @@ -387,37 +389,37 @@ vm_pageout_cluster(vm_page_t m) * holes). To solve this problem we do the reverse scan * first and attempt to align our cluster, then do a * forward scan if room remains. + * + * If we are at an alignment boundary, stop here, and switch directions. */ -more: - m = mc[page_base]; - while (pageout_count < vm_pageout_page_count) { - /* - * If we are at an alignment boundary, and haven't reached the - * last flushable page forward, stop here, and switch - * directions. - */ - if (alignment == pageout_count - 1 && num_ends == 0) - break; - - m = vm_page_prev(m); - if (m == NULL || !vm_pageout_flushable(m)) { - num_ends++; - break; - } - mc[--page_base] = m; - ++pageout_count; + if (alignment > 0) { + pages.index = mc[page_base]->pindex; + do { + m = vm_radix_iter_prev(&pages); + if (m == NULL || !vm_pageout_flushable(m)) + break; + mc[--page_base] = m; + } while (pageout_count++ < alignment); } - m = mc[page_base + pageout_count - 1]; - while (num_ends != 2 && pageout_count < vm_pageout_page_count) { - m = vm_page_next(m); - if (m == NULL || !vm_pageout_flushable(m)) { - if (num_ends++ == 0) - /* Resume the reverse scan. */ - goto more; - break; - } - mc[page_base + pageout_count] = m; - ++pageout_count; + if (pageout_count < vm_pageout_page_count) { + pages.index = mc[page_base + pageout_count - 1]->pindex; + do { + m = vm_radix_iter_next(&pages); + if (m == NULL || !vm_pageout_flushable(m)) + break; + mc[page_base + pageout_count] = m; + } while (++pageout_count < vm_pageout_page_count); + } + if (pageout_count < vm_pageout_page_count && + alignment == nitems(mc) / 2 - page_base) { + /* Resume the reverse scan. */ + pages.index = mc[page_base]->pindex; + do { + m = vm_radix_iter_prev(&pages); + if (m == NULL || !vm_pageout_flushable(m)) + break; + mc[--page_base] = m; + } while (++pageout_count < vm_pageout_page_count); } return (vm_pageout_flush(&mc[page_base], pageout_count,