ovl: mark xwhiteouts directory with overlay.opaque='x'
Subsystems (2)
Amir Goldstein
maintainerPATCH v3 1/1 ovl: mark xwhiteouts directory with overlay.opaque='x'
An opaque directory cannot have xwhiteouts, so instead of marking an xwhiteouts directory with a new xattr, overload overlay.opaque xattr for marking both opaque dir ('y') and xwhiteouts dir ('x').
This is more efficient as the overlay.opaque xattr is checked during lookup of directory anyway.
This also prevents unnecessary checking the xattr when reading a directory without xwhiteouts, i.e. most of the time.
Note that the xwhiteouts marker is not checked on the upper layer and on the last layer in lowerstack, where xwhiteouts are not expected.
---
Miklos,
Alex has reported a problem with your suggested approach of requiring xwhiteouts xattr on layers root dir [1].
Following counter proposal, amortizes the cost of checking opaque xattr on directories during lookup to also check for xwhiteouts.
This change requires the following change to test overlay/084:
tests/overlay/084 +2 -1
@@ -115,7 +115,8 @@ do_test_xwhiteout() mkdir -p $basedir/lower $basedir/upper $basedir/work touch $basedir/lower/regular $basedir/lower/hidden $basedir/upper/hidden - setfattr -n $prefix.overlay.whiteouts -v "y" $basedir/upper + # overlay.opaque="x" means directory has xwhiteout children + setfattr -n $prefix.overlay.opaque -v "x" $basedir/upper setfattr -n $prefix.overlay.whiteout -v "y" $basedir/upper/hidden
Alex,
Please let us know if this change is acceptable for composefs.
Thanks,
Amir.
[1] https://lore.kernel.org/linux-unionfs/[email protected]/
fs/overlayfs/namei.c | 32 +++++++++++++++++++------------- fs/overlayfs/overlayfs.h | 17 +++++++++++++---- fs/overlayfs/ovl_entry.h | 2 ++ fs/overlayfs/readdir.c | 5 +++-- fs/overlayfs/super.c | 9 +++++++++ fs/overlayfs/util.c | 34 ++++++++++++++-------------------- 6 files changed, 60 insertions(+), 39 deletions(-)
fs/overlayfs/namei.c +19 -13
@@ -18,10 +18,11 @@struct ovl_lookup_data {struct super_block *sb; -struct vfsmount *mnt; +const struct ovl_layer *layer;struct qstr name;bool is_dir;bool opaque; +bool xwhiteouts;bool stop;bool last;char *redirect;
@@ -201,17 +202,13 @@ struct dentry *ovl_decode_real_fh(struct ovl_fs *ofs, struct ovl_fh *fh,return real; } -static bool ovl_is_opaquedir (struct ovl_fs *ofs,const struct path *path) -{ -return ovl_path_check_dir_xattr (ofs, path,OVL_XATTR_OPAQUE ); -} -static struct dentry *ovl_lookup_positive_unlocked (struct ovl_lookup_data *d,const char *name,struct dentry *base,int len,bool drop_negative) { -struct dentry *ret =lookup_one_unlocked (mnt_idmap (d->mnt), name, base, len); +struct dentry *ret =lookup_one_unlocked (mnt_idmap (d->layer->mnt), name, + base, len);if (!IS_ERR (ret) &&d_flags_negative (smp_load_acquire (&ret->d_flags))) {if (drop_negative && ret->d_lockref.count ==1 ) {
@@ -232,10 +229,13 @@ static int ovl_lookup_single(struct dentry *base, struct ovl_lookup_data *d, size_t prelen, const char *post, struct dentry **ret, bool drop_negative) { + struct ovl_fs *ofs = OVL_FS(d->sb);struct dentry *this;struct path path;int err;bool last_element = !post[0 ]; +bool is_upper = d->layer->idx ==0 ; +char val; this =ovl_lookup_positive_unlocked (d, name, base, namelen, drop_negative);if (IS_ERR (this)) {
@@ -253,8 +253,8 @@ static int ovl_lookup_single(struct dentry *base, struct ovl_lookup_data *d, } path.dentry = this; - path.mnt = d->mnt; -if (ovl_path_is_whiteout (OVL_FS (d->sb), &path)) { + path.mnt = d->layer->mnt; +if (ovl_path_is_whiteout (ofs, &path)) { d->stop = d->opaque = true; goto put_and_out; }
@@ -272,7 +272,7 @@ static int ovl_lookup_single(struct dentry *base, struct ovl_lookup_data *d, d->stop = true; goto put_and_out; } - err =ovl_check_metacopy_xattr (OVL_FS (d->sb), &path,NULL ); + err =ovl_check_metacopy_xattr (ofs, &path,NULL );if (err <0 ) goto out_err;
@@ -292,7 +292,11 @@ static int ovl_lookup_single(struct dentry *base, struct ovl_lookup_data *d,if (d->last) goto out; -if (ovl_is_opaquedir (OVL_FS (d->sb), &path)) { +/* overlay.opaque=x means xwhiteouts directory */ + val =ovl_get_opaquedir_val (ofs, &path); +if (last_element && !is_upper && val =='x' ) { + d->xwhiteouts = true; + }else if (val =='y' ) { d->stop = true;if (last_element) d->opaque = true;
@@ -1055,7 +1059,7 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry, old_cred =ovl_override_creds (dentry->d_sb); upperdir =ovl_dentry_upper (dentry->d_parent);if (upperdir) { - d.mnt =ovl_upper_mnt (ofs); + d.layer = &ofs->layers[0 ]; err =ovl_lookup_layer (upperdir, &d, &upperdentry, true);if (err) goto out;
@@ -1111,7 +1115,7 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,else if (d.is_dir || !ofs->numdatalayer) d.last = lower.layer->idx ==ovl_numlower (roe); - d.mnt = lower.layer->mnt; + d.layer = lower.layer; err =ovl_lookup_layer (lower.dentry, &d, &this, false);if (err) goto out_put;
@@ -1278,6 +1282,8 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,if (upperopaque)ovl_dentry_set_opaque (dentry); +if (d.xwhiteouts) +ovl_dentry_set_xwhiteouts (dentry);if (upperdentry)ovl_dentry_set_upper_alias (dentry);
fs/overlayfs/overlayfs.h +13 -4
@@ -70,6 +70,8 @@ enum ovl_entry_flag {OVL_E_UPPER_ALIAS ,OVL_E_OPAQUE ,OVL_E_CONNECTED , +/* Lower stack may contain xwhiteout entries */ + OVL_E_XWHITEOUTS, }; enum {
@@ -476,6 +478,8 @@ void ovl_dentry_clear_flag(unsigned long flag, struct dentry *dentry);bool ovl_dentry_test_flag (unsigned long flag,struct dentry *dentry);bool ovl_dentry_is_opaque (struct dentry *dentry);bool ovl_dentry_is_whiteout (struct dentry *dentry); +bool ovl_dentry_is_xwhiteouts (struct dentry *dentry); +void ovl_dentry_set_xwhiteouts (struct dentry *dentry);void ovl_dentry_set_opaque (struct dentry *dentry);bool ovl_dentry_has_upper_alias (struct dentry *dentry);void ovl_dentry_set_upper_alias (struct dentry *dentry);
@@ -494,11 +498,10 @@ struct file *ovl_path_open(const struct path *path, int flags);int ovl_copy_up_start (struct dentry *dentry,int flags);void ovl_copy_up_end (struct dentry *dentry);bool ovl_already_copied_up (struct dentry *dentry,int flags); -bool ovl_path_check_dir_xattr (struct ovl_fs *ofs,const struct path *path, -enum ovl_xattr ox); +char ovl_get_dir_xattr_val (struct ovl_fs *ofs,const struct path *path, +enum ovl_xattr ox);bool ovl_path_check_origin_xattr (struct ovl_fs *ofs,const struct path *path);bool ovl_path_check_xwhiteout_xattr (struct ovl_fs *ofs,const struct path *path); -bool ovl_path_check_xwhiteouts_xattr (struct ovl_fs *ofs,const struct path *path);bool ovl_init_uuid_xattr (struct super_block *sb,struct ovl_fs *ofs,const struct path *upperpath);
@@ -573,7 +576,13 @@ static inline bool ovl_is_impuredir(struct super_block *sb, .mnt = ovl_upper_mnt(ofs), }; -return ovl_path_check_dir_xattr (ofs, &upperpath,OVL_XATTR_IMPURE ); +return ovl_get_dir_xattr_val (ofs, &upperpath,OVL_XATTR_IMPURE ) =='y' ; +} + +static inline char ovl_get_opaquedir_val (struct ovl_fs *ofs, +const struct path *path) +{ +return ovl_get_dir_xattr_val (ofs, path,OVL_XATTR_OPAQUE ); }static inline bool ovl_redirect_follow (struct ovl_fs *ofs)
fs/overlayfs/ovl_entry.h +2 -0
@@ -86,6 +86,8 @@ struct ovl_fs {/* Shared whiteout cache */ struct dentry *whiteout;bool no_shared_whiteout; +/* xwhiteouts may exist in lower layers */ +bool xwhiteouts;/* r/o snapshot of upperdir sb's only taken on volatile mounts */ errseq_t errseq; };
fs/overlayfs/readdir.c +3 -2
@@ -165,7 +165,8 @@ static struct ovl_cache_entry *ovl_cache_entry_new(struct ovl_readdir_data *rdd, p->is_upper = rdd->is_upper; p->is_whiteout = false;/* Defer check for overlay.whiteout to ovl_iterate() */ - p->check_xwhiteout = rdd->in_xwhiteouts_dir && d_type ==DT_REG ; + p->check_xwhiteout = rdd->in_xwhiteouts_dir && + !rdd->is_upper && d_type ==DT_REG ;if (d_type ==DT_CHR ) { p->next_maybe_whiteout = rdd->first_maybe_whiteout;
@@ -306,7 +307,7 @@ static inline int ovl_dir_read(const struct path *realpath,return PTR_ERR (realfile); rdd->in_xwhiteouts_dir = rdd->dentry && -ovl_path_check_xwhiteouts_xattr (OVL_FS (rdd->dentry->d_sb), realpath); +ovl_dentry_is_xwhiteouts (rdd->dentry); rdd->first_maybe_whiteout =NULL ; rdd->ctx.pos =0 ; do {
fs/overlayfs/super.c +9 -0
@@ -1026,6 +1026,7 @@ static int ovl_get_layers(struct super_block *sb, struct ovl_fs *ofs,struct ovl_fs_context_layer *l = &ctx->lower[i];struct vfsmount *mnt;struct inode *trap; +struct path root;int fsid;if (i < nr_merged_lower)
@@ -1068,6 +1069,12 @@ static int ovl_get_layers(struct super_block *sb, struct ovl_fs *ofs,*/ mnt->mnt_flags |=MNT_READONLY |MNT_NOATIME ; +/* overlay.opaque=x means xwhiteouts directory */ + root.mnt = mnt; + root.dentry = mnt->mnt_root; +if (ovl_get_opaquedir_val (ofs, &root) =='x' ) + ofs->xwhiteouts = true; + layers[ofs->numlayer].trap = trap; layers[ofs->numlayer].mnt = mnt; layers[ofs->numlayer].idx = ofs->numlayer;
@@ -1272,6 +1279,8 @@ static struct dentry *ovl_get_root(struct super_block *sb,/* Root is always merge -> can have whiteouts */ ovl_set_flag (OVL_WHITEOUTS ,d_inode (root)); +if (OVL_FS (sb)->xwhiteouts) +ovl_dentry_set_flag (OVL_E_XWHITEOUTS , root);ovl_dentry_set_flag (OVL_E_CONNECTED , root);ovl_set_upperdata (d_inode (root));ovl_inode_init (d_inode (root), &oip, ino, fsid);
fs/overlayfs/util.c +14 -20
@@ -456,6 +456,16 @@ bool ovl_dentry_is_whiteout(struct dentry *dentry)return !dentry->d_inode &&ovl_dentry_is_opaque (dentry); } +bool ovl_dentry_is_xwhiteouts (struct dentry *dentry) +{ +return ovl_dentry_test_flag (OVL_E_XWHITEOUTS , dentry); +} + +void ovl_dentry_set_xwhiteouts (struct dentry *dentry) +{ +ovl_dentry_set_flag (OVL_E_XWHITEOUTS , dentry); +} +void ovl_dentry_set_opaque (struct dentry *dentry) {ovl_dentry_set_flag (OVL_E_OPAQUE , dentry);
@@ -739,19 +749,6 @@ bool ovl_path_check_xwhiteout_xattr(struct ovl_fs *ofs, const struct path *path)return res >=0 ; } -bool ovl_path_check_xwhiteouts_xattr (struct ovl_fs *ofs,const struct path *path) -{ -struct dentry *dentry = path->dentry; -int res; - -/* xattr.whiteouts must be a directory */ -if (!d_is_dir (dentry)) -return false; - - res =ovl_path_getxattr (ofs, path,OVL_XATTR_XWHITEOUTS ,NULL ,0 ); -return res >=0 ; -} -/* * Load persistent uuid from xattr into s_uuid if found, or store a new * random generated value in s_uuid and in xattr.
@@ -811,20 +808,17 @@ bool ovl_init_uuid_xattr(struct super_block *sb, struct ovl_fs *ofs,return false; } -bool ovl_path_check_dir_xattr (struct ovl_fs *ofs,const struct path *path, -enum ovl_xattr ox) +char ovl_get_dir_xattr_val (struct ovl_fs *ofs,const struct path *path, +enum ovl_xattr ox) {int res;char val;if (!d_is_dir (path->dentry)) -return false; +return 0 ; res =ovl_path_getxattr (ofs, path, ox, &val,1 ); -if (res ==1 && val =='y' ) -return true; - -return false; +return res ==1 ? val :0 ; }#define OVL_XATTR_OPAQUE_POSTFIX "opaque"
Signature · 1 line
2.34.1
Quoted 43 lines · Amir Goldstein
An opaque directory cannot have xwhiteouts, so instead of marking an xwhiteouts directory with a new xattr, overload overlay.opaque xattr for marking both opaque dir ('y') and xwhiteouts dir ('x').
This is more efficient as the overlay.opaque xattr is checked during lookup of directory anyway.
This also prevents unnecessary checking the xattr when reading a directory without xwhiteouts, i.e. most of the time.
Note that the xwhiteouts marker is not checked on the upper layer and on the last layer in lowerstack, where xwhiteouts are not expected.
Fixes bc8df7a3dc03 ("ovl: Add an alternative type of whiteout")Cc <[email protected]> # v6.7Signed-off-by Amir Goldstein <[email protected]>---
Miklos,
Alex has reported a problem with your suggested approach of requiring xwhiteouts xattr on layers root dir [1].
Following counter proposal, amortizes the cost of checking opaque xattr
on directories during lookup to also check for xwhiteouts.This change requires the following change to test overlay/084:
tests/overlay/084 +0
-0@@ -115,7 +115,8 @@ do_test_xwhiteout()
mkdir -p $basedir/lower $basedir/upper $basedir/work touch $basedir/lower/regular $basedir/lower/hidden $basedir/upper/hidden
- setfattr -n $prefix.overlay.whiteouts -v "y" $basedir/upper + # overlay.opaque="x" means directory has xwhiteout children + setfattr -n $prefix.overlay.opaque -v "x" $basedir/upper setfattr -n $prefix.overlay.whiteout -v "y" $basedir/upper/hidden
Quoted 3 lines
Alex,
Please let us know if this change is acceptable for composefs.
Yes, this looks very good to me. (Minor comments below) I'll do some testing on this.
Quoted 215 lines
Thanks,
Amir.[1]
https://lore.kernel.org/linux-unionfs/[email protected]/fs/overlayfs/namei.c | 32 +++++++++++++++++++-------------
fs/overlayfs/overlayfs.h| 17 +++++++++++++----fs/overlayfs/ovl_entry.h| 2 ++ fs/overlayfs/readdir.c | 5 +++-- fs/overlayfs/super.c | 9 +++++++++ fs/overlayfs/util.c | 34 ++++++++++++++--------------------6 files changed, 60 insertions(+), 39 deletions(-)fs/overlayfs/namei.c +0
-0@@ -18,10 +18,11 @@
structovl_lookup_data{
structsuper_block*sb;fs/overlayfs/namei.c +1
-1-struct vfsmount *mnt; +const struct ovl_layer *layer;struct qstr name;
boolis_dir;
bool opaque;fs/overlayfs/namei.c +1
-0+bool xwhiteouts;bool stop;
bool last;
char *redirect;fs/overlayfs/namei.c +0
-0@@ -201,17 +202,13 @@ struct dentry *ovl_decode_real_fh(struct ovl_fs *ofs, struct ovl_fh *fh, return real; }
-static boolovl_is_opaquedir(struct ovl_fs *ofs, const struct path *path)fs/overlayfs/namei.c +0
-2-{ - return ovl_path_check_dir_xattr(ofs, path,
OVL_XATTR_OPAQUE);fs/overlayfs/namei.c +0
-2-} -static struct dentry *ovl_lookup_positive_unlocked(struct
ovl_lookup_data*d,
const char *name, struct dentry *base, int len,
booldrop_negative)
{fs/overlayfs/namei.c +0
-1- struct dentry *ret = lookup_one_unlocked(mnt_idmap(d->mnt),name, base, len);
fs/overlayfs/namei.c +1
-0+ struct dentry *ret = lookup_one_unlocked(mnt_idmap(d->layer-Quoted 1 line
mnt), name,
fs/overlayfs/namei.c +1
-0+ base, len);
if (!IS_ERR(ret) && d_flags_negative(smp_load_acquire(&ret-Quoted 1 line
d_flags))) {if (
drop_negative&&ret->d_lockref.count== 1) {fs/overlayfs/namei.c +0
-0@@ -232,10 +229,13 @@ static int ovl_lookup_single(struct dentry *base, struct ovl_lookup_data *d, size_t prelen, const char *post,struct dentry **ret, bool
drop_negative)
{fs/overlayfs/namei.c +1
-0+struct ovl_fs *ofs =OVL_FS (d->sb);struct dentry *this;
struct path path;
int err;
boollast_element= !post[0];fs/overlayfs/namei.c +2
-0+bool is_upper = d->layer->idx ==0 ; +char val;
this =ovl_lookup_positive_unlocked(d, name, base, namelen, drop_negative);
if (IS_ERR(this)) {fs/overlayfs/namei.c +0
-0@@ -253,8 +253,8 @@ static int ovl_lookup_single(struct dentry *base, struct ovl_lookup_data *d, }
path.dentry = this;fs/overlayfs/namei.c +2
-2- path.mnt = d->mnt; -if (ovl_path_is_whiteout (OVL_FS (d->sb), &path)) { + path.mnt = d->layer->mnt; +if (ovl_path_is_whiteout (ofs, &path)) {
d->stop=d->opaque= true;
gotoput_and_out;
}fs/overlayfs/namei.c +1
-1@@ -272,7 +272,7 @@ static int ovl_lookup_single(struct dentry *base,struct ovl_lookup_data *d, d->stop = true; goto put_and_out; } - err =ovl_check_metacopy_xattr (OVL_FS (d->sb), &path, NULL); + err =ovl_check_metacopy_xattr (ofs, &path,NULL ); if (err < 0)goto
out_err;fs/overlayfs/namei.c +0
-0@@ -292,7 +292,11 @@ static int ovl_lookup_single(struct dentry *base, struct ovl_lookup_data *d, if (d->last) goto out;fs/overlayfs/namei.c +5
-1-if (ovl_is_opaquedir (OVL_FS (d->sb), &path)) { +/* overlay.opaque=x means xwhiteouts directory */ + val =ovl_get_opaquedir_val (ofs, &path); +if (last_element && !is_upper && val =='x' ) { + d->xwhiteouts = true; + }else if (val =='y' ) {
d->stop= true;
if (last_element)
d->opaque= true;fs/overlayfs/namei.c +1
-1@@ -1055,7 +1059,7 @@ struct dentry *ovl_lookup(struct inode *dir,struct dentry *dentry, old_cred = ovl_override_creds(dentry->d_sb); upperdir = ovl_dentry_upper(dentry->d_parent); if (upperdir) { - d.mnt =ovl_upper_mnt (ofs); + d.layer = &ofs->layers[0 ]; err = ovl_lookup_layer(upperdir, &d, &upperdentry, true);if (err)
goto out;fs/overlayfs/namei.c +0
-0@@ -1111,7 +1115,7 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry, else if (d.is_dir || !ofs->numdatalayer)d.last =
lower.layer->idx==ovl_numlower(roe);fs/overlayfs/namei.c +1
-1- d.mnt = lower.layer->mnt; + d.layer = lower.layer;err =
ovl_lookup_layer(lower.dentry, &d, &this, false);
if (err)
gotoout_put;fs/overlayfs/namei.c +0
-0@@ -1278,6 +1282,8 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,
if (upperopaque)
ovl_dentry_set_opaque(dentry);fs/overlayfs/namei.c +2
-0+if (d.xwhiteouts) +ovl_dentry_set_xwhiteouts (dentry);
if (upperdentry)ovl_dentry_set_upper_alias(dentry);fs/overlayfs/overlayfs.h +2
-0@@ -70,6 +70,8 @@ enum ovl_entry_flag { OVL_E_UPPER_ALIAS, OVL_E_OPAQUE, OVL_E_CONNECTED, +/* Lower stack may contain xwhiteout entries */ + OVL_E_XWHITEOUTS, };
enum {fs/overlayfs/overlayfs.h +0
-0@@ -476,6 +478,8 @@ void ovl_dentry_clear_flag(unsigned long flag, struct dentry *dentry);bool
ovl_dentry_test_flag(unsigned long flag, struct dentry *dentry);
boolovl_dentry_is_opaque(struct dentry *dentry); boolovl_dentry_is_whiteout(struct dentry *dentry);fs/overlayfs/overlayfs.h +2
-0+bool ovl_dentry_is_xwhiteouts (struct dentry *dentry); +void ovl_dentry_set_xwhiteouts (struct dentry *dentry);void
ovl_dentry_set_opaque(struct dentry *dentry); boolovl_dentry_has_upper_alias(struct dentry *dentry); voidovl_dentry_set_upper_alias(struct dentry *dentry);fs/overlayfs/overlayfs.h +2
-2@@ -494,11 +498,10 @@ struct file *ovl_path_open(const struct path *path, int flags); int ovl_copy_up_start(struct dentry *dentry, int flags); void ovl_copy_up_end(struct dentry *dentry); bool ovl_already_copied_up(struct dentry *dentry, int flags); -bool ovl_path_check_dir_xattr (struct ovl_fs *ofs,const struct path *path, - enum ovl_xattr ox); +char ovl_get_dir_xattr_val(struct ovl_fs *ofs, const struct path *path, + enum ovl_xattr ox);bool
ovl_path_check_origin_xattr(struct ovl_fs *ofs, const struct path *path);
boolovl_path_check_xwhiteout_xattr(struct ovl_fs *ofs, const struct path *path);
-boolovl_path_check_xwhiteouts_xattr(struct ovl_fs *ofs, const struct path *path);
boolovl_init_uuid_xattr(struct super_block *sb, struct ovl_fs *ofs, const struct path *upperpath);fs/overlayfs/overlayfs.h +0
-0@@ -573,7 +576,13 @@ static inline bool ovl_is_impuredir(structsuper_block *sb, .mnt = ovl_upper_mnt(ofs), };fs/overlayfs/overlayfs.h +0
-1- return ovl_path_check_dir_xattr(ofs, &upperpath,
OVL_XATTR_IMPURE);fs/overlayfs/overlayfs.h +1
-0+ return ovl_get_dir_xattr_val(ofs, &upperpath,
OVL_XATTR_IMPURE) == 'y';fs/overlayfs/overlayfs.h +6
-0+} + +static inline char ovl_get_opaquedir_val (struct ovl_fs *ofs, +const struct path *path) +{ +return ovl_get_dir_xattr_val (ofs, path,OVL_XATTR_OPAQUE );}
static inline boolovl_redirect_follow(struct ovl_fs *ofs)fs/overlayfs/ovl_entry.h +0
-0
fs/overlayfs/ovl_entry.h struct ovl_fs { · line 90
Quoted 5 lines
fs/overlayfs/ovl_entry.h +2
-0@@ -86,6 +86,8 @@ struct ovl_fs { /* Shared whiteout cache */ struct dentry *whiteout; bool no_shared_whiteout; +/* xwhiteouts may exist in lower layers */ +bool xwhiteouts;
This comment is a bit off, this is now only used for the root dir.
Quoted 17 lines
fs/overlayfs/ovl_entry.h +0
-0/* r/o snapshot of upperdir sb's only taken on volatilemounts */
errseq_terrseq;
};fs/overlayfs/readdir.c +2
-1@@ -165,7 +165,8 @@ static struct ovl_cache_entry *ovl_cache_entry_new(struct ovl_readdir_data *rdd, p->is_upper = rdd->is_upper; p->is_whiteout = false; /* Defer check for overlay.whiteout to ovl_iterate() */ - p->check_xwhiteout = rdd->in_xwhiteouts_dir && d_type == DT_REG; + p->check_xwhiteout = rdd->in_xwhiteouts_dir && + !rdd->is_upper && d_type == DT_REG;
Quoted 1 line
Maybe we can move the is_upper check to where we set in_xwhiteouts_dir?
fs/overlayfs/readdir.c static inline int ovl_dir_read(const struct path *realpath, · line 310
Quoted 10 lines
if (
d_type==DT_CHR) {
p->next_maybe_whiteout=rdd->first_maybe_whiteout;fs/overlayfs/readdir.c +0
-0@@ -306,7 +307,7 @@ static inline int ovl_dir_read(const struct path *realpath, return PTR_ERR(realfile);
rdd->in_xwhiteouts_dir=rdd->dentry&&fs/overlayfs/readdir.c +0
-1- ovl_path_check_xwhiteouts_xattr(OVL_FS(rdd->dentry-Quoted 1 line
d_sb), realpath);fs/overlayfs/readdir.c +1
-0+ovl_dentry_is_xwhiteouts (rdd->dentry);
Now that the xwhiteout flag is on the dentry, it will be set for all layers. Maybe we can avoid setting in_whiteouts_dir for the lowermost layer?
Quoted 114 lines
rdd->first_maybe_whiteout= NULL;
rdd->ctx.pos= 0;
do {fs/overlayfs/super.c +1
-0@@ -1026,6 +1026,7 @@ static int ovl_get_layers(struct super_block *sb, struct ovl_fs *ofs, struct ovl_fs_context_layer *l = &ctx->lower[i]; struct vfsmount *mnt; struct inode *trap; +struct path root; int fsid;
if (i <nr_merged_lower)fs/overlayfs/super.c +0
-0@@ -1068,6 +1069,12 @@ static int ovl_get_layers(struct super_block*sb, struct ovl_fs *ofs, */ mnt->mnt_flags |= MNT_READONLY | MNT_NOATIME;fs/overlayfs/super.c +6
-0+/* overlay.opaque=x means xwhiteouts directory */ + root.mnt = mnt; + root.dentry = mnt->mnt_root; +if (ovl_get_opaquedir_val (ofs, &root) =='x' ) + ofs->xwhiteouts = true; +layers[ofs->numlayer].trap = trap; layers[ofs->numlayer].mnt = mnt; layers[ofs->numlayer].idx =
ofs->numlayer;fs/overlayfs/super.c +0
-0@@ -1272,6 +1279,8 @@ static struct dentry *ovl_get_root(struct super_block *sb,
/* Root is always merge -> can have whiteouts */ovl_set_flag(OVL_WHITEOUTS, d_inode(root));fs/overlayfs/super.c +2
-0+if (OVL_FS (sb)->xwhiteouts) +ovl_dentry_set_flag (OVL_E_XWHITEOUTS , root);
ovl_dentry_set_flag(OVL_E_CONNECTED, root); ovl_set_upperdata(d_inode(root));ovl_inode_init(d_inode(root), &oip, ino, fsid);fs/overlayfs/util.c +0
-0@@ -456,6 +456,16 @@ bool ovl_dentry_is_whiteout(struct dentry *dentry) return !dentry->d_inode && ovl_dentry_is_opaque(dentry); }fs/overlayfs/util.c +10
-0+bool ovl_dentry_is_xwhiteouts (struct dentry *dentry) +{ +return ovl_dentry_test_flag (OVL_E_XWHITEOUTS , dentry); +} + +void ovl_dentry_set_xwhiteouts (struct dentry *dentry) +{ +ovl_dentry_set_flag (OVL_E_XWHITEOUTS , dentry); +} +void
ovl_dentry_set_opaque(struct dentry *dentry){
ovl_dentry_set_flag(OVL_E_OPAQUE, dentry);fs/overlayfs/util.c +0
-0@@ -739,19 +749,6 @@ bool ovl_path_check_xwhiteout_xattr(struct ovl_fs *ofs, const struct path *path) return res >= 0; }
-boolovl_path_check_xwhiteouts_xattr(struct ovl_fs *ofs, const struct path *path)fs/overlayfs/util.c +0
-9-{ -struct dentry *dentry = path->dentry; -int res; - -/* xattr.whiteouts must be a directory */ -if (!d_is_dir (dentry)) -return false; - - res = ovl_path_getxattr(ofs, path, OVL_XATTR_XWHITEOUTS,NULL, 0);
fs/overlayfs/util.c +0
-3-return res >=0 ; -} -/*
* Load persistent uuid from xattr intos_uuidif found, or store a new
* random generated value ins_uuidand in xattr.fs/overlayfs/util.c +0
-0@@ -811,20 +808,17 @@ bool ovl_init_uuid_xattr(struct super_block *sb, struct ovl_fs *ofs, return false; }
-bool ovl_path_check_dir_xattr(structovl_fs*ofs, const struct path *path,fs/overlayfs/util.c +1
-1- enum ovl_xattr ox) +char ovl_get_dir_xattr_val(struct ovl_fs *ofs, const struct path*path,
fs/overlayfs/util.c +1
-0+ enum ovl_xattr ox){
int res;
char val;
if (!d_is_dir(path->dentry))fs/overlayfs/util.c +1
-1-return false; +return 0 ;
res =ovl_path_getxattr(ofs, path, ox, &val, 1);fs/overlayfs/util.c +1
-4-if (res ==1 && val =='y' ) -return true; - -return false; +return res ==1 ? val :0 ;}
#defineOVL_XATTR_OPAQUE_POSTFIX"opaque"
Signature · 9 lines
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
=-=-=
Alexander Larsson Red Hat,
Inc
[email protected] [email protected]
He's a deeply religious small-town paranormal investigator searching
for
his wife's true killer. She's a strong-willed French-Canadian single
mother operating on the wrong side of the law. They fight crime! Quoted 45 lines · Alexander Larsson
Quoted 43 lines · Amir Goldstein
An opaque directory cannot have xwhiteouts, so instead of marking an xwhiteouts directory with a new xattr, overload overlay.opaque xattr for marking both opaque dir ('y') and xwhiteouts dir ('x').
This is more efficient as the overlay.opaque xattr is checked during lookup of directory anyway.
This also prevents unnecessary checking the xattr when reading a directory without xwhiteouts, i.e. most of the time.
Note that the xwhiteouts marker is not checked on the upper layer and on the last layer in lowerstack, where xwhiteouts are not expected.
Fixes bc8df7a3dc03 ("ovl: Add an alternative type of whiteout")Cc <[email protected]> # v6.7Signed-off-by Amir Goldstein <[email protected]>---
Miklos,
Alex has reported a problem with your suggested approach of requiring xwhiteouts xattr on layers root dir [1].
Following counter proposal, amortizes the cost of checking opaque xattr
on directories during lookup to also check for xwhiteouts.This change requires the following change to test overlay/084:
tests/overlay/084 +0
-0@@ -115,7 +115,8 @@ do_test_xwhiteout() mkdir -p $basedir/lower $basedir/upper $basedir/work touch $basedir/lower/regular $basedir/lower/hidden$basedir/upper/hidden
tests/overlay/084 +2
-1- setfattr -n $prefix.overlay.whiteouts -v "y" $basedir/upper + # overlay.opaque="x" means directory has xwhiteout children + setfattr -n $prefix.overlay.opaque -v "x" $basedir/upper setfattr -n $prefix.overlay.whiteout -v "y"$basedir/upper/hidden
Quoted 7 lines
Quoted 3 lines
Alex,
Please let us know if this change is acceptable for composefs.
Yes, this looks very good to me. (Minor comments below) I'll do some testing on this.
Excellent, I'll be expecting your RVB/Tested-by.
Quoted 250 lines
Quoted 215 lines
Thanks,
Amir.[1]
https://lore.kernel.org/linux-unionfs/[email protected]/fs/overlayfs/namei.c | 32 +++++++++++++++++++------------- fs/overlayfs/overlayfs.h | 17 +++++++++++++---- fs/overlayfs/ovl_entry.h | 2 ++ fs/overlayfs/readdir.c | 5 +++-- fs/overlayfs/super.c | 9 +++++++++ fs/overlayfs/util.c | 34 ++++++++++++++-------------------- 6 files changed, 60 insertions(+), 39 deletions(-)fs/overlayfs/namei.c +2
-6@@ -18,10 +18,11 @@struct ovl_lookup_data {struct super_block *sb; -struct vfsmount *mnt; +const struct ovl_layer *layer;struct qstr name;bool is_dir;bool opaque; +bool xwhiteouts;bool stop;bool last;char *redirect;@@ -201,17 +202,13 @@ struct dentry *ovl_decode_real_fh(struct ovl_fs *ofs, struct ovl_fh *fh, return real; } -static bool ovl_is_opaquedir (struct ovl_fs *ofs,const struct path *path) -{ -return ovl_path_check_dir_xattr (ofs, path, OVL_XATTR_OPAQUE); -} -static struct dentry *ovl_lookup_positive_unlocked (struct ovl_lookup_data *d,const char *name,struct dentry *base,int len, bool
drop_negative)
{
- struct dentry *ret = lookup_one_unlocked(mnt_idmap(d->mnt),
name, base, len);
+ struct dentry *ret = lookup_one_unlocked(mnt_idmap(d->layer-Quoted 1 line
mnt), name,
+ base, len);
if (!IS_ERR(ret) && d_flags_negative(smp_load_acquire(&ret-Quoted 1 line
d_flags))) {if (drop_negative && ret->d_lockref.count == 1) {fs/overlayfs/namei.c +3
-0@@ -232,10 +229,13 @@ static int ovl_lookup_single(struct dentry *base, struct ovl_lookup_data *d, size_t prelen, const char *post, struct dentry **ret, bool drop_negative) { +struct ovl_fs *ofs =OVL_FS (d->sb);struct dentry *this;struct path path;int err;bool last_element = !post[0 ]; +bool is_upper = d->layer->idx ==0 ; +char val;this = ovl_lookup_positive_unlocked(d, name, base, namelen,
drop_negative); if (IS_ERR(this)) {fs/overlayfs/namei.c +2
-2@@ -253,8 +253,8 @@ static int ovl_lookup_single(struct dentry *base, struct ovl_lookup_data *d, } path.dentry = this; - path.mnt = d->mnt; -if (ovl_path_is_whiteout (OVL_FS (d->sb), &path)) { + path.mnt = d->layer->mnt; +if (ovl_path_is_whiteout (ofs, &path)) { d->stop = d->opaque = true; goto put_and_out;}fs/overlayfs/namei.c +1
-1@@ -272,7 +272,7 @@ static int ovl_lookup_single(struct dentry *base,struct ovl_lookup_data *d, d->stop = true; goto put_and_out; } - err =ovl_check_metacopy_xattr (OVL_FS (d->sb), &path, NULL); + err =ovl_check_metacopy_xattr (ofs, &path,NULL );if (err <0 )goto out_err;fs/overlayfs/namei.c +5
-1@@ -292,7 +292,11 @@ static int ovl_lookup_single(struct dentry *base, struct ovl_lookup_data *d, if (d->last) goto out; -if (ovl_is_opaquedir (OVL_FS (d->sb), &path)) { +/* overlay.opaque=x means xwhiteouts directory */ + val =ovl_get_opaquedir_val (ofs, &path); +if (last_element && !is_upper && val =='x' ) { + d->xwhiteouts = true; + }else if (val =='y' ) { d->stop = true;if (last_element)d->opaque = true;fs/overlayfs/namei.c +1
-1@@ -1055,7 +1059,7 @@ struct dentry *ovl_lookup(struct inode *dir,struct dentry *dentry, old_cred =ovl_override_creds (dentry->d_sb); upperdir =ovl_dentry_upper (dentry->d_parent);if (upperdir) { - d.mnt =ovl_upper_mnt (ofs); + d.layer = &ofs->layers[0 ]; err =ovl_lookup_layer (upperdir, &d, &upperdentry, true);if (err) goto out;fs/overlayfs/namei.c +1
-1@@ -1111,7 +1115,7 @@ struct dentry *ovl_lookup(struct inode *dir,struct dentry *dentry, else if (d.is_dir || !ofs->numdatalayer) d.last = lower.layer->idx ==ovl_numlower (roe); - d.mnt = lower.layer->mnt; + d.layer = lower.layer; err = ovl_lookup_layer(lower.dentry, &d, &this,false); if (err) goto out_put;fs/overlayfs/namei.c +2
-0@@ -1278,6 +1282,8 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry, if (upperopaque) ovl_dentry_set_opaque(dentry); +if (d.xwhiteouts) +ovl_dentry_set_xwhiteouts (dentry);if (upperdentry)ovl_dentry_set_upper_alias(dentry);fs/overlayfs/overlayfs.h +4
-0@@ -70,6 +70,8 @@ enum ovl_entry_flag {OVL_E_UPPER_ALIAS ,OVL_E_OPAQUE ,OVL_E_CONNECTED , +/* Lower stack may contain xwhiteout entries */ + OVL_E_XWHITEOUTS, }; enum {@@ -476,6 +478,8 @@ void ovl_dentry_clear_flag(unsigned long flag, struct dentry *dentry);bool ovl_dentry_test_flag (unsigned long flag,struct dentry *dentry);bool ovl_dentry_is_opaque (struct dentry *dentry);bool ovl_dentry_is_whiteout (struct dentry *dentry); +bool ovl_dentry_is_xwhiteouts (struct dentry *dentry); +void ovl_dentry_set_xwhiteouts (struct dentry *dentry);void ovl_dentry_set_opaque (struct dentry *dentry);bool
ovl_dentry_has_upper_alias(struct dentry *dentry); voidovl_dentry_set_upper_alias(struct dentry *dentry);fs/overlayfs/overlayfs.h +2
-2@@ -494,11 +498,10 @@ struct file *ovl_path_open(const struct path *path, int flags);int ovl_copy_up_start (struct dentry *dentry,int flags);void ovl_copy_up_end (struct dentry *dentry);bool ovl_already_copied_up (struct dentry *dentry,int flags); -bool ovl_path_check_dir_xattr (struct ovl_fs *ofs,const struct path *path, -enum ovl_xattr ox); +char ovl_get_dir_xattr_val (struct ovl_fs *ofs,const struct path *path, +enum ovl_xattr ox);bool ovl_path_check_origin_xattr (struct ovl_fs *ofs,const struct path *path); bool ovl_path_check_xwhiteout_xattr(struct ovl_fs *ofs, const structpath *path);
-boolovl_path_check_xwhiteouts_xattr(struct ovl_fs *ofs, const struct path *path);
bool ovl_init_uuid_xattr(structsuper_block*sb, structovl_fs*ofs,const struct path *upperpath);fs/overlayfs/overlayfs.h +7
-1@@ -573,7 +576,13 @@ static inline bool ovl_is_impuredir(structsuper_block *sb, .mnt = ovl_upper_mnt(ofs), }; -return ovl_path_check_dir_xattr (ofs, &upperpath, OVL_XATTR_IMPURE); +return ovl_get_dir_xattr_val (ofs, &upperpath,OVL_XATTR_IMPURE ) =='y' ; +} + +static inline char ovl_get_opaquedir_val (struct ovl_fs *ofs, +const struct path *path) +{ +return ovl_get_dir_xattr_val (ofs, path,OVL_XATTR_OPAQUE );}
static inline bool
ovl_redirect_follow(struct ovl_fs *ofs)fs/overlayfs/ovl_entry.h +0
-0fs/overlayfs/ovl_entry.h struct ovl_fs { · line 90
Quoted 5 lines
fs/overlayfs/ovl_entry.h +2
-0@@ -86,6 +86,8 @@ struct ovl_fs {/* Shared whiteout cache */ struct dentry *whiteout;bool no_shared_whiteout; +/* xwhiteouts may exist in lower layers */ +bool xwhiteouts;This comment is a bit off, this is now only used for the root dir.
Quoted 9 lines
fs/overlayfs/ovl_entry.h +0
-0/* r/o snapshot of upperdir sb's only taken on volatile mounts */
errseq_t errseq;};
fs/overlayfs/readdir.c +0
-0fs/overlayfs/readdir.c static struct ovl_cache_entry · line 172
Quoted 9 lines
fs/overlayfs/readdir.c +2
-1@@ -165,7 +165,8 @@ static struct ovl_cache_entry *ovl_cache_entry_new(struct ovl_readdir_data *rdd, p->is_upper = rdd->is_upper; p->is_whiteout = false;/* Defer check for overlay.whiteout to ovl_iterate() */ - p->check_xwhiteout = rdd->in_xwhiteouts_dir && d_type ==DT_REG ; + p->check_xwhiteout = rdd->in_xwhiteouts_dir && + !rdd->is_upper && d_type ==DT_REG ;Maybe we can move the
is_uppercheck to where we setin_xwhiteouts_dir?Quoted 6 lines
if (d_type == DT_CHR) { p->next_maybe_whiteout = rdd->first_maybe_whiteout;fs/overlayfs/readdir.c +0
-0@@ -306,7 +307,7 @@ static inline int ovl_dir_read(const struct path *realpath, return PTR_ERR(realfile);
Quoted 9 lines
fs/overlayfs/readdir.c static inline int ovl_dir_read(const struct path · line 312
Quoted 4 lines
fs/overlayfs/readdir.c +1
-1rdd->in_xwhiteouts_dir = rdd->dentry && -ovl_path_check_xwhiteouts_xattr (OVL_FS (rdd->dentry- >d_sb), realpath); +ovl_dentry_is_xwhiteouts (rdd->dentry);Now that the xwhiteout flag is on the dentry, it will be set for all layers. Maybe we can avoid setting
in_whiteouts_dirfor the lowermost layer?
Applied this diff and pushed to the ovl-fixes branch.
Will wait for ACK from Miklos before sending PR.
Thanks,
Amir.
fs/overlayfs/ovl_entry.h +1 -1
@@ -86,7 +86,7 @@ struct ovl_fs {/* Shared whiteout cache */ struct dentry *whiteout;bool no_shared_whiteout; -/* xwhiteouts may exist in lower layers */ +/* xwhiteouts may exist in lower layer root dirs */ bool xwhiteouts;/* r/o snapshot of upperdir sb's only taken on volatile mounts */ errseq_t errseq;
fs/overlayfs/readdir.c +0 -0
@@ -165,8 +165,7 @@ static struct ovl_cache_entry
*ovl_cache_entry_new(struct ovl_readdir_data *rdd,
p->is_upper = rdd->is_upper;
p->is_whiteout = false;
/* Defer check for overlay.whiteout to ovl_iterate() */- p->check_xwhiteout = rdd->in_xwhiteouts_dir &&
- !rdd->is_upper && d_type == DT_REG;
+ p->check_xwhiteout = rdd->in_xwhiteouts_dir && d_type == DT_REG;
if (d_type == DT_CHR) {
p->next_maybe_whiteout = rdd->first_maybe_whiteout;
@@ -306,8 +305,9 @@ static inline int ovl_dir_read(const struct path *realpath,
if (IS_ERR(realfile))
return PTR_ERR(realfile);- rdd->in_xwhiteouts_dir = rdd->dentry &&
- ovl_dentry_is_xwhiteouts(rdd->dentry);
+ /* No need to check for xwhiteouts in upper and lowermost layers */
+ rdd->in_xwhiteouts_dir = !rdd->is_upper && !rdd->is_lowest &&
+ rdd->dentry && ovl_dentry_is_xwhiteouts(rdd->dentry);
rdd->first_maybe_whiteout = NULL;
rdd->ctx.pos = 0;Quoted 57 lines · Amir Goldstein
Quoted 55 lines · Alexander Larsson
Quoted 53 lines · Amir Goldstein
An opaque directory cannot have xwhiteouts, so instead of marking an
xwhiteouts directory with a new xattr, overload overlay.opaque xattr
for marking both opaque dir ('y') and xwhiteouts dir ('x').This is more efficient as the overlay.opaque xattr is checked during
lookup of directory anyway.This also prevents unnecessary checking the xattr when reading a directory without xwhiteouts, i.e. most of the time.
Note that the xwhiteouts marker is not checked on the upper layer and
on the last layer in lowerstack, where xwhiteouts are not expected.Fixes bc8df7a3dc03 ("ovl: Add an alternative type of whiteout")Cc <[email protected]> # v6.7Signed-off-by Amir Goldstein <[email protected]>---
Miklos,
Alex has reported a problem with your suggested approach of requiring
xwhiteouts xattr on layers root dir [1].Following counter proposal, amortizes the cost of checking opaque xattr
on directories during lookup to also check for xwhiteouts.This change requires the following change to test overlay/084:
tests/overlay/084 +0
-0@@ -115,7 +115,8 @@ do_test_xwhiteout()mkdir -p $basedir/lower $basedir/upper $basedir/work touch $basedir/lower/regular $basedir/lower/hidden $basedir/upper/hidden
- setfattr -n $prefix.overlay.whiteouts -v "y" $basedir/upper
+ # overlay.opaque="x" means directory has xwhiteout children
+ setfattr -n $prefix.overlay.opaque -v "x" $basedir/upper setfattr -n $prefix.overlay.whiteout -v "y" $basedir/upper/hiddenAlex,
Quoted 8 lines
Quoted 5 lines
Quoted 1 line
Please let us know if this change is acceptable for composefs.
Yes, this looks very good to me. (Minor comments below) I'll do some testing on this.
Excellent, I'll be expecting your RVB/Tested-by.
Quoted 1 line
Yes
for the patch in the ovl-fixes branch.
I tested it manually, and with xfstest (with change), and also with this composefs change:
https://github.com/alexlarsson/composefs/tree/new-format-version
I created a lowerdir with a regular whiteout in, and after running that though the changed mkcomposefs I was able to mount the composefs image, and then mount the lowerdirs from the composefs mount, and they correctly handled the whiteout both when mounted normally and with userxattr.
Quoted 331 lines
Quoted 269 lines
Quoted 230 lines
Thanks,
Amir.[1]
https://lore.kernel.org/linux-unionfs/[email protected]/fs/overlayfs/namei.c | 32 +++++++++++++++++++-------------
fs/overlayfs/overlayfs.h| 17 +++++++++++++----fs/overlayfs/ovl_entry.h| 2 ++ fs/overlayfs/readdir.c | 5 +++-- fs/overlayfs/super.c | 9 +++++++++ fs/overlayfs/util.c | 34 ++++++++++++++--------------------6 files changed, 60 insertions(+), 39 deletions(-)fs/overlayfs/namei.c +2
-1@@ -18,10 +18,11 @@ struct ovl_lookup_data { struct super_block *sb; - struct vfsmount *mnt; + const struct ovl_layer *layer; struct qstr name; bool is_dir; bool opaque; + bool xwhiteouts; bool stop; bool last; char *redirect;@@ -201,17 +202,13 @@ struct dentry *ovl_decode_real_fh(struct
ovl_fs
*ofs, structovl_fh*fh,
return real;
}-static bool ovl_is_opaquedir(struct
ovl_fs*ofs, const struct path
*path)
-{
- returnovl_path_check_dir_xattr(ofs, path, OVL_XATTR_OPAQUE);fs/overlayfs/namei.c +0
-2-} -static struct dentry *ovl_lookup_positive_unlocked(struct
ovl_lookup_data*d,
const char *name,
struct dentry *base, int len,
booldrop_negative)
{
- struct dentry *ret =lookup_one_unlocked(mnt_idmap(d->mnt), name, base, len);
+ struct dentry *ret = lookup_one_unlocked(mnt_idmap(d-Quoted 2 lines
layer-
mnt), name,+ base, len);
if (!IS_ERR(ret) && d_flags_negative(smp_load_acquire(&ret-
Quoted 1 line
d_flags))) {if (
drop_negative&&ret->d_lockref.count== 1) {fs/overlayfs/namei.c +0
-0@@ -232,10 +229,13 @@ static int ovl_lookup_single(struct dentry *base, struct ovl_lookup_data *d, size_t prelen, const char *post,struct dentry **ret, bool
drop_negative)
{
+ structovl_fs*ofs =OVL_FS(d->sb); struct dentry *this;
struct path path;
int err;
boollast_element= !post[0];
+ boolis_upper=d->layer->idx== 0;
+ char val;this =
ovl_lookup_positive_unlocked(d, name, base, namelen, drop_negative);
if (IS_ERR(this)) {fs/overlayfs/namei.c +2
-2@@ -253,8 +253,8 @@ static int ovl_lookup_single(struct dentry *base, struct ovl_lookup_data *d, } path.dentry = this; - path.mnt = d->mnt; - if (ovl_path_is_whiteout(OVL_FS(d->sb), &path)) { + path.mnt = d->layer->mnt; + if (ovl_path_is_whiteout(ofs, &path)) { d->stop = d->opaque = true;goto
put_and_out;
}fs/overlayfs/namei.c +0
-1@@ -272,7 +272,7 @@ static int ovl_lookup_single(struct dentry *base, struct ovl_lookup_data *d, d->stop = true; goto put_and_out; } - err = ovl_check_metacopy_xattr(OVL_FS(d->sb), &path,NULL);
+ err =ovl_check_metacopy_xattr(ofs, &path, NULL); if (err < 0)
gotoout_err;fs/overlayfs/namei.c +5
-1@@ -292,7 +292,11 @@ static int ovl_lookup_single(struct dentry *base, struct ovl_lookup_data *d, if (d->last) goto out; - if (ovl_is_opaquedir(OVL_FS(d->sb), &path)) { + /* overlay.opaque=x means xwhiteouts directory */ + val = ovl_get_opaquedir_val(ofs, &path); + if (last_element && !is_upper && val == 'x') { + d->xwhiteouts = true; + } else if (val == 'y') { d->stop = true; if (last_element)
d->opaque= true;fs/overlayfs/namei.c +1
-1@@ -1055,7 +1059,7 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry, old_cred = ovl_override_creds(dentry->d_sb); upperdir = ovl_dentry_upper(dentry->d_parent); if (upperdir) { - d.mnt = ovl_upper_mnt(ofs); + d.layer = &ofs->layers[0]; err = ovl_lookup_layer(upperdir, &d, &upperdentry,true);
if (err)
goto out;fs/overlayfs/namei.c +0
-0@@ -1111,7 +1115,7 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry, else if (d.is_dir || !ofs->numdatalayer)d.last =
lower.layer->idx==ovl_numlower(roe);- d.mnt =
lower.layer->mnt;
+ d.layer = lower.layer;
err =ovl_lookup_layer(lower.dentry, &d, &this, false);
if (err)
gotoout_put;fs/overlayfs/namei.c +2
-0@@ -1278,6 +1282,8 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry, if (upperopaque) ovl_dentry_set_opaque(dentry); + if (d.xwhiteouts) + ovl_dentry_set_xwhiteouts(dentry);if (upperdentry)
ovl_dentry_set_upper_alias(dentry);fs/overlayfs/overlayfs.h +2
-0@@ -70,6 +70,8 @@ enum ovl_entry_flag { OVL_E_UPPER_ALIAS, OVL_E_OPAQUE, OVL_E_CONNECTED, + /* Lower stack may contain xwhiteout entries */ + OVL_E_XWHITEOUTS, }; enum {@@ -476,6 +478,8 @@ void ovl_dentry_clear_flag(unsigned long flag, struct dentry *dentry);bool
ovl_dentry_test_flag(unsigned long flag, struct dentry *dentry);
boolovl_dentry_is_opaque(struct dentry *dentry); boolovl_dentry_is_whiteout(struct dentry *dentry);fs/overlayfs/overlayfs.h +2
-0+bool ovl_dentry_is_xwhiteouts (struct dentry *dentry); +void ovl_dentry_set_xwhiteouts (struct dentry *dentry);void
ovl_dentry_set_opaque(struct dentry *dentry); boolovl_dentry_has_upper_alias(struct dentry *dentry); voidovl_dentry_set_upper_alias(struct dentry *dentry);fs/overlayfs/overlayfs.h +0
-0@@ -494,11 +498,10 @@ struct file *ovl_path_open(const structpath
*path, int flags);
intovl_copy_up_start(struct dentry *dentry, int flags); voidovl_copy_up_end(struct dentry *dentry);
boolovl_already_copied_up(struct dentry *dentry, int flags); -bool ovl_path_check_dir_xattr(structovl_fs*ofs, const struct path
*path,
- enumovl_xattrox);
+char ovl_get_dir_xattr_val(structovl_fs*ofs, const struct path *path,
+ enumovl_xattrox);
bool ovl_path_check_origin_xattr(structovl_fs*ofs, const struct
path *path);
bool ovl_path_check_xwhiteout_xattr(structovl_fs*ofs, const struct
path *path);
-boolovl_path_check_xwhiteouts_xattr(struct ovl_fs *ofs, const struct path *path);
bool ovl_init_uuid_xattr(structsuper_block*sb, structovl_fs*ofs,
const struct path *upperpath);fs/overlayfs/overlayfs.h +7
-1@@ -573,7 +576,13 @@ static inline bool ovl_is_impuredir(structsuper_block *sb, .mnt = ovl_upper_mnt(ofs), }; - return ovl_path_check_dir_xattr(ofs, &upperpath, OVL_XATTR_IMPURE); + return ovl_get_dir_xattr_val(ofs, &upperpath,OVL_XATTR_IMPURE ) =='y' ; +} + +static inline char ovl_get_opaquedir_val (struct ovl_fs *ofs, + const struct path *path) +{ + return ovl_get_dir_xattr_val(ofs, path, OVL_XATTR_OPAQUE);}
static inline bool
ovl_redirect_follow(struct ovl_fs *ofs)fs/overlayfs/ovl_entry.h +0
-0fs/overlayfs/ovl_entry.h struct ovl_fs { · line 90
Quoted 5 lines
fs/overlayfs/ovl_entry.h +2
-0@@ -86,6 +86,8 @@ struct ovl_fs { /* Shared whiteout cache */ struct dentry *whiteout; bool no_shared_whiteout; + /* xwhiteouts may exist in lower layers */ + bool xwhiteouts;This comment is a bit off, this is now only used for the root dir.
Quoted 9 lines
fs/overlayfs/ovl_entry.h +0
-0/* r/o snapshot of upperdir sb's only taken on volatilemounts */
errseq_terrseq;
};fs/overlayfs/readdir.c +0
-0fs/overlayfs/readdir.c static struct ovl_cache_entry · line 172
Quoted 9 lines
fs/overlayfs/readdir.c +2
-1@@ -165,7 +165,8 @@ static struct ovl_cache_entry *ovl_cache_entry_new(struct ovl_readdir_data *rdd, p->is_upper = rdd->is_upper; p->is_whiteout = false; /* Defer check for overlay.whiteout to ovl_iterate() */ - p->check_xwhiteout = rdd->in_xwhiteouts_dir && d_type == DT_REG; + p->check_xwhiteout = rdd->in_xwhiteouts_dir && + !rdd->is_upper && d_type == DT_REG;Maybe we can move the
is_uppercheck to where we setin_xwhiteouts_dir?Quoted 9 lines
if (
d_type==DT_CHR) {
p->next_maybe_whiteout=rdd->first_maybe_whiteout;fs/overlayfs/readdir.c +0
-0@@ -306,7 +307,7 @@ static inline int ovl_dir_read(const structpath
*realpath,
returnPTR_ERR(realfile);
rdd->in_xwhiteouts_dir=rdd->dentry&&
- ovl_path_check_xwhiteouts_xattr(OVL_FS(rdd->dentry-Quoted 9 lines
Quoted 2 lines
Quoted 1 line
d_sb), realpath);+
ovl_dentry_is_xwhiteouts(rdd->dentry);Now that the xwhiteout flag is on the dentry, it will be set for all
layers. Maybe we can avoid settingin_whiteouts_dirfor the lowermost
layer?Applied this diff and pushed to the ovl-fixes branch.
Will wait for ACK from Miklos before sending PR.
Thanks,
Amir.fs/overlayfs/ovl_entry.h +1
-1@@ -86,7 +86,7 @@ struct ovl_fs { /* Shared whiteout cache */ struct dentry *whiteout; bool no_shared_whiteout; - /* xwhiteouts may exist in lower layers */ + /* xwhiteouts may exist in lower layer root dirs */ bool xwhiteouts; /* r/o snapshot of upperdir sb's only taken on volatilemounts */
errseq_terrseq;fs/overlayfs/readdir.c +1
-2@@ -165,8 +165,7 @@ static struct ovl_cache_entry *ovl_cache_entry_new(struct ovl_readdir_data *rdd, p->is_upper = rdd->is_upper; p->is_whiteout = false; /* Defer check for overlay.whiteout to ovl_iterate() */ - p->check_xwhiteout = rdd->in_xwhiteouts_dir && - !rdd->is_upper && d_type == DT_REG; + p->check_xwhiteout = rdd->in_xwhiteouts_dir && d_type == DT_REG;if (
d_type==DT_CHR) {
p->next_maybe_whiteout=rdd->first_maybe_whiteout;fs/overlayfs/readdir.c +1
-2@@ -306,8 +305,9 @@ static inline int ovl_dir_read(const struct path *realpath, if (IS_ERR(realfile)) return PTR_ERR(realfile); - rdd->in_xwhiteouts_dir = rdd->dentry && - ovl_dentry_is_xwhiteouts(rdd->dentry); + /* No need to check for xwhiteouts in upper and lowermostlayers */
+rdd->in_xwhiteouts_dir= !rdd->is_upper && !rdd->is_lowest && +rdd->dentry&&ovl_dentry_is_xwhiteouts(rdd->dentry);rdd->first_maybe_whiteout= NULL;
rdd->ctx.pos= 0;
Signature · 8 lines
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
=-=-=
Alexander Larsson Red Hat,
Inc
[email protected] [email protected]
He's a suicidal devious gangster with a secret. She's a warm-hearted
thirtysomething femme fatale in the witness protection program. They
fight crime! Amir Goldstein
maintainerQuoted 65 lines · Alexander Larsson
Quoted 63 lines · Amir Goldstein
Quoted 60 lines · Alexander Larsson
Quoted 51 lines · Amir Goldstein
An opaque directory cannot have xwhiteouts, so instead of marking an
xwhiteouts directory with a new xattr, overload overlay.opaque xattr
for marking both opaque dir ('y') and xwhiteouts dir ('x').This is more efficient as the overlay.opaque xattr is checked during
lookup of directory anyway.This also prevents unnecessary checking the xattr when reading a directory without xwhiteouts, i.e. most of the time.
Note that the xwhiteouts marker is not checked on the upper layer and
on the last layer in lowerstack, where xwhiteouts are not expected.Fixes bc8df7a3dc03 ("ovl: Add an alternative type of whiteout")Cc <[email protected]> # v6.7Signed-off-by Amir Goldstein <[email protected]>---
Miklos,
Alex has reported a problem with your suggested approach of requiring
xwhiteouts xattr on layers root dir [1].Following counter proposal, amortizes the cost of checking opaque xattr
on directories during lookup to also check for xwhiteouts.This change requires the following change to test overlay/084:
tests/overlay/084 +0
-0@@ -115,7 +115,8 @@ do_test_xwhiteout() mkdir -p $basedir/lower $basedir/upper $basedir/work touch $basedir/lower/regular $basedir/lower/hidden$basedir/upper/hidden
- setfattr -n $prefix.overlay.whiteouts -v "y"
$basedir/upper
+ # overlay.opaque="x" means directory has xwhiteout
children
+ setfattr -n $prefix.overlay.opaque -v "x" $basedir/upper
setfattr -n $prefix.overlay.whiteout -v "y"
$basedir/upper/hiddenQuoted 3 lines
Alex,
Please let us know if this change is acceptable for composefs.
Yes, this looks very good to me. (Minor comments below) I'll do some testing on this.
Quoted 8 lines
Quoted 2 lines
Excellent, I'll be expecting your RVB/Tested-by.
Quoted 1 line
Yes
Reviewed-by Alexander Larsson <[email protected]>Tested-by Alexander Larsson <[email protected]>for the patch in the ovl-fixes branch.
Thanks. pushed.
Quoted 4 lines
I tested it manually, and with xfstest (with change), and also with this composefs change:
Quoted 8 lines
https://github.com/alexlarsson/composefs/tree/new-format-version
I created a lowerdir with a regular whiteout in, and after running that though the changed mkcomposefs I was able to mount the composefs image, and then mount the lowerdirs from the composefs mount, and they correctly handled the whiteout both when mounted normally and with userxattr.
I noticed you comment in composefs:
* 1 - Mark xwhitouts using the new opaque=x format as needed by Linux 6.8
Note that this "fix" is aimed to be backported to v6.7.y, so there is no kernel version that is expected to retain support for the old format.
Thanks,
Amir.
Quoted 103 lines · Amir Goldstein
Quoted 75 lines · Alexander Larsson
Quoted 73 lines · Amir Goldstein
Quoted 69 lines · Alexander Larsson
Quoted 59 lines · Amir Goldstein
An opaque directory cannot have xwhiteouts, so instead of marking
an
xwhiteouts directory with a new xattr, overload overlay.opaque
xattr
for marking both opaque dir ('y') and xwhiteouts dir ('x').This is more efficient as the overlay.opaque xattr is checked during
lookup of directory anyway.This also prevents unnecessary checking the xattr when reading a
directory without xwhiteouts, i.e. most of the time.Note that the xwhiteouts marker is not checked on the upper layer
and
on the last layer in lowerstack, where xwhiteouts are not expected.Fixes bc8df7a3dc03 ("ovl: Add an alternative type ofwhiteout")
Cc <[email protected]> # v6.7Signed-off-by Amir Goldstein <[email protected]>---
Miklos,
Alex has reported a problem with your suggested approach of requiring
xwhiteouts xattr on layers root dir [1].Following counter proposal, amortizes the cost of checking opaque
xattr
on directories during lookup to also check for xwhiteouts.This change requires the following change to test
overlay/084:tests/overlay/084 +0
-0@@ -115,7 +115,8 @@ do_test_xwhiteout()mkdir -p $basedir/lower $basedir/upper $basedir/work touch $basedir/lower/regular $basedir/lower/hidden $basedir/upper/hidden
- setfattr -n $prefix.overlay.whiteouts -v "y" $basedir/upper
+ # overlay.opaque="x" means directory has xwhiteout children
+ setfattr -n $prefix.overlay.opaque -v "x" $basedir/upper
setfattr -n $prefix.overlay.whiteout -v "y" $basedir/upper/hiddenQuoted 4 lines
Alex,
Please let us know if this change is acceptable for composefs.
Yes, this looks very good to me. (Minor comments below) I'll do some testing on this.
Quoted 8 lines
Quoted 2 lines
Excellent, I'll be expecting your RVB/Tested-by.
Quoted 1 line
Yes
Reviewed-by Alexander Larsson <[email protected]>Tested-by Alexander Larsson <[email protected]>for the patch in the ovl-fixes branch.
Thanks. pushed.
Quoted 6 lines
I tested it manually, and with xfstest (with change), and also with this composefs change:
https://github.com/alexlarsson/composefs/tree/new-format-version
Quoted 8 lines
I created a lowerdir with a regular whiteout in, and after running that
though the changed mkcomposefs I was able to mount the composefs image,
and then mount the lowerdirs from the composefs mount, and they correctly handled the whiteout both when mounted normally and with userxattr.
Quoted 8 lines
I noticed you comment in composefs:
* 1 - Mark xwhitouts using the new opaque=x format as needed by Linux 6.8
Note that this "fix" is aimed to be backported to v6.7.y, so there is no kernel
version that is expected to retain support for the old format.
Yes, but the composefs format needs to be bitwise reproducible, and this change in the image will cause a different digest for the produced image, so we can't just change what we generate, it has to be opt in to users and able to reproduce previous versions.
Signature · 7 lines
=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
=-=-=
Alexander Larsson Red Hat,
Inc
[email protected] [email protected]
He's an uncontrollable zombie senator gone bad. She's a cosmopolitan
hypochondriac doctor from Mars. They fight crime! Amir Goldstein
maintainerQuoted 1 line · Alexander Larsson
...
Quoted 5 lines
Quoted 5 lines
I noticed you comment in composefs:
* 1 - Mark xwhitouts using the new opaque=x format as needed by
Linux 6.8
Quoted 9 lines
Quoted 3 lines
Note that this "fix" is aimed to be backported to v6.7.y, so there is no kernel
version that is expected to retain support for the old format.Yes, but the composefs format needs to be bitwise reproducible, and this change in the image will cause a different digest for the produced image, so we can't just change what we generate, it has to be opt in to users and able to reproduce previous versions.
I understand. I just meant that the comment about Linux 6.8 is a bit confusing.
I guess that composefs version 0 is a pre-release version, if we are not counting v6.7 as a release that any distro is actually using...
Thanks,
Amir.
Miklos Szeredi
maintainerQuoted 19 lines · Amir Goldstein
An opaque directory cannot have xwhiteouts, so instead of marking an xwhiteouts directory with a new xattr, overload overlay.opaque xattr for marking both opaque dir ('y') and xwhiteouts dir ('x').
This is more efficient as the overlay.opaque xattr is checked during lookup of directory anyway.
This also prevents unnecessary checking the xattr when reading a directory without xwhiteouts, i.e. most of the time.
Note that the xwhiteouts marker is not checked on the upper layer and on the last layer in lowerstack, where xwhiteouts are not expected.
Fixes bc8df7a3dc03 ("ovl: Add an alternative type of whiteout")Cc <[email protected]> # v6.7Signed-off-by Amir Goldstein <[email protected]>---
Quoted 7 lines
Miklos,
Alex has reported a problem with your suggested approach of requiring xwhiteouts xattr on layers root dir [1].
Following counter proposal, amortizes the cost of checking opaque xattr on directories during lookup to also check for xwhiteouts.
Concept looks good overall.
overlayfs.rst needs updating with the new format. BTW the nesting
format should also be documented, but that's a separate patch.
fs/overlayfs/namei.c static int ovl_lookup_single(struct dentry *base, struct ovl_lookup_data *d, · line 298
Quoted 9 lines
fs/overlayfs/namei.c +4
-1@@ -292,7 +292,11 @@ static int ovl_lookup_single(struct dentry *base, struct ovl_lookup_data *d,if (d->last) goto out; -if (ovl_is_opaquedir (OVL_FS (d->sb), &path)) { +/* overlay.opaque=x means xwhiteouts directory */ + val =ovl_get_opaquedir_val (ofs, &path); +if (last_element && !is_upper && val =='x' ) { + d->xwhiteouts = true;
Maybe I'm missing something, but can't we set the flag on the layer?
Thanks,
Miklos
Amir Goldstein
maintainerQuoted 26 lines · Miklos Szeredi
Quoted 24 lines · Amir Goldstein
An opaque directory cannot have xwhiteouts, so instead of marking an xwhiteouts directory with a new xattr, overload overlay.opaque xattr for marking both opaque dir ('y') and xwhiteouts dir ('x').
This is more efficient as the overlay.opaque xattr is checked during lookup of directory anyway.
This also prevents unnecessary checking the xattr when reading a directory without xwhiteouts, i.e. most of the time.
Note that the xwhiteouts marker is not checked on the upper layer and on the last layer in lowerstack, where xwhiteouts are not expected.
Fixes bc8df7a3dc03 ("ovl: Add an alternative type of whiteout")Cc <[email protected]> # v6.7Signed-off-by Amir Goldstein <[email protected]>---
Miklos,
Alex has reported a problem with your suggested approach of requiring xwhiteouts xattr on layers root dir [1].
Quoted 7 lines
Quoted 2 lines
Following counter proposal, amortizes the cost of checking opaque xattr on directories during lookup to also check for xwhiteouts.
Concept looks good overall.
overlayfs.rstneeds updating with the new format.
Something like this looks ok?
Documentation/filesystems/overlayfs.rst +0 -0
@@ -145,7 +145,9 @@ filesystem, an overlay filesystem needs to record
in the upper filesystem
that files have been removed. This is done using whiteouts and opaque directories (non-directories are always opaque).
-A whiteout is created as a character device with 0/0 device number. +A whiteout is created as a character device with 0/0 device number or +as a regular file with the xattr "trusted.overlay.whiteout". +
When a whiteout is found in the upper level of a merged directory, any matching name in the lower level is ignored, and the whiteout itself is also hidden.
@@ -154,6 +156,11 @@ A directory is made opaque by setting the xattr "trusted.overlay.opaque"
to "y". Where the upper filesystem contains an opaque directory, any directory in the lower filesystem with the same name is ignored.
+An opaque directory should not conntain any whiteouts, because they do not +serve any purpose. A merge directory containing regular files with the xattr +"trusted.overlay.whiteout", should be additionally marked by setting the xattr +"trusted.overlay.opaque" to "x" on the merge directory itself.
+
readdir
-------
Quoted 3 lines
BTW the nesting
format should also be documented, but that's a separate patch.
Alex already did that:
https://docs.kernel.org/filesystems/overlayfs.html#nesting-overlayfs-mounts
Quoted 4 lines
Quoted 4 lines
(quoted diff) +0
-0@@ -292,7 +292,11 @@ static int ovl_lookup_single(struct dentry *base, struct ovl_lookup_data *d, if (d->last) goto out;
Quoted 8 lines
Review static int ovl_lookup_single(struct dentry *base, struct ovl_lookup_data *d, · line 298
Quoted 5 lines
(quoted diff) +4
-1- if (ovl_is_opaquedir(OVL_FS(d->sb), &path)) { + /* overlay.opaque=x means xwhiteouts directory */ + val = ovl_get_opaquedir_val(ofs, &path); + if (last_element && !is_upper && val == 'x') { + d->xwhiteouts = true;Maybe I'm missing something, but can't we set the flag on the layer?
We do not currently have per-directory-per-layer flags in ovl_lowerstack().
Your patch was optimizing only per-layer check_xwhiteout. My patch is optimizing only per-directory check_xwhiteout.
The important thing is that for the common case (no xwhiteouts) xwhiteout will never be checked.
Are you concerned about optimizing check_xwhiteout in a multi lower overlayfs nested over a composefs overlay mount for the case that one of the merge dirs in the stack have xwhiteouts and the other do not??
I guess we can use a combination of your patch (v2) and my patch (v3) and do something like this:
if (last_element && !is_upper && val == 'x') {
d->xwhiteouts = d->layer->xwhiteouts = true;...
to mark the dentry as OVL_E_XWHITEOUTS
AND mark the layer as having xwhiteouts
and then in readdir we check that
BOTH dentry has xwhiteouts (in some layer)
AND the layer has xwhiteouts (in some directory).
Is that what you meant?
Would you like me to make this change?
Thanks,
Amir.
Miklos Szeredi
maintainerDocumentation/filesystems/overlayfs.rst
Quoted 13 lines · Amir Goldstein
Something like this looks ok?
Documentation/filesystems/overlayfs.rst +0
-0@@ -145,7 +145,9 @@ filesystem, an overlay filesystem needs to recordin the upper filesystem
that files have been removed. This is done using whiteouts and opaque directories (non-directories are always opaque).Documentation/filesystems/overlayfs.rst +2
-1-A whiteout is created as a character device with 0/0 device number. +A whiteout is created as a character device with 0/0 device number or +as a regular file with the xattr "trusted.overlay.whiteout".
It should also refer to the "whiteouts and opaque directories" section.
Documentation/filesystems/overlayfs.rst
Quoted 13 lines
Documentation/filesystems/overlayfs.rst +1
-0+ When a whiteout is found in the upper level of a merged directory, any matching name in the lower level is ignored, and the whiteout itself is also hidden.@@ -154,6 +156,11 @@ A directory is made opaque by setting the xattr"trusted.overlay.opaque"
to "y". Where the upper filesystem contains an opaque directory, any directory in the lower filesystem with the same name is ignored.Documentation/filesystems/overlayfs.rst +4
-0+An opaque directory should not conntain any whiteouts, because they do not +serve any purpose. A merge directory containing regular files with the xattr +"trusted.overlay.whiteout", should be additionally marked by setting the xattr +"trusted.overlay.opaque" to "x" on the merge directory itself.
I think it's worth noting that this can have a performance impact on readdir, so people don't think xwhiteouts are a drop in replacement.
Quoted 3 lines
Alex already did that:
https://docs.kernel.org/filesystems/overlayfs.html#nesting-overlayfs-mounts
Indeed, thanks.
Quoted 20 lines
We do not currently have per-directory-per-layer flags in
ovl_lowerstack().Your patch was optimizing only per-layer
check_xwhiteout. My patch is optimizing only per-directorycheck_xwhiteout.The important thing is that for the common case (no xwhiteouts) xwhiteout will never be checked.
Are you concerned about optimizing
check_xwhiteoutin a multi lower overlayfs nested over a composefs overlay mount for the case that one of the merge dirs in the stack have xwhiteouts and the other do not??I guess we can use a combination of your patch (v2) and my patch (v3) and do something like this:
if (last_element && !is_upper && val == 'x') { d->xwhiteouts = d->layer->xwhiteouts = true;...
Quoted 7 lines
to mark the dentry as
OVL_E_XWHITEOUTS
AND mark the layer as having xwhiteouts
and then in readdir we check that
BOTH dentry has xwhiteouts (in some layer)
AND the layer has xwhiteouts (in some directory).Is that what you meant?
I didn't think it through, but yeah, this sounds good.
This way we can also remove the checks against layer not being upper and lowest, right?
Thanks,
Miklos
Amir Goldstein
maintainerQuoted 12 lines · Miklos Szeredi
Quoted 10 lines · Amir Goldstein
Something like this looks ok?
Documentation/filesystems/overlayfs.rst +0
-0@@ -145,7 +145,9 @@ filesystem, an overlay filesystem needs to recordin the upper filesystem
that files have been removed. This is done using whiteouts and opaque directories (non-directories are always opaque).
Quoted 5 lines
Documentation/filesystems/overlayfs.rst
Quoted 3 lines
Documentation/filesystems/overlayfs.rst +2
-1-A whiteout is created as a character device with 0/0 device number. +A whiteout is created as a character device with 0/0 device number or +as a regular file with the xattr "trusted.overlay.whiteout".It should also refer to the "whiteouts and opaque directories" section.
ok.
Quoted 10 lines
Quoted 10 lines
Documentation/filesystems/overlayfs.rst +1
-0+ When a whiteout is found in the upper level of a merged directory, any matching name in the lower level is ignored, and the whiteout itself is also hidden.@@ -154,6 +156,11 @@ A directory is made opaque by setting the xattr"trusted.overlay.opaque"
to "y". Where the upper filesystem contains an opaque directory, any directory in the lower filesystem with the same name is ignored.
Quoted 8 lines
Documentation/filesystems/overlayfs.rst
Quoted 4 lines
Documentation/filesystems/overlayfs.rst +4
-0+An opaque directory should not conntain any whiteouts, because they do not +serve any purpose. A merge directory containing regular files with the xattr +"trusted.overlay.whiteout", should be additionally marked by setting the xattr +"trusted.overlay.opaque" to "x" on the merge directory itself.I think it's worth noting that this can have a performance impact on readdir, so people don't think xwhiteouts are a drop in replacement.
Ok, I will write something for v4.
Quoted 32 lines
Quoted 3 lines
Alex already did that:
https://docs.kernel.org/filesystems/overlayfs.html#nesting-overlayfs-mounts
Indeed, thanks.
Quoted 26 lines
We do not currently have per-directory-per-layer flags in
ovl_lowerstack().Your patch was optimizing only per-layer
check_xwhiteout. My patch is optimizing only per-directorycheck_xwhiteout.The important thing is that for the common case (no xwhiteouts) xwhiteout will never be checked.
Are you concerned about optimizing
check_xwhiteoutin a multi lower overlayfs nested over a composefs overlay mount for the case that one of the merge dirs in the stack have xwhiteouts and the other do not??I guess we can use a combination of your patch (v2) and my patch (v3) and do something like this:
if (last_element && !is_upper && val == 'x') { d->xwhiteouts = d->layer->xwhiteouts = true;...
to mark the dentry as
OVL_E_XWHITEOUTS
AND mark the layer as having xwhiteouts
and then in readdir we check that
BOTH dentry has xwhiteouts (in some layer)
AND the layer has xwhiteouts (in some directory).
Quoted 6 lines
Quoted 1 line
Is that what you meant?
I didn't think it through, but yeah, this sounds good.
This way we can also remove the checks against layer not being upper and lowest, right?
I think we can.
Let me try this out.
Thanks,
Amir.