Consistently use fbt_excluded() on all architectures.
MFC after: 2 weeks
This commit is contained in:
parent
02315a6759
commit
8bb9b7f17a
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=309785
@ -95,16 +95,8 @@ fbt_provide_module_function(linker_file_t lf, int symindx,
|
||||
uint32_t *instr, *limit;
|
||||
int popm;
|
||||
|
||||
if (strncmp(name, "dtrace_", 7) == 0 &&
|
||||
strncmp(name, "dtrace_safe_", 12) != 0) {
|
||||
/*
|
||||
* Anything beginning with "dtrace_" may be called
|
||||
* from probe context unless it explicitly indicates
|
||||
* that it won't be called from probe context by
|
||||
* using the prefix "dtrace_safe_".
|
||||
*/
|
||||
if (fbt_excluded(name))
|
||||
return (0);
|
||||
}
|
||||
|
||||
instr = (uint32_t *)symval->value;
|
||||
limit = (uint32_t *)(symval->value + symval->size);
|
||||
|
@ -127,16 +127,8 @@ fbt_provide_module_function(linker_file_t lf, int symindx,
|
||||
return (0);
|
||||
#endif
|
||||
|
||||
if (strncmp(name, "dtrace_", 7) == 0 &&
|
||||
strncmp(name, "dtrace_safe_", 12) != 0) {
|
||||
/*
|
||||
* Anything beginning with "dtrace_" may be called
|
||||
* from probe context unless it explicitly indicates
|
||||
* that it won't be called from probe context by
|
||||
* using the prefix "dtrace_safe_".
|
||||
*/
|
||||
if (fbt_excluded(name) == 0)
|
||||
return (0);
|
||||
}
|
||||
|
||||
instr = (uint32_t *) symval->value;
|
||||
limit = (uint32_t *) (symval->value + symval->size);
|
||||
|
@ -158,21 +158,15 @@ fbt_provide_module_function(linker_file_t lf, int symindx,
|
||||
int size;
|
||||
uint8_t *instr, *limit;
|
||||
|
||||
if ((strncmp(name, "dtrace_", 7) == 0 &&
|
||||
strncmp(name, "dtrace_safe_", 12) != 0) ||
|
||||
strcmp(name, "trap_check") == 0) {
|
||||
/*
|
||||
* Anything beginning with "dtrace_" may be called
|
||||
* from probe context unless it explicitly indicates
|
||||
* that it won't be called from probe context by
|
||||
* using the prefix "dtrace_safe_".
|
||||
*
|
||||
* Additionally, we avoid instrumenting trap_check() to avoid
|
||||
* the possibility of generating a fault in probe context before
|
||||
* DTrace's fault handler is called.
|
||||
*/
|
||||
if (fbt_excluded(name))
|
||||
return (0);
|
||||
|
||||
/*
|
||||
* trap_check() is a wrapper for DTrace's fault handler, so we don't
|
||||
* want to be able to instrument it.
|
||||
*/
|
||||
if (strcmp(name, "trap_check") == 0)
|
||||
return (0);
|
||||
}
|
||||
|
||||
size = symval->size;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user