svn commit: r363152 - stable/12/sys/compat/linuxkpi/common/src

[Hans Petter Selasky]

Author: hselasky
Date: Mon Jul 13 15:36:57 2020
New Revision: 363152
URL: https://svnweb.freebsd.org/changeset/base/363152

Log:
  MFC r362829:
  The "pid" field in the LinuxKPI task struct is typically set to the thread ID
  and not the process ID. Make sure the linux_task_exiting() function uses tdfind()
  to lookup the BSD procedure structure pointer by the "pid" field, and only
  fallback to pfind() when no match is found! This makes linux_task_exiting()
  in line with the rest of the code.
  
  Differential Revision: https://reviews.freebsd.org/D25509
  Submitted by:	Greg V <greg at unrelenting.technology>
  Sponsored by:	Mellanox Technologies

Modified:
  stable/12/sys/compat/linuxkpi/common/src/linux_current.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/compat/linuxkpi/common/src/linux_current.c
==============================================================================
--- stable/12/sys/compat/linuxkpi/common/src/linux_current.c	Mon Jul 13 15:34:47 2020	(r363151)
+++ stable/12/sys/compat/linuxkpi/common/src/linux_current.c	Mon Jul 13 15:36:57 2020	(r363152)
@@ -206,11 +206,21 @@ linux_get_pid_task(pid_t pid)
 bool
 linux_task_exiting(struct task_struct *task)
 {
+	struct thread *td;
 	struct proc *p;
 	bool ret;
 
 	ret = false;
-	p = pfind(task->pid);
+
+	/* try to find corresponding thread */
+	td = tdfind(task->pid, -1);
+	if (td != NULL) {
+		p = td->td_proc;
+	} else {
+		/* try to find corresponding procedure */
+		p = pfind(task->pid);
+	}
+
 	if (p != NULL) {
 		if ((p->p_flag & P_WEXIT) != 0)
 			ret = true;