File _service:download_files:54b16303709670ba0ffcb0d... of Package drgn

Overview Repositories Revisions Requests Users Attributes Meta

File _service:download_files:54b16303709670ba0ffcb0d1a140b74eb22908a0.patch of Package drgn (Revision b3d5e71b9bf65cddd1776fb11916310a)

Currently displaying revision b3d5e71b9bf65cddd1776fb11916310a , Show latest

From 54b16303709670ba0ffcb0d1a140b74eb22908a0 Mon Sep 17 00:00:00 2001
From: Oleksandr Natalenko <oleksandr@natalenko.name>
Date: Tue, 25 Jul 2023 09:56:56 +0200
Subject: [PATCH] helpers: support `dmesg` with RHEL 7

RHEL 7 kernel still uses `struct log *` for a structured kernel log
instead of `struct printk_log *`, so lets try to support it.

Tested on:

* `3.10.0-229`
* `3.10.0-1160.80.1`
* `3.10.0-1160.83.1`

This should have no impact on existing supported cases.

Signed-off-by: Oleksandr Natalenko <oleksandr@natalenko.name>
---
 drgn/helpers/linux/printk.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/drgn/helpers/linux/printk.py b/drgn/helpers/linux/printk.py
index b35515c70..4e22db678 100644
--- a/drgn/helpers/linux/printk.py
+++ b/drgn/helpers/linux/printk.py
@@ -158,7 +158,14 @@ def add_record(current_id: int) -> None:
 
 
 def _get_printk_records_structured(prog: Program) -> List[PrintkRecord]:
-    printk_logp_type = prog.type("struct printk_log *")
+    try:
+        printk_logp_type = prog.type("struct printk_log *")
+    except LookupError:
+        # Before Linux kernel commit 62e32ac3505a ("printk: rename struct log
+        # to struct printk_log") (in v3.11), records were "struct log" instead
+        # of "struct printk_log". RHEL 7 kernel still uses old naming.
+        printk_logp_type = prog.type("struct log *")
+
     have_caller_id = printk_logp_type.type.has_member("caller_id")
     LOG_CONT = prog["LOG_CONT"].value_()

Places

File _service:download_files:54b16303709670ba0ffcb0d1a140b74eb22908a0.patch of Package drgn (Revision b3d5e71b9bf65cddd1776fb11916310a)

Places