From nobody Thu Apr 6 15:45:35 2023 X-Original-To: dev-commits-src-main@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 4Psm6m276Wz44VqZ; Thu, 6 Apr 2023 15:45:36 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Psm6m1Tzqz4QX3; Thu, 6 Apr 2023 15:45:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680795936; 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=xHUwdaEv5EoOkf0mbjTCYc3t+oE5uyOjHi/2/HUU+Zk=; b=OpD0kTlB1vHOpbBjtlXYow6aqhxgAi99y1KENDOJIvW3KfkFzHNYmXMS6lk08zI8AXTcwT C4rty9fEzAjurtCynfwXLK2sYIszjQt+Cc35kD+G0cr5vGTjIgWTuBK7AeVSlWQ+qv86DX 0f/I98Gr5CzkFMHM/d8w1uwGW9oQ7wWpc+Z/6zBC/LZrXQJxAhp5SE5r+J/gue0MIJ7IUS th1DMtMwTvBowGbBiMG98GKjD8S4M/k+W3wkT6xMLD/AlZ0anFMZlpqrBgiSURoFq2h9kH Xsxpxs69cIREFurSUL31UsmhgBxzcAqvqrU9sNylc/C14imB9R0jwnTZpi2olw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1680795936; 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=xHUwdaEv5EoOkf0mbjTCYc3t+oE5uyOjHi/2/HUU+Zk=; b=XJEnP0MCRegmjU/6mWAgmQFr9e1sIRt17965w3NHVjPTDvU0QPc+05UvlolgnMFeqTfe7M xDdw5qvLteu39AuGMhstxBCS02hLeH5kXkBZ6ORGoFzukRkjIOSLQrcRggIPqmYHKBgbIy e9i6+nWqTBYSxMtXdkqiqSgB4HKt7uTaougQG5bGtbclscdGnG3TllAd3W6oqO0VklsSaW xqxl7o4YIyCi79EbxVrLlr2HY+kWF5CvI8y7yKXTf1G6dBSYc8HRqZd5jud/A6id+ckpU+ nxuUrCIlY/kqDgicyAWZMzAisO/Yf7q92YokGbPmfNPS0NMKsTfs0kIvbFnCuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1680795936; a=rsa-sha256; cv=none; b=AXRNW8MsdGLsrSZNpr3RPvxzWFjwzR62/+8KYs2bcwmuiribkTY9BTl3tkgV+xRqkXwGdv MCH0NkdO9hLOcEApqK7tTx6nE7u1khdq8jkBuaSmaUixSetKa2fTEEVoRythRR2GMX6tjr Y4e3tqlrPy4AQjmDGzTCQ/2NXl41a/rUABVi8I2AFtM/s8/OGEqZFx2pzBX6oz2k9dKcZz tCPGBhozllXQcHEu7Yfca/TXbXvv9BBkIQYhBPdS8/JHwZQL5ogI2zhuwqVJM6PtR5Fhw6 2XmrcN/zw4KF0N9VyWKLG45ehE1isjXIa/cLhU9Qv+LWSOdVOm7APliKjzZJgw== 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 4Psm6m0YbCz194Z; Thu, 6 Apr 2023 15:45:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 336FjZdM079625; Thu, 6 Apr 2023 15:45:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 336FjZIC079624; Thu, 6 Apr 2023 15:45:35 GMT (envelope-from git) Date: Thu, 6 Apr 2023 15:45:35 GMT Message-Id: <202304061545.336FjZIC079624@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 5f6df177758b - main - vfs: validate that vop vectors provide all or none fplookup vops List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5f6df177758b9dff88e4b6069aeb2359e8b0c493 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=5f6df177758b9dff88e4b6069aeb2359e8b0c493 commit 5f6df177758b9dff88e4b6069aeb2359e8b0c493 Author: Mateusz Guzik AuthorDate: 2021-11-03 20:26:41 +0000 Commit: Mateusz Guzik CommitDate: 2023-04-06 15:20:41 +0000 vfs: validate that vop vectors provide all or none fplookup vops In order to prevent later susprises. --- sys/kern/vfs_cache.c | 34 ++++++++++++++++++++++++++++++++++ sys/sys/vnode.h | 1 + sys/tools/vnode_if.awk | 2 ++ 3 files changed, 37 insertions(+) diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index cc93158078d3..2ffa48f12299 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -3956,6 +3956,40 @@ static int cache_fast_lookup = 1; #define CACHE_FPL_FAILED -2020 +void +cache_vop_vector_register(struct vop_vector *v) +{ + size_t ops; + + ops = 0; + if (v->vop_fplookup_vexec != NULL) { + ops++; + } + if (v->vop_fplookup_symlink != NULL) { + ops++; + } + + if (ops == 2) { + return; + } + + if (ops == 0) { + v->vop_fplookup_vexec = VOP_PANIC; + v->vop_fplookup_symlink = VOP_PANIC; + return; + } + + printf("%s: invalid vop vector %p -- either all or none fplookup vops " + "need to be provided", __func__, v); + if (v->vop_fplookup_vexec == NULL) { + printf("%s: missing vop_fplookup_vexec\n", __func__); + } + if (v->vop_fplookup_symlink == NULL) { + printf("%s: missing vop_fplookup_symlink\n", __func__); + } + panic("bad vop vector %p", v); +} + void cache_fast_lookup_enabled_recalc(void) { diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index a3eb00f0fe7c..2a62c6d1b659 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -650,6 +650,7 @@ int cache_symlink_resolve(struct cache_fpl *fpl, const char *string, void cache_vop_rename(struct vnode *fdvp, struct vnode *fvp, struct vnode *tdvp, struct vnode *tvp, struct componentname *fcnp, struct componentname *tcnp); void cache_vop_rmdir(struct vnode *dvp, struct vnode *vp); +void cache_vop_vector_register(struct vop_vector *); #ifdef INVARIANTS void cache_validate(struct vnode *dvp, struct vnode *vp, struct componentname *cnp); diff --git a/sys/tools/vnode_if.awk b/sys/tools/vnode_if.awk index 415c33c52420..7fdaca208a9b 100644 --- a/sys/tools/vnode_if.awk +++ b/sys/tools/vnode_if.awk @@ -473,6 +473,8 @@ if (cfile) { printc("\t\tpanic(\"%s: vop_vector %p already registered\",") printc("\t\t __func__, orig_vop);"); printc(""); + printc("\tcache_vop_vector_register(orig_vop);"); + printc(""); for (name in funcarr) { printc("\tvop = orig_vop;"); printc("\twhile (vop != NULL && \\");