fallocate missing fd_offset
v3 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 the the fallocate use in ram_block_discard_guest_memfd_range().
The 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
v2->v3
. change the error reporting messages separating start and fd_offset . the local variable is no longer needed
William Roche (1):
system/physmem: take into account fd_offset for file fallocate
system/physmem.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
Signature · 1 line
2.43.5
PATCH v3 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 | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
system/physmem.c +7 -5
@@ -3689,18 +3689,19 @@ 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); + start + rb->fd_offset, length);if (ret) { ret = -errno; -error_report ("%s: Failed to fallocate %s:%" PRIx64" +%zx (%d)" , - __func__, rb->idstr, start, length, ret); +error_report ("%s: Failed to fallocate %s:%" PRIx64"+%" PRIx64 +" +%zx (%d)" , __func__, rb->idstr, start, + rb->fd_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); +"%s:%" PRIx64"+%" PRIx64" +%zx (%d)" , __func__, + rb->idstr, start, rb->fd_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 v3 1/1] system/physmem: take into account fd_offset for file fallocate
Quoted 9 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]>
Signature · 1 line
Peter Xu
Re: [PATCH v3 1/1] system/physmem: take into account fd_offset for file fallocate
In reply to “William RocheQuoted 10 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]>---
Signature · 3 lines
Cheers, David / dhildenb