|
@@ -948,7 +948,7 @@ struct ftrace_func_probe {
|
|
|
};
|
|
|
|
|
|
enum {
|
|
|
- FTRACE_ENABLE_CALLS = (1 << 0),
|
|
|
+ FTRACE_UPDATE_CALLS = (1 << 0),
|
|
|
FTRACE_DISABLE_CALLS = (1 << 1),
|
|
|
FTRACE_UPDATE_TRACE_FUNC = (1 << 2),
|
|
|
FTRACE_START_FUNC_RET = (1 << 3),
|
|
@@ -1519,7 +1519,7 @@ int ftrace_text_reserved(void *start, void *end)
|
|
|
|
|
|
|
|
|
static int
|
|
|
-__ftrace_replace_code(struct dyn_ftrace *rec, int enable)
|
|
|
+__ftrace_replace_code(struct dyn_ftrace *rec, int update)
|
|
|
{
|
|
|
unsigned long ftrace_addr;
|
|
|
unsigned long flag = 0UL;
|
|
@@ -1527,17 +1527,17 @@ __ftrace_replace_code(struct dyn_ftrace *rec, int enable)
|
|
|
ftrace_addr = (unsigned long)FTRACE_ADDR;
|
|
|
|
|
|
/*
|
|
|
- * If we are enabling tracing:
|
|
|
+ * If we are updating calls:
|
|
|
*
|
|
|
* If the record has a ref count, then we need to enable it
|
|
|
* because someone is using it.
|
|
|
*
|
|
|
* Otherwise we make sure its disabled.
|
|
|
*
|
|
|
- * If we are disabling tracing, then disable all records that
|
|
|
+ * If we are disabling calls, then disable all records that
|
|
|
* are enabled.
|
|
|
*/
|
|
|
- if (enable && (rec->flags & ~FTRACE_FL_MASK))
|
|
|
+ if (update && (rec->flags & ~FTRACE_FL_MASK))
|
|
|
flag = FTRACE_FL_ENABLED;
|
|
|
|
|
|
/* If the state of this record hasn't changed, then do nothing */
|
|
@@ -1553,7 +1553,7 @@ __ftrace_replace_code(struct dyn_ftrace *rec, int enable)
|
|
|
return ftrace_make_nop(NULL, rec, ftrace_addr);
|
|
|
}
|
|
|
|
|
|
-static void ftrace_replace_code(int enable)
|
|
|
+static void ftrace_replace_code(int update)
|
|
|
{
|
|
|
struct dyn_ftrace *rec;
|
|
|
struct ftrace_page *pg;
|
|
@@ -1567,7 +1567,7 @@ static void ftrace_replace_code(int enable)
|
|
|
if (rec->flags & FTRACE_FL_FREE)
|
|
|
continue;
|
|
|
|
|
|
- failed = __ftrace_replace_code(rec, enable);
|
|
|
+ failed = __ftrace_replace_code(rec, update);
|
|
|
if (failed) {
|
|
|
ftrace_bug(failed, rec->ip);
|
|
|
/* Stop processing */
|
|
@@ -1623,7 +1623,7 @@ static int __ftrace_modify_code(void *data)
|
|
|
*/
|
|
|
function_trace_stop++;
|
|
|
|
|
|
- if (*command & FTRACE_ENABLE_CALLS)
|
|
|
+ if (*command & FTRACE_UPDATE_CALLS)
|
|
|
ftrace_replace_code(1);
|
|
|
else if (*command & FTRACE_DISABLE_CALLS)
|
|
|
ftrace_replace_code(0);
|
|
@@ -1691,7 +1691,7 @@ static int ftrace_startup(struct ftrace_ops *ops, int command)
|
|
|
return -ENODEV;
|
|
|
|
|
|
ftrace_start_up++;
|
|
|
- command |= FTRACE_ENABLE_CALLS;
|
|
|
+ command |= FTRACE_UPDATE_CALLS;
|
|
|
|
|
|
/* ops marked global share the filter hashes */
|
|
|
if (ops->flags & FTRACE_OPS_FL_GLOBAL) {
|
|
@@ -1743,8 +1743,7 @@ static void ftrace_shutdown(struct ftrace_ops *ops, int command)
|
|
|
if (ops != &global_ops || !global_start_up)
|
|
|
ops->flags &= ~FTRACE_OPS_FL_ENABLED;
|
|
|
|
|
|
- if (!ftrace_start_up)
|
|
|
- command |= FTRACE_DISABLE_CALLS;
|
|
|
+ command |= FTRACE_UPDATE_CALLS;
|
|
|
|
|
|
if (saved_ftrace_func != ftrace_trace_function) {
|
|
|
saved_ftrace_func = ftrace_trace_function;
|
|
@@ -1766,7 +1765,7 @@ static void ftrace_startup_sysctl(void)
|
|
|
saved_ftrace_func = NULL;
|
|
|
/* ftrace_start_up is true if we want ftrace running */
|
|
|
if (ftrace_start_up)
|
|
|
- ftrace_run_update_code(FTRACE_ENABLE_CALLS);
|
|
|
+ ftrace_run_update_code(FTRACE_UPDATE_CALLS);
|
|
|
}
|
|
|
|
|
|
static void ftrace_shutdown_sysctl(void)
|
|
@@ -2919,7 +2918,7 @@ ftrace_set_regex(struct ftrace_ops *ops, unsigned char *buf, int len,
|
|
|
ret = ftrace_hash_move(ops, enable, orig_hash, hash);
|
|
|
if (!ret && ops->flags & FTRACE_OPS_FL_ENABLED
|
|
|
&& ftrace_enabled)
|
|
|
- ftrace_run_update_code(FTRACE_ENABLE_CALLS);
|
|
|
+ ftrace_run_update_code(FTRACE_UPDATE_CALLS);
|
|
|
|
|
|
mutex_unlock(&ftrace_lock);
|
|
|
|
|
@@ -3107,7 +3106,7 @@ ftrace_regex_release(struct inode *inode, struct file *file)
|
|
|
orig_hash, iter->hash);
|
|
|
if (!ret && (iter->ops->flags & FTRACE_OPS_FL_ENABLED)
|
|
|
&& ftrace_enabled)
|
|
|
- ftrace_run_update_code(FTRACE_ENABLE_CALLS);
|
|
|
+ ftrace_run_update_code(FTRACE_UPDATE_CALLS);
|
|
|
|
|
|
mutex_unlock(&ftrace_lock);
|
|
|
}
|