From nobody Mon Jul 28 13:31:50 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 4brKBv4zHrz635DX; Mon, 28 Jul 2025 13:31:51 +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 4brKBt6X7Mz3vsM; Mon, 28 Jul 2025 13:31:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753709510; 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=COCplM74Kjva2FG320guNp4IGin5ZzHQ0vsTSyj8xYY=; b=N0zuGUppkQ7aAYh9cWmoKim1myyUQor2LmtnDl4H1N7b+7LIRRgzi4sWjuIlAULpkSPvD/ paNbpmGIsNEV0HdhnKLU0J5FtMSOmeBjM7d68hO6apX8c65tSZEY5Fjg/VUYWdy7jRmmQG lDZlYvUHvsFtzJspnqCUYgC+cLHUDJITK/RQUdKX2VIVZDfM2cUSQ6IaOgsOnjRXl3VNZc /AlBvk7UPko7jBnqP52nEnMgkw20NGBruomQfVLxCMQcpfxBa6jBkRNQZNg2t5vZ4Zzwpk JmjLEWP9TdrKtuiqO7SajCgel0O+a0I0UKc8D7SsmHUciMMEc6q301Aa5WsJnA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753709510; 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=COCplM74Kjva2FG320guNp4IGin5ZzHQ0vsTSyj8xYY=; b=pSzuweJYIhavWtbep9JLzWqjnjxXWM4/gGiUqKoh10/NFSCkfqYnePE9U79AedfSpzHj5Q 49MyEV4z/jwuNs9aUoMApDQVWbemxMPOMUMpidm+TIQPboLPyKH3iOYGuPqPn0xJYaqZUR /Uqrg09yHmBhl1PcoMICMalZS8oujlcfj8iamlF7VGff/yPH5lx9vEd1VndSuvRBiv4+5K gYvUwHhNG1vG2L8h59MfMSXhgWigs1OdjyMJCT9hAm6xsko345DBM1qnC7VOFSUiqm+WB/ hTspFhih2HJw8G5aOhLkiJL0r0ft895x9qdg/h0nx3Tqxm1k9ujI0pmVx5I6Tw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753709510; a=rsa-sha256; cv=none; b=LQZPeuBJGA4+0TzZ4i+6BPFBRm8gYjB7HVH+aXla5M9cqH9fmf6fEP0z4zk+K6fYEcL/Kc 4np6QKoJE+eWtWYYw6CjqmjJ6WLl1MvJRaH8a5GEkOXFd750s6uMc3gC0ll8Li85VG6ql/ 6LQDD/+eeiBLj3569Q06JmEh0oa3btxEInD91RI41SQJx1M9vnc39nR3/1ZfwY5HTMItcA T/qszrL3F22WMjAwF6yF0aCD0gc70GkkQ+r8Klm7f9jBf1uopcgtzNOFRPHXLkrAo0R5Hb xI45+5n/RY1eT84AvlDhfHJQCe38rOU3KqVkkpFDb/DJ3y9ANQ/UFrtcwgxryg== 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 4brKBt5YjGzngG; Mon, 28 Jul 2025 13:31:50 +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 56SDVosg082506; Mon, 28 Jul 2025 13:31:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56SDVopN082503; Mon, 28 Jul 2025 13:31:50 GMT (envelope-from git) Date: Mon, 28 Jul 2025 13:31:50 GMT Message-Id: <202507281331.56SDVopN082503@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 880e131d9d31 - stable/14 - vm_domainset: Print correct function in KASSERT()/panic() 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 880e131d9d310c98f3b3c035d2daecb757198a77 Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=880e131d9d310c98f3b3c035d2daecb757198a77 commit 880e131d9d310c98f3b3c035d2daecb757198a77 Author: Olivier Certner AuthorDate: 2025-07-07 14:14:16 +0000 Commit: Olivier Certner CommitDate: 2025-07-28 13:28:52 +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 (cherry picked from commit 1e78a6a6d85702b84f679712aac71f91e481e8f9) --- 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 9bc0df865154..b666324db494 100644 --- a/sys/vm/vm_domainset.c +++ b/sys/vm/vm_domainset.c @@ -126,8 +126,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: /* @@ -144,11 +143,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 @@ -184,13 +182,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