Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b76808e6 authored by Palmer Dabbelt's avatar Palmer Dabbelt Committed by Ingo Molnar
Browse files

signals, sched: Change all uses of JOBCTL_* from 'int' to 'long' 



c56fb6564dcd ("Fix a misaligned load inside ptrace_attach()") makes
jobctl an "unsigned long".  It makes sense to have the masks applied
to it match that type.  This is currently just a cosmetic change, but
it will prevent the mask from being unexpectedly truncated if we ever
end up with masks with more bits.

One instance of "signr" is an int, but I left this alone because the
mask ensures that it will never overflow.

Signed-off-by: default avatarPalmer Dabbelt <palmer@dabbelt.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarChris Metcalf <cmetcalf@ezchip.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: bobby.prani@gmail.com
Cc: oleg@redhat.com
Cc: paulmck@linux.vnet.ibm.com
Cc: richard@nod.at
Cc: vdavydov@parallels.com
Link: http://lkml.kernel.org/r/1430453997-32459-4-git-send-email-palmer@dabbelt.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 3289bdb4

include/linux/sched.h

+9 −9
Original line number Diff line number Diff line
@@ -2082,22 +2082,22 @@ TASK_PFA_CLEAR(SPREAD_SLAB, spread_slab) 
#define JOBCTL_TRAPPING_BIT	21	/* switching to TRACED */

#define JOBCTL_LISTENING_BIT	22	/* ptracer is listening for events */



#define JOBCTL_STOP_DEQUEUED	(1 << JOBCTL_STOP_DEQUEUED_BIT)

#define JOBCTL_STOP_PENDING	(1 << JOBCTL_STOP_PENDING_BIT)

#define JOBCTL_STOP_CONSUME	(1 << JOBCTL_STOP_CONSUME_BIT)

#define JOBCTL_TRAP_STOP	(1 << JOBCTL_TRAP_STOP_BIT)

#define JOBCTL_TRAP_NOTIFY	(1 << JOBCTL_TRAP_NOTIFY_BIT)

#define JOBCTL_TRAPPING		(1 << JOBCTL_TRAPPING_BIT)

#define JOBCTL_LISTENING	(1 << JOBCTL_LISTENING_BIT)

#define JOBCTL_STOP_DEQUEUED	(1UL << JOBCTL_STOP_DEQUEUED_BIT)

#define JOBCTL_STOP_PENDING	(1UL << JOBCTL_STOP_PENDING_BIT)

#define JOBCTL_STOP_CONSUME	(1UL << JOBCTL_STOP_CONSUME_BIT)

#define JOBCTL_TRAP_STOP	(1UL << JOBCTL_TRAP_STOP_BIT)

#define JOBCTL_TRAP_NOTIFY	(1UL << JOBCTL_TRAP_NOTIFY_BIT)

#define JOBCTL_TRAPPING		(1UL << JOBCTL_TRAPPING_BIT)

#define JOBCTL_LISTENING	(1UL << JOBCTL_LISTENING_BIT)



#define JOBCTL_TRAP_MASK	(JOBCTL_TRAP_STOP | JOBCTL_TRAP_NOTIFY)

#define JOBCTL_PENDING_MASK	(JOBCTL_STOP_PENDING | JOBCTL_TRAP_MASK)



extern bool task_set_jobctl_pending(struct task_struct *task,

				    unsigned int mask);

				    unsigned long mask);

extern void task_clear_jobctl_trapping(struct task_struct *task);

extern void task_clear_jobctl_pending(struct task_struct *task,

				      unsigned int mask);

				      unsigned long mask);



static inline void rcu_copy_process(struct task_struct *p)

{

kernel/signal.c

+3 −3
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ static inline void print_dropped_signal(int sig) 
 * RETURNS:

 * %true if @mask is set, %false if made noop because @task was dying.

 */

bool task_set_jobctl_pending(struct task_struct *task, unsigned int mask)

bool task_set_jobctl_pending(struct task_struct *task, unsigned long mask)

{

	BUG_ON(mask & ~(JOBCTL_PENDING_MASK | JOBCTL_STOP_CONSUME |

			JOBCTL_STOP_SIGMASK | JOBCTL_TRAPPING));
@@ -297,7 +297,7 @@ void task_clear_jobctl_trapping(struct task_struct *task) 
 * CONTEXT:

 * Must be called with @task->sighand->siglock held.

 */

void task_clear_jobctl_pending(struct task_struct *task, unsigned int mask)

void task_clear_jobctl_pending(struct task_struct *task, unsigned long mask)

{

	BUG_ON(mask & ~JOBCTL_PENDING_MASK);
@@ -2000,7 +2000,7 @@ static bool do_signal_stop(int signr) 
	struct signal_struct *sig = current->signal;



	if (!(current->jobctl & JOBCTL_STOP_PENDING)) {

		unsigned int gstop = JOBCTL_STOP_PENDING | JOBCTL_STOP_CONSUME;

		unsigned long gstop = JOBCTL_STOP_PENDING | JOBCTL_STOP_CONSUME;

		struct task_struct *t;



		/* signr will be recorded in task->jobctl for retries */