From 66db31d5225996a33ba3cd3e1bb3b9b171ee143f Mon Sep 17 00:00:00 2001
From: Yang Yang <yang.yang@vivo.com>
Date: Wed, 1 Jun 2022 15:15:12 +0800
Subject: [PATCH] ANDROID: vendor_hooks: add vendor hook in blk_mq_alloc_rqs()

This vendor hook let us attach oem data as payload to the request.
The payload is used by oem driver for debugging purpose.

Bug: 188749221
Change-Id: Iac598bd9cce836dac0efe9198a3e7752928f351a
Signed-off-by: Yang Yang <yang.yang@vivo.com>
(cherry picked from commit eecc725a8e0b7c10f3b37f7c80531dc859c7dc99)
---
 block/blk-mq.c                 |  3 +++
 drivers/android/vendor_hooks.c |  2 ++
 include/trace/hooks/block.h    | 24 ++++++++++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 100644 include/trace/hooks/block.h

diff --git a/block/blk-mq.c b/block/blk-mq.c
index 95993c4efa49..043629aba403 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 <trace/hooks/block.h>
+
 static DEFINE_PER_CPU(struct llist_head, blk_cpu_done);
 
 static void blk_mq_poll_stats_start(struct request_queue *q);
@@ -2460,6 +2462,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 5732b5b22543..ca02360e26a6 100644
--- a/drivers/android/vendor_hooks.c
+++ b/drivers/android/vendor_hooks.c
@@ -29,6 +29,7 @@
 #include <trace/hooks/preemptirq.h>
 #include <trace/hooks/ftrace_dump.h>
 #include <trace/hooks/ufshcd.h>
+#include <trace/hooks/block.h>
 #include <trace/hooks/cgroup.h>
 #include <trace/hooks/sys.h>
 #include <trace/hooks/iommu.h>
@@ -301,3 +302,4 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_force_compatible_post);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_regmap_update);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_dma_buf_release);
 EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_mmc_check_status);
+EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_blk_alloc_rqs);
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 <linux/tracepoint.h>
+#include <trace/hooks/vendor_hooks.h>
+
+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 <trace/define_trace.h>