fallocate missing fd_offset
v2 cover fallocate missing fd_offset
From: William Roche <[email protected]>
Working on the poisoned memory recovery mechanisms with David Hildenbrand, it appeared that the file hole punching done with the memory discard functions are missing the file offset value fd_offset to correctly modify the right file location.
Note that guest_memfd would not currently take into account fd_offset, so I'm adding a comment next to the fallocate use in ram_block_discard_guest_memfd_range().
This version is also checkpatch.pl clean
make check runs fine on both ARM and x86
v1->v2
. replacing the ram_block_discard_guest_memfd_range()
modifications with a comment
. use a local variable for the global file offset
William Roche (1):
system/physmem: take into account fd_offset for file fallocate
system/physmem.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
Signature · 1 line
2.43.5
PATCH v2 1/1 system/physmem: take into account fd_offset for file fallocate
From: William Roche <[email protected]>
Punching a hole in a file with fallocate needs to take into account the fd_offset value for a correct file location.
But guest_memfd internal use doesn't currently consider fd_offset.
--- system/physmem.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
system/physmem.c +5 -3
@@ -3655,6 +3655,7 @@ int ram_block_discard_range(RAMBlock *rb, uint64_t start, size_t length) need_madvise = (rb->page_size ==qemu_real_host_page_size ()); need_fallocate = rb->fd !=-1 ;if (need_fallocate) { +uint64_t file_offset = start + rb->fd_offset;/* For a file, this causes the area of the file to be zero'd * if read, and for hugetlbfs also causes it to be unmapped * so a userfault will trigger.
@@ -3689,18 +3690,18 @@ int ram_block_discard_range(RAMBlock *rb, uint64_t start, size_t length) } ret =fallocate (rb->fd,FALLOC_FL_PUNCH_HOLE |FALLOC_FL_KEEP_SIZE , - start, length); + file_offset, length);if (ret) { ret = -errno;error_report ("%s: Failed to fallocate %s:%" PRIx64" +%zx (%d)" , - __func__, rb->idstr, start, length, ret); + __func__, rb->idstr, file_offset, length, ret); goto err; }#else ret = -ENOSYS ;error_report ("%s: fallocate not available/file" "%s:%" PRIx64" +%zx (%d)" , - __func__, rb->idstr, start, length, ret); + __func__, rb->idstr, file_offset, length, ret); goto err;#endif }
@@ -3747,6 +3748,7 @@ int ram_block_discard_guest_memfd_range(RAMBlock *rb, uint64_t start,int ret =-1 ;#ifdef CONFIG_FALLOCATE_PUNCH_HOLE +/* ignore fd_offset with guest_memfd */ ret =fallocate (rb->guest_memfd,FALLOC_FL_PUNCH_HOLE |FALLOC_FL_KEEP_SIZE , start, length);
Signature · 1 line
2.43.5
Re: [PATCH v2 1/1] system/physmem: take into account fd_offset for file fallocate
Quoted 18 lines · “William Roche
From: William Roche <[email protected]>
Punching a hole in a file with fallocate needs to take into account the
fd_offsetvalue for a correct file location.
Butguest_memfdinternal use doesn't currently considerfd_offset.Fixes 4b870dc4d0c0 ("hostmem-file: add offset option")Signed-off-by William Roche <[email protected]>--- system/physmem.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)system/physmem.c +0
-0
system/physmem.c int ram_block_discard_range(RAMBlock *rb, uint64_t start, size_t length) · line 3658
Quoted 4 lines
system/physmem.c +1
-0@@ -3655,6 +3655,7 @@ int ram_block_discard_range(RAMBlock *rb, uint64_t start, size_t length) need_madvise = (rb->page_size ==qemu_real_host_page_size ()); need_fallocate = rb->fd !=-1 ;if (need_fallocate) { +uint64_t file_offset = start + rb->fd_offset;
Taking another closer look ...
Could likely be "off_t".
Quoted 14 lines
system/physmem.c +2
-2/* For a file, this causes the area of the file to be zero'd * if read, and for hugetlbfs also causes it to be unmapped * so a userfault will trigger. @@ -3689,18 +3690,18 @@ int ram_block_discard_range(RAMBlock *rb, uint64_t start, size_t length) } ret =fallocate (rb->fd,FALLOC_FL_PUNCH_HOLE |FALLOC_FL_KEEP_SIZE , - start, length); + file_offset, length);if (ret) { ret = -errno;error_report ("%s: Failed to fallocate %s:%" PRIx64" +%zx (%d)" , - __func__, rb->idstr, start, length, ret); + __func__, rb->idstr, file_offset, length, ret);
system/physmem.c int ram_block_discard_range(RAMBlock *rb, uint64_t start, size_t length) · line 3706
Quoted 10 lines
system/physmem.c +1
-1goto err; }#else ret = -ENOSYS ;error_report ("%s: fallocate not available/file" "%s:%" PRIx64" +%zx (%d)" , - __func__, rb->idstr, start, length, ret); + __func__, rb->idstr, file_offset, length, ret); goto err;#endif
Thinking again, both error_report() should likely not have the offset replaced?
We are printing essentially the parameters to ram_block_discard_range() -- range in the ramblock -- just like in the "Failed to discard range" range.
So maybe just leave it like is or print the file offset additionally? (which might only make sense in the "Failed to fallocate" case).
Thanks!
Signature · 3 lines
Cheers, David / dhildenb
Re: [PATCH v2 1/1] system/physmem: take into account fd_offset for file fallocate
Quoted 14 lines · David Hildenbrand
system/physmem.c int ram_block_discard_range(RAMBlock *rb, · line 3659
Quoted 10 lines · “William Roche
From: William Roche <[email protected]>
[...]system/physmem.c +1
-0@@ -3655,6 +3655,7 @@ int ram_block_discard_range(RAMBlock *rb, uint64_t start, size_t length) need_madvise = (rb->page_size == qemu_real_host_page_size()); need_fallocate = rb->fd != -1; if (need_fallocate) { + uint64_t file_offset = start + rb->fd_offset;Taking another closer look ...
Quoted 1 line
Could likely be "
off_t".
Right.
Quoted 27 lines
Quoted 18 lines
system/physmem.c +0
-0/* For a file, this causes the area of the file to be zero'd* if read, and for hugetlbfs also causes it to be unmapped * so a userfault will trigger.
system/physmem.c +2
-2@@ -3689,18 +3690,18 @@ int ram_block_discard_range(RAMBlock *rb, uint64_t start, size_t length) } ret = fallocate(rb->fd, FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, - start, length); + file_offset, length); if (ret) { ret = -errno; error_report("%s: Failed to fallocate %s:%" PRIx64 " +%zx (%d)", - __func__, rb->idstr, start, length, ret); + __func__, rb->idstr, file_offset, length, ret); goto err; } #else ret = -ENOSYS;Quoted 6 lines
error_report("%s: fallocate not available/file" "%s:%" PRIx64 " +%zx (%d)",
-__func__,rb->idstr, start, length, ret); +__func__,rb->idstr,file_offset, length, ret); goto err;
#endifThinking again, both
error_report()should likely not have the offset replaced?
Quoted 5 lines
We are printing essentially the parameters to
ram_block_discard_range()-- range in the ramblock -- just like in the "Failed to discard range" range.So maybe just leave it like is or print the file offset additionally? (which might only make sense in the "Failed to fallocate" case).
I understand that the start value may be clearer to read than the global file_offset. So I'm slightly modifying the error message to show <start>+<fd_offset> (without space) which would usually be <start>+0
For example:
ram_block_discard_range: Failed to fallocate ram-node1:f2db000+0 +1000
(-5)
instead of:
ram_block_discard_range: Failed to fallocate ram-node1:f2db000 +1000 (-5)
The length notation isn't changing, coming afterwards with a space -- so that it continues to match all the other similar range error messages in system/physmem.c.
I also align the "fallocate not available/file" message to show the extra +<fd_offset> after the <start>.
I'm sending a v3 version now.
William.