All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] fuse: hold i_mutex in fuse_file_fallocate()
@ 2013-06-11 10:59 Maxim Patlasov
  2013-06-12 11:40 ` Brian Foster
  2013-06-12 19:04 ` Anand Avati
  0 siblings, 2 replies; 5+ messages in thread
From: Maxim Patlasov @ 2013-06-11 10:59 UTC (permalink / raw)
  To: miklos; +Cc: fuse-devel, bfoster, avati, linux-kernel, devel

Changing size of a file on server and local update (fuse_write_update_size)
should be always protected by inode->i_mutex. Otherwise a race like this is
possible:

1. Process 'A' calls fallocate(2) to extend file (~FALLOC_FL_KEEP_SIZE).
fuse_file_fallocate() sends FUSE_FALLOCATE request to the server.
2. Process 'B' performs ordinary buffered write(2) with a length big enough
to extend the file beyond "offset + length" of fallocate call.
3. Process 'A' resumes execution of fuse_file_fallocate() and calls
fuse_write_update_size(inode, offset + length). But 'offset + length' was
obsoleted by write from previous step.

Signed-off-by: Maxim V. Patlasov <MPatlasov@parallels.com>
---
 fs/fuse/file.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/fs/fuse/file.c b/fs/fuse/file.c
index e570081..8dfbf7d 100644
--- a/fs/fuse/file.c
+++ b/fs/fuse/file.c
@@ -2470,14 +2470,16 @@ static long fuse_file_fallocate(struct file *file, int mode, loff_t offset,
 		.mode = mode
 	};
 	int err;
+	bool lock_inode = !(mode & FALLOC_FL_KEEP_SIZE) ||
+			   (mode & FALLOC_FL_PUNCH_HOLE);
 
 	if (fc->no_fallocate)
 		return -EOPNOTSUPP;
 
-	if (mode & FALLOC_FL_PUNCH_HOLE) {
+	if (lock_inode)
 		mutex_lock(&inode->i_mutex);
+	if (mode & FALLOC_FL_PUNCH_HOLE)
 		fuse_set_nowrite(inode);
-	}
 
 	req = fuse_get_req_nopages(fc);
 	if (IS_ERR(req)) {
@@ -2511,10 +2513,10 @@ static long fuse_file_fallocate(struct file *file, int mode, loff_t offset,
 	fuse_invalidate_attr(inode);
 
 out:
-	if (mode & FALLOC_FL_PUNCH_HOLE) {
+	if (mode & FALLOC_FL_PUNCH_HOLE)
 		fuse_release_nowrite(inode);
+	if (lock_inode)
 		mutex_unlock(&inode->i_mutex);
-	}
 
 	return err;
 }


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH] fuse: hold i_mutex in fuse_file_fallocate()
  2013-06-11 10:59 [PATCH] fuse: hold i_mutex in fuse_file_fallocate() Maxim Patlasov
@ 2013-06-12 11:40 ` Brian Foster
  2013-06-12 18:56   ` Anand Avati
  2013-06-12 19:04 ` Anand Avati
  1 sibling, 1 reply; 5+ messages in thread
From: Brian Foster @ 2013-06-12 11:40 UTC (permalink / raw)
  To: Maxim Patlasov; +Cc: miklos, fuse-devel, avati, linux-kernel, devel

On 06/11/2013 06:59 AM, Maxim Patlasov wrote:
> Changing size of a file on server and local update (fuse_write_update_size)
> should be always protected by inode->i_mutex. Otherwise a race like this is
> possible:
> 
> 1. Process 'A' calls fallocate(2) to extend file (~FALLOC_FL_KEEP_SIZE).
> fuse_file_fallocate() sends FUSE_FALLOCATE request to the server.
> 2. Process 'B' performs ordinary buffered write(2) with a length big enough
> to extend the file beyond "offset + length" of fallocate call.
> 3. Process 'A' resumes execution of fuse_file_fallocate() and calls
> fuse_write_update_size(inode, offset + length). But 'offset + length' was
> obsoleted by write from previous step.
> 

Hi Maxim,

Doesn't fuse_write_update_size() already handle this particular case by
only ever extending the size?

Brian

> Signed-off-by: Maxim V. Patlasov <MPatlasov@parallels.com>
> ---
>  fs/fuse/file.c |   10 ++++++----
>  1 files changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/fs/fuse/file.c b/fs/fuse/file.c
> index e570081..8dfbf7d 100644
> --- a/fs/fuse/file.c
> +++ b/fs/fuse/file.c
> @@ -2470,14 +2470,16 @@ static long fuse_file_fallocate(struct file *file, int mode, loff_t offset,
>  		.mode = mode
>  	};
>  	int err;
> +	bool lock_inode = !(mode & FALLOC_FL_KEEP_SIZE) ||
> +			   (mode & FALLOC_FL_PUNCH_HOLE);
>  
>  	if (fc->no_fallocate)
>  		return -EOPNOTSUPP;
>  
> -	if (mode & FALLOC_FL_PUNCH_HOLE) {
> +	if (lock_inode)
>  		mutex_lock(&inode->i_mutex);
> +	if (mode & FALLOC_FL_PUNCH_HOLE)
>  		fuse_set_nowrite(inode);
> -	}
>  
>  	req = fuse_get_req_nopages(fc);
>  	if (IS_ERR(req)) {
> @@ -2511,10 +2513,10 @@ static long fuse_file_fallocate(struct file *file, int mode, loff_t offset,
>  	fuse_invalidate_attr(inode);
>  
>  out:
> -	if (mode & FALLOC_FL_PUNCH_HOLE) {
> +	if (mode & FALLOC_FL_PUNCH_HOLE)
>  		fuse_release_nowrite(inode);
> +	if (lock_inode)
>  		mutex_unlock(&inode->i_mutex);
> -	}
>  
>  	return err;
>  }
> 


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] fuse: hold i_mutex in fuse_file_fallocate()
  2013-06-12 11:40 ` Brian Foster
@ 2013-06-12 18:56   ` Anand Avati
  0 siblings, 0 replies; 5+ messages in thread
From: Anand Avati @ 2013-06-12 18:56 UTC (permalink / raw)
  To: Brian Foster; +Cc: Maxim Patlasov, miklos, fuse-devel, linux-kernel, devel

On 6/12/13 4:40 AM, Brian Foster wrote:
> On 06/11/2013 06:59 AM, Maxim Patlasov wrote:
>> Changing size of a file on server and local update (fuse_write_update_size)
>> should be always protected by inode->i_mutex. Otherwise a race like this is
>> possible:
>>
>> 1. Process 'A' calls fallocate(2) to extend file (~FALLOC_FL_KEEP_SIZE).
>> fuse_file_fallocate() sends FUSE_FALLOCATE request to the server.
>> 2. Process 'B' performs ordinary buffered write(2) with a length big enough
>> to extend the file beyond "offset + length" of fallocate call.
>> 3. Process 'A' resumes execution of fuse_file_fallocate() and calls
>> fuse_write_update_size(inode, offset + length). But 'offset + length' was
>> obsoleted by write from previous step.
>>
>
> Hi Maxim,
>
> Doesn't fuse_write_update_size() already handle this particular case by
> only ever extending the size?
>


As you say, fuse_write_update_size() does seem to protect against the 
case Maxim writes in the commit log.

However, there is still an issue with with truncate(shrinking_offset) 
and fallocate(growing_offset,~FALLOC_FL_KEEP_SIZE) racing, and changing 
inode size in opposing order between file server and in core ->i_size. 
Therefore, grabbing i_mutex is making fallocate and truncate atomic 
against each other.

I guess we just need an updated commit log, and same code change?

Avati



^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] fuse: hold i_mutex in fuse_file_fallocate()
  2013-06-11 10:59 [PATCH] fuse: hold i_mutex in fuse_file_fallocate() Maxim Patlasov
  2013-06-12 11:40 ` Brian Foster
@ 2013-06-12 19:04 ` Anand Avati
  2013-06-13  7:15   ` Maxim Patlasov
  1 sibling, 1 reply; 5+ messages in thread
From: Anand Avati @ 2013-06-12 19:04 UTC (permalink / raw)
  To: Maxim Patlasov; +Cc: miklos, fuse-devel, bfoster, linux-kernel, devel

On 6/11/13 3:59 AM, Maxim Patlasov wrote:

> -	if (mode & FALLOC_FL_PUNCH_HOLE) {
> +	if (lock_inode)
>   		mutex_lock(&inode->i_mutex);

> +	if (mode & FALLOC_FL_PUNCH_HOLE)
>   		fuse_set_nowrite(inode);
> -	}

Just for clarity, can you make the condition to check 
FALLOC_FL_PUNCH_HOLE and call to fuse_set_nowrite() nested within the 
larger if (lock_inode) { .. } block? fuse_set_nowrite() should not be 
called without i_mutex acquired. The current style of calling 
mutex_lock() and fuse_set_nowrite() in separate conditions can 
potentially cause bugs in the future if they were to get re-ordered due 
to some unrelated patch. Nesting them makes the relation more explicit 
and clear.

Thanks,
Avati


^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] fuse: hold i_mutex in fuse_file_fallocate()
  2013-06-12 19:04 ` Anand Avati
@ 2013-06-13  7:15   ` Maxim Patlasov
  0 siblings, 0 replies; 5+ messages in thread
From: Maxim Patlasov @ 2013-06-13  7:15 UTC (permalink / raw)
  To: Anand Avati; +Cc: miklos, fuse-devel, bfoster, linux-kernel, devel

Anand, Brian,

06/12/2013 11:04 PM, Anand Avati пишет:
> On 6/11/13 3:59 AM, Maxim Patlasov wrote:
>
>> -    if (mode & FALLOC_FL_PUNCH_HOLE) {
>> +    if (lock_inode)
>>           mutex_lock(&inode->i_mutex);
>
>> +    if (mode & FALLOC_FL_PUNCH_HOLE)
>>           fuse_set_nowrite(inode);
>> -    }
>
> Just for clarity, can you make the condition to check 
> FALLOC_FL_PUNCH_HOLE and call to fuse_set_nowrite() nested within the 
> larger if (lock_inode) { .. } block? fuse_set_nowrite() should not be 
> called without i_mutex acquired. The current style of calling 
> mutex_lock() and fuse_set_nowrite() in separate conditions can 
> potentially cause bugs in the future if they were to get re-ordered 
> due to some unrelated patch. Nesting them makes the relation more 
> explicit and clear.

Thanks a lot for review. I'll post updated patch soon.

Thanks,
Maxim


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2013-06-13  7:16 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-06-11 10:59 [PATCH] fuse: hold i_mutex in fuse_file_fallocate() Maxim Patlasov
2013-06-12 11:40 ` Brian Foster
2013-06-12 18:56   ` Anand Avati
2013-06-12 19:04 ` Anand Avati
2013-06-13  7:15   ` Maxim Patlasov

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.