Skip to contentSkip to conversation

ftrace: Remove the unused variant ftrace_update_time

PATCH NAK Minfei Huang 3 participants 4 messages Jul 26, 2015 – Jul 27, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 ftrace: Remove the unused variant ftrace_update_time

Since the patch "ftrace: remove daemon(cb7be3b)" remove the function ftraced, the variant ftrace_update_time never be used any more.

Remove the unused variant ftrace_update_time.

---
 kernel/trace/ftrace.c | 6 ------
 1 file changed, 6 deletions(-)
kernel/trace/ftrace.c +0 -6
index eb11011..c04dff9 100644
@@ -2761,7 +2761,6 @@ static void ftrace_shutdown_sysctl(void)
 	}
 }
 
-static cycle_t		ftrace_update_time;
 unsigned long		ftrace_update_tot_cnt;
 
 static inline int ops_traces_mod(struct ftrace_ops *ops)
@@ -2821,7 +2820,6 @@ static int ftrace_update_code(struct module *mod, struct ftrace_page *new_pgs)
 {
 	struct ftrace_page *pg;
 	struct dyn_ftrace *p;
-	cycle_t start, stop;
 	unsigned long update_cnt = 0;
 	unsigned long ref = 0;
 	bool test = false;
@@ -2847,8 +2845,6 @@ static int ftrace_update_code(struct module *mod, struct ftrace_page *new_pgs)
 		}
 	}
 
-	start = ftrace_now(raw_smp_processor_id());
-
 	for (pg = new_pgs; pg; pg = pg->next) {
 
 		for (i = 0; i < pg->index; i++) {
@@ -2889,8 +2885,6 @@ static int ftrace_update_code(struct module *mod, struct ftrace_page *new_pgs)
 		}
 	}
 
-	stop = ftrace_now(raw_smp_processor_id());
-	ftrace_update_time = stop - start;
 	ftrace_update_tot_cnt += update_cnt;
 
 	return 0;
Signature · 1 line
2.4.0
#1 lore raw

PATCH 2/2 ftrace: Make if condition correctly due to the operator order

The if condition will be always true, since the operator & has the high priority than operator ||.

Use () to quote them to make the if condition correctly.

---
 kernel/trace/ftrace.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/trace/ftrace.c +1 -1
index c04dff9..d9acc6a 100644
@@ -254,7 +254,7 @@ static ftrace_func_t ftrace_ops_get_list_func(struct ftrace_ops *ops)
 	 * If this is a dynamic ops or we force list func,
 	 * then it needs to call the list anyway.
 	 */
-	if (ops->flags & FTRACE_OPS_FL_DYNAMIC || FTRACE_FORCE_LIST_FUNC)
+	if (ops->flags & (FTRACE_OPS_FL_DYNAMIC || FTRACE_FORCE_LIST_FUNC))
 		return ftrace_ops_list_func;
 
 	return ftrace_ops_get_func(ops);
Signature · 1 line
2.4.0
#2 lore raw

Re: [PATCH 2/2] ftrace: Make if condition correctly due to the operator order

Quoted 26 lines · Minfei Huang

The if condition will be always true, since the operator & has the high priority than operator ||.

Use () to quote them to make the if condition correctly.

---
kernel/trace/ftrace.c | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)
kernel/trace/ftrace.c +1 -1
index c04dff9..d9acc6a 100644
@@ -254,7 +254,7 @@ static ftrace_func_t ftrace_ops_get_list_func(struct ftrace_ops *ops)
 	 * If this is a dynamic ops or we force list func,
 	 * then it needs to call the list anyway.
 	 */
-	if (ops->flags & FTRACE_OPS_FL_DYNAMIC || FTRACE_FORCE_LIST_FUNC)
+	if (ops->flags & (FTRACE_OPS_FL_DYNAMIC || FTRACE_FORCE_LIST_FUNC))
 		return ftrace_ops_list_func;
 
 	return ftrace_ops_get_func(ops);
Quoted 1 line

—

i think the original code is correct, while your change is wrong from logic. am i missing something ?
Thanks

#3 lore raw

Re: [PATCH 2/2] ftrace: Make if condition correctly due to the operator order

Quoted 25 lines · yalin wang
Quoted 25 lines · Minfei Huang

The if condition will be always true, since the operator & has the high priority than operator ||.

Use () to quote them to make the if condition correctly.

---
kernel/trace/ftrace.c | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)
kernel/trace/ftrace.c +1 -1
index c04dff9..d9acc6a 100644
@@ -254,7 +254,7 @@ static ftrace_func_t ftrace_ops_get_list_func(struct ftrace_ops *ops)
 	 * If this is a dynamic ops or we force list func,
 	 * then it needs to call the list anyway.
 	 */
-	if (ops->flags & FTRACE_OPS_FL_DYNAMIC || FTRACE_FORCE_LIST_FUNC)
+	if (ops->flags & (FTRACE_OPS_FL_DYNAMIC || FTRACE_FORCE_LIST_FUNC))
 		return ftrace_ops_list_func;
 
Quoted 6 lines
Quoted 2 lines
kernel/trace/ftrace.c +0 -0
 	return ftrace_ops_get_func(ops);

—

i think the original code is correct, while your change is wrong from logic. am i missing something ?
Thanks

Thanks for your correction.

Yes. The previous code matches the logic.

Nacked.

Thanks
Minfei