From nobody Wed Jul 23 16:22:59 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 4bnKDh2Kghz62VgH; Wed, 23 Jul 2025 16:23:00 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bnKDg5Yb9z3dkw; Wed, 23 Jul 2025 16:22:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753287779; 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=ZkkBk+TiGzBrVW2TjX6OmEIZK7tU+cEgGbQfPoYp/y4=; b=UO+bvuJ0+j6FtO+o+JXabfqg9SXBGPDIBEiMW52DaNMphR7xkwx2ljgM/VjfpmWQV4Xx0+ PVky/Zw+aDYm7JNNGo2HF1q/gQ6NrQ7C0dSPNnS5mDyUKNS2TN5wIdEd1V7y2pbgplnVaY 4X0ycsQuMciuAgsBr+fTo0ep6YHGXIHtELwVdtsuxFiY1nL6o9XhFayrLH7yJpVUCapF3A ZLJ1kGi04O+oXF9NdERJD7F/MhxQgLbcVLexxZjemFLPtraKdx4Af0/Xw30jyTRWhEOfFi a/oj/e+m7Z5gSbyeoFvh99o7qvTc6Y69j6AKsgY+jhFElMhxEQdQ/HcrOCF5Yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753287779; 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=ZkkBk+TiGzBrVW2TjX6OmEIZK7tU+cEgGbQfPoYp/y4=; b=b3nux6H0ieYdlHZJCLp5U+xP5uVjm5u+PscPoM4j8SY+QQ81Zuf75KeNGXGBWTgaiRCWvX /AotNRVSh3f8D76JWD2FFEqyUjOo9PhJ0gj5Z3IbaFDKBWrUz1Usm62gbQda/EMhj8bTx+ 2PGejCNR9X8Ch6FbAAwNujf7ngLETFVax8EmgW3BDaKw+NCOGKOyCEV33eOQ+eAElm9zb9 EYLjhqHAHhF03oBBlAlYBY3voD09CpjoXF/73y1nHEKb7WEBH4lTjm0d4PMfUTrFu5l773 4MUfOvf61Jz4c0HEjpocSvqvSKIh4tpCRwinZJ/IpZRWwiWZX26Tlrs7sRED4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753287779; a=rsa-sha256; cv=none; b=GJ/DIdQ0LAdO2sdw3xr/oYBBkcGxJAByy4iEmLv8QcIKn1+G+p+Dawl29y8UvIcMnd3IGV 3TCiKHWReAOCMfmciTODDklHgpFh19XN9yTEUpC6WrgZLGfCwcq5d0NTKotGleSbhy3VC3 aiVCkbs5pQDgUxudZUx4lqPfjl2yqu1s1+YIumTZjVPIL+m9iRImgR5BOQS6eGLFVj8POe be/Rn4EG4CP3VsgXzzj6XJqNW4j2ufqJ/8XSBOtzp9PL2AMDGrbgJldyiqA7O/ogCwJ1dF GH3eCmM6N5dZgl9DQFe5U6hq8z/tQxNa67c+QDBJyxbYDb7PABCxdjlK9SpZUw== 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 4bnKDg54vfz56g; Wed, 23 Jul 2025 16:22:59 +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 56NGMxnm057545; Wed, 23 Jul 2025 16:22:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56NGMxR6057542; Wed, 23 Jul 2025 16:22:59 GMT (envelope-from git) Date: Wed, 23 Jul 2025 16:22:59 GMT Message-Id: <202507231622.56NGMxR6057542@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: e9b713513a78 - main - pseudofs: Simplify pfs_readdir() and set eofflag 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e9b713513a78ccb01dbfa1a3f087f94b33531787 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e9b713513a78ccb01dbfa1a3f087f94b33531787 commit e9b713513a78ccb01dbfa1a3f087f94b33531787 Author: Mark Johnston AuthorDate: 2025-07-23 01:52:38 +0000 Commit: Mark Johnston CommitDate: 2025-07-23 16:20:31 +0000 pseudofs: Simplify pfs_readdir() and set eofflag There were two loops, one to skip entries before the requested offset, and one to populate entries. Merge them and use the return value of pfs_iterate() to decide whether to set eofflag. As a side effect, this fixes a small bug: the first loop would decrement `offset` to zero, and the second loop would increment it again. However, `offset` was used to set `d_off`, and we should include the starting offset there. Add a comment explaining the use of the allproc lock. Reviewed by: des, kib MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D51462 --- sys/fs/pseudofs/pseudofs_vnops.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/sys/fs/pseudofs/pseudofs_vnops.c b/sys/fs/pseudofs/pseudofs_vnops.c index 0bdfedffafcb..8cd092118d0e 100644 --- a/sys/fs/pseudofs/pseudofs_vnops.c +++ b/sys/fs/pseudofs/pseudofs_vnops.c @@ -850,7 +850,7 @@ pfs_readdir(struct vop_readdir_args *va) struct uio *uio; struct pfsentry *pfsent, *pfsent2; struct pfsdirentlist lst; - off_t offset; + off_t coffset, offset; int error, i, resid; STAILQ_INIT(&lst); @@ -860,6 +860,9 @@ pfs_readdir(struct vop_readdir_args *va) PFS_TRACE(("%s pid %lu", pd->pn_name, (unsigned long)pid)); pfs_assert_not_owned(pd); + if (va->a_eofflag != NULL) + *va->a_eofflag = 0; + if (vn->v_type != VDIR) PFS_RETURN (ENOTDIR); KASSERT_PN_IS_DIR(pd); @@ -878,6 +881,10 @@ pfs_readdir(struct vop_readdir_args *va) if (pid != NO_PID && !pfs_lookup_proc(pid, &proc)) PFS_RETURN (ENOENT); + /* + * The allproc lock is required in pfs_iterate() for procdir + * directories. + */ sx_slock(&allproc_lock); pfs_lock(pd); @@ -897,23 +904,15 @@ pfs_readdir(struct vop_readdir_args *va) } } - /* skip unwanted entries */ - for (pn = NULL, p = NULL; offset > 0; offset -= PFS_DELEN) { + for (pn = NULL, p = NULL, coffset = 0; resid >= PFS_DELEN; + coffset += PFS_DELEN) { if (pfs_iterate(curthread, proc, pd, &pn, &p) == -1) { - /* nothing left... */ - if (proc != NULL) { - _PRELE(proc); - PROC_UNLOCK(proc); - } - pfs_unlock(pd); - sx_sunlock(&allproc_lock); - PFS_RETURN (0); + if (va->a_eofflag != NULL) + *va->a_eofflag = 1; + break; } - } - - /* fill in entries */ - while (pfs_iterate(curthread, proc, pd, &pn, &p) != -1 && - resid >= PFS_DELEN) { + if (coffset < offset) + continue; if ((pfsent = malloc(sizeof(struct pfsentry), M_IOV, M_NOWAIT | M_ZERO)) == NULL) { error = ENOMEM;