From nobody Wed Aug 27 19:19:04 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 4cBvTj0RJsz65VtL; Wed, 27 Aug 2025 19:19:05 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cBvTh6CnKz438N; Wed, 27 Aug 2025 19:19:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756322344; 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=HY3etn+2n8CwmVZhExGUlgpWWbd2KNZo/XMk61zTzts=; b=jNdUctkhIzPiVLr/fAw2Eh0rNU25bio92O36Q2fQi99Z36T0HGyRLclazK30w31V1W6gP9 btK1Cd9GW35t2ch1oyDCuOi+OYRtaYUJRysxWXU9kA3SZJ/6KWA4fTS60TGFPMWQA1W/2M Gtq/+LZ7Rq6R/aeDKNjDrZn7Xeut6aM4BBrRNZ8CljRjU5Yk9ySYqzevfagWHE5vIR+n5a 1/vcp7Ss66mJJz7lqSRmeW7N8saKcJ+coXPIiWupE4AGcYP5lpRCQl31V4ZQkQepZIj/Lk uTWVt70G/CmzWE4cKNu0d+Ksg33SDFlcc1R6UR4tVzNcQWWwypfMqQmRnyZEtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1756322344; 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=HY3etn+2n8CwmVZhExGUlgpWWbd2KNZo/XMk61zTzts=; b=g5cvGXN1Iy9eOd5CMk+G3wniCwCLJ82YEaX5Y3yOBdD6vOqfiAj/zs1jt3Cu7Ot/lbIC8t nLsBH4jOvTc+PuuQV55yHFWUqEKhwcK0bNnLfpMnt4GKX6Uic4djZMb/bXjFt4pAVgL9D1 vnMYt+yvPyvfd62QiM5dz2lbZCpl0HpuUhFYDUJ59GTEp881DDlgnVdtWDQ9MnFtAhixie 8AGryjyxZ9907EFrGxDm5vxKh4w0q4V6lbztPPmn1vyMoAS62SLCTnEaf40+czPJHWg5Cz NJ2liU2QZorEmkh2lEnYLZP0AwlYIgbL8qjgRJs98G2dHQDsRNkYZy9Os8mhBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1756322344; a=rsa-sha256; cv=none; b=ElitqAHS6ButRYP16ELryLsKINXzV2g0eLVdZ7JMQqtPlEqsq3ME2cs85dzfFNgjMXX7An NnDU0cXkS5LYVt8zetiUTiKVxZzXx+yQqvfYDrbQwlRINV0CFfv7QZHgFbqRkwvB4mlrhF KrdgFFLk2J1XYWcbADaZSRMzPtFERJMveL3GWw252+wZ9hoW8KbUWuTSMvG48PmPyOGbFU k6BNNDmKqgUI6KRmpMENIjjghX9rOyJUWdsyWMWxcFFMHGPdY2vsBt+XeAyDvr3ZDUuUob +1cWB6IODgikPAhjmAZwykjJ6DakOPdrBUA5kUI5VGgipT7/6O8IV0DfRuaWTQ== 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 4cBvTh5LLPzbtq; Wed, 27 Aug 2025 19:19:04 +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 57RJJ40d025660; Wed, 27 Aug 2025 19:19:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57RJJ4QR025657; Wed, 27 Aug 2025 19:19:04 GMT (envelope-from git) Date: Wed, 27 Aug 2025 19:19:04 GMT Message-Id: <202508271919.57RJJ4QR025657@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 9ce29249ec5d - main - makefs: Calculate indirect block count properly for large files on ffs 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: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9ce29249ec5d7d1d0a9f5f7655e1b37d54622665 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=9ce29249ec5d7d1d0a9f5f7655e1b37d54622665 commit 9ce29249ec5d7d1d0a9f5f7655e1b37d54622665 Author: Boris Lytochkin AuthorDate: 2025-08-27 18:49:12 +0000 Commit: Ed Maste CommitDate: 2025-08-27 19:18:50 +0000 makefs: Calculate indirect block count properly for large files on ffs When building an ffs image containing large file(s), space requirements were calculated incorrectly yielding a bigger image than necessary. The reason is that amount of indirect blocks estimation was done wrong: - single indirect block was treated as it can hold just 12 data blocks - nested indirect blocks were not taken into account at all Add support for indirect blocks and fix another tiny bug with underestimated space requirement for files with size between (UFS_NDADDR-1)*blksz+fragsz ... (UFS_NDADDR)*blksz requesting N>1 fragments instead of a whole block. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D52120 --- usr.sbin/makefs/ffs.c | 94 +++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 76 insertions(+), 18 deletions(-) diff --git a/usr.sbin/makefs/ffs.c b/usr.sbin/makefs/ffs.c index c0fcadf11fba..ed94abb7504f 100644 --- a/usr.sbin/makefs/ffs.c +++ b/usr.sbin/makefs/ffs.c @@ -591,6 +591,75 @@ ffs_create_image(const char *image, fsinfo_t *fsopts) return (fsopts->fd); } +static void +ffs_add_size(fsinfo_t *fsopts, size_t file_len) +{ + ffs_opt_t *ffs_opts = fsopts->fs_specific; + size_t blocks, fs_nindir, overhead; + int indir_level; + + blocks = howmany(file_len, ffs_opts->bsize); + + if (blocks <= UFS_NDADDR) { + /* Count full blocks. */ + fsopts->size += rounddown2(file_len, ffs_opts->bsize); + /* Calculate fragment size needed. */ + overhead = howmany(file_len - + rounddown2(file_len, ffs_opts->bsize), ffs_opts->fsize); + + /* + * A file could have just 1 fragment with size 1/8, 1/4 or 1/2 + * of bsize. + */ + switch (overhead) { + case 0: + break; + case 1: + fsopts->size += ffs_opts->fsize; + break; + case 2: + fsopts->size += 2 * ffs_opts->fsize; + break; + case 3: + case 4: + fsopts->size += 4 * ffs_opts->fsize; + break; + default: + fsopts->size += ffs_opts->bsize; + break; + } + return; + } + + /* File does not fit into direct blocks, count indirect blocks. */ + blocks = howmany(file_len - UFS_NDADDR * (size_t)ffs_opts->bsize, + ffs_opts->bsize); + fs_nindir = (size_t)ffs_opts->bsize / ((ffs_opts->version == 1) ? + sizeof(ufs1_daddr_t) : sizeof(ufs2_daddr_t)); + + indir_level = overhead = 0; + while (blocks > 0 && indir_level < 3) { + /* One indirect block is stored in di_ib[] */ + blocks = howmany(blocks, fs_nindir) - 1; + fsopts->size += ffs_opts->bsize * blocks; + overhead += blocks + 1; + indir_level++; + } + + assert(blocks == 0); + + if ((debug & DEBUG_FS_SIZE_DIR_NODE) != 0) { + printf("ffs_size_dir: size %jd, using %d levels of indirect " + "blocks, overhead %jd blocks\n", (uintmax_t)file_len, + indir_level, (uintmax_t)overhead); + } + + /* + * If the file is big enough to use indirect blocks, + * we allocate bsize block for trailing data. + */ + fsopts->size += roundup2(file_len, ffs_opts->bsize); +} static void ffs_size_dir(fsnode *root, fsinfo_t *fsopts) @@ -622,20 +691,6 @@ ffs_size_dir(fsnode *root, fsinfo_t *fsopts) e, tmpdir.d_namlen, this, curdirsize); \ } while (0); -#define ADDSIZE(x) do { \ - if ((size_t)(x) < UFS_NDADDR * (size_t)ffs_opts->bsize) { \ - fsopts->size += roundup((x), ffs_opts->fsize); \ - } else { \ - /* Count space consumed by indirecttion blocks. */ \ - fsopts->size += ffs_opts->bsize * \ - (howmany((x), UFS_NDADDR * ffs_opts->bsize) - 1); \ - /* \ - * If the file is big enough to use indirect blocks, \ - * we allocate bsize block for trailing data. \ - */ \ - fsopts->size += roundup((x), ffs_opts->bsize); \ - } \ -} while (0); curdirsize = 0; for (node = root; node != NULL; node = node->next) { @@ -646,13 +701,13 @@ ffs_size_dir(fsnode *root, fsinfo_t *fsopts) } else if ((node->inode->flags & FI_SIZED) == 0) { /* don't count duplicate names */ node->inode->flags |= FI_SIZED; - if (debug & DEBUG_FS_SIZE_DIR_NODE) + if ((debug & DEBUG_FS_SIZE_DIR_NODE) != 0) printf("ffs_size_dir: `%s' size %lld\n", node->name, (long long)node->inode->st.st_size); fsopts->inodes++; if (node->type == S_IFREG) - ADDSIZE(node->inode->st.st_size); + ffs_add_size(fsopts, node->inode->st.st_size); if (node->type == S_IFLNK) { size_t slen; @@ -660,13 +715,16 @@ ffs_size_dir(fsnode *root, fsinfo_t *fsopts) if (slen >= (ffs_opts->version == 1 ? UFS1_MAXSYMLINKLEN : UFS2_MAXSYMLINKLEN)) - ADDSIZE(slen); + ffs_add_size(fsopts, slen); } } if (node->type == S_IFDIR) ffs_size_dir(node->child, fsopts); } - ADDSIZE(curdirsize); + ffs_add_size(fsopts, curdirsize); + + /* Round up to full block to account fragment scattering. */ + fsopts->size = roundup2(fsopts->size, ffs_opts->bsize); if (debug & DEBUG_FS_SIZE_DIR) printf("ffs_size_dir: exit: size %lld inodes %lld\n",