fsstress: avoid infinite zero byte reading
PATCH v3 1/1 fsstress: avoid infinite zero byte reading
copyrange_f and splice_f functions use a while loop to read a file, it's fine if there's only one fsstress process(and its children), but if some third part testing processes remove the file in the middle phase of copyrange_f running, copyrange_f maybe always return 0, and the while loop can't be end. As below:
root 47184 xxxxxx S+ ./fsstress -d /mnt/scratch -n 10000 -p 20 -v root 47187 xxxxxx R+ ./fsstress -d /mnt/scratch -n 10000 -p 20 -v root 47199 xxxxxx R+ ./fsstress -d /mnt/scratch -n 10000 -p 20 -v root 47314 xxxxxx S+ grep --color=auto fsstress
...
...copy_file_range(3, [372258], 4, [2658770], 71179, 0) = 0copy_file_range(3, [372258], 4, [2658770], 71179, 0) = 0copy_file_range(3, [372258], 4, [2658770], 71179, 0) = 0copy_file_range(3, [372258], 4, [2658770], 71179, 0) = 0
...
...
lr-x------. 1 root root 64 Jan 28 11:34 /proc/47187/fd/3 -> '/mnt/scratch/p2/f2 (deleted)'
Signed-off-by Zorro Lang <[email protected]>
--- ltp/fsstress.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
ltp/fsstress.c +4 -4
@@ -2449,7 +2449,7 @@ copyrange_f(while (len >0 ) { ret =syscall (__NR_copy_file_range, fd1, &off1, fd2, &off2, len,0 ); -if (ret <0 ) { +if (ret <=0 ) {if (errno !=EAGAIN || tries++ >=300 )break ; }else if (ret > len)
@@ -2890,7 +2890,7 @@ splice_f(int opno, long r)while (len >0 ) {/* move to pipe buffer */ ret1 =splice (fd1, &off1, filedes[1 ],NULL , len,0 ); -if (ret1 <0 ) { +if (ret1 <=0 ) {break ; } bytes = ret1;
@@ -2898,12 +2898,12 @@ splice_f(int opno, long r)/* move from pipe buffer to dst file */ while (bytes >0 ) { ret2 =splice (filedes[0 ],NULL , fd2, &off2, bytes,0 ); -if (ret2 <0 ) { +if (ret2 <=0 ) {break ; } bytes -= ret2; } -if (ret2 <0 ) +if (ret2 <=0 )break ; len -= ret1;
Signature · 1 line
2.17.2