1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270
|
xxx crash logging works
---
hurd/paths.h | 1 +
trans/crash.c | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 117 insertions(+)
Index: hurd-debian/hurd/paths.h
===================================================================
--- hurd-debian.orig/hurd/paths.h
+++ hurd-debian/hurd/paths.h
@@ -61,6 +61,7 @@ the Free Software Foundation, 675 Mass A
/* Symbolic names for all non-essential translators. */
#define _HURD_MAGIC _HURD "magic"
+#define _HURD_CRASH _HURD "crash"
#define _HURD_MTAB _HURD "mtab"
#endif /* hurd/paths.h */
Index: hurd-debian/trans/crash.c
===================================================================
--- hurd-debian.orig/trans/crash.c
+++ hurd-debian/trans/crash.c
@@ -25,6 +25,7 @@
#include <fcntl.h>
#include <hurd/trivfs.h>
#include <hurd/msg.h>
+#include <hurd/paths.h>
#include <sys/wait.h>
#include <error.h>
#include <argp.h>
@@ -243,6 +244,229 @@ stop_pgrp (process_t userproc, mach_port
munmap (pids, numpids);
}
+void mach_print(const char *);
+
+#ifndef EXTERNAL_MACH_PRINT
+asm (".global mach_print;"
+ " mach_print:;"
+#ifdef __x86_64__
+ " mov $0xffffffffffffffe2, %rax;"
+ " syscall;"
+#else
+ " mov $0xffffffe2, %eax;"
+ " lcall $0x7, $0x0;"
+#endif
+ " ret;");
+#endif /* EXTERNAL_MACH_PRINT */
+
+#include <mach/thread_status.h>
+
+static error_t
+get_pointer (task_t task, vm_offset_t va, vm_offset_t *value)
+{
+ error_t err;
+ vm_offset_t data;
+ mach_msg_type_number_t count;
+ vm_offset_t page = trunc_page (va);
+
+ if (va - page > vm_page_size - sizeof (vm_offset_t))
+ /* Spans two pages. */
+ err = vm_read (task, page, vm_page_size * 2, &data, &count);
+ else
+ err = vm_read (task, page, vm_page_size, &data, &count);
+
+ if (err)
+ return err;
+
+ *value = *(vm_offset_t *) (data + (va - page));
+
+ vm_deallocate (mach_task_self (), data, count);
+
+ return 0;
+}
+
+static error_t
+get_pcs (task_t task, char **pcs)
+{
+ error_t err;
+ thread_t *threads;
+ mach_msg_type_number_t i, j, k, nthreads;
+ char **stacks;
+ char *cur;
+
+#ifdef i386_THREAD_STATE
+ struct i386_thread_state state;
+ mach_msg_type_number_t count = i386_THREAD_STATE_COUNT;
+ int flavor = i386_THREAD_STATE;
+ int len = 0;
+
+ err = task_threads (task, &threads, &nthreads);
+ if (err)
+ return err;
+
+ stacks = malloc (nthreads * sizeof *stacks);
+
+#define N 10
+#define STACK_MAX (8 << 20)
+ for (i = 0; i < nthreads; i++)
+ {
+ vm_offset_t stack[N], bp, sp, prev_bp, ra;
+ err = thread_get_state (threads[i], flavor,
+ (thread_state_t) &state, &count);
+ if (err)
+ goto error;
+
+#ifdef __x86_64__
+ stack[0] = state.rip;
+ bp = state.rbp;
+ sp = state.ursp;
+#else
+ stack[0] = state.eip;
+ bp = state.ebp;
+ sp = state.uesp;
+#endif
+
+ /* Try to get backtrace in a trivial way.
+ Hopefully the application was built with -fno-omit-frame-pointer. */
+ for (j = 1; j < N; j++)
+ {
+ if (bp < sp || bp > sp + STACK_MAX)
+ /* Bogus frame pointer. */
+ break;
+
+ /* Get previous bp. */
+ err = get_pointer (task, bp, &prev_bp);
+ if (err)
+ /* Bogus frame pointer. */
+ break;
+
+ /* Get return address. */
+ err = get_pointer (task, bp + sizeof (vm_offset_t), &ra);
+ if (err)
+ /* Bogus frame pointer. */
+ break;
+
+ if (!ra)
+ /* End of stack */
+ break;
+
+ stack[j] = ra;
+
+ if (prev_bp == bp)
+ {
+ /* End of stack */
+ j++;
+ break;
+ }
+
+ bp = prev_bp;
+ }
+
+ cur = stacks[i] = malloc (j * (2 + sizeof (vm_offset_t) * 2 + 1));
+
+ for (k = 0; k < j; k++)
+ cur += sprintf (cur, "%s0x%lx", k ? " " : "", (unsigned long) stack[k]);
+
+ len += cur - stacks[i];
+ }
+
+ len += strlen(",\n") * (nthreads-1);
+ cur = *pcs = malloc(len);
+
+ for (i = 0; i < nthreads; i++)
+ {
+ if (i && !strcmp (stacks[i-1], stacks[i]))
+ /* Avoid cluttering output with server threads */
+ cur = stpncpy (cur, ", DUP", len - (cur - *pcs));
+ else
+ {
+ if (i)
+ cur = stpncpy (cur, ",\n", len - (cur - *pcs));
+ cur = stpncpy (cur, stacks[i], len - (cur - *pcs));
+ }
+ }
+
+ for (i = 0; i < nthreads; i++)
+ free (stacks[i]);
+#else
+ *pcs = strdup ("architecture not supported");
+#endif
+ return 0;
+
+error:
+ for (j = 0; j < i; j++)
+ free (stacks[j]);
+
+ for (i = 0; i < nthreads; i++)
+ {
+ err = mach_port_deallocate (mach_task_self (), threads[i]);
+ assert_perror_backtrace (err);
+ }
+
+ return err;
+}
+
+error_t
+log_crash (task_t task,
+ int signo, integer_t sigcode, int sigerror,
+ natural_t exc, natural_t code, natural_t subcode,
+ enum crash_action how)
+{
+ error_t err;
+ pid_t pid;
+ char argz_buf[128], *argz = argz_buf;
+ mach_msg_type_number_t argz_len = sizeof argz;
+ char *msg;
+ char *how_msg;
+ char *pcs;
+
+ switch (how)
+ {
+ case crash_suspend:
+ how_msg = "suspending task";
+ break;
+ case crash_kill:
+ how_msg = "killing task";
+ break;
+ case crash_corefile:
+ how_msg = "writing core file";
+ break;
+ default:
+ assert_backtrace (! "reached");
+ }
+
+ err = proc_task2pid (procserver, task, &pid);
+ if (err)
+ return err;
+
+ err = proc_getprocargs (procserver, pid, &argz, &argz_len);
+ if (err)
+ return err;
+
+ err = get_pcs (task, &pcs);
+ if (err)
+ return err;
+
+ argz_stringify (argz, argz_len, ' ');
+ asprintf (&msg, "%s: %s(%d) crashed, signal {no:%d, code:%d, error:%d}, "
+ "exception {%d, code:%d, subcode:%d}, PCs: {\n%s\n}, %s.\n",
+ _HURD_CRASH, argz, pid,
+ signo, sigcode, sigerror,
+ exc, code, subcode,
+ pcs,
+ how_msg);
+ if (argz != argz_buf)
+ vm_deallocate (mach_task_self (), (vm_address_t) argz, argz_len);
+ free (pcs);
+ if (! msg)
+ return ENOMEM;
+
+ fprintf (stderr, "%s", msg);
+ mach_print (msg);
+ free (msg);
+
+ return 0;
+}
kern_return_t
S_crash_dump_task (mach_port_t port,
@@ -276,6 +499,8 @@ S_crash_dump_task (mach_port_t port,
}
}
+ log_crash (task, signo, sigcode, sigerror, exc, code, subcode, how);
+
switch (how)
{
default: /* NOTREACHED */
|