.. | .. |
---|
| 1 | +// SPDX-License-Identifier: GPL-2.0-only |
---|
1 | 2 | /* |
---|
2 | 3 | * recordmcount.c: construct a table of the locations of calls to 'mcount' |
---|
3 | 4 | * so that ftrace can find them quickly. |
---|
4 | 5 | * Copyright 2009 John F. Reiser <jreiser@BitWagon.com>. All rights reserved. |
---|
5 | | - * Licensed under the GNU General Public License, version 2 (GPLv2). |
---|
6 | 6 | * |
---|
7 | 7 | * Restructured to fit Linux format, as well as other updates: |
---|
8 | 8 | * Copyright 2010 Steven Rostedt <srostedt@redhat.com>, Red Hat Inc. |
---|
.. | .. |
---|
27 | 27 | #include <getopt.h> |
---|
28 | 28 | #include <elf.h> |
---|
29 | 29 | #include <fcntl.h> |
---|
30 | | -#include <setjmp.h> |
---|
31 | 30 | #include <stdio.h> |
---|
32 | 31 | #include <stdlib.h> |
---|
33 | 32 | #include <string.h> |
---|
.. | .. |
---|
43 | 42 | #define R_ARM_THM_CALL 10 |
---|
44 | 43 | #define R_ARM_CALL 28 |
---|
45 | 44 | |
---|
| 45 | +#define R_AARCH64_CALL26 283 |
---|
| 46 | + |
---|
46 | 47 | static int fd_map; /* File descriptor for file being modified. */ |
---|
47 | 48 | static int mmap_failed; /* Boolean flag. */ |
---|
48 | 49 | static char gpfx; /* prefix for global symbol name (sometimes '_') */ |
---|
49 | 50 | static struct stat sb; /* Remember .st_size, etc. */ |
---|
50 | | -static jmp_buf jmpenv; /* setjmp/longjmp per-file error escape */ |
---|
51 | 51 | static const char *altmcount; /* alternate mcount symbol name */ |
---|
52 | 52 | static int warn_on_notrace_sect; /* warn when section has mcount not being recorded */ |
---|
53 | 53 | static void *file_map; /* pointer of the mapped file */ |
---|
54 | 54 | static void *file_end; /* pointer to the end of the mapped file */ |
---|
55 | 55 | static int file_updated; /* flag to state file was changed */ |
---|
56 | 56 | static void *file_ptr; /* current file pointer location */ |
---|
| 57 | + |
---|
57 | 58 | static void *file_append; /* added to the end of the file */ |
---|
58 | 59 | static size_t file_append_size; /* how much is added to end of file */ |
---|
59 | 60 | |
---|
60 | | -/* setjmp() return values */ |
---|
61 | | -enum { |
---|
62 | | - SJ_SETJMP = 0, /* hardwired first return */ |
---|
63 | | - SJ_FAIL, |
---|
64 | | - SJ_SUCCEED |
---|
65 | | -}; |
---|
66 | | - |
---|
67 | 61 | /* Per-file resource cleanup when multiple files. */ |
---|
68 | | -static void |
---|
69 | | -cleanup(void) |
---|
| 62 | +static void file_append_cleanup(void) |
---|
70 | 63 | { |
---|
71 | | - if (!mmap_failed) |
---|
72 | | - munmap(file_map, sb.st_size); |
---|
73 | | - else |
---|
74 | | - free(file_map); |
---|
75 | | - file_map = NULL; |
---|
76 | 64 | free(file_append); |
---|
77 | 65 | file_append = NULL; |
---|
78 | 66 | file_append_size = 0; |
---|
79 | 67 | file_updated = 0; |
---|
80 | 68 | } |
---|
81 | 69 | |
---|
82 | | -static void __attribute__((noreturn)) |
---|
83 | | -fail_file(void) |
---|
| 70 | +static void mmap_cleanup(void) |
---|
84 | 71 | { |
---|
85 | | - cleanup(); |
---|
86 | | - longjmp(jmpenv, SJ_FAIL); |
---|
| 72 | + if (!mmap_failed) |
---|
| 73 | + munmap(file_map, sb.st_size); |
---|
| 74 | + else |
---|
| 75 | + free(file_map); |
---|
| 76 | + file_map = NULL; |
---|
87 | 77 | } |
---|
88 | 78 | |
---|
89 | | -static void __attribute__((noreturn)) |
---|
90 | | -succeed_file(void) |
---|
91 | | -{ |
---|
92 | | - cleanup(); |
---|
93 | | - longjmp(jmpenv, SJ_SUCCEED); |
---|
94 | | -} |
---|
| 79 | +/* ulseek, uwrite, ...: Check return value for errors. */ |
---|
95 | 80 | |
---|
96 | | -/* ulseek, uread, ...: Check return value for errors. */ |
---|
97 | | - |
---|
98 | | -static off_t |
---|
99 | | -ulseek(int const fd, off_t const offset, int const whence) |
---|
| 81 | +static off_t ulseek(off_t const offset, int const whence) |
---|
100 | 82 | { |
---|
101 | 83 | switch (whence) { |
---|
102 | 84 | case SEEK_SET: |
---|
.. | .. |
---|
111 | 93 | } |
---|
112 | 94 | if (file_ptr < file_map) { |
---|
113 | 95 | fprintf(stderr, "lseek: seek before file\n"); |
---|
114 | | - fail_file(); |
---|
| 96 | + return -1; |
---|
115 | 97 | } |
---|
116 | 98 | return file_ptr - file_map; |
---|
117 | 99 | } |
---|
118 | 100 | |
---|
119 | | -static size_t |
---|
120 | | -uread(int const fd, void *const buf, size_t const count) |
---|
121 | | -{ |
---|
122 | | - size_t const n = read(fd, buf, count); |
---|
123 | | - if (n != count) { |
---|
124 | | - perror("read"); |
---|
125 | | - fail_file(); |
---|
126 | | - } |
---|
127 | | - return n; |
---|
128 | | -} |
---|
129 | | - |
---|
130 | | -static size_t |
---|
131 | | -uwrite(int const fd, void const *const buf, size_t const count) |
---|
| 101 | +static ssize_t uwrite(void const *const buf, size_t const count) |
---|
132 | 102 | { |
---|
133 | 103 | size_t cnt = count; |
---|
134 | 104 | off_t idx = 0; |
---|
| 105 | + void *p = NULL; |
---|
135 | 106 | |
---|
136 | 107 | file_updated = 1; |
---|
137 | 108 | |
---|
.. | .. |
---|
139 | 110 | off_t aoffset = (file_ptr + count) - file_end; |
---|
140 | 111 | |
---|
141 | 112 | if (aoffset > file_append_size) { |
---|
142 | | - file_append = realloc(file_append, aoffset); |
---|
| 113 | + p = realloc(file_append, aoffset); |
---|
| 114 | + if (!p) |
---|
| 115 | + free(file_append); |
---|
| 116 | + file_append = p; |
---|
143 | 117 | file_append_size = aoffset; |
---|
144 | 118 | } |
---|
145 | 119 | if (!file_append) { |
---|
146 | 120 | perror("write"); |
---|
147 | | - fail_file(); |
---|
| 121 | + file_append_cleanup(); |
---|
| 122 | + mmap_cleanup(); |
---|
| 123 | + return -1; |
---|
148 | 124 | } |
---|
149 | 125 | if (file_ptr < file_end) { |
---|
150 | 126 | cnt = file_end - file_ptr; |
---|
.. | .. |
---|
164 | 140 | return count; |
---|
165 | 141 | } |
---|
166 | 142 | |
---|
167 | | -static void * |
---|
168 | | -umalloc(size_t size) |
---|
| 143 | +static void * umalloc(size_t size) |
---|
169 | 144 | { |
---|
170 | 145 | void *const addr = malloc(size); |
---|
171 | 146 | if (addr == 0) { |
---|
172 | 147 | fprintf(stderr, "malloc failed: %zu bytes\n", size); |
---|
173 | | - fail_file(); |
---|
| 148 | + file_append_cleanup(); |
---|
| 149 | + mmap_cleanup(); |
---|
| 150 | + return NULL; |
---|
174 | 151 | } |
---|
175 | 152 | return addr; |
---|
176 | 153 | } |
---|
| 154 | + |
---|
| 155 | +/* |
---|
| 156 | + * Get the whole file as a programming convenience in order to avoid |
---|
| 157 | + * malloc+lseek+read+free of many pieces. If successful, then mmap |
---|
| 158 | + * avoids copying unused pieces; else just read the whole file. |
---|
| 159 | + * Open for both read and write; new info will be appended to the file. |
---|
| 160 | + * Use MAP_PRIVATE so that a few changes to the in-memory ElfXX_Ehdr |
---|
| 161 | + * do not propagate to the file until an explicit overwrite at the last. |
---|
| 162 | + * This preserves most aspects of consistency (all except .st_size) |
---|
| 163 | + * for simultaneous readers of the file while we are appending to it. |
---|
| 164 | + * However, multiple writers still are bad. We choose not to use |
---|
| 165 | + * locking because it is expensive and the use case of kernel build |
---|
| 166 | + * makes multiple writers unlikely. |
---|
| 167 | + */ |
---|
| 168 | +static void *mmap_file(char const *fname) |
---|
| 169 | +{ |
---|
| 170 | + /* Avoid problems if early cleanup() */ |
---|
| 171 | + fd_map = -1; |
---|
| 172 | + mmap_failed = 1; |
---|
| 173 | + file_map = NULL; |
---|
| 174 | + file_ptr = NULL; |
---|
| 175 | + file_updated = 0; |
---|
| 176 | + sb.st_size = 0; |
---|
| 177 | + |
---|
| 178 | + fd_map = open(fname, O_RDONLY); |
---|
| 179 | + if (fd_map < 0) { |
---|
| 180 | + perror(fname); |
---|
| 181 | + return NULL; |
---|
| 182 | + } |
---|
| 183 | + if (fstat(fd_map, &sb) < 0) { |
---|
| 184 | + perror(fname); |
---|
| 185 | + goto out; |
---|
| 186 | + } |
---|
| 187 | + if (!S_ISREG(sb.st_mode)) { |
---|
| 188 | + fprintf(stderr, "not a regular file: %s\n", fname); |
---|
| 189 | + goto out; |
---|
| 190 | + } |
---|
| 191 | + file_map = mmap(0, sb.st_size, PROT_READ|PROT_WRITE, MAP_PRIVATE, |
---|
| 192 | + fd_map, 0); |
---|
| 193 | + if (file_map == MAP_FAILED) { |
---|
| 194 | + mmap_failed = 1; |
---|
| 195 | + file_map = umalloc(sb.st_size); |
---|
| 196 | + if (!file_map) { |
---|
| 197 | + perror(fname); |
---|
| 198 | + goto out; |
---|
| 199 | + } |
---|
| 200 | + if (read(fd_map, file_map, sb.st_size) != sb.st_size) { |
---|
| 201 | + perror(fname); |
---|
| 202 | + free(file_map); |
---|
| 203 | + file_map = NULL; |
---|
| 204 | + goto out; |
---|
| 205 | + } |
---|
| 206 | + } else |
---|
| 207 | + mmap_failed = 0; |
---|
| 208 | +out: |
---|
| 209 | + close(fd_map); |
---|
| 210 | + fd_map = -1; |
---|
| 211 | + |
---|
| 212 | + file_end = file_map + sb.st_size; |
---|
| 213 | + |
---|
| 214 | + return file_map; |
---|
| 215 | +} |
---|
| 216 | + |
---|
177 | 217 | |
---|
178 | 218 | static unsigned char ideal_nop5_x86_64[5] = { 0x0f, 0x1f, 0x44, 0x00, 0x00 }; |
---|
179 | 219 | static unsigned char ideal_nop5_x86_32[5] = { 0x3e, 0x8d, 0x74, 0x26, 0x00 }; |
---|
.. | .. |
---|
198 | 238 | return -1; |
---|
199 | 239 | |
---|
200 | 240 | /* convert to nop */ |
---|
201 | | - ulseek(fd_map, offset - 1, SEEK_SET); |
---|
202 | | - uwrite(fd_map, ideal_nop, 5); |
---|
| 241 | + if (ulseek(offset - 1, SEEK_SET) < 0) |
---|
| 242 | + return -1; |
---|
| 243 | + if (uwrite(ideal_nop, 5) < 0) |
---|
| 244 | + return -1; |
---|
203 | 245 | return 0; |
---|
204 | 246 | } |
---|
205 | 247 | |
---|
.. | .. |
---|
247 | 289 | return -1; |
---|
248 | 290 | |
---|
249 | 291 | /* Convert to nop */ |
---|
250 | | - ulseek(fd_map, off, SEEK_SET); |
---|
| 292 | + if (ulseek(off, SEEK_SET) < 0) |
---|
| 293 | + return -1; |
---|
251 | 294 | |
---|
252 | 295 | do { |
---|
253 | | - uwrite(fd_map, ideal_nop, nop_size); |
---|
| 296 | + if (uwrite(ideal_nop, nop_size) < 0) |
---|
| 297 | + return -1; |
---|
254 | 298 | } while (--cnt > 0); |
---|
255 | 299 | |
---|
256 | 300 | return 0; |
---|
.. | .. |
---|
267 | 311 | return -1; |
---|
268 | 312 | |
---|
269 | 313 | /* Convert to nop */ |
---|
270 | | - ulseek(fd_map, offset, SEEK_SET); |
---|
271 | | - uwrite(fd_map, ideal_nop, 4); |
---|
| 314 | + if (ulseek(offset, SEEK_SET) < 0) |
---|
| 315 | + return -1; |
---|
| 316 | + if (uwrite(ideal_nop, 4) < 0) |
---|
| 317 | + return -1; |
---|
272 | 318 | return 0; |
---|
273 | 319 | } |
---|
274 | 320 | |
---|
275 | | -/* |
---|
276 | | - * Get the whole file as a programming convenience in order to avoid |
---|
277 | | - * malloc+lseek+read+free of many pieces. If successful, then mmap |
---|
278 | | - * avoids copying unused pieces; else just read the whole file. |
---|
279 | | - * Open for both read and write; new info will be appended to the file. |
---|
280 | | - * Use MAP_PRIVATE so that a few changes to the in-memory ElfXX_Ehdr |
---|
281 | | - * do not propagate to the file until an explicit overwrite at the last. |
---|
282 | | - * This preserves most aspects of consistency (all except .st_size) |
---|
283 | | - * for simultaneous readers of the file while we are appending to it. |
---|
284 | | - * However, multiple writers still are bad. We choose not to use |
---|
285 | | - * locking because it is expensive and the use case of kernel build |
---|
286 | | - * makes multiple writers unlikely. |
---|
287 | | - */ |
---|
288 | | -static void *mmap_file(char const *fname) |
---|
289 | | -{ |
---|
290 | | - fd_map = open(fname, O_RDONLY); |
---|
291 | | - if (fd_map < 0 || fstat(fd_map, &sb) < 0) { |
---|
292 | | - perror(fname); |
---|
293 | | - fail_file(); |
---|
294 | | - } |
---|
295 | | - if (!S_ISREG(sb.st_mode)) { |
---|
296 | | - fprintf(stderr, "not a regular file: %s\n", fname); |
---|
297 | | - fail_file(); |
---|
298 | | - } |
---|
299 | | - file_map = mmap(0, sb.st_size, PROT_READ|PROT_WRITE, MAP_PRIVATE, |
---|
300 | | - fd_map, 0); |
---|
301 | | - mmap_failed = 0; |
---|
302 | | - if (file_map == MAP_FAILED) { |
---|
303 | | - mmap_failed = 1; |
---|
304 | | - file_map = umalloc(sb.st_size); |
---|
305 | | - uread(fd_map, file_map, sb.st_size); |
---|
306 | | - } |
---|
307 | | - close(fd_map); |
---|
308 | | - |
---|
309 | | - file_end = file_map + sb.st_size; |
---|
310 | | - |
---|
311 | | - return file_map; |
---|
312 | | -} |
---|
313 | | - |
---|
314 | | -static void write_file(const char *fname) |
---|
| 321 | +static int write_file(const char *fname) |
---|
315 | 322 | { |
---|
316 | 323 | char tmp_file[strlen(fname) + 4]; |
---|
317 | 324 | size_t n; |
---|
318 | 325 | |
---|
319 | 326 | if (!file_updated) |
---|
320 | | - return; |
---|
| 327 | + return 0; |
---|
321 | 328 | |
---|
322 | 329 | sprintf(tmp_file, "%s.rc", fname); |
---|
323 | 330 | |
---|
.. | .. |
---|
329 | 336 | fd_map = open(tmp_file, O_WRONLY | O_TRUNC | O_CREAT, sb.st_mode); |
---|
330 | 337 | if (fd_map < 0) { |
---|
331 | 338 | perror(fname); |
---|
332 | | - fail_file(); |
---|
| 339 | + return -1; |
---|
333 | 340 | } |
---|
334 | 341 | n = write(fd_map, file_map, sb.st_size); |
---|
335 | 342 | if (n != sb.st_size) { |
---|
336 | 343 | perror("write"); |
---|
337 | | - fail_file(); |
---|
| 344 | + close(fd_map); |
---|
| 345 | + return -1; |
---|
338 | 346 | } |
---|
339 | 347 | if (file_append_size) { |
---|
340 | 348 | n = write(fd_map, file_append, file_append_size); |
---|
341 | 349 | if (n != file_append_size) { |
---|
342 | 350 | perror("write"); |
---|
343 | | - fail_file(); |
---|
| 351 | + close(fd_map); |
---|
| 352 | + return -1; |
---|
344 | 353 | } |
---|
345 | 354 | } |
---|
346 | 355 | close(fd_map); |
---|
347 | 356 | if (rename(tmp_file, fname) < 0) { |
---|
348 | 357 | perror(fname); |
---|
349 | | - fail_file(); |
---|
| 358 | + return -1; |
---|
350 | 359 | } |
---|
| 360 | + return 0; |
---|
351 | 361 | } |
---|
352 | 362 | |
---|
353 | 363 | /* w8rev, w8nat, ...: Handle endianness. */ |
---|
.. | .. |
---|
398 | 408 | static uint32_t (*w2)(uint16_t); |
---|
399 | 409 | |
---|
400 | 410 | /* Names of the sections that could contain calls to mcount. */ |
---|
401 | | -static int |
---|
402 | | -is_mcounted_section_name(char const *const txtname) |
---|
| 411 | +static int is_mcounted_section_name(char const *const txtname) |
---|
403 | 412 | { |
---|
404 | 413 | return strncmp(".text", txtname, 5) == 0 || |
---|
405 | 414 | strcmp(".init.text", txtname) == 0 || |
---|
.. | .. |
---|
409 | 418 | strcmp(".irqentry.text", txtname) == 0 || |
---|
410 | 419 | strcmp(".softirqentry.text", txtname) == 0 || |
---|
411 | 420 | strcmp(".kprobes.text", txtname) == 0 || |
---|
412 | | - strcmp(".cpuidle.text", txtname) == 0 || |
---|
413 | | - (strncmp(".text.", txtname, 6) == 0 && |
---|
414 | | - strcmp(".text..ftrace", txtname) != 0); |
---|
| 421 | + strcmp(".cpuidle.text", txtname) == 0; |
---|
415 | 422 | } |
---|
| 423 | + |
---|
| 424 | +static char const *already_has_rel_mcount = "success"; /* our work here is done! */ |
---|
416 | 425 | |
---|
417 | 426 | /* 32 bit and 64 bit are very similar */ |
---|
418 | 427 | #include "recordmcount.h" |
---|
.. | .. |
---|
429 | 438 | } |
---|
430 | 439 | |
---|
431 | 440 | return 1; |
---|
| 441 | +} |
---|
| 442 | + |
---|
| 443 | +static int arm64_is_fake_mcount(Elf64_Rel const *rp) |
---|
| 444 | +{ |
---|
| 445 | + return ELF64_R_TYPE(w8(rp->r_info)) != R_AARCH64_CALL26; |
---|
432 | 446 | } |
---|
433 | 447 | |
---|
434 | 448 | /* 64-bit EM_MIPS has weird ELF64_Rela.r_info. |
---|
.. | .. |
---|
464 | 478 | }).r_info; |
---|
465 | 479 | } |
---|
466 | 480 | |
---|
467 | | -static void |
---|
468 | | -do_file(char const *const fname) |
---|
| 481 | +static int do_file(char const *const fname) |
---|
469 | 482 | { |
---|
470 | | - Elf32_Ehdr *const ehdr = mmap_file(fname); |
---|
471 | 483 | unsigned int reltype = 0; |
---|
| 484 | + Elf32_Ehdr *ehdr; |
---|
| 485 | + int rc = -1; |
---|
| 486 | + |
---|
| 487 | + ehdr = mmap_file(fname); |
---|
| 488 | + if (!ehdr) |
---|
| 489 | + goto out; |
---|
472 | 490 | |
---|
473 | 491 | w = w4nat; |
---|
474 | 492 | w2 = w2nat; |
---|
.. | .. |
---|
478 | 496 | default: |
---|
479 | 497 | fprintf(stderr, "unrecognized ELF data encoding %d: %s\n", |
---|
480 | 498 | ehdr->e_ident[EI_DATA], fname); |
---|
481 | | - fail_file(); |
---|
482 | | - break; |
---|
| 499 | + goto out; |
---|
483 | 500 | case ELFDATA2LSB: |
---|
484 | 501 | if (*(unsigned char const *)&endian != 1) { |
---|
485 | 502 | /* main() is big endian, file.o is little endian. */ |
---|
.. | .. |
---|
507 | 524 | push_bl_mcount_thumb = push_bl_mcount_thumb_be; |
---|
508 | 525 | break; |
---|
509 | 526 | } /* end switch */ |
---|
510 | | - if (memcmp(ELFMAG, ehdr->e_ident, SELFMAG) != 0 |
---|
511 | | - || w2(ehdr->e_type) != ET_REL |
---|
512 | | - || ehdr->e_ident[EI_VERSION] != EV_CURRENT) { |
---|
| 527 | + if (memcmp(ELFMAG, ehdr->e_ident, SELFMAG) != 0 || |
---|
| 528 | + w2(ehdr->e_type) != ET_REL || |
---|
| 529 | + ehdr->e_ident[EI_VERSION] != EV_CURRENT) { |
---|
513 | 530 | fprintf(stderr, "unrecognized ET_REL file %s\n", fname); |
---|
514 | | - fail_file(); |
---|
| 531 | + goto out; |
---|
515 | 532 | } |
---|
516 | 533 | |
---|
517 | | - gpfx = 0; |
---|
| 534 | + gpfx = '_'; |
---|
518 | 535 | switch (w2(ehdr->e_machine)) { |
---|
519 | 536 | default: |
---|
520 | 537 | fprintf(stderr, "unrecognized e_machine %u %s\n", |
---|
521 | 538 | w2(ehdr->e_machine), fname); |
---|
522 | | - fail_file(); |
---|
523 | | - break; |
---|
| 539 | + goto out; |
---|
524 | 540 | case EM_386: |
---|
525 | 541 | reltype = R_386_32; |
---|
526 | 542 | rel_type_nop = R_386_NONE; |
---|
527 | 543 | make_nop = make_nop_x86; |
---|
528 | 544 | ideal_nop = ideal_nop5_x86_32; |
---|
529 | 545 | mcount_adjust_32 = -1; |
---|
| 546 | + gpfx = 0; |
---|
530 | 547 | break; |
---|
531 | | - case EM_ARM: reltype = R_ARM_ABS32; |
---|
532 | | - altmcount = "__gnu_mcount_nc"; |
---|
533 | | - make_nop = make_nop_arm; |
---|
534 | | - rel_type_nop = R_ARM_NONE; |
---|
535 | | - is_fake_mcount32 = arm_is_fake_mcount; |
---|
536 | | - break; |
---|
| 548 | + case EM_ARM: |
---|
| 549 | + reltype = R_ARM_ABS32; |
---|
| 550 | + altmcount = "__gnu_mcount_nc"; |
---|
| 551 | + make_nop = make_nop_arm; |
---|
| 552 | + rel_type_nop = R_ARM_NONE; |
---|
| 553 | + is_fake_mcount32 = arm_is_fake_mcount; |
---|
| 554 | + gpfx = 0; |
---|
| 555 | + break; |
---|
537 | 556 | case EM_AARCH64: |
---|
538 | | - reltype = R_AARCH64_ABS64; |
---|
539 | | - make_nop = make_nop_arm64; |
---|
540 | | - rel_type_nop = R_AARCH64_NONE; |
---|
541 | | - ideal_nop = ideal_nop4_arm64; |
---|
542 | | - gpfx = '_'; |
---|
543 | | - break; |
---|
544 | | - case EM_IA_64: reltype = R_IA64_IMM64; gpfx = '_'; break; |
---|
545 | | - case EM_MIPS: /* reltype: e_class */ gpfx = '_'; break; |
---|
546 | | - case EM_PPC: reltype = R_PPC_ADDR32; gpfx = '_'; break; |
---|
547 | | - case EM_PPC64: reltype = R_PPC64_ADDR64; gpfx = '_'; break; |
---|
548 | | - case EM_S390: /* reltype: e_class */ gpfx = '_'; break; |
---|
549 | | - case EM_SH: reltype = R_SH_DIR32; break; |
---|
550 | | - case EM_SPARCV9: reltype = R_SPARC_64; gpfx = '_'; break; |
---|
| 557 | + reltype = R_AARCH64_ABS64; |
---|
| 558 | + make_nop = make_nop_arm64; |
---|
| 559 | + rel_type_nop = R_AARCH64_NONE; |
---|
| 560 | + ideal_nop = ideal_nop4_arm64; |
---|
| 561 | + is_fake_mcount64 = arm64_is_fake_mcount; |
---|
| 562 | + break; |
---|
| 563 | + case EM_IA_64: reltype = R_IA64_IMM64; break; |
---|
| 564 | + case EM_MIPS: /* reltype: e_class */ break; |
---|
| 565 | + case EM_PPC: reltype = R_PPC_ADDR32; break; |
---|
| 566 | + case EM_PPC64: reltype = R_PPC64_ADDR64; break; |
---|
| 567 | + case EM_S390: /* reltype: e_class */ break; |
---|
| 568 | + case EM_SH: reltype = R_SH_DIR32; gpfx = 0; break; |
---|
| 569 | + case EM_SPARCV9: reltype = R_SPARC_64; break; |
---|
551 | 570 | case EM_X86_64: |
---|
552 | 571 | make_nop = make_nop_x86; |
---|
553 | 572 | ideal_nop = ideal_nop5_x86_64; |
---|
554 | 573 | reltype = R_X86_64_64; |
---|
555 | 574 | rel_type_nop = R_X86_64_NONE; |
---|
556 | 575 | mcount_adjust_64 = -1; |
---|
| 576 | + gpfx = 0; |
---|
557 | 577 | break; |
---|
558 | 578 | } /* end switch */ |
---|
559 | 579 | |
---|
.. | .. |
---|
561 | 581 | default: |
---|
562 | 582 | fprintf(stderr, "unrecognized ELF class %d %s\n", |
---|
563 | 583 | ehdr->e_ident[EI_CLASS], fname); |
---|
564 | | - fail_file(); |
---|
565 | | - break; |
---|
| 584 | + goto out; |
---|
566 | 585 | case ELFCLASS32: |
---|
567 | 586 | if (w2(ehdr->e_ehsize) != sizeof(Elf32_Ehdr) |
---|
568 | 587 | || w2(ehdr->e_shentsize) != sizeof(Elf32_Shdr)) { |
---|
569 | 588 | fprintf(stderr, |
---|
570 | 589 | "unrecognized ET_REL file: %s\n", fname); |
---|
571 | | - fail_file(); |
---|
| 590 | + goto out; |
---|
572 | 591 | } |
---|
573 | 592 | if (w2(ehdr->e_machine) == EM_MIPS) { |
---|
574 | 593 | reltype = R_MIPS_32; |
---|
575 | 594 | is_fake_mcount32 = MIPS32_is_fake_mcount; |
---|
576 | 595 | } |
---|
577 | | - do32(ehdr, fname, reltype); |
---|
| 596 | + if (do32(ehdr, fname, reltype) < 0) |
---|
| 597 | + goto out; |
---|
578 | 598 | break; |
---|
579 | 599 | case ELFCLASS64: { |
---|
580 | 600 | Elf64_Ehdr *const ghdr = (Elf64_Ehdr *)ehdr; |
---|
.. | .. |
---|
582 | 602 | || w2(ghdr->e_shentsize) != sizeof(Elf64_Shdr)) { |
---|
583 | 603 | fprintf(stderr, |
---|
584 | 604 | "unrecognized ET_REL file: %s\n", fname); |
---|
585 | | - fail_file(); |
---|
| 605 | + goto out; |
---|
586 | 606 | } |
---|
587 | 607 | if (w2(ghdr->e_machine) == EM_S390) { |
---|
588 | 608 | reltype = R_390_64; |
---|
.. | .. |
---|
594 | 614 | Elf64_r_info = MIPS64_r_info; |
---|
595 | 615 | is_fake_mcount64 = MIPS64_is_fake_mcount; |
---|
596 | 616 | } |
---|
597 | | - do64(ghdr, fname, reltype); |
---|
| 617 | + if (do64(ghdr, fname, reltype) < 0) |
---|
| 618 | + goto out; |
---|
598 | 619 | break; |
---|
599 | 620 | } |
---|
600 | 621 | } /* end switch */ |
---|
601 | 622 | |
---|
602 | | - write_file(fname); |
---|
603 | | - cleanup(); |
---|
| 623 | + rc = write_file(fname); |
---|
| 624 | +out: |
---|
| 625 | + file_append_cleanup(); |
---|
| 626 | + mmap_cleanup(); |
---|
| 627 | + return rc; |
---|
604 | 628 | } |
---|
605 | 629 | |
---|
606 | | -int |
---|
607 | | -main(int argc, char *argv[]) |
---|
| 630 | +int main(int argc, char *argv[]) |
---|
608 | 631 | { |
---|
609 | 632 | const char ftrace[] = "/ftrace.o"; |
---|
610 | 633 | int ftrace_size = sizeof(ftrace) - 1; |
---|
.. | .. |
---|
631 | 654 | /* Process each file in turn, allowing deep failure. */ |
---|
632 | 655 | for (i = optind; i < argc; i++) { |
---|
633 | 656 | char *file = argv[i]; |
---|
634 | | - int const sjval = setjmp(jmpenv); |
---|
635 | 657 | int len; |
---|
636 | 658 | |
---|
637 | 659 | /* |
---|
.. | .. |
---|
644 | 666 | strcmp(file + (len - ftrace_size), ftrace) == 0) |
---|
645 | 667 | continue; |
---|
646 | 668 | |
---|
647 | | - switch (sjval) { |
---|
648 | | - default: |
---|
649 | | - fprintf(stderr, "internal error: %s\n", file); |
---|
650 | | - exit(1); |
---|
651 | | - break; |
---|
652 | | - case SJ_SETJMP: /* normal sequence */ |
---|
653 | | - /* Avoid problems if early cleanup() */ |
---|
654 | | - fd_map = -1; |
---|
655 | | - mmap_failed = 1; |
---|
656 | | - file_map = NULL; |
---|
657 | | - file_ptr = NULL; |
---|
658 | | - file_updated = 0; |
---|
659 | | - do_file(file); |
---|
660 | | - break; |
---|
661 | | - case SJ_FAIL: /* error in do_file or below */ |
---|
| 669 | + if (do_file(file)) { |
---|
662 | 670 | fprintf(stderr, "%s: failed\n", file); |
---|
663 | 671 | ++n_error; |
---|
664 | | - break; |
---|
665 | | - case SJ_SUCCEED: /* premature success */ |
---|
666 | | - /* do nothing */ |
---|
667 | | - break; |
---|
668 | | - } /* end switch */ |
---|
| 672 | + } |
---|
669 | 673 | } |
---|
670 | 674 | return !!n_error; |
---|
671 | 675 | } |
---|