From nobody Thu May 15 15:27:58 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 4ZyvH33jpMz5wVP7; Thu, 15 May 2025 15:27:59 +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 4ZyvH311p2z46L6; Thu, 15 May 2025 15:27:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747322879; 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=dw+fWzcowMbHCQHu4S1dYN4ByKO/Secvv7cwpAWcp9I=; b=W4jlnHTb/NZYUu4GJl4CXVRReaIC1ATpBsybOTj66B1fkKuRahIQ4KuFgZ+QBD7vn8qOG2 v7w56wAtpE+9aaW4LgzAyS1m3pP7aXR7kVF0Vw5hr1VtXQi+QZ/+QrQGg7i6vN5uCiUgCS flBuiWuUP05Q2zaqW53cAZ5O7V8dnADU6tskXI2TXBmdlnw0vptpNZcvMPjmuiFgRo4sXH IXM2a/rocrv+T9JObzcRtJGmO9MOmBOtGCbZRmrS59vxODDCDYZn1wl17/OWx44VbA2DGx Q0musWAARj7t/S1IkkKMaA4OGCivnSRxq8+bQkMfASgvzB0K8FKvnZFwktcKEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747322879; 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=dw+fWzcowMbHCQHu4S1dYN4ByKO/Secvv7cwpAWcp9I=; b=lIayGCzXLCU5r1NxQJrs/DaIwKV9UTMREB5BB/uZcNDbwqrWBgYtorz/5IrLh+IMfD9Gz3 46F1r96uICtHqqS0ieLuqA+E8u5YfyzX7ItT+kwmi1zaW4m6S3ZTh1xET+1GgcN91Rxe1M IoVh8Kb+C3fRQYHv7UnQwku+9b6dMTy9iiKGdDXK6DlMq8D/QlqUwZA4jectk8YXSCDowx pQ5ntmtzVGXN4piEWYBga6rANoZTS2po6k4R0Pz25wsScl/7NSL0vgrNq3LiO81y3QBQ9F JguocJe5GD/pc8ld4Klh1kddMtP2MEO7c93P15K9DO5FloksAXGSDtIq1W9TRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747322879; a=rsa-sha256; cv=none; b=OpXh+DrblRqNVYYONcBlwoZUYHTjHtpqpLmqu/Cr+yMdFPuv8SbMJNt+pCywO+qKEBQj2y AfwfauHELYEMPbTHZnzbd8GAkLpiyw1/NzxOQuVJ3Q4EQc8TdPZOKb1AmhvxNdz+aIgFwO iizOGo0+o+V6ole2u77FWb8P8FhccoEbC0DTSKHXL6Pb7DbkGGDWLk9IqobiEA2c2e1lMw /HIzZtkVw3CInB5Utsbxd0wwTCmYblw2KuVNnJr224ln8Al/dUs3fBjRQxEFsIVhoxn9wE +OYypficaBhj7SU//yPCI5siGpEExlrGHZei+c4AD86NNgocANy8nn2RleL0HQ== 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 4ZyvH30Pqzz7GB; Thu, 15 May 2025 15:27:59 +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 54FFRwra071484; Thu, 15 May 2025 15:27:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54FFRwDZ071481; Thu, 15 May 2025 15:27:58 GMT (envelope-from git) Date: Thu, 15 May 2025 15:27:58 GMT Message-Id: <202505151527.54FFRwDZ071481@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 66886d9d9608 - main - subr_devmap: Add the function name to KASSERT 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 66886d9d960833a8fa6383976e546b3dfde96176 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=66886d9d960833a8fa6383976e546b3dfde96176 commit 66886d9d960833a8fa6383976e546b3dfde96176 Author: Andrew Turner AuthorDate: 2025-05-15 15:06:35 +0000 Commit: Andrew Turner CommitDate: 2025-05-15 15:09:46 +0000 subr_devmap: Add the function name to KASSERT These messages are almost identical, other than one has " 2" appended. Change this to include the function name at the start to make it more obvious which function the KASSERT is from. Reviewed by: mhorne, emaste Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D50308 --- sys/kern/subr_devmap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/kern/subr_devmap.c b/sys/kern/subr_devmap.c index 609c9b142312..d9026dd97311 100644 --- a/sys/kern/subr_devmap.c +++ b/sys/kern/subr_devmap.c @@ -267,7 +267,7 @@ pmap_mapdev(vm_paddr_t pa, vm_size_t size) akva_devmap_vaddr = trunc_page(akva_devmap_vaddr - size); va = akva_devmap_vaddr; KASSERT(va >= VM_MAX_KERNEL_ADDRESS - PMAP_MAPDEV_EARLY_SIZE, - ("Too many early devmap mappings")); + ("%s: Too many early devmap mappings", __func__)); } else #endif #ifdef __aarch64__ @@ -306,8 +306,8 @@ pmap_mapdev_attr(vm_paddr_t pa, vm_size_t size, vm_memattr_t ma) if (early_boot) { akva_devmap_vaddr = trunc_page(akva_devmap_vaddr - size); va = akva_devmap_vaddr; - KASSERT(va >= (VM_MAX_KERNEL_ADDRESS - (PMAP_MAPDEV_EARLY_SIZE)), - ("Too many early devmap mappings 2")); + KASSERT(va >= (VM_MAX_KERNEL_ADDRESS - PMAP_MAPDEV_EARLY_SIZE), + ("%s: Too many early devmap mappings", __func__)); } else #ifdef __aarch64__ if (size >= L2_SIZE && (pa & L2_OFFSET) == 0)