svn commit: r326129 - in stable/11/sys/cddl: compat/opensolaris/kern contrib/opensolaris/uts/intel/dtrace

[Mark Johnston]

Author: markj
Date: Thu Nov 23 14:01:52 2017
New Revision: 326129
URL: https://svnweb.freebsd.org/changeset/base/326129

Log:
  MFC r325887:
  Avoid holding the process in uread() and uwrite().

Modified:
  stable/11/sys/cddl/compat/opensolaris/kern/opensolaris_proc.c
  stable/11/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/cddl/compat/opensolaris/kern/opensolaris_proc.c
==============================================================================
--- stable/11/sys/cddl/compat/opensolaris/kern/opensolaris_proc.c	Thu Nov 23 13:59:34 2017	(r326128)
+++ stable/11/sys/cddl/compat/opensolaris/kern/opensolaris_proc.c	Thu Nov 23 14:01:52 2017	(r326129)
@@ -35,9 +35,7 @@ uread(proc_t *p, void *kaddr, size_t len, uintptr_t ua
 {
 	ssize_t n;
 
-	PHOLD(p);
 	n = proc_readmem(curthread, p, uaddr, kaddr, len);
-	PRELE(p);
 	if (n != len)
 		return (ENOMEM);
 	return (0);
@@ -48,9 +46,7 @@ uwrite(proc_t *p, void *kaddr, size_t len, uintptr_t u
 {
 	ssize_t n;
 
-	PHOLD(p);
 	n = proc_writemem(curthread, p, uaddr, kaddr, len);
-	PRELE(p);
 	if (n != len)
 		return (ENOMEM);
 	return (0);

Modified: stable/11/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c
==============================================================================
--- stable/11/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c	Thu Nov 23 13:59:34 2017	(r326128)
+++ stable/11/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c	Thu Nov 23 14:01:52 2017	(r326129)
@@ -1728,11 +1728,7 @@ fasttrap_pid_probe(struct reg *rp)
 
 		ASSERT(i <= sizeof (scratch));
 
-#ifdef illumos
 		if (fasttrap_copyout(scratch, (char *)addr, i)) {
-#else
-		if (uwrite(p, scratch, i, addr)) {
-#endif
 			fasttrap_sigtrap(p, curthread, pc);
 			new_pc = pc;
 			break;