From nobody Sun Jul 13 07:27:35 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 4bfxqX1bssz61pr2; Sun, 13 Jul 2025 07:27:36 +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 4bfxqW1Z7Vz3GmB; Sun, 13 Jul 2025 07:27:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752391655; 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=x/6CO646iY94Me9r6XY+ahLjG67OE0F0Wv4jw5EbZ2o=; b=A3giQdLl3DPTSB+9kjmdzV49HEU1WgJtR09Pc07TBDTvcUgBR67QFTRSM7F2/A4SgZdk4y DlLZz4CJA9eU3wYJNBCTAE0QqLD07fjn2EYwDgsJ1Zx4380iKYg2plFHtmwdgV3R70nIix lObdOOhEqxhRNdxOQHDVaBto4E/il6IfEr8EW8Btiqkz2wM+3WzJoFqYxO8RSuiTF+XM2W JRy8PXIC4BpO8NlgMpA709ZEo8BYuXZbGJFteZoWiG9/UtRCWKkukz1ROZnBeapcxnkfrF V7kT7Chm8KZvBAoZJJyX3N06qaeP0RJ1Rlg1K4haZQgSVgVrJqJWHvPrC7kXPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752391655; 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=x/6CO646iY94Me9r6XY+ahLjG67OE0F0Wv4jw5EbZ2o=; b=LFOf0/ZzWmBgXSBjhUt+m5kSotLm8pzMTuz8LsM+4VcnyXwcHHi7WtV0RZEYyNFhpr2XsB cmarvOR3r3Bww0DUuiichuc4SI4wy1o0djEt1iUX45J88wFmarjbkNBlJ4pUbSzZJu+1jn +2Wr5afirBUsI1nQOw0zdkyth7nSDegw3YQq+J/hBN8AjPY64zUWCw2wrCGz9fsgVDh8H5 tjo3+jWPzETa+Ly0qAsEQ3k8kbtYOR8iNQ+zNSXDjM4aLD5D+1LwcRqAKAtWKpGYsoRYL0 18W6bzc1Y35wshykQwJ+LCBeRC5axT3aOinsppQF1+uNoS2cZ3hT4Zq8UBa+5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752391655; a=rsa-sha256; cv=none; b=lnCi5EjDo4O0zQLADxSg+xky++lhZCABekaE0ACpIm61O0nbtVedEp7iHxl4Paev6jRtww ybS7c06pnDerMXk7iY17lUcsm708dxXJO4EXkP+/nR5sZzOBfoy2C7zFKkvqZ4p7F7YIGj h/PPubJ2qsq20gB+MG826BOByIOaDKd+oAgcvj8JiFjiegLhdiq3N3oE9jkLYE/mGxQhw0 UntVeziU9yYDwiDd2d0K5TwkD/UlWUSw+Y2NIb4NCbgPGfr04e+a5R/Wtfz3/yWsNL6zLK H/xbIWLMiK4UiXL8tFT+36YrVszJ0ZrSxLWGWKftYwxRaj+wD9x/bShHQOWeLw== 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 4bfxqW0wjrz1078; Sun, 13 Jul 2025 07:27: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 56D7RZ9J094781; Sun, 13 Jul 2025 07:27:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56D7RZuf094776; Sun, 13 Jul 2025 07:27:35 GMT (envelope-from git) Date: Sun, 13 Jul 2025 07:27:35 GMT Message-Id: <202507130727.56D7RZuf094776@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 1e78a6a6d857 - main - vm_domainset: Print correct function in KASSERT()/panic() 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1e78a6a6d85702b84f679712aac71f91e481e8f9 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=1e78a6a6d85702b84f679712aac71f91e481e8f9 commit 1e78a6a6d85702b84f679712aac71f91e481e8f9 Author: Olivier Certner AuthorDate: 2025-07-07 14:14:16 +0000 Commit: Olivier Certner CommitDate: 2025-07-13 07:15:22 +0000 vm_domainset: Print correct function in KASSERT()/panic() Some messages in vm_domainset_iter_next() would wrongly refer to vm_domainset_iter_first(). While here, ensure that all assertion/panic messages use '__func__' to avoid this discrepancy in the future if code is moved/copy-pasted again. Reviewed by: markj, alc, kib MFC after: 10 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D51248 --- sys/vm/vm_domainset.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/sys/vm/vm_domainset.c b/sys/vm/vm_domainset.c index 7b8bf4c77663..b44bdb96b0d4 100644 --- a/sys/vm/vm_domainset.c +++ b/sys/vm/vm_domainset.c @@ -131,8 +131,7 @@ static void vm_domainset_iter_next(struct vm_domainset_iter *di, int *domain) { - KASSERT(di->di_n > 0, - ("vm_domainset_iter_first: Invalid n %d", di->di_n)); + KASSERT(di->di_n > 0, ("%s: Invalid n %d", __func__, di->di_n)); switch (di->di_policy) { case DOMAINSET_POLICY_FIRSTTOUCH: /* @@ -149,11 +148,10 @@ vm_domainset_iter_next(struct vm_domainset_iter *di, int *domain) vm_domainset_iter_prefer(di, domain); break; default: - panic("vm_domainset_iter_first: Unknown policy %d", - di->di_policy); + panic("%s: Unknown policy %d", __func__, di->di_policy); } KASSERT(*domain < vm_ndomains, - ("vm_domainset_iter_next: Invalid domain %d", *domain)); + ("%s: Invalid domain %d", __func__, *domain)); } static void @@ -189,13 +187,11 @@ vm_domainset_iter_first(struct vm_domainset_iter *di, int *domain) di->di_n = di->di_domain->ds_cnt; break; default: - panic("vm_domainset_iter_first: Unknown policy %d", - di->di_policy); + panic("%s: Unknown policy %d", __func__, di->di_policy); } - KASSERT(di->di_n > 0, - ("vm_domainset_iter_first: Invalid n %d", di->di_n)); + KASSERT(di->di_n > 0, ("%s: Invalid n %d", __func__, di->di_n)); KASSERT(*domain < vm_ndomains, - ("vm_domainset_iter_first: Invalid domain %d", *domain)); + ("%s: Invalid domain %d", __func__, *domain)); } void