From nobody Tue Jul 29 12:49:18 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 4brwCM15cRz62xWN; Tue, 29 Jul 2025 12:49:19 +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 4brwCL4cyxz3lqw; Tue, 29 Jul 2025 12:49:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753793358; 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=nqUVrelY1eETxGsUYr0awUZ6hV85vvvsj2j5+17k/ZE=; b=BMqesLVyeTuZpcQ2Hf/TPAoq/SMCF0CxzgY+hZcxkBNokOnsEMixOdcyqlWJCXIFNMgC2i uOJme3PWfQ4HXlpfUM6COxSBp8pZ6qD9aLPoIfFDzDUMYjXh09Id8X0fxhZ0OjYybZA43R jaNIoXz5EQkLHUao/CNOpT+f3EEVF44683V5l8mLDuEw6Kk5psm2N7D6lMf45J3B5p1MY3 ox9rfI8vP1bfTtjRgvtqTdaM+WtVBhNAahht5ESwMD/gIKzBJmWGs1xmH9Cs+1Bageuakm M/9OTYoE8b1TuK4B4gyf0xTBdJI/B60zriEmy4K1Ft5BQmTkoa9NTTlI35trUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753793358; 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=nqUVrelY1eETxGsUYr0awUZ6hV85vvvsj2j5+17k/ZE=; b=Jp+Njb+zp1nyOeZAeLctJaCCOSaAE4cLLBSXkfDxIB2o0+zryZwog1Bw5p2tyFYH8OMSvD JCfJTtmV7U9g6P5Zm5jc+wls4YiXdudHZZFWlxFwObYep0PnKwsLybsQ4yP0van2f0i1fL kZjYV4HOdpZz/bNnvbhlhxemVJjitlmGQtJOZKftxXXZU/mJt8bcYnS/SM7KtzuKBy/4Ii cQ7qjqj+NiQ/8qhRcY23eoOziPBZV6L22ezq15Skk+PJtwURQjS1aqjn83/NOzk2zJe77h sTTJgO7xqXUkT6c7zLywkccZxjDhjs282Eb1B4IFpoKrPPJeLnYo+32KNe85qg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753793358; a=rsa-sha256; cv=none; b=rMvwmlNZc+/WoUfdJLOjXXgCWQRvqNd5+jiI0g3kNoteBtToUsdCaMVG0d9ntZNeWFFQJN OFs3SKSlhNhmXJXyOxPFxx5g9DACerUJyUWCGwuFGXcbpN+nOn4igurrX9IVWFqonkyCHN F5WqKB2sa3SKewhZJTNQ885xbhNqj3wMiK9odjaBVLync0yokBbHFBYBm1nh9qyi3W2m+G kJLTL4me6ylFx0Afep9MvuK1a8ojlikg8KKPMOz2d/mWx775zvsc5llOh3e81jsnNDAeD4 1vemOk2AdwPzSnu0TILYdBUet+rxIF0bZW0ay0JoGtgqGYW/1Cj1LVVPRlFn8w== 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 4brwCL44KXzY1q; Tue, 29 Jul 2025 12:49:18 +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 56TCnIgJ033801; Tue, 29 Jul 2025 12:49:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56TCnIcO033798; Tue, 29 Jul 2025 12:49:18 GMT (envelope-from git) Date: Tue, 29 Jul 2025 12:49:18 GMT Message-Id: <202507291249.56TCnIcO033798@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 2019311525ce - stable/14 - swap_pager: Convert swap-space-full flags to bools 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2019311525ce724c79bdf7cb677c44bf7383323e Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2019311525ce724c79bdf7cb677c44bf7383323e commit 2019311525ce724c79bdf7cb677c44bf7383323e Author: Mark Johnston AuthorDate: 2025-07-15 15:16:57 +0000 Commit: Mark Johnston CommitDate: 2025-07-29 12:09:04 +0000 swap_pager: Convert swap-space-full flags to bools No functional change intended. Reviewed by: alc, kib MFC after: 2 weeks Sponsored by: Modirum MDPay Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D51321 (cherry picked from commit 5c76e9f4579677482b0f96d4b3581f5e1ea2e072) --- sys/vm/swap_pager.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/sys/vm/swap_pager.c b/sys/vm/swap_pager.c index 53cd8294e299..c23f8bc1f966 100644 --- a/sys/vm/swap_pager.c +++ b/sys/vm/swap_pager.c @@ -377,8 +377,8 @@ swap_release_by_cred(vm_ooffset_t decr, struct ucred *cred) #endif } -static int swap_pager_full = 2; /* swap space exhaustion (task killing) */ -static int swap_pager_almost_full = 1; /* swap space exhaustion (w/hysteresis)*/ +static bool swap_pager_full = true; /* swap space exhaustion (task killing) */ +static bool swap_pager_almost_full = true; /* swap space exhaustion (w/hysteresis) */ static struct mtx swbuf_mtx; /* to sync nsw_wcount_async */ static int nsw_wcount_async; /* limit async write buffers */ static int nsw_wcount_async_max;/* assigned maximum */ @@ -542,14 +542,14 @@ swp_sizecheck(void) { if (swap_pager_avail < nswap_lowat) { - if (swap_pager_almost_full == 0) { + if (!swap_pager_almost_full) { printf("swap_pager: out of swap space\n"); - swap_pager_almost_full = 1; + swap_pager_almost_full = true; } } else { - swap_pager_full = 0; + swap_pager_full = false; if (swap_pager_avail > nswap_hiwat) - swap_pager_almost_full = 0; + swap_pager_almost_full = false; } } @@ -858,11 +858,10 @@ swp_pager_getswapspace(int *io_npages) swp_sizecheck(); swdevhd = TAILQ_NEXT(sp, sw_list); } else { - if (swap_pager_full != 2) { + if (!swap_pager_full) { printf("swp_pager_getswapspace(%d): failed\n", *io_npages); - swap_pager_full = 2; - swap_pager_almost_full = 1; + swap_pager_full = swap_pager_almost_full = true; } swdevhd = NULL; } @@ -2581,10 +2580,8 @@ swapoff_one(struct swdevt *sp, struct ucred *cred, u_int flags) sp->sw_id = NULL; TAILQ_REMOVE(&swtailq, sp, sw_list); nswapdev--; - if (nswapdev == 0) { - swap_pager_full = 2; - swap_pager_almost_full = 1; - } + if (nswapdev == 0) + swap_pager_full = swap_pager_almost_full = true; if (swdevhd == sp) swdevhd = NULL; mtx_unlock(&sw_dev_mtx);