Annotate vital static, dynamic information into meminspect for debugging Static: - prb_descs - prb_infos - prb - prb_data - printk_rb_static - printk_rb_dynamic
Dynamic: - new_descs - new_infos - new_log_buf meminspect uses a different API to annotate variables for inspection, and information about these variables is stored in the inspection table. Reviewed-by: Petr Mladek <[email protected]> Co-developed-by: Eugen Hristev <[email protected]> Signed-off-by: Eugen Hristev <[email protected]> Signed-off-by: Mukesh Ojha <[email protected]> --- kernel/printk/printk.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 0323149548f6..03216e7ef807 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -49,6 +49,7 @@ #include <linux/sched/debug.h> #include <linux/sched/task_stack.h> #include <linux/panic.h> +#include <linux/meminspect.h> #include <linux/uaccess.h> #include <asm/sections.h> @@ -518,10 +519,16 @@ static u32 log_buf_len = __LOG_BUF_LEN; #endif _DEFINE_PRINTKRB(printk_rb_static, CONFIG_LOG_BUF_SHIFT - PRB_AVGBITS, PRB_AVGBITS, &__log_buf[0]); +MEMINSPECT_NAMED_ENTRY(prb_descs, _printk_rb_static_descs); +MEMINSPECT_NAMED_ENTRY(prb_infos, _printk_rb_static_infos); +MEMINSPECT_NAMED_ENTRY(prb_data, __log_buf); +MEMINSPECT_SIMPLE_ENTRY(printk_rb_static); static struct printk_ringbuffer printk_rb_dynamic; +MEMINSPECT_SIMPLE_ENTRY(printk_rb_dynamic); struct printk_ringbuffer *prb = &printk_rb_static; +MEMINSPECT_SIMPLE_ENTRY(prb); /* * We cannot access per-CPU data (e.g. per-CPU flush irq_work) before @@ -1238,6 +1245,10 @@ void __init setup_log_buf(int early) local_irq_restore(flags); + meminspect_register_va(new_log_buf, new_log_buf_len); + meminspect_register_va(new_descs, new_descs_size); + meminspect_register_va(new_infos, new_infos_size); + /* * Copy any remaining messages that might have appeared from * NMI context after copying but before switching to the -- 2.50.1
