commit 546cf713f667437fb6e283cc3dc090679eb47d08

Author: Subhendu Saha <subhends@akamai.com>

Date:   Tue Jan 12 03:29:55 2021 -0500

    Fix ras-mc-ctl script.

    When rasdaemon is compiled without enabling aer, mce, devlink,

    etc., those tables are not created in the database file. Then

    ras-mc-ctl script breaks trying to query data from non-existent

    tables.

    Signed-off-by: Subhendu Saha subhends@akamai.com

    Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

---

 util/ras-mc-ctl.in |  310 ++++++++++++++++++++++++++++-------------------------

 1 file changed, 168 insertions(+), 142 deletions(-)

--- a/util/ras-mc-ctl.in	2021-10-12 13:45:43.260646935 -0400

+++ b/util/ras-mc-ctl.in	2021-10-12 13:46:38.610158949 -0400

@@ -41,6 +41,16 @@ my $sysconfdir  = "@sysconfdir@";

 my $dmidecode   = find_prog ("dmidecode");

 my $modprobe    = find_prog ("modprobe")  or exit (1);

+my $has_aer = 0;

+my $has_arm = 0;

+my $has_extlog = 0;

+my $has_mce = 0;

+

+@WITH_AER_TRUE@$has_aer = 1;

+@WITH_ARM_TRUE@$has_arm = 1;

+@WITH_EXTLOG_TRUE@$has_extlog = 1;

+@WITH_MCE_TRUE@$has_mce = 1;

+

 my %conf        = ();

 my %bus         = ();

 my %dimm_size   = ();

@@ -1145,70 +1155,78 @@ sub summary

     $query_handle->finish;

     # PCIe AER aer_event errors

-    $query = "select err_type, err_msg, count(*) from aer_event group by err_type, err_msg";

-    $query_handle = $dbh->prepare($query);

-    $query_handle->execute();

-    $query_handle->bind_columns(\($err_type, $msg, $count));

-    $out = "";

-    while($query_handle->fetch()) {

-        $out .= "\t$count $err_type errors: $msg\n";

-    }

-    if ($out ne "") {

-        print "PCIe AER events summary:\n$out\n";

-    } else {

-        print "No PCIe AER errors.\n\n";

+    if ($has_aer == 1) {

+        $query = "select err_type, err_msg, count(*) from aer_event group by err_type, err_msg";

+        $query_handle = $dbh->prepare($query);

+        $query_handle->execute();

+        $query_handle->bind_columns(\($err_type, $msg, $count));

+        $out = "";

+        while($query_handle->fetch()) {

+            $out .= "\t$count $err_type errors: $msg\n";

+        }

+        if ($out ne "") {

+            print "PCIe AER events summary:\n$out\n";

+        } else {

+            print "No PCIe AER errors.\n\n";

+        }

+        $query_handle->finish;

     }

-    $query_handle->finish;

     # ARM processor arm_event errors

-    $query = "select affinity, mpidr, count(*) from arm_event group by affinity, mpidr";

-    $query_handle = $dbh->prepare($query);

-    $query_handle->execute();

-    $query_handle->bind_columns(\($affinity, $mpidr, $count));

-    $out = "";

-    while($query_handle->fetch()) {

-        $out .= "\t$count errors\n";

-    }

-    if ($out ne "") {

-        print "ARM processor events summary:\n$out\n";

-    } else {

-        print "No ARM processor errors.\n\n";

+    if ($has_arm == 1) {

+        $query = "select affinity, mpidr, count(*) from arm_event group by affinity, mpidr";

+        $query_handle = $dbh->prepare($query);

+        $query_handle->execute();

+        $query_handle->bind_columns(\($affinity, $mpidr, $count));

+        $out = "";

+        while($query_handle->fetch()) {

+            $out .= "\t$count errors\n";

+        }

+        if ($out ne "") {

+            print "ARM processor events summary:\n$out\n";

+        } else {

+            print "No ARM processor errors.\n\n";

+        }

+        $query_handle->finish;

     }

-    $query_handle->finish;

     # extlog errors

-    $query = "select etype, severity, count(*) from extlog_event group by etype, severity";

-    $query_handle = $dbh->prepare($query);

-    $query_handle->execute();

-    $query_handle->bind_columns(\($etype, $severity, $count));

-    $out = "";

-    while($query_handle->fetch()) {

-        $etype_string = get_extlog_type($etype);

-        $severity_string = get_extlog_severity($severity);

-        $out .= "\t$count $etype_string $severity_string errors\n";

-    }

-    if ($out ne "") {

-        print "Extlog records summary:\n$out";

-    } else {

-        print "No Extlog errors.\n";

+    if ($has_extlog == 1) {

+        $query = "select etype, severity, count(*) from extlog_event group by etype, severity";

+        $query_handle = $dbh->prepare($query);

+        $query_handle->execute();

+        $query_handle->bind_columns(\($etype, $severity, $count));

+        $out = "";

+        while($query_handle->fetch()) {

+            $etype_string = get_extlog_type($etype);

+            $severity_string = get_extlog_severity($severity);

+            $out .= "\t$count $etype_string $severity_string errors\n";

+        }

+        if ($out ne "") {

+            print "Extlog records summary:\n$out";

+        } else {

+            print "No Extlog errors.\n";

+        }

+        $query_handle->finish;

     }

-    $query_handle->finish;

     # MCE mce_record errors

-    $query = "select error_msg, count(*) from mce_record group by error_msg";

-    $query_handle = $dbh->prepare($query);

-    $query_handle->execute();

-    $query_handle->bind_columns(\($msg, $count));

-    $out = "";

-    while($query_handle->fetch()) {

-        $out .= "\t$count $msg errors\n";

-    }

-    if ($out ne "") {

-        print "MCE records summary:\n$out";

-    } else {

-        print "No MCE errors.\n";

+    if ($has_mce == 1) {

+        $query = "select error_msg, count(*) from mce_record group by error_msg";

+        $query_handle = $dbh->prepare($query);

+        $query_handle->execute();

+        $query_handle->bind_columns(\($msg, $count));

+        $out = "";

+        while($query_handle->fetch()) {

+            $out .= "\t$count $msg errors\n";

+        }

+        if ($out ne "") {

+            print "MCE records summary:\n$out";

+        } else {

+            print "No MCE errors.\n";

+        }

+        $query_handle->finish;

     }

-    $query_handle->finish;

     undef($dbh);

 }

@@ -1244,105 +1262,113 @@ sub errors

     $query_handle->finish;

     # PCIe AER aer_event errors

-    $query = "select id, timestamp, err_type, err_msg from aer_event order by id";

-    $query_handle = $dbh->prepare($query);

-    $query_handle->execute();

-    $query_handle->bind_columns(\($id, $time, $type, $msg));

-    $out = "";

-    while($query_handle->fetch()) {

-        $out .= "$id $time $type error: $msg\n";

-    }

-    if ($out ne "") {

-        print "PCIe AER events:\n$out\n";

-    } else {

-        print "No PCIe AER errors.\n\n";

+    if ($has_aer == 1) {

+        $query = "select id, timestamp, err_type, err_msg from aer_event order by id";

+        $query_handle = $dbh->prepare($query);

+        $query_handle->execute();

+        $query_handle->bind_columns(\($id, $time, $type, $msg));

+        $out = "";

+        while($query_handle->fetch()) {

+            $out .= "$id $time $type error: $msg\n";

+        }

+        if ($out ne "") {

+            print "PCIe AER events:\n$out\n";

+        } else {

+            print "No PCIe AER errors.\n\n";

+        }

+        $query_handle->finish;

     }

-    $query_handle->finish;

     # ARM processor arm_event errors

-    $query = "select id, timestamp, error_count, affinity, mpidr, running_state, psci_state from arm_event 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));

-    $out = "";

-    while($query_handle->fetch()) {

-        $out .= "$id $timestamp error: ";

-        $out .= "error_count=$error_count, " if ($error_count);

-        $out .= "affinity_level=$affinity, ";

-        $out .= sprintf "mpidr=0x%x, ", $mpidr;

-        $out .= sprintf "running_state=0x%x, ", $r_state;

-        $out .= sprintf "psci_state=0x%x", $psci_state;

-        $out .= "\n";

-    }

-    if ($out ne "") {

-        print "ARM processor events:\n$out\n";

-    } else {

-        print "No ARM processor errors.\n\n";

+    if ($has_arm == 1) {

+        $query = "select id, timestamp, error_count, affinity, mpidr, running_state, psci_state from arm_event 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));

+        $out = "";

+        while($query_handle->fetch()) {

+            $out .= "$id $timestamp error: ";

+            $out .= "error_count=$error_count, " if ($error_count);

+            $out .= "affinity_level=$affinity, ";

+            $out .= sprintf "mpidr=0x%x, ", $mpidr;

+            $out .= sprintf "running_state=0x%x, ", $r_state;

+            $out .= sprintf "psci_state=0x%x", $psci_state;

+            $out .= "\n";

+        }

+        if ($out ne "") {

+            print "ARM processor events:\n$out\n";

+        } else {

+            print "No ARM processor errors.\n\n";

+        }

+        $query_handle->finish;

     }

-    $query_handle->finish;

     # Extlog errors

-    $query = "select id, timestamp, etype, severity, address, fru_id, fru_text, cper_data from extlog_event 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));

-    $out = "";

-    while($query_handle->fetch()) {

-        $etype_string = get_extlog_type($etype);

-        $severity_string = get_extlog_severity($severity);

-        $out .= "$id $timestamp error: ";

-        $out .= "type=$etype_string, ";

-        $out .= "severity=$severity_string, ";

-        $out .= sprintf "address=0x%08x, ", $addr;

-        $out .= sprintf "fru_id=%s, ", get_uuid_le($fru_id);

-        $out .= "fru_text='$fru_text', ";

-        $out .= get_cper_data_text($cper_data) if ($cper_data);

-        $out .= "\n";

-    }

-    if ($out ne "") {

-        print "Extlog events:\n$out\n";

-    } else {

-        print "No Extlog errors.\n\n";

+    if ($has_extlog) {

+        $query = "select id, timestamp, etype, severity, address, fru_id, fru_text, cper_data from extlog_event 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));

+        $out = "";

+        while($query_handle->fetch()) {

+            $etype_string = get_extlog_type($etype);

+            $severity_string = get_extlog_severity($severity);

+            $out .= "$id $timestamp error: ";

+            $out .= "type=$etype_string, ";

+            $out .= "severity=$severity_string, ";

+            $out .= sprintf "address=0x%08x, ", $addr;

+            $out .= sprintf "fru_id=%s, ", get_uuid_le($fru_id);

+            $out .= "fru_text='$fru_text', ";

+            $out .= get_cper_data_text($cper_data) if ($cper_data);

+            $out .= "\n";

+        }

+        if ($out ne "") {

+            print "Extlog events:\n$out\n";

+        } else {

+            print "No Extlog errors.\n\n";

+        }

+        $query_handle->finish;

     }

-    $query_handle->finish;

     # MCE mce_record errors

-    $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_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));

-    $out = "";

-    while($query_handle->fetch()) {

-        $out .= "$id $time error: $msg";

-	$out .= ", CPU $cpuvendor" if ($cpuvendor);

-	$out .= ", bank $bank_name" if ($bank_name);

-	$out .= ", mcg $mcgstatus_msg" if ($mcgstatus_msg);

-	$out .= ", mci $mcistatus_msg" if ($mcistatus_msg);

-	$out .= ", $mc_location" if ($mc_location);

-	$out .= ", $user_action" if ($user_action);

-	$out .= sprintf ", mcgcap=0x%08x", $mcgcap if ($mcgcap);

-	$out .= sprintf ", mcgstatus=0x%08x", $mcgstatus if ($mcgstatus);

-	$out .= sprintf ", status=0x%08x", $status if ($status);

-	$out .= sprintf ", addr=0x%08x", $addr if ($addr);

-	$out .= sprintf ", misc=0x%08x", $misc if ($misc);

-	$out .= sprintf ", ip=0x%08x", $ip if ($ip);

-	$out .= sprintf ", tsc=0x%08x", $tsc if ($tsc);

-	$out .= sprintf ", walltime=0x%08x", $walltime if ($walltime);

-	$out .= sprintf ", cpu=0x%08x", $cpu if ($cpu);

-	$out .= sprintf ", cpuid=0x%08x", $cpuid if ($cpuid);

-	$out .= sprintf ", apicid=0x%08x", $apicid if ($apicid);

-	$out .= sprintf ", socketid=0x%08x", $socketid if ($socketid);

-	$out .= sprintf ", cs=0x%08x", $cs if ($cs);

-	$out .= sprintf ", bank=0x%08x", $bank if ($bank);

+    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_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));

+        $out = "";

+        while($query_handle->fetch()) {

+            $out .= "$id $time error: $msg";

+        $out .= ", CPU $cpuvendor" if ($cpuvendor);

+        $out .= ", bank $bank_name" if ($bank_name);

+        $out .= ", mcg $mcgstatus_msg" if ($mcgstatus_msg);

+        $out .= ", mci $mcistatus_msg" if ($mcistatus_msg);

+        $out .= ", $mc_location" if ($mc_location);

+        $out .= ", $user_action" if ($user_action);

+        $out .= sprintf ", mcgcap=0x%08x", $mcgcap if ($mcgcap);

+        $out .= sprintf ", mcgstatus=0x%08x", $mcgstatus if ($mcgstatus);

+        $out .= sprintf ", status=0x%08x", $status if ($status);

+        $out .= sprintf ", addr=0x%08x", $addr if ($addr);

+        $out .= sprintf ", misc=0x%08x", $misc if ($misc);

+        $out .= sprintf ", ip=0x%08x", $ip if ($ip);

+        $out .= sprintf ", tsc=0x%08x", $tsc if ($tsc);

+        $out .= sprintf ", walltime=0x%08x", $walltime if ($walltime);

+        $out .= sprintf ", cpu=0x%08x", $cpu if ($cpu);

+        $out .= sprintf ", cpuid=0x%08x", $cpuid if ($cpuid);

+        $out .= sprintf ", apicid=0x%08x", $apicid if ($apicid);

+        $out .= sprintf ", socketid=0x%08x", $socketid if ($socketid);

+        $out .= sprintf ", cs=0x%08x", $cs if ($cs);

+        $out .= sprintf ", bank=0x%08x", $bank if ($bank);

-	$out .= "\n";

-    }

-    if ($out ne "") {

-        print "MCE events:\n$out\n";

-    } else {

-        print "No MCE errors.\n\n";

+        $out .= "\n";

+        }

+        if ($out ne "") {

+            print "MCE events:\n$out\n";

+        } else {

+            print "No MCE errors.\n\n";

+        }

+        $query_handle->finish;

     }

-    $query_handle->finish;

     undef($dbh);

 }