From nobody Fri Jan 9 14:16:18 2026 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 4dnkN308fpz62Z5p for ; Fri, 09 Jan 2026 14:16:19 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dnkN255Z1z3YX8 for ; Fri, 09 Jan 2026 14:16:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767968178; 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=wNzPjk8QZKEZcNZtT7HXgEEqcX/2EBqSm/knC7J5Rm8=; b=rnMtPUh1V4MSd4cVgcrHVK+vmS+pDDwmgy1zvlHdhfOIESimNoti3JarVvW33jqJoBWOCB V/5AL7B1BFNzIF7qkg8sz3nnVSZK7I3gCYEdF5N+BJTz/9L0kuEcKoBBhg4ln5kC/J0KOv JGkxMIF9i/HgrXSHjBlpcGoQ3WqzvMP1X0gSd46h/m+u8duk9WdOQ0ZA8a9lNy6rp4l1aM vxNIL9dj4SQSQDiPzHMJLKEIzGxgOPiN8v+hpDi2QLM9wfNIQ3SqF2PFdGy1R6YSYXMuOG QP+wkJs2OLjHhqDRy2FcqibJtxdK0m41tmu0kbbZA8F2jq+3OuRYQZK1rDiIfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1767968178; 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=wNzPjk8QZKEZcNZtT7HXgEEqcX/2EBqSm/knC7J5Rm8=; b=vlbkvznI+G4iIODxT/+n8biTJ/RCx0meIpj/2RDAUMQpoTbtDyTVtacUoakjfUMz3JALCq er487xA2qo9eBkULGb023MfnNPBJkF00CQdq/JCtyAeo5w/4CDLkdzeaA+COQ75JZzXINn FGtRVA2KBI0FsZaRDoixYE95Oydmmm89hnA+q0buf58AOOcPK5V+/4+Py+pqK6G13H/l+N rCTYW4K8iQKGzqU1lOOIIMFpknnIsSBnPDCDT3u48r5E7mJZppQtfHg8r98KNvUEhrpMnA xZ9gatRnpVCF1VDuH4GJNPXXlPTXIc6HQyzRSbtTSaacUrN5cudKrcRs9tOyvg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1767968178; a=rsa-sha256; cv=none; b=IirnYHK68B1wsZiTGZX8nXR2oX8diZ6lnCPodxfUnoUFGh9SgyDU0JBrpET1VMYXcda+zi W2oBEtKhrJZLeJ4BasxrRJwXceRPyuf1dhj9cO9rTRP85NcywSrnlud/UpBOOJb0PWH2/R UaQlbfpJMoUlfeeExQtfRSegOIO0WdFamAq8E7fVdFU2CvGiKLGVbOnBGxhdttGr4N3mod YBeEM9CId9YzeEvTMql6dJNuP2pyiva76j9iZDzw7D2kHkGWTFGOyoD32x0/Kg+FyYr9JM J5AmH2B3RaRkHCDcOnjqlanGe/6tmYjqLPoneLjYfUZOxpWq7v7vilQiz7RB8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dnkN24fQqz1Qs3 for ; Fri, 09 Jan 2026 14:16:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id d401 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 09 Jan 2026 14:16:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 258ad800929b - main - cache: avoid hardcoded cache padding 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 258ad800929b397c79bd1fc8178e14bfec9ebe78 Auto-Submitted: auto-generated Date: Fri, 09 Jan 2026 14:16:18 +0000 Message-Id: <69610db2.d401.3562f539@gitrepo.freebsd.org> The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=258ad800929b397c79bd1fc8178e14bfec9ebe78 commit 258ad800929b397c79bd1fc8178e14bfec9ebe78 Author: Brooks Davis AuthorDate: 2026-01-09 14:15:35 +0000 Commit: Brooks Davis CommitDate: 2026-01-09 14:15:35 +0000 cache: avoid hardcoded cache padding Replace CACHE_LARGE_PAD with rounding up to the alignment of struct namecache_ts. No functional change. Reviewed by: olce, markj Suggested by: jhb Effort: CHERI upstreaming Sponsored by: DARPA, AFRL Differential Revision: https://reviews.freebsd.org/D54553 --- sys/kern/vfs_cache.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index c5abc1c8b9b7..404234861710 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -420,10 +420,8 @@ TAILQ_HEAD(cache_freebatch, namecache); */ #ifdef __LP64__ #define CACHE_PATH_CUTOFF 45 -#define CACHE_LARGE_PAD 6 #else #define CACHE_PATH_CUTOFF 41 -#define CACHE_LARGE_PAD 2 #endif #define CACHE_ZONE_SMALL_SIZE \ @@ -431,7 +429,8 @@ TAILQ_HEAD(cache_freebatch, namecache); #define CACHE_ZONE_SMALL_TS_SIZE \ (offsetof(struct namecache_ts, nc_nc) + CACHE_ZONE_SMALL_SIZE) #define CACHE_ZONE_LARGE_SIZE \ - (offsetof(struct namecache, nc_name) + NAME_MAX + 1 + CACHE_LARGE_PAD) + roundup2(offsetof(struct namecache, nc_name) + NAME_MAX + 1, \ + _Alignof(struct namecache_ts)) #define CACHE_ZONE_LARGE_TS_SIZE \ (offsetof(struct namecache_ts, nc_nc) + CACHE_ZONE_LARGE_SIZE)