cifs: add support for fallocate mode 0 for non-sparse files
diff mbox series

Message ID 20200117000448.13704-1-lsahlber@redhat.com
State New
Headers show
Series
  • cifs: add support for fallocate mode 0 for non-sparse files
Related show

Commit Message

Ronnie Sahlberg Jan. 17, 2020, 12:04 a.m. UTC
RHBZ 1336264

When we extend a file we must also force the attributes (the size)
to be revalidated.

This fixes an issue with holetest in xfs-tests which performs the following
sequence :
1, create a new file
2, use fallocate mode==0 to populate the file
3, mmap the file
4, touch each page by reading the mmapped region.

If we don't revalidate the file as part of step 2, the handle will still have
cached attributes where the size is 0 and thus the mmap will not map the
requested region leading to SIGBUS for the application in step 4.

We already had the same crash bug for sparse files but we never triggered that
with our xfstests.

Signed-off-by: Ronnie Sahlberg <lsahlber@redhat.com>
---
 fs/cifs/cifsfs.c  |  6 ++----
 fs/cifs/cifsfs.h  |  2 +-
 fs/cifs/inode.c   |  6 +++---
 fs/cifs/smb2ops.c | 23 ++++++++++++++++++++---
 4 files changed, 26 insertions(+), 11 deletions(-)

Patch
diff mbox series

diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c
index 5492b9860baa..638337dc04ee 100644
--- a/fs/cifs/cifsfs.c
+++ b/fs/cifs/cifsfs.c
@@ -957,11 +957,9 @@  static loff_t cifs_llseek(struct file *file, loff_t offset, int whence)
 		/*
 		 * Some applications poll for the file length in this strange
 		 * way so we must seek to end on non-oplocked files by
-		 * setting the revalidate time to zero.
+		 * forcing revalidation.
 		 */
-		CIFS_I(inode)->time = 0;
-
-		rc = cifs_revalidate_file_attr(file);
+		rc = cifs_revalidate_file_attr(file, true);
 		if (rc < 0)
 			return (loff_t)rc;
 	}
diff --git a/fs/cifs/cifsfs.h b/fs/cifs/cifsfs.h
index b59dc7478130..e72aec945875 100644
--- a/fs/cifs/cifsfs.h
+++ b/fs/cifs/cifsfs.h
@@ -75,7 +75,7 @@  extern int cifs_mkdir(struct inode *, struct dentry *, umode_t);
 extern int cifs_rmdir(struct inode *, struct dentry *);
 extern int cifs_rename2(struct inode *, struct dentry *, struct inode *,
 			struct dentry *, unsigned int);
-extern int cifs_revalidate_file_attr(struct file *filp);
+extern int cifs_revalidate_file_attr(struct file *filp, bool force);
 extern int cifs_revalidate_dentry_attr(struct dentry *);
 extern int cifs_revalidate_file(struct file *filp);
 extern int cifs_revalidate_dentry(struct dentry *);
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c
index ca76a9287456..1db84db822ec 100644
--- a/fs/cifs/inode.c
+++ b/fs/cifs/inode.c
@@ -2050,13 +2050,13 @@  cifs_zap_mapping(struct inode *inode)
 	return cifs_revalidate_mapping(inode);
 }
 
-int cifs_revalidate_file_attr(struct file *filp)
+int cifs_revalidate_file_attr(struct file *filp, bool force)
 {
 	int rc = 0;
 	struct inode *inode = file_inode(filp);
 	struct cifsFileInfo *cfile = (struct cifsFileInfo *) filp->private_data;
 
-	if (!cifs_inode_needs_reval(inode))
+	if (!force && !cifs_inode_needs_reval(inode))
 		return rc;
 
 	if (tlink_tcon(cfile->tlink)->unix_ext)
@@ -2112,7 +2112,7 @@  int cifs_revalidate_file(struct file *filp)
 	int rc;
 	struct inode *inode = file_inode(filp);
 
-	rc = cifs_revalidate_file_attr(filp);
+	rc = cifs_revalidate_file_attr(filp, false);
 	if (rc)
 		return rc;
 
diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c
index 6250370c1170..6c0fe6544fd7 100644
--- a/fs/cifs/smb2ops.c
+++ b/fs/cifs/smb2ops.c
@@ -12,6 +12,7 @@ 
 #include <linux/uuid.h>
 #include <linux/sort.h>
 #include <crypto/aead.h>
+#include "cifsfs.h"
 #include "cifsglob.h"
 #include "smb2pdu.h"
 #include "smb2proto.h"
@@ -3106,9 +3107,19 @@  static long smb3_simple_falloc(struct file *file, struct cifs_tcon *tcon,
 		else if (i_size_read(inode) >= off + len)
 			/* not extending file and already not sparse */
 			rc = 0;
-		/* BB: in future add else clause to extend file */
-		else
-			rc = -EOPNOTSUPP;
+		/* extend file */
+		else {
+			eof = cpu_to_le64(off + len);
+			rc = SMB2_set_eof(xid, tcon, cfile->fid.persistent_fid,
+					  cfile->fid.volatile_fid, cfile->pid,
+					  &eof);
+			if (!rc) {
+				rc = cifs_revalidate_file_attr(file, true);
+				if (rc)
+					cifs_dbg(FYI, "Validation during fallocate "
+						 "failed, error=%ld\n", rc);
+			}
+		}
 		if (rc)
 			trace_smb3_falloc_err(xid, cfile->fid.persistent_fid,
 				tcon->tid, tcon->ses->Suid, off, len, rc);
@@ -3146,6 +3157,12 @@  static long smb3_simple_falloc(struct file *file, struct cifs_tcon *tcon,
 			rc = SMB2_set_eof(xid, tcon, cfile->fid.persistent_fid,
 					  cfile->fid.volatile_fid, cfile->pid,
 					  &eof);
+			if (!rc) {
+				rc = cifs_revalidate_file_attr(file, true);
+				if (rc)
+					cifs_dbg(FYI, "Validation during fallocate "
+						 "failed, error=%ld\n", rc);
+			}
 		}
 	}