Date: Thu, 7 Jan 2021 23:30:22 GMT From: Mateusz Guzik <mjg@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: ac7715471ca4 - main - cache: stop checkpointing cn_nameptr Message-ID: <202101072330.107NUMYH075875@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=ac7715471ca438f128cec36ae440fea4d21b8ff4 commit ac7715471ca438f128cec36ae440fea4d21b8ff4 Author: Mateusz Guzik <mjg@FreeBSD.org> AuthorDate: 2021-01-07 04:40:05 +0000 Commit: Mateusz Guzik <mjg@FreeBSD.org> CommitDate: 2021-01-07 23:29:38 +0000 cache: stop checkpointing cn_nameptr For aborts cn_nameptr is the same as cn_pnbuf. For partial results the same cn_nameptr is to be used. --- sys/kern/vfs_cache.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index b6f97e55746b..7d774466be53 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -3615,8 +3615,8 @@ SYSCTL_PROC(_vfs, OID_AUTO, cache_fast_lookup, CTLTYPE_INT|CTLFLAG_RW|CTLFLAG_MP * need restoring in case fast path lookup fails. */ struct nameidata_saved { - char *cn_nameptr; #ifdef INVARIANTS + char *cn_nameptr; size_t ni_pathlen; #endif int cn_flags; @@ -3696,8 +3696,8 @@ cache_fpl_checkpoint(struct cache_fpl *fpl, struct nameidata_saved *snd) { snd->cn_flags = fpl->ndp->ni_cnd.cn_flags; - snd->cn_nameptr = fpl->ndp->ni_cnd.cn_nameptr; #ifdef INVARIANTS + snd->cn_nameptr = fpl->ndp->ni_cnd.cn_nameptr; snd->ni_pathlen = fpl->debug.ni_pathlen; #endif } @@ -3707,7 +3707,6 @@ cache_fpl_restore_partial(struct cache_fpl *fpl, struct nameidata_saved *snd) { fpl->ndp->ni_cnd.cn_flags = snd->cn_flags; - fpl->ndp->ni_cnd.cn_nameptr = snd->cn_nameptr; #ifdef INVARIANTS fpl->debug.ni_pathlen = snd->ni_pathlen; #endif @@ -3722,6 +3721,7 @@ cache_fpl_restore_abort(struct cache_fpl *fpl, struct nameidata_saved *snd) * It is 0 on entry by API contract. */ fpl->ndp->ni_resflags = 0; + fpl->ndp->ni_cnd.cn_nameptr = fpl->ndp->ni_cnd.cn_pnbuf; } #ifdef INVARIANTS @@ -4018,6 +4018,12 @@ cache_fplookup_partial_setup(struct cache_fpl *fpl) } cache_fpl_restore_partial(fpl, &fpl->snd); +#ifdef INVARIANTS + if (cnp->cn_nameptr != fpl->snd.cn_nameptr) { + panic("%s: cn_nameptr mismatch (%p != %p) full [%s]\n", __func__, + cnp->cn_nameptr, fpl->snd.cn_nameptr, cnp->cn_pnbuf); + } +#endif ndp->ni_startdir = dvp; cnp->cn_flags |= MAKEENTRY;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101072330.107NUMYH075875>