* [PATCH v2] Btrfs: fix error handling in btrfs_truncate()
@ 2018-05-22 16:47 Omar Sandoval
2018-05-22 17:17 ` David Sterba
0 siblings, 1 reply; 6+ messages in thread
From: Omar Sandoval @ 2018-05-22 16:47 UTC (permalink / raw)
To: linux-btrfs; +Cc: kernel-team, David Sterba, Jun Wu
From: Omar Sandoval <osandov@fb.com>
Jun Wu at Facebook reported that an internal service was seeing a return
value of 1 from ftruncate() on Btrfs in some cases. This is coming from
the NEED_TRUNCATE_BLOCK return value from btrfs_truncate_inode_items().
btrfs_truncate() uses two variables for error handling, ret and err.
When btrfs_truncate_inode_items() returns non-zero, we set err to the
return value. However, NEED_TRUNCATE_BLOCK is not an error. Make sure we
only set err if ret is an error (i.e., negative).
Fixes: ddfae63cc8e0 ("btrfs: move btrfs_truncate_block out of trans handle")
Reported-by: Jun Wu <quark@fb.com>
Cc: stable@vger.kernel.org
Signed-off-by: Omar Sandoval <osandov@fb.com>
---
This version makes the minimal fix which should be good for v4.17 and
stable. I'll submit a cleanup separately.
fs/btrfs/inode.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
index d241285a0d2a..f276da70f659 100644
--- a/fs/btrfs/inode.c
+++ b/fs/btrfs/inode.c
@@ -9117,7 +9117,8 @@ static int btrfs_truncate(struct inode *inode, bool skip_writeback)
BTRFS_EXTENT_DATA_KEY);
trans->block_rsv = &fs_info->trans_block_rsv;
if (ret != -ENOSPC && ret != -EAGAIN) {
- err = ret;
+ if (ret < 0)
+ err = ret;
break;
}
--
2.17.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2] Btrfs: fix error handling in btrfs_truncate()
2018-05-22 16:47 [PATCH v2] Btrfs: fix error handling in btrfs_truncate() Omar Sandoval
@ 2018-05-22 17:17 ` David Sterba
2018-05-22 17:37 ` Omar Sandoval
0 siblings, 1 reply; 6+ messages in thread
From: David Sterba @ 2018-05-22 17:17 UTC (permalink / raw)
To: Omar Sandoval; +Cc: linux-btrfs, kernel-team, David Sterba, Jun Wu
On Tue, May 22, 2018 at 09:47:58AM -0700, Omar Sandoval wrote:
> From: Omar Sandoval <osandov@fb.com>
>
> Jun Wu at Facebook reported that an internal service was seeing a return
> value of 1 from ftruncate() on Btrfs in some cases.
Do you have a reproducer? To estimate how likely is to hit the problem
in practice.
> This is coming from
> the NEED_TRUNCATE_BLOCK return value from btrfs_truncate_inode_items().
>
> btrfs_truncate() uses two variables for error handling, ret and err.
> When btrfs_truncate_inode_items() returns non-zero, we set err to the
> return value. However, NEED_TRUNCATE_BLOCK is not an error. Make sure we
> only set err if ret is an error (i.e., negative).
>
> Fixes: ddfae63cc8e0 ("btrfs: move btrfs_truncate_block out of trans handle")
> Reported-by: Jun Wu <quark@fb.com>
> Cc: stable@vger.kernel.org
> Signed-off-by: Omar Sandoval <osandov@fb.com>
> ---
> This version makes the minimal fix which should be good for v4.17 and
> stable. I'll submit a cleanup separately.
>
> fs/btrfs/inode.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c
> index d241285a0d2a..f276da70f659 100644
> --- a/fs/btrfs/inode.c
> +++ b/fs/btrfs/inode.c
> @@ -9117,7 +9117,8 @@ static int btrfs_truncate(struct inode *inode, bool skip_writeback)
> BTRFS_EXTENT_DATA_KEY);
> trans->block_rsv = &fs_info->trans_block_rsv;
> if (ret != -ENOSPC && ret != -EAGAIN) {
> - err = ret;
> + if (ret < 0)
> + err = ret;
> break;
> }
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] Btrfs: fix error handling in btrfs_truncate()
2018-05-22 17:17 ` David Sterba
@ 2018-05-22 17:37 ` Omar Sandoval
2018-05-22 17:41 ` Omar Sandoval
0 siblings, 1 reply; 6+ messages in thread
From: Omar Sandoval @ 2018-05-22 17:37 UTC (permalink / raw)
To: dsterba, linux-btrfs, kernel-team, David Sterba, Jun Wu
On Tue, May 22, 2018 at 07:17:48PM +0200, David Sterba wrote:
> On Tue, May 22, 2018 at 09:47:58AM -0700, Omar Sandoval wrote:
> > From: Omar Sandoval <osandov@fb.com>
> >
> > Jun Wu at Facebook reported that an internal service was seeing a return
> > value of 1 from ftruncate() on Btrfs in some cases.
>
> Do you have a reproducer? To estimate how likely is to hit the problem
> in practice.
This reproduces it every time when mounted with compress-force=zstd:
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/mman.h>
#include <unistd.h>
int main() {
int i;
for (i = 0; i < 2; i++) {
char buf[256] = { 0 };
int fd, ret;
char *p;
fd = open("test", O_CREAT | O_WRONLY | O_TRUNC, 0666);
if (fd == -1) {
perror("open");
return EXIT_FAILURE;
}
if (write(fd, buf, sizeof(buf)) != sizeof(buf)) {
perror("write");
close(fd);
return EXIT_FAILURE;
}
close(fd);
fd = open("test", O_RDONLY, 0666);
if (fd == -1) {
perror("open");
return EXIT_FAILURE;
}
p = mmap(NULL, 256, PROT_READ, MAP_SHARED, fd, 0);
if (p == MAP_FAILED) {
perror("mmap");
close(fd);
return EXIT_FAILURE;
}
if (p[0] != 0)
return 1;
close(fd);
fd = open("test", O_WRONLY, 0666);
if (fd == -1) {
perror("open");
return EXIT_FAILURE;
}
ret = ftruncate(fd, 128);
if (ret) {
printf("ftruncate() returned %d\n", ret);
close(fd);
return EXIT_FAILURE;
}
close(fd);
}
return EXIT_SUCCESS;
}
This happens any time NEED_TRUNCATE_BLOCK is returned. The file has to
be inline and compressed, and there's some other condition that I
haven't figured out yet which the mmap() is there for.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] Btrfs: fix error handling in btrfs_truncate()
2018-05-22 17:37 ` Omar Sandoval
@ 2018-05-22 17:41 ` Omar Sandoval
2018-05-22 17:48 ` Omar Sandoval
0 siblings, 1 reply; 6+ messages in thread
From: Omar Sandoval @ 2018-05-22 17:41 UTC (permalink / raw)
To: dsterba, linux-btrfs, kernel-team, David Sterba, Jun Wu
On Tue, May 22, 2018 at 10:37:14AM -0700, Omar Sandoval wrote:
> On Tue, May 22, 2018 at 07:17:48PM +0200, David Sterba wrote:
> > On Tue, May 22, 2018 at 09:47:58AM -0700, Omar Sandoval wrote:
> > > From: Omar Sandoval <osandov@fb.com>
> > >
> > > Jun Wu at Facebook reported that an internal service was seeing a return
> > > value of 1 from ftruncate() on Btrfs in some cases.
> >
> > Do you have a reproducer? To estimate how likely is to hit the problem
> > in practice.
Here's an even easier one: truncating a compressed, inline file twice:
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
int main() {
char buf[256] = { 0 };
int ret;
int fd;
fd = open("test", O_CREAT | O_WRONLY | O_TRUNC, 0666);
if (fd == -1) {
perror("open");
return EXIT_FAILURE;
}
if (write(fd, buf, sizeof(buf)) != sizeof(buf)) {
perror("write");
close(fd);
return EXIT_FAILURE;
}
close(fd);
fd = open("test", O_WRONLY, 0666);
if (fd == -1) {
perror("open");
return EXIT_FAILURE;
}
ret = ftruncate(fd, 128);
if (ret) {
printf("first ftruncate() returned %d\n", ret);
close(fd);
return EXIT_FAILURE;
}
close(fd);
fd = open("test", O_WRONLY, 0666);
if (fd == -1) {
perror("open");
return EXIT_FAILURE;
}
ret = ftruncate(fd, 64);
if (ret) {
printf("second ftruncate() returned %d\n", ret);
close(fd);
return EXIT_FAILURE;
}
close(fd);
return EXIT_SUCCESS;
}
The output is
second ftruncate() returned 1
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] Btrfs: fix error handling in btrfs_truncate()
2018-05-22 17:41 ` Omar Sandoval
@ 2018-05-22 17:48 ` Omar Sandoval
2018-05-24 11:06 ` David Sterba
0 siblings, 1 reply; 6+ messages in thread
From: Omar Sandoval @ 2018-05-22 17:48 UTC (permalink / raw)
To: dsterba, linux-btrfs, kernel-team, David Sterba, Jun Wu
On Tue, May 22, 2018 at 10:41:11AM -0700, Omar Sandoval wrote:
> On Tue, May 22, 2018 at 10:37:14AM -0700, Omar Sandoval wrote:
> > On Tue, May 22, 2018 at 07:17:48PM +0200, David Sterba wrote:
> > > On Tue, May 22, 2018 at 09:47:58AM -0700, Omar Sandoval wrote:
> > > > From: Omar Sandoval <osandov@fb.com>
> > > >
> > > > Jun Wu at Facebook reported that an internal service was seeing a return
> > > > value of 1 from ftruncate() on Btrfs in some cases.
> > >
> > > Do you have a reproducer? To estimate how likely is to hit the problem
> > > in practice.
Okay last one, I promise, we just need the extent items to be on disk:
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
int main(void) {
char buf[256] = { 0 };
int ret;
int fd;
fd = open("test", O_CREAT | O_WRONLY | O_TRUNC, 0666);
if (fd == -1) {
perror("open");
return EXIT_FAILURE;
}
if (write(fd, buf, sizeof(buf)) != sizeof(buf)) {
perror("write");
close(fd);
return EXIT_FAILURE;
}
if (fsync(fd) == -1) {
perror("fsync");
close(fd);
return EXIT_FAILURE;
}
ret = ftruncate(fd, 128);
if (ret) {
printf("ftruncate() returned %d\n", ret);
close(fd);
return EXIT_FAILURE;
}
close(fd);
return EXIT_SUCCESS;
}
Basically, any time we truncate a compressed, inline file, as long as
its extents are already on disk, we get the erroneous return value.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2] Btrfs: fix error handling in btrfs_truncate()
2018-05-22 17:48 ` Omar Sandoval
@ 2018-05-24 11:06 ` David Sterba
0 siblings, 0 replies; 6+ messages in thread
From: David Sterba @ 2018-05-24 11:06 UTC (permalink / raw)
To: Omar Sandoval; +Cc: dsterba, linux-btrfs, kernel-team, David Sterba, Jun Wu
On Tue, May 22, 2018 at 10:48:38AM -0700, Omar Sandoval wrote:
> On Tue, May 22, 2018 at 10:41:11AM -0700, Omar Sandoval wrote:
> > On Tue, May 22, 2018 at 10:37:14AM -0700, Omar Sandoval wrote:
> > > On Tue, May 22, 2018 at 07:17:48PM +0200, David Sterba wrote:
> > > > On Tue, May 22, 2018 at 09:47:58AM -0700, Omar Sandoval wrote:
> > > > > From: Omar Sandoval <osandov@fb.com>
> > > > >
> > > > > Jun Wu at Facebook reported that an internal service was seeing a return
> > > > > value of 1 from ftruncate() on Btrfs in some cases.
> > > >
> > > > Do you have a reproducer? To estimate how likely is to hit the problem
> > > > in practice.
>
> Okay last one, I promise, we just need the extent items to be on disk:
[...]
Thanks, I'll add it to the changelog and send the pull request about today.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-05-24 11:09 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-05-22 16:47 [PATCH v2] Btrfs: fix error handling in btrfs_truncate() Omar Sandoval
2018-05-22 17:17 ` David Sterba
2018-05-22 17:37 ` Omar Sandoval
2018-05-22 17:41 ` Omar Sandoval
2018-05-22 17:48 ` Omar Sandoval
2018-05-24 11:06 ` David Sterba
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.