From nobody Wed Jul 23 16:23:01 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 4bnKDk3sl7z62Vwd; Wed, 23 Jul 2025 16:23:02 +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 4bnKDk0fTJz3dZG; Wed, 23 Jul 2025 16:23:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753287782; 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=nfnS6SgAkga01TjCk3UtUemp81BTPXCjdz9u7A8qRiI=; b=CATgKleMdIyfG5VnRS6qY/T1rMFUKr3OBeTskkK12TYjNSDTyC5Lt/jC4nhUik+W8fvF9Q fJsbokzFVOpLL3Mn43zRxZetrtpDpp/hXEPrO/8miem48Mz1P9Gk5J0TkF1wLrMRiGCQML OsIFUE1FHdezi7bmZ2nX5YUcLWH/5RHbIj5H+E8ZGom3uWrTunEU3QhTZbBIAfyqj00MlA NzbcxgmPz99KvoupMlPYH+GEIY9q/kjvC8dKnQLn8fXBF9LFvdHtcCkK7e+DVJ7ZhLNKgo j4vMsyPUKS7fgpOY52b1AysW4lMtM/C+HFCUUiOwS+frNpYECjLbmhZjYCryRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753287782; 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=nfnS6SgAkga01TjCk3UtUemp81BTPXCjdz9u7A8qRiI=; b=wL+wVEELmLP69wJgr7CJwW1hkDEFiJBFk4ARdiGXOSLEPpPXDyJRAOjxVsYOkVPW73YeGn Phh8eSSo0PwqrmJwcCEr6RBo1x1BHO+ZccEhF7fNr3lMcDVg42XWW7toKgZrDsVpMK/7is Rc2marTQwIuhGwMyaswMebiQws5V15mICtlm0fp0KYX5jN3024RZoRTq65ywKcZ+AnNCUF 68jrF7ARfJ47KPBS5dE+Kl+nVMyQazdi2pJrENM4pmMl8psjQoMHRRGhjQHCSZ5jwRVBSH OE9Z1/hT4LHTPut2OEUgs9gOxnjoppdxZasGzsCNpVZi/Buyz1rVT2MY+6CNyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753287782; a=rsa-sha256; cv=none; b=VDvWDa/naGUUITTgE38fAagU6whjLohgu6THxWa8JVTDFXVo5yGdkKF5oKLf1LGGphZp9x vgmqCRYUJB18yG5e7DtUgJqFwpW2UXjYNbKzJu43D1y3bCy/NfDquC7rdwaXkovGullJjk VfFHd42WvbwgH9HnZG0YsCK7N2er+1KGAoC4WxTnoBsBix/gUQqawqE2Sy++jmWOHuLDlm PNbTXsz6PxoRqq8oCC+pjnw0xe2W5o/IFc6EdHhuBfFTsetEI0v40cRq9YXlXPhcMpYURO 4R9wlxwXgHhC96bbPETBMbgCYUuJfKM1yU5P6YeO/6Z2J7iEPRdD9XO4D67b9g== 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 4bnKDj6gp2z5VX; Wed, 23 Jul 2025 16:23:01 +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 56NGN1Ea057623; Wed, 23 Jul 2025 16:23:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56NGN1GM057619; Wed, 23 Jul 2025 16:23:01 GMT (envelope-from git) Date: Wed, 23 Jul 2025 16:23:01 GMT Message-Id: <202507231623.56NGN1GM057619@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: 77b273d8f5f4 - main - vfs: Assert that VOP_READDIR sets *eofflag properly 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: 77b273d8f5f40939841952cf8daf6e934922d264 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=77b273d8f5f40939841952cf8daf6e934922d264 commit 77b273d8f5f40939841952cf8daf6e934922d264 Author: Mark Johnston AuthorDate: 2025-07-23 01:52:13 +0000 Commit: Mark Johnston CommitDate: 2025-07-23 16:20:31 +0000 vfs: Assert that VOP_READDIR sets *eofflag properly Suggested by: kib Reviewed by: olce, kib MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D51300 --- sys/kern/vfs_subr.c | 11 ----------- sys/kern/vnode_if.src | 1 + sys/sys/vnode.h | 29 ++++++++++++++++++++++++++++- 3 files changed, 29 insertions(+), 12 deletions(-) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 918b256e6c59..29774cf87393 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -6533,17 +6533,6 @@ vop_read_pgcache_post(void *ap, int rc) VFS_KNOTE_UNLOCKED(a->a_vp, NOTE_READ); } -void -vop_readdir_post(void *ap, int rc) -{ - struct vop_readdir_args *a = ap; - - if (!rc) { - VFS_KNOTE_LOCKED(a->a_vp, NOTE_READ); - INOTIFY(a->a_vp, IN_ACCESS); - } -} - static struct knlist fs_knlist; static void diff --git a/sys/kern/vnode_if.src b/sys/kern/vnode_if.src index 38138a4af921..4684eb8a7d77 100644 --- a/sys/kern/vnode_if.src +++ b/sys/kern/vnode_if.src @@ -380,6 +380,7 @@ vop_symlink { %% readdir vp L L L +%! readdir pre vop_readdir_pre %! readdir post vop_readdir_post vop_readdir { diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index 2c6947103c94..201e260c41f5 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -939,7 +939,6 @@ void vop_mknod_post(void *a, int rc); void vop_open_post(void *a, int rc); void vop_read_post(void *a, int rc); void vop_read_pgcache_post(void *ap, int rc); -void vop_readdir_post(void *a, int rc); void vop_reclaim_post(void *a, int rc); void vop_remove_pre(void *a); void vop_remove_post(void *a, int rc); @@ -1015,6 +1014,34 @@ void vop_rename_fail(struct vop_rename_args *ap); _error; \ }) +#ifdef INVARIANTS +#define vop_readdir_pre_assert(ap) \ + ssize_t nresid, oresid; \ + \ + oresid = (ap)->a_uio->uio_resid; + +#define vop_readdir_post_assert(ap, ret) \ + nresid = (ap)->a_uio->uio_resid; \ + if ((ret) == 0 && (ap)->a_eofflag != NULL) { \ + VNASSERT(nresid != oresid || *(ap)->a_eofflag == 1, \ + (ap)->a_vp, ("VOP_READDIR: eofflag not set")); \ + } +#else +#define vop_readdir_pre_assert(ap) +#define vop_readdir_post_assert(ap, ret) +#endif + +#define vop_readdir_pre(ap) do { \ + vop_readdir_pre_assert(ap) + +#define vop_readdir_post(ap, ret) \ + vop_readdir_post_assert(ap, ret); \ + if ((ret) == 0) { \ + VFS_KNOTE_LOCKED((ap)->a_vp, NOTE_READ); \ + INOTIFY((ap)->a_vp, IN_ACCESS); \ + } \ +} while (0) + #define VOP_WRITE_PRE(ap) \ struct vattr va; \ int error; \