Deprecate enabled probe ID (epid)
PATCH v3 3/19 Deprecate enabled probe ID (epid)
From: Eugene Loh <[email protected]>
Historically, the enabled probe id (epid) was an integer, passed from producer to consumer, that uniquely identified probe ID and statement (data description). It was used in error reporting and was available to D users via a built-in variable "epid".
However, its value was opaque to users and difficult to use.
Deprecate the use of EPID:
*) Have the producer pass to the consumer the probe ID and statement
ID explicitly, instead of passing an opaque integer that requires additional lookup tables.
*) Keep an array dt_stmts[] of statements, from which we can retrieve
probe descriptions and data descriptions.
*) Remove data structures related to epid: dt_ddesc[], dt_pdesc[],
dt_nextepid, dt_maxprobe, etc.
Nevertheless, continue to provide a value for the built-in "epid" variable for back compatability. Expand the epid from 4 bytes to 8 bytes: the upper half is the probe ID and the lower half the statement ID.
The output buffer (written by the producer, read by the consumer) is rearranged slightly. Note that:
*) It starts with a 4-byte size, which perf_event writes.
*) The beginning of the output buffer should have 8-byte alignment.
*) The beginning of the trace data within the output buffer should
also have 8-byte alignment.
*) So the buffer looks like:
0: size (written by perf_event)
4: was pad, now prid
8: was epid, now stid
12: specid
16: data[n]
We used to start the output buffer after the first 8 bytes, which we did not write. Now, start the output buffer with the size, even if we still do not write it.
For error reporting:
*) Report errors in terms of the probe ID (and description) and the
clause function name, which is decipherable in terms of the disassembly output. Specifically, change ERROR-probe arguments:
-) arg1 changes from epid to the probe ID
-) arg2 changes from "clause index" (which is no longer needed)
to the statement ID that identifies the clause named in disassembly output
*) No longer report the "action number", which has lost much of its
meaning in the port to eBPF. Nonetheless, keep dteda_action; its value is not used, but set the value to stid for possible future use.
Signed-off-by Eugene Loh <[email protected]>
--- bpf/get_bvar.c | 5 +- bpf/probe_error.c | 8 +- include/dtrace/metadesc.h | 4 +- include/dtrace/universal.h | 3 +- libdtrace/dt_bpf.c | 2 - libdtrace/dt_bpf.h | 46 +++++---- libdtrace/dt_cc.c | 47 +++------- libdtrace/dt_cg.c | 49 +++++----- libdtrace/dt_consume.c | 85 +++++++++-------- libdtrace/dt_dctx.h | 23 +++-- libdtrace/dt_dlibs.c | 2 - libdtrace/dt_error.c | 2 +- libdtrace/dt_handle.c | 41 ++++---- libdtrace/dt_impl.h | 15 +-- libdtrace/dt_map.c | 94 ++----------------- libdtrace/dt_open.c | 5 +- libdtrace/dt_program.c | 9 +- libdtrace/dtrace.h | 3 +- test/demo/builtin/eipd.d | 4 - test/demo/dtrace/error.r | 2 +- test/demo/spec/specopen.d | 5 +- test/stress/buffering/tst.resize3-manual.d | 2 +- test/stress/buffering/tst.resize3-manual.r | 2 +- test/stress/buffering/tst.resize3.d | 2 +- test/stress/buffering/tst.resize3.r | 2 +- test/unittest/actions/setopt/tst.badopt.r | 14 +-- .../arrays/tst.declared-bounds.runtime_out.r | 2 +- test/unittest/builtinvar/tst.id_ERROR.r.p | 2 +- test/unittest/codegen/err.deref_0.r | 2 +- test/unittest/codegen/err.deref_1.r | 2 +- test/unittest/codegen/err.deref_i0.r | 2 +- test/unittest/codegen/err.deref_i1.r | 2 +- .../unittest/codegen/err.deref_string-assoc.r | 2 +- test/unittest/codegen/err.deref_string-gvar.r | 2 +- test/unittest/codegen/err.deref_string-lvar.r | 2 +- test/unittest/codegen/err.deref_string-tvar.r | 2 +- .../codegen/err.str_NULL_plus_offset-assoc.r | 2 +- .../codegen/err.str_NULL_plus_offset-lvar.r | 2 +- .../codegen/err.str_NULL_plus_offset-tvar.r | 2 +- .../codegen/err.str_NULL_plus_offset.r | 2 +- test/unittest/disasm/tst.vartab-bvar.r | 2 +- test/unittest/drops/drp.DTRACEDROP_DBLERROR.r | 2 +- .../tst.DTRACEFLT_BADADDR.null_ptr_field.d | 6 +- .../tst.DTRACEFLT_BADADDR.null_ptr_field.r | 2 +- test/unittest/error/tst.DTRACEFLT_BADADDR.r | 4 +- test/unittest/error/tst.DTRACEFLT_BADADDR2.r | 4 +- .../error/tst.DTRACEFLT_DIVZERO.div.d | 11 ++- .../error/tst.DTRACEFLT_DIVZERO.div.r | 2 +- .../error/tst.DTRACEFLT_DIVZERO.mod.d | 11 ++- .../error/tst.DTRACEFLT_DIVZERO.mod.r | 2 +- test/unittest/error/tst.DTRACEFLT_UNKNOWN.r | 4 +- .../error/tst.clause_scope-begin-ended.r | 2 +- test/unittest/error/tst.clause_scope-begin.r | 2 +- .../unittest/error/tst.clause_scope-regular.r | 2 +- .../error/tst.clause_scope-regular.r.p | 8 +- test/unittest/error/tst.error.r | 2 +- test/unittest/error/tst.errorend.r | 2 +- .../alloca/err.alloca-bcopy-before-beyond.r | 2 +- .../alloca/err.alloca-bcopy-before-bottom.r | 2 +- .../alloca/err.alloca-bcopy-beyond-top.r | 2 +- .../alloca/err.alloca-bcopy-crossing-bottom.r | 2 +- .../alloca/err.alloca-bcopy-crossing-top.r | 2 +- .../alloca/err.alloca-crossing-clauses.r | 2 +- .../alloca/err.alloca-load-before-bottom.r | 2 +- .../funcs/alloca/err.alloca-load-beyond-top.r | 2 +- .../alloca/err.alloca-load-crossing-bottom.r | 2 +- .../alloca/err.alloca-null-deref-lvalue.r | 2 +- .../funcs/alloca/err.alloca-null-deref.r | 2 +- .../err.alloca-scratch-exceeding-bcopy.r | 2 +- .../alloca/err.alloca-store-before-bottom.r | 2 +- .../alloca/err.alloca-store-beyond-top.r | 2 +- .../alloca/err.alloca-store-crossing-bottom.r | 2 +- test/unittest/funcs/bcopy/err.badbcopy1.r | 2 +- test/unittest/funcs/bcopy/err.badbcopy4.r | 2 +- test/unittest/funcs/bcopy/err.badbcopy5.r | 2 +- test/unittest/funcs/bcopy/err.badbcopy6.r | 2 +- test/unittest/funcs/bcopy/err.badbcopy7.r | 2 +- test/unittest/funcs/bcopy/err.badbcopy8.r | 2 +- test/unittest/funcs/copyin/err.badaddr.r | 2 +- test/unittest/funcs/copyin/err.null_arg1.r | 2 +- test/unittest/funcs/copyinstr/err.badaddr.r | 2 +- test/unittest/funcs/copyinstr/err.null_arg1.r | 2 +- test/unittest/funcs/copyinto/err.badaddr.r | 2 +- test/unittest/funcs/copyinto/err.badsize.r | 2 +- test/unittest/funcs/copyinto/err.null_arg1.r | 2 +- test/unittest/funcs/err.badalloca.r | 2 +- test/unittest/funcs/err.badalloca.r.p | 8 +- test/unittest/funcs/err.link_ntopbadaddr.r | 2 +- test/unittest/funcs/err.link_ntopbadarg.r | 2 +- .../inet_ntoa6/err.inet_ntoa6.arg1_null.r | 2 +- .../err.inet_ntoa6.arg1_null_const.r | 2 +- test/unittest/funcs/strlen/tst.null.r | 2 +- test/unittest/funcs/strtok/tst.strtok_null.r | 2 +- .../funcs/strtok/tst.strtok_nulldel.r | 2 +- .../funcs/strtok/tst.strtok_nullstr.r | 2 +- .../funcs/strtok/tst.strtok_nullstr2.r | 2 +- .../funcs/substr/err.substr_null_arg1.r | 2 +- test/unittest/pointers/err.AllocaOverrun.r | 2 +- test/unittest/pointers/err.BadAlign.r | 2 +- test/unittest/pointers/err.InvalidAddress2.r | 2 +- test/unittest/pointers/err.InvalidAddress4.r | 2 +- .../speculation/err.CommitWithInvalid.r | 2 +- .../speculation/err.DiscardWithInvalid.r | 2 +- test/unittest/speculation/tst.negcommit.r | 2 +- .../unittest/variables/bvar/tst.arg3-ERROR.sh | 2 +- 105 files changed, 292 insertions(+), 382 deletions(-) delete mode 100644 test/demo/builtin/eipd.d
bpf/get_bvar.c +3 -2
@@ -48,8 +48,9 @@ noinline uint64_t dt_get_bvar(const dt_dctx_t *dctx, uint32_t id, uint32_t idx) mst->tstamp =bpf_ktime_get_ns ();return mst->tstamp; -case DIF_VAR_EPID : -return mst->epid; +case DIF_VAR_EPID : { +return (((uint64_t )mst->prid) <<32 ) | mst->stid; + }case DIF_VAR_ID :return mst->prid;case DIF_VAR_ARG0 :case DIF_VAR_ARG1 :case DIF_VAR_ARG2 :
bpf/probe_error.c +4 -4
@@ -16,8 +16,8 @@ extern int64_t dt_error(const dt_dctx_t *dctx);/* * DTrace ERROR probes provide 6 arguments: * arg0 = always NULL (used to be kernel consumer state pointer) -* arg1 = EPID of probe that triggered the fault -* arg2 = clause index of code that triggered the fault +* arg1 = probe ID that triggered the fault +* arg2 = statement ID that triggered the fault * arg3 = BPF offset in the clause that triggered the fault (or -1) * arg4 = fault type * arg5 = fault-specific value (usually address being accessed or 0)
@@ -29,8 +29,8 @@ noinline void dt_probe_error(const dt_dctx_t *dctx, uint64_t pc, uint64_t fault,int oldprid = mst->prid; mst->argv[0 ] =0 ; - mst->argv[1 ] = mst->epid; - mst->argv[2 ] = mst->clid; + mst->argv[1 ] = mst->prid; + mst->argv[2 ] = mst->stid; mst->argv[3 ] = pc; mst->argv[4 ] = fault; mst->argv[5 ] = illval;
include/dtrace/metadesc.h +2 -2
@@ -19,8 +19,8 @@/* * DTrace separates the trace data stream from the metadata stream. The only -* metadata tokens placed in the data stream are enabled probe identifiers -* (EPIDs) or (in the case of aggregations) aggregation identifiers. In order +* metadata tokens placed in the data stream are probe and statement identifiers +* or (in the case of aggregations) aggregation identifiers. In order * to determine the structure of the data, DTrace uses the token to perform a * lookup to retrieve the corresponding description of the enabled probe (via * the dtrace_datadesc structure) or the aggregation (via the dtrace_aggdesc
include/dtrace/universal.h +1 -2
@@ -17,7 +17,6 @@#define DTRACE_CPUALL -1/* all CPUs */ #define DTRACE_IDNONE 0/* invalid probe identifier */ -#define DTRACE_EPIDNONE 0/* invalid enabled probe identifier */ #define DTRACE_AGGIDNONE 0/* invalid aggregation identifier */ #define DTRACE_AGGVARIDNONE 0/* invalid aggregation variable ID */ #define DTRACE_CACHEIDNONE 0/* invalid predicate cache */
@@ -37,7 +36,7 @@ typedef uint16_t dtrace_actkind_t; /* action kind */typedef uint32_t dtrace_aggid_t ;/* aggregation identifier */ typedef uint32_t dtrace_cacheid_t ;/* predicate cache identifier */ -typedef uint32_t dtrace_epid_t ;/* enabled probe identifier */ +typedef uint32_t dtrace_stid_t ;/* statement identifier */ typedef uint32_t dtrace_optid_t ;/* option identifier */ typedef uint32_t dtrace_specid_t ;/* speculation identifier */
libdtrace/dt_bpf.c +0 -2
@@ -774,7 +774,6 @@ gmap_create_cpuinfo(dtrace_hdl_t *dtp)* The size of the memory region is the sum of: * - size of the DTrace machine state, rounded up to the nearest * multiple of 8 -* - 8 bytes padding for trace buffer alignment purposes * - maximum trace buffer record size, rounded up to the nearest * multiple of 8 * - size of dctx->mem (see dt_dctx.h)
@@ -783,7 +782,6 @@ static int gmap_create_mem(dtrace_hdl_t *dtp) {size_t sz =roundup (sizeof (dt_mstate_t),8 ) + -8 +roundup (dtp->dt_maxreclen,8 ) +DMEM_SIZE (dtp);
libdtrace/dt_bpf.h +22 -24
52 lines not on this page · raw message
libdtrace/dt_cc.c +12 -35
137 lines not on this page · raw message
libdtrace/dt_cg.c +22 -27
107 lines not on this page · raw message
libdtrace/dt_consume.c +46 -39
212 lines not on this page · raw message
libdtrace/dt_dctx.h +14 -9
@@ -18,9 +18,8 @@* The DTrace machine state. */ typedef struct dt_mstate { - uint32_t epid; /* Enabled probe ID */ uint32_t prid; /* Probe ID */ - uint32_t clid; /* Clause ID (unique per probe) */ + uint32_t stid; /* Statement ID */ uint32_t tag; /* Tag (for future use) */ uint32_t scratch_top; /* Current top of scratch space */ int32_t syscall_errno; /* syscall errno */
@@ -33,9 +32,8 @@ typedef struct dt_mstate {uint64_t saved_argv[10 ];/* Saved probe arguments */ } dt_mstate_t; -#define DMST_EPID offsetof(dt_mstate_t, epid)#define DMST_PRID offsetof(dt_mstate_t, prid) -#define DMST_CLID offsetof(dt_mstate_t, clid) +#define DMST_STID offsetof(dt_mstate_t, stid)#define DMST_TAG offsetof(dt_mstate_t, tag)#define DMST_SCRATCH_TOP offsetof(dt_mstate_t, scratch_top)#define DMST_ERRNO offsetof(dt_mstate_t, syscall_errno)
@@ -82,16 +80,23 @@ typedef struct dt_dctx {* The dctx->buf pointer references a block of memory that contains: * * +----------------+ -* 0 -> | EPID | +* 0 -> | size | * +----------------+ -* 4 -> | Speculation ID | +* 4 -> | PRID | * +----------------+ -* | Trace Data | +* 8 -> | STID | +* +----------------+ +* 12 -> | Speculation ID | +* +----------------+ +* 16 -> | Trace Data | * | ... | * +----------------+ */ -#define DBUF_EPID 0 -#define DBUF_SPECID 4 +#define DBUF_SIZE 0 +#define DBUF_PRID 4 +#define DBUF_STID 8 +#define DBUF_SPECID 12 +#define DBUF_DATA 16/* * The dctx->mem pointer references a block of memory that contains:
libdtrace/dt_dlibs.c +0 -2
@@ -73,9 +73,7 @@ static const dt_ident_t dt_bpf_symbols[] = {DT_BPF_SYMBOL (tuples,DT_IDENT_PTR ),/* BPF internal identifiers */ -DT_BPF_SYMBOL_ID (EPID ,DT_IDENT_SCALAR ,DT_CONST_EPID ),DT_BPF_SYMBOL_ID (PRID ,DT_IDENT_SCALAR ,DT_CONST_PRID ), -DT_BPF_SYMBOL_ID (CLID ,DT_IDENT_SCALAR ,DT_CONST_CLID ),DT_BPF_SYMBOL_ID (ARGC ,DT_IDENT_SCALAR ,DT_CONST_ARGC ),DT_BPF_SYMBOL_ID (STBSZ ,DT_IDENT_SCALAR ,DT_CONST_STBSZ ), DT_BPF_SYMBOL_ID(STRSZ, DT_IDENT_SCALAR, DT_CONST_STRSZ),
libdtrace/dt_error.c +1 -1
@@ -54,7 +54,7 @@ static const struct { { EDT_DOFFSET, "Data record offset exceeds buffer boundary" }, { EDT_DALIGN, "Data record has inappropriate alignment" }, { EDT_DSIZE, "Data record has incorrect size" }, - { EDT_BADEPID, "Invalid EPID" }, + { EDT_BADSTID, "Invalid statement ID" }, { EDT_BADOPTNAME, "Invalid option name" }, { EDT_BADOPTVAL, "Invalid value for specified option" }, { EDT_BADOPTCTX, "Option cannot be used from within a D program" },
libdtrace/dt_handle.c +21 -20
89 lines not on this page · raw message
libdtrace/dt_impl.h +4 -11
@@ -271,10 +271,11 @@ struct dtrace_hdl {const char *dt_errtag;/* tag used with last call to dt_set_errmsg() */ dt_pcb_t *dt_pcb;/* pointer to current parsing control block */ ulong_t dt_gen;/* compiler generation number */ -uint_t dt_clause_nextid;/* next ID to use for programs */ +uint_t dt_stmt_nextid;/* next ID to use for statements */ dt_list_t dt_programs;/* linked list of dtrace_prog_t's */ dt_list_t dt_xlators;/* linked list of dt_xlator_t's */ dt_list_t dt_enablings;/* list of (to be) enabled probes */ +dtrace_stmtdesc_t **dt_stmts;/* array of stmts */ struct dt_xlator **dt_xlatormap;/* dt_xlator_t's indexed by dx_id */ id_t dt_xlatorid;/* next dt_xlator_t id to assign */ dt_ident_t *dt_externs;/* linked list of external symbol identifiers */
@@ -341,10 +342,6 @@ struct dtrace_hdl {ctf_id_t dt_type_symaddr;/* cached CTF identifier for _symaddr type */ ctf_id_t dt_type_usymaddr;/* cached CTF ident. for _usymaddr type */ ctf_id_t dt_type_void;/* cached CTF identifier for void type */ -dtrace_epid_t dt_nextepid;/* next enabled probe ID to assign */ -size_t dt_maxprobe;/* max enabled probe ID */ -dtrace_datadesc_t **dt_ddesc;/* probe data descriptions */ -dtrace_probedesc_t **dt_pdesc;/* probe descriptions for enabled prbs */ size_t dt_maxagg;/* max aggregation ID */ dtrace_aggdesc_t **dt_adesc;/* aggregation descriptions */ struct dt_aggregate *dt_aggregate;/* aggregate */
@@ -604,7 +601,7 @@ enum {EDT_DOFFSET ,/* record data offset error */ EDT_DALIGN ,/* record data alignment error */ EDT_DSIZE ,/* record data size error */ -EDT_BADEPID ,/* invalid enabled probe id */ +EDT_BADSTID ,/* invalid statement id */ EDT_BADOPTNAME ,/* invalid dtrace_setopt option name */ EDT_BADOPTVAL ,/* invalid dtrace_setopt option value */ EDT_BADOPTCTX, /* invalid dtrace_setopt option context */
@@ -773,11 +770,7 @@ extern dtrace_datadesc_t *dt_datadesc_hold(dtrace_datadesc_t *ddp);extern void dt_datadesc_release (dtrace_hdl_t *,dtrace_datadesc_t *);extern dtrace_datadesc_t *dt_datadesc_create (dtrace_hdl_t *);extern int dt_datadesc_finalize (dtrace_hdl_t *,dtrace_datadesc_t *); -extern dtrace_epid_t dt_epid_add (dtrace_hdl_t *,dtrace_datadesc_t *, -dtrace_id_t ); -extern int dt_epid_lookup (dtrace_hdl_t *,dtrace_epid_t ,dtrace_datadesc_t **, -dtrace_probedesc_t **); -extern void dt_epid_destroy (dtrace_hdl_t *); +extern int dt_stid_lookup (dtrace_hdl_t *,dtrace_stid_t ,dtrace_datadesc_t **);typedef void (*dt_cg_gap_f )(dt_pcb_t *,int );extern uint32_t dt_rec_add (dtrace_hdl_t *,dt_cg_gap_f ,dtrace_actkind_t ,uint32_t ,uint16_t ,dt_pfargv_t *,uint64_t );
libdtrace/dt_map.c +7 -87
105 lines not on this page · raw message
libdtrace/dt_open.c +1 -4
@@ -170,7 +170,7 @@ static const dt_ident_t _dtrace_globals[] = { {"discard" ,DT_IDENT_ACTFUNC ,0 ,DT_ACT_DISCARD ,DT_ATTR_STABCMN ,DT_VERS_1_0 , &dt_idops_func, "void(int)" }, { "epid", DT_IDENT_SCALAR, 0, DIF_VAR_EPID, DT_ATTR_STABCMN, DT_VERS_1_0, - &dt_idops_type, "uint_t" }, + &dt_idops_type, "uint64_t" }, { "errno", DT_IDENT_SCALAR, 0, DIF_VAR_ERRNO, DT_ATTR_STABCMN, DT_VERS_1_0, &dt_idops_type, "int" }, { "execname", DT_IDENT_SCALAR, 0, DIF_VAR_EXECNAME,
@@ -739,8 +739,6 @@ dt_vopen(int version, int flags, int *errp,dt_proc_hash_create (dtp);dt_proc_signal_init (dtp); dtp->dt_proc_fd =eventfd (0 ,EFD_CLOEXEC |EFD_NONBLOCK ); - dtp->dt_nextepid =1 ; - dtp->dt_maxprobe =0 ;if (dt_aggregate_init (dtp) ==-1 )return set_open_errno (dtp, errp,dtrace_errno (dtp)); dtp->dt_vmax =DT_VERS_LATEST ;
@@ -1303,7 +1301,6 @@ dtrace_close(dtrace_hdl_t *dtp)if (dtp->dt_poll_fd !=-1 )close (dtp->dt_poll_fd); -dt_epid_destroy (dtp);dt_aggid_destroy (dtp);dt_buffered_destroy (dtp);dt_aggregate_destroy (dtp);
libdtrace/dt_program.c +8 -1
@@ -100,7 +100,7 @@ dtrace_program_info(dtrace_hdl_t *dtp, dtrace_prog_t *pgp,/* * If there aren't any actions, account for the fact that -* recording the epid will generate a record. +* the default action will generate a record. */ dp =dt_dlib_get_func_difo (dtp, stp->ds_desc->dtsd_clause);if (dp !=NULL )
@@ -165,6 +165,13 @@ dt_prog_stmt(dtrace_hdl_t *dtp, dtrace_prog_t *pgp, dtrace_stmtdesc_t *sdp,dtrace_probedesc_t *pdp = &sdp->dtsd_ecbdesc->dted_probe;int rc; +if (dtp->dt_stmts ==NULL ) { + dtp->dt_stmts =dt_calloc (dtp, dtp->dt_stmt_nextid,sizeof (dtrace_stmtdesc_t *)); +if (dtp->dt_stmts ==NULL ) +return dt_set_errno (dtp,EDT_NOMEM ); + } + dtp->dt_stmts[sdp->dtsd_id] = sdp; + st.cnt = cnt; st.sdp = sdp; rc =dt_probe_iter (dtp, pdp, (dt_probe_f *)dt_stmt_probe,NULL , &st);
libdtrace/dtrace.h +2 -1
@@ -150,6 +150,7 @@ typedef struct dtrace_stmtdesc {dtrace_attribute_t dtsd_descattr;/* probedesc attributes */ dtrace_attribute_t dtsd_stmtattr;/* statement attributes */ int dtsd_clauseflags;/* clause flags */ +int dtsd_id;/* index in dtp->dt_stmts */ } dtrace_stmtdesc_t;/* dtsd clause flags */
@@ -189,7 +190,7 @@ typedef enum { typedef struct dtrace_probedata { dtrace_hdl_t *dtpda_handle; /* handle to DTrace library */ - dtrace_epid_t dtpda_epid; /* enabled probe ID */ + dtrace_stid_t dtpda_stid; /* statement ID */ dtrace_datadesc_t *dtpda_ddesc; /* probe data description */ dtrace_probedesc_t *dtpda_pdesc; /* probe description */ unsigned int dtpda_cpu; /* CPU for data */
test/demo/builtin/eipd.d deleted +0 -4
@@ -1,4 +0,0 @@ -BEGIN { - trace(epid); - exit(0); -}
test/demo/dtrace/error.r +1 -1
@@ -3,4 +3,4 @@ -- @@stderr -- dtrace: script 'test/demo/dtrace/error.d' matched 2 probes -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): invalid address ({ptr}) at BPF pc NNN
test/demo/spec/specopen.d +2 -3
@@ -2,7 +2,7 @@ /* * Oracle Linux DTrace. - * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2024, Oracle and/or its affiliates. All rights reserved. * Licensed under the Universal Permissive License v 1.0 as shown at * http://oss.oracle.com/licenses/upl. */
@@ -33,8 +33,7 @@ fbt::: /self->spec/ { /* - * A speculate() with no other actions speculates the default action: - * tracing the EPID. + * A speculate() with no other actions speculates the default action. */ speculate(self->spec); }
test/stress/buffering/tst.resize3-manual.d +1 -1
@@ -31,7 +31,7 @@ BEGIN BEGIN { speculate(spec); - trace(epid); + trace(12345678); } BEGIN
test/stress/buffering/tst.resize3-manual.r +1 -1
@@ -1,5 +1,5 @@ FUNCTION:NAME - :BEGIN 3 + :BEGIN 12345678 :BEGIN -- @@stderr --
test/stress/buffering/tst.resize3.d +1 -1
@@ -27,7 +27,7 @@ BEGIN BEGIN { speculate(spec); - trace(epid); + trace(12345678); } BEGIN
test/stress/buffering/tst.resize3.r +1 -1
@@ -1,5 +1,5 @@ FUNCTION:NAME - :BEGIN 3 + :BEGIN 12345678 :BEGIN -- @@stderr --
test/unittest/actions/setopt/tst.badopt.r +7 -7
@@ -1,16 +1,16 @@ -- @@stderr -- -dtrace: error on enabled probe ID 2 (ID 1: dtrace:::BEGIN): couldn't set option "Nixon" to "1": Invalid option name +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): couldn't set option "Nixon" to "1": Invalid option name -dtrace: error on enabled probe ID 2 (ID 1: dtrace:::BEGIN): couldn't set option "Harding" to "1": Invalid option name +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): couldn't set option "Harding" to "1": Invalid option name -dtrace: error on enabled probe ID 2 (ID 1: dtrace:::BEGIN): couldn't set option "Hoover" to "1": Invalid option name +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): couldn't set option "Hoover" to "1": Invalid option name -dtrace: error on enabled probe ID 2 (ID 1: dtrace:::BEGIN): couldn't set option "Bush" to "1": Invalid option name +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): couldn't set option "Bush" to "1": Invalid option name -dtrace: error on enabled probe ID 2 (ID 1: dtrace:::BEGIN): couldn't set option "quiet" to "um, no": Invalid value for specified option +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): couldn't set option "quiet" to "um, no": Invalid value for specified option -dtrace: error on enabled probe ID 2 (ID 1: dtrace:::BEGIN): couldn't set option "aggrate" to "0.5hz": Invalid value for specified option +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): couldn't set option "aggrate" to "0.5hz": Invalid value for specified option -dtrace: error on enabled probe ID 2 (ID 1: dtrace:::BEGIN): couldn't set option "bufsize" to "1m": Operation illegal when tracing is active +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): couldn't set option "bufsize" to "1m": Operation illegal when tracing is active
test/unittest/arrays/tst.declared-bounds.runtime_out.r +1 -1
@@ -1,3 +1,3 @@ expected run-time error -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): index out of bounds (8) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): index out of bounds (8) at BPF pc NNN
test/unittest/builtinvar/tst.id_ERROR.r.p +1 -1
@@ -1,4 +1,4 @@ #!/usr/bin/gawk -f # Drop the line with run-dependent PRID for profile probe. -!/error on enabled probe ID/ { print } +!/dtrace: error in dt_clause_. for probe ID [0-9]* \(profile:::tick-1s):/ { print }
test/unittest/codegen/err.deref_0.r +1 -1
@@ -1,3 +1,3 @@ -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address (0) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): invalid address (0) at BPF pc NNN
test/unittest/codegen/err.deref_1.r +1 -1
@@ -1,3 +1,3 @@ -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address (1) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): invalid address (1) at BPF pc NNN
test/unittest/codegen/err.deref_i0.r +1 -1
@@ -1,3 +1,3 @@ -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address (0) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): invalid address (0) at BPF pc NNN
test/unittest/codegen/err.deref_i1.r +1 -1
@@ -1,3 +1,3 @@ -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address (1) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): invalid address (1) at BPF pc NNN
test/unittest/codegen/err.deref_string-assoc.r +1 -1
@@ -1,3 +1,3 @@ 66 -- @@stderr -- -dtrace: error on enabled probe ID 4 (ID 1: dtrace:::BEGIN): invalid address (1) in action #2 at BPF pc NNN +dtrace: error in dt_clause_1 for probe ID 1 (dtrace:::BEGIN): invalid address (1) at BPF pc NNN
test/unittest/codegen/err.deref_string-gvar.r +1 -1
@@ -1,3 +1,3 @@ 66 -- @@stderr -- -dtrace: error on enabled probe ID 4 (ID 1: dtrace:::BEGIN): invalid address (1) in action #2 at BPF pc NNN +dtrace: error in dt_clause_1 for probe ID 1 (dtrace:::BEGIN): invalid address (1) at BPF pc NNN
test/unittest/codegen/err.deref_string-lvar.r +1 -1
@@ -1,3 +1,3 @@ 66 -- @@stderr -- -dtrace: error on enabled probe ID 4 (ID 1: dtrace:::BEGIN): invalid address (1) in action #2 at BPF pc NNN +dtrace: error in dt_clause_1 for probe ID 1 (dtrace:::BEGIN): invalid address (1) at BPF pc NNN
test/unittest/codegen/err.deref_string-tvar.r +1 -1
@@ -1,3 +1,3 @@ 66 -- @@stderr -- -dtrace: error on enabled probe ID 4 (ID 1: dtrace:::BEGIN): invalid address (1) in action #2 at BPF pc NNN +dtrace: error in dt_clause_1 for probe ID 1 (dtrace:::BEGIN): invalid address (1) at BPF pc NNN
test/unittest/codegen/err.str_NULL_plus_offset-assoc.r +1 -1
@@ -1,3 +1,3 @@ -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): invalid address ({ptr}) at BPF pc NNN
test/unittest/codegen/err.str_NULL_plus_offset-lvar.r +1 -1
@@ -1,3 +1,3 @@ -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): invalid address ({ptr}) at BPF pc NNN
test/unittest/codegen/err.str_NULL_plus_offset-tvar.r +1 -1
@@ -1,3 +1,3 @@ -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): invalid address ({ptr}) at BPF pc NNN
test/unittest/codegen/err.str_NULL_plus_offset.r +1 -1
@@ -1,3 +1,3 @@ -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): invalid address ({ptr}) at BPF pc NNN
test/unittest/disasm/tst.vartab-bvar.r +1 -1
@@ -4,7 +4,7 @@ curthread scl glb r D type (pointer) (size 8) timestamp scl glb r D type (integer) (size 8) vtimestamp scl glb r D type (integer) (size 8) ipl scl glb r D type (integer) (size 4) -epid scl glb r D type (integer) (size 4) +epid scl glb r D type (integer) (size 8) id scl glb r D type (integer) (size 4) arg0 scl glb r D type (integer) (size 8) arg1 scl glb r D type (integer) (size 8)
test/unittest/drops/drp.DTRACEDROP_DBLERROR.r +1 -1
@@ -4,4 +4,4 @@ -- @@stderr -- dtrace: script 'test/unittest/drops/drp.DTRACEDROP_DBLERROR.d' matched 3 probes dtrace: [DTRACEDROP_DBLERROR] 1 error in ERROR probe enabling -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (:::BEGIN): invalid address ({ptr}) at BPF pc NNN
test/unittest/error/tst.DTRACEFLT_BADADDR.null_ptr_field.d +3 -3
@@ -1,6 +1,6 @@ /* * Oracle Linux DTrace. - * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved. * Licensed under the Universal Permissive License v 1.0 as shown at * http://oss.oracle.com/licenses/upl. */
@@ -15,13 +15,13 @@ BEGIN { - myepid = epid; + myid = id; trace(((struct task_struct *)NULL)->pid); exit(1); } ERROR { - exit(arg1 != myepid || arg2 != 1 || arg4 != DTRACEFLT_BADADDR || + exit(arg1 != myid || arg2 != 0 || arg4 != DTRACEFLT_BADADDR || arg5 != 0); }
test/unittest/error/tst.DTRACEFLT_BADADDR.null_ptr_field.r +1 -1
@@ -1,3 +1,3 @@ -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): invalid address ({ptr}) at BPF pc NNN
test/unittest/error/tst.DTRACEFLT_BADADDR.r +2 -2
@@ -1,6 +1,6 @@ -The arguments are 3 1 1 0 +The arguments are 1 1 1 0 The value of arg4 should be 1 The value of arg5 should be 0 -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_1 for probe ID 1 (dtrace:::BEGIN): invalid address ({ptr}) at BPF pc NNN
test/unittest/error/tst.DTRACEFLT_BADADDR2.r +2 -2
@@ -1,6 +1,6 @@ -The arguments are 3 1 1 16384 +The arguments are 1 1 1 16384 The value of arg4 should be 1 The value of arg5 should be 16384 -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_1 for probe ID 1 (dtrace:::BEGIN): invalid address ({ptr}) at BPF pc NNN
test/unittest/error/tst.DTRACEFLT_DIVZERO.div.d +8 -3
@@ -1,6 +1,6 @@ /* * Oracle Linux DTrace. - * Copyright (c) 2006, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2024, Oracle and/or its affiliates. All rights reserved. * Licensed under the Universal Permissive License v 1.0 as shown at * http://oss.oracle.com/licenses/upl. */
@@ -13,9 +13,14 @@ #pragma D option quiet +BEGIN { myid = id } /* clause 0 */ +BEGIN { myid = id } /* clause 1 */ +BEGIN { myid = id } /* clause 2 */ +BEGIN { myid = id } /* clause 3 */ + BEGIN { - myepid = epid; + myid = id; i = 1; j = 2; j = i / (j - 2);
@@ -24,6 +29,6 @@ BEGIN ERROR { - exit(arg1 != myepid || arg2 != 1 || arg4 != DTRACEFLT_DIVZERO || + exit(arg1 != myid || arg2 != 4 || arg4 != DTRACEFLT_DIVZERO || arg5 != 0); }
test/unittest/error/tst.DTRACEFLT_DIVZERO.div.r +1 -1
@@ -1,3 +1,3 @@ -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): divide-by-zero in action #1 at BPF pc NNN +dtrace: error in dt_clause_4 for probe ID 1 (dtrace:::BEGIN): divide-by-zero at BPF pc NNN
test/unittest/error/tst.DTRACEFLT_DIVZERO.mod.d +8 -3
@@ -1,6 +1,6 @@ /* * Oracle Linux DTrace. - * Copyright (c) 2021, 2022, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2021, 2024, Oracle and/or its affiliates. All rights reserved. * Licensed under the Universal Permissive License v 1.0 as shown at * http://oss.oracle.com/licenses/upl. */
@@ -13,9 +13,14 @@ #pragma D option quiet +BEGIN { myid = id; } /* clause 0 */ +BEGIN { myid = id; } /* clause 1 */ +BEGIN { myid = id; } /* clause 2 */ +BEGIN { myid = id; } /* clause 3 */ + BEGIN { - myepid = epid; + myid = id; i = 1; j = 2; j = i % (j - 2);
@@ -24,6 +29,6 @@ BEGIN ERROR { - exit(arg1 != myepid || arg2 != 1 || arg4 != DTRACEFLT_DIVZERO || + exit(arg1 != myid || arg2 != 4 || arg4 != DTRACEFLT_DIVZERO || arg5 != 0); }
test/unittest/error/tst.DTRACEFLT_DIVZERO.mod.r +1 -1
@@ -1,3 +1,3 @@ -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): divide-by-zero in action #1 at BPF pc NNN +dtrace: error in dt_clause_4 for probe ID 1 (dtrace:::BEGIN): divide-by-zero at BPF pc NNN
test/unittest/error/tst.DTRACEFLT_UNKNOWN.r +2 -2
@@ -1,5 +1,5 @@ -The arguments are 3 1 PC 1 64 +The arguments are 1 1 PC 1 64 The value of arg4 = 0 -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_1 for probe ID 1 (dtrace:::BEGIN): invalid address ({ptr}) at BPF pc NNN
test/unittest/error/tst.clause_scope-begin-ended.r +1 -1
@@ -2,4 +2,4 @@ Error fired Clause executed -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_1 for probe ID 1 (dtrace:::BEGIN): invalid address ({ptr}) at BPF pc NNN
test/unittest/error/tst.clause_scope-begin.r +1 -1
@@ -2,4 +2,4 @@ Error fired Clause executed -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_1 for probe ID 1 (dtrace:::BEGIN): invalid address ({ptr}) at BPF pc NNN
test/unittest/error/tst.clause_scope-regular.r +1 -1
@@ -2,4 +2,4 @@ Error fired Clause executed -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID nnn: profile:::tick-10ms): invalid address ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_1 for probe ID nnn (profile:::tick-10ms): invalid address ({ptr}) at BPF pc NNN
test/unittest/error/tst.clause_scope-regular.r.p +6 -2
@@ -1,3 +1,7 @@ -#!/bin/sed -f +#!/usr/bin/awk -f + # This report has a variable probe ID in it. -s/ID [0-9][0-9]*: profile/ID nnn: profile/ +{ + sub("for probe ID [0-9][0-9]* .profile", "for probe ID nnn (profile"); + print; +}
test/unittest/error/tst.error.r +1 -1
@@ -1,4 +1,4 @@ Error fired -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_1 for probe ID 1 (dtrace:::BEGIN): invalid address ({ptr}) at BPF pc NNN
test/unittest/error/tst.errorend.r +1 -1
@@ -2,4 +2,4 @@ Error fired End fired after exit -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_2 for probe ID 1 (dtrace:::BEGIN): invalid address ({ptr}) at BPF pc NNN
test/unittest/funcs/alloca/err.alloca-bcopy-before-beyond.r +1 -1
@@ -1,3 +1,3 @@ -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): invalid address ({ptr}) at BPF pc NNN
test/unittest/funcs/alloca/err.alloca-bcopy-before-bottom.r +1 -1
@@ -1,3 +1,3 @@ -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): invalid address ({ptr}) at BPF pc NNN
test/unittest/funcs/alloca/err.alloca-bcopy-beyond-top.r +1 -1
@@ -1,3 +1,3 @@ -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): invalid address ({ptr}) at BPF pc NNN
test/unittest/funcs/alloca/err.alloca-bcopy-crossing-bottom.r +1 -1
@@ -1,3 +1,3 @@ -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): invalid address ({ptr}) at BPF pc NNN
test/unittest/funcs/alloca/err.alloca-bcopy-crossing-top.r +1 -1
@@ -1,3 +1,3 @@ -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid size ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): invalid size ({ptr}) at BPF pc NNN
test/unittest/funcs/alloca/err.alloca-crossing-clauses.r +1 -1
@@ -1,3 +1,3 @@ -- @@stderr -- -dtrace: error on enabled probe ID 4 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #2 at BPF pc NNN +dtrace: error in dt_clause_1 for probe ID 1 (dtrace:::BEGIN): invalid address ({ptr}) at BPF pc NNN
test/unittest/funcs/alloca/err.alloca-load-before-bottom.r +1 -1
@@ -1,3 +1,3 @@ -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): invalid address ({ptr}) at BPF pc NNN
test/unittest/funcs/alloca/err.alloca-load-beyond-top.r +1 -1
@@ -1,3 +1,3 @@ -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): invalid address ({ptr}) at BPF pc NNN
test/unittest/funcs/alloca/err.alloca-load-crossing-bottom.r +1 -1
@@ -1,3 +1,3 @@ -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): invalid address ({ptr}) at BPF pc NNN
test/unittest/funcs/alloca/err.alloca-null-deref-lvalue.r +1 -1
@@ -1,3 +1,3 @@ -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): invalid address ({ptr}) at BPF pc NNN
test/unittest/funcs/alloca/err.alloca-null-deref.r +1 -1
@@ -1,3 +1,3 @@ -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): invalid address ({ptr}) at BPF pc NNN
test/unittest/funcs/alloca/err.alloca-scratch-exceeding-bcopy.r +1 -1
@@ -1,3 +1,3 @@ -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid size ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): invalid size ({ptr}) at BPF pc NNN
test/unittest/funcs/alloca/err.alloca-store-before-bottom.r +1 -1
@@ -1,3 +1,3 @@ -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): invalid address ({ptr}) at BPF pc NNN
test/unittest/funcs/alloca/err.alloca-store-beyond-top.r +1 -1
@@ -1,3 +1,3 @@ -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): invalid address ({ptr}) at BPF pc NNN
test/unittest/funcs/alloca/err.alloca-store-crossing-bottom.r +1 -1
@@ -1,3 +1,3 @@ -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): invalid address ({ptr}) at BPF pc NNN
test/unittest/funcs/bcopy/err.badbcopy1.r +1 -1
@@ -1,3 +1,3 @@ -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): invalid address ({ptr}) at BPF pc NNN
test/unittest/funcs/bcopy/err.badbcopy4.r +1 -1
@@ -1,3 +1,3 @@ -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): invalid address ({ptr}) at BPF pc NNN
test/unittest/funcs/bcopy/err.badbcopy5.r +1 -1
@@ -1,3 +1,3 @@ -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): invalid address ({ptr}) at BPF pc NNN
test/unittest/funcs/bcopy/err.badbcopy6.r +1 -1
@@ -1,3 +1,3 @@ -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid size ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): invalid size ({ptr}) at BPF pc NNN
test/unittest/funcs/bcopy/err.badbcopy7.r +1 -1
@@ -1,3 +1,3 @@ -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid size ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): invalid size ({ptr}) at BPF pc NNN
test/unittest/funcs/bcopy/err.badbcopy8.r +1 -1
@@ -1,3 +1,3 @@ -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid size ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): invalid size ({ptr}) at BPF pc NNN
test/unittest/funcs/copyin/err.badaddr.r +1 -1
@@ -3,4 +3,4 @@ -- @@stderr -- dtrace: script 'test/unittest/funcs/copyin/err.badaddr.d' matched 2 probes -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): invalid address ({ptr}) at BPF pc NNN
test/unittest/funcs/copyin/err.null_arg1.r +1 -1
@@ -3,4 +3,4 @@ -- @@stderr -- dtrace: script 'test/unittest/funcs/copyin/err.null_arg1.d' matched 2 probes -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): invalid address ({ptr}) at BPF pc NNN
test/unittest/funcs/copyinstr/err.badaddr.r +1 -1
@@ -3,4 +3,4 @@ -- @@stderr -- dtrace: script 'test/unittest/funcs/copyinstr/err.badaddr.d' matched 2 probes -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): invalid address ({ptr}) at BPF pc NNN
test/unittest/funcs/copyinstr/err.null_arg1.r +1 -1
@@ -3,4 +3,4 @@ -- @@stderr -- dtrace: script 'test/unittest/funcs/copyinstr/err.null_arg1.d' matched 2 probes -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): invalid address ({ptr}) at BPF pc NNN
test/unittest/funcs/copyinto/err.badaddr.r +1 -1
@@ -3,4 +3,4 @@ -- @@stderr -- dtrace: script 'test/unittest/funcs/copyinto/err.badaddr.d' matched 2 probes -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): invalid address ({ptr}) at BPF pc NNN
test/unittest/funcs/copyinto/err.badsize.r +1 -1
@@ -3,4 +3,4 @@ -- @@stderr -- dtrace: script 'test/unittest/funcs/copyinto/err.badsize.d' matched 2 probes -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid size ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): invalid size ({ptr}) at BPF pc NNN
test/unittest/funcs/copyinto/err.null_arg1.r +1 -1
@@ -3,4 +3,4 @@ -- @@stderr -- dtrace: script 'test/unittest/funcs/copyinto/err.null_arg1.d' matched 2 probes -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): invalid address ({ptr}) at BPF pc NNN
test/unittest/funcs/err.badalloca.r +1 -1
@@ -1,3 +1,3 @@ -- @@stderr -- -dtrace: error on enabled probe ID 4 (ID NNN: profile:::tick-1): invalid address ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_1 for probe ID NNN (profile:::tick-1): invalid address ({ptr}) at BPF pc NNN
test/unittest/funcs/err.badalloca.r.p +6 -2
@@ -1,3 +1,7 @@ -#!/bin/sed -f +#!/usr/bin/awk -f -s/(ID [0-9]*/(ID NNN/g +# This report has a variable probe ID in it. +{ + sub("for probe ID [0-9]* .profile", "for probe ID NNN (profile"); + print; +}
test/unittest/funcs/err.link_ntopbadaddr.r +1 -1
@@ -1,3 +1,3 @@ -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): invalid address ({ptr}) at BPF pc NNN
test/unittest/funcs/err.link_ntopbadarg.r +1 -1
@@ -1,3 +1,3 @@ -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): illegal operation in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): illegal operation at BPF pc NNN
test/unittest/funcs/inet_ntoa6/err.inet_ntoa6.arg1_null.r +1 -1
@@ -1,3 +1,3 @@ -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): invalid address ({ptr}) at BPF pc NNN
test/unittest/funcs/inet_ntoa6/err.inet_ntoa6.arg1_null_const.r +1 -1
@@ -1,3 +1,3 @@ -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): invalid address ({ptr}) at BPF pc NNN
test/unittest/funcs/strlen/tst.null.r +1 -1
@@ -1,3 +1,3 @@ -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): invalid address ({ptr}) at BPF pc NNN
test/unittest/funcs/strtok/tst.strtok_null.r +1 -1
@@ -3,4 +3,4 @@ -- @@stderr -- dtrace: script 'test/unittest/funcs/strtok/tst.strtok_null.d' matched 2 probes -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): invalid address ({ptr}) at BPF pc NNN
test/unittest/funcs/strtok/tst.strtok_nulldel.r +1 -1
@@ -3,4 +3,4 @@ -- @@stderr -- dtrace: script 'test/unittest/funcs/strtok/tst.strtok_nulldel.d' matched 2 probes -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): invalid address ({ptr}) at BPF pc NNN
test/unittest/funcs/strtok/tst.strtok_nullstr.r +1 -1
@@ -3,4 +3,4 @@ -- @@stderr -- dtrace: script 'test/unittest/funcs/strtok/tst.strtok_nullstr.d' matched 2 probes -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): invalid address ({ptr}) at BPF pc NNN
test/unittest/funcs/strtok/tst.strtok_nullstr2.r +1 -1
@@ -4,4 +4,4 @@ -- @@stderr -- dtrace: script 'test/unittest/funcs/strtok/tst.strtok_nullstr2.d' matched 4 probes -dtrace: error on enabled probe ID 4 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #2 at BPF pc NNN +dtrace: error in dt_clause_1 for probe ID 1 (dtrace:::BEGIN): invalid address ({ptr}) at BPF pc NNN
test/unittest/funcs/substr/err.substr_null_arg1.r +1 -1
@@ -1,3 +1,3 @@ -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): invalid address ({ptr}) at BPF pc NNN
test/unittest/pointers/err.AllocaOverrun.r +1 -1
@@ -1,3 +1,3 @@ -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): invalid address ({ptr}) at BPF pc NNN
test/unittest/pointers/err.BadAlign.r +1 -1
@@ -1,3 +1,3 @@ -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): invalid address ({ptr}) at BPF pc NNN
test/unittest/pointers/err.InvalidAddress2.r +1 -1
@@ -1,3 +1,3 @@ -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): invalid address ({ptr}) at BPF pc NNN
test/unittest/pointers/err.InvalidAddress4.r +1 -1
@@ -1,3 +1,3 @@ -- @@stderr -- -dtrace: error on enabled probe ID 3 (ID 1: dtrace:::BEGIN): invalid address ({ptr}) in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): invalid address ({ptr}) at BPF pc NNN
test/unittest/speculation/err.CommitWithInvalid.r +1 -1
@@ -1,3 +1,3 @@ -- @@stderr -- -dtrace: error on enabled probe ID 4 (ID 1: dtrace:::BEGIN): illegal operation in action #2 at BPF pc NNN +dtrace: error in dt_clause_1 for probe ID 1 (dtrace:::BEGIN): illegal operation at BPF pc NNN
test/unittest/speculation/err.DiscardWithInvalid.r +1 -1
@@ -1,3 +1,3 @@ -- @@stderr -- -dtrace: error on enabled probe ID 4 (ID 1: dtrace:::BEGIN): illegal operation in action #2 at BPF pc NNN +dtrace: error in dt_clause_1 for probe ID 1 (dtrace:::BEGIN): illegal operation at BPF pc NNN
test/unittest/speculation/tst.negcommit.r +1 -1
@@ -3,4 +3,4 @@ -- @@stderr -- dtrace: script 'test/unittest/speculation/tst.negcommit.d' matched 2 probes -dtrace: error on enabled probe ID 2 (ID 1: dtrace:::BEGIN): illegal operation in action #1 at BPF pc NNN +dtrace: error in dt_clause_0 for probe ID 1 (dtrace:::BEGIN): illegal operation at BPF pc NNN
test/unittest/variables/bvar/tst.arg3-ERROR.sh +1 -1
@@ -120,7 +120,7 @@ done # Do a sanity check on DTrace's error output. -awk '/^dtrace: error on enabled probe ID [0-9]* \(ID 1: dtrace:::BEGIN): invalid address \(0x40) in action #[0-9] at BPF pc [0-9]*$/ { print $NF }' \ +awk '/^dtrace: error in dt_clause_[1-4] for probe ID 1 \(dtrace:::BEGIN): invalid address \(0x40) at BPF pc [0-9]*$/ { print $NF }' \ disasm.out > err_pcs.txt.chk1 if ! diff -q err_pcs.txt err_pcs.txt.chk1; then echo ERROR: problem with DTrace error output
Signature · 1 line
2.43.5
PATCH v2 7/19 Create the BPF usdt_prids map
From: Eugene Loh <[email protected]>
As USDT processes come and go, the overlying probes for an underlying probe will change. Hence, we will move to a scheme in which an underlying probe will walk all possible clauses it could call, deciding at run time (using a bit mask for the overlying USDT probe) which of the clauses to call.
In this patch, we create and update the BPF "usdt_prids" map. This is a hash map, where:
*) the key (size: dtp->dt_usdt_pridsmap_ksz) comprises
- the PID of the firing process
- the PRID of the underlying probe
*) the value (size: dtp->dt_usdt_pridsmap_vsz) comprises
- the PRID over the overlying USDT probe
- a bit mask indicating which clauses should be called
As processes start up, we also add new overlying USDT probes, requiring updates of the BPF "probes" and "strtab" maps and of the list of enablings.
The underlying-probes "update" function is called sporadically. The focus of this patch is the function. When it is called can be tuned in future patches.
This patch guesses certain sizes very crudely. These sizes should be handled more robustly in future patches:
*) The allocated size of the string table. For example,
new provider names have to be added as new processes start.
*) The number of entries in the BPF "usdt_prids" map.
There is a little relief here in that, as processes terminate, they can be removed from the map.
*) The size of the bit mask -- that is, the greatest
number of clauses an underlying probe might call. This is relatively easy to extend; nevertheless, that work is left for a future patch.
Signed-off-by Eugene Loh <[email protected]>
--- libdtrace/dt_bpf.c | 42 +++++- libdtrace/dt_cc.c | 2 +- libdtrace/dt_dlibs.c | 1 + libdtrace/dt_impl.h | 6 + libdtrace/dt_prov_uprobe.c | 266 +++++++++++++++++++++++++++++++++++++ libdtrace/dt_work.c | 2 + 6 files changed, 317 insertions(+), 2 deletions(-)
libdtrace/dt_bpf.c +41 -1
@@ -841,7 +841,8 @@ gmap_create_strtab(dtrace_hdl_t *dtp)int fd, rc, err; dtp->dt_strlen =dt_strtab_size (dtp->dt_ccstab); - dtp->dt_rooffset =P2ROUNDUP (dtp->dt_strlen,8 ); + dtp->dt_strmax = dtp->dt_strlen +1000 ;// FIXME pad some arbitrary amount to account for new USDT probes as new processes start + dtp->dt_rooffset =P2ROUNDUP (dtp->dt_strmax,8 ); dtp->dt_rosize =dt_rodata_size (dtp->dt_rodata); dtp->dt_zerooffset =P2ROUNDUP (dtp->dt_rooffset + dtp->dt_rosize,8 ); dtp->dt_zerosize =0 ;
@@ -899,6 +900,7 @@ gmap_create_strtab(dtrace_hdl_t *dtp)if (rc ==-1 )return dt_bpf_error (dtp,"cannot update BPF map 'strtab': %s\n" ,strerror (err)); + dtp->dt_strtabmap_fd = fd;return 0 ; }
@@ -936,6 +938,43 @@ gmap_create_probes(dtrace_hdl_t *dtp) dtp,"cannot update BPF map 'probes': %s\n" , strerror(errno)); } + dtp->dt_probesmap_fd = fd; + +return 0 ; +} + +/* +* Create the 'usdt_prids' BPF map. +* +* USDT-PRID information map. This is a global hash map for use +* with USDT probes. It is indexed by (pid, underlying probe ID). +* The value is a probe ID for the overlying USDT probe and a bit +* mask indicating which clauses to execute for this pid. +* +* WIP. Just make up some sizes for now. +* +* How big is a probe ID? Sometimes, it's a dtrace_id_t. +* And uts/common/sys/dtrace_types.h gives us "typedef uint32_t dtrace_id_t". +* Meanwhile, libdtrace/dt_impl.h has "uint32_t dt_probe_id". +* So either uint32_t or dtrace_id_t is fine. +* +* How big should our bit mask be? Start with 8*sizeof(long long) bits. +* +* How many entries should we allow? Start with 1000. +* +* Note that for a given (pid, PRID) key, there can be at most one +* overlying USDT probe. +*/ +static int +gmap_create_usdt_prids (dtrace_hdl_t *dtp) +{ + dtp->dt_usdt_pridsmap_fd =create_gmap (dtp,"usdt_prids" ,BPF_MAP_TYPE_HASH , + dtp->dt_usdt_pridsmap_ksz, dtp->dt_usdt_pridsmap_vsz,1000 ); +if (dtp->dt_usdt_pridsmap_fd ==-1 ) +return -1 ; + +/* Populate the newly created map. FIXME: this is probably not the right place for this. */ + dt_uprobe.update (dtp,NULL );return 0 ; }
@@ -1045,6 +1084,7 @@ dt_bpf_gmap_create(dtrace_hdl_t *dtp) CREATE_MAP(scratchmem) CREATE_MAP(strtab) CREATE_MAP(probes) + CREATE_MAP(usdt_prids) CREATE_MAP(gvars) CREATE_MAP(lvars) CREATE_MAP(dvars)
libdtrace/dt_cc.c +1 -1
@@ -1046,7 +1046,7 @@ dt_link_construct(dtrace_hdl_t *dtp, const dt_probe_t *prp, dtrace_difo_t *dp, nrp->dofr_data =0 ;/* FIXME */ continue ;case DT_CONST_STBSZ : - nrp->dofr_data = dtp->dt_strlen; + nrp->dofr_data = dtp->dt_strmax;continue ;case DT_CONST_STRSZ : nrp->dofr_data =
libdtrace/dt_dlibs.c +1 -0
@@ -66,6 +66,7 @@ static const dt_ident_t dt_bpf_symbols[] = {DT_BPF_SYMBOL (lvars,DT_IDENT_PTR ),DT_BPF_SYMBOL (mem,DT_IDENT_PTR ),DT_BPF_SYMBOL (probes,DT_IDENT_PTR ), +DT_BPF_SYMBOL (usdt_prids,DT_IDENT_PTR ),DT_BPF_SYMBOL (scratchmem,DT_IDENT_PTR ),DT_BPF_SYMBOL (specs,DT_IDENT_PTR ), DT_BPF_SYMBOL(state, DT_IDENT_PTR),
libdtrace/dt_impl.h +6 -0
@@ -287,6 +287,7 @@ struct dtrace_hdl {dt_strtab_t *dt_ccstab;/* global string table (during compilation) */ dt_rodata_t *dt_rodata;/* global read-only data */ uint_t dt_strlen;/* global string table (runtime) size */ +uint_t dt_strmax;/* global string table (runtime) size, allocated */ uint_t dt_rooffset;/* read-only data offset */ uint_t dt_rosize;/* read-only data size */ uint_t dt_zerooffset;/* zero region, offset */
@@ -394,6 +395,11 @@ struct dtrace_hdl {int dt_aggmap_fd;/* file descriptor for the 'aggs' BPF map */ int dt_genmap_fd;/* file descriptor for the 'agggen' BPF map */ int dt_cpumap_fd;/* file descriptor for the 'cpuinfo' BPF map */ +int dt_strtabmap_fd;/* file descriptor for the 'strtab' BPF map */ +int dt_probesmap_fd;/* file descriptor for the 'probes' BPF map */ +int dt_usdt_pridsmap_fd;/* file descriptor for the 'usdt_prids' BPF map */ +int dt_usdt_pridsmap_ksz;/* 'usdt_prids' BPF map key size */ +int dt_usdt_pridsmap_vsz;/* 'usdt_prids' BPF map value size */ dtrace_handle_err_f *dt_errhdlr;/* error handler, if any */ void *dt_errarg;/* error handler argument */ dtrace_handle_drop_f *dt_drophdlr;/* drop handler, if any */
libdtrace/dt_prov_uprobe.c +266 -0
298 lines not on this page · raw message
libdtrace/dt_work.c +2 -0
@@ -373,6 +373,8 @@ dtrace_work(dtrace_hdl_t *dtp, FILE *fp, dtrace_consume_probe_f *pfunc,dtrace_workstatus_t rval;int gen; +dt_uprobe.update (dtp,NULL ); +switch (dtrace_status (dtp)) {case DTRACE_STATUS_EXITED :case DTRACE_STATUS_STOPPED :
Signature · 1 line
2.43.5
Re: [PATCH v2 07/19] Create the BPF usdt_prids map
Just a head's up that I am taking a look at this right now from the perspective of whether it is safe to perform a BPF map update on a map that might be in use at the same time. So, the updating of the strtab map is a likely dangerous situation.
More once I figure out a few things.
Quoted 499 lines · On Sun, Sep 08, 2024 at 12:40:15PM -0400, [email protected] wrote:
From: Eugene Loh <[email protected]>
As USDT processes come and go, the overlying probes for an underlying probe will change. Hence, we will move to a scheme in which an underlying probe will walk all possible clauses it could call, deciding at run time (using a bit mask for the overlying USDT probe) which of the clauses to call.
In this patch, we create and update the BPF "
usdt_prids" map. This is a hash map, where:*) the key (size:
dtp->dt_usdt_pridsmap_ksz) comprises
- the PID of the firing process
- the PRID of the underlying probe*) the value (size:
dtp->dt_usdt_pridsmap_vsz) comprises
- the PRID over the overlying USDT probe
- a bit mask indicating which clauses should be calledAs processes start up, we also add new overlying USDT probes, requiring updates of the BPF "probes" and "strtab" maps and of the list of enablings.
The underlying-probes "update" function is called sporadically. The focus of this patch is the function. When it is called can be tuned in future patches.
This patch guesses certain sizes very crudely. These sizes should be handled more robustly in future patches:
*) The allocated size of the string table. For example,
new provider names have to be added as new processes start.*) The number of entries in the BPF "
usdt_prids" map.
There is a little relief here in that, as processes terminate, they can be removed from the map.*) The size of the bit mask -- that is, the greatest
number of clauses an underlying probe might call. This is relatively easy to extend; nevertheless, that work is left for a future patch.Signed-off-by Eugene Loh <[email protected]>--- libdtrace/dt_bpf.c | 42 +++++- libdtrace/dt_cc.c | 2 +- libdtrace/dt_dlibs.c | 1 + libdtrace/dt_impl.h | 6 + libdtrace/dt_prov_uprobe.c | 266 +++++++++++++++++++++++++++++++++++++ libdtrace/dt_work.c | 2 + 6 files changed, 317 insertions(+), 2 deletions(-)libdtrace/dt_bpf.c +41
-1@@ -841,7 +841,8 @@ gmap_create_strtab(dtrace_hdl_t *dtp)int fd, rc, err; dtp->dt_strlen =dt_strtab_size (dtp->dt_ccstab); - dtp->dt_rooffset =P2ROUNDUP (dtp->dt_strlen,8 ); + dtp->dt_strmax = dtp->dt_strlen +1000 ;// FIXME pad some arbitrary amount to account for new USDT probes as new processes start + dtp->dt_rooffset =P2ROUNDUP (dtp->dt_strmax,8 ); dtp->dt_rosize =dt_rodata_size (dtp->dt_rodata); dtp->dt_zerooffset =P2ROUNDUP (dtp->dt_rooffset + dtp->dt_rosize,8 ); dtp->dt_zerosize =0 ;@@ -899,6 +900,7 @@ gmap_create_strtab(dtrace_hdl_t *dtp)if (rc ==-1 )return dt_bpf_error (dtp,"cannot update BPF map 'strtab': %s\n" ,strerror (err)); + dtp->dt_strtabmap_fd = fd;return 0 ; }@@ -936,6 +938,43 @@ gmap_create_probes(dtrace_hdl_t *dtp) dtp,"cannot update BPF map 'probes': %s\n" , strerror(errno)); } + dtp->dt_probesmap_fd = fd; + +return 0 ; +} + +/* +* Create the 'usdt_prids' BPF map. +* +* USDT-PRID information map. This is a global hash map for use +* with USDT probes. It is indexed by (pid, underlying probe ID). +* The value is a probe ID for the overlying USDT probe and a bit +* mask indicating which clauses to execute for this pid. +* +* WIP. Just make up some sizes for now. +* +* How big is a probe ID? Sometimes, it's a dtrace_id_t. +* And uts/common/sys/dtrace_types.h gives us "typedef uint32_t dtrace_id_t". +* Meanwhile, libdtrace/dt_impl.h has "uint32_t dt_probe_id". +* So either uint32_t or dtrace_id_t is fine. +* +* How big should our bit mask be? Start with 8*sizeof(long long) bits. +* +* How many entries should we allow? Start with 1000. +* +* Note that for a given (pid, PRID) key, there can be at most one +* overlying USDT probe. +*/ +static int +gmap_create_usdt_prids (dtrace_hdl_t *dtp) +{ + dtp->dt_usdt_pridsmap_fd =create_gmap (dtp,"usdt_prids" ,BPF_MAP_TYPE_HASH , + dtp->dt_usdt_pridsmap_ksz, dtp->dt_usdt_pridsmap_vsz,1000 ); +if (dtp->dt_usdt_pridsmap_fd ==-1 ) +return -1 ; + +/* Populate the newly created map. FIXME: this is probably not the right place for this. */ + dt_uprobe.update (dtp,NULL );return 0 ; }@@ -1045,6 +1084,7 @@ dt_bpf_gmap_create(dtrace_hdl_t *dtp) CREATE_MAP(scratchmem) CREATE_MAP(strtab) CREATE_MAP(probes) + CREATE_MAP(usdt_prids) CREATE_MAP(gvars) CREATE_MAP(lvars) CREATE_MAP(dvars)libdtrace/dt_cc.c +1
-1@@ -1046,7 +1046,7 @@ dt_link_construct(dtrace_hdl_t *dtp, const dt_probe_t *prp, dtrace_difo_t *dp, nrp->dofr_data =0 ;/* FIXME */ continue ;case DT_CONST_STBSZ : - nrp->dofr_data = dtp->dt_strlen; + nrp->dofr_data = dtp->dt_strmax;continue ;case DT_CONST_STRSZ : nrp->dofr_data =libdtrace/dt_dlibs.c +1
-0@@ -66,6 +66,7 @@ static const dt_ident_t dt_bpf_symbols[] = {DT_BPF_SYMBOL (lvars,DT_IDENT_PTR ),DT_BPF_SYMBOL (mem,DT_IDENT_PTR ),DT_BPF_SYMBOL (probes,DT_IDENT_PTR ), +DT_BPF_SYMBOL (usdt_prids,DT_IDENT_PTR ),DT_BPF_SYMBOL (scratchmem,DT_IDENT_PTR ),DT_BPF_SYMBOL (specs,DT_IDENT_PTR ), DT_BPF_SYMBOL(state, DT_IDENT_PTR),libdtrace/dt_impl.h +6
-0@@ -287,6 +287,7 @@ struct dtrace_hdl {dt_strtab_t *dt_ccstab;/* global string table (during compilation) */ dt_rodata_t *dt_rodata;/* global read-only data */ uint_t dt_strlen;/* global string table (runtime) size */ +uint_t dt_strmax;/* global string table (runtime) size, allocated */ uint_t dt_rooffset;/* read-only data offset */ uint_t dt_rosize;/* read-only data size */ uint_t dt_zerooffset;/* zero region, offset */ @@ -394,6 +395,11 @@ struct dtrace_hdl {int dt_aggmap_fd;/* file descriptor for the 'aggs' BPF map */ int dt_genmap_fd;/* file descriptor for the 'agggen' BPF map */ int dt_cpumap_fd;/* file descriptor for the 'cpuinfo' BPF map */ +int dt_strtabmap_fd;/* file descriptor for the 'strtab' BPF map */ +int dt_probesmap_fd;/* file descriptor for the 'probes' BPF map */ +int dt_usdt_pridsmap_fd;/* file descriptor for the 'usdt_prids' BPF map */ +int dt_usdt_pridsmap_ksz;/* 'usdt_prids' BPF map key size */ +int dt_usdt_pridsmap_vsz;/* 'usdt_prids' BPF map value size */ dtrace_handle_err_f *dt_errhdlr;/* error handler, if any */ void *dt_errarg;/* error handler argument */ dtrace_handle_drop_f *dt_drophdlr;/* drop handler, if any */ libdtrace/dt_prov_uprobe.c +266
-0@@ -37,8 +37,10 @@#include "dt_list.h" #include "dt_provider_tp.h" #include "dt_probe.h" +#include "dt_program.h" #include "dt_pid.h" #include "dt_string.h" +#include "port.h" /* Provider name for the underlying probes. */ static const char prvname[] ="uprobe" ;@@ -63,6 +65,15 @@ typedef struct list_probe {dt_probe_t *probe; } list_probe_t; +typedef struct usdt_prids_map_key { +pid_t pid; +dtrace_id_t uprid; +}usdt_prids_map_key_t ; +typedef struct usdt_prids_map_val { +dtrace_id_t prid; +long long mask; +}usdt_prids_map_val_t ; +static const dtrace_pattr_t pattr = { {DTRACE_STABILITY_EVOLVING ,DTRACE_STABILITY_EVOLVING ,DTRACE_CLASS_ISA }, {DTRACE_STABILITY_PRIVATE ,DTRACE_STABILITY_PRIVATE ,DTRACE_CLASS_UNKNOWN },@@ -77,6 +88,9 @@ dt_provimpl_t dt_usdt; static int populate(dtrace_hdl_t *dtp) { + dtp->dt_usdt_pridsmap_ksz = sizeof(usdt_prids_map_key_t); + dtp->dt_usdt_pridsmap_vsz = sizeof(usdt_prids_map_val_t); + if (dt_provider_create(dtp, dt_uprobe.name, &dt_uprobe, &pattr, NULL) == NULL || dt_provider_create(dtp, dt_uprobe_is_enabled.name,@@ -123,6 +137,257 @@ static void probe_destroy(dtrace_hdl_t *dtp, void *datap)free_probe_list (dtp, datap); } +/* +* Clean up the BPF "usdt_prids" map. +*/ +static int +purge_BPFmap (dtrace_hdl_t *dtp) +{ +int fd = dtp->dt_usdt_pridsmap_fd; +usdt_prids_map_key_t key, nxt; +usdt_prids_map_val_t val; + +/* Initialize key to a pid/uprid that cannot be found. */ + key.pid =0 ; + key.uprid =0 ; + +/* Loop over all entries. */ +while (dt_bpf_map_next_key (fd, &key, &nxt) ==0 ) { +memcpy (&key, &nxt,sizeof (usdt_prids_map_key_t)); + +if (dt_bpf_map_lookup (fd, &key, &val) ==-1 ) +return dt_set_errno (dtp,EDT_BPF ); + +/* Check if the process is still running. */ +if (!Pexists (key.pid)) { +dt_bpf_map_delete (fd, &key);// FIXME: bpf_map_next_key() iteration restarts each time we delete an elem!!! +continue ; + } + +/* +* FIXME. There might be another case, where the process +* is still running, but some of its USDT probes are gone? +* So maybe we have to check for the existence of one of +* dtrace_probedesc_t *pdp = dtp->dt_probes[val.prid]->desc; +* char *prv = ...pdp->prv minus the numerial part; +* +* /run/dtrace/probes/$pid/$pdp->prv/$pdp->mod/$pdp->fun/$pdp->prb +* /run/dtrace/stash/dof-pid/$pid/0/parsed/$prv:$pdp->mod:$pdp->fun:$pdp->prb +* /run/dtrace/stash/dof-pid/$pid/.../parsed/$prv:$pdp->mod:$pdp->fun:$pdp->prb +*/ + } + +return 0 ; +} + +/* +* Grow the string table map. It includes the string table (which might +* grow due to new USDT probes). It also includes the read-only data and +* the block of zeros, but these remain fixed. +* +* FIXME Is there a danger of the BPF map update colliding with map reads? +*/ +static int +grow_strtab (dtrace_hdl_t *dtp) +{ +size_t sz = dtp->dt_zerooffset + dtp->dt_zerosize; +char *strtab; +uint8_t *buf, *end; +size_t strsize = dtp->dt_options[DTRACEOPT_STRSIZE ]; +uint32_t key =0 ; +int rc, err; + + strtab =dt_zalloc (dtp, sz); +#if 0 +// FIXME do something +if (strtab ==NULL ) +return dt_set_errno (dtp,EDT_NOMEM ); +#endif + +/* Copy the string table data. */ +dt_strtab_write (dtp->dt_ccstab, (dt_strtab_write_f *)dt_strtab_copystr, strtab); + +/* Loop over the string table and truncate strings that are too long. */ + buf = (uint8_t *)strtab; + end = buf + dtp->dt_strlen; +while (buf < end) { +uint_t len =strlen ((char *)buf); + +if (len > strsize) + buf[strsize] ='\0' ; + + buf += len +1 ; + } + +/* Copy the read-only data. */ +dt_rodata_write (dtp->dt_rodata, (dt_rodata_copy_f *)dt_rodata_copy, strtab + dtp->dt_rooffset); + + rc =dt_bpf_map_update (dtp->dt_strtabmap_fd, &key, strtab); + err = errno; +dt_free (dtp, strtab); + +// FIXME do something +if (rc ==-1 ) { +strerror (err); +return -1 ; +// return dt_bpf_error(dtp, "cannot update BPF map 'strtab': %s\n", strerror(err)); + } + +return 0 ; +} + +/* +* Update the uprobe provider. +*/ +static void update_uprobe (dtrace_hdl_t *dtp,void *datap) +{ +dt_probe_t *prp; +dt_probe_t *prp_next; +int i, prid = dtp->dt_probe_id; +uint_t old_strlen = dtp->dt_strlen; +dt_pcb_t pcb; + +/* Clear stale pids. */ +purge_BPFmap (dtp); + +/* Update dt_probes[] and dt_enablings. */ +/* +* pcb is only used inside of dt_pid_error() to get: +* pcb->pcb_region +* pcb->pcb_filetag +* pcb->pcb_fileptr +* While pcb cannot be NULL, these other things apparently can be. +*/ +memset (&pcb,0 ,sizeof (dt_pcb_t)); +for (i =0 ; i < dtp->dt_stmt_nextid; i++) +dt_pid_create_probes (&dtp->dt_stmts[i]->dtsd_ecbdesc->dted_probe, dtp, &pcb,1 ); + +while (prid < dtp->dt_probe_id) { +dt_bpf_probe_t pinfo; +const dtrace_probedesc_t *pdp = dtp->dt_probes[prid]->desc; +int fd = dtp->dt_probesmap_fd; + +dt_probe_enable (dtp, dtp->dt_probes[prid]); + + pinfo.prv =dt_strtab_index (dtp->dt_ccstab, pdp->prv); + pinfo.mod =dt_strtab_index (dtp->dt_ccstab, pdp->mod); + pinfo.fun =dt_strtab_index (dtp->dt_ccstab, pdp->fun); + pinfo.prb =dt_strtab_index (dtp->dt_ccstab, pdp->prb); + +if (dt_bpf_map_update (fd, &pdp->id, &pinfo) ==-1 ) +assert (0 );// FIXME do something here + + prid++; + } + +/* Grow the strtab if it has gotten bigger. */ + dtp->dt_strlen =dt_strtab_size (dtp->dt_ccstab); + +if (dtp->dt_strlen > dtp->dt_strmax) +assert (0 );// FIXME handle this more gracefully +if (dtp->dt_strlen > old_strlen) +grow_strtab (dtp); + +/* Review enablings. */ +for (prp =dt_list_next (&dtp->dt_enablings); prp !=NULL ; prp = prp_next) { +pid_t pid; +list_probe_t *pup; + + prp_next =dt_list_next (prp); + +/* Make sure it is an overlying USDT probe. */ +if (prp->prov->impl != &dt_usdt) +continue ; + +/* FIXME passing in NULL pcb and dpr wreaks havoc on error reporting? */ +/* +* Nick writes: +* This is a general problem with running compiler-adjacent things outside +* compile time. I think we should adjust dt_pid_error() so that it works +* with NULL pcb and dpr at once, probably by using the code path for +* pcb != NULL and augmenting it so that it passes in NULL for the region and +* filename args and 0 for the lineno if pcb is NULL. (dt_set_errmsg can +* already handle this case.) +*/ + pid =dt_pid_get_pid (prp->desc, dtp,NULL ,NULL ); + +if (!Pexists (pid)) { +/* Remove from enablings. */ +dt_list_delete (&dtp->dt_enablings, prp); + +/* Make it evident from the probe that it is not in enablings. */ + ((dt_list_t *)prp)->dl_prev =NULL ; + ((dt_list_t *)prp)->dl_next =NULL ; + +/* Free up its list of underlying probes. */ +while ((pup =dt_list_next (prp->prv_data)) !=NULL ) { +dt_list_delete (prp->prv_data, pup); +dt_free (dtp, pup); + } +dt_free (dtp, prp->prv_data); + prp->prv_data =NULL ; + +/* Free up BPF "probes" map entry. */ +dt_bpf_map_delete (dtp->dt_probesmap_fd, &prp->desc->id); + +continue ; + } + +for (pup = prp->prv_data; pup !=NULL ; pup =dt_list_next (pup)) { +dt_probe_t *uprp = pup->probe; +long long mask =0 , bit =1 ; +usdt_prids_map_key_t key; +usdt_prids_map_val_t val, oval; +dt_uprobe_t *upp = uprp->prv_data; + +/* +* For is-enabled probes, the bit mask does not matter. +* It is possible that we have this underlying probe due to +* an overlying pid-offset probe and that we will not know +* until later, when some new pid is created, that we also +* have an overlying USDT is-enabled probe, but missing this +* optimization opportunity is okay. +*/ +if (uprp->prov->impl == &dt_uprobe && !(upp->flags &PP_IS_ENABLED )) { +int n; + +for (n =0 ; n < dtp->dt_stmt_nextid; n++) { +if (dt_gmatch (prp->desc->prv, dtp->dt_stmts[n]->dtsd_ecbdesc->dted_probe.prv) && +dt_gmatch (prp->desc->mod, dtp->dt_stmts[n]->dtsd_ecbdesc->dted_probe.mod) && +dt_gmatch (prp->desc->fun, dtp->dt_stmts[n]->dtsd_ecbdesc->dted_probe.fun) && +dt_gmatch (prp->desc->prb, dtp->dt_stmts[n]->dtsd_ecbdesc->dted_probe.prb)) + mask |= bit; + + bit <<=1 ; + } + } + + key.pid = pid; + key.uprid = uprp->desc->id; + + val.prid = prp->desc->id; + val.mask = mask; + +/* linux/bpf.h says error is -1, but it could be -2 */ +if (dt_bpf_map_lookup (dtp->dt_usdt_pridsmap_fd, &key, &oval) <0 ) { +/* +* Set the map entry. +*/ +// FIXME Check return value, but how should errors be handled? +dt_bpf_map_update (dtp->dt_usdt_pridsmap_fd, &key, &val); + }else if (val.prid != oval.prid || val.mask != oval.mask) { +/* +* This can happen when two overlying probes map to the same underlying probe for the same pid. +* E.g., pid:::entry and pid:::0, or pid:::$offset and usdt:::. +*/ + }else { +/* +* Nothing to do, it already is in the map. +*/ + } + } + } +}/* * Look up or create an underlying (real) probe, corresponding directly to a @@ -782,6 +1047,7 @@ dt_provimpl_t dt_uprobe = { .probe_info = &probe_info, .detach = &detach, .probe_destroy = &probe_destroy_underlying, + .update = &update_uprobe, };/* libdtrace/dt_work.c +2
-0@@ -373,6 +373,8 @@ dtrace_work(dtrace_hdl_t *dtp, FILE *fp, dtrace_consume_probe_f *pfunc,dtrace_workstatus_t rval;int gen; +dt_uprobe.update (dtp,NULL ); +switch (dtrace_status (dtp)) {case DTRACE_STATUS_EXITED :case DTRACE_STATUS_STOPPED :Signature · 1 line
2.43.5
PATCH v2 9/19 Use usdt_prids map to call clauses conditionally for USDT probes
In reply to [email protected]From: Eugene Loh <[email protected]>
This version supports only up to 64 clauses for an underlying probe, but it can be extended to more clauses.
Signed-off-by Eugene Loh <[email protected]>
--- libdtrace/dt_prov_uprobe.c | 159 +++++++++++++++++++++++++++---------- 1 file changed, 116 insertions(+), 43 deletions(-)
libdtrace/dt_prov_uprobe.c +116 -43
@@ -681,11 +681,16 @@ static void enable_usdt(dtrace_hdl_t *dtp, dt_probe_t *prp)*/ static int trampoline (dt_pcb_t *pcb,uint_t exitlbl) { +dtrace_hdl_t *dtp = pcb->pcb_hdl;dt_irlist_t *dlp = &pcb->pcb_ir;const dt_probe_t *uprp = pcb->pcb_probe;const dt_uprobe_t *upp = uprp->prv_data;const list_probe_t *pop;uint_t lbl_exit = pcb->pcb_exitlbl; +dt_ident_t *usdt_prids =dt_dlib_get_map (dtp,"usdt_prids" ); +int n; + +assert (usdt_prids !=NULL );dt_cg_tramp_prologue (pcb);// call this only once... is PRID set/relocated correctly?
@@ -697,14 +702,17 @@ static int trampoline(dt_pcb_t *pcb, uint_t exitlbl)dt_cg_tramp_copy_regs (pcb);// call this only once for all clauses? /* -* Loop over overlying probes, calling clauses for those that match: +* pid probes. +* +* Loop over overlying pid probes, calling clauses for those that match: * -* for overlying probes (that match except possibly for pid) +* for overlying pid probes (that match except possibly for pid) * if (pid matches) { * dctx->mst->prid = PRID1; * < any number of clause calls > * } */ +for (pop =dt_list_next (&upp->probes); pop !=NULL ; pop =dt_list_next (pop)) {const dt_probe_t *prp = pop->probe;
@@ -712,6 +720,9 @@ static int trampoline(dt_pcb_t *pcb, uint_t exitlbl)pid_t pid;dt_ident_t *idp; +if (prp->prov->impl != &dt_pid) +continue ; + pid =dt_pid_get_pid (prp->desc, pcb->pcb_hdl, pcb,NULL );assert (pid !=-1 );
@@ -743,6 +754,86 @@ static int trampoline(dt_pcb_t *pcb, uint_t exitlbl) BPF_NOP()); } +/* +* USDT +*/ + +/* In some cases, we know there are no USDT probes. */ // FIXME: add more checks +if (upp->flags &PP_IS_RETURN ) + goto out; + +dt_cg_tramp_copy_args_from_regs (pcb,0 ); + +/* +* Retrieve the PID of the process that caused the probe to fire. +*/ +emit (dlp,BPF_CALL_HELPER (BPF_FUNC_get_current_pid_tgid)); +emit (dlp,BPF_ALU64_IMM (BPF_RSH ,BPF_REG_0 ,32 )); + +/* +* Look up in the BPF 'usdt_prids' map. Space for the look-up key +* will be used on the BPF stack: +* +* offset value +* +* -sizeof(usdt_prids_map_key_t) pid (in %r0) +* +* -sizeof(usdt_prids_map_key_t) + sizeof(pid_t) +* == +* -sizeof(dtrace_id_t) underlying-probe prid +*/ +emit (dlp,BPF_STORE (BPF_W ,BPF_REG_9 , (int )(-sizeof (usdt_prids_map_key_t)),BPF_REG_0 )); +emit (dlp,BPF_STORE_IMM (BPF_W ,BPF_REG_9 , (int )(-sizeof (dtrace_id_t)), uprp->desc->id)); +dt_cg_xsetx (dlp, usdt_prids,DT_LBL_NONE ,BPF_REG_1 , usdt_prids->di_id); +emit (dlp,BPF_MOV_REG (BPF_REG_2 ,BPF_REG_9 )); +emit (dlp,BPF_ALU64_IMM (BPF_ADD ,BPF_REG_2 , (int )(-sizeof (usdt_prids_map_key_t)))); +emit (dlp,BPF_CALL_HELPER (BPF_FUNC_map_lookup_elem)); +emit (dlp,BPF_BRANCH_IMM (BPF_JEQ ,BPF_REG_0 ,0 , lbl_exit)); + +/* Read the PRID from the table lookup and store to mst->prid. */ +emit (dlp,BPF_LOAD (BPF_W ,BPF_REG_1 ,BPF_REG_0 ,0 )); +emit (dlp,BPF_STORE (BPF_W ,BPF_REG_7 ,DMST_PRID ,BPF_REG_1 )); + +/* Read the bit mask from the table lookup in %r6. */ // FIXME someday, extend this past 64 bits +emit (dlp,BPF_LOAD (BPF_DW ,BPF_REG_6 ,BPF_REG_0 , offsetof(usdt_prids_map_val_t , mask))); + +/* +* Hold the bit mask in %r6 between clause calls. +*/ +for (n =0 ; n < dtp->dt_stmt_nextid; n++) { +dt_ident_t *idp = dtp->dt_stmts[n]->dtsd_clause; +uint_t lbl_next =dt_irlist_label (dlp); + +/* If the lowest %r6 bit is 0, skip over this clause. */ +emit (dlp,BPF_MOV_REG (BPF_REG_1 ,BPF_REG_6 )); +emit (dlp,BPF_ALU64_IMM (BPF_AND ,BPF_REG_1 ,1 )); +emit (dlp,BPF_BRANCH_IMM (BPF_JEQ ,BPF_REG_1 ,0 , lbl_next)); + +/* +* if (*dctx.act != act) // ldw %r0, [%r9 + DCTX_ACT] +* goto exit; // ldw %r0, [%r0 + 0] +* // jne %r0, act, lbl_exit +*/ +emit (dlp,BPF_LOAD (BPF_DW ,BPF_REG_0 ,BPF_REG_9 ,DCTX_ACT )); +emit (dlp,BPF_LOAD (BPF_W ,BPF_REG_0 ,BPF_REG_0 ,0 )); +emit (dlp,BPF_BRANCH_IMM (BPF_JNE ,BPF_REG_0 ,DT_ACTIVITY_ACTIVE , lbl_exit)); + +/* dctx.mst->scratch_top = 8 */ +emit (dlp,BPF_STORE_IMM (BPF_W ,BPF_REG_7 ,DMST_SCRATCH_TOP ,8 )); + +/* Call clause. */ +emit (dlp,BPF_MOV_REG (BPF_REG_1 ,BPF_REG_9 )); +emite (dlp,BPF_CALL_FUNC (idp->di_id), idp); + +/* Finished this clause. */ +emitl (dlp, lbl_next, +BPF_NOP ()); + +/* Right-shift %r6. */ +emit (dlp,BPF_ALU64_IMM (BPF_RSH ,BPF_REG_6 ,1 )); + } + +out:dt_cg_tramp_return (pcb);return 0 ;
@@ -788,10 +879,9 @@ static int trampoline_is_enabled(dt_pcb_t *pcb, uint_t exitlbl) {dt_irlist_t *dlp = &pcb->pcb_ir;const dt_probe_t *uprp = pcb->pcb_probe; -const dt_uprobe_t *upp = uprp->prv_data; -const list_probe_t *pop; -uint_t lbl_assign =dt_irlist_label (dlp); -uint_t lbl_exit = pcb->pcb_exitlbl; +dt_ident_t *usdt_prids =dt_dlib_get_map (pcb->pcb_hdl,"usdt_prids" ); + +assert (usdt_prids !=NULL );dt_cg_tramp_prologue (pcb);
@@ -800,7 +890,6 @@ static int trampoline_is_enabled(dt_pcb_t *pcb, uint_t exitlbl)* // (%r7 = dctx->mst) * // (%r8 = dctx->ctx) */ -dt_cg_tramp_copy_regs (pcb);/*
@@ -818,46 +907,30 @@ static int trampoline_is_enabled(dt_pcb_t *pcb, uint_t exitlbl)emit (dlp,BPF_ALU64_IMM (BPF_RSH ,BPF_REG_0 ,32 ));/* -* Generate a composite conditional clause, as above, except that rather -* than emitting call_clauses, we emit copyouts instead, using -* copyout_val() above: +* Look up in the BPF 'usdt_prids' map. Space for the look-up key +* will be used on the BPF stack: * -* if (pid == PID1) { -* goto assign; -* } else if (pid == PID2) { -* goto assign; -* } else if (pid == ...) { -* goto assign; -* } -* goto exit; -* assign: -* *arg0 = 1; -* goto exit; +* offset value +* +* -sizeof(usdt_prids_map_key_t) pid (in %r0) * -* It is valid and safe to use %r0 to hold the pid value because there -* are no assignments to %r0 possible in between the conditional -* statements. +* -sizeof(usdt_prids_map_key_t) + sizeof(pid_t) +* == +* -sizeof(dtrace_id_t) underlying-probe prid */ -for (pop =dt_list_next (&upp->probes); pop !=NULL ; - pop =dt_list_next (pop)) { -const dt_probe_t *prp = pop->probe; -pid_t pid; -dt_ident_t *idp; - - pid =dt_pid_get_pid (prp->desc, pcb->pcb_hdl, pcb,NULL ); -assert (pid !=-1 ); - - idp =dt_dlib_add_probe_var (pcb->pcb_hdl, prp); -assert (idp !=NULL ); +emit (dlp,BPF_STORE (BPF_W ,BPF_REG_9 , (int )(-sizeof (usdt_prids_map_key_t)),BPF_REG_0 )); +emit (dlp,BPF_STORE_IMM (BPF_W ,BPF_REG_9 , (int )(-sizeof (dtrace_id_t)), uprp->desc->id)); +dt_cg_xsetx (dlp, usdt_prids,DT_LBL_NONE ,BPF_REG_1 , usdt_prids->di_id); +emit (dlp,BPF_MOV_REG (BPF_REG_2 ,BPF_REG_9 )); +emit (dlp,BPF_ALU64_IMM (BPF_ADD ,BPF_REG_2 , (int )(-sizeof (usdt_prids_map_key_t)))); +emit (dlp,BPF_CALL_HELPER (BPF_FUNC_map_lookup_elem)); +emit (dlp,BPF_BRANCH_IMM (BPF_JEQ ,BPF_REG_0 ,0 , pcb->pcb_exitlbl)); -/* -* Check whether this pid-provider probe serves the current -* process, and copy out a 1 into arg 0 if so. -*/ -emit (dlp,BPF_BRANCH_IMM (BPF_JEQ ,BPF_REG_0 , pid, lbl_assign)); - } -emit (dlp,BPF_JUMP (lbl_exit)); -copyout_val (pcb, lbl_assign,1 ,0 ); +/* +* If we succeeded, then we use copyout_val() above to assign: +* *arg0 = 1; +*/ +copyout_val (pcb,DT_LBL_NONE ,1 ,0 );dt_cg_tramp_return (pcb);
Signature · 1 line
2.43.5