From nobody Fri Jan 17 13:40:35 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 4YZLTb2nngz5l0nf; Fri, 17 Jan 2025 13:40:35 +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 4YZLTb1qVXz3m4h; Fri, 17 Jan 2025 13:40:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737121235; 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=UtEolO1nTgRblUCtCtAUvpye8Hd2SAFpE5MiMcteBJU=; b=ZQ3dBKGDHobX/3S0Zp6yvyaZVCWVN2PBPQ4I0SAX2gd8v1rse0uNeiEroWG2buRX14v4EA /FxlpiQm0Te+sXkQA4KZzgl+Ju9Nv9bfZMPH9olTZBB4eFNtQ4yGKzVupNxuPGxV/QuJWG /WPe9RX5bC+h2LP0gZEy03d67FSKsW7byLzVDEe+eApuvoWi1ox/3wXE2wJ1kVbq3sZAwT p+bfMzySR6fK6g7MEpjLSRSNmzUpBliEwO4OfKce8JVTF82QcLIeQUJwBdFdZXd7sofm2W VwRfn08eedQs9cM9agxsLvagUuKMdvrDRLmkBH5pWecgTHmOd40C8SGJ0fmUIw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737121235; 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=UtEolO1nTgRblUCtCtAUvpye8Hd2SAFpE5MiMcteBJU=; b=BD1SEd7Zl+TzAzbUaamYO6bnoqjg8bJAjPBIThEUcDqqgWJ6TXXqBCwZEQicNBrr04638T CGMFORd81KBEwxdenuNw+82U8HAY8w09AceA8J741qYhQOo6P7AblEiOEZ+K7DsA3xjrAR 0Ne3BjR00RdWnTLpXpx4jseGXIDt6/0qaOrQFrOhNy6K0/ZZx1rbulCcUgsJj7x6XNHbS1 P9nL8UNcGzLLwGRBVmDhv70N43BIscRRiiZPjnyOlAC+z2wlUHny9CGgjjp1C1U0Q9778U ufJBYouq3KYGLElCQV7C8M6YUwTuzQOlXq5794DLroukq7gCI0LLtkRRN8MvTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737121235; a=rsa-sha256; cv=none; b=rbg2Z3jDHa6rfFD5ibIS7C657mEDe7gRQGkRvQck+hPglKGCxN30LdYaTQCJWEtPwSv41m UCm+ksxpZogvaGtc6ARF6dPKNcOfhxYkG229lKv7fdtNWJvT8xChDxs7DYZayOgiiOeJgL cU+W8j2ghokEOscXf7ROJ+KvUaoPT+509yzsW7azVTMfVOw6pex3pL7eN1qMTJQF2bQGGN bVu/P/QsqndmzvGei/zUc/JOnguva10SYjWPZxLuSm5ufszOc7O5ZWcD7Q6CcHMI10R/cH rY9xkogXTBn7LshXJNsup6H0UhnndeVzoyBLozAo8yVZmdYRKnne+st6ILLTGw== 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 4YZLTb1J4gz4Ph; Fri, 17 Jan 2025 13:40:35 +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 50HDeZHr095999; Fri, 17 Jan 2025 13:40:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50HDeZmJ095996; Fri, 17 Jan 2025 13:40:35 GMT (envelope-from git) Date: Fri, 17 Jan 2025 13:40:35 GMT Message-Id: <202501171340.50HDeZmJ095996@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: e16a2508e17d - stable/14 - vm_pageout: Make vmd_oom a bool 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e16a2508e17de8dffaf06d41df59918cc57b27e0 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e16a2508e17de8dffaf06d41df59918cc57b27e0 commit e16a2508e17de8dffaf06d41df59918cc57b27e0 Author: Mark Johnston AuthorDate: 2025-01-09 14:53:37 +0000 Commit: Mark Johnston CommitDate: 2025-01-17 13:18:51 +0000 vm_pageout: Make vmd_oom a bool No functional change intended. Reviewed by: dougm, kib MFC after: 1 week Sponsored by: Klara, Inc. Sponsored by: Modirum MDPay Differential Revision: https://reviews.freebsd.org/D48376 (cherry picked from commit fe1165df4b776b14b21a04d2ef3fc4c46740c2f5) --- sys/vm/vm_page.c | 2 +- sys/vm/vm_pageout.c | 6 +++--- sys/vm/vm_pagequeue.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index 3713fe17dd13..2facdca9bf27 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -459,7 +459,7 @@ vm_page_domain_init(int domain) vmd->vmd_page_count = 0; vmd->vmd_free_count = 0; vmd->vmd_segs = 0; - vmd->vmd_oom = FALSE; + vmd->vmd_oom = false; for (i = 0; i < PQ_COUNT; i++) { pq = &vmd->vmd_pagequeues[i]; TAILQ_INIT(&pq->pq_pl); diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c index aec850039389..3b07af2c76d4 100644 --- a/sys/vm/vm_pageout.c +++ b/sys/vm/vm_pageout.c @@ -1798,7 +1798,7 @@ vm_pageout_mightbe_oom(struct vm_domain *vmd, int page_shortage, vmd->vmd_oom_seq++; if (vmd->vmd_oom_seq < vm_pageout_oom_seq) { if (vmd->vmd_oom) { - vmd->vmd_oom = FALSE; + vmd->vmd_oom = false; atomic_subtract_int(&vm_pageout_oom_vote, 1); } return; @@ -1813,7 +1813,7 @@ vm_pageout_mightbe_oom(struct vm_domain *vmd, int page_shortage, if (vmd->vmd_oom) return; - vmd->vmd_oom = TRUE; + vmd->vmd_oom = true; old_vote = atomic_fetchadd_int(&vm_pageout_oom_vote, 1); if (old_vote != vm_ndomains - 1) return; @@ -1831,7 +1831,7 @@ vm_pageout_mightbe_oom(struct vm_domain *vmd, int page_shortage, * memory condition is still there, due to vmd_oom being * false. */ - vmd->vmd_oom = FALSE; + vmd->vmd_oom = false; atomic_subtract_int(&vm_pageout_oom_vote, 1); } diff --git a/sys/vm/vm_pagequeue.h b/sys/vm/vm_pagequeue.h index 1f44580dfd23..1f1f818d3ec3 100644 --- a/sys/vm/vm_pagequeue.h +++ b/sys/vm/vm_pagequeue.h @@ -254,7 +254,7 @@ struct vm_domain { /* Paging control variables, used within single threaded page daemon. */ struct pidctrl vmd_pid; /* Pageout controller. */ - boolean_t vmd_oom; + bool vmd_oom; u_int vmd_inactive_threads; u_int vmd_inactive_shortage; /* Per-thread shortage. */ blockcount_t vmd_inactive_running; /* Number of inactive threads. */