From 0820d8e399e81ff9f70cfc8d169f48596d7d3ed7 Mon Sep 17 00:00:00 2001 From: Mukesh Ojha Date: Sun, 27 Jun 2021 15:26:40 +0530 Subject: [PATCH] ANDROID: logbuf: Add new logbuf vendor hook to support pr_cont() Add new logbuf vendor hook android_vh_logbuf_pr_cont() to capture pr_cont logs. Bug: 199236943 Change-Id: I76b310fc9caac71b344b6cc25ea36f7f81cb7148 Signed-off-by: Mukesh Ojha (cherry picked from commit 01f2392e13dbdb17d7a22290fba48207059a7f5a) Signed-off-by: Yogesh Lal --- drivers/android/vendor_hooks.c | 1 + include/trace/hooks/logbuf.h | 4 ++++ kernel/printk/printk.c | 1 + 3 files changed, 6 insertions(+) diff --git a/drivers/android/vendor_hooks.c b/drivers/android/vendor_hooks.c index f4c7a1938511..003f1395a1ca 100644 --- a/drivers/android/vendor_hooks.c +++ b/drivers/android/vendor_hooks.c @@ -201,3 +201,4 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_set_cpus_allowed_ptr_locked); EXPORT_TRACEPOINT_SYMBOL_GPL(android_rvh_rto_next_cpu); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_em_dev_register_pd); EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_logbuf); +EXPORT_TRACEPOINT_SYMBOL_GPL(android_vh_logbuf_pr_cont); diff --git a/include/trace/hooks/logbuf.h b/include/trace/hooks/logbuf.h index a599bf8c2cbf..7af9122af8ad 100644 --- a/include/trace/hooks/logbuf.h +++ b/include/trace/hooks/logbuf.h @@ -17,6 +17,10 @@ struct printk_record; DECLARE_HOOK(android_vh_logbuf, TP_PROTO(struct printk_ringbuffer *rb, struct printk_record *r), TP_ARGS(rb, r)) + +DECLARE_HOOK(android_vh_logbuf_pr_cont, + TP_PROTO(struct printk_record *r, size_t text_len), + TP_ARGS(r, text_len)) #else #define trace_android_vh_logbuf(rb, r) #endif diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index aad43ad4369d..783b81550de3 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -2164,6 +2164,7 @@ int vprintk_store(int facility, int level, prb_commit(&e); } + trace_android_vh_logbuf_pr_cont(&r, text_len); ret = text_len; goto out; }