From 41a4dab305d06a79a7212d6f83d2b403e2d7cd70 Mon Sep 17 00:00:00 2001 From: Shaleen Agrawal Date: Fri, 24 Sep 2021 11:28:26 -0700 Subject: [PATCH] ANDROID: Disable CFI on trace hooks Disable CFI on trace hooks, as this improves some lmbench microbenchmarks by as much as 12%. Bug: 200542217 Change-Id: I6ad1d12047c4e69743ff94cf0ea8f70f5023c7da Signed-off-by: Shaleen Agrawal --- include/linux/tracepoint.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h index 28031b15f878..0d3fd60c70bd 100644 --- a/include/linux/tracepoint.h +++ b/include/linux/tracepoint.h @@ -242,7 +242,7 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p) extern int __traceiter_##name(data_proto); \ DECLARE_STATIC_CALL(tp_func_##name, __traceiter_##name); \ extern struct tracepoint __tracepoint_##name; \ - static inline void trace_##name(proto) \ + static inline void __nocfi trace_##name(proto) \ { \ if (static_key_false(&__tracepoint_##name.key)) \ __DO_TRACE(name, \ @@ -306,7 +306,7 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p) .unregfunc = _unreg, \ .funcs = NULL }; \ __TRACEPOINT_ENTRY(_name); \ - int __traceiter_##_name(void *__data, proto) \ + int __nocfi __traceiter_##_name(void *__data, proto) \ { \ struct tracepoint_func *it_func_ptr; \ void *it_func; \