Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 28 Feb 2020 17:04:37 +0000 (UTC)
From:      Mark Johnston <markj@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r358433 - head/sys/cddl/dev/systrace
Message-ID:  <202002281704.01SH4boW015071@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: markj
Date: Fri Feb 28 17:04:36 2020
New Revision: 358433
URL: https://svnweb.freebsd.org/changeset/base/358433

Log:
  Clear systrace_args_func when systrace probes are disabled.
  
  This function pointer is invalidated when systrace.ko is unloaded.
  
  Reported by:	pho
  MFC after:	1 week
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/sys/cddl/dev/systrace/systrace.c

Modified: head/sys/cddl/dev/systrace/systrace.c
==============================================================================
--- head/sys/cddl/dev/systrace/systrace.c	Fri Feb 28 16:05:18 2020	(r358432)
+++ head/sys/cddl/dev/systrace/systrace.c	Fri Feb 28 17:04:36 2020	(r358433)
@@ -298,9 +298,9 @@ systrace_destroy(void *arg, dtrace_id_t id, void *parg
 	 * disabled.
 	 */
 	if (SYSTRACE_ISENTRY((uintptr_t)parg)) {
-		ASSERT(sysent[sysnum].sy_entry == 0);
+		ASSERT(sysent[sysnum].sy_entry == DTRACE_IDNONE);
 	} else {
-		ASSERT(sysent[sysnum].sy_return == 0);
+		ASSERT(sysent[sysnum].sy_return == DTRACE_IDNONE);
 	}
 #endif
 }
@@ -310,8 +310,7 @@ systrace_enable(void *arg, dtrace_id_t id, void *parg)
 {
 	int sysnum = SYSTRACE_SYSNUM((uintptr_t)parg);
 
-	if (SYSENT[sysnum].sy_systrace_args_func == NULL)
-		SYSENT[sysnum].sy_systrace_args_func = systrace_args;
+	SYSENT[sysnum].sy_systrace_args_func = systrace_args;
 
 	if (SYSTRACE_ISENTRY((uintptr_t)parg))
 		SYSENT[sysnum].sy_entry = id;
@@ -327,8 +326,9 @@ systrace_disable(void *arg, dtrace_id_t id, void *parg
 {
 	int sysnum = SYSTRACE_SYSNUM((uintptr_t)parg);
 
-	SYSENT[sysnum].sy_entry = 0;
-	SYSENT[sysnum].sy_return = 0;
+	SYSENT[sysnum].sy_systrace_args_func = NULL;
+	SYSENT[sysnum].sy_entry = DTRACE_IDNONE;
+	SYSENT[sysnum].sy_return = DTRACE_IDNONE;
 	systrace_enabled_count--;
 	if (systrace_enabled_count == 0)
 		systrace_enabled = false;

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202002281704.01SH4boW015071>