Bug 271174
| Summary: | NFS readdir truncates dirent fileid to 32 bits | ||||||
|---|---|---|---|---|---|---|---|
| Product: | Base System | Reporter: | Brian Mueller <bmueller> | ||||
| Component: | kern | Assignee: | Rick Macklem <rmacklem> | ||||
| Status: | Closed FIXED | ||||||
| Severity: | Affects Only Me | CC: | emaste, rmacklem, rpokala | ||||
| Priority: | --- | Flags: | rmacklem:
mfc-stable13+
rmacklem: mfc-stable12+ |
||||
| Version: | 12.4-RELEASE | ||||||
| Hardware: | Any | ||||||
| OS: | Any | ||||||
| Attachments: |
|
||||||
|
Description
Brian Mueller
2023-05-01 16:19:33 UTC
The last sentence in comment #0 should read: The NFS server can be fixed by doing 64 bit fileid marshalling for NFSv3/4, while leaving it as 32 bits for NFSv2 where fileid is 32 bits. This was fixed by asomers@ for main/FreeBSD14 on Dec. 15, 2021 (commit 32fbc5d) and MFC'd to stable/13 on Jan. 2, 2022 (commit 8ec62f0). If you really need it for FreeBSD12, you could try and back-port the patch. (In reply to Rick Macklem from comment #2) Aha, in fact it was also merged to stable/12 in 374e8226d225. Oops, my mistake. I confused fileno with directory offset cookie. I'm almost certain I had a patch waiting for the 64bit ino_t conversion, but it never got committed. I'll come up with a patch. As such, I've marked the PR Open. (Sorry about the previous noise.) Created attachment 241943 [details]
Fix the NFSv3 server so that it returns all 64bits of fileno for Readdir entries
This patch should fix the problem for any version
of FreeBSD that defines ino_t as 64bits.
The problem is NFSv3 specific (not NFSv4) and only
causes problems when a file system on the NFSv3
server generates inode#s that do not fit in 32bits.
This can happen for large ZFS stores.
Maybe the reporter can test it and report whether
or not it fixes the problem for them?
To test, I do the following. Note that pwd fails. root@pgh-quad-19-c:/mnt/pgh-realm-65-122/home # sysctl -w debug.disablecwd=1 debug.disablecwd: 0 -> 1 root@pgh-quad-19-c:/mnt/pgh-realm-65-122/home # pwd pwd: .: No such file or directory root@pgh-quad-19-c:/mnt/pgh-realm-65-122/home # sysctl -w debug.disablecwd=0 debug.disablecwd: 1 -> 0 root@pgh-quad-19-c:/mnt/pgh-realm-65-122/home # pwd /mnt/pgh-realm-65-122/home With the suggested fix, the test succeeds. root@pgh-quad-19-c:/mnt/pgh-realm-65-122/home # sysctl -w debug.disablecwd=1 debug.disablecwd: 0 -> 1 root@pgh-quad-19-c:/mnt/pgh-realm-65-122/home # pwd /mnt/pgh-realm-65-122/home root@pgh-quad-19-c:/mnt/pgh-realm-65-122/home # sysctl -w debug.disablecwd=0 debug.disablecwd: 1 -> 0 root@pgh-quad-19-c:/mnt/pgh-realm-65-122/home # pwd /mnt/pgh-realm-65-122/home A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/src/commit/?id=648a208ef3a171585f3446464646832f0e0ed3dc commit 648a208ef3a171585f3446464646832f0e0ed3dc Author: Rick Macklem <rmacklem@FreeBSD.org> AuthorDate: 2023-05-05 22:43:55 +0000 Commit: Rick Macklem <rmacklem@FreeBSD.org> CommitDate: 2023-05-05 22:43:55 +0000 nfsd: Fix NFSv3 Readdir/ReaddirPlus reply for large i-node numbers If the i-node number (d_fileno) for a file on the server did not fit in 32bits, it would be truncated to the low order 32bits for the NFSv3 Readdir and ReaddirPlus RPC replies. This is no longer correct, given that ino_t is now 64bits. This patch fixes this by sending the full 64bits of d_fileno on the wire in the NFSv3 Readdir/ReaddirPlus RPC reply. PR: 271174 Reported by: bmueller@panasas.com Tested by: bmueller@panasas.com MFC after: 2 weeks sys/fs/nfsserver/nfs_nfsdport.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) The patch has been committed to main and will be MFC'd. A commit in branch stable/13 references this bug: URL: https://cgit.FreeBSD.org/src/commit/?id=c7f6408f482059d4fb7e5344b49a8d879da73743 commit c7f6408f482059d4fb7e5344b49a8d879da73743 Author: Rick Macklem <rmacklem@FreeBSD.org> AuthorDate: 2023-05-05 22:43:55 +0000 Commit: Rick Macklem <rmacklem@FreeBSD.org> CommitDate: 2023-05-22 18:56:03 +0000 nfsd: Fix NFSv3 Readdir/ReaddirPlus reply for large i-node numbers If the i-node number (d_fileno) for a file on the server did not fit in 32bits, it would be truncated to the low order 32bits for the NFSv3 Readdir and ReaddirPlus RPC replies. This is no longer correct, given that ino_t is now 64bits. This patch fixes this by sending the full 64bits of d_fileno on the wire in the NFSv3 Readdir/ReaddirPlus RPC reply. PR: 271174 (cherry picked from commit 648a208ef3a171585f3446464646832f0e0ed3dc) sys/fs/nfsserver/nfs_nfsdport.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) A commit in branch stable/12 references this bug: URL: https://cgit.FreeBSD.org/src/commit/?id=886d82afb0359c2bb8321eb1f5c6675787840468 commit 886d82afb0359c2bb8321eb1f5c6675787840468 Author: Rick Macklem <rmacklem@FreeBSD.org> AuthorDate: 2023-05-05 22:43:55 +0000 Commit: Rick Macklem <rmacklem@FreeBSD.org> CommitDate: 2023-05-22 19:08:30 +0000 nfsd: Fix NFSv3 Readdir/ReaddirPlus reply for large i-node numbers If the i-node number (d_fileno) for a file on the server did not fit in 32bits, it would be truncated to the low order 32bits for the NFSv3 Readdir and ReaddirPlus RPC replies. This is no longer correct, given that ino_t is now 64bits. This patch fixes this by sending the full 64bits of d_fileno on the wire in the NFSv3 Readdir/ReaddirPlus RPC reply. PR: 271174 (cherry picked from commit 648a208ef3a171585f3446464646832f0e0ed3dc) sys/fs/nfsserver/nfs_nfsdport.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) Patch has been committed and MFC'd. |
