MFV r289003:
6271 dtrace caused excessive fork time Author: Bryan Cantrill <bryan@joyent.com> Reviewed by: Adam Leventhal <ahl@delphix.com> Reviewed by: Dan McDonald <danmcd@omniti.com> Reviewed by: Richard Lowe <richlowe@richlowe.net> Approved by: Gordon Ross <gwr@nexenta.com> illumos/illumos-gate@7bd3c1d12d
This commit is contained in:
commit
1639290749
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=291963
@ -0,0 +1,99 @@
|
|||||||
|
#
|
||||||
|
# This file and its contents are supplied under the terms of the
|
||||||
|
# Common Development and Distribution License ("CDDL"), version 1.0.
|
||||||
|
# You may only use this file in accordance with the terms of version
|
||||||
|
# 1.0 of the CDDL.
|
||||||
|
#
|
||||||
|
# A full copy of the text of the CDDL should have accompanied this
|
||||||
|
# source. A copy of the CDDL is also available via the Internet at
|
||||||
|
# http://www.illumos.org/license/CDDL.
|
||||||
|
#
|
||||||
|
|
||||||
|
#
|
||||||
|
# Copyright (c) 2015, Joyent, Inc. All rights reserved.
|
||||||
|
#
|
||||||
|
|
||||||
|
#
|
||||||
|
# This test assures that we can have the same provider name across multiple
|
||||||
|
# probe definitions, and that the result will be the union of those
|
||||||
|
# definitions. In particular, libusdt depends on this when (for example)
|
||||||
|
# node modules that create a provider are loaded multiple times due to
|
||||||
|
# being included by different modules.
|
||||||
|
#
|
||||||
|
|
||||||
|
if [ $# != 1 ]; then
|
||||||
|
echo expected one argument: '<'dtrace-path'>'
|
||||||
|
exit 2
|
||||||
|
fi
|
||||||
|
|
||||||
|
dtrace=$1
|
||||||
|
DIR=/var/tmp/dtest.$$
|
||||||
|
|
||||||
|
mkdir $DIR
|
||||||
|
cd $DIR
|
||||||
|
|
||||||
|
cat > test.c <<EOF
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
|
void
|
||||||
|
main()
|
||||||
|
{
|
||||||
|
EOF
|
||||||
|
|
||||||
|
objs=
|
||||||
|
|
||||||
|
for oogle in bagnoogle stalloogle cockoogle; do
|
||||||
|
cat > $oogle.c <<EOF
|
||||||
|
#include <sys/sdt.h>
|
||||||
|
|
||||||
|
void
|
||||||
|
$oogle()
|
||||||
|
{
|
||||||
|
DTRACE_PROBE(doogle, $oogle);
|
||||||
|
}
|
||||||
|
EOF
|
||||||
|
|
||||||
|
cat > $oogle.d <<EOF
|
||||||
|
provider doogle {
|
||||||
|
probe $oogle();
|
||||||
|
};
|
||||||
|
EOF
|
||||||
|
|
||||||
|
cc -c $oogle.c
|
||||||
|
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
print -u2 "failed to compile $oogle.c"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
$dtrace -G -s $oogle.d $oogle.o -o $oogle.d.o
|
||||||
|
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
print -u2 "failed to process $oogle.d"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
objs="$objs $oogle.o $oogle.d.o"
|
||||||
|
echo $oogle'();' >> test.c
|
||||||
|
done
|
||||||
|
|
||||||
|
echo "}" >> test.c
|
||||||
|
|
||||||
|
cc -o test test.c $objs
|
||||||
|
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
print -u2 "failed to compile test.c"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
$dtrace -n 'doogle$target:::{@[probename] = count()}' \
|
||||||
|
-n 'END{printa("%-10s %@d\n", @)}' -x quiet -x aggsortkey -Zc ./test
|
||||||
|
|
||||||
|
if [ $? -ne 0 ]; then
|
||||||
|
print -u2 "failed to execute test"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
cd /
|
||||||
|
rm -rf $DIR
|
||||||
|
exit 0
|
@ -0,0 +1,4 @@
|
|||||||
|
bagnoogle 1
|
||||||
|
cockoogle 1
|
||||||
|
stalloogle 1
|
||||||
|
|
@ -15749,8 +15749,8 @@ dtrace_helper_provider_add(dof_helper_t *dofhp, dtrace_helpers_t *help, int gen)
|
|||||||
* Check to make sure this isn't a duplicate.
|
* Check to make sure this isn't a duplicate.
|
||||||
*/
|
*/
|
||||||
for (i = 0; i < help->dthps_nprovs; i++) {
|
for (i = 0; i < help->dthps_nprovs; i++) {
|
||||||
if (dofhp->dofhp_dof ==
|
if (dofhp->dofhp_addr ==
|
||||||
help->dthps_provs[i]->dthp_prov.dofhp_dof)
|
help->dthps_provs[i]->dthp_prov.dofhp_addr)
|
||||||
return (EALREADY);
|
return (EALREADY);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -16110,7 +16110,14 @@ dtrace_helper_slurp(dof_hdr_t *dof, dof_helper_t *dhp)
|
|||||||
dtrace_enabling_destroy(enab);
|
dtrace_enabling_destroy(enab);
|
||||||
|
|
||||||
if (dhp != NULL && nprovs > 0) {
|
if (dhp != NULL && nprovs > 0) {
|
||||||
|
/*
|
||||||
|
* Now that this is in-kernel, we change the sense of the
|
||||||
|
* members: dofhp_dof denotes the in-kernel copy of the DOF
|
||||||
|
* and dofhp_addr denotes the address at user-level.
|
||||||
|
*/
|
||||||
|
dhp->dofhp_addr = dhp->dofhp_dof;
|
||||||
dhp->dofhp_dof = (uint64_t)(uintptr_t)dof;
|
dhp->dofhp_dof = (uint64_t)(uintptr_t)dof;
|
||||||
|
|
||||||
if (dtrace_helper_provider_add(dhp, help, gen) == 0) {
|
if (dtrace_helper_provider_add(dhp, help, gen) == 0) {
|
||||||
mutex_exit(&dtrace_lock);
|
mutex_exit(&dtrace_lock);
|
||||||
dtrace_helper_provider_register(p, help, dhp);
|
dtrace_helper_provider_register(p, help, dhp);
|
||||||
|
@ -2117,6 +2117,18 @@ fasttrap_meta_provide(void *arg, dtrace_helper_provdesc_t *dhpv, pid_t pid)
|
|||||||
return (provider);
|
return (provider);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* We know a few things about our context here: we know that the probe being
|
||||||
|
* created doesn't already exist (DTrace won't load DOF at the same address
|
||||||
|
* twice, even if explicitly told to do so) and we know that we are
|
||||||
|
* single-threaded with respect to the meta provider machinery. Knowing that
|
||||||
|
* this is a new probe and that there is no way for us to race with another
|
||||||
|
* operation on this provider allows us an important optimization: we need not
|
||||||
|
* lookup a probe before adding it. Saving this lookup is important because
|
||||||
|
* this code is in the fork path for processes with USDT probes, and lookups
|
||||||
|
* here are potentially very expensive because of long hash conflicts on
|
||||||
|
* module, function and name (DTrace doesn't hash on provider name).
|
||||||
|
*/
|
||||||
/*ARGSUSED*/
|
/*ARGSUSED*/
|
||||||
static void
|
static void
|
||||||
fasttrap_meta_create_probe(void *arg, void *parg,
|
fasttrap_meta_create_probe(void *arg, void *parg,
|
||||||
@ -2153,19 +2165,6 @@ fasttrap_meta_create_probe(void *arg, void *parg,
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* Grab the creation lock to ensure consistency between calls to
|
|
||||||
* dtrace_probe_lookup() and dtrace_probe_create() in the face of
|
|
||||||
* other threads creating probes.
|
|
||||||
*/
|
|
||||||
mutex_enter(&provider->ftp_cmtx);
|
|
||||||
|
|
||||||
if (dtrace_probe_lookup(provider->ftp_provid, dhpb->dthpb_mod,
|
|
||||||
dhpb->dthpb_func, dhpb->dthpb_name) != 0) {
|
|
||||||
mutex_exit(&provider->ftp_cmtx);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
ntps = dhpb->dthpb_noffs + dhpb->dthpb_nenoffs;
|
ntps = dhpb->dthpb_noffs + dhpb->dthpb_nenoffs;
|
||||||
ASSERT(ntps > 0);
|
ASSERT(ntps > 0);
|
||||||
|
|
||||||
@ -2173,7 +2172,6 @@ fasttrap_meta_create_probe(void *arg, void *parg,
|
|||||||
|
|
||||||
if (fasttrap_total > fasttrap_max) {
|
if (fasttrap_total > fasttrap_max) {
|
||||||
atomic_add_32(&fasttrap_total, -ntps);
|
atomic_add_32(&fasttrap_total, -ntps);
|
||||||
mutex_exit(&provider->ftp_cmtx);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2237,8 +2235,6 @@ fasttrap_meta_create_probe(void *arg, void *parg,
|
|||||||
*/
|
*/
|
||||||
pp->ftp_id = dtrace_probe_create(provider->ftp_provid, dhpb->dthpb_mod,
|
pp->ftp_id = dtrace_probe_create(provider->ftp_provid, dhpb->dthpb_mod,
|
||||||
dhpb->dthpb_func, dhpb->dthpb_name, FASTTRAP_OFFSET_AFRAMES, pp);
|
dhpb->dthpb_func, dhpb->dthpb_name, FASTTRAP_OFFSET_AFRAMES, pp);
|
||||||
|
|
||||||
mutex_exit(&provider->ftp_cmtx);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*ARGSUSED*/
|
/*ARGSUSED*/
|
||||||
|
@ -2205,12 +2205,18 @@ extern void dtrace_probe(dtrace_id_t, uintptr_t arg0, uintptr_t arg1,
|
|||||||
*
|
*
|
||||||
* 1.2.4 Caller's context
|
* 1.2.4 Caller's context
|
||||||
*
|
*
|
||||||
* dtms_create_probe() is called from either ioctl() or module load context.
|
* dtms_create_probe() is called from either ioctl() or module load context
|
||||||
* The DTrace framework is locked in such a way that meta providers may not
|
* in the context of a newly-created provider (that is, a provider that
|
||||||
* register or unregister. This means that the meta provider cannot call
|
* is a result of a call to dtms_provide_pid()). The DTrace framework is
|
||||||
* dtrace_meta_register() or dtrace_meta_unregister(). However, the context is
|
* locked in such a way that meta providers may not register or unregister,
|
||||||
* such that the provider may (and is expected to) call provider-related
|
* such that no other thread can call into a meta provider operation and that
|
||||||
* DTrace provider APIs including dtrace_probe_create().
|
* atomicity is assured with respect to meta provider operations across
|
||||||
|
* dtms_provide_pid() and subsequent calls to dtms_create_probe().
|
||||||
|
* The context is thus effectively single-threaded with respect to the meta
|
||||||
|
* provider, and that the meta provider cannot call dtrace_meta_register()
|
||||||
|
* or dtrace_meta_unregister(). However, the context is such that the
|
||||||
|
* provider may (and is expected to) call provider-related DTrace provider
|
||||||
|
* APIs including dtrace_probe_create().
|
||||||
*
|
*
|
||||||
* 1.3 void *dtms_provide_pid(void *arg, dtrace_meta_provider_t *mprov,
|
* 1.3 void *dtms_provide_pid(void *arg, dtrace_meta_provider_t *mprov,
|
||||||
* pid_t pid)
|
* pid_t pid)
|
||||||
|
Loading…
Reference in New Issue
Block a user