svn commit: r335503 - in head/sys: kern sys

[Konstantin Belousov]

Author: kib
Date: Thu Jun 21 21:07:25 2018
New Revision: 335503
URL: https://svnweb.freebsd.org/changeset/base/335503

Log:
  Update proc->p_ptevents annotation to reflect the actual locking.
  
  Submitted by:	Yanko Yankulov <yanko.yankulov at gmail.com>
  Reviewed by:	jhb
  MFC after:	1 week
  Differential revision:	https://reviews.freebsd.org/D15954

Modified:
  head/sys/kern/sys_process.c
  head/sys/sys/proc.h

Modified: head/sys/kern/sys_process.c
==============================================================================
--- head/sys/kern/sys_process.c	Thu Jun 21 21:03:58 2018	(r335502)
+++ head/sys/kern/sys_process.c	Thu Jun 21 21:07:25 2018	(r335503)
@@ -688,6 +688,7 @@ void
 proc_set_traced(struct proc *p, bool stop)
 {
 
+	sx_assert(&proctree_lock, SX_XLOCKED);
 	PROC_LOCK_ASSERT(p, MA_OWNED);
 	p->p_flag |= P_TRACED;
 	if (stop)

Modified: head/sys/sys/proc.h
==============================================================================
--- head/sys/sys/proc.h	Thu Jun 21 21:03:58 2018	(r335502)
+++ head/sys/sys/proc.h	Thu Jun 21 21:07:25 2018	(r335503)
@@ -633,7 +633,7 @@ struct proc {
 	u_int		p_stype;	/* (c) Stop event type. */
 	char		p_step;		/* (c) Process is stopped. */
 	u_char		p_pfsflags;	/* (c) Procfs flags. */
-	u_int		p_ptevents;	/* (c) ptrace() event mask. */
+	u_int		p_ptevents;	/* (c + e) ptrace() event mask. */
 	struct nlminfo	*p_nlminfo;	/* (?) Only used by/for lockd. */
 	struct kaioinfo	*p_aioinfo;	/* (y) ASYNC I/O info. */
 	struct thread	*p_singlethread;/* (c + j) If single threading this is it */