diff --git a/block/blk-mq.c b/block/blk-mq.c index 08d5571d95e0..9fb88dac18e3 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c @@ -41,6 +41,8 @@ #include "blk-mq-sched.h" #include "blk-rq-qos.h" +#include + static DEFINE_PER_CPU(struct list_head, blk_cpu_done); static void blk_mq_poll_stats_start(struct request_queue *q); @@ -2483,6 +2485,7 @@ int blk_mq_alloc_rqs(struct blk_mq_tag_set *set, struct blk_mq_tags *tags, */ rq_size = round_up(sizeof(struct request) + set->cmd_size, cache_line_size()); + trace_android_vh_blk_alloc_rqs(&rq_size, set, tags); left = rq_size * depth; for (i = 0; i < depth; ) { diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index 7da0fbf06d9d..6cd8e36a08e3 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include @@ -239,6 +240,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_selinux_avc_insert); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_selinux_avc_node_delete); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_selinux_avc_node_replace); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_selinux_avc_lookup); +EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_blk_alloc_rqs); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_commit_creds); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_exit_creds); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_override_creds); diff --git a/include/trace/hooks/block.h b/include/trace/hooks/block.h new file mode 100644 index 000000000000..cccdf419ceb7 --- /dev/null +++ b/include/trace/hooks/block.h @@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#undef TRACE_SYSTEM +#define TRACE_SYSTEM block + +#define TRACE_INCLUDE_PATH trace/hooks + +#if !defined(_TRACE_HOOK_BLOCK_H) || defined(TRACE_HEADER_MULTI_READ) +#define _TRACE_HOOK_BLOCK_H + +#include +#include + +struct blk_mq_tag_set; +struct blk_mq_tags; + +DECLARE_HOOK(android_vh_blk_alloc_rqs, + TP_PROTO(size_t *rq_size, struct blk_mq_tag_set *set, + struct blk_mq_tags *tags), + TP_ARGS(rq_size, set, tags)); + +#endif /* _TRACE_HOOK_BLOCK_H */ + +/* This part must be outside protection */ +#include