xfsprogs: filesystem properties
RFC PATCH 1/1 xfsprogs: filesystem properties
Hi all,
After last week's discussion about how to allow sysadmins to opt in or out of autonomous self healing XFS[1], I now have an RFC patchset that implements the filesystem properties that we talked about.
As a refresher, the design I settled on is to add ATTR_ROOT (aka "trusted") xattrs to the root directory. ATTR_ROOT xattrs can only be accessed by processes with CAP_SYS_ADMIN, so unprivileged userspace can't mess with the sysadmin's configured preferences.
I decided that all fs properties should have "xfs:" in the name to make them look distinct, and defined "trusted.xfs:self_healing" as the property that controls the amount of autonomous self healing. There's a new wrapper program "xfs_property" that one can use to administer the properties. xfs_scrub{,bed} uses the property; and mkfs.xfs can set it for you at format time.
# mkfs.xfs -m self_healing /dev/sda
# xfs_property /dev/sda get self_healing repair
# mount /dev/sda /mnt
# xfs_property /mnt set self_healing=check
# xfs_scrub -o fsprops_advise /mnt Info: /mnt: Checking per self_healing directive.
--D
[1] https://lore.kernel.org/linux-xfs/20240724213852.GA612460@frogsfrogsfrogs/
PATCH 1/3 xfsprogs: filesystem properties
Hi all,
It would be very useful if system administrators could set properties for a given xfs filesystem to control its behavior. This we can do easily and extensibly by setting ATTR_ROOT (aka "trusted") extended attributes on the root directory. To prevent this from becoming a weird free for all, let's add some library and tooling support so that sysadmins simply run the xfs_property program to administer these properties.
If you're going to start using this code, I strongly recommend pulling from my git trees, which are linked below.
This has been running on the djcloud for months with no problems. Enjoy! Comments and questions are, as always, welcome.
--D
xfsprogs git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfsprogs-dev.git/log/?h=filesystem-properties
fstests git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfstests-dev.git/log/?h=filesystem-properties
---
Commits in this patchset:
* libfrog: support editing filesystem property sets
* xfs_spaceman: edit filesystem properties
* xfs_db: improve getting and setting extended attributes
* libxfs: hoist listxattr from xfs_repair
* libxfs: pass a transaction context through listxattr
* xfs_db: add a command to list xattrs
* xfs_property: add a new tool to administer fs properties
--- db/attrset.c | 463 ++++++++++++++++++++++++++++++++++++++++++++++- libfrog/Makefile | 7 + libfrog/fsproperties.c | 39 ++++ libfrog/fsproperties.h | 50 +++++ libfrog/fsprops.c | 214 ++++++++++++++++++++++ libfrog/fsprops.h | 34 +++ libxfs/Makefile | 2 libxfs/listxattr.c | 42 ++-- libxfs/listxattr.h | 17 ++ man/man8/xfs_db.8 | 68 +++++++ man/man8/xfs_property.8 | 52 +++++ man/man8/xfs_spaceman.8 | 27 +++ repair/Makefile | 2 repair/listxattr.h | 15 -- repair/pptr.c | 9 + spaceman/Makefile | 7 + spaceman/init.c | 1 spaceman/properties.c | 342 +++++++++++++++++++++++++++++++++++ spaceman/space.h | 1 spaceman/xfs_property | 77 ++++++++ 20 files changed, 1422 insertions(+), 47 deletions(-) create mode 100644 libfrog/fsproperties.c create mode 100644 libfrog/fsproperties.h create mode 100644 libfrog/fsprops.c create mode 100644 libfrog/fsprops.h rename repair/listxattr.c => libxfs/listxattr.c (84%) create mode 100644 libxfs/listxattr.h create mode 100644 man/man8/xfs_property.8 delete mode 100644 repair/listxattr.h create mode 100644 spaceman/properties.c create mode 100755 spaceman/xfs_property
PATCH 1/7 libfrog: support editing filesystem property sets
From: Darrick J. Wong <[email protected]>
Add some library functions so that spaceman and scrub can share the same code to edit and retrieve filesystem properties.
--- libfrog/Makefile | 7 ++ libfrog/fsproperties.c | 39 +++++++++ libfrog/fsproperties.h | 50 +++++++++++ libfrog/fsprops.c | 214 ++++++++++++++++++++++++++++++++++++++++++++++++ libfrog/fsprops.h | 34 ++++++++ 5 files changed, 344 insertions(+) create mode 100644 libfrog/fsproperties.c create mode 100644 libfrog/fsproperties.h create mode 100644 libfrog/fsprops.c create mode 100644 libfrog/fsprops.h
libfrog/Makefile +7 -0
@@ -20,6 +20,7 @@ convert.c \ crc32.c \ file_exchange.c \ fsgeom.c \ +fsproperties.c \ getparents.c \ histogram.c \ list_sort.c \
@@ -47,6 +48,7 @@ dahashselftest.h \ div64.h \ file_exchange.h \ fsgeom.h \ +fsproperties.h \ getparents.h \ histogram.h \ logging.h \
@@ -60,6 +62,11 @@ workqueue.h LSRCFILES += gen_crc32table.c +ifeq ($(HAVE_LIBATTR),yes) +CFILES+=fsprops.c +HFILES+=fsprops.h +endif + LDIRT = gen_crc32table crc32table.h default: ltdepend $(LTLIBRARY)
libfrog/fsproperties.c new file +39 -0
@@ -0,0 +1,39 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Copyright (c) 2024 Oracle. All Rights Reserved. +* Author: Darrick J. Wong <[email protected]> +*/ +#include <string.h> +#include "xfs.h" +#include "libfrog/fsgeom.h" +#include "libfrog/fsproperties.h" +#include "list.h" + +/* Return the offset of a string in a string table, or -1 if not found. */ +static inline int +__fsprops_lookup ( +const char *values[], +unsigned int nr_values, +const char *value) +{ +unsigned int i; + +for (i =0 ; i < nr_values; i++) { +if (values[i] && !strcmp (value, values[i])) +return i; + } + +return -1 ; +} + +#define fsprops_lookup (values, value) \ + __fsprops_lookup((values), ARRAY_SIZE(values), (value)) + +/* Return true if a fs property name=value tuple is allowed. */ +bool +fsprop_validate ( +const char *name, +const char *value) +{ +return true; +}
libfrog/fsproperties.h new file +50 -0
50 lines not on this page · raw message
libfrog/fsprops.c new file +214 -0
214 lines not on this page · raw message
libfrog/fsprops.h new file +34 -0
@@ -0,0 +1,34 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ +/* +* Copyright (c) 2024 Oracle. All Rights Reserved. +* Author: Darrick J. Wong <[email protected]> +*/ +#ifndef __LIBFROG_FSPROPS_H__ +#define __LIBFROG_FSPROPS_H__ + +/* Edit and view filesystem property sets. */ + +struct fsprops_handle { +void *hanp; +size_t hlen; +}; + +struct xfs_fd ; +struct fs_path ; + +int fsprops_open_handle (struct xfs_fd *xfd,struct fs_path *fspath, +struct fsprops_handle *fph); +void fsprops_free_handle (struct fsprops_handle *fph); + +typedef int (*fsprops_name_walk_fn )(struct fsprops_handle *fph, +const char *name,size_t valuelen,void *priv); + +int fsprops_walk_names (struct fsprops_handle *fph,fsprops_name_walk_fn walk_fn, +void *priv); +int fsprops_get (struct fsprops_handle *fph,const char *name,void *attrbuf, +size_t *attrlen); +int fsprops_set (struct fsprops_handle *fph,const char *name,void *attrbuf, +size_t attrlen); +int fsprops_remove (struct fsprops_handle *fph,const char *name); + +#endif /* __LIBFROG_FSPROPS_H__ */
Re: [PATCH 1/7] libfrog: support editing filesystem property sets
Looks good:
PATCH 2/7 xfs_spaceman: edit filesystem properties
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Add some new subcommands to xfs_spaceman so that we can examine filesystem properties.
--- man/man8/xfs_spaceman.8 | 27 ++++ spaceman/Makefile | 4 + spaceman/init.c | 1 spaceman/properties.c | 342 +++++++++++++++++++++++++++++++++++++++++++++++ spaceman/space.h | 1 5 files changed, 375 insertions(+) create mode 100644 spaceman/properties.c
man/man8/xfs_spaceman.8 +27 -0
@@ -217,3 +217,30 @@ Do not trim free space extents shorter than this length. Units can be appended to this argument. .PD .RE + +.SH FILESYSTEM PROPERTIES +If the opened file is the root directory of a filesystem, the following +commands can be used to read and write filesystem properties. +These properties allow system administrators to express their preferences for +the filesystem in question. +.TP +.BI "getfsprops name [ " names "... ]" +Retrieve the values of the given filesystem properties. +.TP +.BI "listfsprops" +List all filesystem properties that have been stored in the filesystem. +.TP +.BI "setfsprops " name = value " [ " name = value "... ]" +Set the given filesystem properties to the specified values. +.TP +.BI "removefsprops name [ " names "... ]" +Remove the given filesystem properties. + +.RE +Currently supported filesystem properties are: +.TP +.B self_healing +See the +.BR xfs_scrub (8) +manual for more information. +.RE
spaceman/Makefile +4 -0
@@ -30,6 +30,10 @@ ifeq ($(HAVE_GETFSMAP),yes) CFILES += freesp.c endif +ifeq ($(HAVE_LIBATTR),yes) +CFILES += properties.c +endif + default: depend $(LTCOMMAND) include $(BUILDRULES)
spaceman/init.c +1 -0
@@ -35,6 +35,7 @@ init_commands(void)trim_init ();freesp_init ();health_init (); +fsprops_init (); } static int
spaceman/properties.c new file +342 -0
342 lines not on this page · raw message
spaceman/space.h +1 -0
@@ -36,5 +36,6 @@ extern void freesp_init(void);#endif extern void info_init (void );extern void health_init (void ); +void fsprops_init (void );#endif /* XFS_SPACEMAN_SPACE_H_ */
Re: [PATCH 2/7] xfs_spaceman: edit filesystem properties
Is this really a xfs_spaceman thingy? The code itself looks fine, but the association with space management is kinda weird.
Re: [PATCH 2/7] xfs_spaceman: edit filesystem properties
Quoted 2 lines · Christoph Hellwig
Is this really a
xfs_spacemanthingy? The code itself looks fine, but the association with space management is kinda weird.
I dunno. It could just as easily go into xfs_io I suppose; the tiny advantage of putting it in spaceman is that spaceman grabs the fsgeometry structure on file open so we don't have to do that again.
--D
Re: [PATCH 2/7] xfs_spaceman: edit filesystem properties
Quoted 7 lines · Darrick J. Wong
Quoted 2 lines · Christoph Hellwig
Is this really a
xfs_spacemanthingy? The code itself looks fine, but the association with space management is kinda weird.I dunno. It could just as easily go into
xfs_ioI suppose; the tiny advantage of putting it in spaceman is that spaceman grabs the fsgeometry structure on file open so we don't have to do that again.
For the online changes xfs_io seems ok, and for the offline ones xfs_db seems like a perfevt fit anyway.
Re: [PATCH 2/7] xfs_spaceman: edit filesystem properties
Quoted 11 lines · Christoph Hellwig
Quoted 7 lines · Darrick J. Wong
Quoted 2 lines · Christoph Hellwig
Is this really a
xfs_spacemanthingy? The code itself looks fine, but the association with space management is kinda weird.I dunno. It could just as easily go into
xfs_ioI suppose; the tiny advantage of putting it in spaceman is that spaceman grabs the fsgeometry structure on file open so we don't have to do that again.For the online changes
xfs_ioseems ok, and for the offline onesxfs_dbseems like a perfevt fit anyway.
If fsprops can be managed both online and offline,
then xfs_admin is probably the right user facing interface to document. i.e. We already have xfs_admin vectoring between xfs_io when the filesystem is online and xfs_db when the filesystem is offline to do things like change UUIDs and labels. This would make setting fsprops somewhat simpler for admins and scripts as they then only have to learn/code one mechanism instead of two...
-Dave.
Signature · 2 lines
Dave Chinner [email protected]
PATCH 3/7 xfs_db: improve getting and setting extended attributes
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Add an attr_get command to retrieve the value of an xattr from a file; and extend the attr_set command to allow passing of string values.
--- db/attrset.c | 262 ++++++++++++++++++++++++++++++++++++++++++++++++++++- man/man8/xfs_db.8 | 40 ++++++++ 2 files changed, 293 insertions(+), 9 deletions(-)
db/attrset.c +255 -7
@@ -17,20 +17,44 @@#include "inode.h" #include "malloc.h" #include <sys/xattr.h> +#include "libfrog/fsproperties.h" +static int attr_get_f (int argc,char **argv);static int attr_set_f (int argc,char **argv);static int attr_remove_f (int argc,char **argv); +static void attrget_help (void );static void attrset_help (void ); +static const cmdinfo_t attr_get_cmd = + {"attr_get" ,"aget" , attr_get_f,1 ,-1 ,0 , +N_ ("[-r|-s|-u|-p|-Z] name" ), +N_ ("get the named attribute on the current inode" ), attrget_help };static const cmdinfo_t attr_set_cmd = {"attr_set" ,"aset" , attr_set_f,1 ,-1 ,0 , -N_ ("[-r|-s|-u|-p] [-n] [-R|-C] [-v n] name" ), +N_ ("[-r|-s|-u|-p|-Z] [-n] [-R|-C] [-v n] name" ),N_ ("set the named attribute on the current inode" ), attrset_help };static const cmdinfo_t attr_remove_cmd = {"attr_remove" ,"aremove" , attr_remove_f,1 ,-1 ,0 , -N_ ("[-r|-s|-u|-p] [-n] name" ), +N_ ("[-r|-s|-u|-p|-Z] [-n] name" ),N_ ("remove the named attribute from the current inode" ), attrset_help }; +static void +attrget_help (void ) +{ +dbprintf (_ ( +"\n" +" The attr_get command provide interfaces for retrieving the values of extended\n" +" attributes of a file. This command requires attribute names to be specified.\n" +" There are 4 namespace flags:\n" +" -r -- 'root'\n" +" -u -- 'user' (default)\n" +" -s -- 'secure'\n" +" -p -- 'parent'\n" +" -f -- 'fs-verity'\n" +" -Z -- fs property\n" +"\n" )); +} +static void attrset_help (void ) {
@@ -45,10 +69,15 @@ attrset_help(void)" -u -- 'user' (default)\n" " -s -- 'secure'\n" " -p -- 'parent'\n" +" -Z -- fs property\n" "\n" " For attr_set, these options further define the type of set operation:\n" " -C -- 'create' - create attribute, fail if it already exists\n" " -R -- 'replace' - replace attribute, fail if it does not exist\n" +"\n" +" If the attribute value is a string, it can be specified after the\n" +" attribute name.\n" +"\n" " The backward compatibility mode 'noattr2' can be emulated (-n) also.\n" "\n")); }
@@ -59,6 +88,7 @@ attrset_init(void)if (!expert_mode)return ; +add_command (&attr_get_cmd);add_command (&attr_set_cmd);add_command (&attr_remove_cmd); }
@@ -106,6 +136,57 @@ get_buf_from_file( LIBXFS_ATTR_ROOT | \ LIBXFS_ATTR_PARENT) +static bool +adjust_fsprop_attr_name ( +struct xfs_da_args *args, +bool *free_name) +{ +const char *o = args->name; +char *p; +int ret; + +if ((args->attr_filter &LIBXFS_ATTR_NS ) !=LIBXFS_ATTR_ROOT ) { +dbprintf (_ ("fs properties must be ATTR_ROOT\n" )); +return false; + } + + ret =fsprop_name_to_attr_name (o, &p); +if (ret <0 ) { +dbprintf (_ ("could not allocate fs property name string\n" )); +return false; + } + args->namelen = ret; + args->name = p; + +if (*free_name) +free ((void *)o); + *free_name = true; + +if (args->namelen >MAXNAMELEN ) { +dbprintf (_ ("%s: name too long\n" ), args->name); +return false; + } + +if (args->valuelen >ATTR_MAX_VALUELEN ) { +dbprintf (_ ("%s: value too long\n" ), args->name); +return false; + } + +return true; +} + +static void +print_fsprop ( +struct xfs_da_args *args) +{ +const char *p =attr_name_to_fsprop_name (args->name); + +if (p) +printf ("%s=%.*s\n" , p, args->valuelen, (char *)args->value); +else +fprintf (stderr,_ ("%s: not a fs property?\n" ), args->name); +} + static int attr_set_f( int argc,
@@ -119,7 +200,9 @@ attr_set_f(char *sp;char *name_from_file =NULL ;char *value_from_file =NULL ; +bool free_name = false;enum xfs_attr_update op =XFS_ATTRUPDATE_UPSERT ; +bool fsprop = false;int c;int error;
@@ -132,9 +215,12 @@ attr_set_f(return 0 ; } -while ((c =getopt (argc, argv,"ruspCRnN:v:V:" )) !=EOF ) { +while ((c =getopt (argc, argv,"ruspCRnN:v:V:Z" )) !=EOF ) {switch (c) {/* namespaces */ +case 'Z' : + fsprop = true; + fallthrough;case 'r' : args.attr_filter &= ~LIBXFS_ATTR_NS ; args.attr_filter |=LIBXFS_ATTR_ROOT ;
@@ -213,9 +299,10 @@ attr_set_f(if (!args.name)return 0 ; + free_name = true; args.namelen = namelen; }else { -if (optind != argc -1 ) { +if (optind != argc -1 && optind != argc -2 ) {dbprintf (_ ("too few options for attr_set (no name given)\n" ));return 0 ; }
@@ -250,6 +337,25 @@ attr_set_f( goto out; }memset (args.value,'v' , args.valuelen); + }else if (optind == argc -2 ) { + args.valuelen =strlen (argv[optind +1 ]); + args.value =strdup (argv[optind +1 ]); +if (!args.value) { +dbprintf (_ ("cannot allocate buffer (%d)\n" ), + args.valuelen); + goto out; + } + } + +if (fsprop) { +if (!fsprop_validate (args.name, args.value)) { +dbprintf (_ ("%s: invalid value \"%s\"\n" ), + args.name, args.value); + goto out; + } + +if (!adjust_fsprop_attr_name (&args, &free_name)) + goto out; }if (libxfs_iget (mp,NULL , iocur_top->ino,0 , &args.dp)) {
@@ -269,6 +375,9 @@ attr_set_f( goto out; } +if (fsprop) +print_fsprop (&args); +/* refresh with updated inode contents */ set_cur_inode (iocur_top->ino);
@@ -277,7 +386,7 @@ attr_set_f(libxfs_irele (args.dp);if (args.value)free (args.value); -if (name_from_file) +if (free_name)free ((void *)args.name);return 0 ; }
@@ -293,6 +402,8 @@ attr_remove_f( .op_flags = XFS_DA_OP_OKNOENT, };char *name_from_file =NULL ; +bool free_name = false; +bool fsprop = false;int c;int error;
@@ -305,9 +416,12 @@ attr_remove_f(return 0 ; } -while ((c =getopt (argc, argv,"ruspnN:" )) !=EOF ) { +while ((c =getopt (argc, argv,"ruspnN:Z" )) !=EOF ) {switch (c) {/* namespaces */ +case 'Z' : + fsprop = true; + fallthrough;case 'r' : args.attr_filter &= ~LIBXFS_ATTR_NS ; args.attr_filter |=LIBXFS_ATTR_ROOT ;
@@ -354,6 +468,7 @@ attr_remove_f(if (!args.name)return 0 ; + free_name = true; args.namelen = namelen; }else {if (optind != argc -1 ) {
@@ -374,6 +489,9 @@ attr_remove_f( } } +if (fsprop && !adjust_fsprop_attr_name (&args, &free_name)) + goto out; +if (libxfs_iget (mp,NULL , iocur_top->ino,0 , &args.dp)) {dbprintf (_ ("failed to iget inode %llu\n" ), (unsigned long long )iocur_top->ino);
@@ -398,7 +516,137 @@ attr_remove_f( out:if (args.dp)libxfs_irele (args.dp); -if (name_from_file) +if (free_name) +free ((void *)args.name); +return 0 ; +} + +static int +attr_get_f ( +int argc, +char **argv) +{ +struct xfs_da_args args = { + .geo = mp->m_attr_geo, + .whichfork =XFS_ATTR_FORK , + .op_flags =XFS_DA_OP_OKNOENT , + }; +char *name_from_file =NULL ; +bool free_name = false; +bool fsprop = false; +int c; +int error; + +if (cur_typ ==NULL ) { +dbprintf (_ ("no current type\n" )); +return 0 ; + } +if (cur_typ->typnm !=TYP_INODE ) { +dbprintf (_ ("current type is not inode\n" )); +return 0 ; + } + +while ((c =getopt (argc, argv,"ruspN:Z" )) !=EOF ) { +switch (c) { +/* namespaces */ +case 'Z' : + fsprop = true; + fallthrough; +case 'r' : + args.attr_filter &= ~LIBXFS_ATTR_NS ; + args.attr_filter |=LIBXFS_ATTR_ROOT ; +break ; +case 'u' : + args.attr_filter &= ~LIBXFS_ATTR_NS ; +break ; +case 's' : + args.attr_filter &= ~LIBXFS_ATTR_NS ; + args.attr_filter |=LIBXFS_ATTR_SECURE ; +break ; +case 'p' : + args.attr_filter &= ~LIBXFS_ATTR_NS ; + args.attr_filter |=XFS_ATTR_PARENT ; +break ; + +case 'N' : + name_from_file = optarg; +break ; +default : +dbprintf (_ ("bad option for attr_get command\n" )); +return 0 ; + } + } + +if (name_from_file) { +int namelen; + +if (optind != argc) { +dbprintf (_ ("too many options for attr_get (no name needed)\n" )); +return 0 ; + } + + args.name =get_buf_from_file (name_from_file,MAXNAMELEN , + &namelen); +if (!args.name) +return 0 ; + + free_name = true; + args.namelen = namelen; + }else { +if (optind != argc -1 ) { +dbprintf (_ ("too few options for attr_get (no name given)\n" )); +return 0 ; + } + + args.name = (const unsigned char *)argv[optind]; +if (!args.name) { +dbprintf (_ ("invalid name\n" )); +return 0 ; + } + + args.namelen =strlen (argv[optind]); +if (args.namelen >=MAXNAMELEN ) { +dbprintf (_ ("name too long\n" )); + goto out; + } + } + +if (libxfs_iget (mp,NULL , iocur_top->ino,0 , &args.dp)) { +dbprintf (_ ("failed to iget inode %llu\n" ), + (unsigned long long )iocur_top->ino); + goto out; + } + +if (fsprop && !adjust_fsprop_attr_name (&args, &free_name)) + goto out; + + args.owner = iocur_top->ino; +libxfs_attr_sethash (&args); + +/* +* Look up attr value with a maximally long length and a null buffer +* to return the value and the correct length. +*/ + args.valuelen =XATTR_SIZE_MAX ; + error = -libxfs_attr_get (&args); +if (error) { +dbprintf (_ ("failed to get attr %s on inode %llu: %s\n" ), + args.name, (unsigned long long )iocur_top->ino, +strerror (error)); + goto out; + } + +if (fsprop) +print_fsprop (&args); +else +printf ("%.*s\n" , args.valuelen, (char *)args.value); + +out: +if (args.dp) +libxfs_irele (args.dp); +if (args.value) +free (args.value); +if (free_name)free ((void *)args.name);return 0 ; }
man/man8/xfs_db.8 +38 -2
@@ -184,7 +184,35 @@ Displays the length, free block count, per-AG reservation size, and per-AG reservation usage for a given AG. If no argument is given, display information for all AGs. .TP -.BI "attr_remove [\-p|\-r|\-u|\-s] [\-n] [\-N " namefile "|" name "] " +.BI "attr_get [\-p|\-r|\-u|\-s|\-Z] [\-N " namefile "|" name "] " +Print the value of the specified extended attribute from the current file. +.RS 1.0i +.TP 0.4i +.B \-p +Sets the attribute in the parent namespace. +Only one namespace option can be specified. +.TP +.B \-r +Sets the attribute in the root namespace. +Only one namespace option can be specified. +.TP +.B \-u +Sets the attribute in the user namespace. +Only one namespace option can be specified. +.TP +.B \-s +Sets the attribute in the secure namespace. +Only one namespace option can be specified. +.TP +.B \-Z +Sets a filesystem property in the root namespace. +Only one namespace option can be specified. +.TP +.B \-N +Read the name from this file. +.RE +.TP +.BI "attr_remove [\-p|\-r|\-u|\-s|\-Z] [\-n] [\-N " namefile "|" name "] " Remove the specified extended attribute from the current file. .RS 1.0i .TP 0.4i
@@ -204,6 +232,10 @@ Only one namespace option can be specified. Sets the attribute in the secure namespace. Only one namespace option can be specified. .TP +.B \-Z +Sets a filesystem property in the root namespace. +Only one namespace option can be specified. +.TP .B \-N Read the name from this file. .TP
@@ -211,7 +243,7 @@ Read the name from this file. Do not enable 'noattr2' mode on V4 filesystems. .RE .TP -.BI "attr_set [\-p\-r|\-u|\-s] [\-n] [\-R|\-C] [\-v " valuelen "|\-V " valuefile "] [\-N " namefile "|" name "] " +.BI "attr_set [\-p\-r|\-u|\-s|\-Z] [\-n] [\-R|\-C] [\-v " valuelen "|\-V " valuefile "] [\-N " namefile "|" name "] [" value "]" Sets an extended attribute on the current file with the given name. .RS 1.0i .TP 0.4i
@@ -231,6 +263,10 @@ Only one namespace option can be specified. Sets the attribute in the secure namespace. Only one namespace option can be specified. .TP +.B \-Z +Sets a filesystem property in the root namespace. +Only one namespace option can be specified. +.TP .B \-N Read the name from this file. .TP
Re: [PATCH 3/7] xfs_db: improve getting and setting extended attributes
db/attrset.c line 26
Quoted 5 lines
db/attrset.c +2
-0+static int attr_get_f (int argc,char **argv);static int attr_set_f (int argc,char **argv);static int attr_remove_f (int argc,char **argv); +static void attrget_help (void );static void attrset_help (void );
I always hate these forward declarations, but I guess it matches the existing code..
Otherwise looks good:
PATCH 4/7 libxfs: hoist listxattr from xfs_repair
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Hoist the listxattr code from xfs_repair so that we can use it in xfs_db.
--- libxfs/Makefile | 2 ++ libxfs/listxattr.c | 2 +- libxfs/listxattr.h | 6 +++--- repair/Makefile | 2 -- repair/pptr.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) rename repair/listxattr.c => libxfs/listxattr.c (99%) rename repair/listxattr.h => libxfs/listxattr.h (81%)
libxfs/Makefile +2 -0
@@ -23,6 +23,7 @@ HFILES = \ defer_item.h \ libxfs_io.h \ libxfs_api_defs.h \ + listxattr.h \ init.h \ libxfs_priv.h \ linux-err.h \
@@ -69,6 +70,7 @@ CFILES = buf_mem.c \ defer_item.c \ init.c \ kmem.c \ + listxattr.c \ logitem.c \ rdwr.c \ topology.c \
libxfs/listxattr.c renamed from repair/listxattr.c +1 -1
@@ -6,7 +6,7 @@#include "libxfs.h" #include "libxlog.h" #include "libfrog/bitmap.h" -#include "repair/listxattr.h" +#include "listxattr.h" /* Call a function for every entry in a shortform xattr structure. */ STATIC int
libxfs/listxattr.h renamed from repair/listxattr.h +3 -3
@@ -3,8 +3,8 @@* Copyright (c) 2022-2024 Oracle. All Rights Reserved. * Author: Darrick J. Wong <[email protected]> */ -#ifndef __REPAIR_LISTXATTR_H__ -#define __REPAIR_LISTXATTR_H__ +#ifndef __LIBXFS_LISTXATTR_H__ +#define __LIBXFS_LISTXATTR_H__ typedef int (*xattr_walk_fn)(struct xfs_inode *ip, unsigned int attr_flags, const unsigned char *name, unsigned int namelen,
@@ -12,4 +12,4 @@ typedef int (*xattr_walk_fn)(struct xfs_inode *ip, unsigned int attr_flags,int xattr_walk (struct xfs_inode *ip,xattr_walk_fn attr_fn,void *priv); -#endif /* __REPAIR_LISTXATTR_H__ */ +#endif /* __LIBXFS_LISTXATTR_H__ */
repair/Makefile +0 -2
@@ -24,7 +24,6 @@ HFILES = \ err_protos.h \ globals.h \ incore.h \ - listxattr.h \ pptr.h \ prefetch.h \ progress.h \
@@ -59,7 +58,6 @@ CFILES = \ incore_ext.c \ incore_ino.c \ init.c \ - listxattr.c \ phase1.c \ phase2.c \ phase3.c \
repair/pptr.c +1 -1
@@ -11,7 +11,7 @@#include "repair/globals.h" #include "repair/err_protos.h" #include "repair/slab.h" -#include "repair/listxattr.h" +#include "libxfs/listxattr.h" #include "repair/threads.h" #include "repair/incore.h" #include "repair/pptr.h"
Re: [PATCH 4/7] libxfs: hoist listxattr from xfs_repair
Quoted 4 lines · Darrick J. Wong
From: Darrick J. Wong <[email protected]>
Hoist the listxattr code from
xfs_repairso that we can use it inxfs_db.
I guess there isn't much of a point in sharing with the kernel listattr code?
But maybe that is for later, for now this trivial move looks good:
Re: [PATCH 4/7] libxfs: hoist listxattr from xfs_repair
Quoted 10 lines · Christoph Hellwig
Quoted 4 lines · Darrick J. Wong
From: Darrick J. Wong <[email protected]>
Hoist the listxattr code from
xfs_repairso that we can use it inxfs_db.I guess there isn't much of a point in sharing with the kernel listattr code?
But maybe that is for later, for now this trivial move looks good:
I think we could do it. The major difference between the two is the prefix we use for the dabno "have I seen this block before?" bitmap functions. But that and the scrub/listxattr.c code would both have to be lifted to libxfs, and as long as we're doing that we might as well clean up the userspace bitmap implementation.
(IOWs that's a somewhat lengthy cleanup for userspace either for after we get the rt modernization stuff merged or if we get really bored sitting in meetings.)
Quoted 1 line
Reviewed-by Christoph Hellwig <[email protected]>
Thank you!
--D
PATCH 5/7 libxfs: pass a transaction context through listxattr
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Pass a transaction context so that a new caller can walk the attr names and query the values all in one go without deadlocking on nested buffer access.
While we're at it, make the existing xfs_repair callers try to use empty transactions so that we don't deadlock on cycles in the xattr structure.
--- libxfs/listxattr.c | 40 +++++++++++++++++++++++----------------- libxfs/listxattr.h | 6 ++++-- repair/pptr.c | 7 ++++++- 3 files changed, 33 insertions(+), 20 deletions(-)
libxfs/listxattr.c +23 -17
@@ -11,6 +11,7 @@/* Call a function for every entry in a shortform xattr structure. */ STATIC intxattr_walk_sf ( +struct xfs_trans *tp,struct xfs_inode *ip,xattr_walk_fn attr_fn,void *priv)
@@ -22,7 +23,7 @@ xattr_walk_sf( sfe =libxfs_attr_sf_firstentry (hdr);for (i =0 ; i < hdr->count; i++) { - error =attr_fn (ip, sfe->flags, sfe->nameval, sfe->namelen, + error =attr_fn (tp, ip, sfe->flags, sfe->nameval, sfe->namelen, &sfe->nameval[sfe->namelen], sfe->valuelen, priv);if (error)
@@ -37,6 +38,7 @@ xattr_walk_sf(/* Call a function for every entry in this xattr leaf block. */ STATIC int xattr_walk_leaf_entries( + struct xfs_trans *tp, struct xfs_inode *ip, xattr_walk_fn attr_fn, struct xfs_buf *bp,
@@ -75,7 +77,7 @@ xattr_walk_leaf_entries( valuelen =be32_to_cpu (name_rmt->valuelen); } - error =attr_fn (ip, entry->flags, name, namelen, value, + error =attr_fn (tp, ip, entry->flags, name, namelen, value, valuelen, priv);if (error)return error;
@@ -91,6 +93,7 @@ xattr_walk_leaf_entries(*/ STATIC intxattr_walk_leaf ( +struct xfs_trans *tp,struct xfs_inode *ip,xattr_walk_fn attr_fn,void *priv)
@@ -98,18 +101,19 @@ xattr_walk_leaf(struct xfs_buf *leaf_bp;int error; - error = -libxfs_attr3_leaf_read (NULL , ip, ip->i_ino,0 , &leaf_bp); + error = -libxfs_attr3_leaf_read (tp, ip, ip->i_ino,0 , &leaf_bp);if (error)return error; - error =xattr_walk_leaf_entries (ip, attr_fn, leaf_bp, priv); -libxfs_trans_brelse (NULL , leaf_bp); + error =xattr_walk_leaf_entries (tp, ip, attr_fn, leaf_bp, priv); +libxfs_trans_brelse (tp, leaf_bp);return error; }/* Find the leftmost leaf in the xattr dabtree. */ STATIC intxattr_walk_find_leftmost_leaf ( +struct xfs_trans *tp,struct xfs_inode *ip,struct bitmap *seen_blocks,struct xfs_buf **leaf_bpp)
@@ -127,7 +131,7 @@ xattr_walk_find_leftmost_leaf(for (;;) {uint16_t magic; - error = -libxfs_da3_node_read (NULL , ip, blkno, &bp, + error = -libxfs_da3_node_read (tp, ip, blkno, &bp,XFS_ATTR_FORK );if (error)return error;
@@ -164,7 +168,7 @@ xattr_walk_find_leftmost_leaf(/* Find the next level towards the leaves of the dabtree. */ btree = nodehdr.btree; blkno =be32_to_cpu (btree->before); -libxfs_trans_brelse (NULL , bp); +libxfs_trans_brelse (tp, bp);/* Make sure we haven't seen this new block already. */ if (bitmap_test (seen_blocks, blkno,1 ))
@@ -184,13 +188,14 @@ xattr_walk_find_leftmost_leaf(return 0 ; out_buf: -libxfs_trans_brelse (NULL , bp); +libxfs_trans_brelse (tp, bp);return error; }/* Call a function for every entry in a node-format xattr structure. */ STATIC intxattr_walk_node ( +struct xfs_trans *tp,struct xfs_inode *ip,xattr_walk_fn attr_fn,void *priv)
@@ -204,12 +209,12 @@ xattr_walk_node(bitmap_alloc (&seen_blocks); - error =xattr_walk_find_leftmost_leaf (ip, seen_blocks, &leaf_bp); + error =xattr_walk_find_leftmost_leaf (tp, ip, seen_blocks, &leaf_bp);if (error) goto out_bitmap;for (;;) { - error =xattr_walk_leaf_entries (ip, attr_fn, leaf_bp, + error =xattr_walk_leaf_entries (tp, ip, attr_fn, leaf_bp, priv);if (error) goto out_leaf;
@@ -220,13 +225,13 @@ xattr_walk_node(if (leafhdr.forw ==0 ) goto out_leaf; -libxfs_trans_brelse (NULL , leaf_bp); +libxfs_trans_brelse (tp, leaf_bp);/* Make sure we haven't seen this new leaf already. */ if (bitmap_test (seen_blocks, leafhdr.forw,1 )) goto out_bitmap; - error = -libxfs_attr3_leaf_read (NULL , ip, ip->i_ino, + error = -libxfs_attr3_leaf_read (tp, ip, ip->i_ino, leafhdr.forw, &leaf_bp);if (error) goto out_bitmap;
@@ -238,7 +243,7 @@ xattr_walk_node( } out_leaf: -libxfs_trans_brelse (NULL , leaf_bp); +libxfs_trans_brelse (tp, leaf_bp); out_bitmap:bitmap_free (&seen_blocks);return error;
@@ -247,6 +252,7 @@ xattr_walk_node(/* Call a function for every extended attribute in a file. */ int xattr_walk ( +struct xfs_trans *tp,struct xfs_inode *ip,xattr_walk_fn attr_fn,void *priv)
@@ -257,15 +263,15 @@ xattr_walk(return 0 ;if (ip->i_af.if_format ==XFS_DINODE_FMT_LOCAL ) -return xattr_walk_sf (ip, attr_fn, priv); +return xattr_walk_sf (tp, ip, attr_fn, priv);/* attr functions require that the attr fork is loaded */ - error = -libxfs_iread_extents (NULL , ip,XFS_ATTR_FORK ); + error = -libxfs_iread_extents (tp, ip,XFS_ATTR_FORK );if (error)return error;if (libxfs_attr_is_leaf (ip)) -return xattr_walk_leaf (ip, attr_fn, priv); +return xattr_walk_leaf (tp, ip, attr_fn, priv); -return xattr_walk_node (ip, attr_fn, priv); +return xattr_walk_node (tp, ip, attr_fn, priv); }
libxfs/listxattr.h +4 -2
@@ -6,10 +6,12 @@#ifndef __LIBXFS_LISTXATTR_H__#define __LIBXFS_LISTXATTR_H__ -typedef int (*xattr_walk_fn )(struct xfs_inode *ip,unsigned int attr_flags, +typedef int (*xattr_walk_fn )(struct xfs_trans *tp,struct xfs_inode *ip, +unsigned int attr_flags,const unsigned char *name,unsigned int namelen,const void *value,unsigned int valuelen,void *priv); -int xattr_walk (struct xfs_inode *ip,xattr_walk_fn attr_fn,void *priv); +int xattr_walk (struct xfs_trans *tp,struct xfs_inode *ip, +xattr_walk_fn attr_fn,void *priv);#endif /* __LIBXFS_LISTXATTR_H__ */
repair/pptr.c +6 -1
@@ -593,6 +593,7 @@ store_file_pptr_name(/* Decide if this is a directory parent pointer and stash it if so. */ static int examine_xattr( + struct xfs_trans *tp, struct xfs_inode *ip, unsigned int attr_flags, const unsigned char *name,
@@ -1205,6 +1206,7 @@ check_file_parent_ptrs(struct xfs_inode *ip, struct file_scan *fscan) { + struct xfs_trans *tp = NULL;int error; error = -init_slab (&fscan->file_pptr_recs,sizeof (struct file_pptr ));
@@ -1215,7 +1217,10 @@ check_file_parent_ptrs( fscan->have_garbage = false; fscan->nr_file_pptrs =0 ; - error =xattr_walk (ip, examine_xattr, fscan); +libxfs_trans_alloc_empty (ip->i_mount, &tp); + error =xattr_walk (tp, ip, examine_xattr, fscan); +if (tp) +libxfs_trans_cancel (tp);if (error && !no_modify) do_error(_("ino %llu parent pointer scan failed: %s\n"), (unsigned long long)ip->i_ino,
Re: [PATCH 5/7] libxfs: pass a transaction context through listxattr
Looks good:
PATCH 6/7 xfs_db: add a command to list xattrs
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Add a command to list extended attributes from xfs_db. We'll need this later to manage the fs properties when unmounted.
--- db/attrset.c | 201 +++++++++++++++++++++++++++++++++++++++++++++++++++++ man/man8/xfs_db.8 | 28 +++++++ 2 files changed, 229 insertions(+)
db/attrset.c +201 -0
@@ -18,13 +18,21 @@#include "malloc.h" #include <sys/xattr.h> #include "libfrog/fsproperties.h" +#include "libxfs/listxattr.h" +static int attr_list_f (int argc,char **argv);static int attr_get_f (int argc,char **argv);static int attr_set_f (int argc,char **argv);static int attr_remove_f (int argc,char **argv); + +static void attrlist_help (void );static void attrget_help (void );static void attrset_help (void ); +static const cmdinfo_t attr_list_cmd = + {"attr_list" ,"alist" , attr_list_f,0 ,-1 ,0 , +N_ ("[-r|-s|-u|-p|-Z] [-v]" ), +N_ ("list attributes on the current inode" ), attrlist_help };static const cmdinfo_t attr_get_cmd = {"attr_get" ,"aget" , attr_get_f,1 ,-1 ,0 ,N_ ("[-r|-s|-u|-p|-Z] name" ),
@@ -38,6 +46,24 @@ static const cmdinfo_t attr_remove_cmd =N_ ("[-r|-s|-u|-p|-Z] [-n] name" ), N_("remove the named attribute from the current inode"), attrset_help }; +static void +attrlist_help (void ) +{ +dbprintf (_ ( +"\n" +" The attr_list command provide interfaces for listing all extended attributes\n" +" attached to an inode.\n" +" There are 4 namespace flags:\n" +" -r -- 'root'\n" +" -u -- 'user' (default)\n" +" -s -- 'secure'\n" +" -p -- 'parent'\n" +" -Z -- fs property\n" +"\n" +" -v -- print the value of the attributes\n" +"\n" )); +} +static void attrget_help (void ) {
@@ -88,6 +114,7 @@ attrset_init(void)if (!expert_mode)return ; +add_command (&attr_list_cmd);add_command (&attr_get_cmd);add_command (&attr_set_cmd);add_command (&attr_remove_cmd);
@@ -650,3 +677,177 @@ attr_get_f(free ((void *)args.name);return 0 ; } + +struct attrlist_ctx { +unsigned int attr_filter; +bool print_values; +bool fsprop; +}; + +static int +attrlist_print ( +struct xfs_trans *tp, +struct xfs_inode *ip, +unsigned int attr_flags, +const unsigned char *name, +unsigned int namelen, +const void *value, +unsigned int valuelen, +void *priv) +{ +struct attrlist_ctx *ctx = priv; +struct xfs_da_args args = { + .geo = mp->m_attr_geo, + .whichfork =XFS_ATTR_FORK , + .op_flags =XFS_DA_OP_OKNOENT , + .dp = ip, + .owner = ip->i_ino, + .trans = tp, + .attr_filter = attr_flags &XFS_ATTR_NSP_ONDISK_MASK , + .name = name, + .namelen = namelen, + }; +char namebuf[MAXNAMELEN +1 ]; +const char *print_name = namebuf; +int error; + +if ((attr_flags &XFS_ATTR_NSP_ONDISK_MASK ) != ctx->attr_filter) +return 0 ; + +/* Make sure the name is null terminated. */ +memcpy (namebuf, name, namelen); + namebuf[MAXNAMELEN ] =0 ; + +if (ctx->fsprop) { +const char *p =attr_name_to_fsprop_name (namebuf); + +if (!p) +return 0 ; + + namelen -= (p - namebuf); + print_name = p; + } + +if (!ctx->print_values) { +printf ("%.*s\n" , namelen, print_name); +return 0 ; + } + +if (value) { +printf ("%.*s=%.*s\n" , namelen, print_name, valuelen, + (char *)value); +return 0 ; + } + +libxfs_attr_sethash (&args); + +/* +* Look up attr value with a maximally long length and a null buffer +* to return the value and the correct length. +*/ + args.valuelen =XATTR_SIZE_MAX ; + error = -libxfs_attr_get (&args); +if (error) { +dbprintf (_ ("failed to get attr %s on inode %llu: %s\n" ), + args.name, (unsigned long long )iocur_top->ino, +strerror (error)); +return error; + } + +printf ("%.*s=%.*s\n" , namelen, print_name, args.valuelen, + (char *)args.value); +kfree (args.value); + +return 0 ; +} + +static int +attr_list_f ( +int argc, +char **argv) +{ +struct attrlist_ctx ctx = { }; +struct xfs_trans *tp; +struct xfs_inode *ip; +int c; +int error; + +if (cur_typ ==NULL ) { +dbprintf (_ ("no current type\n" )); +return 0 ; + } +if (cur_typ->typnm !=TYP_INODE ) { +dbprintf (_ ("current type is not inode\n" )); +return 0 ; + } + +while ((c =getopt (argc, argv,"ruspvZ" )) !=EOF ) { +switch (c) { +/* namespaces */ +case 'Z' : + ctx.fsprop = true; + fallthrough; +case 'r' : + ctx.attr_filter &= ~LIBXFS_ATTR_NS ; + ctx.attr_filter |=LIBXFS_ATTR_ROOT ; +break ; +case 'u' : + ctx.attr_filter &= ~LIBXFS_ATTR_NS ; +break ; +case 's' : + ctx.attr_filter &= ~LIBXFS_ATTR_NS ; + ctx.attr_filter |=LIBXFS_ATTR_SECURE ; +break ; +case 'p' : + ctx.attr_filter &= ~LIBXFS_ATTR_NS ; + ctx.attr_filter |=XFS_ATTR_PARENT ; +break ; + +case 'v' : + ctx.print_values = true; +break ; +default : +dbprintf (_ ("bad option for attr_list command\n" )); +return 0 ; + } + } + +if (ctx.fsprop && + (ctx.attr_filter &LIBXFS_ATTR_NS ) !=LIBXFS_ATTR_ROOT ) { +dbprintf (_ ("fs properties must be ATTR_ROOT\n" )); +return false; + } + +if (optind != argc) { +dbprintf (_ ("too many options for attr_list (no name needed)\n" )); +return 0 ; + } + + error = -libxfs_trans_alloc_empty (mp, &tp); +if (error) { +dbprintf (_ ("failed to allocate empty transaction\n" )); +return 0 ; + } + + error = -libxfs_iget (mp,NULL , iocur_top->ino,0 , &ip); +if (error) { +dbprintf (_ ("failed to iget inode %llu: %s\n" ), + (unsigned long long )iocur_top->ino, +strerror (error)); + goto out_trans; + } + + error =xattr_walk (tp, ip, attrlist_print, &ctx); +if (error) { +dbprintf (_ ("walking inode %llu xattrs: %s\n" ), + (unsigned long long )iocur_top->ino, +strerror (error)); + goto out_inode; + } + +out_inode: +libxfs_irele (ip); +out_trans: +libxfs_trans_cancel (tp); +return 0 ; +}
man/man8/xfs_db.8 +28 -0
@@ -212,6 +212,34 @@ Only one namespace option can be specified. Read the name from this file. .RE .TP +.BI "attr_list [\-p|\-r|\-u|\-s|\-Z] [\-v] " +Lists the extended attributes of the current file. +.RS 1.0i +.TP 0.4i +.B \-p +Sets the attribute in the parent namespace. +Only one namespace option can be specified. +.TP +.B \-r +Sets the attribute in the root namespace. +Only one namespace option can be specified. +.TP +.B \-u +Sets the attribute in the user namespace. +Only one namespace option can be specified. +.TP +.B \-s +Sets the attribute in the secure namespace. +Only one namespace option can be specified. +.TP +.B \-Z +Sets a filesystem property in the root namespace. +Only one namespace option can be specified. +.TP +.B \-v +Print the extended attribute values too. +.RE +.TP .BI "attr_remove [\-p|\-r|\-u|\-s|\-Z] [\-n] [\-N " namefile "|" name "] " Remove the specified extended attribute from the current file. .RS 1.0i
Re: [PATCH 6/7] xfs_db: add a command to list xattrs
Looks good:
PATCH 7/7 xfs_property: add a new tool to administer fs properties
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Create a tool to list, get, set, and remove filesystem properties.
--- man/man8/xfs_property.8 | 52 ++++++++++++++++++++++++++++++++ spaceman/Makefile | 3 +- spaceman/xfs_property | 77 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 131 insertions(+), 1 deletion(-) create mode 100644 man/man8/xfs_property.8 create mode 100755 spaceman/xfs_property
man/man8/xfs_property.8 new file +52 -0
@@ -0,0 +1,52 @@ +.TH xfs_property 8 +.SH NAME +xfs_property \- examine and edit properties about an XFS filesystem +.SH SYNOPSIS +.B xfs_property +.I target +.B get +.IR name ... +.br +.B xfs_property +.I target +.B list [ \-v ] +.br +.B xfs_property +.I target +.B set +.IR name=value ... +.br +.B xfs_property +.I target +.B remove +.IR name ... +.br +.B xfs_property \-V +.SH DESCRIPTION +.B xfs_property +retrieves, lists, sets, or removes properties of an XFS filesystem. +Filesystem properties are root-controlled attributes set on the root directory +of the filesystem to enable the system administrator to coordinate with +userspace programs. + +.SH COMMANDS +.TP +.B get +.IR name ... +Prints the values of the given filesystem properties. +.TP +.B list +Lists the names of all filesystem properties. +If the +.B -v +flag is specified, prints the values as well. +.TP +.B set +.IR name = value ... +Sets the given filesystem properties to the specified values and prints what +was set. +.TP +.B +remove +.IR name ... +Unsets the given filesystem properties.
spaceman/Makefile +2 -1
@@ -16,7 +16,7 @@ CFILES = \ init.c \ prealloc.c \ trim.c -LSRCFILES = xfs_info.sh +LSRCFILES = xfs_info.sh xfs_property LLDLIBS = $(LIBHANDLE) $(LIBXCMD) $(LIBFROG) LTDEPENDENCIES = $(LIBHANDLE) $(LIBXCMD) $(LIBFROG)
@@ -42,6 +42,7 @@ install: default $(INSTALL) -m 755 -d $(PKG_SBIN_DIR) $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR) $(INSTALL) -m 755 xfs_info.sh $(PKG_SBIN_DIR)/xfs_info + $(INSTALL) -m 755 xfs_property $(PKG_SBIN_DIR)/xfs_property install-dev: -include .dep
spaceman/xfs_property new file +77 -0
77 lines not on this page · raw message
Re: [PATCH 7/7] xfs_property: add a new tool to administer fs properties
Quoted 3 lines · Darrick J. Wong
From: Darrick J. Wong <[email protected]>
Create a tool to list, get, set, and remove filesystem properties.
Ok, so this wraps spaceman. Can we make the property manipulation only available through this interface to cause less confusion?
Re: [PATCH 7/7] xfs_property: add a new tool to administer fs properties
Quoted 7 lines · Christoph Hellwig
Quoted 3 lines · Darrick J. Wong
From: Darrick J. Wong <[email protected]>
Create a tool to list, get, set, and remove filesystem properties.
Ok, so this wraps spaceman. Can we make the property manipulation only available through this interface to cause less confusion?
I think you're asking if I could make xfs_spaceman expose the {list,get,set}fsprops commands and db expose the -Z flag to attr_{get,set,list} when someone starts them up with -p xfs_property ?
If so, then yes, I can do that.
--D
Re: [PATCH 7/7] xfs_property: add a new tool to administer fs properties
Quoted 3 lines · Darrick J. Wong
I think you're asking if I could make
xfs_spacemanexpose the {list,get,set}fsprops commands and db expose the -Z flag to attr_{get,set,list} when someone starts them up with -pxfs_property?
I was mostly concerned about spaceman. I don't think it actually is so bad, just a bit confusing. But if we do xfs_io and xfs_db that's not really an issue anyway.
Re: [PATCH 7/7] xfs_property: add a new tool to administer fs properties
Quoted 8 lines · Christoph Hellwig
Quoted 3 lines · Darrick J. Wong
I think you're asking if I could make
xfs_spacemanexpose the {list,get,set}fsprops commands and db expose the -Z flag to attr_{get,set,list} when someone starts them up with -pxfs_property?I was mostly concerned about spaceman. I don't think it actually is so bad, just a bit confusing. But if we do
xfs_ioandxfs_dbthat's not really an issue anyway.
Fair 'enough. I'll see about switching spaceman -> io today.
--D
Re: [PATCH 7/7] xfs_property: add a new tool to administer fs properties
In reply to Darrick J. WongQuoted 4 lines · Darrick J. Wong
From: Darrick J. Wong <[email protected]>
Create a tool to list, get, set, and remove filesystem properties.
Quoted 8 lines
Signed-off-by Darrick J. Wong <[email protected]>--- man/man8/xfs_property.8 | 52 ++++++++++++++++++++++++++++++++ spaceman/Makefile | 3 +- spaceman/xfs_property | 77 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 131 insertions(+), 1 deletion(-) create mode 100644 man/man8/xfs_property.8 create mode 100755 spaceman/xfs_property
Ah, there's the admin wrapper. :)
I should have read the whole patch set before commenting.
Quoted 48 lines
man/man8/xfs_property.8 new file +42
-0@@ -0,0 +1,52 @@ +.TH xfs_property 8 +.SH NAME +xfs_property \- examine and edit properties about an XFS filesystem +.SH SYNOPSIS +.B xfs_property +.I target +.B get +.IR name ... +.br +.B xfs_property +.I target +.B list [ \-v ] +.br +.B xfs_property +.I target +.B set +.IR name=value ... +.br +.B xfs_property +.I target +.B remove +.IR name ... +.br +.B xfs_property \-V +.SH DESCRIPTION +.B xfs_property +retrieves, lists, sets, or removes properties of an XFS filesystem. +Filesystem properties are root-controlled attributes set on the root directory +of the filesystem to enable the system administrator to coordinate with +userspace programs. + +.SH COMMANDS +.TP +.B get +.IR name ... +Prints the values of the given filesystem properties. +.TP +.B list +Lists the names of all filesystem properties. +If the +.B -v +flag is specified, prints the values as well.
man/man8/xfs_property.8 line 52
Quoted 10 lines
man/man8/xfs_property.8 new file +10
-0+.TP +.B set +.IR name = value ... +Sets the given filesystem properties to the specified values and prints what +was set. +.TP +.B +remove +.IR name ... +Unsets the given filesystem properties.
What does the -V option do? It's documented as existing, but not explained.
Otherwise looks fine.
-Dave.
Signature · 2 lines
Dave Chinner [email protected]
PATCH 2/3 xfs_scrub: control of autonomous self healing
In reply to Darrick J. WongHi all,
Now that we have the ability to set per-filesystem properties, teach the background xfs_scrub service to pick up advice from the filesystem that it wants to examine, and pick a mode from that.
If you're going to start using this code, I strongly recommend pulling from my git trees, which are linked below.
This has been running on the djcloud for months with no problems. Enjoy! Comments and questions are, as always, welcome.
--D
xfsprogs git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfsprogs-dev.git/log/?h=self-healing
---
Commits in this patchset:
* libfrog: define a self_healing filesystem property
* xfs_scrub: allow sysadmin to control background scrubs
* mkfs: set self_healing property
--- libfrog/fsproperties.c | 38 +++++++++++++++ libfrog/fsproperties.h | 13 +++++ man/man8/mkfs.xfs.8.in | 6 ++ man/man8/xfs_scrub.8 | 44 +++++++++++++++++ mkfs/lts_4.19.conf | 1 mkfs/lts_5.10.conf | 1 mkfs/lts_5.15.conf | 1 mkfs/lts_5.4.conf | 1 mkfs/lts_6.1.conf | 1 mkfs/lts_6.6.conf | 1 mkfs/xfs_mkfs.c | 122 ++++++++++++++++++++++++++++++++++++++++++++++++ scrub/phase1.c | 81 ++++++++++++++++++++++++++++++++ scrub/xfs_scrub.c | 14 ++++++ scrub/xfs_scrub.h | 7 +++ 14 files changed, 330 insertions(+), 1 deletion(-)
PATCH 1/3 libfrog: define a self_healing filesystem property
From: Darrick J. Wong <[email protected]>
--- libfrog/fsproperties.c | 38 ++++++++++++++++++++++++++++++++++++++ libfrog/fsproperties.h | 13 +++++++++++++ 2 files changed, 51 insertions(+)
libfrog/fsproperties.c +38 -0
@@ -29,11 +29,49 @@ __fsprops_lookup(#define fsprops_lookup (values, value) \ __fsprops_lookup((values), ARRAY_SIZE(values), (value)) +/* Self-healing fs property */ + +static const char *fsprop_self_healing_values[] = { + [FSPROP_SELFHEAL_UNSET ] =NULL , + [FSPROP_SELFHEAL_NONE ] ="none" , + [FSPROP_SELFHEAL_CHECK ] ="check" , + [FSPROP_SELFHEAL_OPTIMIZE ] ="optimize" , + [FSPROP_SELFHEAL_REPAIR ] ="repair" , +}; + +/* Convert the self_healing property enum to a string. */ +const char * +fsprop_write_self_healing ( +enum fsprop_self_healing x) +{ +if (x <=FSPROP_SELFHEAL_UNSET || + x >=ARRAY_SIZE (fsprop_self_healing_values)) +return NULL ; +return fsprop_self_healing_values[x]; +} + +/* +* Turn a self_healing value string into an enumerated value, or _UNSET if it's +* not recognized. +*/ +enum fsprop_self_healing +fsprop_read_self_healing ( +const char *value) +{ +int ret =fsprops_lookup (fsprop_self_healing_values, value); +if (ret <0 ) +return FSPROP_SELFHEAL_UNSET ; +return ret; +} +/* Return true if a fs property name=value tuple is allowed. */ bool fsprop_validate (const char *name,const char *value) { +if (!strcmp (name,FSPROP_SELF_HEALING_NAME )) +return fsprops_lookup (fsprop_self_healing_values, value) >=0 ; +return true; }
libfrog/fsproperties.h +13 -0
@@ -47,4 +47,17 @@ bool fsprop_validate(const char *name, const char *value);/* Specific Filesystem Properties */ +#define FSPROP_SELF_HEALING_NAME "self_healing" + +enum fsprop_self_healing { +FSPROP_SELFHEAL_UNSET =0 ,/* do not set property */ +FSPROP_SELFHEAL_NONE ,/* no background scrubs */ +FSPROP_SELFHEAL_CHECK ,/* allow only background checking */ +FSPROP_SELFHEAL_OPTIMIZE ,/* allow background optimization */ +FSPROP_SELFHEAL_REPAIR ,/* allow background repair & optimization */ +}; + +const char *fsprop_write_self_healing (enum fsprop_self_healing x); +enum fsprop_self_healing fsprop_read_self_healing (const char *value); +#endif /* __LIBFROG_FSPROPERTIES_H__ */
Re: [PATCH 1/3] libfrog: define a self_healing filesystem property
self-healing sounds a little imposterous :)
The code itself looks fine though.
Re: [PATCH 1/3] libfrog: define a self_healing filesystem property
Quoted 1 line · Christoph Hellwig
self-healing sounds a little imposterous :)
Do you have a better suggestion?
"auto_fsck"?
"auto_unf***"? ;)
"background_fsck"?
"background_scrub"?
"patrol_scrub"? <ugh>
Quoted 1 line
The code itself looks fine though.
--D
Re: [PATCH 1/3] libfrog: define a self_healing filesystem property
Quoted 4 lines · Darrick J. Wong
Quoted 1 line · Christoph Hellwig
self-healing sounds a little imposterous :)
Do you have a better suggestion?
Heh. Maybe actually make it to separate ones?auto_scrub and auto_repair?
Re: [PATCH 1/3] libfrog: define a self_healing filesystem property
Quoted 8 lines · Christoph Hellwig
Quoted 4 lines · Darrick J. Wong
Quoted 1 line · Christoph Hellwig
self-healing sounds a little imposterous :)
Do you have a better suggestion?
Heh. Maybe actually make it to separate ones?
auto_scrubandauto_repair?
I don't want multiple attributes because that enables sysadmins to give us mixed messages. What happens if we encounter this:
auto_scrub=no
auto_repair=yes
auto_optimize=paula
?
Better just to have one attribute and make them pick the one they want.
How about auto_fsck={none,check,optimize,repair} ?
--D
Re: [PATCH 1/3] libfrog: define a self_healing filesystem property
Quoted 3 lines · Darrick J. Wong
Better just to have one attribute and make them pick the one they want.
How about auto_fsck={none,check,optimize,repair} ?
Sounds good.
PATCH 2/3 xfs_scrub: allow sysadmin to control background scrubs
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Define a "self_healing" filesystem property so that sysadmins can indicate their preferences for background online fsck. Add an extended option to xfs_scrub so that it selects the operation mode from the self healing fs property.
--- man/man8/xfs_scrub.8 | 44 +++++++++++++++++++++++++++ scrub/phase1.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++ scrub/xfs_scrub.c | 14 +++++++++ scrub/xfs_scrub.h | 7 ++++ 4 files changed, 146 insertions(+)
man/man8/xfs_scrub.8 +44 -0
@@ -107,6 +107,14 @@ The supported are: .RS 1.0i .TP +.B fsprops_advise +Decide the operating mode from the value of the +.I self_healing +filesystem property. +See the +.B filesytem properties +section for more details. +.TP .BI fstrim_pct= percentage To constrain the amount of time spent on fstrim activities during phase 8, this program tries to balance estimated runtime against completeness of the
@@ -192,6 +200,42 @@ Scheduling a quotacheck for the next mount. .PP If corrupt metadata is successfully repaired, this program will log that a repair has succeeded instead of a corruption report. +.SH FILESYSTEM PROPERTIES +System administrators can convey their preferences for scrubbing of a +particular filesystem by setting the filesystem property +.B self_healing +via the +.B setfsprops +subcommand of the +.B xfs_spaceman +on the filesystem. +These preferences will be honored if the +.B -o fsprops_advise +option is specified. + +Recognized values for the +.B self_healing +property are: +.RS +.TP +.I none +Do not scan the filesystem at all. +.TP +.I check +Scan and report corruption and opportunities for optimization, but do not +change anything. +.TP +.I optimize +Scan the filesystem and optimize where possible. +Report corruptions, but do not fix them. +.TP +.I repair +Scan the filesystem, fix corruptions, and optimize where possible. +.RE + +If the property is not set, the default is +.IR check . + .SH EXIT CODE The exit code returned by .B xfs_scrub
scrub/phase1.c +81 -0
99 lines not on this page · raw message
scrub/xfs_scrub.c +14 -0
@@ -526,6 +526,10 @@ _("Scrub aborted after phase %d."),if (ret)break ; +/* Did background scrub get canceled on us? */ +if (ctx->mode ==SCRUB_MODE_NONE ) +break ; +/* Too many errors? */ if (scrub_excessive_errors (ctx)) { ret =ECANCELED ;
@@ -630,12 +634,14 @@ report_outcome(enum o_opt_nums {IWARN =0 ,FSTRIM_PCT , +FSPROPS_ADVISE ,O_MAX_OPTS , };static char *o_opts[] = { [IWARN ] ="iwarn" , [FSTRIM_PCT ] ="fstrim_pct" , + [FSPROPS_ADVISE ] ="fsprops_advise" , [O_MAX_OPTS ] =NULL , };
@@ -688,6 +694,14 @@ parse_o_opts( ctx->fstrim_block_pct = dval /100.0 ;break ; +case FSPROPS_ADVISE : +if (val) { +fprintf (stderr, +_ ("-o fsprops_advise does not take an argument\n" )); +usage (); + } + ctx->mode =SCRUB_MODE_NONE ; +break ;default :usage ();break ;
scrub/xfs_scrub.h +7 -0
@@ -26,6 +26,13 @@ extern bool use_force_rebuild;extern bool info_is_warning;enum scrub_mode { +/* +* Prior to phase 1, this means that xfs_scrub should read the +* "self_healing" fs property from the mount and set the value +* appropriate. If it's still set after phase 1, this means we should +* exit without doing anything. +*/ +SCRUB_MODE_NONE ,SCRUB_MODE_DRY_RUN ,SCRUB_MODE_PREEN ,SCRUB_MODE_REPAIR ,
PATCH 3/3 mkfs: set self_healing property
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Add a new mkfs options so that sysadmins can control the background scrubbing behavior of filesystems from the start.
--- man/man8/mkfs.xfs.8.in | 6 ++ mkfs/lts_4.19.conf | 1 mkfs/lts_5.10.conf | 1 mkfs/lts_5.15.conf | 1 mkfs/lts_5.4.conf | 1 mkfs/lts_6.1.conf | 1 mkfs/lts_6.6.conf | 1 mkfs/xfs_mkfs.c | 122 ++++++++++++++++++++++++++++++++++++++++++++++++ 8 files changed, 133 insertions(+), 1 deletion(-)
man/man8/mkfs.xfs.8.in +6 -0
@@ -323,6 +323,12 @@ option set. When the option .B \-m crc=0 is used, the reference count btree feature is not supported and reflink is disabled. +.TP +.BI self_healing= value +Set the self_healing filesystem property to this value. +See the +.BI xfs_scrub (8) +manual page for more information on this property. .RE .PP .PD 0
mkfs/lts_4.19.conf +1 -0
@@ -8,6 +8,7 @@ finobt=1 inobtcount=0 reflink=0 rmapbt=0 +self_healing=0 [inode] sparse=1
mkfs/lts_5.10.conf +1 -0
@@ -8,6 +8,7 @@ finobt=1 inobtcount=0 reflink=1 rmapbt=0 +self_healing=0 [inode] sparse=1
mkfs/lts_5.15.conf +1 -0
@@ -8,6 +8,7 @@ finobt=1 inobtcount=1 reflink=1 rmapbt=0 +self_healing=0 [inode] sparse=1
mkfs/lts_5.4.conf +1 -0
@@ -8,6 +8,7 @@ finobt=1 inobtcount=0 reflink=1 rmapbt=0 +self_healing=0 [inode] sparse=1
mkfs/lts_6.1.conf +1 -0
@@ -8,6 +8,7 @@ finobt=1 inobtcount=1 reflink=1 rmapbt=0 +self_healing=0 [inode] sparse=1
mkfs/lts_6.6.conf +1 -0
@@ -8,6 +8,7 @@ finobt=1 inobtcount=1 reflink=1 rmapbt=1 +self_healing=0 [inode] sparse=1
mkfs/xfs_mkfs.c +121 -1
194 lines not on this page · raw message
PATCH 3/3 xfs_scrub: separate package for self healing
In reply to Darrick J. WongHi all,
Debian policy (section 9 iirc) says that services shipped in a package should be started by default. We don't necessarily want that from the base xfsprogs package long term, so separate the self healing services into a separate package.
If you're going to start using this code, I strongly recommend pulling from my git trees, which are linked below.
This has been running on the djcloud for months with no problems. Enjoy! Comments and questions are, as always, welcome.
--D
xfsprogs git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfsprogs-dev.git/log/?h=scrub-self-healing-package
---
Commits in this patchset:
* misc: shift install targets
* xfs_scrub: use the self_healing fsproperty to select mode
* debian: create a new package for automatic self-healing
--- Makefile | 14 +++++++++++--- copy/Makefile | 6 +++++- db/Makefile | 6 +++++- debian/Makefile | 6 +++++- debian/control | 8 ++++++++ debian/rules | 15 ++++++++++----- doc/Makefile | 7 ++++++- estimate/Makefile | 6 +++++- fsck/Makefile | 7 ++++++- fsr/Makefile | 6 +++++- growfs/Makefile | 6 +++++- include/Makefile | 7 ++++++- io/Makefile | 6 +++++- libfrog/Makefile | 4 +++- libhandle/Makefile | 6 +++++- libxcmd/Makefile | 4 +++- libxfs/Makefile | 7 ++++++- libxlog/Makefile | 4 +++- logprint/Makefile | 6 +++++- m4/Makefile | 4 +++- man/Makefile | 10 +++++++--- man/man2/Makefile | 4 +++- man/man3/Makefile | 4 +++- man/man5/Makefile | 5 ++++- man/man8/Makefile | 4 +++- mdrestore/Makefile | 6 +++++- mkfs/Makefile | 6 +++++- po/Makefile | 7 ++++++- quota/Makefile | 6 +++++- repair/Makefile | 6 +++++- rtcp/Makefile | 6 +++++- scrub/Makefile | 19 ++++++++++++++----- scrub/[email protected] | 2 +- scrub/[email protected] | 2 +- spaceman/Makefile | 6 +++++- 35 files changed, 182 insertions(+), 46 deletions(-)
PATCH 1/3 misc: shift install targets
From: Darrick J. Wong <[email protected]>
Modify each Makefile so that "install-pkg" installs the main package contents, and "install" just invokes "install-pkg". We'll need this indirection for the next patch where we add an install-selfheal target to build the xfsprogs-self-healing package but will still want 'make install' to install everything on a developer's workstation.
--- Makefile | 8 +++++--- copy/Makefile | 4 +++- db/Makefile | 4 +++- debian/Makefile | 4 +++- debian/rules | 2 +- doc/Makefile | 4 +++- estimate/Makefile | 4 +++- fsck/Makefile | 4 +++- fsr/Makefile | 4 +++- growfs/Makefile | 4 +++- include/Makefile | 4 +++- io/Makefile | 4 +++- libfrog/Makefile | 2 +- libhandle/Makefile | 4 +++- libxcmd/Makefile | 2 +- libxfs/Makefile | 4 +++- libxlog/Makefile | 2 +- logprint/Makefile | 4 +++- m4/Makefile | 2 +- man/Makefile | 8 +++++--- man/man2/Makefile | 4 +++- man/man3/Makefile | 4 +++- man/man5/Makefile | 5 ++++- man/man8/Makefile | 4 +++- mdrestore/Makefile | 4 +++- mkfs/Makefile | 4 +++- po/Makefile | 4 +++- quota/Makefile | 4 +++- repair/Makefile | 4 +++- rtcp/Makefile | 4 +++- scrub/Makefile | 4 +++- spaceman/Makefile | 4 +++- 32 files changed, 91 insertions(+), 36 deletions(-)
Makefile +5 -3
@@ -116,15 +116,17 @@ configure: configure.ac include/builddefs: configure ./configure $$LOCAL_CONFIGURE_OPTIONS -install: $(addsuffix -install,$(SUBDIRS)) +install: install-pkg + +install-pkg: $(addsuffix -install-pkg,$(SUBDIRS)) $(INSTALL) -m 755 -d $(PKG_DOC_DIR) $(INSTALL) -m 644 README $(PKG_DOC_DIR) install-dev: $(addsuffix -install-dev,$(SUBDIRS)) -%-install: +%-install-pkg: @echo "Installing $@" - $(Q)$(MAKE) $(MAKEOPTS) -C $* install + $(Q)$(MAKE) $(MAKEOPTS) -C $* install-pkg %-install-dev: @echo "Installing $@"
copy/Makefile +3 -1
@@ -18,7 +18,9 @@ default: depend $(LTCOMMAND) include $(BUILDRULES) -install: default +install: install-pkg + +install-pkg: default $(INSTALL) -m 755 -d $(PKG_SBIN_DIR) $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR) install-dev:
db/Makefile +3 -1
@@ -81,7 +81,9 @@ default: depend $(LTCOMMAND) include $(BUILDRULES) -install: default +install: install-pkg + +install-pkg: default $(INSTALL) -m 755 -d $(PKG_SBIN_DIR) $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR) $(INSTALL) -m 755 xfs_admin.sh $(PKG_SBIN_DIR)/xfs_admin
debian/Makefile +3 -1
@@ -15,7 +15,9 @@ default: include $(BUILDRULES) -install: default +install: install-pkg + +install-pkg: default ifeq ($(PKG_DISTRIBUTION), debian) $(INSTALL) -m 755 -d $(PKG_DOC_DIR) $(INSTALL) -m 644 changelog $(PKG_DOC_DIR)/changelog.Debian
debian/rules +1 -1
@@ -100,7 +100,7 @@ binary-arch: checkroot built @echo "== dpkg-buildpackage: binary-arch" 1>&2 $(checkdir) -rm -rf $(dirme) $(dirdev) $(dirdi) - $(pkgme) $(MAKE) -C . install + $(pkgme) $(MAKE) -C . install-pkg $(pkgdev) $(MAKE) -C . install-dev $(pkgdi) $(MAKE) -C debian install-d-i $(pkgme) $(MAKE) dist
doc/Makefile +3 -1
@@ -16,7 +16,9 @@ CHANGES.gz: @echo " [ZIP] $@" $(Q)$(ZIP) --best -c < CHANGES > $@ -install: default +install: install-pkg + +install-pkg: default $(INSTALL) -m 755 -d $(PKG_DOC_DIR) $(INSTALL) -m 644 CHANGES.gz CREDITS $(PKG_DOC_DIR) ifeq ($(PKG_DISTRIBUTION), debian)
estimate/Makefile +3 -1
@@ -12,7 +12,9 @@ default: depend $(LTCOMMAND) include $(BUILDRULES) -install: default +install: install-pkg + +install-pkg: default $(INSTALL) -m 755 -d $(PKG_SBIN_DIR) $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR) install-dev:
fsck/Makefile +3 -1
@@ -11,7 +11,9 @@ default: $(LTCOMMAND) include $(BUILDRULES) -install: default +install: install-pkg + +install-pkg: default $(INSTALL) -m 755 -d $(PKG_SBIN_DIR) $(INSTALL) -m 755 xfs_fsck.sh $(PKG_SBIN_DIR)/fsck.xfs install-dev:
fsr/Makefile +3 -1
@@ -15,7 +15,9 @@ default: depend $(LTCOMMAND) include $(BUILDRULES) -install: default +install: install-pkg + +install-pkg: default $(INSTALL) -m 755 -d $(PKG_SBIN_DIR) $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR) install-dev:
growfs/Makefile +3 -1
@@ -23,7 +23,9 @@ default: depend $(LTCOMMAND) include $(BUILDRULES) -install: default +install: install-pkg + +install-pkg: default $(INSTALL) -m 755 -d $(PKG_SBIN_DIR) $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR) install-dev:
include/Makefile +3 -1
@@ -57,7 +57,9 @@ install-headers: $(addsuffix -hdrs, $(DKHFILES) $(HFILES)) %-hdrs: $(Q)$(LN_S) -f $(CURDIR)/$* xfs/$* -install: default +install: install-pkg + +install-pkg: default $(INSTALL) -m 755 -d $(PKG_INC_DIR) install-dev: install
io/Makefile +3 -1
@@ -85,7 +85,9 @@ default: depend $(LTCOMMAND) include $(BUILDRULES) -install: default +install: install-pkg + +install-pkg: default $(INSTALL) -m 755 -d $(PKG_SBIN_DIR) $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR) $(LTINSTALL) -m 755 xfs_bmap.sh $(PKG_SBIN_DIR)/xfs_bmap
libfrog/Makefile +1 -1
@@ -79,6 +79,6 @@ crc32table.h: gen_crc32table.c crc32defs.h include $(BUILDRULES) -install install-dev: default +install install-pkg install-dev: default -include .ltdep
libhandle/Makefile +3 -1
@@ -19,7 +19,9 @@ default: ltdepend $(LTLIBRARY) include $(BUILDRULES) -install: default +install: install-pkg + +install-pkg: default $(INSTALL_LTLIB) install-dev: default
libxcmd/Makefile +1 -1
@@ -23,6 +23,6 @@ default: ltdepend $(LTLIBRARY) include $(BUILDRULES) -install install-dev: default +install install-pkg install-dev: default -include .ltdep
libxfs/Makefile +3 -1
@@ -140,7 +140,9 @@ default: ltdepend $(LTLIBRARY) # set up include/xfs header directory include $(BUILDRULES) -install: default +install: install-pkg + +install-pkg: default $(INSTALL) -m 755 -d $(PKG_INC_DIR) install-headers: $(addsuffix -hdrs, $(PKGHFILES))
libxlog/Makefile +1 -1
@@ -21,6 +21,6 @@ default: ltdepend $(LTLIBRARY) include $(BUILDRULES) -install install-dev: default +install install-pkg install-dev: default -include .ltdep
logprint/Makefile +3 -1
@@ -21,7 +21,9 @@ default: depend $(LTCOMMAND) include $(BUILDRULES) -install: default +install: install-pkg + +install-pkg: default $(INSTALL) -m 755 -d $(PKG_SBIN_DIR) $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR) install-dev:
m4/Makefile +1 -1
@@ -33,7 +33,7 @@ default: include $(BUILDRULES) -install install-dev install-lib: default +install install-pkg install-dev install-lib: default realclean: distclean rm -f $(CONFIGURE)
man/Makefile +5 -3
@@ -9,12 +9,14 @@ SUBDIRS = man2 man3 man5 man8 default : $(SUBDIRS) -install : $(addsuffix -install,$(SUBDIRS)) +install : install-pkg + +install-pkg : $(addsuffix -install-pkg,$(SUBDIRS)) install-dev : $(addsuffix -install-dev,$(SUBDIRS)) -%-install: - $(Q)$(MAKE) $(MAKEOPTS) -C $* install +%-install-pkg: + $(Q)$(MAKE) $(MAKEOPTS) -C $* install-pkg %-install-dev: $(Q)$(MAKE) $(MAKEOPTS) -C $* install-dev
man/man2/Makefile +3 -1
@@ -15,7 +15,9 @@ default : $(MAN_PAGES) include $(BUILDRULES) -install : +install : install-pkg + +install-pkg : install-dev : default $(INSTALL) -m 755 -d $(MAN_DEST)
man/man3/Makefile +3 -1
@@ -15,7 +15,9 @@ default : $(MAN_PAGES) include $(BUILDRULES) -install : +install : install-pkg + +install-pkg : install-dev : default $(INSTALL) -m 755 -d $(MAN_DEST)
man/man5/Makefile +4 -1
@@ -15,7 +15,10 @@ default : $(MAN_PAGES) include $(BUILDRULES) -install : default +install : install-pkg + +install-pkg : default $(INSTALL) -m 755 -d $(MAN_DEST) $(INSTALL_MAN) + install-dev :
man/man8/Makefile +3 -1
@@ -22,7 +22,9 @@ default : $(MAN_PAGES) include $(BUILDRULES) -install : default +install : install-pkg + +install-pkg : default $(INSTALL) -m 755 -d $(MAN_DEST) $(INSTALL_MAN)
mdrestore/Makefile +3 -1
@@ -16,7 +16,9 @@ default: depend $(LTCOMMAND) include $(BUILDRULES) -install: default +install: install-pkg + +install-pkg: default $(INSTALL) -m 755 -d $(PKG_SBIN_DIR) $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR) install-dev:
mkfs/Makefile +3 -1
@@ -27,7 +27,9 @@ default: depend $(LTCOMMAND) $(CFGFILES) include $(BUILDRULES) -install: default +install: install-pkg + +install-pkg: default $(INSTALL) -m 755 -d $(PKG_SBIN_DIR) $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR) $(INSTALL) -m 755 -d $(MKFS_CFG_DIR)
po/Makefile +3 -1
@@ -19,7 +19,9 @@ default: $(POTHEAD) $(LINGUAS:%=%.mo) include $(BUILDRULES) -install: default +install: install-pkg + +install-pkg: default $(INSTALL_LINGUAS) install-dev install-lib:
quota/Makefile +3 -1
@@ -23,7 +23,9 @@ default: depend $(LTCOMMAND) include $(BUILDRULES) -install: default +install: install-pkg + +install-pkg: default $(INSTALL) -m 755 -d $(PKG_SBIN_DIR) $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR) install-dev:
repair/Makefile +3 -1
@@ -106,7 +106,9 @@ include $(BUILDRULES) # #CFLAGS += ... -install: default +install: install-pkg + +install-pkg: default $(INSTALL) -m 755 -d $(PKG_SBIN_DIR) $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR) install-dev:
rtcp/Makefile +3 -1
@@ -16,7 +16,9 @@ default: depend $(LTCOMMAND) include $(BUILDRULES) -install: default +install: install-pkg + +install-pkg: default $(INSTALL) -m 755 -d $(PKG_SBIN_DIR) $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR) install-dev:
scrub/Makefile +3 -1
@@ -138,7 +138,9 @@ phase5.o unicrash.o xfs.o: $(builddefs) include $(BUILDRULES) -install: $(INSTALL_SCRUB) +install: install-pkg + +install-pkg: $(INSTALL_SCRUB) %.service: %.service.in $(builddefs) @echo " [SED] $@"
spaceman/Makefile +3 -1
@@ -38,7 +38,9 @@ default: depend $(LTCOMMAND) include $(BUILDRULES) -install: default +install: install-pkg + +install-pkg: default $(INSTALL) -m 755 -d $(PKG_SBIN_DIR) $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR) $(INSTALL) -m 755 xfs_info.sh $(PKG_SBIN_DIR)/xfs_info
PATCH 2/3 xfs_scrub: use the self_healing fsproperty to select mode
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Now that we can set properties on xfs filesystems, make the xfs_scrub background service query the self_healing property to figure out which mode (dry run, optimize, repair, none) it should use.
--- scrub/Makefile | 3 +-- scrub/[email protected] | 2 +- scrub/[email protected] | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-)
scrub/Makefile +1 -2
@@ -17,7 +17,7 @@ INSTALL_SCRUB = install-scrub XFS_SCRUB_ALL_PROG = xfs_scrub_all XFS_SCRUB_FAIL_PROG = xfs_scrub_fail XFS_SCRUB_ARGS = -p -XFS_SCRUB_SERVICE_ARGS = -b +XFS_SCRUB_SERVICE_ARGS = -b -o fsprops_advise ifeq ($(HAVE_SYSTEMD),yes) INSTALL_SCRUB += install-systemd SYSTEMD_SERVICES=\
@@ -146,7 +146,6 @@ install-pkg: $(INSTALL_SCRUB) @echo " [SED] $@" $(Q)$(SED) -e "s|@sbindir@|$(PKG_SBIN_DIR)|g" \ -e "s|@scrub_service_args@|$(XFS_SCRUB_SERVICE_ARGS)|g" \ - -e "s|@scrub_args@|$(XFS_SCRUB_ARGS)|g" \ -e "s|@pkg_libexec_dir@|$(PKG_LIBEXEC_DIR)|g" \ -e "s|@pkg_state_dir@|$(PKG_STATE_DIR)|g" \ -e "s|@media_scan_interval@|$(XFS_SCRUB_ALL_AUTO_MEDIA_SCAN_INTERVAL)|g" \
scrub/[email protected] +1 -1
@@ -22,7 +22,7 @@ RequiresMountsFor=%f [Service] Type=oneshot Environment=SERVICE_MODE=1 -ExecStart=@sbindir@/xfs_scrub @scrub_service_args@ @scrub_args@ -M /tmp/scrub/ %f +ExecStart=@sbindir@/xfs_scrub @scrub_service_args@ -M /tmp/scrub/ %f SyslogIdentifier=%N # Run scrub with minimal CPU and IO priority so that nothing else will starve.
scrub/[email protected] +1 -1
@@ -22,7 +22,7 @@ RequiresMountsFor=%f [Service] Type=oneshot Environment=SERVICE_MODE=1 -ExecStart=@sbindir@/xfs_scrub @scrub_service_args@ @scrub_args@ -M /tmp/scrub/ -x %f +ExecStart=@sbindir@/xfs_scrub @scrub_service_args@ -M /tmp/scrub/ -x %f SyslogIdentifier=%N # Run scrub with minimal CPU and IO priority so that nothing else will starve.
PATCH 3/3 debian: create a new package for automatic self-healing
In reply to Darrick J. WongFrom: Darrick J. Wong <[email protected]>
Create a new package for people who explicilty want self-healing turned on by default for XFS. This package is named xfsprogs-self-healing.
Note: This introduces a new "install-selfheal" target to install only the files needed for enabling online fsck by default. Other distributions should take note of the new target if they choose to create a package for enabling autonomous self healing.
--- Makefile | 8 +++++++- copy/Makefile | 2 ++ db/Makefile | 2 ++ debian/Makefile | 2 ++ debian/control | 8 ++++++++ debian/rules | 13 +++++++++---- doc/Makefile | 3 +++ estimate/Makefile | 2 ++ fsck/Makefile | 3 +++ fsr/Makefile | 2 ++ growfs/Makefile | 2 ++ include/Makefile | 3 +++ io/Makefile | 2 ++ libfrog/Makefile | 2 ++ libhandle/Makefile | 2 ++ libxcmd/Makefile | 2 ++ libxfs/Makefile | 3 +++ libxlog/Makefile | 2 ++ logprint/Makefile | 2 ++ m4/Makefile | 2 ++ man/Makefile | 2 ++ mdrestore/Makefile | 2 ++ mkfs/Makefile | 2 ++ po/Makefile | 3 +++ quota/Makefile | 2 ++ repair/Makefile | 2 ++ rtcp/Makefile | 2 ++ scrub/Makefile | 12 ++++++++++-- spaceman/Makefile | 2 ++ 29 files changed, 89 insertions(+), 7 deletions(-)
Makefile +7 -1
@@ -116,7 +116,7 @@ configure: configure.ac include/builddefs: configure ./configure $$LOCAL_CONFIGURE_OPTIONS -install: install-pkg +install: install-pkg install-selfheal install-pkg: $(addsuffix -install-pkg,$(SUBDIRS)) $(INSTALL) -m 755 -d $(PKG_DOC_DIR)
@@ -124,6 +124,8 @@ install-pkg: $(addsuffix -install-pkg,$(SUBDIRS)) install-dev: $(addsuffix -install-dev,$(SUBDIRS)) +install-selfheal: $(addsuffix -install-selfheal,$(SUBDIRS)) + %-install-pkg: @echo "Installing $@" $(Q)$(MAKE) $(MAKEOPTS) -C $* install-pkg
@@ -132,6 +134,10 @@ install-dev: $(addsuffix -install-dev,$(SUBDIRS)) @echo "Installing $@" $(Q)$(MAKE) $(MAKEOPTS) -C $* install-dev +%-install-selfheal: + @echo "Installing $@" + $(Q)$(MAKE) $(MAKEOPTS) -C $* install-selfheal + distclean: clean $(Q)rm -f $(LDIRT)
copy/Makefile +2 -0
@@ -25,4 +25,6 @@ install-pkg: default $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR) install-dev: +install-selfheal: + -include .dep
db/Makefile +2 -0
@@ -91,4 +91,6 @@ install-pkg: default $(INSTALL) -m 755 xfs_metadump.sh $(PKG_SBIN_DIR)/xfs_metadump install-dev: +install-selfheal: + -include .dep
debian/Makefile +2 -0
@@ -36,3 +36,5 @@ ifeq ($(PKG_DISTRIBUTION), debian) $(INSTALL) -m 755 -d $(PKG_SBIN_DIR) $(INSTALL) -m 755 $(BOOT_MKFS_BIN) $(PKG_SBIN_DIR)/mkfs.xfs endif + +install-selfheal: default
debian/control +8 -0
@@ -27,6 +27,14 @@ Description: Utilities for managing the XFS filesystem Refer to the documentation at https://xfs.wiki.kernel.org/ for complete details. +Package: xfsprogs-self-healing +Depends: ${shlibs:Depends}, ${misc:Depends}, xfsprogs, systemd, udev +Architecture: linux-any +Description: Automatic self healing for the XFS filesystem + A set of background services for the XFS filesystem to make it + find and fix corruptions automatically. These services are activated + automatically upon installation of this package. + Package: xfslibs-dev Section: libdevel Depends: libc6-dev | libc-dev, uuid-dev, xfsprogs (>= 3.0.0), ${misc:Depends}
debian/rules +9 -4
@@ -14,6 +14,7 @@ endif package = xfsprogs develop = xfslibs-dev bootpkg = xfsprogs-udeb +healpkg = xfsprogs-self-healing DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -26,9 +27,11 @@ udebpkg = $(bootpkg)_$(version)_$(target).udeb dirme = debian/$(package) dirdev = debian/$(develop) dirdi = debian/$(bootpkg) -pkgme = DIST_ROOT=`pwd`/$(dirme); export DIST_ROOT; -pkgdev = DIST_ROOT=`pwd`/$(dirdev); export DIST_ROOT; -pkgdi = DIST_ROOT=`pwd`/$(dirdi); export DIST_ROOT; +dirheal= debian/$(healpkg) +pkgme = DIST_ROOT=`pwd`/$(dirme); export DIST_ROOT; +pkgdev = DIST_ROOT=`pwd`/$(dirdev); export DIST_ROOT; +pkgdi = DIST_ROOT=`pwd`/$(dirdi); export DIST_ROOT; +pkgheal= DIST_ROOT=`pwd`/$(dirheal); export DIST_ROOT; stdenv = @GZIP=-q; export GZIP; configure_options = \
@@ -103,6 +106,7 @@ binary-arch: checkroot built $(pkgme) $(MAKE) -C . install-pkg $(pkgdev) $(MAKE) -C . install-dev $(pkgdi) $(MAKE) -C debian install-d-i + $(pkgheal) $(MAKE) -C . install-selfheal $(pkgme) $(MAKE) dist install -D -m 0755 debian/local/initramfs.hook debian/xfsprogs/usr/share/initramfs-tools/hooks/xfs rmdir debian/xfslibs-dev/usr/share/doc/xfsprogs
@@ -114,7 +118,8 @@ binary-arch: checkroot built dh_compress dh_fixperms dh_makeshlibs - dh_installsystemd -p xfsprogs --no-enable --no-start --no-restart-after-upgrade --no-stop-on-upgrade + dh_installsystemd -p xfsprogs --no-restart-after-upgrade --no-stop-on-upgrade system-xfs_scrub.slice + dh_installsystemd -p xfsprogs-self-healing --no-restart-after-upgrade --no-stop-on-upgrade xfs_scrub_all.timer dh_installdeb dh_shlibdeps dh_gencontrol
doc/Makefile +3 -0
@@ -26,3 +26,6 @@ ifeq ($(PKG_DISTRIBUTION), debian) endif install-dev: + +install-selfheal: +
estimate/Makefile +2 -0
@@ -19,4 +19,6 @@ install-pkg: default $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR) install-dev: +install-selfheal: + -include .dep
fsck/Makefile +3 -0
@@ -17,3 +17,6 @@ install-pkg: default $(INSTALL) -m 755 -d $(PKG_SBIN_DIR) $(INSTALL) -m 755 xfs_fsck.sh $(PKG_SBIN_DIR)/fsck.xfs install-dev: + +install-selfheal: +
fsr/Makefile +2 -0
@@ -22,4 +22,6 @@ install-pkg: default $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR) install-dev: +install-selfheal: + -include .dep
growfs/Makefile +2 -0
@@ -30,4 +30,6 @@ install-pkg: default $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR) install-dev: +install-selfheal: + -include .dep
include/Makefile +3 -0
@@ -64,3 +64,6 @@ install-pkg: default install-dev: install $(INSTALL) -m 644 $(HFILES) $(PKG_INC_DIR) + +install-selfheal: +
io/Makefile +2 -0
@@ -95,4 +95,6 @@ install-pkg: default $(LTINSTALL) -m 755 xfs_mkfile.sh $(PKG_SBIN_DIR)/xfs_mkfile install-dev: +install-selfheal: + -include .dep
libfrog/Makefile +2 -0
@@ -81,4 +81,6 @@ include $(BUILDRULES) install install-pkg install-dev: default +install-selfheal: + -include .ltdep
libhandle/Makefile +2 -0
@@ -27,4 +27,6 @@ install-pkg: default install-dev: default $(INSTALL_LTLIB_DEV) +install-selfheal: + -include .ltdep
libxcmd/Makefile +2 -0
@@ -25,4 +25,6 @@ include $(BUILDRULES) install install-pkg install-dev: default +install-selfheal: + -include .ltdep
libxfs/Makefile +3 -0
@@ -162,3 +162,6 @@ install-dev: install ifndef NODEP -include .ltdep endif + +install-selfheal: +
libxlog/Makefile +2 -0
@@ -23,4 +23,6 @@ include $(BUILDRULES) install install-pkg install-dev: default +install-selfheal: + -include .ltdep
logprint/Makefile +2 -0
@@ -28,4 +28,6 @@ install-pkg: default $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR) install-dev: +install-selfheal: + -include .dep
m4/Makefile +2 -0
@@ -35,5 +35,7 @@ include $(BUILDRULES) install install-pkg install-dev install-lib: default +install-selfheal: + realclean: distclean rm -f $(CONFIGURE)
man/Makefile +2 -0
@@ -21,4 +21,6 @@ install-dev : $(addsuffix -install-dev,$(SUBDIRS)) %-install-dev: $(Q)$(MAKE) $(MAKEOPTS) -C $* install-dev +install-selfheal: + include $(BUILDRULES)
mdrestore/Makefile +2 -0
@@ -23,4 +23,6 @@ install-pkg: default $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR) install-dev: +install-selfheal: + -include .dep
mkfs/Makefile +2 -0
@@ -37,4 +37,6 @@ install-pkg: default install-dev: +install-selfheal: + -include .dep
po/Makefile +3 -0
@@ -25,3 +25,6 @@ install-pkg: default $(INSTALL_LINGUAS) install-dev install-lib: + +install-selfheal: +
quota/Makefile +2 -0
@@ -30,4 +30,6 @@ install-pkg: default $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR) install-dev: +install-selfheal: + -include .dep
repair/Makefile +2 -0
@@ -113,4 +113,6 @@ install-pkg: default $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR) install-dev: +install-selfheal: + -include .dep
rtcp/Makefile +2 -0
@@ -23,4 +23,6 @@ install-pkg: default $(LTINSTALL) -m 755 $(LTCOMMAND) $(PKG_SBIN_DIR) install-dev: +install-selfheal: + -include .dep
scrub/Makefile +10 -2
@@ -20,6 +20,7 @@ XFS_SCRUB_ARGS = -p XFS_SCRUB_SERVICE_ARGS = -b -o fsprops_advise ifeq ($(HAVE_SYSTEMD),yes) INSTALL_SCRUB += install-systemd +INSTALL_SELFHEAL += install-systemd-selfheal SYSTEMD_SERVICES=\ $(scrub_svcname) \ [email protected] \
@@ -27,9 +28,10 @@ SYSTEMD_SERVICES=\ [email protected] \ xfs_scrub_all.service \ xfs_scrub_all_fail.service \ - xfs_scrub_all.timer \ system-xfs_scrub.slice -OPTIONAL_TARGETS += $(SYSTEMD_SERVICES) +SYSTEMD_SERVICES_SELFHEAL=\ + xfs_scrub_all.timer +OPTIONAL_TARGETS += $(SYSTEMD_SERVICES) $(SYSTEMD_SERVICES_SELFHEAL) endif ifeq ($(HAVE_CROND),yes) INSTALL_SCRUB += install-crond
@@ -163,6 +165,10 @@ install-systemd: default $(SYSTEMD_SERVICES) $(INSTALL) -m 755 -d $(PKG_LIBEXEC_DIR) $(INSTALL) -m 755 $(XFS_SCRUB_FAIL_PROG) $(PKG_LIBEXEC_DIR) +install-systemd-selfheal: default $(SYSTEMD_SERVICES_SELFHEAL) + $(INSTALL) -m 755 -d $(SYSTEMD_SYSTEM_UNIT_DIR) + $(INSTALL) -m 644 $(SYSTEMD_SERVICES_SELFHEAL) $(SYSTEMD_SYSTEM_UNIT_DIR) + install-crond: default $(CRONTABS) $(INSTALL) -m 755 -d $(CROND_DIR) $(INSTALL) -m 644 $(CRONTABS) $(CROND_DIR)
@@ -181,4 +187,6 @@ install-udev: $(UDEV_RULES) install-dev: +install-selfheal: $(INSTALL_SELFHEAL) + -include .dep
spaceman/Makefile +2 -0
@@ -47,4 +47,6 @@ install-pkg: default $(INSTALL) -m 755 xfs_property $(PKG_SBIN_DIR)/xfs_property install-dev: +install-selfheal: + -include .dep
PATCH 1/1 fstests: xfs filesystem properties
In reply to Darrick J. WongHi all,
It would be very useful if system administrators could set properties for a given xfs filesystem to control its behavior. This we can do easily and extensibly by setting ATTR_ROOT (aka "trusted") extended attributes on the root directory. To prevent this from becoming a weird free for all, let's add some library and tooling support so that sysadmins simply run the xfs_property program to administer these properties.
If you're going to start using this code, I strongly recommend pulling from my git trees, which are linked below.
This has been running on the djcloud for months with no problems. Enjoy! Comments and questions are, as always, welcome.
--D
xfsprogs git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfsprogs-dev.git/log/?h=filesystem-properties
fstests git tree:
https://git.kernel.org/cgit/linux/kernel/git/djwong/xfstests-dev.git/log/?h=filesystem-properties
---
Commits in this patchset:
* xfs: functional testing for filesystem properties
--- common/config | 1 common/xfs | 4 +- tests/xfs/1886 | 135 ++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/1886.out | 53 ++++++++++++++++++++ tests/xfs/1887 | 124 ++++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/1887.out | 46 ++++++++++++++++++ tests/xfs/1888 | 66 +++++++++++++++++++++++++ tests/xfs/1888.out | 9 +++ tests/xfs/1889 | 67 ++++++++++++++++++++++++++ tests/xfs/1889.out | 9 +++ 10 files changed, 512 insertions(+), 2 deletions(-) create mode 100755 tests/xfs/1886 create mode 100644 tests/xfs/1886.out create mode 100755 tests/xfs/1887 create mode 100644 tests/xfs/1887.out create mode 100755 tests/xfs/1888 create mode 100644 tests/xfs/1888.out create mode 100755 tests/xfs/1889 create mode 100644 tests/xfs/1889.out
PATCH 1/1 xfs: functional testing for filesystem properties
From: Darrick J. Wong <[email protected]>
Make sure that fs property storage and retrieval actually work.
--- common/config | 1 common/xfs | 4 +- tests/xfs/1886 | 135 ++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/1886.out | 53 ++++++++++++++++++++ tests/xfs/1887 | 124 ++++++++++++++++++++++++++++++++++++++++++++++++ tests/xfs/1887.out | 46 ++++++++++++++++++ tests/xfs/1888 | 66 +++++++++++++++++++++++++ tests/xfs/1888.out | 9 +++ tests/xfs/1889 | 67 ++++++++++++++++++++++++++ tests/xfs/1889.out | 9 +++ 10 files changed, 512 insertions(+), 2 deletions(-) create mode 100755 tests/xfs/1886 create mode 100644 tests/xfs/1886.out create mode 100755 tests/xfs/1887 create mode 100644 tests/xfs/1887.out create mode 100755 tests/xfs/1888 create mode 100644 tests/xfs/1888.out create mode 100755 tests/xfs/1889 create mode 100644 tests/xfs/1889.out
common/config +1 -0
@@ -234,6 +234,7 @@ export GZIP_PROG="$(type -P gzip)" export BTRFS_IMAGE_PROG="$(type -P btrfs-image)" export BTRFS_MAP_LOGICAL_PROG=$(type -P btrfs-map-logical) export PARTED_PROG="$(type -P parted)" +export XFS_PROPERTY_PROG="$(type -P xfs_property)" # use 'udevadm settle' or 'udevsettle' to wait for lv to be settled. # newer systems have udevadm command but older systems like RHEL5 don't.
common/xfs +2 -2
@@ -1318,8 +1318,8 @@ _require_xfs_spaceman_command() testfile=$TEST_DIR/$$.xfs_spaceman touch $testfile case $command in - "health") - testio=`$XFS_SPACEMAN_PROG -c "health $param" $TEST_DIR 2>&1` + "health"|"listfsprops") + testio=`$XFS_SPACEMAN_PROG -c "$command $param" $TEST_DIR 2>&1` param_checked=1 ;; *)
tests/xfs/1886 new file +135 -0
135 lines not on this page · raw message
tests/xfs/1886.out new file +53 -0
53 lines not on this page · raw message
tests/xfs/1887 new file +124 -0
124 lines not on this page · raw message
tests/xfs/1887.out new file +46 -0
46 lines not on this page · raw message
tests/xfs/1888 new file +66 -0
66 lines not on this page · raw message
tests/xfs/1888.out new file +9 -0
@@ -0,0 +1,9 @@ +QA output created by 1888 +self_healing=repair +failed to get attr xfs:self_healing on inode XXX: No data available +self_healing=none +self_healing=check +self_healing=optimize +self_healing=repair +self_healing=none +self_healing=repair
tests/xfs/1889 new file +67 -0
67 lines not on this page · raw message
tests/xfs/1889.out new file +9 -0
@@ -0,0 +1,9 @@ +QA output created by 1889 +Info: TEST_DIR/1889.mount: Checking and repairing per self_healing directive. +Info: TEST_DIR/1889.mount: Checking per self_healing directive. +Info: TEST_DIR/1889.mount: Disabling scrub per self_healing directive. +Info: TEST_DIR/1889.mount: Checking per self_healing directive. +Info: TEST_DIR/1889.mount: Optimizing per self_healing directive. +Info: TEST_DIR/1889.mount: Checking and repairing per self_healing directive. +Info: TEST_DIR/1889.mount: Disabling scrub per self_healing directive. +Info: TEST_DIR/1889.mount: Checking and repairing per self_healing directive.
Re: [PATCHSET v30.9] fstests: xfs filesystem properties
In reply to Darrick J. WongQuoted 8 lines · Darrick J. Wong
Hi all,
It would be very useful if system administrators could set properties for a given xfs filesystem to control its behavior. This we can do easily and extensibly by setting
ATTR_ROOT(aka "trusted") extended attributes on the root directory. To prevent this from becoming a weird free for all, let's add some library and tooling support so that sysadmins simply run thexfs_propertyprogram to administer these properties.
Heh, I forgot to cc the patchbomb coverletter -- this is an RFC, not for merging at this time.
--D
Quoted 11 lines · Darrick J. Wong
Hi all,
After last week's discussion about how to allow sysadmins to opt in or out of autonomous self healing XFS[1], I now have an RFC patchset that implements the filesystem properties that we talked about.
As a refresher, the design I settled on is to add
ATTR_ROOT(aka "trusted") xattrs to the root directory.ATTR_ROOTxattrs can only be accessed by processes withCAP_SYS_ADMIN, so unprivileged userspace can't mess with the sysadmin's configured preferences.
Quoted 6 lines
I decided that all fs properties should have "xfs:" in the name to make them look distinct, and defined "trusted.xfs:self_healing" as the property that controls the amount of autonomous self healing. There's a new wrapper program "
xfs_property" that one can use to administer the properties. xfs_scrub{,bed} uses the property; and mkfs.xfs can set it for you at format time.
Overall this approach looks fine to me.
-Dave.
Signature · 2 lines
Dave Chinner [email protected]