1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-20 08:27:15 +00:00
freebsd-ports/sysutils/mcelog/files/patch-mcelog.c
Richard Gallamore 10671f3005 * Updated to 161
The added header should fix build on head.

Submitted by:	eric@van^
Differential Revision:	https://reviews.freebsd.org/D17696
2018-10-27 15:35:46 +00:00

822 lines
18 KiB
C

--- mcelog.c.orig 2018-08-09 21:49:49 UTC
+++ mcelog.c
@@ -20,9 +20,23 @@
#define _GNU_SOURCE 1
#include <sys/fcntl.h>
#include <sys/ioctl.h>
+#ifdef __Linux__
#include <asm/types.h>
#include <asm/ioctls.h>
#include <linux/limits.h>
+#endif
+#ifdef __FreeBSD__
+#include <sys/types.h>
+#include <sys/queue.h>
+#include <sys/sysctl.h>
+#include <machine/cpufunc.h>
+#include <machine/cputypes.h>
+#include <machine/specialreg.h>
+#include <err.h>
+#include <kvm.h>
+#include <limits.h>
+#endif
+#undef CPU_P4
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
@@ -60,9 +74,25 @@
#include "bus.h"
#include "unknown.h"
+struct mca_record {
+ uint64_t mr_status;
+ uint64_t mr_addr;
+ uint64_t mr_misc;
+ uint64_t mr_tsc;
+ int mr_apic_id;
+ int mr_bank;
+ uint64_t mr_mcg_cap;
+ uint64_t mr_mcg_status;
+ int mr_cpu_id;
+ int mr_cpu_vendor_id;
+ int mr_cpu;
+};
+
enum cputype cputype = CPU_GENERIC;
+#ifdef __Linux__
char *logfn = LOG_DEV_FILENAME;
+#endif
int ignore_nodev;
int filter_bogus = 1;
@@ -73,7 +103,9 @@ int ascii_mode;
int dump_raw_ascii;
int daemon_mode;
static char *inputfile;
+#ifdef __Linux__
char *processor_flags;
+#endif
static int foreground;
int filter_memory_errors;
static struct config_cred runcred = { .uid = -1U, .gid = -1U };
@@ -82,6 +114,10 @@ static char pidfile_default[] = PID_FILE
static char logfile_default[] = LOG_FILE;
static char *pidfile = pidfile_default;
static char *logfile;
+#ifdef __FreeBSD__
+static char *execfile;
+static char *corefile;
+#endif
static int debug_numerrors;
int imc_log = -1;
static int check_only = 0;
@@ -199,6 +235,7 @@ static void parse_cpuid(u32 cpuid, u32 *
*model += c.c.ext_model << 4;
}
+#ifdef __Linux__
static u32 unparse_cpuid(unsigned family, unsigned model)
{
union {
@@ -216,6 +253,7 @@ static u32 unparse_cpuid(unsigned family
c.c.ext_model = model >> 4;
return c.v;
}
+#endif
static char *cputype_name[] = {
[CPU_GENERIC] = "generic CPU",
@@ -332,6 +370,7 @@ static char *vendor[] = {
[8] = "NSC"
};
+#ifdef __Linux__
static unsigned cpuvendor_to_num(char *name)
{
unsigned i;
@@ -346,6 +385,7 @@ static unsigned cpuvendor_to_num(char *n
return i;
return 0;
}
+#endif
static char *cpuvendor_name(u32 cpuvendor)
{
@@ -497,6 +537,7 @@ static void dump_mce_raw_ascii(struct mc
Wprintf("\n");
}
+#ifdef __Linux__
int is_cpu_supported(void)
{
enum {
@@ -567,14 +608,61 @@ int is_cpu_supported(void)
return 1;
}
+#endif
+
+#ifdef __FreeBSD__
+int is_cpu_supported(void)
+{
+ char vendor[20];
+ u_int regs[4];
+ u_int cpu_id;
+ int family, model;
+ static int checked;
+
+ if (checked)
+ return 1;
+
+ checked = 1;
+
+ do_cpuid(0, regs);
+ ((u_int *)vendor)[0] = regs[1];
+ ((u_int *)vendor)[1] = regs[3];
+ ((u_int *)vendor)[2] = regs[2];
+ vendor[12] = 0;
+
+ do_cpuid(1, regs);
+ cpu_id = regs[0];
+ family = CPUID_TO_FAMILY(cpu_id);
+ model = CPUID_TO_MODEL(cpu_id);
+
+ if (cpu_forced)
+ ;
+ else if (!strcmp(vendor,"AuthenticAMD")) {
+ if (family == 15) {
+ cputype = CPU_K8;
+ } else if (family >= 16) {
+ SYSERRprintf("ERROR: AMD Processor family %d: mcelog does not support this processor. Please use the edac_mce_amd module instead.\n", family);
+ return 0;
+ }
+ } else if (!strcmp(vendor,"GenuineIntel"))
+ cputype = select_intel_cputype(family, model);
+ /* Add checks for other CPUs here */
+ else
+ return 1;
+ return 0;
+}
+#endif
+#ifdef __Linux__
static char *skipspace(char *s)
{
while (isspace(*s))
++s;
return s;
}
+#endif
+#ifdef __Linux__
static char *skip_syslog(char *s)
{
char *p;
@@ -585,7 +673,9 @@ static char *skip_syslog(char *s)
return p + sizeof("mcelog: ") - 1;
return s;
}
+#endif
+#ifdef __Linux__
static char *skipgunk(char *s)
{
s = skip_syslog(s);
@@ -610,12 +700,16 @@ static char *skipgunk(char *s)
return skipspace(s);
}
+#endif
+#ifdef __Linux__
static inline int urange(unsigned val, unsigned lo, unsigned hi)
{
return val >= lo && val <= hi;
}
+#endif
+#ifdef __Linux__
static int is_short(char *name)
{
return strlen(name) == 3 &&
@@ -623,7 +717,9 @@ static int is_short(char *name)
islower(name[1]) &&
islower(name[2]);
}
+#endif
+#ifdef __Linux__
static unsigned skip_date(char *s)
{
unsigned day, hour, min, year, sec;
@@ -640,6 +736,7 @@ static unsigned skip_date(char *s)
return 0;
return next;
}
+#endif
static void dump_mce_final(struct mce *m, char *symbol, int missing, int recordlen,
int dseen)
@@ -660,6 +757,7 @@ static void dump_mce_final(struct mce *m
flushlog();
}
+#ifdef __Linux__
static char *skip_patterns[] = {
"MCA:*",
"MCi_MISC register valid*",
@@ -668,7 +766,9 @@ static char *skip_patterns[] = {
"Kernel does not support page offline interface",
NULL
};
+#endif
+#ifdef __Linux__
static int match_patterns(char *s, char **pat)
{
for (; *pat; pat++)
@@ -676,12 +776,14 @@ static int match_patterns(char *s, char
return 0;
return 1;
}
+#endif
#define FIELD(f) \
if (recordlen < endof_field(struct mce, f)) \
recordlen = endof_field(struct mce, f)
/* Decode ASCII input for fatal messages */
+#ifdef __Linux__
static void decodefatal(FILE *inf)
{
struct mce m;
@@ -892,6 +994,227 @@ restart:
if (data)
dump_mce_final(&m, symbol, missing, recordlen, disclaimer_seen);
}
+#endif
+
+#ifdef __FreeBSD__
+/*
+ * Table used to map cpuid vendor strings and FreeBSD CPU vendor IDs
+ * to Linux cpuvendor values.
+ */
+static struct {
+ char *name;
+ int vendor_id;
+ u_char cpuvendor;
+} vendor_ids[] = {
+ { "GenuineIntel", CPU_VENDOR_INTEL, 0 },
+ { "AuthenticAMD", CPU_VENDOR_AMD, 2 },
+ { "CentaurHauls", CPU_VENDOR_CENTAUR, 5 },
+#ifdef __i386__
+ { "CyrixInstead", CPU_VENDOR_CYRIX, 1 },
+ { "UMC UMC UMC ", CPU_VENDOR_UMC, 3 },
+ { "GenuineTMx86", CPU_VENDOR_TRANSMETA, 7 },
+ { "Geode by NSC", CPU_VENDOR_NSC, 8 },
+#endif
+};
+
+static int find_cpu_vendor(const char *vendor)
+{
+ u_int i;
+
+ for (i = 0; i < sizeof(vendor_ids) / sizeof(vendor_ids[0]); i++)
+ if (strcmp(vendor, vendor_ids[i].name) == 0)
+ return (vendor_ids[i].cpuvendor);
+ return (0xff);
+}
+
+static int find_cpu_vendor_id(const char *vendor)
+{
+ u_int i;
+
+ for (i = 0; i < sizeof(vendor_ids) / sizeof(vendor_ids[0]); i++)
+ if (strcmp(vendor, vendor_ids[i].name) == 0)
+ return (vendor_ids[i].vendor_id);
+ return (0);
+}
+
+static int map_cpu_vendor(int vendor_id)
+{
+ u_int i;
+
+ for (i = 0; i < sizeof(vendor_ids) / sizeof(vendor_ids[0]); i++)
+ if (vendor_ids[i].vendor_id == vendor_id)
+ return (vendor_ids[i].cpuvendor);
+ return (0xff);
+}
+
+/* Convert FreeBSD's struct mca_record into a struct mce. */
+static void convert_mca(struct mca_record *mr, struct mce *mce, int live,
+ size_t len)
+{
+ memset(mce, 0, sizeof(*mce));
+ mce->status = mr->mr_status;
+ mce->misc = mr->mr_misc;
+ mce->addr = mr->mr_addr;
+ mce->mcgstatus = mr->mr_mcg_status;
+ mce->tsc = mr->mr_tsc;
+ mce->cpuvendor = map_cpu_vendor(mr->mr_cpu_vendor_id);
+ mce->cpuid = mr->mr_cpu_id;
+ mce->bank = mr->mr_bank;
+ mce->finished = 1;
+ mce->extcpu = mr->mr_cpu;
+ mce->apicid = mr->mr_apic_id;
+ mce->mcgcap = mr->mr_mcg_cap;
+
+ /*
+ * For older live records (from sysctl), fill in some fields
+ * using registers from the current CPU.
+ */
+ if (len < offsetof(struct mca_record, mr_cpu_id) && live) {
+ char vendor[20];
+ u_int regs[4];
+
+ do_cpuid(0, regs);
+ ((u_int *)vendor)[0] = regs[1];
+ ((u_int *)vendor)[1] = regs[3];
+ ((u_int *)vendor)[2] = regs[2];
+ vendor[12] = 0;
+ mce->cpuvendor = find_cpu_vendor(vendor);
+
+ do_cpuid(1, regs);
+ mce->cpuid = regs[0];
+ }
+}
+
+/* Decode ASCII input for fatal messages */
+static void decodefatal(FILE *inf)
+{
+ struct mca_record mr;
+ struct mce m;
+ long long val, val2;
+ char *cp, line[100], *s, symbol[1];
+ const char *fmt;
+ int cpu, data, old, missing;
+ enum rows {
+ BANK = 0x1,
+ MCG = 0x2,
+ VENDOR = 0x4,
+ CPU = 0x8,
+ ADDR = 0x10,
+ MISC = 0x20,
+ };
+
+ symbol[0] = '\0';
+ data = 0;
+ missing = 0;
+ old = 0;
+ memset(&mr, 0, sizeof(mr));
+ while ((s = fgets(line, sizeof(line), inf)) != NULL) {
+ s = strstr(s, "MCA: ");
+ if (s == NULL)
+ continue;
+ s += strlen("MCA: ");
+
+ if (strncmp(s, "bank", 4) == 0 || strncmp(s, "Bank", 4) == 0) {
+ /* Start of a new record, dump the previous one. */
+ if (data != 0) {
+ /* Require some minimum data. */
+ if (data & BANK) {
+ if (mr.mr_status & MC_STATUS_ADDRV &&
+ !(data & ADDR))
+ missing = 1;
+ if (mr.mr_status & MC_STATUS_MISCV &&
+ !(data & MISC))
+ missing = 1;
+ convert_mca(&mr, &m, 0, sizeof(mr));
+ mce_cpuid(&m);
+ dump_mce_final(&m, symbol, missing,
+ sizeof(struct mce), 0);
+ }
+ data = 0;
+ missing = 0;
+ memset(&mr, 0, sizeof(mr));
+ }
+
+ if (s[0] == 'b') {
+ old = 1;
+ fmt = "bank %d, status 0x%llx";
+ } else {
+ old = 0;
+ fmt = "Bank %d, Status 0x%llx";
+ }
+ if (sscanf(s, fmt, &mr.mr_bank, &val) != 2)
+ missing = 1;
+ else {
+ data |= BANK;
+ mr.mr_status = val;
+ }
+ }
+ if (strncmp(s, "Global", 6) == 0) {
+ if (sscanf(s, "Global Cap 0x%llx, Status 0x%llx", &val,
+ &val2) != 2)
+ missing = 1;
+ else {
+ data |= MCG;
+ mr.mr_mcg_cap = val;
+ mr.mr_mcg_status = val2;
+ }
+ }
+ if (strncmp(s, "Vendor \"", 8) == 0) {
+ s += 8;
+ cp = index(s, '"');
+ if (cp != NULL) {
+ *cp = '\0';
+ mr.mr_cpu_vendor_id = find_cpu_vendor_id(s);
+ s = cp + 1;
+ if (sscanf(s, ", ID 0x%x, APIC ID %d",
+ &mr.mr_cpu_id, &mr.mr_apic_id) != 2)
+ missing = 1;
+ else
+ data |= VENDOR;
+ } else
+ missing = 1;
+ }
+ if (strncmp(s, "CPU", 3) == 0) {
+ if (sscanf(s, "CPU %d ", &cpu) != 1)
+ missing = 1;
+ else {
+ data |= CPU;
+ if (old)
+ mr.mr_apic_id = cpu;
+ else
+ mr.mr_cpu = cpu;
+ }
+ }
+ if (strncmp(s, "Address", 7) == 0) {
+ if (sscanf(s, "Address 0x%llx", &val) != 1)
+ missing = 1;
+ else {
+ data |= ADDR;
+ mr.mr_addr = val;
+ }
+ }
+ if (strncmp(s, "Misc", 4) == 0) {
+ if (sscanf(s, "Misc 0x%llx", &val) != 1)
+ missing = 1;
+ else {
+ data |= MISC;
+ mr.mr_misc = val;
+ }
+ }
+ }
+
+ /* Dump the last record. */
+ if (data & BANK) {
+ if (mr.mr_status & MC_STATUS_ADDRV && !(data & ADDR))
+ missing = 1;
+ if (mr.mr_status & MC_STATUS_MISCV && !(data & MISC))
+ missing = 1;
+ convert_mca(&mr, &m, 0, sizeof(mr));
+ mce_cpuid(&m);
+ dump_mce_final(&m, symbol, missing, sizeof(struct mce), 0);
+ }
+}
+#endif
static void remove_pidfile(void)
{
@@ -957,6 +1280,10 @@ void usage(void)
" mcelog [options] --ascii < log\n"
" mcelog [options] --ascii --file log\n"
"Decode machine check ASCII output from kernel logs\n"
+#ifdef __FreeBSD_
+" mcelog [options] -M vmcore -N kernel\n"
+"Decode machine check error records from kernel crashdump.\n"
+#endif
"\n"
"Options:\n"
"--version Show the version of mcelog and exit\n"
@@ -1174,6 +1501,14 @@ static int modifier(int opt)
usage();
exit(0);
break;
+#ifdef __FreeBSD__
+ case 'M':
+ corefile = strdup(optarg);
+ break;
+ case 'N':
+ execfile = strdup(optarg);
+ break;
+#endif
case 0:
break;
default:
@@ -1224,10 +1559,12 @@ static int combined_modifier(int opt)
static void general_setup(void)
{
+#ifdef __Linux__
trigger_setup();
yellow_setup();
bus_setup();
unknown_setup();
+#endif
config_cred("global", "run-credentials", &runcred);
if (config_bool("global", "filter-memory-errors") == 1)
filter_memory_errors = 1;
@@ -1250,6 +1587,7 @@ static void drop_cred(void)
}
}
+#ifdef __Linux__
static void process(int fd, unsigned recordlen, unsigned loglen, char *buf)
{
int i;
@@ -1302,6 +1640,173 @@ static void process(int fd, unsigned rec
if (finish)
exit(0);
}
+#endif
+
+#ifdef __FreeBSD__
+#ifdef LOCAL_HACK
+struct mca_record_old {
+ uint64_t mr_status;
+ uint64_t mr_addr;
+ uint64_t mr_misc;
+ uint64_t mr_tsc;
+ int mr_apic_id;
+ int mr_bank;
+};
+#endif
+
+struct mca_record_internal {
+ struct mca_record rec;
+ int logged;
+ STAILQ_ENTRY(mca_internal) link;
+};
+
+#ifdef LOCAL_HACK
+struct mca_record_internal_old {
+ struct mca_record_old rec;
+ int logged;
+ STAILQ_ENTRY(mca_internal) link;
+};
+#endif
+
+static struct nlist nl[] = {
+#define X_MCA_RECORDS 0
+ { .n_name = "_mca_records" },
+#ifdef LOCAL_HACK
+#define X_SNAPDATE 1
+ { .n_name = "_snapdate" },
+#endif
+ { .n_name = NULL },
+};
+
+static int
+kread(kvm_t *kvm, void *kvm_pointer, void *buf, size_t size, size_t offset)
+{
+ ssize_t ret;
+
+ ret = kvm_read(kvm, (unsigned long)kvm_pointer + offset, buf, size);
+ if (ret < 0 || (size_t)ret != size)
+ return (-1);
+ return (0);
+}
+
+static int
+kread_symbol(kvm_t *kvm, int index, void *buf, size_t size)
+{
+ ssize_t ret;
+
+ ret = kvm_read(kvm, nl[index].n_value, buf, size);
+ if (ret < 0 || (size_t)ret != size)
+ return (-1);
+ return (0);
+}
+
+static void process_kvm(const char *execfile, const char *corefile)
+{
+ struct mca_record mr, *mrp;
+ struct mce mce;
+ char errbuf[_POSIX2_LINE_MAX];
+ kvm_t *kvm;
+ size_t record_size, link_offset;
+ int i;
+#ifdef LOCAL_HACK
+ int snapdate;
+#endif
+
+ kvm = kvm_openfiles(execfile, corefile, NULL, O_RDONLY, errbuf);
+ if (kvm == NULL)
+ errx(1, "kvm_openfiles: %s", errbuf);
+ if (kvm_nlist(kvm, nl) != 0)
+ errx(1, "kvm_nlist: %s", kvm_geterr(kvm));
+
+#ifdef LOCAL_HACK
+ if (kread_symbol(kvm, X_SNAPDATE, &snapdate, sizeof(snapdate)) < 0)
+ errx(1, "kvm_read(snapdate) failed");
+#endif
+ /* stqh_first is the first pointer at this address. */
+ if (kread_symbol(kvm, X_MCA_RECORDS, &mrp, sizeof(mrp)) < 0)
+ errx(1, "kvm_read(mca_records) failed");
+#ifdef LOCAL_HACK
+ if (snapdate >= 20100329) {
+#endif
+ record_size = sizeof(struct mca_record);
+ link_offset = __offsetof(struct mca_record_internal,
+ link.stqe_next);
+#ifdef LOCAL_HACK
+ } else {
+ record_size = sizeof(struct mca_record_old);
+ link_offset = __offsetof(struct mca_record_internal_old,
+ link.stqe_next);
+ }
+#endif
+
+ for (i = 0; mrp != NULL; i++) {
+ memset(&mr, 0, sizeof(mr));
+ if (kread(kvm, mrp, &mr, record_size, 0) < 0)
+ break;
+ if (kread(kvm, mrp, &mrp, sizeof(mrp), link_offset) < 0)
+ mrp = NULL;
+
+ convert_mca(&mr, &mce, 1, record_size);
+ mce_prepare(&mce);
+ if (!mce_filter(&mce, sizeof(struct mce)))
+ continue;
+ if (!dump_raw_ascii) {
+ disclaimer();
+ Wprintf("MCE %d\n", i);
+ dump_mce(&mce, sizeof(struct mce));
+ } else
+ dump_mce_raw_ascii(&mce, sizeof(struct mce));
+ flushlog();
+ }
+
+ exit(0);
+}
+
+static void process_live(void)
+{
+ struct mca_record mr;
+ struct mce mce;
+ int mib[4];
+ size_t len;
+ int count, finish, i;
+
+ len = sizeof(count);
+ if (sysctlbyname("hw.mca.count", &count, &len, NULL, 0) < 0)
+ return;
+
+ len = 4;
+ if (sysctlnametomib("hw.mca.records", mib, &len) < 0)
+ return;
+
+ finish = 0;
+ for (i = 0; i < count; i++) {
+ mib[3] = i;
+ len = sizeof(mr);
+ memset(&mr, 0, sizeof(mr));
+ if (sysctl(mib, 4, &mr, &len, NULL, 0) < 0) {
+ warn("sysctl(hw.mca.records.%d)", i);
+ continue;
+ }
+
+ convert_mca(&mr, &mce, 1, len);
+ mce_prepare(&mce);
+ if (numerrors > 0 && --numerrors == 0)
+ finish = 1;
+ if (!mce_filter(&mce, sizeof(struct mce)))
+ continue;
+ if (!dump_raw_ascii) {
+ disclaimer();
+ Wprintf("MCE %d\n", i);
+ dump_mce(&mce, sizeof(struct mce));
+ } else
+ dump_mce_raw_ascii(&mce, sizeof(struct mce));
+ flushlog();
+ }
+
+ if (finish)
+ exit(0);
+}
+#endif
static void noargs(int ac, char **av)
{
@@ -1364,12 +1869,14 @@ struct mcefd_data {
char *buf;
};
+#ifdef __Linux__
static void process_mcefd(struct pollfd *pfd, void *data)
{
struct mcefd_data *d = (struct mcefd_data *)data;
assert((pfd->revents & POLLIN) != 0);
process(pfd->fd, d->recordlen, d->loglen, d->buf);
}
+#endif
static void handle_sigusr1(int sig)
{
@@ -1378,13 +1885,18 @@ static void handle_sigusr1(int sig)
int main(int ac, char **av)
{
+#ifdef __Linux__
struct mcefd_data d = {};
- int opt;
int fd;
-
+#endif
+ int opt;
parse_config(av);
+#ifdef __FreeBSD
+ while ((opt = getopt_long(ac, av, "M:N:", options, NULL)) != -1) {
+#else
while ((opt = getopt_long(ac, av, "", options, NULL)) != -1) {
+#endif
if (opt == '?') {
usage();
exit(1);
@@ -1405,11 +1917,13 @@ int main(int ac, char **av)
}
/* before doing anything else let's see if the CPUs are supported */
+#ifdef __Linux__
if (!cpu_forced && !is_cpu_supported()) {
if (!check_only)
fprintf(stderr, "CPU is unsupported\n");
exit(1);
}
+#endif
if (check_only)
exit(0);
@@ -1428,15 +1942,23 @@ int main(int ac, char **av)
}
modifier_finish();
+#ifdef __Linux__
if (av[optind])
logfn = av[optind++];
+#endif
if (av[optind]) {
usage();
+#ifdef __FreeBSD__
+ if ((corefile != NULL) ^ (execfile != NULL) ||
+ (corefile != NULL && daemon_mode))
+ usage();
+#endif
exit(1);
}
checkdmi();
general_setup();
+#ifdef __Linux__
fd = open(logfn, O_RDONLY);
if (fd < 0) {
if (ignore_nodev)
@@ -1451,27 +1973,44 @@ int main(int ac, char **av)
err("MCE_GET_LOG_LEN");
d.buf = xalloc(d.recordlen * d.loglen);
+#endif
if (daemon_mode) {
prefill_memdb(do_dmi);
if (!do_dmi)
closedmi();
server_setup();
+#ifdef __Linux__
page_setup();
+#endif
if (imc_log)
set_imc_log(cputype);
drop_cred();
+#ifdef __Linux__
register_pollcb(fd, POLLIN, process_mcefd, &d);
+#endif
if (!foreground && daemon(0, need_stdout()) < 0)
err("daemon");
if (pidfile)
write_pidfile();
signal(SIGUSR1, handle_sigusr1);
+#ifdef __Linux__
event_signal(SIGUSR1);
+#endif
eventloop();
} else {
+#ifdef __Linux__
process(fd, d.recordlen, d.loglen, d.buf);
+#endif
+#ifdef __FreeBSD__
+ if (corefile != NULL)
+ process_kvm(execfile, corefile);
+ else
+ process_live();
+#endif
}
+#ifdef __Linux__
trigger_wait();
+#endif
exit(0);
}