From nobody Sun Dec 24 05:39:37 2023 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 4SyVGf0wrnz53rFb; Sun, 24 Dec 2023 05:39:38 +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 4SyVGd73Kqz4LWZ; Sun, 24 Dec 2023 05:39:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703396378; 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=drnBjKLI0gxrzQD5sNBkyTHHJD/PXeUqmDws7toePx0=; b=P8Am5Xv/Il0J0hlGZ8jPKH6n6lYQN25Rb+7IDr68q/pIxaucYv6qAhTGXLvX7GFuQHZzDp VzkLKAuzbeotdcSFpI6oR5M0fj7f3q7I7Pc8uqdWqySduHu3yROZ3EosCbTR4FGnFDpIxL GLTPem4dbqAvPmLFo9ikfs31gceYolelPYYysFTwZp3sED0Ep7pOHPaD8zuwpPP0XDibhx 79j4uaDBj9PG6eeibhNzrjiPrLJoFsMmC6lnPhTIPs0xNKbnCqLrcdf+QZZJR0/BZpCqSi kgjNiTVvQ7n3TEcSS2HZempZCKBz9EfELrrOiUTt++bf1q6v7aTVMWfzsDCgWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1703396378; a=rsa-sha256; cv=none; b=gOdCtzCG6zM4IHlrD+mDJ+cwEpN0zb1wpkXt9XhQY7490cx6OoVJFGuNRtN4NqySIKsWZ8 ywoWW61eouc46QyLSAdaM0uGo87IuAQYMiWCl6xU+z7IQRfG+vfOm0GQoXoT8v7z7cyW+l VDsL4C6eRDQ/6GjcVafWNxxgCX6/gecACLkoWyT4Ewdvrp7rHGfsflhb6MuRltYaH6rvQL OpSg0T7YCL5eHAFID+F9od0zrY1mz3Zfo0wXUM5ZncRqY1CVAa3PwPFca2PcbXFZ+7a0oU VzLKRN/9xDaafI9nF64vpKC2R3PaMzVz4mHcV/gd/XvpzU3c5Mk0lS//ex/UlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1703396378; 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=drnBjKLI0gxrzQD5sNBkyTHHJD/PXeUqmDws7toePx0=; b=IICOvlR5O9bBnSPeCS/663NXRddwzUsSRjkyZGaXSNKWsZ8LOqAsrkJFsBSfnXTIeV5Rlr B2aaZcFxSyNwqDCrRBB/5QDwIOe5EKIcG+5gFcxJOp7oAnTtmCewM1jaMBDyRX77Rm/ndd aaeNMnkU9LIPsc8B+UZlSYfPe5LdKCFO0LykCg3BmwqARD+gmzFWKmYpoh9uMxKQuJfrpJ kVhdff09zaY8KglSVHW54DDaPXXDEtIyQp1rpd+jkgJF55AZb1hxTntxJGXY0XU0ryieBV BlFgdRinSZCIv1FkYD2fULR49/MHJ1zO/tYfkChOZSnNR66yeMovV/Sub0YQVA== 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 4SyVGd60FSz1Lv; Sun, 24 Dec 2023 05:39:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3BO5dbPQ003540; Sun, 24 Dec 2023 05:39:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BO5dbOd003537; Sun, 24 Dec 2023 05:39:37 GMT (envelope-from git) Date: Sun, 24 Dec 2023 05:39:37 GMT Message-Id: <202312240539.3BO5dbOd003537@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Jason A. Harmening" Subject: git: 0ee1cd6da960 - main - vm_page.h: tweak page-busied assertion macros 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jah X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0ee1cd6da960a7a3fedbba82b37d9c67494d2394 Auto-Submitted: auto-generated The branch main has been updated by jah: URL: https://cgit.FreeBSD.org/src/commit/?id=0ee1cd6da960a7a3fedbba82b37d9c67494d2394 commit 0ee1cd6da960a7a3fedbba82b37d9c67494d2394 Author: Jason A. Harmening AuthorDate: 2023-12-24 05:20:13 +0000 Commit: Jason A. Harmening CommitDate: 2023-12-24 05:20:13 +0000 vm_page.h: tweak page-busied assertion macros Fix incorrect macro name and include the value of curthread in the panic message where relevant. --- sys/vm/vm_page.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/vm/vm_page.h b/sys/vm/vm_page.h index e6bff3334d39..37cb1374b9f6 100644 --- a/sys/vm/vm_page.h +++ b/sys/vm/vm_page.h @@ -730,9 +730,9 @@ void vm_page_lock_assert_KBI(vm_page_t m, int a, const char *file, int line); #define vm_page_assert_unbusied(m) \ KASSERT((vm_page_busy_fetch(m) & ~VPB_BIT_WAITERS) != \ VPB_CURTHREAD_EXCLUSIVE, \ - ("vm_page_assert_xbusied: page %p busy_lock %#x owned" \ - " by me @ %s:%d", \ - (m), (m)->busy_lock, __FILE__, __LINE__)); \ + ("vm_page_assert_unbusied: page %p busy_lock %#x owned" \ + " by me (%p) @ %s:%d", \ + (m), (m)->busy_lock, curthread, __FILE__, __LINE__)); \ #define vm_page_assert_xbusied_unchecked(m) do { \ KASSERT(vm_page_xbusied(m), \ @@ -744,8 +744,8 @@ void vm_page_lock_assert_KBI(vm_page_t m, int a, const char *file, int line); KASSERT((vm_page_busy_fetch(m) & ~VPB_BIT_WAITERS) == \ VPB_CURTHREAD_EXCLUSIVE, \ ("vm_page_assert_xbusied: page %p busy_lock %#x not owned" \ - " by me @ %s:%d", \ - (m), (m)->busy_lock, __FILE__, __LINE__)); \ + " by me (%p) @ %s:%d", \ + (m), (m)->busy_lock, curthread, __FILE__, __LINE__)); \ } while (0) #define vm_page_busied(m) \