From nobody Fri Mar  4 01:52:42 2022
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 C933919E1D84;
	Fri,  4 Mar 2022 01:52:42 +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 4K8rTQ4l52z4mvC;
	Fri,  4 Mar 2022 01:52:42 +0000 (UTC)
	(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
	t=1646358762;
	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=JW21C2xzn3eMaMQIfATJdwx0PkDlbDua1Orr5BDguVQ=;
	b=X8w4IR6GILKMb/mMNpBqS4ihD+F9o4PCLtACLb55sVN+c5Q0D5yFsy/CtRnedFbLYOiNN6
	Bk5w6piVJRTt8iXbKMpNuUNEhHqcdquSrQuwuLsHljxIC1TY/spT9RBlUPwJpB6xkYxOES
	rH2da49QR8PdKVW1677Fx0FGSEIY+cJI366H8ct6X5TaMaXtU+Zb8FYTLG2saQI0hanXGR
	lmJt5QU9zmd3X2h3f/t9lfpHLUJXmmR7PbLaPhyc/oWv6UGOUDXTlbQpI5UEePxMpOZwLI
	4bVkGIK4eyB1yan2eWiuJK1FJSI/HjomJFr9xWBJAO3BrpOdZUCuflDFHydgzw==
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 78835231B8;
	Fri,  4 Mar 2022 01:52:42 +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 2241qgrW027957;
	Fri, 4 Mar 2022 01:52:42 GMT
	(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
	by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2241qgOV027956;
	Fri, 4 Mar 2022 01:52:42 GMT
	(envelope-from git)
Date: Fri, 4 Mar 2022 01:52:42 GMT
Message-Id: <202203040152.2241qgOV027956@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
        dev-commits-src-main@FreeBSD.org
From: John Baldwin <jhb@FreeBSD.org>
Subject: git: 9af41803cbe5 - main - Use vnsz2log directly in assertion on its relation to sizeof(struct vnode).
List-Id: Commit messages for all branches of the src repository <dev-commits-src-all.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all
List-Help: <mailto:dev-commits-src-all+help@freebsd.org>
List-Post: <mailto:dev-commits-src-all@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-all+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-all+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-all@freebsd.org
X-BeenThere: dev-commits-src-all@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: jhb
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 9af41803cbe5cf88e145e44cc28d8db2642a0e90
Auto-Submitted: auto-generated
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
	s=dkim; t=1646358762;
	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=JW21C2xzn3eMaMQIfATJdwx0PkDlbDua1Orr5BDguVQ=;
	b=TpEbzaxrVa/mAP39MhjVCJIG/u8gh2q9eeRT7DoUCzSa8zRB4SdaTsrxT7xPzzhAAfHopY
	Hldx5Ek84IStX7l8KsKq9dc9TVsp1NvbApT9pEh9QB91/k0WdCFYVj5wVlJmVojr/0tV4o
	L59ibVyONk+nciqpUoseEBRamlGnPKywK3iMwe/JttZM6GB54CVsstbC6K8n3Vvu2tXcu8
	ZMm3ssRt5HSLhnqBHNaH/WZWyBLEOmQIS0ReFFlitiEU6k1UH1kS59zIi7WaAqhzmSLXoL
	Bu6Byy4TSawUnYiZSrIdDLAe1rqtC1eLBPZigSS2QnUy4Q+PvdK3Xg+gb/Ip8g==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646358762; a=rsa-sha256; cv=none;
	b=u46g8KJkJIi97gK++ncZWWabU1PE/8IEeXVENcEeDnF6unK1h0uYbFKmbD2Eop6QUnEEYa
	gdw8LT8S6SQNMbSul/3mRWc9sfOnSRf9c5mZSEPc9AHE/RAHKmbdOwO8h3h4p3QErmAp6B
	x3fUofKsAeXG8ql5/GaOzJhv1t9HZurnRt0xTo5eo4GtLm39YwHkwLZwOtPalTFvZ8A4o3
	zD2aqnZKN+rf7xNhVdJcXVOmpKsoxTlvuPbvAgFy9F1x1HdsuctGBEU6jgvZJRIT8sHSX8
	cwhuMfeuCumgX2MFBs2eAik9yYyO0XcuqIeRQHSZm+pwiT23ICNf6xvgpWOr4g==
ARC-Authentication-Results: i=1;
	mx1.freebsd.org;
	none
X-ThisMailContainsUnwantedMimeParts: N

The branch main has been updated by jhb:

URL: https://cgit.FreeBSD.org/src/commit/?id=9af41803cbe5cf88e145e44cc28d8db2642a0e90

commit 9af41803cbe5cf88e145e44cc28d8db2642a0e90
Author:     John Baldwin <jhb@FreeBSD.org>
AuthorDate: 2022-03-04 01:52:07 +0000
Commit:     John Baldwin <jhb@FreeBSD.org>
CommitDate: 2022-03-04 01:52:07 +0000

    Use vnsz2log directly in assertion on its relation to sizeof(struct vnode).
    
    This reduces the size of diffs required to support different values of
    vnsz2log.  In CheriBSD, kernels for CHERI architectures have vnodes
    larger than 512 bytes and require a value of 9.
    
    Reviewed by:    mjg
    Obtained from:  CheriBSD
    Sponsored by:   University of Cambridge, Google, Inc.
    Differential Revision:  https://reviews.freebsd.org/D34418
---
 sys/kern/vfs_subr.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c
index 56efe0367c03..afafd02d92b9 100644
--- a/sys/kern/vfs_subr.c
+++ b/sys/kern/vfs_subr.c
@@ -462,7 +462,8 @@ SYSCTL_PROC(_debug, OID_AUTO, ftry_reclaim_vnode,
 /* Shift count for (uintptr_t)vp to initialize vp->v_hash. */
 #define vnsz2log 8
 #ifndef DEBUG_LOCKS
-_Static_assert((sizeof(struct vnode) >= 256) && (sizeof(struct vnode) < 512),
+_Static_assert(sizeof(struct vnode) >= 1UL << vnsz2log &&
+    sizeof(struct vnode) < 1UL << (vnsz2log + 1),
     "vnsz2log needs to be updated");
 #endif