fix hang when BLKTRACESETUP fails and "-o -" is used
PATCH 1/1 fix hang when BLKTRACESETUP fails and "-o -" is used
# blktrace -o - /dev/sda /dev/sdb /dev/sdc
has to be SIGKILLed if BLKTRACESETUP fails for any or all of the devices listed. (I simulated this by just catching one of the devices in setup_buts(), skipping the ioctl, and doing ret++).
This seems to be because with "-o -" on the command line, use_tracer_devpaths() sees piped_output set, so we call process_trace_bufs which ends up waiting on (!done) and "done" is never set. i.e.
atexit(exit_tracing)
wait_tracers if (use_tracer_devpaths()) // true because "-o -" process_trace_bufs while (wait_empty_entries()) wait_empty_entries while (!done ... ) <loop forever>
I think this can be avoided by just setting "done = 1" before returning when setup_buts() fails in run_tracers().
---
blktrace.c +3 -1
@@ -2684,8 +2684,10 @@ static int run_tracers(void)if (net_mode == Net_client)printf ("blktrace: connecting to %s\n" , hostname); -if (setup_buts ()) +if (setup_buts ()) { + done =1 ;return 1 ; + }if (use_tracer_devpaths ()) {if (setup_tracer_devpaths ())
Hi, Eric,
This looks like a repost? I mentioned that we should also set done = 1 for a failed setup_tracer_devpaths() call, and I was hoping you'd include that in a new version (or at least comment on whether you thought it was a good idea). Sorry if that wasn't clear!
The change here looks good to me.
-Jeff
Quoted 41 lines · Eric Sandeen
# blktrace -o - /dev/sda /dev/sdb /dev/sdchas to be SIGKILLed if BLKTRACESETUP fails for any or all of the devices listed. (I simulated this by just catching one of the devices in
setup_buts(), skipping the ioctl, and doing ret++).This seems to be because with "-o -" on the command line,
use_tracer_devpaths()seespiped_outputset, so we callprocess_trace_bufswhich ends up waiting on (!done) and "done" is never set. i.e.
atexit(exit_tracing)wait_tracers if (use_tracer_devpaths()) // true because "-o -" process_trace_bufs while (wait_empty_entries()) wait_empty_entries while (!done ... ) <loop forever>I think this can be avoided by just setting "done = 1" before returning when
setup_buts()fails inrun_tracers().Signed-off-by Eric Sandeen <[email protected]>---
blktrace.c +3
-1@@ -2684,8 +2684,10 @@ static int run_tracers(void)if (net_mode == Net_client)printf ("blktrace: connecting to %s\n" , hostname); -if (setup_buts ()) +if (setup_buts ()) { + done =1 ;return 1 ; + }if (use_tracer_devpaths ()) {if (setup_tracer_devpaths ())
Quoted 6 lines · Jeff Moyer
Hi, Eric,
This looks like a repost? I mentioned that we should also set done = 1 for a failed
setup_tracer_devpaths()call, and I was hoping you'd include that in a new version (or at least comment on whether you thought it was a good idea). Sorry if that wasn't clear!
The first one was a question, this one was a patch :)
I'm sorry, I have not had time to look into or test for failed setup_tracer_devpaths() calls, and hoped to just fix the bug I had encountered.
Quoted 1 line
The change here looks good to me.
Thanks,
-Eric
Quoted 47 lines
-Jeff
Quoted 41 lines · Eric Sandeen
# blktrace -o - /dev/sda /dev/sdb /dev/sdchas to be SIGKILLed if BLKTRACESETUP fails for any or all of the devices listed. (I simulated this by just catching one of the devices in
setup_buts(), skipping the ioctl, and doing ret++).This seems to be because with "-o -" on the command line,
use_tracer_devpaths()seespiped_outputset, so we callprocess_trace_bufswhich ends up waiting on (!done) and "done" is never set. i.e.
atexit(exit_tracing)wait_tracers if (use_tracer_devpaths()) // true because "-o -" process_trace_bufs while (wait_empty_entries()) wait_empty_entries while (!done ... ) <loop forever>I think this can be avoided by just setting "done = 1" before returning when
setup_buts()fails inrun_tracers().Signed-off-by Eric Sandeen <[email protected]>---
blktrace.c +3
-1@@ -2684,8 +2684,10 @@ static int run_tracers(void)if (net_mode == Net_client)printf ("blktrace: connecting to %s\n" , hostname); -if (setup_buts ()) +if (setup_buts ()) { + done =1 ;return 1 ; + }if (use_tracer_devpaths ()) {if (setup_tracer_devpaths ())
Jeff Moyer
Reviewed-byQuoted 9 lines · Eric Sandeen
Quoted 6 lines · Jeff Moyer
Hi, Eric,
This looks like a repost? I mentioned that we should also set done = 1 for a failed
setup_tracer_devpaths()call, and I was hoping you'd include that in a new version (or at least comment on whether you thought it was a good idea). Sorry if that wasn't clear!The first one was a question, this one was a patch :)
Ah, ok. :)
Quoted 3 lines
I'm sorry, I have not had time to look into or test for failed
setup_tracer_devpaths()calls, and hoped to just fix the bug I had encountered.
That's fair.
Thanks!
Quoted 53 lines
Quoted 2 lines
The change here looks good to me.
Thanks,
-EricQuoted 47 lines
-Jeff
Quoted 41 lines · Eric Sandeen
# blktrace -o - /dev/sda /dev/sdb /dev/sdchas to be SIGKILLed if BLKTRACESETUP fails for any or all of the devices listed. (I simulated this by just catching one of the devices in
setup_buts(), skipping the ioctl, and doing ret++).This seems to be because with "-o -" on the command line,
use_tracer_devpaths()seespiped_outputset, so we callprocess_trace_bufswhich ends up waiting on (!done) and "done" is never set. i.e.
atexit(exit_tracing)wait_tracers if (use_tracer_devpaths()) // true because "-o -" process_trace_bufs while (wait_empty_entries()) wait_empty_entries while (!done ... ) <loop forever>I think this can be avoided by just setting "done = 1" before returning when
setup_buts()fails inrun_tracers().Signed-off-by Eric Sandeen <[email protected]>---
blktrace.c +3
-1@@ -2684,8 +2684,10 @@ static int run_tracers(void)if (net_mode == Net_client)printf ("blktrace: connecting to %s\n" , hostname); -if (setup_buts ()) +if (setup_buts ()) { + done =1 ;return 1 ; + }if (use_tracer_devpaths ()) {if (setup_tracer_devpaths ())
Jens Axboe
AppliedQuoted 11 lines · Eric Sandeen
# blktrace -o - /dev/sda /dev/sdb /dev/sdchas to be SIGKILLed if BLKTRACESETUP fails for any or all of the devices listed. (I simulated this by just catching one of the devices in
setup_buts(), skipping the ioctl, and doing ret++).This seems to be because with "-o -" on the command line,
use_tracer_devpaths()seespiped_outputset, so we callprocess_trace_bufswhich ends up waiting on (!done) and "done" is never set. i.e.[...]
Applied, thanks!
[1/1] fix hang when BLKTRACESETUP fails and "-o -" is used
commit: 1836be5d99c9362f1e2b39206c95270f19cb7faa
Best regards,
Signature · 1 line
Jens Axboe