This patch enable nfs to report btime in nfs_getattr.
If underlying filesystem supports "btime" timestamp,
statx will report btime for STATX_BTIME.
Signed-off-by: Chen Hanxiao <[email protected]>
---
v1:
Don't revalidate btime attribute
RFC v2:
properly set cache validity
fs/nfs/inode.c | 23 ++++++++++++++++++++---
fs/nfs/nfs4proc.c | 3 +++
fs/nfs/nfs4xdr.c | 23 +++++++++++++++++++++++
include/linux/nfs_fs.h | 2 ++
include/linux/nfs_xdr.h | 5 ++++-
5 files changed, 52 insertions(+), 4 deletions(-)
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index ebb8d60e1152..e8b06f508cc0 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -196,6 +196,7 @@ void nfs_set_cache_invalid(struct inode *inode, unsigned long flags)
if (!(flags & NFS_INO_REVAL_FORCED))
flags &= ~(NFS_INO_INVALID_MODE |
NFS_INO_INVALID_OTHER |
+ NFS_INO_INVALID_BTIME |
NFS_INO_INVALID_XATTR);
flags &= ~(NFS_INO_INVALID_CHANGE | NFS_INO_INVALID_SIZE);
}
@@ -515,6 +516,7 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr)
inode_set_atime(inode, 0, 0);
inode_set_mtime(inode, 0, 0);
inode_set_ctime(inode, 0, 0);
+ memset(&nfsi->btime, 0, sizeof(nfsi->btime));
inode_set_iversion_raw(inode, 0);
inode->i_size = 0;
clear_nlink(inode);
@@ -538,6 +540,10 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr)
inode_set_ctime_to_ts(inode, fattr->ctime);
else if (fattr_supported & NFS_ATTR_FATTR_CTIME)
nfs_set_cache_invalid(inode, NFS_INO_INVALID_CTIME);
+ if (fattr->valid & NFS_ATTR_FATTR_V4_BTIME)
+ nfsi->btime = fattr->btime;
+ else if (fattr_supported & NFS_ATTR_FATTR_V4_BTIME)
+ nfs_set_cache_invalid(inode, NFS_INO_INVALID_BTIME);
if (fattr->valid & NFS_ATTR_FATTR_CHANGE)
inode_set_iversion_raw(inode, fattr->change_attr);
else
@@ -835,6 +841,7 @@ int nfs_getattr(struct mnt_idmap *idmap, const struct path *path,
{
struct inode *inode = d_inode(path->dentry);
struct nfs_server *server = NFS_SERVER(inode);
+ struct nfs_inode *nfsi = NFS_I(inode);
unsigned long cache_validity;
int err = 0;
bool force_sync = query_flags & AT_STATX_FORCE_SYNC;
@@ -845,7 +852,7 @@ int nfs_getattr(struct mnt_idmap *idmap, const struct path *path,
request_mask &= STATX_TYPE | STATX_MODE | STATX_NLINK | STATX_UID |
STATX_GID | STATX_ATIME | STATX_MTIME | STATX_CTIME |
- STATX_INO | STATX_SIZE | STATX_BLOCKS |
+ STATX_INO | STATX_SIZE | STATX_BLOCKS | STATX_BTIME |
STATX_CHANGE_COOKIE;
if ((query_flags & AT_STATX_DONT_SYNC) && !force_sync) {
@@ -920,6 +927,10 @@ int nfs_getattr(struct mnt_idmap *idmap, const struct path *path,
stat->attributes |= STATX_ATTR_CHANGE_MONOTONIC;
if (S_ISDIR(inode->i_mode))
stat->blksize = NFS_SERVER(inode)->dtsize;
+ if (!(server->fattr_valid & NFS_ATTR_FATTR_V4_BTIME))
+ stat->result_mask &= ~STATX_BTIME;
+ else
+ stat->btime = nfsi->btime;
out:
trace_nfs_getattr_exit(inode, err);
return err;
@@ -1803,7 +1814,7 @@ static int nfs_inode_finish_partial_attr_update(const struct nfs_fattr *fattr,
NFS_INO_INVALID_ATIME | NFS_INO_INVALID_CTIME |
NFS_INO_INVALID_MTIME | NFS_INO_INVALID_SIZE |
NFS_INO_INVALID_BLOCKS | NFS_INO_INVALID_OTHER |
- NFS_INO_INVALID_NLINK;
+ NFS_INO_INVALID_NLINK | NFS_INO_INVALID_BTIME;
unsigned long cache_validity = NFS_I(inode)->cache_validity;
enum nfs4_change_attr_type ctype = NFS_SERVER(inode)->change_attr_type;
@@ -2122,7 +2133,8 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)
nfsi->cache_validity &= ~(NFS_INO_INVALID_ATTR
| NFS_INO_INVALID_ATIME
| NFS_INO_REVAL_FORCED
- | NFS_INO_INVALID_BLOCKS);
+ | NFS_INO_INVALID_BLOCKS
+ | NFS_INO_INVALID_BTIME);
/* Do atomic weak cache consistency updates */
nfs_wcc_update_inode(inode, fattr);
@@ -2161,6 +2173,7 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)
| NFS_INO_INVALID_BLOCKS
| NFS_INO_INVALID_NLINK
| NFS_INO_INVALID_MODE
+ | NFS_INO_INVALID_BTIME
| NFS_INO_INVALID_OTHER;
if (S_ISDIR(inode->i_mode))
nfs_force_lookup_revalidate(inode);
@@ -2189,6 +2202,9 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)
nfsi->cache_validity |=
save_cache_validity & NFS_INO_INVALID_MTIME;
+ if (fattr->valid & NFS_ATTR_FATTR_V4_BTIME)
+ nfsi->btime = fattr->btime;
+
if (fattr->valid & NFS_ATTR_FATTR_CTIME)
inode_set_ctime_to_ts(inode, fattr->ctime);
else if (fattr_supported & NFS_ATTR_FATTR_CTIME)
@@ -2332,6 +2348,7 @@ struct inode *nfs_alloc_inode(struct super_block *sb)
#endif /* CONFIG_NFS_V4 */
#ifdef CONFIG_NFS_V4_2
nfsi->xattr_cache = NULL;
+ memset(&nfsi->btime, 0, sizeof(nfsi->btime));
#endif
nfs_netfs_inode_init(nfsi);
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 23819a756508..e151f7e0361c 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -212,6 +212,7 @@ const u32 nfs4_fattr_bitmap[3] = {
| FATTR4_WORD1_TIME_ACCESS
| FATTR4_WORD1_TIME_METADATA
| FATTR4_WORD1_TIME_MODIFY
+ | FATTR4_WORD1_TIME_CREATE
| FATTR4_WORD1_MOUNTED_ON_FILEID,
#ifdef CONFIG_NFS_V4_SECURITY_LABEL
FATTR4_WORD2_SECURITY_LABEL
@@ -3940,6 +3941,8 @@ static int _nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *f
server->fattr_valid &= ~NFS_ATTR_FATTR_CTIME;
if (!(res.attr_bitmask[1] & FATTR4_WORD1_TIME_MODIFY))
server->fattr_valid &= ~NFS_ATTR_FATTR_MTIME;
+ if (!(res.attr_bitmask[1] & FATTR4_WORD1_TIME_CREATE))
+ server->fattr_valid &= ~NFS_ATTR_FATTR_V4_BTIME;
memcpy(server->attr_bitmask_nl, res.attr_bitmask,
sizeof(server->attr_bitmask));
server->attr_bitmask_nl[2] &= ~FATTR4_WORD2_SECURITY_LABEL;
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index 69406e60f391..df178519fb29 100644
--- a/fs/nfs/nfs4xdr.c
+++ b/fs/nfs/nfs4xdr.c
@@ -4180,6 +4180,24 @@ static int decode_attr_time_access(struct xdr_stream *xdr, uint32_t *bitmap, str
return status;
}
+static int decode_attr_time_create(struct xdr_stream *xdr, uint32_t *bitmap, struct timespec64 *time)
+{
+ int status = 0;
+
+ time->tv_sec = 0;
+ time->tv_nsec = 0;
+ if (unlikely(bitmap[1] & (FATTR4_WORD1_TIME_CREATE - 1U)))
+ return -EIO;
+ if (likely(bitmap[1] & FATTR4_WORD1_TIME_CREATE)) {
+ status = decode_attr_time(xdr, time);
+ if (status == 0)
+ status = NFS_ATTR_FATTR_V4_BTIME;
+ bitmap[1] &= ~FATTR4_WORD1_TIME_CREATE;
+ }
+ dprintk("%s: btime=%lld\n", __func__, time->tv_sec);
+ return status;
+}
+
static int decode_attr_time_metadata(struct xdr_stream *xdr, uint32_t *bitmap, struct timespec64 *time)
{
int status = 0;
@@ -4739,6 +4757,11 @@ static int decode_getfattr_attrs(struct xdr_stream *xdr, uint32_t *bitmap,
goto xdr_error;
fattr->valid |= status;
+ status = decode_attr_time_create(xdr, bitmap, &fattr->btime);
+ if (status < 0)
+ goto xdr_error;
+ fattr->valid |= status;
+
status = decode_attr_time_metadata(xdr, bitmap, &fattr->ctime);
if (status < 0)
goto xdr_error;
diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
index f5ce7b101146..88cff15a8ee7 100644
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
@@ -159,6 +159,7 @@ struct nfs_inode {
unsigned long read_cache_jiffies;
unsigned long attrtimeo;
unsigned long attrtimeo_timestamp;
+ struct timespec64 btime;
unsigned long attr_gencount;
@@ -298,6 +299,7 @@ struct nfs4_copy_state {
#define NFS_INO_INVALID_XATTR BIT(15) /* xattrs are invalid */
#define NFS_INO_INVALID_NLINK BIT(16) /* cached nlinks is invalid */
#define NFS_INO_INVALID_MODE BIT(17) /* cached mode is invalid */
+#define NFS_INO_INVALID_BTIME BIT(18) /* cached btime is invalid */
#define NFS_INO_INVALID_ATTR (NFS_INO_INVALID_CHANGE \
| NFS_INO_INVALID_CTIME \
diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
index 539b57fbf3ce..85911e216bc2 100644
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
@@ -67,6 +67,7 @@ struct nfs_fattr {
struct timespec64 atime;
struct timespec64 mtime;
struct timespec64 ctime;
+ struct timespec64 btime;
__u64 change_attr; /* NFSv4 change attribute */
__u64 pre_change_attr;/* pre-op NFSv4 change attribute */
__u64 pre_size; /* pre_op_attr.size */
@@ -106,6 +107,7 @@ struct nfs_fattr {
#define NFS_ATTR_FATTR_OWNER_NAME (1U << 23)
#define NFS_ATTR_FATTR_GROUP_NAME (1U << 24)
#define NFS_ATTR_FATTR_V4_SECURITY_LABEL (1U << 25)
+#define NFS_ATTR_FATTR_V4_BTIME (1U << 26)
#define NFS_ATTR_FATTR (NFS_ATTR_FATTR_TYPE \
| NFS_ATTR_FATTR_MODE \
@@ -126,7 +128,8 @@ struct nfs_fattr {
| NFS_ATTR_FATTR_SPACE_USED)
#define NFS_ATTR_FATTR_V4 (NFS_ATTR_FATTR \
| NFS_ATTR_FATTR_SPACE_USED \
- | NFS_ATTR_FATTR_V4_SECURITY_LABEL)
+ | NFS_ATTR_FATTR_V4_SECURITY_LABEL \
+ | NFS_ATTR_FATTR_V4_BTIME)
/*
* Maximal number of supported layout drivers.
--
2.39.1
Patch looks good for me.
Please add a Reviewed-By: Cedric Blancher <[email protected]>
When can this patch land?
Ced
On Mon, 15 Jan 2024 at 07:37, Chen Hanxiao <[email protected]> wrote:
>
> This patch enable nfs to report btime in nfs_getattr.
> If underlying filesystem supports "btime" timestamp,
> statx will report btime for STATX_BTIME.
>
> Signed-off-by: Chen Hanxiao <[email protected]>
> ---
> v1:
> Don't revalidate btime attribute
>
> RFC v2:
> properly set cache validity
>
> fs/nfs/inode.c | 23 ++++++++++++++++++++---
> fs/nfs/nfs4proc.c | 3 +++
> fs/nfs/nfs4xdr.c | 23 +++++++++++++++++++++++
> include/linux/nfs_fs.h | 2 ++
> include/linux/nfs_xdr.h | 5 ++++-
> 5 files changed, 52 insertions(+), 4 deletions(-)
>
> diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
> index ebb8d60e1152..e8b06f508cc0 100644
> --- a/fs/nfs/inode.c
> +++ b/fs/nfs/inode.c
> @@ -196,6 +196,7 @@ void nfs_set_cache_invalid(struct inode *inode, unsigned long flags)
> if (!(flags & NFS_INO_REVAL_FORCED))
> flags &= ~(NFS_INO_INVALID_MODE |
> NFS_INO_INVALID_OTHER |
> + NFS_INO_INVALID_BTIME |
> NFS_INO_INVALID_XATTR);
> flags &= ~(NFS_INO_INVALID_CHANGE | NFS_INO_INVALID_SIZE);
> }
> @@ -515,6 +516,7 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr)
> inode_set_atime(inode, 0, 0);
> inode_set_mtime(inode, 0, 0);
> inode_set_ctime(inode, 0, 0);
> + memset(&nfsi->btime, 0, sizeof(nfsi->btime));
> inode_set_iversion_raw(inode, 0);
> inode->i_size = 0;
> clear_nlink(inode);
> @@ -538,6 +540,10 @@ nfs_fhget(struct super_block *sb, struct nfs_fh *fh, struct nfs_fattr *fattr)
> inode_set_ctime_to_ts(inode, fattr->ctime);
> else if (fattr_supported & NFS_ATTR_FATTR_CTIME)
> nfs_set_cache_invalid(inode, NFS_INO_INVALID_CTIME);
> + if (fattr->valid & NFS_ATTR_FATTR_V4_BTIME)
> + nfsi->btime = fattr->btime;
> + else if (fattr_supported & NFS_ATTR_FATTR_V4_BTIME)
> + nfs_set_cache_invalid(inode, NFS_INO_INVALID_BTIME);
> if (fattr->valid & NFS_ATTR_FATTR_CHANGE)
> inode_set_iversion_raw(inode, fattr->change_attr);
> else
> @@ -835,6 +841,7 @@ int nfs_getattr(struct mnt_idmap *idmap, const struct path *path,
> {
> struct inode *inode = d_inode(path->dentry);
> struct nfs_server *server = NFS_SERVER(inode);
> + struct nfs_inode *nfsi = NFS_I(inode);
> unsigned long cache_validity;
> int err = 0;
> bool force_sync = query_flags & AT_STATX_FORCE_SYNC;
> @@ -845,7 +852,7 @@ int nfs_getattr(struct mnt_idmap *idmap, const struct path *path,
>
> request_mask &= STATX_TYPE | STATX_MODE | STATX_NLINK | STATX_UID |
> STATX_GID | STATX_ATIME | STATX_MTIME | STATX_CTIME |
> - STATX_INO | STATX_SIZE | STATX_BLOCKS |
> + STATX_INO | STATX_SIZE | STATX_BLOCKS | STATX_BTIME |
> STATX_CHANGE_COOKIE;
>
> if ((query_flags & AT_STATX_DONT_SYNC) && !force_sync) {
> @@ -920,6 +927,10 @@ int nfs_getattr(struct mnt_idmap *idmap, const struct path *path,
> stat->attributes |= STATX_ATTR_CHANGE_MONOTONIC;
> if (S_ISDIR(inode->i_mode))
> stat->blksize = NFS_SERVER(inode)->dtsize;
> + if (!(server->fattr_valid & NFS_ATTR_FATTR_V4_BTIME))
> + stat->result_mask &= ~STATX_BTIME;
> + else
> + stat->btime = nfsi->btime;
> out:
> trace_nfs_getattr_exit(inode, err);
> return err;
> @@ -1803,7 +1814,7 @@ static int nfs_inode_finish_partial_attr_update(const struct nfs_fattr *fattr,
> NFS_INO_INVALID_ATIME | NFS_INO_INVALID_CTIME |
> NFS_INO_INVALID_MTIME | NFS_INO_INVALID_SIZE |
> NFS_INO_INVALID_BLOCKS | NFS_INO_INVALID_OTHER |
> - NFS_INO_INVALID_NLINK;
> + NFS_INO_INVALID_NLINK | NFS_INO_INVALID_BTIME;
> unsigned long cache_validity = NFS_I(inode)->cache_validity;
> enum nfs4_change_attr_type ctype = NFS_SERVER(inode)->change_attr_type;
>
> @@ -2122,7 +2133,8 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)
> nfsi->cache_validity &= ~(NFS_INO_INVALID_ATTR
> | NFS_INO_INVALID_ATIME
> | NFS_INO_REVAL_FORCED
> - | NFS_INO_INVALID_BLOCKS);
> + | NFS_INO_INVALID_BLOCKS
> + | NFS_INO_INVALID_BTIME);
>
> /* Do atomic weak cache consistency updates */
> nfs_wcc_update_inode(inode, fattr);
> @@ -2161,6 +2173,7 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)
> | NFS_INO_INVALID_BLOCKS
> | NFS_INO_INVALID_NLINK
> | NFS_INO_INVALID_MODE
> + | NFS_INO_INVALID_BTIME
> | NFS_INO_INVALID_OTHER;
> if (S_ISDIR(inode->i_mode))
> nfs_force_lookup_revalidate(inode);
> @@ -2189,6 +2202,9 @@ static int nfs_update_inode(struct inode *inode, struct nfs_fattr *fattr)
> nfsi->cache_validity |=
> save_cache_validity & NFS_INO_INVALID_MTIME;
>
> + if (fattr->valid & NFS_ATTR_FATTR_V4_BTIME)
> + nfsi->btime = fattr->btime;
> +
> if (fattr->valid & NFS_ATTR_FATTR_CTIME)
> inode_set_ctime_to_ts(inode, fattr->ctime);
> else if (fattr_supported & NFS_ATTR_FATTR_CTIME)
> @@ -2332,6 +2348,7 @@ struct inode *nfs_alloc_inode(struct super_block *sb)
> #endif /* CONFIG_NFS_V4 */
> #ifdef CONFIG_NFS_V4_2
> nfsi->xattr_cache = NULL;
> + memset(&nfsi->btime, 0, sizeof(nfsi->btime));
> #endif
> nfs_netfs_inode_init(nfsi);
>
> diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
> index 23819a756508..e151f7e0361c 100644
> --- a/fs/nfs/nfs4proc.c
> +++ b/fs/nfs/nfs4proc.c
> @@ -212,6 +212,7 @@ const u32 nfs4_fattr_bitmap[3] = {
> | FATTR4_WORD1_TIME_ACCESS
> | FATTR4_WORD1_TIME_METADATA
> | FATTR4_WORD1_TIME_MODIFY
> + | FATTR4_WORD1_TIME_CREATE
> | FATTR4_WORD1_MOUNTED_ON_FILEID,
> #ifdef CONFIG_NFS_V4_SECURITY_LABEL
> FATTR4_WORD2_SECURITY_LABEL
> @@ -3940,6 +3941,8 @@ static int _nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *f
> server->fattr_valid &= ~NFS_ATTR_FATTR_CTIME;
> if (!(res.attr_bitmask[1] & FATTR4_WORD1_TIME_MODIFY))
> server->fattr_valid &= ~NFS_ATTR_FATTR_MTIME;
> + if (!(res.attr_bitmask[1] & FATTR4_WORD1_TIME_CREATE))
> + server->fattr_valid &= ~NFS_ATTR_FATTR_V4_BTIME;
> memcpy(server->attr_bitmask_nl, res.attr_bitmask,
> sizeof(server->attr_bitmask));
> server->attr_bitmask_nl[2] &= ~FATTR4_WORD2_SECURITY_LABEL;
> diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
> index 69406e60f391..df178519fb29 100644
> --- a/fs/nfs/nfs4xdr.c
> +++ b/fs/nfs/nfs4xdr.c
> @@ -4180,6 +4180,24 @@ static int decode_attr_time_access(struct xdr_stream *xdr, uint32_t *bitmap, str
> return status;
> }
>
> +static int decode_attr_time_create(struct xdr_stream *xdr, uint32_t *bitmap, struct timespec64 *time)
> +{
> + int status = 0;
> +
> + time->tv_sec = 0;
> + time->tv_nsec = 0;
> + if (unlikely(bitmap[1] & (FATTR4_WORD1_TIME_CREATE - 1U)))
> + return -EIO;
> + if (likely(bitmap[1] & FATTR4_WORD1_TIME_CREATE)) {
> + status = decode_attr_time(xdr, time);
> + if (status == 0)
> + status = NFS_ATTR_FATTR_V4_BTIME;
> + bitmap[1] &= ~FATTR4_WORD1_TIME_CREATE;
> + }
> + dprintk("%s: btime=%lld\n", __func__, time->tv_sec);
> + return status;
> +}
> +
> static int decode_attr_time_metadata(struct xdr_stream *xdr, uint32_t *bitmap, struct timespec64 *time)
> {
> int status = 0;
> @@ -4739,6 +4757,11 @@ static int decode_getfattr_attrs(struct xdr_stream *xdr, uint32_t *bitmap,
> goto xdr_error;
> fattr->valid |= status;
>
> + status = decode_attr_time_create(xdr, bitmap, &fattr->btime);
> + if (status < 0)
> + goto xdr_error;
> + fattr->valid |= status;
> +
> status = decode_attr_time_metadata(xdr, bitmap, &fattr->ctime);
> if (status < 0)
> goto xdr_error;
> diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
> index f5ce7b101146..88cff15a8ee7 100644
> --- a/include/linux/nfs_fs.h
> +++ b/include/linux/nfs_fs.h
> @@ -159,6 +159,7 @@ struct nfs_inode {
> unsigned long read_cache_jiffies;
> unsigned long attrtimeo;
> unsigned long attrtimeo_timestamp;
> + struct timespec64 btime;
>
> unsigned long attr_gencount;
>
> @@ -298,6 +299,7 @@ struct nfs4_copy_state {
> #define NFS_INO_INVALID_XATTR BIT(15) /* xattrs are invalid */
> #define NFS_INO_INVALID_NLINK BIT(16) /* cached nlinks is invalid */
> #define NFS_INO_INVALID_MODE BIT(17) /* cached mode is invalid */
> +#define NFS_INO_INVALID_BTIME BIT(18) /* cached btime is invalid */
>
> #define NFS_INO_INVALID_ATTR (NFS_INO_INVALID_CHANGE \
> | NFS_INO_INVALID_CTIME \
> diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
> index 539b57fbf3ce..85911e216bc2 100644
> --- a/include/linux/nfs_xdr.h
> +++ b/include/linux/nfs_xdr.h
> @@ -67,6 +67,7 @@ struct nfs_fattr {
> struct timespec64 atime;
> struct timespec64 mtime;
> struct timespec64 ctime;
> + struct timespec64 btime;
> __u64 change_attr; /* NFSv4 change attribute */
> __u64 pre_change_attr;/* pre-op NFSv4 change attribute */
> __u64 pre_size; /* pre_op_attr.size */
> @@ -106,6 +107,7 @@ struct nfs_fattr {
> #define NFS_ATTR_FATTR_OWNER_NAME (1U << 23)
> #define NFS_ATTR_FATTR_GROUP_NAME (1U << 24)
> #define NFS_ATTR_FATTR_V4_SECURITY_LABEL (1U << 25)
> +#define NFS_ATTR_FATTR_V4_BTIME (1U << 26)
>
> #define NFS_ATTR_FATTR (NFS_ATTR_FATTR_TYPE \
> | NFS_ATTR_FATTR_MODE \
> @@ -126,7 +128,8 @@ struct nfs_fattr {
> | NFS_ATTR_FATTR_SPACE_USED)
> #define NFS_ATTR_FATTR_V4 (NFS_ATTR_FATTR \
> | NFS_ATTR_FATTR_SPACE_USED \
> - | NFS_ATTR_FATTR_V4_SECURITY_LABEL)
> + | NFS_ATTR_FATTR_V4_SECURITY_LABEL \
> + | NFS_ATTR_FATTR_V4_BTIME)
>
> /*
> * Maximal number of supported layout drivers.
> --
> 2.39.1
>
>
--
Cedric Blancher <[email protected]>
[https://plus.google.com/u/0/+CedricBlancher/]
Institute Pasteur
On Mon, 15 Jan 2024 at 07:37, Chen Hanxiao <[email protected]> wrote:
>
> This patch enable nfs to report btime in nfs_getattr.
> If underlying filesystem supports "btime" timestamp,
> statx will report btime for STATX_BTIME.
>
> Signed-off-by: Chen Hanxiao <[email protected]>
> ---
> v1:
> Don't revalidate btime attribute
>
> RFC v2:
> properly set cache validity
>
> fs/nfs/inode.c | 23 ++++++++++++++++++++---
> fs/nfs/nfs4proc.c | 3 +++
> fs/nfs/nfs4xdr.c | 23 +++++++++++++++++++++++
> include/linux/nfs_fs.h | 2 ++
> include/linux/nfs_xdr.h | 5 ++++-
> 5 files changed, 52 insertions(+), 4 deletions(-)#
Hello
Where is the patch which adds support for btime to nfsd?
Dan
--
Dan Shelton - Cluster Specialist Win/Lin/Bsd
> On Jan 15, 2024, at 8:02 PM, Dan Shelton <[email protected]> wrote:
>
> On Mon, 15 Jan 2024 at 07:37, Chen Hanxiao <[email protected]> wrote:
>>
>> This patch enable nfs to report btime in nfs_getattr.
>> If underlying filesystem supports "btime" timestamp,
>> statx will report btime for STATX_BTIME.
>>
>> Signed-off-by: Chen Hanxiao <[email protected]>
>> ---
>> v1:
>> Don't revalidate btime attribute
>>
>> RFC v2:
>> properly set cache validity
>>
>> fs/nfs/inode.c | 23 ++++++++++++++++++++---
>> fs/nfs/nfs4proc.c | 3 +++
>> fs/nfs/nfs4xdr.c | 23 +++++++++++++++++++++++
>> include/linux/nfs_fs.h | 2 ++
>> include/linux/nfs_xdr.h | 5 ++++-
>> 5 files changed, 52 insertions(+), 4 deletions(-)#
>
> Hello
>
> Where is the patch which adds support for btime to nfsd?
Support for the birth time attribute was added to NFSD two years
ago by commit e377a3e698fb ("nfsd: Add support for the birth
time attribute").
--
Chuck Lever
On Tue, 16 Jan 2024 at 02:43, Chuck Lever III <[email protected]> wrote:
>
>
>
> > On Jan 15, 2024, at 8:02 PM, Dan Shelton <[email protected]> wrote:
> >
> > On Mon, 15 Jan 2024 at 07:37, Chen Hanxiao <[email protected]> wrote:
> >>
> >> This patch enable nfs to report btime in nfs_getattr.
> >> If underlying filesystem supports "btime" timestamp,
> >> statx will report btime for STATX_BTIME.
> >>
> >> Signed-off-by: Chen Hanxiao <[email protected]>
> >> ---
> >> v1:
> >> Don't revalidate btime attribute
> >>
> >> RFC v2:
> >> properly set cache validity
> >>
> >> fs/nfs/inode.c | 23 ++++++++++++++++++++---
> >> fs/nfs/nfs4proc.c | 3 +++
> >> fs/nfs/nfs4xdr.c | 23 +++++++++++++++++++++++
> >> include/linux/nfs_fs.h | 2 ++
> >> include/linux/nfs_xdr.h | 5 ++++-
> >> 5 files changed, 52 insertions(+), 4 deletions(-)#
> >
> > Hello
> >
> > Where is the patch which adds support for btime to nfsd?
>
> Support for the birth time attribute was added to NFSD two years
> ago by commit e377a3e698fb ("nfsd: Add support for the birth
> time attribute").
Which Linux versions (trunk, LTS, RT) have that commit?
Dan
--
Dan Shelton - Cluster Specialist Win/Lin/Bsd
> On Jan 16, 2024, at 3:17 PM, Dan Shelton <[email protected]> wrote:
>
> On Tue, 16 Jan 2024 at 02:43, Chuck Lever III <[email protected]> wrote:
>>
>>> On Jan 15, 2024, at 8:02 PM, Dan Shelton <[email protected]> wrote:
>>>
>>> On Mon, 15 Jan 2024 at 07:37, Chen Hanxiao <[email protected]> wrote:
>>>>
>>>> This patch enable nfs to report btime in nfs_getattr.
>>>> If underlying filesystem supports "btime" timestamp,
>>>> statx will report btime for STATX_BTIME.
>>>>
>>>> Signed-off-by: Chen Hanxiao <[email protected]>
>>>> ---
>>>> v1:
>>>> Don't revalidate btime attribute
>>>>
>>>> RFC v2:
>>>> properly set cache validity
>>>>
>>>> fs/nfs/inode.c | 23 ++++++++++++++++++++---
>>>> fs/nfs/nfs4proc.c | 3 +++
>>>> fs/nfs/nfs4xdr.c | 23 +++++++++++++++++++++++
>>>> include/linux/nfs_fs.h | 2 ++
>>>> include/linux/nfs_xdr.h | 5 ++++-
>>>> 5 files changed, 52 insertions(+), 4 deletions(-)#
>>>
>>> Hello
>>>
>>> Where is the patch which adds support for btime to nfsd?
>>
>> Support for the birth time attribute was added to NFSD two years
>> ago by commit e377a3e698fb ("nfsd: Add support for the birth
>> time attribute").
>
> Which Linux versions (trunk, LTS, RT) have that commit?
e377a3e698fb was merged in v5.18. You'll also need these two fixes:
5b2f3e0777da ("NFSD: Decode NFSv4 birth time attribute") (v5.19)
d7dbed457c2e ("nfsd: Fix creation time serialization order") (v6.5)
All three of those commits should be in:
trunk: v6.5, v6.6, and v6.7
stable/LTS: origin/linux-6.6.y
I don't know which local file systems support birth time. I think
maybe ext4 and xfs do?
--
Chuck Lever
> -----邮件原件-----
> 发件人: Dan Shelton <[email protected]>
> 发送时间: 2024年1月17日 4:17
> 收件人: Linux NFS Mailing List <[email protected]>
> 主题: Re: [PATCH] nfsv4: Add support for the birth time attribute
>
> On Tue, 16 Jan 2024 at 02:43, Chuck Lever III <[email protected]> wrote:
> >
> >
> >
> > > On Jan 15, 2024, at 8:02 PM, Dan Shelton <[email protected]>
> wrote:
> > >
> > > On Mon, 15 Jan 2024 at 07:37, Chen Hanxiao <[email protected]>
> wrote:
> > >>
> > >> This patch enable nfs to report btime in nfs_getattr.
> > >> If underlying filesystem supports "btime" timestamp, statx will
> > >> report btime for STATX_BTIME.
> > >>
> > >> Signed-off-by: Chen Hanxiao <[email protected]>
> > >> ---
> > >> v1:
> > >> Don't revalidate btime attribute
> > >>
> > >> RFC v2:
> > >> properly set cache validity
> > >>
> > >> fs/nfs/inode.c | 23 ++++++++++++++++++++---
> > >> fs/nfs/nfs4proc.c | 3 +++
> > >> fs/nfs/nfs4xdr.c | 23 +++++++++++++++++++++++
> > >> include/linux/nfs_fs.h | 2 ++
> > >> include/linux/nfs_xdr.h | 5 ++++-
> > >> 5 files changed, 52 insertions(+), 4 deletions(-)#
> > >
> > > Hello
> > >
> > > Where is the patch which adds support for btime to nfsd?
> >
> > Support for the birth time attribute was added to NFSD two years ago
> > by commit e377a3e698fb ("nfsd: Add support for the birth time
> > attribute").
>
> Which Linux versions (trunk, LTS, RT) have that commit?
>
FYI,
Commit e377a3e698fb was in:
6.6 LTS [1]
6.1 LTS [2]
Stable [3]
RT [4]
[1]
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/fs/nfsd/nfs4xdr.c?h=linux-6.6.y&id=e377a3e698fb56cb63f6bddbebe7da76dc37e316
[2]
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/fs/nfsd/nfs4xdr.c?h=linux-6.1.y&id=e377a3e698fb56cb63f6bddbebe7da76dc37e316
[3]
https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux-stable/+/e377a3e698fb56cb63f6bddbebe7da76dc37e316
[4]
https://kernel.googlesource.com/pub/scm/linux/kernel/git/rt/linux-rt-devel/+/e377a3e698fb56cb63f6bddbebe7da76dc37e316
> -----邮件原件-----
> 发件人: Chuck Lever III <[email protected]>
> 发送时间: 2024年1月17日 10:54
> 收件人: Dan Shelton <[email protected]>
> 抄送: Linux NFS Mailing List <[email protected]>
> 主题: Re: [PATCH] nfsv4: Add support for the birth time attribute
>
>
> > On Jan 16, 2024, at 3:17 PM, Dan Shelton <[email protected]> wrote:
> >
> > On Tue, 16 Jan 2024 at 02:43, Chuck Lever III <[email protected]>
> wrote:
> >>
> >>> On Jan 15, 2024, at 8:02 PM, Dan Shelton <[email protected]>
> wrote:
> >>>
> >>> On Mon, 15 Jan 2024 at 07:37, Chen Hanxiao <[email protected]>
> wrote:
> >>>>
> >>>> This patch enable nfs to report btime in nfs_getattr.
> >>>> If underlying filesystem supports "btime" timestamp, statx will
> >>>> report btime for STATX_BTIME.
> >>>>
> >>>> Signed-off-by: Chen Hanxiao <[email protected]>
> >>>> ---
> >>>> v1:
> >>>> Don't revalidate btime attribute
> >>>>
> >>>> RFC v2:
> >>>> properly set cache validity
> >>>>
> >>>> fs/nfs/inode.c | 23 ++++++++++++++++++++---
> >>>> fs/nfs/nfs4proc.c | 3 +++
> >>>> fs/nfs/nfs4xdr.c | 23 +++++++++++++++++++++++
> >>>> include/linux/nfs_fs.h | 2 ++
> >>>> include/linux/nfs_xdr.h | 5 ++++-
> >>>> 5 files changed, 52 insertions(+), 4 deletions(-)#
> >>>
> >>> Hello
> >>>
> >>> Where is the patch which adds support for btime to nfsd?
> >>
> >> Support for the birth time attribute was added to NFSD two years ago
> >> by commit e377a3e698fb ("nfsd: Add support for the birth time
> >> attribute").
> >
> > Which Linux versions (trunk, LTS, RT) have that commit?
>
> e377a3e698fb was merged in v5.18. You'll also need these two fixes:
>
> 5b2f3e0777da ("NFSD: Decode NFSv4 birth time attribute") (v5.19)
> d7dbed457c2e ("nfsd: Fix creation time serialization order") (v6.5)
>
> All three of those commits should be in:
>
> trunk: v6.5, v6.6, and v6.7
> stable/LTS: origin/linux-6.6.y
>
> I don't know which local file systems support birth time. I think maybe ext4 and
> xfs do?
AFAIK,
Xfs
Ext4
btrfs
cephfs
f2fs
support birth time.
Regards,
- Chen
>
>
> --
> Chuck Lever
>