From: Tom de Vries <tdevries@suse.de>
To: Tom Tromey <tromey@adacore.com>, gdb-patches@sourceware.org
Subject: Re: [PATCH] Restore previous sigmask in gdb.block_signals
Date: Sat, 29 Jul 2023 08:37:44 +0200 [thread overview]
Message-ID: <651d15ef-ff0e-7c80-7d5e-f4ade2f6620d@suse.de> (raw)
In-Reply-To: <2ef71a71-35b9-4b8d-fbac-fadb69a01fd1@suse.de>
On 7/29/23 08:25, Tom de Vries via Gdb-patches wrote:
> On 7/28/23 20:10, Tom Tromey wrote:
>> Tom de Vries found a bug where, sometimes, a SIGCHLD would be
>> delivered to a non-main thread, wreaking havoc.
>>
>> The problem is that gdb.block_signals was unblocking the signals it
>> blocked -- but it was being called from the DAP thread, leading to
>> SIGCHLD being unblocked there.
>>
>> This patch fixes the problem by restoring the previous set of signals
>> instead.
>>
>
> I've done a build and reg-test on x86_64-linux, no regressions.
>
> I also build this in combination with the assert patch mentioned in the
> PR, and ran the dap tests 50 times, and the assert no longer triggers.
>
Also, I build with -fsanitize=thread and tested the dap tests, that's
also clean now.
Thanks,
- Tom
> Also, the patch LGTM.
>
> I had a bit of trouble parsing the commit message, I'd suggest for
> instance instead:
> ...
> The problem is that gdb.block_signals after first blocking a set of
> signals, then unblocked the same set rather than restoring the initial
> situation. This function being called from the DAP thread lead to
> SIGCHLD being unblocked there.
> ...
>
> Tested-by: Tom de Vries <tdevries@suse.de>
> Reviewed-By: Tom de Vries <tdevries@suse.de>
>
> Thanks,
> - Tom
>
>> Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=30680
>> ---
>> gdb/python/lib/gdb/__init__.py | 4 ++--
>> 1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/gdb/python/lib/gdb/__init__.py
>> b/gdb/python/lib/gdb/__init__.py
>> index 98aadb1dfea..b3124369fe8 100644
>> --- a/gdb/python/lib/gdb/__init__.py
>> +++ b/gdb/python/lib/gdb/__init__.py
>> @@ -271,11 +271,11 @@ def blocked_signals():
>> return
>> to_block = {signal.SIGCHLD, signal.SIGINT, signal.SIGALRM,
>> signal.SIGWINCH}
>> - signal.pthread_sigmask(signal.SIG_BLOCK, to_block)
>> + old_mask = signal.pthread_sigmask(signal.SIG_BLOCK, to_block)
>> try:
>> yield None
>> finally:
>> - signal.pthread_sigmask(signal.SIG_UNBLOCK, to_block)
>> + signal.pthread_sigmask(signal.SIG_SETMASK, old_mask)
>> class Thread(threading.Thread):
>
prev parent reply other threads:[~2023-07-29 6:37 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-28 18:10 Tom Tromey
2023-07-29 6:25 ` Tom de Vries
2023-07-29 6:37 ` Tom de Vries [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=651d15ef-ff0e-7c80-7d5e-f4ade2f6620d@suse.de \
--to=tdevries@suse.de \
--cc=gdb-patches@sourceware.org \
--cc=tromey@adacore.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).