diff --git a/backport-Use-the-right-dev_t-decoding-for-diskerror-handler.patch b/backport-Use-the-right-dev_t-decoding-for-diskerror-handler.patch new file mode 100644 index 0000000000000000000000000000000000000000..9b5cb3dc85db5189d94b7e0b9b139c73fff25fe4 --- /dev/null +++ b/backport-Use-the-right-dev_t-decoding-for-diskerror-handler.patch @@ -0,0 +1,98 @@ +From 048ee0406fcf82045ececf43cb08845307030afd Mon Sep 17 00:00:00 2001 +From: scarlet-storm <12461256+scarlet-storm@users.noreply.github.com> +Date: Mon, 3 Mar 2025 15:16:57 +0530 +Subject: [PATCH] Use the right dev_t decoding for diskerror handler + +There is a dev_t type defined by libc for makedev etc, which +is exposed by the kernel headers & also a dev_t type defined in the +internal kernel headers. +Both have simliar functionality, but different encoding. +Copy the MAJOR & MINOR macros from linux/kdev_t.h for proper +decoding of the trace events. +Fixes #71 + +Signed-off-by: scarlet-storm +<12461256+scarlet-storm@users.noreply.github.com> +Signed-off-by: Mauro Carvalho Chehab +--- + ras-diskerror-handler.c | 10 +++------- + ras-diskerror-handler.h | 26 ++++++++++++++++++++++++++ + 2 files changed, 29 insertions(+), 7 deletions(-) + +diff --git a/ras-diskerror-handler.c b/ras-diskerror-handler.c +index 751aee2..b95eae3 100644 +--- a/ras-diskerror-handler.c ++++ b/ras-diskerror-handler.c +@@ -18,12 +18,8 @@ + #define _GNU_SOURCE + #include + #include +-#ifndef __dev_t_defined +-#include +-#endif /* __dev_t_defined */ + #include + #include +-#include + #include + #include "ras-diskerror-handler.h" + #include "ras-record.h" +@@ -70,7 +66,7 @@ int ras_diskerror_event_handler(struct trace_seq *s, + time_t now; + struct tm *tm; + struct diskerror_event ev; +- dev_t dev; ++ uint32_t dev; + + /* + * Newer kernels (3.10-rc1 or upper) provide an uptime clock. +@@ -94,8 +90,8 @@ int ras_diskerror_event_handler(struct trace_seq *s, + + if (tep_get_field_val(s, event, "dev", record, &val, 1) < 0) + return -1; +- dev = (dev_t)val; +- if (asprintf(&ev.dev, "%u:%u", major(dev), minor(dev)) < 0) ++ dev = (uint32_t)val; ++ if (asprintf(&ev.dev, "%u:%u", MAJOR(dev), MINOR(dev)) < 0) + return -1; + trace_seq_printf(s, "%s ", ev.dev); + +diff --git a/ras-diskerror-handler.h b/ras-diskerror-handler.h +index ba4c1ab..ab53a23 100644 +--- a/ras-diskerror-handler.h ++++ b/ras-diskerror-handler.h +@@ -22,6 +22,32 @@ + #include "ras-events.h" + #include + ++/* ++ * Defined in linux/kdev_t.h ++ * Since the encoding with 20 bit mask is not defined in the linux-libc headers, ++ * redefine it here ++ * format: ++ * field:unsigned short common_type; offset:0; size:2; signed:0; ++ * field:unsigned char common_flags; offset:2; size:1; signed:0; ++ * field:unsigned char common_preempt_count; offset:3; size:1; signed:0; ++ * field:int common_pid; offset:4; size:4; signed:1; ++ * ++ * field:dev_t dev; offset:8; size:4; signed:0; ++ * field:sector_t sector; offset:16; size:8; signed:0; ++ * field:unsigned int nr_sector; offset:24; size:4; signed:0; ++ * field:int error; offset:28; size:4; signed:1; ++ * field:unsigned short ioprio; offset:32; size:2; signed:0; ++ * field:char rwbs[8]; offset:34; size:8; signed:0; ++ * field:__data_loc char[] cmd; offset:44; size:4; signed:0; ++ * ++ * print fmt: "%d,%d %s (%s) %llu + %u %s,%u,%u [%d]", ((unsigned int) ((REC->dev) >> 20)), ((unsigned int) ((REC->dev) & ((1U << 20) - 1))), REC->rwbs, __get_str(cmd), (unsigned long long)REC->sector, REC->nr_sector, __print_symbolic((((REC->ioprio) >> 13) & (8 - 1)), { IOPRIO_CLASS_NONE, "none" }, { IOPRIO_CLASS_RT, "rt" }, { IOPRIO_CLASS_BE, "be" }, { IOPRIO_CLASS_IDLE, "idle" }, { IOPRIO_CLASS_INVALID, "invalid"}), (((REC->ioprio) >> 3) & ((1 << 10) - 1)), ((REC->ioprio) & ((1 << 3) - 1)), REC->error ++ */ ++#define MINORBITS 20 ++#define MINORMASK ((1U << MINORBITS) - 1) ++ ++#define MAJOR(dev) ((unsigned int) ((dev) >> MINORBITS)) ++#define MINOR(dev) ((unsigned int) ((dev) & MINORMASK)) ++#define MKDEV(ma,mi) (((ma) << MINORBITS) | (mi)) + int ras_diskerror_event_handler(struct trace_seq *s, + struct tep_record *record, + struct tep_event *event, void *context); +-- +2.43.0 + diff --git a/rasdaemon.spec b/rasdaemon.spec index e653ad0f3888c8065b38971cbffced07484b584a..bbec01e2764943c9938a5a74050cabd69324163f 100644 --- a/rasdaemon.spec +++ b/rasdaemon.spec @@ -1,6 +1,6 @@ Name: rasdaemon Version: 0.8.0 -Release: 10 +Release: 11 License: GPLv2 Summary: Utility to get Platform Reliability, Availability and Serviceability (RAS) reports via the Kernel tracing events URL: https://github.com/mchehab/rasdaemon.git @@ -44,6 +44,7 @@ Patch9017: 0001-rasdaemon-Fix-some-compilation-alarms-in-ras-record..patch Patch9018: 0002-rasdaemon-Fix-few-compilation-warnings-in-non-standa.patch Patch9019: 0003-rasdaemon-Fix-some-static-check-warning.patch Patch9020: 0004-rasdaemon-Add-new-modules-supported-by-HiSilicon-com.patch +Patch9021: backport-Use-the-right-dev_t-decoding-for-diskerror-handler.patch %description The rasdaemon program is a daemon which monitors the platform @@ -95,6 +96,13 @@ fi /usr/bin/systemctl disable rasdaemon.service >/dev/null 2>&1 || : %changelog +* Tue Aug 12 2025 andy - 0.8.0-11 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:backport upstream patches + Use the right dev_t decoding for diskerror handler + * Mon Apr 28 2025 wangjiang - 0.8.0-10 - Type:bugfix - ID:NA