From nobody Tue Aug 12 12:56:11 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 4c1Whq6Dzlz64jRy; Tue, 12 Aug 2025 12:56:11 +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 4c1Whq5Vdjz3KNc; Tue, 12 Aug 2025 12:56:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755003371; 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=cZx9IL+RxsIWVqaliBY22zNZaA50zYlCfgrEKJuNzxI=; b=jsZryPa8QqNo7orS1S3BWj0hK2GwtyA9WARLT+mE7KDSUBfRSIgF0V3tlXs2Mt0hwZjYFD GBXzviIQrqBmlRQoyNkuTHELSNQdvu2l1zr8XfQQxqm+I6e7faEurx1cwAdiCnHVoldHr8 gTGswep1sBj7s+gjkE9SeLkrjlGxYJdA2kPsbngu64wVXf8WnNA8/nVNkU7DdTR0EG7679 Iu+Cgor2GyV1l8Bs9oa07RsMxfnCXauuUcGywqqM/4BbRH6xZJEYjcwDZ5Z1AF7+QgG9Kt lQHydS/pf55RlL6DoDJb+MmTjGoD4JD1BzVDtT71BhTjif4RQsAzaa8BmJ5hMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755003371; 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=cZx9IL+RxsIWVqaliBY22zNZaA50zYlCfgrEKJuNzxI=; b=ilkEEFNNmrUqC1eymqe9o1qU9uAB5f/mxqNL++DGmrziQxVCTUBFPZvAk2+Y9TIflK7FTE pFNqNkKaAXbHJHFjR1eO0YJE36/3J0WRGVC0x9ViXPYr4Wi5BVk57dt9Zi4/V7x0jWVVw0 C0GOEsIsuABYWbMbDdYsYeaky89a8lHy2QW4iJ1DWi6UiSmsKYwKbQHv5DMSFflQcKfJNm Wv+O7nT2uDkEekhtkY278H4Ax+/hYG5gdvywKT4QSPE1pRqQcvFQz5Pc0ZkfRWPcgmtVsh Yrs7dHXVKccPavwl5Xdge8eWRmz8foucMU/Y0ggyezHO7rx/Xh2ykCrfciOHJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755003371; a=rsa-sha256; cv=none; b=wvyn0WdABRJttrl4PXsrWAT/zDTAWNoV8qXCNiy0Zx4L23Lvzp7/b/i+2P9p3RsLWe3Gd+ ZL+210Ixi70UEDq+Ps84fy8oZArMTpsd1Braq+lve7oFZZXs11y2vwDfA3iUIr003PZBLe h9eILe9hjTw55rW1+4VefHC8KHqs1T3D0anYiXr+Qp29T7laEBMlQp2vkgrrIg04fBTQ0G tXGI+L4uQkvPcI1QW2vewOojaRp9yblZ6ovCfnQXAS/fh4D7391qM50Wr4TmLsGMvjwe5k 3yOqZGlcDSykY63Q201KTp/k4Jw/E5ZSQiRtGVdol26wQHEyWHnMPo8ACZSr1g== 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 4c1Whq4nWfzfn2; Tue, 12 Aug 2025 12:56:11 +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 57CCuB6b088380; Tue, 12 Aug 2025 12:56:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57CCuBKa088377; Tue, 12 Aug 2025 12:56:11 GMT (envelope-from git) Date: Tue, 12 Aug 2025 12:56:11 GMT Message-Id: <202508121256.57CCuBKa088377@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: f88108c7963c - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: f88108c7963c1aa3c83a2c053f43dfcddb5cf4bc Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=f88108c7963c1aa3c83a2c053f43dfcddb5cf4bc commit f88108c7963c1aa3c83a2c053f43dfcddb5cf4bc Author: Mark Johnston AuthorDate: 2025-07-23 01:52:38 +0000 Commit: Mark Johnston CommitDate: 2025-08-12 12:49:42 +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 (cherry picked from commit e9b713513a78ccb01dbfa1a3f087f94b33531787) --- 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;