Commit 0214f46b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'siginfo-linus' of... 

Merge branch 'siginfo-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

Pull core signal handling updates from Eric Biederman:
 "It was observed that a periodic timer in combination with a
  sufficiently expensive fork could prevent fork from every completing.
  This contains the changes to remove the need for that restart.

  This set of changes is split into several parts:

   - The first part makes PIDTYPE_TGID a proper pid type instead
     something only for very special cases. The part starts using
     PIDTYPE_TGID enough so that in __send_signal where signals are
     actually delivered we know if the signal is being sent to a a group
     of processes or just a single process.

   - With that prep work out of the way the logic in fork is modified so
     that fork logically makes signals received while it is running
     appear to be received after the fork completes"

* 'siginfo-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace: (22 commits)
  signal: Don't send signals to tasks that don't exist
  signal: Don't restart fork when signals come in.
  fork: Have new threads join on-going signal group stops
  fork: Skip setting TIF_SIGPENDING in ptrace_init_task
  signal: Add calculate_sigpending()
  fork: Unconditionally exit if a fatal signal is pending
  fork: Move and describe why the code examines PIDNS_ADDING
  signal: Push pid type down into complete_signal.
  signal: Push pid type down into __send_signal
  signal: Push pid type down into send_signal
  signal: Pass pid type into do_send_sig_info
  signal: Pass pid type into send_sigio_to_task & send_sigurg_to_task
  signal: Pass pid type into group_send_sig_info
  signal: Pass pid and pid type into send_sigqueue
  posix-timers: Noralize good_sigevent
  signal: Use PIDTYPE_TGID to clearly store where file signals will be sent
  pid: Implement PIDTYPE_TGID
  pids: Move the pgrp and session pid pointers from task_struct to signal_struct
  kvm: Don't open code task_pid in kvm_vcpu_ioctl
  pids: Compute task_tgid using signal->leader_pid
  ...
parents 40fafdcb 84fe4cc0

arch/ia64/kernel/asm-offsets.c

+2 −2
Original line number Diff line number Diff line
@@ -50,8 +50,7 @@ void foo(void) 


	DEFINE(IA64_TASK_BLOCKED_OFFSET,offsetof (struct task_struct, blocked));

	DEFINE(IA64_TASK_CLEAR_CHILD_TID_OFFSET,offsetof (struct task_struct, clear_child_tid));

	DEFINE(IA64_TASK_GROUP_LEADER_OFFSET, offsetof (struct task_struct, group_leader));

	DEFINE(IA64_TASK_TGIDLINK_OFFSET, offsetof (struct task_struct, pids[PIDTYPE_PID].pid));

	DEFINE(IA64_TASK_THREAD_PID_OFFSET,offsetof (struct task_struct, thread_pid));

	DEFINE(IA64_PID_LEVEL_OFFSET, offsetof (struct pid, level));

	DEFINE(IA64_PID_UPID_OFFSET, offsetof (struct pid, numbers[0]));

	DEFINE(IA64_TASK_PENDING_OFFSET,offsetof (struct task_struct, pending));
@@ -68,6 +67,7 @@ void foo(void) 
	DEFINE(IA64_SIGNAL_GROUP_STOP_COUNT_OFFSET,offsetof (struct signal_struct,

							     group_stop_count));

	DEFINE(IA64_SIGNAL_SHARED_PENDING_OFFSET,offsetof (struct signal_struct, shared_pending));

	DEFINE(IA64_SIGNAL_PIDS_TGID_OFFSET, offsetof (struct signal_struct, pids[PIDTYPE_TGID]));



	BLANK();

arch/ia64/kernel/fsys.S

+6 −6
Original line number Diff line number Diff line
@@ -62,16 +62,16 @@ ENTRY(fsys_getpid) 
	.prologue

	.altrp b6

	.body

	add r17=IA64_TASK_GROUP_LEADER_OFFSET,r16

	add r17=IA64_TASK_SIGNAL_OFFSET,r16

	;;

	ld8 r17=[r17]				// r17 = current->group_leader

	ld8 r17=[r17]				// r17 = current->signal

	add r9=TI_FLAGS+IA64_TASK_SIZE,r16

	;;

	ld4 r9=[r9]

	add r17=IA64_TASK_TGIDLINK_OFFSET,r17

	add r17=IA64_SIGNAL_PIDS_TGID_OFFSET,r17

	;;

	and r9=TIF_ALLWORK_MASK,r9

	ld8 r17=[r17]				// r17 = current->group_leader->pids[PIDTYPE_PID].pid

	ld8 r17=[r17]				// r17 = current->signal->pids[PIDTYPE_TGID]

	;;

	add r8=IA64_PID_LEVEL_OFFSET,r17

	;;
@@ -96,11 +96,11 @@ ENTRY(fsys_set_tid_address) 
	.altrp b6

	.body

	add r9=TI_FLAGS+IA64_TASK_SIZE,r16

	add r17=IA64_TASK_TGIDLINK_OFFSET,r16

	add r17=IA64_TASK_THREAD_PID_OFFSET,r16

	;;

	ld4 r9=[r9]

	tnat.z p6,p7=r32		// check argument register for being NaT

	ld8 r17=[r17]				// r17 = current->pids[PIDTYPE_PID].pid

	ld8 r17=[r17]				// r17 = current->thread_pid

	;;

	and r9=TIF_ALLWORK_MASK,r9

	add r8=IA64_PID_LEVEL_OFFSET,r17

arch/s390/kernel/perf_cpum_sf.c

+1 −1
Original line number Diff line number Diff line
@@ -665,7 +665,7 @@ static void cpumsf_output_event_pid(struct perf_event *event, 
		goto out;



	/* Update the process ID (see also kernel/events/core.c) */

	data->tid_entry.pid = cpumsf_pid_type(event, pid, __PIDTYPE_TGID);

	data->tid_entry.pid = cpumsf_pid_type(event, pid, PIDTYPE_TGID);

	data->tid_entry.tid = cpumsf_pid_type(event, pid, PIDTYPE_PID);



	perf_output_sample(&handle, &header, data, event);

drivers/net/tun.c

+1 −1
Original line number Diff line number Diff line
@@ -3217,7 +3217,7 @@ static int tun_chr_fasync(int fd, struct file *file, int on) 
		goto out;



	if (on) {

		__f_setown(file, task_pid(current), PIDTYPE_PID, 0);

		__f_setown(file, task_pid(current), PIDTYPE_TGID, 0);

		tfile->flags |= TUN_FASYNC;

	} else

		tfile->flags &= ~TUN_FASYNC;

drivers/platform/x86/thinkpad_acpi.c

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ 
#include <linux/list.h>

#include <linux/mutex.h>

#include <linux/sched.h>

#include <linux/sched/signal.h>

#include <linux/kthread.h>

#include <linux/freezer.h>

#include <linux/delay.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE