Skip to contentSkip to conversation

fsfreeze: added new file_start_write_killable

PATCH In review Marco Stornelli 2 participants 3 messages Apr 26, 2013

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 2/4 fsfreeze: added new file_start_write_killable

Replace file_start_write with file_start_write_killable where possible.

---
 drivers/block/loop.c |    4 +++-
 fs/aio.c             |    7 +++++--
 fs/coda/file.c       |    4 +++-
 fs/read_write.c      |   28 +++++++++++++++++-----------
 fs/splice.c          |    4 +++-
 include/linux/fs.h   |   17 +++++++++++++++++
 6 files changed, 48 insertions(+), 16 deletions(-)
drivers/block/loop.c +3 -1
index be9a101..2c0d0a3 100644
@@ -230,7 +230,9 @@ static int __do_lo_send_write(struct file *file,
 	ssize_t bw;
 	mm_segment_t old_fs = get_fs();
 
-	file_start_write(file);
+	bw = file_start_write_killable(file);
+	if (bw < 0)
+		return bw;
 	set_fs(get_ds());
 	bw = file->f_op->write(file, buf, len, &pos);
 	set_fs(old_fs);
fs/aio.c +5 -2
index 5b7ed78..5deddf5 100644
@@ -1103,8 +1103,11 @@ static ssize_t aio_rw_vect_retry(struct kiocb *iocb, int rw, aio_rw_op *rw_op)
 	if (iocb->ki_pos < 0)
 		return -EINVAL;
 
-	if (rw == WRITE)
-		file_start_write(file);
+	if (rw == WRITE) {
+		ret = file_start_write_killable(file);
+		if (ret < 0)
+			return ret;
+	}
 	do {
 		ret = rw_op(iocb, &iocb->ki_iovec[iocb->ki_cur_seg],
 			    iocb->ki_nr_segs - iocb->ki_cur_seg,
fs/coda/file.c +3 -1
index 380b798..c5708d0 100644
@@ -79,7 +79,9 @@ coda_file_write(struct file *coda_file, const char __user *buf, size_t count, lo
 		return -EINVAL;
 
 	host_inode = file_inode(host_file);
-	file_start_write(host_file);
+	ret = file_start_write_killable(host_file);
+	if (ret < 0)
+		return ret;
 	mutex_lock(&coda_inode->i_mutex);
 
 	ret = host_file->f_op->write(host_file, buf, count, ppos);
fs/read_write.c +17 -11
index 7eb7ef3..ed9006f 100644
@@ -438,17 +438,19 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_
 	ret = rw_verify_area(WRITE, file, pos, count);
 	if (ret >= 0) {
 		count = ret;
-		file_start_write(file);
-		if (file->f_op->write)
-			ret = file->f_op->write(file, buf, count, pos);
-		else
-			ret = do_sync_write(file, buf, count, pos);
+		ret = file_start_write_killable(file);
 		if (ret > 0) {
-			fsnotify_modify(file);
-			add_wchar(current, ret);
+			if (file->f_op->write)
+				ret = file->f_op->write(file, buf, count, pos);
+			else
+				ret = do_sync_write(file, buf, count, pos);
+			if (ret > 0) {
+				fsnotify_modify(file);
+				add_wchar(current, ret);
+			}
+			inc_syscw(current);
+			file_end_write(file);
 		}
-		inc_syscw(current);
-		file_end_write(file);
 	}
 
 	return ret;
@@ -718,7 +720,9 @@ static ssize_t do_readv_writev(int type, struct file *file,
 	} else {
 		fn = (io_fn_t)file->f_op->write;
 		fnv = file->f_op->aio_write;
-		file_start_write(file);
+		ret = file_start_write_killable(file);
+		if (ret < 0)
+			goto out;
 	}
 
 	if (fnv)
@@ -898,7 +902,9 @@ static ssize_t compat_do_readv_writev(int type, struct file *file,
 	} else {
 		fn = (io_fn_t)file->f_op->write;
 		fnv = file->f_op->aio_write;
-		file_start_write(file);
+		ret = file_start_write_killable(file);
+		if (ret < 0)
+			goto out;
 	}
 
 	if (fnv)
fs/splice.c +3 -1
index e6b2559..b37c30e 100644
@@ -1115,7 +1115,9 @@ static long do_splice_from(struct pipe_inode_info *pipe, struct file *out,
 	else
 		splice_write = default_file_splice_write;
 
-	file_start_write(out);
+	ret = file_start_write_killable(out);
+	if (ret < 0)
+		return ret;
 	ret = splice_write(pipe, out, ppos, len, flags);
 	file_end_write(out);
 	return ret;
include/linux/fs.h +17 -0
index c8b7325..998ec2a 100644
@@ -1404,6 +1404,16 @@ static inline void sb_start_write(struct super_block *sb)
 	__sb_start_write(sb, SB_FREEZE_WRITE, FREEZE_WAIT);
 }
 
+/**
+ * sb_start_write_killable - get write access to a superblock
+ * @sb: the super we write to
+ *
+ */
+static inline int sb_start_write_killable(struct super_block *sb)
+{
+	return __sb_start_write(sb, SB_FREEZE_WRITE, FREEZE_WAIT_KILLABLE);
+}
+
 static inline int sb_start_write_trylock(struct super_block *sb)
 {
 	return __sb_start_write(sb, SB_FREEZE_WRITE, FREEZE_NOWAIT);
@@ -2227,6 +2237,13 @@ static inline struct inode *file_inode(struct file *f)
 	return f->f_inode;
 }
 
+static inline int file_start_write_killable(struct file *file)
+{
+	if (!S_ISREG(file_inode(file)->i_mode))
+		return 1;
+	return sb_start_write_killable(file_inode(file)->i_sb);
+}
+
 static inline void file_start_write(struct file *file)
 {
 	if (!S_ISREG(file_inode(file)->i_mode))
Signature · 7 lines
1.7.3.4

--
To unsubscribe, send a message with 'unsubscribe linux-aio' in
the body to [email protected].  For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"[email protected]">[email protected]</a>
#1 lore raw
Quoted 2 lines · Marco Stornelli

Replace file_start_write with file_start_write_killable where possible.

I feel like I'm missing context here. Possibly because you only cc'd me on patch 2/4. In particular, file_start_write doesn't exist upstream, so I'm not sure what it's for. But returning 1 for non-regular files looks dodgy:

Quoted 10 lines
include/linux/fs.h +7 -0
+static inline int file_start_write_killable(struct file *file)
+{
+	if (!S_ISREG(file_inode(file)->i_mode))
+		return 1;
+	return sb_start_write_killable(file_inode(file)->i_sb);
+}
 
+++ b/fs/aio.c
@@ -1103,8 +1103,11 @@ static ssize_t aio_rw_vect_retry(struct kiocb *iocb, int rw, aio_rw_op *rw_op)
 	if (iocb->ki_pos < 0)

include/linux/fs.h static ssize_t aio_rw_vect_retry(struct kiocb *iocb, int rw, aio_rw_op *rw_op) · line 1111

Quoted 10 lines
include/linux/fs.h +5 -2
 		return -EINVAL;
 
-	if (rw == WRITE)
-		file_start_write(file);
+	if (rw == WRITE) {
+		ret = file_start_write_killable(file);
+		if (ret < 0)
+			return ret;
+	}
 	do {

So ... it's OK to do this write to pipes/directories/devices/... ? Or is that check always taken care of elsewhere? If so, why do we need this check? I'm confused. None of the callers check for the 'ret == 1' case, so I'm sure there's something wrong here, I just can't tell what it is.

Quoted 20 lines
fs/read_write.c +8 -7
+++ b/fs/read_write.c
@@ -438,17 +438,19 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_
 	ret = rw_verify_area(WRITE, file, pos, count);
 	if (ret >= 0) {
 		count = ret;
-		file_start_write(file);
-		if (file->f_op->write)
-			ret = file->f_op->write(file, buf, count, pos);
-		else
-			ret = do_sync_write(file, buf, count, pos);
+		ret = file_start_write_killable(file);
 		if (ret > 0) {
-			fsnotify_modify(file);
-			add_wchar(current, ret);
+			if (file->f_op->write)
+				ret = file->f_op->write(file, buf, count, pos);
+			else
+				ret = do_sync_write(file, buf, count, pos);
+			if (ret > 0) {
+				fsnotify_modify(file);

fs/read_write.c ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_ · line 456

Quoted 10 lines
fs/read_write.c +4 -2
+				add_wchar(current, ret);
+			}
+			inc_syscw(current);
+			file_end_write(file);
 		}
-		inc_syscw(current);
-		file_end_write(file);
 	}
 
 	return ret;

I don't like it that you've increased the indentation here. Better to do a preliminary patch which just converts to our normal style with gotos. ie:

- if (ret >= 0) {
- count = ret;
- file_start_write(file);
- if (file->f_op->write)
- ret = file->f_op->write(file, buf, count, pos);
- else
- ret = do_sync_write(file, buf, count, pos);
- if (ret > 0) {
- fsnotify_modify(file);
- add_wchar(current, ret);
- }
- inc_syscw(current);
- file_end_write(file);
+ if (ret < 0)
+ goto out;
+ count = ret;
+ file_start_write(file);
+ if (file->f_op->write)
+ ret = file->f_op->write(file, buf, count, pos);
+ else
+ ret = do_sync_write(file, buf, count, pos);
+ if (ret > 0) {
+ fsnotify_modify(file);
+ add_wchar(current, ret);
}
+ inc_syscw(current);
+ file_end_write(file);
+ out:
return ret;

and then this patch would just add another if ... goto out case.

Signature · 10 lines
Matthew Wilcox				Intel Open Source Technology Centre
"Bill, look, we understand that you're interested in selling us this
operating system, but compare it to ours.  We can't possibly take such
a retrograde step."

--
To unsubscribe, send a message with 'unsubscribe linux-aio' in
the body to [email protected].  For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"[email protected]">[email protected]</a>
#2 lore raw

Hi,

Il 26/04/2013 14:06, Matthew Wilcox ha scritto:

Quoted 8 lines · Marco Stornelli
Quoted 2 lines

Replace file_start_write with file_start_write_killable where possible.

I feel like I'm missing context here. Possibly because you only cc'd me on patch 2/4. In particular, file_start_write doesn't exist upstream, so I'm not sure what it's for. But returning 1 for non-regular files looks dodgy:

The patch series is based on -next due to several changes done by Al about fsfreeze. file_start_write_killable returns 1 because it's mainly a wrapper of __st_start_write. __sb_start_write returns 1 when everything is ok, 0 when the lock can't be gotten (we are using the trylock version) and _now_ a value < 0 when something happens (i.e. -EINTR).

Quoted 13 lines
Quoted 13 lines
include/linux/fs.h +7 -0
+static inline int file_start_write_killable(struct file *file)
+{
+	if (!S_ISREG(file_inode(file)->i_mode))
+		return 1;
+	return sb_start_write_killable(file_inode(file)->i_sb);
+}
 
+++ b/fs/aio.c
@@ -1103,8 +1103,11 @@ static ssize_t aio_rw_vect_retry(struct kiocb *iocb, int rw, aio_rw_op *rw_op)
  	if (iocb->ki_pos < 0)
  		return -EINVAL;
 
Quoted 14 lines

fs/aio.c static ssize_t aio_rw_vect_retry(struct kiocb *iocb, int rw, aio_rw_op *rw_op) · line 1111

Quoted 8 lines
fs/aio.c +5 -2
-	if (rw == WRITE)
-		file_start_write(file);
+	if (rw == WRITE) {
+		ret = file_start_write_killable(file);
+		if (ret < 0)
+			return ret;
+	}
  	do {

So ... it's OK to do this write to pipes/directories/devices/... ? Or is that check always taken care of elsewhere? If so, why do we need this check? I'm confused. None of the callers check for the 'ret == 1' case, so I'm sure there's something wrong here, I just can't tell what it is.

See above.

Quoted 29 lines
Quoted 29 lines
fs/read_write.c +12 -9
+++ b/fs/read_write.c
@@ -438,17 +438,19 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_
  	ret = rw_verify_area(WRITE, file, pos, count);
  	if (ret >= 0) {
  		count = ret;
-		file_start_write(file);
-		if (file->f_op->write)
-			ret = file->f_op->write(file, buf, count, pos);
-		else
-			ret = do_sync_write(file, buf, count, pos);
+		ret = file_start_write_killable(file);
  		if (ret > 0) {
-			fsnotify_modify(file);
-			add_wchar(current, ret);
+			if (file->f_op->write)
+				ret = file->f_op->write(file, buf, count, pos);
+			else
+				ret = do_sync_write(file, buf, count, pos);
+			if (ret > 0) {
+				fsnotify_modify(file);
+				add_wchar(current, ret);
+			}
+			inc_syscw(current);
+			file_end_write(file);
  		}
-		inc_syscw(current);
-		file_end_write(file);
  	}
 
Quoted 5 lines

Review ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_ · line 456

Quoted 1 line
(quoted diff) +0 -0
  	return ret;

I don't like it that you've increased the indentation here. Better to do a preliminary patch which just converts to our normal style with gotos. ie:

Ok, I can change the style here, no problem.

Marco

--
To unsubscribe, send a message with 'unsubscribe linux-aio' in the body to [email protected]. For more info on Linux AIO,
see: http://www.kvack.org/aio/
Don't email: <a href=mailto:"[email protected]">[email protected]</a>