diff mbox

Revert "posix-aio-compat: avoid signal race when spawning a thread"

Message ID 20091007132006.GA9668@redhat.com
State Rejected
Headers show

Commit Message

Michael S. Tsirkin Oct. 7, 2009, 1:20 p.m. UTC
This reverts commit ee3993069ff55fa6f1c64daf1e09963e340db8e4.

With commit ee3993069ff55fa6f1c64daf1e09963e340db8e4,
winxp installation on a raw format file fails
during disk format, with a message "your
disk may be damaged".

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Cc: malc <av1474@comtv.ru>
---

malc, care to describe what the problem you
are solving here is?

All, could everyone please start being nice and post patches
and give time for review before applying?
Thanks!

 posix-aio-compat.c |   14 +++++---------
 1 files changed, 5 insertions(+), 9 deletions(-)

Comments

malc Oct. 7, 2009, 4:04 p.m. UTC | #1
On Wed, 7 Oct 2009, Michael S. Tsirkin wrote:

> This reverts commit ee3993069ff55fa6f1c64daf1e09963e340db8e4.
> 
> With commit ee3993069ff55fa6f1c64daf1e09963e340db8e4,
> winxp installation on a raw format file fails
> during disk format, with a message "your
> disk may be damaged".
> 
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> Cc: malc <av1474@comtv.ru>
> ---
> 
> malc, care to describe what the problem you
> are solving here is?

New thread is spawned, SIGALRM arrives, kernel picks up this new thread
since it's mask allows it - bad thigs happen.

> 
> All, could everyone please start being nice and post patches
> and give time for review before applying?
> Thanks!

There's nothing to review in this particular case, the thing was plain
broken, besides same thing was already discussed between me and
Andrzej, see for instance:
http://www.mail-archive.com/qemu-devel@nongnu.org/msg09542.html

Needless to say the revert is broken also.
Anthony Liguori Oct. 7, 2009, 4:28 p.m. UTC | #2
> There's nothing to review in this particular case, the thing was plain
> broken, besides same thing was already discussed between me and
> Andrzej, see for instance:
> http://www.mail-archive.com/qemu-devel@nongnu.org/msg09542.html
>
> Needless to say the revert is broken also.
>   

Yeah, I understand the race the original commit fixes but I don't 
understand how the original commit broke WinXP.

Do you have further insight Michael?  Blindly reverting something that 
appears right because of a regression is likely just papering over a 
bigger problem.

Regards,

Anthony Liguori
Michael S. Tsirkin Oct. 7, 2009, 4:33 p.m. UTC | #3
On Wed, Oct 07, 2009 at 11:28:21AM -0500, Anthony Liguori wrote:
>
>> There's nothing to review in this particular case, the thing was plain
>> broken, besides same thing was already discussed between me and
>> Andrzej, see for instance:
>> http://www.mail-archive.com/qemu-devel@nongnu.org/msg09542.html
>>
>> Needless to say the revert is broken also.
>>   
>
> Yeah, I understand the race the original commit fixes but I don't  
> understand how the original commit broke WinXP.
>
> Do you have further insight Michael?

Nope, I just bisected and then reverted and tested that this helps.

>  Blindly reverting something that  
> appears right because of a regression is likely just papering over a  
> bigger problem.
>
> Regards,
>
> Anthony Liguori
>
Michael S. Tsirkin Oct. 7, 2009, 8:44 p.m. UTC | #4
On Wed, Oct 07, 2009 at 11:28:21AM -0500, Anthony Liguori wrote:
>
>> There's nothing to review in this particular case, the thing was plain
>> broken, besides same thing was already discussed between me and
>> Andrzej, see for instance:
>> http://www.mail-archive.com/qemu-devel@nongnu.org/msg09542.html
>>
>> Needless to say the revert is broken also.
>>   
>
> Yeah, I understand the race the original commit fixes but I don't  
> understand how the original commit broke WinXP.
>
> Do you have further insight Michael?

My guess is that SIGALARM gets lost, this somehow leads to
disk request to timeout. Possible?

> Blindly reverting something that  appears right because of a
> regression is likely just papering over a  bigger problem.
>
> Regards,
>
> Anthony Liguori
>
malc Oct. 7, 2009, 8:54 p.m. UTC | #5
On Wed, 7 Oct 2009, Michael S. Tsirkin wrote:

> On Wed, Oct 07, 2009 at 11:28:21AM -0500, Anthony Liguori wrote:
> >
> >> There's nothing to review in this particular case, the thing was plain
> >> broken, besides same thing was already discussed between me and
> >> Andrzej, see for instance:
> >> http://www.mail-archive.com/qemu-devel@nongnu.org/msg09542.html
> >>
> >> Needless to say the revert is broken also.
> >>   
> >
> > Yeah, I understand the race the original commit fixes but I don't  
> > understand how the original commit broke WinXP.
> >
> > Do you have further insight Michael?
> 
> My guess is that SIGALARM gets lost, this somehow leads to
> disk request to timeout. Possible?

Being delayed - possible, being lost - violation of the spec.

> 
> > Blindly reverting something that  appears right because of a
> > regression is likely just papering over a  bigger problem.
> >
> > Regards,
> >
> > Anthony Liguori
> >
>
Michael S. Tsirkin Oct. 7, 2009, 8:55 p.m. UTC | #6
On Thu, Oct 08, 2009 at 12:54:00AM +0400, malc wrote:
> On Wed, 7 Oct 2009, Michael S. Tsirkin wrote:
> 
> > On Wed, Oct 07, 2009 at 11:28:21AM -0500, Anthony Liguori wrote:
> > >
> > >> There's nothing to review in this particular case, the thing was plain
> > >> broken, besides same thing was already discussed between me and
> > >> Andrzej, see for instance:
> > >> http://www.mail-archive.com/qemu-devel@nongnu.org/msg09542.html
> > >>
> > >> Needless to say the revert is broken also.
> > >>   
> > >
> > > Yeah, I understand the race the original commit fixes but I don't  
> > > understand how the original commit broke WinXP.
> > >
> > > Do you have further insight Michael?
> > 
> > My guess is that SIGALARM gets lost, this somehow leads to
> > disk request to timeout. Possible?
> 
> Being delayed - possible, being lost - violation of the spec.

I see this:

	The  use of sigprocmask() is unspecified in a
	multithreaded process; see pthread_sigmask(3).

Does it matter?

> > 
> > > Blindly reverting something that  appears right because of a
> > > regression is likely just papering over a  bigger problem.
> > >
> > > Regards,
> > >
> > > Anthony Liguori
> > >
> > 
> 
> -- 
> mailto:av1474@comtv.ru
malc Oct. 7, 2009, 9:01 p.m. UTC | #7
On Wed, 7 Oct 2009, Michael S. Tsirkin wrote:

> On Thu, Oct 08, 2009 at 12:54:00AM +0400, malc wrote:
> > On Wed, 7 Oct 2009, Michael S. Tsirkin wrote:
> > 
> > > On Wed, Oct 07, 2009 at 11:28:21AM -0500, Anthony Liguori wrote:
> > > >
> > > >> There's nothing to review in this particular case, the thing was plain
> > > >> broken, besides same thing was already discussed between me and
> > > >> Andrzej, see for instance:
> > > >> http://www.mail-archive.com/qemu-devel@nongnu.org/msg09542.html
> > > >>
> > > >> Needless to say the revert is broken also.
> > > >>   
> > > >
> > > > Yeah, I understand the race the original commit fixes but I don't  
> > > > understand how the original commit broke WinXP.
> > > >
> > > > Do you have further insight Michael?
> > > 
> > > My guess is that SIGALARM gets lost, this somehow leads to
> > > disk request to timeout. Possible?
> > 
> > Being delayed - possible, being lost - violation of the spec.
> 
> I see this:
> 
> 	The  use of sigprocmask() is unspecified in a
> 	multithreaded process; see pthread_sigmask(3).
> 
> Does it matter?

One of the patches i've asked you to try today replaced sigprocmask with
pthread_sigmask, you've said it did nothing. In any case, strictly
speaking, the code is wrong, so yes it does matter in theory.

[..snip..]
Jamie Lokier Oct. 8, 2009, 1:47 a.m. UTC | #8
malc wrote:
> > 	The  use of sigprocmask() is unspecified in a
> > 	multithreaded process; see pthread_sigmask(3).
> > 
> > Does it matter?
> 
> One of the patches i've asked you to try today replaced sigprocmask with
> pthread_sigmask, you've said it did nothing. In any case, strictly
> speaking, the code is wrong, so yes it does matter in theory.

It won't matter on a Linux host (they are the same), but
pthread_sigmask should be used because it's Right(tm) and it could
make a difference on some other host.

-- Jamie
malc Oct. 8, 2009, 2:48 a.m. UTC | #9
On Thu, 8 Oct 2009, Jamie Lokier wrote:

> malc wrote:
> > > 	The  use of sigprocmask() is unspecified in a
> > > 	multithreaded process; see pthread_sigmask(3).
> > > 
> > > Does it matter?
> > 
> > One of the patches i've asked you to try today replaced sigprocmask with
> > pthread_sigmask, you've said it did nothing. In any case, strictly
> > speaking, the code is wrong, so yes it does matter in theory.
> 
> It won't matter on a Linux host (they are the same), but
> pthread_sigmask should be used because it's Right(tm) and it could
> make a difference on some other host.

What made you think i'm of a different opinion?
Jamie Lokier Oct. 8, 2009, 3:15 p.m. UTC | #10
malc wrote:
> On Thu, 8 Oct 2009, Jamie Lokier wrote:
> 
> > malc wrote:
> > > > 	The  use of sigprocmask() is unspecified in a
> > > > 	multithreaded process; see pthread_sigmask(3).
> > > > 
> > > > Does it matter?
> > > 
> > > One of the patches i've asked you to try today replaced sigprocmask with
> > > pthread_sigmask, you've said it did nothing. In any case, strictly
> > > speaking, the code is wrong, so yes it does matter in theory.
> > 
> > It won't matter on a Linux host (they are the same), but
> > pthread_sigmask should be used because it's Right(tm) and it could
> > make a difference on some other host.
> 
> What made you think i'm of a different opinion?

The fact you asked Michael to test a patch which replaced sigprocmask
with pthread_sigmask.

-- Jamie
malc Oct. 8, 2009, 4:39 p.m. UTC | #11
On Thu, 8 Oct 2009, Jamie Lokier wrote:

> malc wrote:
> > On Thu, 8 Oct 2009, Jamie Lokier wrote:
> > 
> > > malc wrote:
> > > > > 	The  use of sigprocmask() is unspecified in a
> > > > > 	multithreaded process; see pthread_sigmask(3).
> > > > > 
> > > > > Does it matter?
> > > > 
> > > > One of the patches i've asked you to try today replaced sigprocmask with
> > > > pthread_sigmask, you've said it did nothing. In any case, strictly
> > > > speaking, the code is wrong, so yes it does matter in theory.
> > > 
> > > It won't matter on a Linux host (they are the same), but
> > > pthread_sigmask should be used because it's Right(tm) and it could
> > > make a difference on some other host.
> > 
> > What made you think i'm of a different opinion?
> 
> The fact you asked Michael to test a patch which replaced sigprocmask
> with pthread_sigmask.

That made you think i'm somehow in favour of sigprocmask? I'm confused.
Michael S. Tsirkin Oct. 8, 2009, 9:24 p.m. UTC | #12
On Thu, Oct 08, 2009 at 04:15:27PM +0100, Jamie Lokier wrote:
> malc wrote:
> > On Thu, 8 Oct 2009, Jamie Lokier wrote:
> > 
> > > malc wrote:
> > > > > 	The  use of sigprocmask() is unspecified in a
> > > > > 	multithreaded process; see pthread_sigmask(3).
> > > > > 
> > > > > Does it matter?
> > > > 
> > > > One of the patches i've asked you to try today replaced sigprocmask with
> > > > pthread_sigmask, you've said it did nothing. In any case, strictly
> > > > speaking, the code is wrong, so yes it does matter in theory.

BTW, tried looking at the code.
I saw some (unrelated) issues:

static void aio_signal_handler(int signum)
{
    if (posix_aio_state) {
        char byte = 0;

        write(posix_aio_state->wfd, &byte, sizeof(byte));
    }

    qemu_service_io();
}

And qemu_service_io does a *ton* of things.
Questions:
-  Do we need the call to qemu_service_io? Seems to
   behave the same with and without it.
-  Are all of the data structures touched by qemu_service_io
   protected by blocking signals before access?

Also:
	- let's use signalfd on linux, if available?
	- for SIGALARM, maybe timerfd?

Thanks,
Anthony Liguori Oct. 8, 2009, 9:50 p.m. UTC | #13
Michael S. Tsirkin wrote:
> BTW, tried looking at the code.
> I saw some (unrelated) issues:
>
> static void aio_signal_handler(int signum)
> {
>     if (posix_aio_state) {
>         char byte = 0;
>
>         write(posix_aio_state->wfd, &byte, sizeof(byte));
>     }
>
>     qemu_service_io();
> }
>
> And qemu_service_io does a *ton* of things.
>   

It just does a cpu_exit().

> Questions:
> -  Do we need the call to qemu_service_io? Seems to
>    behave the same with and without it.
>   

Where you run into trouble is when you have a guest that has no periodic 
timer  and needs a mechanism to break out of the tcg loop whenever an IO 
operation completes.  See


Author: aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>
Date:   Wed Oct 8 19:50:24 2008 +0000

    Fix IO performance regression in sparc

> -  Are all of the data structures touched by qemu_service_io
>    protected by blocking signals before access?
>   

cpu_exit is pretty careful to not do anything that could be racey.

> Also:
> 	- let's use signalfd on linux, if available?
>   

signalfd doesn't help.  In fact, we originally used signalfd and it 
caused a regression.

> 	- for SIGALARM, maybe timerfd?
>   

Or just get rid of SIGALARM...

Regards,

Anthony Liguori
Anthony Liguori Oct. 8, 2009, 9:51 p.m. UTC | #14
Michael S. Tsirkin wrote:
> BTW, tried looking at the code.
> I saw some (unrelated) issues:
>
> static void aio_signal_handler(int signum)
> {
>     if (posix_aio_state) {
>         char byte = 0;
>
>         write(posix_aio_state->wfd, &byte, sizeof(byte));
>     }
>
>     qemu_service_io();
> }
>
> And qemu_service_io does a *ton* of things.
>   

It just does a cpu_exit().

> Questions:
> -  Do we need the call to qemu_service_io? Seems to
>    behave the same with and without it.
>   

Where you run into trouble is when you have a guest that has no periodic 
timer  and needs a mechanism to break out of the tcg loop whenever an IO 
operation completes.  See


Author: aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>
Date:   Wed Oct 8 19:50:24 2008 +0000

    Fix IO performance regression in sparc

> -  Are all of the data structures touched by qemu_service_io
>    protected by blocking signals before access?
>   

cpu_exit is pretty careful to not do anything that could be racey.

> Also:
> 	- let's use signalfd on linux, if available?
>   

signalfd doesn't help.  In fact, we originally used signalfd and it 
caused a regression.

> 	- for SIGALARM, maybe timerfd?
>   

Or just get rid of SIGALARM...

Regards,

Anthony Liguori
Jamie Lokier Oct. 9, 2009, 11:12 a.m. UTC | #15
malc wrote:
> On Thu, 8 Oct 2009, Jamie Lokier wrote:
> 
> > malc wrote:
> > > On Thu, 8 Oct 2009, Jamie Lokier wrote:
> > > 
> > > > malc wrote:
> > > > > > 	The  use of sigprocmask() is unspecified in a
> > > > > > 	multithreaded process; see pthread_sigmask(3).
> > > > > > 
> > > > > > Does it matter?
> > > > > 
> > > > > One of the patches i've asked you to try today replaced sigprocmask with
> > > > > pthread_sigmask, you've said it did nothing. In any case, strictly
> > > > > speaking, the code is wrong, so yes it does matter in theory.
> > > > 
> > > > It won't matter on a Linux host (they are the same), but
> > > > pthread_sigmask should be used because it's Right(tm) and it could
> > > > make a difference on some other host.
> > > 
> > > What made you think i'm of a different opinion?
> > 
> > The fact you asked Michael to test a patch which replaced sigprocmask
> > with pthread_sigmask.
> 
> That made you think i'm somehow in favour of sigprocmask? I'm confused.

It didn't make me think you're in favour of sigprocmask.

It made me think you thought there was a difference between them that
would affect the bug.

Anyways, I think we're done with this subthread :-)

-- Jamie
Jamie Lokier Oct. 9, 2009, 11:13 a.m. UTC | #16
Michael S. Tsirkin wrote:
> And qemu_service_io does a *ton* of things.
> Questions:
> -  Do we need the call to qemu_service_io? Seems to
>    behave the same with and without it.
> -  Are all of the data structures touched by qemu_service_io
>    protected by blocking signals before access?

Plus:

-  Are all the things done by qemu_service_io async-signal-safe?
   E.g. any use of pthread primitives is not async-signal-safe.
   I don't know if thread-local storage is.

-- Jamie
malc Oct. 9, 2009, 1:13 p.m. UTC | #17
On Fri, 9 Oct 2009, Jamie Lokier wrote:

> malc wrote:
> > On Thu, 8 Oct 2009, Jamie Lokier wrote:
> > 
> > > malc wrote:
> > > > On Thu, 8 Oct 2009, Jamie Lokier wrote:
> > > > 
> > > > > malc wrote:
> > > > > > > 	The  use of sigprocmask() is unspecified in a
> > > > > > > 	multithreaded process; see pthread_sigmask(3).
> > > > > > > 
> > > > > > > Does it matter?
> > > > > > 
> > > > > > One of the patches i've asked you to try today replaced sigprocmask with
> > > > > > pthread_sigmask, you've said it did nothing. In any case, strictly
> > > > > > speaking, the code is wrong, so yes it does matter in theory.
> > > > > 
> > > > > It won't matter on a Linux host (they are the same), but
> > > > > pthread_sigmask should be used because it's Right(tm) and it could
> > > > > make a difference on some other host.
> > > > 
> > > > What made you think i'm of a different opinion?
> > > 
> > > The fact you asked Michael to test a patch which replaced sigprocmask
> > > with pthread_sigmask.
> > 
> > That made you think i'm somehow in favour of sigprocmask? I'm confused.
> 
> It didn't make me think you're in favour of sigprocmask.
> 
> It made me think you thought there was a difference between them that
> would affect the bug.
> 
> Anyways, I think we're done with this subthread :-)

Goooood :)
diff mbox

Patch

diff --git a/posix-aio-compat.c b/posix-aio-compat.c
index 400d898..68cbec8 100644
--- a/posix-aio-compat.c
+++ b/posix-aio-compat.c
@@ -301,9 +301,14 @@  static size_t handle_aiocb_rw(struct qemu_paiocb *aiocb)
 static void *aio_thread(void *unused)
 {
     pid_t pid;
+    sigset_t set;
 
     pid = getpid();
 
+    /* block all signals */
+    if (sigfillset(&set)) die("sigfillset");
+    if (sigprocmask(SIG_BLOCK, &set, NULL)) die("sigprocmask");
+
     while (1) {
         struct qemu_paiocb *aiocb;
         size_t ret = 0;
@@ -364,18 +369,9 @@  static void *aio_thread(void *unused)
 
 static void spawn_thread(void)
 {
-    sigset_t set, oldset;
-
     cur_threads++;
     idle_threads++;
-
-    /* block all signals */
-    if (sigfillset(&set)) die("sigfillset");
-    if (sigprocmask(SIG_SETMASK, &set, &oldset)) die("sigprocmask");
-
     thread_create(&thread_id, &attr, aio_thread, NULL);
-
-    if (sigprocmask(SIG_SETMASK, &oldset, NULL)) die("sigprocmask restore");
 }
 
 static void qemu_paio_submit(struct qemu_paiocb *aiocb)