ovl: support stacked SEEK_HOLE/SEEK_DATA
Amir Goldstein
maintainerPATCH v2 1/1 ovl: support stacked SEEK_HOLE/SEEK_DATA
Overlay file f_pos is the master copy that is preserved through copy up and modified on read/write, but only real fs knows how to SEEK_HOLE/SEEK_DATA and real fs may impose limitations that are more strict than ->s_maxbytes for specific files, so we use the real file to perform seeks.
We do not call real fs for SEEK_CUR:0 query and for SEEK_SET:0 requests.
---
Changes since v1:
- Take ovl inode lock
- Optimize SEEK_CUR:0 and SEEK_SET:0 cases
fs/overlayfs/file.c | 44 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 40 insertions(+), 4 deletions(-)
fs/overlayfs/file.c +40 -4
@@ -145,11 +145,47 @@ static int ovl_release(struct inode *inode, struct file *file)static loff_t ovl_llseek (struct file *file,loff_t offset,int whence) { -struct inode *realinode =ovl_inode_real (file_inode (file)); +struct inode *inode =file_inode (file); +struct fd real; +const struct cred *old_cred; +ssize_t ret; + +/* +* The two special cases below do not need to involve real fs, +* so we can optimizing concurrent callers. +*/ +if (offset ==0 ) { +if (whence ==SEEK_CUR ) +return file->f_pos; + +if (whence ==SEEK_SET ) +return vfs_setpos (file,0 ,0 ); + } + + ret =ovl_real_fdget (file, &real); +if (ret) +return ret; -return generic_file_llseek_size (file, offset, whence, - realinode->i_sb->s_maxbytes, -i_size_read (realinode)); +/* +* Overlay file f_pos is the master copy that is preserved +* through copy up and modified on read/write, but only real +* fs knows how to SEEK_HOLE/SEEK_DATA and real fs may impose +* limitations that are more strict than ->s_maxbytes for specific +* files, so we use the real file to perform seeks. +*/ +inode_lock (inode); + real.file->f_pos = file->f_pos; + + old_cred =ovl_override_creds (inode->i_sb); + ret =vfs_llseek (real.file, offset, whence); +revert_creds (old_cred); + + file->f_pos = real.file->f_pos; +inode_unlock (inode); + +fdput (real); + +return ret; }static void ovl_file_accessed (struct file *file)
Signature · 1 line
2.17.1
Amir Goldstein
maintainerQuoted 7 lines · Amir Goldstein
Overlay file
f_posis the master copy that is preserved through copy up and modified on read/write, but only real fs knows how to SEEK_HOLE/SEEK_DATA and real fs may impose limitations that are more strict than ->s_maxbytes for specific files, so we use the real file to perform seeks.
Quoted 7 lines
We do not call real fs for SEEK_CUR:0 query and for SEEK_SET:0 requests.
Fixes d1d04ef8572b ("ovl: stack file ops")Reported-by Eddie Horng <[email protected]>Signed-off-by Amir Goldstein <[email protected]>---
Miklos,
PING.
xfstests are already upstream and failing...
Thanks,
Amir.
Quoted 67 lines
Changes since v1:
- Take ovl inode lock
- Optimize SEEK_CUR:0 and SEEK_SET:0 casesfs/overlayfs/file.c | 44 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 40 insertions(+), 4 deletions(-)fs/overlayfs/file.c +40
-5@@ -145,11 +145,47 @@ static int ovl_release(struct inode *inode, struct file *file)static loff_t ovl_llseek (struct file *file,loff_t offset,int whence) { -struct inode *realinode =ovl_inode_real (file_inode (file)); +struct inode *inode =file_inode (file); +struct fd real; +const struct cred *old_cred; +ssize_t ret; + +/* +* The two special cases below do not need to involve real fs, +* so we can optimizing concurrent callers. +*/ +if (offset ==0 ) { +if (whence ==SEEK_CUR ) +return file->f_pos; + +if (whence ==SEEK_SET ) +return vfs_setpos (file,0 ,0 ); + } + + ret =ovl_real_fdget (file, &real); +if (ret) +return ret; -return generic_file_llseek_size (file, offset, whence, - realinode->i_sb->s_maxbytes, -i_size_read (realinode)); +/* +* Overlay file f_pos is the master copy that is preserved +* through copy up and modified on read/write, but only real +* fs knows how to SEEK_HOLE/SEEK_DATA and real fs may impose +* limitations that are more strict than ->s_maxbytes for specific +* files, so we use the real file to perform seeks. +*/ +inode_lock (inode); + real.file->f_pos = file->f_pos; + + old_cred =ovl_override_creds (inode->i_sb); + ret =vfs_llseek (real.file, offset, whence); +revert_creds (old_cred); + + file->f_pos = real.file->f_pos; +inode_unlock (inode); + +fdput (real); + +return ret; }static void ovl_file_accessed (struct file *file) --2.17.1
Amir Goldstein
maintainerQuoted 17 lines · Amir Goldstein
Quoted 7 lines · Amir Goldstein
Overlay file
f_posis the master copy that is preserved through copy up and modified on read/write, but only real fs knows how to SEEK_HOLE/SEEK_DATA and real fs may impose limitations that are more strict than ->s_maxbytes for specific files, so we use the real file to perform seeks.Quoted 7 lines
We do not call real fs for SEEK_CUR:0 query and for SEEK_SET:0 requests.
Fixes d1d04ef8572b ("ovl: stack file ops")Reported-by Eddie Horng <[email protected]>Signed-off-by Amir Goldstein <[email protected]>---
Quoted 6 lines
Miklos,
PING.
xfstests are already upstream and failing...
I lied... xfstests were only posted for review
Now posted v3 tests.
Thanks,
Amir.
Quoted 7 lines · Amir Goldstein
Overlay file
f_posis the master copy that is preserved through copy up and modified on read/write, but only real fs knows how to SEEK_HOLE/SEEK_DATA and real fs may impose limitations that are more strict than ->s_maxbytes for specific files, so we use the real file to perform seeks.
Quoted 6 lines
We do not call real fs for SEEK_CUR:0 query and for SEEK_SET:0 requests.
Fixes d1d04ef8572b ("ovl: stack file ops")Reported-by Eddie Horng <[email protected]>Signed-off-by Amir Goldstein <[email protected]>
Thanks, applied.
Miklos