xfs_io: catch statx fields up to 6.15
PATCH 1/2 xfs_io: catch statx fields up to 6.15
From: Darrick J. Wong <[email protected]>
Add all the new statx fields that have accumulated for the past couple of years.
--- io/statx.h | 25 ++++++++++++++++++++++++- io/stat.c | 5 +++++ m4/package_libcdev.m4 | 2 +- 3 files changed, 30 insertions(+), 2 deletions(-)
io/statx.h +24 -1
@@ -138,7 +138,10 @@ struct statx {__u32 stx_atomic_write_unit_max;/* Max atomic write unit in bytes */ /* 0xb0 */ __u32 stx_atomic_write_segments_max;/* Max atomic write segment count */ -__u32 __spare1[1 ]; + +/* File offset alignment for direct I/O reads */ +__u32 stx_dio_read_offset_align; +/* 0xb8 */ __u64 __spare3[9 ];/* Spare space for future expansion */ /* 0x100 */
@@ -191,8 +194,28 @@ struct statx {#endif /* STATX_TYPE */ +#ifndef STATX_MNT_ID +#define STATX_MNT_ID 0x00001000U/* Got stx_mnt_id */ +#endif + +#ifndef STATX_DIOALIGN +#define STATX_DIOALIGN 0x00002000U/* Want/got direct I/O alignment info */ +#endif + +#ifndef STATX_MNT_ID_UNIQUE +#define STATX_MNT_ID_UNIQUE 0x00004000U/* Want/got extended stx_mount_id */ +#endif + +#ifndef STATX_SUBVOL +#define STATX_SUBVOL 0x00008000U/* Want/got stx_subvol */ +#endif +#ifndef STATX_WRITE_ATOMIC #define STATX_WRITE_ATOMIC 0x00010000U/* Want/got atomic_write_* fields */ #endif +#ifndef STATX_DIO_READ_ALIGN +#define STATX_DIO_READ_ALIGN 0x00020000U/* Want/got dio read alignment info */ +#endif +#endif /* XFS_IO_STATX_H */
io/stat.c +5 -0
@@ -365,9 +365,14 @@ dump_raw_statx(struct statx *stx)printf ("stat.rdev_minor = %u\n" , stx->stx_rdev_minor);printf ("stat.dev_major = %u\n" , stx->stx_dev_major);printf ("stat.dev_minor = %u\n" , stx->stx_dev_minor); +printf ("stat.mnt_id = 0x%llu\n" , (unsigned long long )stx->stx_mnt_id); +printf ("stat.dio_mem_align = %u\n" , stx->stx_dio_mem_align); +printf ("stat.dio_offset_align = %u\n" , stx->stx_dio_offset_align); +printf ("stat.subvol = 0x%llu\n" , (unsigned long long )stx->stx_subvol);printf ("stat.atomic_write_unit_min = %u\n" , stx->stx_atomic_write_unit_min);printf ("stat.atomic_write_unit_max = %u\n" , stx->stx_atomic_write_unit_max);printf ("stat.atomic_write_segments_max = %u\n" , stx->stx_atomic_write_segments_max); +printf ("stat.dio_read_offset_align = %u\n" , stx->stx_dio_read_offset_align);return 0 ; }
m4/package_libcdev.m4 +1 -1
@@ -126,7 +126,7 @@ AC_DEFUN([AC_NEED_INTERNAL_FSCRYPT_POLICY_V2], AC_DEFUN([AC_NEED_INTERNAL_STATX], [ AC_CHECK_TYPE(struct statx, [ - AC_CHECK_MEMBER(struct statx.stx_atomic_write_unit_min, + AC_CHECK_MEMBER(struct statx.stx_dio_read_offset_align, , need_internal_statx=yes, [#include <linux/stat.h>]
PATCH 2/2 xfs_io: make statx mask parsing more generally useful
From: Darrick J. Wong <[email protected]>
Enhance the statx -m parsing to be more useful:
Add words for all the new STATX_* field flags added in the previous patch.
Allow "+" and "-" prefixes to add or remove flags from the mask.
Allow multiple arguments to be specified as a comma separated list.
--- io/stat.c | 120 ++++++++++++++++++++++++++++++++++++++++++++++------- man/man8/xfs_io.8 | 11 +++++ 2 files changed, 116 insertions(+), 15 deletions(-)
io/stat.c +105 -15
@@ -321,10 +321,41 @@ _statx(#endif } +struct statx_masks { +const char *name; +unsigned int mask; +}; + +static const struct statx_masks statx_masks[] = { + {"basic" ,STATX_BASIC_STATS }, + {"all" ,STATX_ALL }, + + {"type" ,STATX_TYPE }, + {"mode" ,STATX_MODE }, + {"nlink" ,STATX_NLINK }, + {"uid" ,STATX_UID }, + {"gid" ,STATX_GID }, + {"atime" ,STATX_ATIME }, + {"mtime" ,STATX_MTIME }, + {"ctime" ,STATX_CTIME }, + {"ino" ,STATX_INO }, + {"size" ,STATX_SIZE }, + {"blocks" ,STATX_BLOCKS }, + {"btime" ,STATX_BTIME }, + {"mnt_id" ,STATX_MNT_ID }, + {"dioalign" ,STATX_DIOALIGN }, + {"mnt_id_unique" ,STATX_MNT_ID_UNIQUE }, + {"subvol" ,STATX_SUBVOL }, + {"write_atomic" ,STATX_WRITE_ATOMIC }, + {"dio_read_align" ,STATX_DIO_READ_ALIGN }, +}; +static void statx_help (void ) { - printf(_( +unsigned int i; + + printf(_( "\n" " Display extended file status.\n" "\n"
@@ -333,9 +364,16 @@ statx_help(void)" -r -- Print raw statx structure fields\n" " -m mask -- Specify the field mask for the statx call\n" " (can also be 'basic' or 'all'; default STATX_ALL)\n" +" -m +mask -- Add this to the field mask for the statx call\n" +" -m -mask -- Remove this from the field mask for the statx call\n" " -D -- Don't sync attributes with the server\n" " -F -- Force the attributes to be sync'd with the server\n" -"\n")); +"\n" +"statx mask values: ")); + +for (i =0 ; i <ARRAY_SIZE (statx_masks); i++) +printf ("%s%s" , i ==0 ?"" :", " , statx_masks[i].name); +printf ("\n" ); }/* statx helper */
@@ -376,6 +414,68 @@ dump_raw_statx(struct statx *stx)return 0 ; } +enum statx_mask_op { +SET , +REMOVE , +ADD , +}; + +static bool +parse_statx_masks ( +char *optarg, +unsigned int *caller_mask) +{ +char *arg = optarg; +char *word; +unsigned int i; + +while ((word =strtok (arg,"," )) !=NULL ) { +enum statx_mask_op op; +unsigned int mask; +char *p; + + arg =NULL ; + +if (*word =='+' ) { + op =ADD ; + word++; + }else if (*word =='-' ) { + op =REMOVE ; + word++; + }else { + op =SET ; + } + +for (i =0 ; i <ARRAY_SIZE (statx_masks); i++) { +if (!strcmp (statx_masks[i].name, word)) { + mask = statx_masks[i].mask; + goto process_op; + } + } + + mask =strtoul (word, &p,0 ); +if (!p || p == word) { +printf (_ ("non-numeric mask -- %s\n" ), word); +return false; + } + +process_op: +switch (op) { +case ADD : + *caller_mask |= mask; +continue ; +case REMOVE : + *caller_mask &= ~mask; +continue ; +case SET : + *caller_mask = mask; +continue ; + } + } + +return true; +} +/* * options: * - input flags - query type
@@ -388,7 +488,6 @@ statx_f( char **argv) {int c, verbose =0 , raw =0 ; -char *p;struct statx stx;int atflag =0 ;unsigned int mask =STATX_ALL ;
@@ -396,18 +495,9 @@ statx_f(while ((c =getopt (argc, argv,"m:rvFD" )) !=EOF ) {switch (c) {case 'm' : -if (strcmp (optarg,"basic" ) ==0 ) - mask =STATX_BASIC_STATS ; -else if (strcmp (optarg,"all" ) ==0 ) - mask =STATX_ALL ; -else { - mask =strtoul (optarg, &p,0 ); -if (!p || p == optarg) { -printf ( -_ ("non-numeric mask -- %s\n" ), optarg); - exitcode =1 ; -return 0 ; - } +if (!parse_statx_masks (optarg, &mask)) { + exitcode =1 ; +return 0 ; }break ;case 'r' :
man/man8/xfs_io.8 +11 -0
@@ -999,6 +999,17 @@ .SH FILE I/O COMMANDS .B \-m <mask> Specify a numeric field mask for the statx call. .TP +.BI "\-m +" value +Add this value to the statx field value. +Values can be numeric, or they can be words describing the desired fields. +See the help command output for a list of recognized words. +.TP +.BI "\-m -" value +Remove this value from the statx field value. +.TP +.BI "\-m +" value ",-" value +Add and remove multiple values from the statx field value. +.TP .B \-F Force the attributes to be synced with the server. .TP
Re: [PATCH 2/2] xfs_io: make statx mask parsing more generally useful
Quoted 65 lines · Darrick J. Wong
From: Darrick J. Wong <[email protected]>
Enhance the statx -m parsing to be more useful:
Add words for all the new STATX_* field flags added in the previous patch.
Allow "+" and "-" prefixes to add or remove flags from the mask.
Allow multiple arguments to be specified as a comma separated list.
Signed-off-by "Darrick J. Wong" <[email protected]>--- io/stat.c | 120 ++++++++++++++++++++++++++++++++++++++++++++++------- man/man8/xfs_io.8 | 11 +++++ 2 files changed, 116 insertions(+), 15 deletions(-)io/stat.c +32
-1@@ -321,10 +321,41 @@ _statx(#endif } +struct statx_masks { +const char *name; +unsigned int mask; +}; + +static const struct statx_masks statx_masks[] = { + {"basic" ,STATX_BASIC_STATS }, + {"all" ,STATX_ALL }, + + {"type" ,STATX_TYPE }, + {"mode" ,STATX_MODE }, + {"nlink" ,STATX_NLINK }, + {"uid" ,STATX_UID }, + {"gid" ,STATX_GID }, + {"atime" ,STATX_ATIME }, + {"mtime" ,STATX_MTIME }, + {"ctime" ,STATX_CTIME }, + {"ino" ,STATX_INO }, + {"size" ,STATX_SIZE }, + {"blocks" ,STATX_BLOCKS }, + {"btime" ,STATX_BTIME }, + {"mnt_id" ,STATX_MNT_ID }, + {"dioalign" ,STATX_DIOALIGN }, + {"mnt_id_unique" ,STATX_MNT_ID_UNIQUE }, + {"subvol" ,STATX_SUBVOL }, + {"write_atomic" ,STATX_WRITE_ATOMIC }, + {"dio_read_align" ,STATX_DIO_READ_ALIGN }, +}; +static void statx_help (void ) { - printf(_( +unsigned int i; + + printf(_( "\n" " Display extended file status.\n" "\n"
io/stat.c statx_help(void) · line 366
Quoted 3 lines
io/stat.c +0
-0@@ -333,9 +364,16 @@ statx_help(void)" -r -- Print raw statx structure fields\n" " -m mask -- Specify the field mask for the statx call\n" " (can also be 'basic' or 'all'; default STATX_ALL)\n"
this comment ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
then probably can go away, as it can be any of the above now
Otherwise, looks good to me
Quoted 136 lines
io/stat.c +73
-14+" -m +mask -- Add this to the field mask for the statx call\n" +" -m -mask -- Remove this from the field mask for the statx call\n" " -D -- Don't sync attributes with the server\n" " -F -- Force the attributes to be sync'd with the server\n" -"\n")); +"\n" +"statx mask values: ")); + +for (i =0 ; i <ARRAY_SIZE (statx_masks); i++) +printf ("%s%s" , i ==0 ?"" :", " , statx_masks[i].name); +printf ("\n" ); }/* statx helper */ @@ -376,6 +414,68 @@ dump_raw_statx(struct statx *stx)return 0 ; } +enum statx_mask_op { +SET , +REMOVE , +ADD , +}; + +static bool +parse_statx_masks ( +char *optarg, +unsigned int *caller_mask) +{ +char *arg = optarg; +char *word; +unsigned int i; + +while ((word =strtok (arg,"," )) !=NULL ) { +enum statx_mask_op op; +unsigned int mask; +char *p; + + arg =NULL ; + +if (*word =='+' ) { + op =ADD ; + word++; + }else if (*word =='-' ) { + op =REMOVE ; + word++; + }else { + op =SET ; + } + +for (i =0 ; i <ARRAY_SIZE (statx_masks); i++) { +if (!strcmp (statx_masks[i].name, word)) { + mask = statx_masks[i].mask; + goto process_op; + } + } + + mask =strtoul (word, &p,0 ); +if (!p || p == word) { +printf (_ ("non-numeric mask -- %s\n" ), word); +return false; + } + +process_op: +switch (op) { +case ADD : + *caller_mask |= mask; +continue ; +case REMOVE : + *caller_mask &= ~mask; +continue ; +case SET : + *caller_mask = mask; +continue ; + } + } + +return true; +} +/* * options: * - input flags - query type @@ -388,7 +488,6 @@ statx_f( char **argv) {int c, verbose =0 , raw =0 ; -char *p;struct statx stx;int atflag =0 ;unsigned int mask =STATX_ALL ;@@ -396,18 +495,9 @@ statx_f(while ((c =getopt (argc, argv,"m:rvFD" )) !=EOF ) {switch (c) {case 'm' : -if (strcmp (optarg,"basic" ) ==0 ) - mask =STATX_BASIC_STATS ; -else if (strcmp (optarg,"all" ) ==0 ) - mask =STATX_ALL ; -else { - mask =strtoul (optarg, &p,0 ); -if (!p || p == optarg) { -printf ( -_ ("non-numeric mask -- %s\n" ), optarg); - exitcode =1 ; -return 0 ; - } +if (!parse_statx_masks (optarg, &mask)) { + exitcode =1 ; +return 0 ; }break ;case 'r' :man/man8/xfs_io.8 +11
-0@@ -999,6 +999,17 @@ .SH FILE I/O COMMANDS .B \-m <mask> Specify a numeric field mask for the statx call. .TP +.BI "\-m +" value +Add this value to the statx field value. +Values can be numeric, or they can be words describing the desired fields. +See the help command output for a list of recognized words. +.TP +.BI "\-m -" value +Remove this value from the statx field value. +.TP +.BI "\-m +" value ",-" value +Add and remove multiple values from the statx field value. +.TP .B \-F Force the attributes to be synced with the server. .TP
Signature · 1 line
- Andrey
Re: [PATCH 2/2] xfs_io: make statx mask parsing more generally useful
In reply to Darrick J. WongQuoted 3 lines · Darrick J. Wong
From: Darrick J. Wong <[email protected]>
Enhance the statx -m parsing to be more useful:
Btw, -m claims to set STATX_ALL, which the kernel deprecated soon after adding it:
* This is deprecated, and shall remain the same value in the future. To avoid
* confusion please use the equivalent (STATX_BASIC_STATS | STATX_BTIME)
* instead.
do we need to do something about the -m definition in xfs_io because all fields aren't included in STATX_ALL?
Re: [PATCH 2/2] xfs_io: make statx mask parsing more generally useful
Quoted 8 lines · Christoph Hellwig
Quoted 3 lines · Darrick J. Wong
From: Darrick J. Wong <[email protected]>
Enhance the statx -m parsing to be more useful:
Btw, -m claims to set
STATX_ALL, which the kernel deprecated soon after adding it:
Quoted 6 lines
* This is deprecated, and shall remain the same value in the future. To avoid
* confusion please use the equivalent (STATX_BASIC_STATS|STATX_BTIME)
* instead.do we need to do something about the -m definition in
xfs_iobecause all fields aren't included inSTATX_ALL?
Hrm. Nothing in fstests uses it AFAICT so maybe we could just get rid of the -m option. Or we could redefine "all" to map to ~1U so it actually does what that word means?
--D
Re: [PATCH 2/2] xfs_io: make statx mask parsing more generally useful
Quoted 3 lines · Darrick J. Wong
Hrm. Nothing in fstests uses it AFAICT so maybe we could just get rid of the -m option. Or we could redefine "all" to map to ~1U so it actually does what that word means?
The latter sounds reasonable to me.
Quoted 82 lines · Darrick J. Wong
From: Darrick J. Wong <[email protected]>
Add all the new statx fields that have accumulated for the past couple of years.
Signed-off-by "Darrick J. Wong" <[email protected]>--- io/statx.h | 25 ++++++++++++++++++++++++- io/stat.c | 5 +++++ m4/package_libcdev.m4 | 2 +- 3 files changed, 30 insertions(+), 2 deletions(-)io/statx.h +24
-1@@ -138,7 +138,10 @@ struct statx {__u32 stx_atomic_write_unit_max;/* Max atomic write unit in bytes */ /* 0xb0 */ __u32 stx_atomic_write_segments_max;/* Max atomic write segment count */ -__u32 __spare1[1 ]; + +/* File offset alignment for direct I/O reads */ +__u32 stx_dio_read_offset_align; +/* 0xb8 */ __u64 __spare3[9 ];/* Spare space for future expansion */ /* 0x100 */ @@ -191,8 +194,28 @@ struct statx {#endif /* STATX_TYPE */ +#ifndef STATX_MNT_ID +#define STATX_MNT_ID 0x00001000U/* Got stx_mnt_id */ +#endif + +#ifndef STATX_DIOALIGN +#define STATX_DIOALIGN 0x00002000U/* Want/got direct I/O alignment info */ +#endif + +#ifndef STATX_MNT_ID_UNIQUE +#define STATX_MNT_ID_UNIQUE 0x00004000U/* Want/got extended stx_mount_id */ +#endif + +#ifndef STATX_SUBVOL +#define STATX_SUBVOL 0x00008000U/* Want/got stx_subvol */ +#endif +#ifndef STATX_WRITE_ATOMIC #define STATX_WRITE_ATOMIC 0x00010000U/* Want/got atomic_write_* fields */ #endif +#ifndef STATX_DIO_READ_ALIGN +#define STATX_DIO_READ_ALIGN 0x00020000U/* Want/got dio read alignment info */ +#endif +#endif /* XFS_IO_STATX_H */ io/stat.c +5
-0@@ -365,9 +365,14 @@ dump_raw_statx(struct statx *stx)printf ("stat.rdev_minor = %u\n" , stx->stx_rdev_minor);printf ("stat.dev_major = %u\n" , stx->stx_dev_major);printf ("stat.dev_minor = %u\n" , stx->stx_dev_minor); +printf ("stat.mnt_id = 0x%llu\n" , (unsigned long long )stx->stx_mnt_id); +printf ("stat.dio_mem_align = %u\n" , stx->stx_dio_mem_align); +printf ("stat.dio_offset_align = %u\n" , stx->stx_dio_offset_align); +printf ("stat.subvol = 0x%llu\n" , (unsigned long long )stx->stx_subvol);printf ("stat.atomic_write_unit_min = %u\n" , stx->stx_atomic_write_unit_min);printf ("stat.atomic_write_unit_max = %u\n" , stx->stx_atomic_write_unit_max);printf ("stat.atomic_write_segments_max = %u\n" , stx->stx_atomic_write_segments_max); +printf ("stat.dio_read_offset_align = %u\n" , stx->stx_dio_read_offset_align);return 0 ; }m4/package_libcdev.m4 +0
-0
m4/package_libcdev.m4 AC_DEFUN([AC_NEED_INTERNAL_FSCRYPT_POLICY_V2], · line 132
Quoted 8 lines
m4/package_libcdev.m4 +1
-1@@ -126,7 +126,7 @@ AC_DEFUN([AC_NEED_INTERNAL_FSCRYPT_POLICY_V2], AC_DEFUN([AC_NEED_INTERNAL_STATX], [ AC_CHECK_TYPE(struct statx, [ - AC_CHECK_MEMBER(struct statx.stx_atomic_write_unit_min, + AC_CHECK_MEMBER(struct statx.stx_dio_read_offset_align, , need_internal_statx=yes, [#include <linux/stat.h>]
Looks good to me
Signature · 1 line
- Andrey
Quoted 4 lines · Darrick J. Wong
From: Darrick J. Wong <[email protected]>
Add all the new statx fields that have accumulated for the past couple of years.
I only see a single new field, although I can spot a few flags and missing printing of a few fields.
Maybe update the commit log a little?
Otherwise looks good:
Quoted 10 lines · Christoph Hellwig
Quoted 4 lines · Darrick J. Wong
From: Darrick J. Wong <[email protected]>
Add all the new statx fields that have accumulated for the past couple of years.
I only see a single new field, although I can spot a few flags and missing printing of a few fields.
Maybe update the commit log a little?
"Add all the new statx fields and flags that have accumulated for the past couple of years so they all print now." ?
Quoted 3 lines
Otherwise looks good:
Reviewed-by Christoph Hellwig <[email protected]>
Thanks!
--D
Quoted 2 lines · Darrick J. Wong
"Add all the new statx fields and flags that have accumulated for the past couple of years so they all print now." ?
Sounds good.