Sorry this has taken me a bit to re-post. I've been working on some pynfs testcases for CB_GETATTR, and have found more bugs in our implementation. This repost is based on top of Chuck's nfsd-next branch. The first two patches fix a couple of different bugs in how we handle the change attr. I also dropped one of the patches from the last series that tried to correct how we were handling the change attr. After going over RFC8881 section 10.4.3 a few times, I think the existing code in this respect is actually correct. We advance the change attr in the inode on every CB_GETATTR, which follows the guidance in the spec. The rest of the series is more or less the same as the last one. Signed-off-by: Jeff Layton <jlayton@xxxxxxxxxx> --- Changes in v4: - get attrs from correct inode when issuing write deleg - dropped some change attr handling patches that were incorrect - only request FATTR4_CHANGE in CB_GETATTR if the file isn't modified - Link to v3: https://lore.kernel.org/r/20240829-delstid-v3-0-271c60806c5d@xxxxxxxxxx Changes in v3: - fix includes in nfs4xdr_gen.c - drop ATTR_CTIME_DLG flag (just use ATTR_DELEG instead) - proper handling for SETATTR (maybe? Outstanding q about stateid here) - incorporate Neil's patches for handling non-delegation leases - always return times from CB_GETATTR instead of from local vfs_getattr - fix potential races vs. mgtimes by moving ctime handling into VFS layer - Link to v2: https://lore.kernel.org/r/20240826-delstid-v2-0-e8ab5c0e39cc@xxxxxxxxxx Changes in v2: - rebase onto Chuck's lkxdrgen branch, and reworked how autogenerated code is included - declare nfsd_open_arguments as a global, so it doesn't have to be set up on the stack each time - delegated timestamp support has been added - Link to v1: https://lore.kernel.org/r/20240816-delstid-v1-0-c221c3dc14cd@xxxxxxxxxx --- Jeff Layton (11): nfsd: fix initial getattr on write delegation nfsd: drop the ncf_cb_bmap field nfsd: don't request change attr in CB_GETATTR once file is modified nfsd: drop the nfsd4_fattr_args "size" field nfsd: have nfsd4_deleg_getattr_conflict pass back write deleg pointer nfs_common: make include/linux/nfs4.h include generated nfs4.h nfsd: add support for FATTR4_OPEN_ARGUMENTS nfsd: implement OPEN_ARGS_SHARE_ACCESS_WANT_OPEN_XOR_DELEGATION fs: handle delegated timestamps in setattr_copy_mgtime nfsd: add support for delegated timestamps nfsd: handle delegated timestamps in SETATTR fs/attr.c | 28 +++++--- fs/inode.c | 74 ++++++++++++++++++++++ fs/nfsd/Makefile | 2 +- fs/nfsd/nfs4callback.c | 50 +++++++++++++-- fs/nfsd/nfs4proc.c | 29 ++++++++- fs/nfsd/nfs4state.c | 158 ++++++++++++++++++++++++++++++++++++++-------- fs/nfsd/nfs4xdr.c | 108 +++++++++++++++++++++++++++---- fs/nfsd/nfsd.h | 5 +- fs/nfsd/state.h | 6 +- fs/nfsd/xdr4cb.h | 10 ++- include/linux/fs.h | 2 + include/linux/nfs4.h | 7 +- include/linux/nfs_xdr.h | 5 -- include/linux/time64.h | 5 ++ include/uapi/linux/nfs4.h | 7 +- 15 files changed, 416 insertions(+), 80 deletions(-) --- base-commit: 5cd183a621de1d76daeb58379d7a2c2f8dc1143f change-id: 20240815-delstid-93290691ad11 Best regards, -- Jeff Layton <jlayton@xxxxxxxxxx>
