apfs/apfstests
0
0
Fork 0
mirror of https://github.com/linux-apfs/apfstests.git synced 2026-05-01 15:01:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

fsx: fix infinite/too long loops when generating ranges for copy_file_range

Browse Source 
While running generic/521 I've had fsx taking a lot of CPU time and not
making any progress for several hours. Attaching gdb to the fsx process
revealed that fsx was in the loop that generates the ranges for a
copy_file_range operation, in particular the loop seemed to never end
because the range defined by 'offset2' kept overlapping with the range
defined by 'offset'.
So far this happened one time only in one of my test VMs with generic/521.

Fix this by breaking out of the loop after trying 30 times, like we
currently do for dedupe operations, which results in logging the operation
as skipped.

Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
This commit is contained in:
Filipe Manana
2020-04-20 18:09:17 +01:00
committed by Eryu Guan
parent c8b5a73750
commit e5faa1ef15
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ltp/fsx.c
+19 -11
View File
@@ -2051,17 +2051,25 @@ test(void)
break;
}
case OP_COPY_RANGE:
TRIM_OFF_LEN(offset, size, file_size);
offset -= offset % readbdy;
if (o_direct)
size -= size % readbdy;
do {
offset2 = random();
TRIM_OFF(offset2, maxfilelen);
offset2 -= offset2 % writebdy;
} while (range_overlaps(offset, offset2, size) ||
offset2 + size > maxfilelen);
break;
{
int tries = 0;
TRIM_OFF_LEN(offset, size, file_size);
offset -= offset % readbdy;
if (o_direct)
size -= size % readbdy;
do {
if (tries++ >= 30) {
size = 0;
break;
}
offset2 = random();
TRIM_OFF(offset2, maxfilelen);
offset2 -= offset2 % writebdy;
} while (range_overlaps(offset, offset2, size) ||
offset2 + size > maxfilelen);
break;
}
}
have_op: