rpms/rasdaemon
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Add option to exclude old events from reports

Browse Source 
Resolves: RHEL-79325

Signed-off-by: Joel Savitz <jsavitz@redhat.com>
This commit is contained in:
Joel Savitz 2025-02-13 15:14:23 -05:00
parent 5d6b3c3241
commit 344acb5bf4
2 changed files with 276 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

267
bd27251e3d52f57be1e245dff1cf221e09c5686f.patch Normal file
View File

@ -0,0 +1,267 @@
commit bd27251e3d52f57be1e245dff1cf221e09c5686f
Author: Marcus Sundman <sundman@iki.fi>
Date: Thu Apr 20 18:17:17 2023 +0300
ras-mc-ctl: add option to exclude old events from reports
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
diff --git a/util/ras-mc-ctl.in b/util/ras-mc-ctl.in
index 5e120d9..712a105 100755
--- a/util/ras-mc-ctl.in
+++ b/util/ras-mc-ctl.in
@@ -97,6 +97,7 @@ Usage: $prog [OPTIONS...]
--summary Presents a summary of the logged errors.
--errors Shows the errors stored at the error database.
--error-count Shows the corrected and uncorrected error counts using sysfs.
+ --since=YYYY-MM-DD Only include events since the date YYYY-MM-DD.
--vendor-errors-summary <platform-id> Presents a summary of the vendor-specific logged errors.
--vendor-errors <platform-id> Shows the vendor-specific errors stored in the error database.
--vendor-errors <platform-id> <module-name> Shows the vendor-specific errors for a specific module stored in the error database.
@@ -177,6 +178,7 @@ sub parse_cmdline
$conf{opt}{error_count} = 0;
$conf{opt}{vendor_errors_summary} = 0;
$conf{opt}{vendor_errors} = 0;
+ $conf{opt}{since} = '';
$conf{opt}{vendor_platforms} = 0;
my $rref = \$conf{opt}{report};
@@ -198,6 +200,7 @@ sub parse_cmdline
"error-count" => \$conf{opt}{error_count},
"vendor-errors-summary" => \$conf{opt}{vendor_errors_summary},
"vendor-errors" => \$conf{opt}{vendor_errors},
+ "since=s" => \$conf{opt}{since},
"vendor-platforms" => \$conf{opt}{vendor_platforms},
);
@@ -209,6 +212,14 @@ sub parse_cmdline
log_error ("Only use --delay with --register-labels\n");
exit (1);
}
+
+ if ($conf{opt}{since}) {
+ if ($conf{opt}{since} !~ /^20\d\d-[01]\d-[0-3]\d/) {
+ log_error ("--since requires a date like yyyy-mm-dd where yyyy is the year, mm the month, and dd the day\n");
+ exit (1);
+ }
+ $conf{opt}{since} = " where timestamp>='$conf{opt}{since}'";
+ }
}
sub usage
@@ -1452,7 +1463,7 @@ sub summary
my $dbh = DBI->connect("dbi:SQLite:dbname=$dbname", "", "", {});
# Memory controller mc_event errors
- $query = "select err_type, label, mc, top_layer,middle_layer,lower_layer, count(*) from mc_event group by err_type, label, mc, top_layer, middle_layer, lower_layer";
+ $query = "select err_type, label, mc, top_layer,middle_layer,lower_layer, count(*) from mc_event$conf{opt}{since} group by err_type, label, mc, top_layer, middle_layer, lower_layer";
$query_handle = $dbh->prepare($query);
$query_handle->execute();
$query_handle->bind_columns(\($err_type, $label, $mc, $top, $mid, $low, $count));
@@ -1469,7 +1480,7 @@ sub summary
# PCIe AER aer_event errors
if ($has_aer == 1) {
- $query = "select err_type, err_msg, count(*) from aer_event group by err_type, err_msg";
+ $query = "select err_type, err_msg, count(*) from aer_event$conf{opt}{since} group by err_type, err_msg";
$query_handle = $dbh->prepare($query);
$query_handle->execute();
$query_handle->bind_columns(\($err_type, $msg, $count));
@@ -1487,7 +1498,7 @@ sub summary
# ARM processor arm_event errors
if ($has_arm == 1) {
- $query = "select mpidr, count(*) from arm_event group by mpidr";
+ $query = "select mpidr, count(*) from arm_event$conf{opt}{since} group by mpidr";
$query_handle = $dbh->prepare($query);
$query_handle->execute();
$query_handle->bind_columns(\($mpidr, $count));
@@ -1636,7 +1647,7 @@ sub summary
# extlog errors
if ($has_extlog == 1) {
- $query = "select etype, severity, count(*) from extlog_event group by etype, severity";
+ $query = "select etype, severity, count(*) from extlog_event$conf{opt}{since} group by etype, severity";
$query_handle = $dbh->prepare($query);
$query_handle->execute();
$query_handle->bind_columns(\($etype, $severity, $count));
@@ -1656,7 +1667,7 @@ sub summary
# devlink errors
if ($has_devlink == 1) {
- $query = "select dev_name, count(*) from devlink_event group by dev_name";
+ $query = "select dev_name, count(*) from devlink_event$conf{opt}{since} group by dev_name";
$query_handle = $dbh->prepare($query);
$query_handle->execute();
$query_handle->bind_columns(\($dev_name, $count));
@@ -1674,7 +1685,7 @@ sub summary
# Disk errors
if ($has_disk_errors == 1) {
- $query = "select dev, count(*) from disk_errors group by dev";
+ $query = "select dev, count(*) from disk_errors$conf{opt}{since} group by dev";
$query_handle = $dbh->prepare($query);
$query_handle->execute();
$query_handle->bind_columns(\($dev, $count));
@@ -1692,7 +1703,7 @@ sub summary
# Memory failure errors
if ($has_mem_failure == 1) {
- $query = "select action_result, count(*) from memory_failure_event group by action_result";
+ $query = "select action_result, count(*) from memory_failure_event$conf{opt}{since} group by action_result";
$query_handle = $dbh->prepare($query);
$query_handle->execute();
$query_handle->bind_columns(\($action_result, $count));
@@ -1710,7 +1721,7 @@ sub summary
# MCE mce_record errors
if ($has_mce == 1) {
- $query = "select error_msg, count(*) from mce_record group by error_msg";
+ $query = "select error_msg, count(*) from mce_record$conf{opt}{since} group by error_msg";
$query_handle = $dbh->prepare($query);
$query_handle->execute();
$query_handle->bind_columns(\($msg, $count));
@@ -1750,7 +1761,7 @@ sub errors
my $dbh = DBI->connect("dbi:SQLite:dbname=$dbname", "", "", {});
# Memory controller mc_event errors
- $query = "select id, timestamp, err_count, err_type, err_msg, label, mc, top_layer,middle_layer,lower_layer, address, grain, syndrome, driver_detail from mc_event order by id";
+ $query = "select id, timestamp, err_count, err_type, err_msg, label, mc, top_layer,middle_layer,lower_layer, address, grain, syndrome, driver_detail from mc_event$conf{opt}{since} order by id";
$query_handle = $dbh->prepare($query);
if (!$query_handle) {
log_error ("mc_event table missing from $dbname. Run 'rasdaemon --record'.\n");
@@ -1771,7 +1782,7 @@ sub errors
# PCIe AER aer_event errors
if ($has_aer == 1) {
- $query = "select id, timestamp, dev_name, err_type, err_msg from aer_event order by id";
+ $query = "select id, timestamp, dev_name, err_type, err_msg from aer_event$conf{opt}{since} order by id";
$query_handle = $dbh->prepare($query);
$query_handle->execute();
$query_handle->bind_columns(\($id, $time, $devname, $type, $msg));
@@ -1789,7 +1800,7 @@ sub errors
# ARM processor arm_event errors
if ($has_arm == 1) {
- $query = "select id, timestamp, error_count, affinity, mpidr, running_state, psci_state from arm_event order by id";
+ $query = "select id, timestamp, error_count, affinity, mpidr, running_state, psci_state from arm_event$conf{opt}{since} order by id";
$query_handle = $dbh->prepare($query);
$query_handle->execute();
$query_handle->bind_columns(\($id, $timestamp, $error_count, $affinity, $mpidr, $r_state, $psci_state));
@@ -2087,7 +2098,7 @@ sub errors
# Extlog errors
if ($has_extlog == 1) {
- $query = "select id, timestamp, etype, severity, address, fru_id, fru_text, cper_data from extlog_event order by id";
+ $query = "select id, timestamp, etype, severity, address, fru_id, fru_text, cper_data from extlog_event$conf{opt}{since} order by id";
$query_handle = $dbh->prepare($query);
$query_handle->execute();
$query_handle->bind_columns(\($id, $timestamp, $etype, $severity, $addr, $fru_id, $fru_text, $cper_data));
@@ -2114,7 +2125,7 @@ sub errors
# devlink errors
if ($has_devlink == 1) {
- $query = "select id, timestamp, bus_name, dev_name, driver_name, reporter_name, msg from devlink_event order by id";
+ $query = "select id, timestamp, bus_name, dev_name, driver_name, reporter_name, msg from devlink_event$conf{opt}{since} order by id";
$query_handle = $dbh->prepare($query);
$query_handle->execute();
$query_handle->bind_columns(\($id, $timestamp, $bus_name, $dev_name, $driver_name, $reporter_name, $msg));
@@ -2138,7 +2149,7 @@ sub errors
# Disk errors
if ($has_disk_errors == 1) {
- $query = "select id, timestamp, dev, sector, nr_sector, error, rwbs, cmd from disk_errors order by id";
+ $query = "select id, timestamp, dev, sector, nr_sector, error, rwbs, cmd from disk_errors$conf{opt}{since} order by id";
$query_handle = $dbh->prepare($query);
$query_handle->execute();
$query_handle->bind_columns(\($id, $timestamp, $dev, $sector, $nr_sector, $error, $rwbs, $cmd));
@@ -2163,7 +2174,7 @@ sub errors
# Memory failure errors
if ($has_mem_failure == 1) {
- $query = "select id, timestamp, pfn, page_type, action_result from memory_failure_event order by id";
+ $query = "select id, timestamp, pfn, page_type, action_result from memory_failure_event$conf{opt}{since} order by id";
$query_handle = $dbh->prepare($query);
$query_handle->execute();
$query_handle->bind_columns(\($id, $timestamp, $pfn, $page_type, $action_result));
@@ -2182,7 +2193,7 @@ sub errors
# MCE mce_record errors
if ($has_mce == 1) {
- $query = "select id, timestamp, mcgcap, mcgstatus, status, addr, misc, ip, tsc, walltime, cpu, cpuid, apicid, socketid, cs, bank, cpuvendor, bank_name, error_msg, mcgstatus_msg, mcistatus_msg, user_action, mc_location from mce_record order by id";
+ $query = "select id, timestamp, mcgcap, mcgstatus, status, addr, misc, ip, tsc, walltime, cpu, cpuid, apicid, socketid, cs, bank, cpuvendor, bank_name, error_msg, mcgstatus_msg, mcistatus_msg, user_action, mc_location from mce_record$conf{opt}{since} order by id";
$query_handle = $dbh->prepare($query);
$query_handle->execute();
$query_handle->bind_columns(\($id, $time, $mcgcap,$mcgstatus, $status, $addr, $misc, $ip, $tsc, $walltime, $cpu, $cpuid, $apicid, $socketid, $cs, $bank, $cpuvendor, $bank_name, $msg, $mcgstatus_msg, $mcistatus_msg, $user_action, $mc_location));
@@ -2251,7 +2262,7 @@ sub vendor_errors_summary
# HiSilicon KunPeng9xx errors
if ($platform_id eq HISILICON_KUNPENG_9XX) {
$found_platform = 1;
- $query = "select err_severity, module_id, count(*) from hip08_oem_type1_event_v2 group by err_severity, module_id";
+ $query = "select err_severity, module_id, count(*) from hip08_oem_type1_event_v2$conf{opt}{since} group by err_severity, module_id";
$query_handle = $dbh->prepare($query);
$query_handle->execute();
$query_handle->bind_columns(\($err_severity, $module_id, $count));
@@ -2269,7 +2280,7 @@ sub vendor_errors_summary
}
$query_handle->finish;
- $query = "select err_severity, module_id, count(*) from hip08_oem_type2_event_v2 group by err_severity, module_id";
+ $query = "select err_severity, module_id, count(*) from hip08_oem_type2_event_v2$conf{opt}{since} group by err_severity, module_id";
$query_handle = $dbh->prepare($query);
$query_handle->execute();
$query_handle->bind_columns(\($err_severity, $module_id, $count));
@@ -2287,7 +2298,7 @@ sub vendor_errors_summary
}
$query_handle->finish;
- $query = "select err_severity, sub_module_id, count(*) from hip08_pcie_local_event_v2 group by err_severity, sub_module_id";
+ $query = "select err_severity, sub_module_id, count(*) from hip08_pcie_local_event_v2$conf{opt}{since} group by err_severity, sub_module_id";
$query_handle = $dbh->prepare($query);
$query_handle->execute();
$query_handle->bind_columns(\($err_severity, $sub_module_id, $count));
@@ -2305,7 +2316,7 @@ sub vendor_errors_summary
}
$query_handle->finish;
- $query = "select err_severity, module_id, count(*) from hisi_common_section_v2 group by err_severity, module_id";
+ $query = "select err_severity, module_id, count(*) from hisi_common_section_v2$conf{opt}{since} group by err_severity, module_id";
$query_handle = $dbh->prepare($query);
$query_handle->execute();
$query_handle->bind_columns(\($err_severity, $module_id, $count));
@@ -2359,7 +2370,7 @@ sub vendor_errors
# HiSilicon KunPeng9xx errors
if ($platform_id eq HISILICON_KUNPENG_9XX) {
$found_platform = 1;
- $query = "select id, timestamp, version, soc_id, socket_id, nimbus_id, module_id, sub_module_id, err_severity, regs_dump from hip08_oem_type1_event_v2 order by id, module_id, err_severity";
+ $query = "select id, timestamp, version, soc_id, socket_id, nimbus_id, module_id, sub_module_id, err_severity, regs_dump from hip08_oem_type1_event_v2$conf{opt}{since} order by id, module_id, err_severity";
$query_handle = $dbh->prepare($query);
$query_handle->execute();
$query_handle->bind_columns(\($id, $timestamp, $version, $soc_id, $socket_id, $nimbus_id, $module_id, $sub_module_id, $err_severity, $regs));
@@ -2384,7 +2395,7 @@ sub vendor_errors
}
$query_handle->finish;
- $query = "select id, timestamp, version, soc_id, socket_id, nimbus_id, module_id, sub_module_id, err_severity, regs_dump from hip08_oem_type2_event_v2 order by id, module_id, err_severity";
+ $query = "select id, timestamp, version, soc_id, socket_id, nimbus_id, module_id, sub_module_id, err_severity, regs_dump from hip08_oem_type2_event_v2$conf{opt}{since} order by id, module_id, err_severity";
$query_handle = $dbh->prepare($query);
$query_handle->execute();
$query_handle->bind_columns(\($id, $timestamp, $version, $soc_id, $socket_id, $nimbus_id, $module_id, $sub_module_id, $err_severity, $regs));
@@ -2409,7 +2420,7 @@ sub vendor_errors
}
$query_handle->finish;
- $query = "select id, timestamp, version, soc_id, socket_id, nimbus_id, sub_module_id, core_id, port_id, err_severity, err_type, regs_dump from hip08_pcie_local_event_v2 order by id, sub_module_id, err_severity";
+ $query = "select id, timestamp, version, soc_id, socket_id, nimbus_id, sub_module_id, core_id, port_id, err_severity, err_type, regs_dump from hip08_pcie_local_event_v2$conf{opt}{since} order by id, sub_module_id, err_severity";
$query_handle = $dbh->prepare($query);
$query_handle->execute();
$query_handle->bind_columns(\($id, $timestamp, $version, $soc_id, $socket_id, $nimbus_id, $sub_module_id, $core_id, $port_id, $err_severity, $err_type, $regs));
@@ -2436,7 +2447,7 @@ sub vendor_errors
}
$query_handle->finish;
- $query = "select id, timestamp, version, soc_id, socket_id, totem_id, nimbus_id, sub_system_id, module_id, sub_module_id, core_id, port_id, err_type, pcie_info, err_severity, regs_dump from hisi_common_section_v2 order by id, module_id, err_severity";
+ $query = "select id, timestamp, version, soc_id, socket_id, totem_id, nimbus_id, sub_system_id, module_id, sub_module_id, core_id, port_id, err_type, pcie_info, err_severity, regs_dump from hisi_common_section_v2$conf{opt}{since} order by id, module_id, err_severity";
$query_handle = $dbh->prepare($query);
$query_handle->execute();
$query_handle->bind_columns(\($id, $timestamp, $version, $soc_id, $socket_id, $totem_id, $nimbus_id, $sub_system_id, $module_id, $sub_module_id, $core_id, $port_id, $err_type, $pcie_info, $err_severity, $regs));

10
rasdaemon.spec
View File

@ -1,6 +1,6 @@
Name: rasdaemon
Version: 0.8.0
Release: 7%{?dist}
Release: 8%{?dist}
Summary: Utility to receive RAS error tracings
Group: Applications/System
License: GPLv2
@ -79,6 +79,9 @@ Patch19: c38c14afc5d7bb6c8c52d1023271d755deb23008.patch
# rasdaemon: ras-mc-ctl: Add support for CXL memory module trace events
Patch20: aee13f74266382c64128bd7367a5eeb46277f490.patch
# ras-mc-ctl: add option to exclude old events from reports
Patch21: bd27251e3d52f57be1e245dff1cf221e09c5686f.patch
ExcludeArch: s390 s390x
BuildRequires: make
BuildRequires: gcc
@ -133,6 +136,7 @@ an utility for reporting current error counts from the EDAC sysfs files.
%patch18 -p1
%patch19 -p1
%patch20 -p1
%patch21 -p1
autoreconf -vfi
%build
@ -169,6 +173,10 @@ rm INSTALL %{buildroot}/usr/include/*.h
%config(noreplace) %{_sysconfdir}/sysconfig/%{name}
%changelog
* Thu Feb 13 2025 Joel Savitz <jsavitz@redhat.com> - 0.8.0-8
- Add option to exclude old events from reports
Resolves: RHEL-79325
* Tue Jan 14 2025 Joel Savitz <jsavitz@redhat.com> - 0.8.0-7
- Add support for CXL memory failure event logging
Resolves: RHEL-61233