Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dtrace_sdt: Fix bug in builtin module reference counting. 

Don't module_hold(NULL)!  This mistake was introduced in my attempt
to get dtrace working for sdt probes defined in non-builtin modules
like zfs.
This commit is contained in:
riastradh 2022-08-31 12:34:04 +00:00
parent cf221fb572
commit c5301d0824
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
external/cddl/osnet/dev/sdt/sdt.c vendored
View File

@ -39,7 +39,7 @@
* unloaded; in particular, probes may not span multiple kernel modules.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: sdt.c,v 1.23 2022/08/07 23:42:09 riastradh Exp $");
__KERNEL_RCSID(0, "$NetBSD: sdt.c,v 1.24 2022/08/31 12:34:04 riastradh Exp $");
#include <sys/cdefs.h>
#include <sys/proc.h>
@ -270,7 +270,8 @@ sdt_enable(void *arg __unused, dtrace_id_t id, void *parg)
probe->id = id;
#ifdef __NetBSD__
module_hold(&probe->sdtp_lf->lf_mod);
if (probe->sdtp_lf)
module_hold(&probe->sdtp_lf->lf_mod);
#endif
#ifdef __FreeBSD__
probe->sdtp_lf->nenabled++;
@ -286,7 +287,8 @@ sdt_disable(void *arg __unused, dtrace_id_t id, void *parg)
struct sdt_probe *probe = parg;
#ifdef __NetBSD__
module_rele(&probe->sdtp_lf->lf_mod);
if (probe->sdtp_lf)
module_rele(&probe->sdtp_lf->lf_mod);
#endif
#ifdef __FreeBSD__
SDT_KASSERT(probe->sdtp_lf->nenabled > 0, ("no probes enabled"));