On Fri, 27 Aug 2021, J. Bruce Fields wrote: > On Thu, Aug 26, 2021 at 04:03:04PM +1000, NeilBrown wrote: > > > > [[ Hi Bruce and Chuck, > > I've rebased this patch on the earlier patch I sent which allows > > me to use the name "fh_flags". I've also added a missing #include. > > I've added the 'Acked-by' which Joesf provided earlier for the > > btrfs-part. I don't have an 'ack' for the stat.h part, but no-one > > has complained wither. > > I think it is as ready as it can be, and am keen to know what you > > think. > > I'm not *very* keen on testing s_magic in nfsd code (though we > > already have a couple of such tests in nfs3proc.c), but it does have > > the advantage of ensuring that no other filesystem can use this > > functionality without landing a patch in fs/nfsd/. > > > > Thanks for any review that you can provide, > > NeilBrown > > ]] > > This seems hairy, but *somebody* has hated every single solution > proposed, so, argh, I don't know, maybe it's best. People don't like change I guess :-) I think we need the fh_flags stuff for almost any fix, else existing mounts could break when the server is upgraded. This could be needed for any filesystem that has flawed NFS export support and needs to seemlessly repair it. We *might* be able to avoid that is I xored the uniquifier with the fsid instead of the fileid (I'd have to test), but that has other problems like polluting the client's mount table and mounted-on-fileid being hard to manage - especially for NFSv3. The rest is the minimum that actually achieves something. I could still agonise of whether the swap-bits instead of swap-bytes, and whether to leave a few high bits free for e.g. overlay. But I won't lose sleep over it. > > There was a ton of "but why can't we just..." in previous threads, could > we include URLs for those and/or the lwn articles? E.g.: > > https://lore.kernel.org/linux-nfs/162742539595.32498.13687924366155737575.stgit@noble.brown/#b > https://lwn.net/Articles/866709/ I've add Link: lines. The are a couple of other threads that maybe I could like. > > Acked-by: Josef Bacik <josef@xxxxxxxxxxxxxx> (for BTFS change) > > s/BTFS/BTRFS/. Ack. > > /* fileid */ > > + if (!resp->dir_have_uniquifier) { > > + struct kstat stat; > > + if (fh_getattr(&resp->fh, &stat) == nfs_ok) > > + resp->dir_ino_uniquifier = > > + nfsd_ino_uniquifier(&resp->fh, &stat); > > + else > > + resp->dir_ino_uniquifier = 0; > > + resp->dir_have_uniquifier = true; > > This took me a minute. So we're assuming the uniquifier stays the same > across a directory and its children (because you can't hard link across > subvolumes), and this code is just caching the uniquifier for use across > the directory--is that right? Yep. I think I originally planned to set dir_ino_uniquifier closer to "open", but there wasn't a convenient place to do that, so I did it here and added the "dir_have_uniquifier" flag. The comment in stat.h affirms that the uniquifier for a directory can be used for inodes reported by readdir. Note that the inode numbers might be different to those returned by a lookup of the name - just like with mountpoints. > > > + } > > + if (resp->dir_ino_uniquifier != ino) > > + ino ^= resp->dir_ino_uniquifier; > > I guess this check (here and in nfsd_uniquify_ino) is just to prevent > returning inode number zero? Yep. The set of valid inode numbers is 1..MAX and that set isn't closed under xor. It is closed (and bijective) under "xor if not equals". I've added: diff --git a/fs/nfsd/nfs3xdr.c b/fs/nfsd/nfs3xdr.c index 5e2d5c352ecd..fed56edf229f 100644 --- a/fs/nfsd/nfs3xdr.c +++ b/fs/nfsd/nfs3xdr.c @@ -1162,6 +1162,7 @@ svcxdr_encode_entry3_common(struct nfsd3_readdirres *resp, const char *name, resp->dir_ino_uniquifier = 0; resp->dir_have_uniquifier = true; } + /* See comment in nfsd_uniquify_ino() */ if (resp->dir_ino_uniquifier != ino) ino ^= resp->dir_ino_uniquifier; if (xdr_stream_encode_u64(xdr, ino) < 0) diff --git a/fs/nfsd/nfsfh.h b/fs/nfsd/nfsfh.h index bbc7ddd34143..6dd8c7325902 100644 --- a/fs/nfsd/nfsfh.h +++ b/fs/nfsd/nfsfh.h @@ -155,6 +155,9 @@ static inline u64 nfsd_uniquify_ino(const struct svc_fh *fhp, const struct kstat *stat) { u64 u = nfsd_ino_uniquifier(fhp, stat); + /* Neither stat->ino or return value can be zero, so + * if ->ino is u, return u. + */ if (u != stat->ino) return stat->ino ^ u; return stat->ino; Thanks, NeilBrown
