signal: add block_sigmask() for adding sigmask to current->blocked

Abstract the code sequence for adding a signal handler's sa_mask to
current->blocked because the sequence is identical for all architectures.
Furthermore, in the past some architectures actually got this code wrong,
so introduce a wrapper that all architectures can use.

Signed-off-by: Matt Fleming <[email protected]>
Signed-off-by: Oleg Nesterov <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: H. Peter Anvin <[email protected]>
Cc: Tejun Heo <[email protected]>
Cc: "David S. Miller" <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
Matt Fleming 2012-01-10 15:11:17 -08:00 • committed by Linus Torvalds
commit 5e6292c0f2
3 changed files with 23 additions and 5 deletions

View file

@ -2318,6 +2318,27 @@ relock:
return signr;
}
/**
* block_sigmask - add @ka's signal mask to current->blocked
* @ka: action for @signr
* @signr: signal that has been successfully delivered
*
* This function should be called when a signal has succesfully been
* delivered. It adds the mask of signals for @ka to current->blocked
* so that they are blocked during the execution of the signal
* handler. In addition, @signr will be blocked unless %SA_NODEFER is
* set in @ka->sa.sa_flags.
*/
void block_sigmask(struct k_sigaction *ka, int signr)
{
sigset_t blocked;
sigorsets(&blocked, &current->blocked, &ka->sa.sa_mask);
if (!(ka->sa.sa_flags & SA_NODEFER))
sigaddset(&blocked, signr);
set_current_blocked(&blocked);
}
/*
* It could be that complete_signal() picked us to notify about the
* group-wide signal. Other threads should be notified now to take