From nobody Mon Jun 19 13:08:36 2023 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 4Ql97T1prbz4g5n7; Mon, 19 Jun 2023 13:08:37 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ql97T1K49z3r0x; Mon, 19 Jun 2023 13:08:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687180117; 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=GzCLftKSJB7tQasc4Vu6RK0u/QPcyCqDhf9Abv8Eb6A=; b=xdlxBKXz6iO9x8PejJbUJMwFCerCZjUOSNto4PFVmZuUWSi6QK+7txOJQRLdwOrT4BNaYb nZbXLwKoghzz4NUEnG1xN8yqVB9pqu0VyuU+EDnmOHq0fqb97+9EcGTUqXphFHZf/QY7dn uiUz9bHZ45wPm3jbvRAHAWosxQ6XfnGbD85aS+tyb5K5ylMX6CfWvV0S4JGEYdYsX8eaj5 BxgHH+zeX2S/YJPnM7tYyPYJRcoyk8AO/PTZ2ZGa0ZSHZToVK9a6cgVnEobnMgmim90py6 VM+FvT5u+n9kEW5rgcgMpWs9p0ARz8SmTnlq+K/lwXeUdIcM4T4UiYyx/W2JAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687180117; 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=GzCLftKSJB7tQasc4Vu6RK0u/QPcyCqDhf9Abv8Eb6A=; b=ocwm+PFgYabGc+mCN7sEau96wtx+XKpb1PF2SvtCnDyIzP1nFlh3nZMOFJvutfMQxrijam +AMBNSIdTMqiRaVi9YmrpeuEDJBfqTrvyLMVB9gQ5w82yTadxtYUiVZK5bLkkkSNhPO8rN sufUzfZ0FSVcE9jif1lEbv7FloNGijb6jh9IrtROzbzyipD0bIbgg8HH9MYJlQx6EQrGs0 tTGHdkX3/9z0k7Mv81Q5Gz5T8jsZyMqJqH8sxwn+z+6a0PuCrZVK+CPOtcuu15t8lnwwhE rEvGR/d1EtomyvAHS/zLIqVzL1h3Z0UoyviRmnx9Y2WYhvPZ5/zpMvSsRQiqGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687180117; a=rsa-sha256; cv=none; b=wSzUCNDoCeU9j9AEbt0jPC8E0wlbjUXdFM4vS/B4+mSPs9iqkfRIe04TGoexi0UAXfNGQd pkTex0pgEgQ/RJXXs0+6uAZjiRw21+UpnNACiZiaMYBxn9p62ZyxVFYwGmxYwfYNzMrSOc E50Qu49ZF/30shZoHhn43/wdh4LpRXwKhntne1nUd2/1Y2epMNXduWVxdY8prEg3JD35nM zlE2Ckdmi8nqmI0lAVQ6F9B7quN8tjVAHCt/Lp8+MABIyxN4PGzEqIVZxXU4yXTYj2cHhT L2MLrRfBuj+UTk1THQu/yFI8LYh/2kNVUCOxt3uf/ILCBihh8bcB0N2nRiTpkA== 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 4Ql97T0NWPzJ6t; Mon, 19 Jun 2023 13:08:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35JD8aXQ035485; Mon, 19 Jun 2023 13:08:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35JD8a9v035484; Mon, 19 Jun 2023 13:08:36 GMT (envelope-from git) Date: Mon, 19 Jun 2023 13:08:36 GMT Message-Id: <202306191308.35JD8a9v035484@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: 232bd8e8d896 - stable/13 - vm_phys: Change the return type of vm_phys_unfree_page() to 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: 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/13 X-Git-Reftype: branch X-Git-Commit: 232bd8e8d8961f4c937ea67c5e83184661447c4a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=232bd8e8d8961f4c937ea67c5e83184661447c4a commit 232bd8e8d8961f4c937ea67c5e83184661447c4a Author: Mark Johnston AuthorDate: 2023-06-05 14:40:15 +0000 Commit: Mark Johnston CommitDate: 2023-06-19 12:56:42 +0000 vm_phys: Change the return type of vm_phys_unfree_page() to bool This is in keeping with the trend of removing uses of boolean_t, and the sole caller was implicitly converting it to a "bool". No functional change intended. Reviewed by: dougm, alc, imp, kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D40401 (cherry picked from commit 6062d9faf23f11e0655f3a222c204725e3111fe8) --- sys/vm/vm_page.c | 8 ++++---- sys/vm/vm_phys.c | 14 +++++++------- sys/vm/vm_phys.h | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/sys/vm/vm_page.c b/sys/vm/vm_page.c index ecabd6c4798e..6e3913517bb5 100644 --- a/sys/vm/vm_page.c +++ b/sys/vm/vm_page.c @@ -327,7 +327,7 @@ vm_page_blacklist_add(vm_paddr_t pa, bool verbose) { struct vm_domain *vmd; vm_page_t m; - int ret; + bool found; m = vm_phys_paddr_to_vm_page(pa); if (m == NULL) @@ -335,15 +335,15 @@ vm_page_blacklist_add(vm_paddr_t pa, bool verbose) vmd = vm_pagequeue_domain(m); vm_domain_free_lock(vmd); - ret = vm_phys_unfree_page(m); + found = vm_phys_unfree_page(m); vm_domain_free_unlock(vmd); - if (ret != 0) { + if (found) { vm_domain_freecnt_inc(vmd, -1); TAILQ_INSERT_TAIL(&blacklist_head, m, listq); if (verbose) printf("Skipping page with pa 0x%jx\n", (uintmax_t)pa); } - return (ret); + return (found); } /* diff --git a/sys/vm/vm_phys.c b/sys/vm/vm_phys.c index 6798c55cc91c..2b5a792fce6d 100644 --- a/sys/vm/vm_phys.c +++ b/sys/vm/vm_phys.c @@ -1288,12 +1288,12 @@ vm_phys_scan_contig(int domain, u_long npages, vm_paddr_t low, vm_paddr_t high, /* * Search for the given physical page "m" in the free lists. If the search - * succeeds, remove "m" from the free lists and return TRUE. Otherwise, return - * FALSE, indicating that "m" is not in the free lists. + * succeeds, remove "m" from the free lists and return true. Otherwise, return + * false, indicating that "m" is not in the free lists. * * The free page queues must be locked. */ -boolean_t +bool vm_phys_unfree_page(vm_page_t m) { struct vm_freelist *fl; @@ -1316,12 +1316,12 @@ vm_phys_unfree_page(vm_page_t m) if (pa >= seg->start) m_set = &seg->first_page[atop(pa - seg->start)]; else - return (FALSE); + return (false); } if (m_set->order < order) - return (FALSE); + return (false); if (m_set->order == VM_NFREEORDER) - return (FALSE); + return (false); KASSERT(m_set->order < VM_NFREEORDER, ("vm_phys_unfree_page: page %p has unexpected order %d", m_set, m_set->order)); @@ -1347,7 +1347,7 @@ vm_phys_unfree_page(vm_page_t m) vm_freelist_add(fl, m_tmp, order, 0); } KASSERT(m_set == m, ("vm_phys_unfree_page: fatal inconsistency")); - return (TRUE); + return (true); } /* diff --git a/sys/vm/vm_phys.h b/sys/vm/vm_phys.h index 86785fd7579d..76c933d97914 100644 --- a/sys/vm/vm_phys.h +++ b/sys/vm/vm_phys.h @@ -79,7 +79,7 @@ void vm_phys_register_domains(int ndomains, struct mem_affinity *affinity, int *locality); vm_page_t vm_phys_scan_contig(int domain, u_long npages, vm_paddr_t low, vm_paddr_t high, u_long alignment, vm_paddr_t boundary, int options); -boolean_t vm_phys_unfree_page(vm_page_t m); +bool vm_phys_unfree_page(vm_page_t m); int vm_phys_mem_affinity(int f, int t); void vm_phys_early_add_seg(vm_paddr_t start, vm_paddr_t end); vm_paddr_t vm_phys_early_alloc(int domain, size_t alloc_size);