From nobody Sat May 31 18:03:59 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 4b8nzh1wmLz5xN8V; Sat, 31 May 2025 18:04:00 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b8nzg629mz3nf1; Sat, 31 May 2025 18:03:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748714639; 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=UGUGHwJ5rOnZD+AbtajLOtX+CK1TxBxg49fQBSZjIZY=; b=M/XDHHgpgRda5851xC8gmLZUaGUxECVpDkZ+5Qp2XzmXCXQBAcnXU6Iv1Nbfnt06+f6W2l +8JUe18a7cGraHkWkm1IjJpstRtAXq9Q294Q03FCrmemLfKBscWPVs9a7fickoaG4XgKFI 70jkcFhqyLap77nD5zrj2fZdA9znU7ygibUdBxbuiD6gHGsFJqMHpNf9JOInmyNXPxO5II +CX9glTWm72N/hiEzmC3oe+xjKbG+fOAVPzn7+sQppqGl8870zg/Kot0UwXI+ezEhiu9at ZX2xnD0savevad5/b5teqY3g0BMV/0IFEFCSSAsp1mH193aRriYgx9bG8eDlOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748714639; 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=UGUGHwJ5rOnZD+AbtajLOtX+CK1TxBxg49fQBSZjIZY=; b=YNjDvzkULUaAI+1WkAghyo3VEzShMD45EwxFvMqIENimCeDeCsRb1R2GCczC1UHmTNfjhF tKMD2wRkqGcmOgOJiuHOzFggryotAzO/1Mw1drwXQtnSuf1VT91wvOwvB+8RUq6/k4YfRG IxFdoCz+MtYcJzzHUg7aeQKIYw+QkfvMR+r0nuEKaX6MnXZhbsHhuM+5f7bHjXKt6Lz5ZD fu0F49OMluDDVKuKauyhFkQN8hoS4rANEx92cwUJUz3NPRF5T7O2FvVG/fuQLXZiS7imWP Y0J1fHlTB42Uos/mobmADaWMfz/xa/KOnAl6ajcT8N7vY1yoE5z5gIEVjqSuGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748714639; a=rsa-sha256; cv=none; b=u7rcG5eoNagIaSsioV3Upn2SOUDJ4EQsG84VhTrDzwVigRBgTttQzT9Fzdkz9TQ/kp139x qRuX1et1HfKyvYDd2F+wBEagKFOQPwopzIu2wZ5HeZRXl7o9yqOwNXAcqm+YYszSo+k/+C RFgdtANkoOuG78bvJekziOJU7Vq+AIchwUfUhQEcNSmL9tZPFQ4WhJnQkYA6Y+G+rvx8vP yU5a7IdFxi5Yw/FSJYyA1Wphd6s0TD6jvdJ4lO7fsT5cDnwtgqPSGyi5i0epE3aCW7jFUG U94njJY+rf6SczZZASj8HoC3IimD+qQn/baN9c5C20BYqMhucOBhnLUjoSUnHQ== 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 4b8nzg5TMjznW4; Sat, 31 May 2025 18:03:59 +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 54VI3x1u023847; Sat, 31 May 2025 18:03:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54VI3xnZ023844; Sat, 31 May 2025 18:03:59 GMT (envelope-from git) Date: Sat, 31 May 2025 18:03:59 GMT Message-Id: <202505311803.54VI3xnZ023844@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: e3bc87ab1b66 - main - vm_pageout: fix pageout_flush 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: e3bc87ab1b66e8fff1cd3a069e858461349a0cab Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=e3bc87ab1b66e8fff1cd3a069e858461349a0cab commit e3bc87ab1b66e8fff1cd3a069e858461349a0cab Author: Doug Moore AuthorDate: 2025-05-31 18:02:08 +0000 Commit: Doug Moore CommitDate: 2025-05-31 18:02:08 +0000 vm_pageout: fix pageout_flush A change just made to vm_pageout_flush wrongly dismissed the variable 'runlen' and used 'count' in its place, with the unintended consequence of terminating the main loop of the function prematurely when the first VM_PAGER_AGAIN pageout status was encountered. Reintroduce that variable, so that the loop runs to completion. Reported by: alc Reviewed by: alc Fixes: f2a193a967e3 ("vm_pageout: reduce number of flush() params") Differential Revision: https://reviews.freebsd.org/D50622 --- sys/vm/vm_pageout.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c index 624184d57442..6d3139e58c5a 100644 --- a/sys/vm/vm_pageout.c +++ b/sys/vm/vm_pageout.c @@ -462,7 +462,7 @@ vm_pageout_flush(vm_page_t *mc, int count, int flags, bool *eio) vm_object_t object = mc[0]->object; int pageout_status[count]; int numpagedout = 0; - int i; + int i, runlen; VM_OBJECT_ASSERT_WLOCKED(object); @@ -488,6 +488,7 @@ vm_pageout_flush(vm_page_t *mc, int count, int flags, bool *eio) vm_pager_put_pages(object, mc, count, flags, pageout_status); + runlen = count; if (eio != NULL) *eio = false; for (i = 0; i < count; i++) { @@ -543,7 +544,8 @@ vm_pageout_flush(vm_page_t *mc, int count, int flags, bool *eio) *eio = true; break; case VM_PAGER_AGAIN: - count = i; + if (runlen == count) + runlen = i; break; } @@ -559,7 +561,7 @@ vm_pageout_flush(vm_page_t *mc, int count, int flags, bool *eio) } } if (eio != NULL) - return (count); + return (runlen); return (numpagedout); }