From: ebiederm@xmission.com (Eric W. Biederman)
To: Oleg Nesterov <oleg@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Deepa Dinamani <deepa.kernel@gmail.com>,
linux-kernel@vger.kernel.org, arnd@arndb.de, dbueso@suse.de,
axboe@kernel.dk, dave@stgolabs.net, e@80x24.org,
jbaron@akamai.com, linux-fsdevel@vger.kernel.org,
linux-aio@kvack.org, omar.kilani@gmail.com, tglx@linutronix.de,
Al Viro <viro@ZenIV.linux.org.uk>,
Linus Torvalds <torvalds@linux-foundation.org>,
David Laight <David.Laight@ACULAB.COM>,
<linux-arch@vger.kernel.org>
Subject: [RFC PATCH 4/5] signal: Remove saved_sigmask
Date: Fri, 07 Jun 2019 16:43:21 -0500 [thread overview]
Message-ID: <87wohx9ime.fsf_-_@xmission.com> (raw)
In-Reply-To: <87k1dxaxcl.fsf_-_@xmission.com> (Eric W. Biederman's message of "Fri, 07 Jun 2019 16:39:54 -0500")
We have real_sigmask that serves the same purpose and is always kept
uptodate. Remove a field from the task structure and a conditional
from the signal delivery code by removing this field.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
---
include/linux/sched.h | 2 --
include/linux/sched/signal.h | 9 +++------
kernel/ptrace.c | 12 ++----------
kernel/signal.c | 2 --
4 files changed, 5 insertions(+), 20 deletions(-)
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 11837410690f..520efbd355be 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -864,8 +864,6 @@ struct task_struct {
struct sighand_struct *sighand;
sigset_t blocked;
sigset_t real_blocked;
- /* Restored if set_restore_sigmask() was used: */
- sigset_t saved_sigmask;
struct sigpending pending;
unsigned long sas_ss_sp;
size_t sas_ss_size;
diff --git a/include/linux/sched/signal.h b/include/linux/sched/signal.h
index 97f6a6a35a81..78678de45278 100644
--- a/include/linux/sched/signal.h
+++ b/include/linux/sched/signal.h
@@ -407,7 +407,7 @@ void task_join_group_stop(struct task_struct *task);
*/
/**
- * set_restore_sigmask() - make sure saved_sigmask processing gets done
+ * set_restore_sigmask() - make sure real_sigmask processing gets done
*
* This sets TIF_RESTORE_SIGMASK and ensures that the arch signal code
* will run before returning to user mode, to process the flag. For
@@ -479,7 +479,7 @@ static inline bool test_and_clear_restore_sigmask(void)
static inline void restore_saved_sigmask(void)
{
if (test_and_clear_restore_sigmask())
- __set_current_blocked(¤t->saved_sigmask);
+ __set_current_blocked(¤t->real_blocked);
}
extern int set_user_sigmask(const sigset_t __user *umask, size_t sigsetsize);
@@ -494,10 +494,7 @@ static inline void restore_saved_sigmask_unless(bool interrupted)
static inline sigset_t *sigmask_to_save(void)
{
- sigset_t *res = ¤t->blocked;
- if (unlikely(test_restore_sigmask()))
- res = ¤t->saved_sigmask;
- return res;
+ return ¤t->real_blocked;
}
static inline int kill_cad_pid(int sig, int priv)
diff --git a/kernel/ptrace.c b/kernel/ptrace.c
index 6507d700d70f..5ed6126e1cc5 100644
--- a/kernel/ptrace.c
+++ b/kernel/ptrace.c
@@ -925,26 +925,18 @@ int ptrace_request(struct task_struct *child, long request,
ret = ptrace_setsiginfo(child, &siginfo);
break;
- case PTRACE_GETSIGMASK: {
- sigset_t *mask;
-
+ case PTRACE_GETSIGMASK:
if (addr != sizeof(sigset_t)) {
ret = -EINVAL;
break;
}
- if (test_tsk_restore_sigmask(child))
- mask = &child->saved_sigmask;
- else
- mask = &child->blocked;
-
- if (copy_to_user(datavp, mask, sizeof(sigset_t)))
+ if (copy_to_user(datavp, &child->real_blocked, sizeof(sigset_t)))
ret = -EFAULT;
else
ret = 0;
break;
- }
case PTRACE_SETSIGMASK: {
sigset_t new_set;
diff --git a/kernel/signal.c b/kernel/signal.c
index fcd84f4a93c9..c37d4f209699 100644
--- a/kernel/signal.c
+++ b/kernel/signal.c
@@ -2941,8 +2941,6 @@ EXPORT_SYMBOL(sigprocmask);
static int set_sigmask(sigset_t *newset)
{
set_restore_sigmask();
- current->saved_sigmask = current->blocked;
-
sigdelsetmask(newset, sigmask(SIGKILL) | sigmask(SIGSTOP));
__set_current_blocked(newset);
--
2.21.0.dirty
next prev parent reply other threads:[~2019-06-07 21:43 UTC|newest]
Thread overview: 123+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-22 3:21 [PATCH v2] signal: Adjust error codes according to restore_user_sigmask() Deepa Dinamani
2019-05-22 15:05 ` Oleg Nesterov
2019-05-22 15:55 ` Deepa Dinamani
2019-05-22 16:14 ` Oleg Nesterov
2019-05-22 16:33 ` Deepa Dinamani
2019-05-23 9:03 ` David Laight
2019-05-23 14:59 ` Oleg Nesterov
2019-05-23 16:18 ` David Laight
2019-05-23 16:36 ` Oleg Nesterov
2019-05-23 16:56 ` David Laight
2019-05-23 18:06 ` Deepa Dinamani
2019-05-23 20:41 ` Deepa Dinamani
2019-05-23 21:06 ` Deepa Dinamani
2019-05-24 9:58 ` David Laight
2019-05-24 14:10 ` Oleg Nesterov
2019-05-24 15:16 ` Deepa Dinamani
2019-05-24 16:33 ` Oleg Nesterov
2019-05-24 17:01 ` Deepa Dinamani
2019-05-27 15:04 ` Oleg Nesterov
2019-05-28 20:47 ` Deepa Dinamani
2019-05-29 16:57 ` Oleg Nesterov
2019-05-29 18:42 ` Deepa Dinamani
2019-05-28 9:02 ` David Laight
2019-05-28 9:12 ` David Laight
2019-05-28 11:37 ` Deepa Dinamani
2019-05-28 12:04 ` David Laight
2019-05-24 14:19 ` Oleg Nesterov
2019-05-24 14:29 ` Deepa Dinamani
2019-05-24 14:51 ` Oleg Nesterov
2019-05-24 13:29 ` Oleg Nesterov
2019-05-24 14:59 ` David Laight
2019-05-24 15:09 ` David Laight
2019-05-24 15:46 ` Oleg Nesterov
2019-05-24 15:44 ` Oleg Nesterov
2019-05-24 16:40 ` David Laight
2019-05-23 14:33 ` Oleg Nesterov
2019-05-22 22:18 ` Chris Down
2019-05-22 22:52 ` Deepa Dinamani
2019-05-29 16:11 ` pselect/etc semantics (Was: [PATCH v2] signal: Adjust error codes according to restore_user_sigmask()) Oleg Nesterov
2019-05-29 16:54 ` David Laight
2019-05-29 18:50 ` Eric Wong
2019-05-30 9:34 ` David Laight
2019-05-30 13:04 ` pselect/etc semantics Eric W. Biederman
2019-05-29 16:56 ` pselect/etc semantics (Was: [PATCH v2] signal: Adjust error codes according to restore_user_sigmask()) Deepa Dinamani
2019-05-29 18:26 ` Deepa Dinamani
2019-05-29 22:32 ` Arnd Bergmann
2019-05-30 1:54 ` pselect/etc semantics Eric W. Biederman
2019-05-30 18:28 ` Arnd Bergmann
2019-05-30 14:40 ` pselect/etc semantics (Was: [PATCH v2] signal: Adjust error codes according to restore_user_sigmask()) Oleg Nesterov
2019-05-30 18:37 ` Arnd Bergmann
2019-05-30 13:01 ` pselect/etc semantics Eric W. Biederman
2019-05-30 15:18 ` David Laight
2019-05-30 16:13 ` Oleg Nesterov
2019-05-30 15:38 ` Eric W. Biederman
2019-05-30 15:48 ` Deepa Dinamani
2019-05-30 16:59 ` Deepa Dinamani
2019-05-30 16:08 ` Oleg Nesterov
2019-05-30 17:20 ` Eric W. Biederman
2019-05-30 16:22 ` David Laight
2019-05-30 15:57 ` Oleg Nesterov
2019-05-30 21:03 ` Eric Wong
2019-06-04 13:41 ` [PATCH] signal: remove the wrong signal_pending() check in restore_user_sigmask() Oleg Nesterov
2019-06-04 15:31 ` Eric W. Biederman
2019-06-04 15:57 ` David Laight
2019-06-04 16:37 ` Arnd Bergmann
2019-06-04 18:14 ` Deepa Dinamani
2019-06-04 18:35 ` Eric Wong
2019-06-04 21:26 ` Linus Torvalds
2019-06-04 22:24 ` Eric Wong
2019-06-04 23:51 ` Eric W. Biederman
2019-06-05 9:04 ` Oleg Nesterov
2019-06-05 8:56 ` Oleg Nesterov
2019-06-05 9:02 ` David Laight
2019-06-05 9:25 ` Oleg Nesterov
2019-06-05 9:58 ` David Laight
2019-06-05 15:58 ` [PATCH -mm 0/1] signal: simplify set_user_sigmask/restore_user_sigmask Oleg Nesterov
2019-06-05 15:58 ` [PATCH -mm 1/1] " Oleg Nesterov
2019-06-06 0:14 ` kbuild test robot
2019-06-06 1:06 ` kbuild test robot
2019-06-06 7:25 ` Oleg Nesterov
2019-06-06 7:30 ` Sedat Dilek
2019-06-05 17:24 ` [PATCH -mm 0/1] " Linus Torvalds
2019-06-06 9:05 ` David Laight
2019-06-06 11:05 ` Oleg Nesterov
2019-06-06 11:29 ` David Laight
2019-06-06 12:41 ` Oleg Nesterov
2019-06-06 13:23 ` David Laight
2019-06-06 10:22 ` Oleg Nesterov
2019-06-06 11:32 ` [PATCH -mm V2 1/1] " Oleg Nesterov
2019-06-06 14:08 ` [PATCH 0/2] select: simplify the usage of restore_saved_sigmask_unless() Oleg Nesterov
2019-06-06 14:08 ` [PATCH 1/2] select: change do_poll() to return -ERESTARTNOHAND rather than -EINTR Oleg Nesterov
2019-06-07 18:05 ` Linus Torvalds
2019-06-06 14:09 ` [PATCH 2/2] select: shift restore_saved_sigmask_unless() into poll_select_copy_remaining() Oleg Nesterov
2019-06-07 21:39 ` [RFC PATCH 0/5]: Removing saved_sigmask Eric W. Biederman
2019-06-07 21:41 ` [RFC PATCH 1/5] signal: Teach sigsuspend to use set_user_sigmask Eric W. Biederman
2019-06-07 22:07 ` Linus Torvalds
2019-06-10 16:22 ` Oleg Nesterov
2019-06-10 21:20 ` Eric W. Biederman
2019-06-11 9:52 ` David Laight
2019-06-11 11:14 ` David Laight
2019-06-12 12:55 ` Eric W. Biederman
2019-06-12 13:24 ` David Laight
2019-06-12 13:35 ` Oleg Nesterov
2019-06-12 13:39 ` David Laight
2019-06-11 15:46 ` David Laight
2019-06-12 12:40 ` Eric W. Biederman
2019-06-12 13:45 ` Oleg Nesterov
2019-06-12 14:18 ` David Laight
2019-06-12 15:11 ` Eric W. Biederman
2019-06-12 15:37 ` Oleg Nesterov
2019-06-13 8:48 ` David Laight
2019-06-13 9:43 ` Oleg Nesterov
2019-06-13 10:56 ` David Laight
2019-06-13 12:43 ` Oleg Nesterov
2019-06-11 18:55 ` Oleg Nesterov
2019-06-11 19:02 ` Eric W. Biederman
2019-06-12 8:39 ` David Laight
2019-06-12 13:09 ` Eric W. Biederman
2019-06-07 21:41 ` [RFC PATCH 2/5] signal/kvm: Stop using sigprocmask in kvm_sigset_(activate|deactivate) Eric W. Biederman
2019-06-07 21:42 ` [RFC PATCH 3/5] signal: Always keep real_blocked in sync with blocked Eric W. Biederman
2019-06-07 21:43 ` Eric W. Biederman [this message]
2019-06-07 21:44 ` [RFC PATCH 5/5] signal: Remove the unnecessary restore_sigmask flag Eric W. Biederman
2019-06-11 18:58 ` [RFC PATCH 0/5]: Removing saved_sigmask Oleg Nesterov
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=87wohx9ime.fsf_-_@xmission.com \
--to=ebiederm@xmission.com \
--cc=David.Laight@ACULAB.COM \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=axboe@kernel.dk \
--cc=dave@stgolabs.net \
--cc=dbueso@suse.de \
--cc=deepa.kernel@gmail.com \
--cc=e@80x24.org \
--cc=jbaron@akamai.com \
--cc=linux-aio@kvack.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=oleg@redhat.com \
--cc=omar.kilani@gmail.com \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
--cc=viro@ZenIV.linux.org.uk \
/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 NNTP newsgroup(s).