From nobody Wed Nov 19 11:19:25 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 4dBJsT50Ftz6HYNc for ; Wed, 19 Nov 2025 11:19:25 +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 4dBJsT4MPzz3WMR for ; Wed, 19 Nov 2025 11:19:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551165; 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=sD3e+N761dYzYmzR8KY1DH+rfl5p6b/FYQDexyvfkV0=; b=Nkpyqgy5ItrAPmt0PdjUwmfjIS3hcmKKlwPviehgKIHkXw/3tDPY1IApuXdXwNP831fVyV 9xkU970wVvnLJpL4JsUrm5XDwq47fwzL69tW+Xz1mnEr/3yNI+3Enainprdbkv8cevT+N9 3xg+XdJNxpSLt2sRwQr1vmFtm0oeFlwjuajF5oadf5QrwWsZmqN30kR/lRPuV0Dlz1K2CS aFcXYF4cRS/VCPlBqGsbJCl+yRgZ8o2zhjJ68NDIj3P5Vfu1/bS8OHZB0FQBALGMGm0rd8 Q5XogZSbG1FhydhbNLwI/EaNMrijQif2knD5I9cqhT4c0sf+LZ/1S7Fl4WX3dQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763551165; 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=sD3e+N761dYzYmzR8KY1DH+rfl5p6b/FYQDexyvfkV0=; b=qbqppW4qGHYRWIiMF78XsHuWwUNcfK2Hjpt90R+Sa3sLuQkrTXmMvDWMLWt0nkpQ/6GlZe qBOpuPYDnWJJ5dKvy36iNoMBL1Mw2k+bdimF7Xqw9HCN3c2O9X6Ws37J3CTPxYvNfxhdbU xyLilH8eBBhXFT0IiGRQuzVbuDKBTiWr2hwcsSFE64H9EKHMJs1/7H5tmdLdX6lXBpnfP9 xrZ/X4BoyhOxDVzFrIqnjsxhizcjqws2vSzVx7yjqdL4JYHP4vrvTU1kNkUv2IUbMp4dsz R1DG1FjvXfMjWFu3kNLkvd8QZXnkBxZ3FQlld9mKRJa9FNIKtpCD1KjWo6MelQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763551165; a=rsa-sha256; cv=none; b=rJvWu/KcTPN7J5QRBmNLM0B4y4idZFR3KOlqB53T15UOFVrMDRmpu4Jsbf1SDZMUviS5fR YHU0odh3dIAVB24UwXF9ckR00tqLcF5YAVFCKja1pRbBIajgmF1qzwH0Zm1tcXZumkXZn7 sLOMo2kQGCpleDpJw0hbRwJISVUvJNDRJA7Gy1DZIfqS0qsFl002xr3c5XIWanoBip0nAK PegOrn5BKsQX63jcEuj3Q1lTJO6v5TExDoT0OpSMqDKKjBvQXntW8QL2eqySwIKfqEFzx9 QV5vPXKz+ghKpl+UvghzMvgOZOxIBksD/YWonhD7MngGY63xBatULT/HpQuBfQ== 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 4dBJsT3xjpzf40 for ; Wed, 19 Nov 2025 11:19:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 99cf by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Wed, 19 Nov 2025 11:19:25 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav Subject: git: b41551753a2b - stable/14 - quot: Add tests 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b41551753a2baff6646e2958acb4a7fcd205b69c Auto-Submitted: auto-generated Date: Wed, 19 Nov 2025 11:19:25 +0000 Message-Id: <691da7bd.99cf.4af747a@gitrepo.freebsd.org> The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=b41551753a2baff6646e2958acb4a7fcd205b69c commit b41551753a2baff6646e2958acb4a7fcd205b69c Author: Dag-Erling Smørgrav AuthorDate: 2025-10-17 11:55:12 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2025-11-19 11:19:07 +0000 quot: Add tests To facilitate the task, we change the comparison function so that users with equal filesystem usage are sorted by UID, and add an undocumented option that prevents quot from replacing numerical UIDs with names. We also switch from getfsfile(3) to getmntpoint(3) so the first line is identical regardless of whether we pass quot a mountpoint or a device. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D53133 (cherry picked from commit aa870a1935bccb66e02c4c31630706768a3e7d74) (cherry picked from commit b5f3f1a661ab69986c3379fa4c9c2b38785933db) --- etc/mtree/BSD.tests.dist | 2 + usr.sbin/quot/Makefile | 5 +- usr.sbin/quot/quot.c | 11 ++++- usr.sbin/quot/tests/Makefile | 4 ++ usr.sbin/quot/tests/quot_test.sh | 101 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 120 insertions(+), 3 deletions(-) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 6833d35bae76..214d6f6162cb 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -1217,6 +1217,8 @@ .. pw .. + quot + .. rpcbind .. sa diff --git a/usr.sbin/quot/Makefile b/usr.sbin/quot/Makefile index b18c37126448..1f87278f1bfa 100644 --- a/usr.sbin/quot/Makefile +++ b/usr.sbin/quot/Makefile @@ -1,7 +1,10 @@ +.include PROG= quot MAN= quot.8 -LIBADD= ufs +LIBADD= ufs util +HAS_TESTS= +SUBDIR.${MK_TESTS}= tests WARNS?= 2 diff --git a/usr.sbin/quot/quot.c b/usr.sbin/quot/quot.c index 7a7362dea996..5005622987dc 100644 --- a/usr.sbin/quot/quot.c +++ b/usr.sbin/quot/quot.c @@ -55,6 +55,7 @@ /* some flags of what to do: */ static char estimate; static char count; +static char noname; static char unused; static void (*func)(int, struct fs *, char *); static long blocksize; @@ -281,7 +282,7 @@ user(uid_t uid) usr--) { if (!usr->name) { usr->uid = uid; - if (!(pwd = getpwuid(uid))) { + if (noname || !(pwd = getpwuid(uid))) { asprintf(&usr->name, "#%u", uid); } else { usr->name = strdup(pwd->pw_name); @@ -308,7 +309,10 @@ cmpusers(const void *v1, const void *v2) u1 = (const struct user *)v1; u2 = (const struct user *)v2; - return u2->space - u1->space; + return (u2->space > u1->space ? 1 : + u2->space < u1->space ? -1 : + u1->uid > u2->uid ? 1 : + u1->uid < u2->uid ? -1 : 0); } #define sortusers(users) (qsort((users),nusers,sizeof(struct user), \ @@ -576,6 +580,9 @@ main(int argc, char *argv[]) while (--argc > 0 && **++argv == '-') { while (*++*argv) { switch (**argv) { + case 'N': + noname = 1; + break; case 'n': func = donames; break; diff --git a/usr.sbin/quot/tests/Makefile b/usr.sbin/quot/tests/Makefile new file mode 100644 index 000000000000..d4e64691f905 --- /dev/null +++ b/usr.sbin/quot/tests/Makefile @@ -0,0 +1,4 @@ +PACKAGE= tests +ATF_TESTS_SH= quot_test + +.include diff --git a/usr.sbin/quot/tests/quot_test.sh b/usr.sbin/quot/tests/quot_test.sh new file mode 100644 index 000000000000..7da9d23ca11f --- /dev/null +++ b/usr.sbin/quot/tests/quot_test.sh @@ -0,0 +1,101 @@ +# +# Copyright (c) 2025 Dag-Erling Smørgrav +# +# SPDX-License-Identifier: BSD-2-Clause +# + +# Create and mount a UFS filesystem on a small memory disk +quot_setup() +{ + atf_check -o save:dev mdconfig -t malloc -s 16M + local dev=$(cat dev) + atf_check -o ignore newfs "$@" /dev/$dev + atf_check mkdir mnt + local mnt=$(realpath mnt) + atf_check mount /dev/$dev "$mnt" + echo "/dev/$dev:" >expect + printf "%5d\t%5d\t%-8s\n" 8 2 "#0" >>expect +} + +# Create a directory owned by a given UID +quot_adduid() +{ + local uid=$1 + atf_check install -d -o $uid -g 0 mnt/$uid + printf "%5d\t%5d\t%-8s\n" 4 1 "#$uid" >>expect +} + +# Perform the tests +quot_test() +{ + local dev=$(cat dev) + # Create inodes owned by a large number of users to exercise + # hash collisions and rehashing. The code uses an open hash + # table that starts out with only 8 entries and doubles every + # time it fills up. + local uid + for uid in $(seq 1 32); do + quot_adduid $uid + done + # Also create inodes owned by users with long UIDs, up to the + # highest possible value (2^32 - 2, because chown(2) and + # friends interpret 2^32 - 1 as “leave unchanged”). + local shift + for shift in $(seq 6 32); do + quot_adduid $(((1 << shift) - 2)) + done + # Since quot operates directly on the underlying device, not + # on the mounted filesystem, we remount read-only to ensure + # that everything gets flushed to the memory disk. + atf_check mount -ur /dev/$dev + atf_check -o file:expect quot -fkN /dev/$dev +} + +# Unmount and release the memory disk +quot_cleanup() +{ + if [ -d mnt ]; then + umount mnt || true + fi + if [ -f dev ]; then + mdconfig -d -u $(cat dev) || true + fi +} + +atf_test_case ufs1 cleanup +ufs1_head() +{ + atf_set descr "Test quot on UFS1" + atf_set require.user root +} +ufs1_body() +{ + quot_setup -O1 + quot_test +} +ufs1_cleanup() +{ + quot_cleanup +} + +atf_test_case ufs2 cleanup +ufs2_head() +{ + atf_set descr "Test quot on UFS2" + atf_set require.user root +} +ufs2_body() +{ + quot_setup -O2 + quot_test +} +ufs2_cleanup() +{ + quot_cleanup +} + +atf_init_test_cases() +{ + atf_add_test_case ufs1 + atf_add_test_case ufs2 +}