symbol.c 17.1 KB
Newer Older
1 2
#include "util.h"
#include "../perf.h"
3
#include "string.h"
4 5 6 7 8 9
#include "symbol.h"

#include <libelf.h>
#include <gelf.h>
#include <elf.h>

10 11
const char *sym_hist_filter;

12
static struct symbol *symbol__new(u64 start, u64 len,
13
				  const char *name, unsigned int priv_size,
14
				  u64 obj_start, int verbose)
15
{
16
	size_t namelen = strlen(name) + 1;
17
	struct symbol *self = calloc(1, priv_size + sizeof(*self) + namelen);
18

19 20 21 22 23
	if (!self)
		return NULL;

	if (verbose >= 2)
		printf("new symbol: %016Lx [%08lx]: %s, hist: %p, obj_start: %p\n",
24
			(u64)start, (unsigned long)len, name, self->hist, (void *)(unsigned long)obj_start);
25 26 27 28 29 30

	self->obj_start= obj_start;
	self->hist = NULL;
	self->hist_sum = 0;

	if (sym_hist_filter && !strcmp(name, sym_hist_filter))
31
		self->hist = calloc(sizeof(u64), len);
32 33 34 35

	if (priv_size) {
		memset(self, 0, priv_size);
		self = ((void *)self) + priv_size;
36
	}
37
	self->start = start;
38
	self->end   = len ? start + len - 1 : start;
39
	memcpy(self->name, name, namelen);
40 41 42 43

	return self;
}

44
static void symbol__delete(struct symbol *self, unsigned int priv_size)
45
{
46
	free(((void *)self) - priv_size);
47 48 49 50
}

static size_t symbol__fprintf(struct symbol *self, FILE *fp)
{
51 52
	if (!self->module)
		return fprintf(fp, " %llx-%llx %s\n",
53
		       self->start, self->end, self->name);
54 55 56
	else
		return fprintf(fp, " %llx-%llx %s \t[%s]\n",
		       self->start, self->end, self->name, self->module->name);
57 58
}

59
struct dso *dso__new(const char *name, unsigned int sym_priv_size)
60 61 62 63 64 65
{
	struct dso *self = malloc(sizeof(*self) + strlen(name) + 1);

	if (self != NULL) {
		strcpy(self->name, name);
		self->syms = RB_ROOT;
66
		self->sym_priv_size = sym_priv_size;
P
Peter Zijlstra 已提交
67
		self->find_symbol = dso__find_symbol;
68
		self->slen_calculated = 0;
69 70 71 72 73 74 75 76 77 78 79 80 81
	}

	return self;
}

static void dso__delete_symbols(struct dso *self)
{
	struct symbol *pos;
	struct rb_node *next = rb_first(&self->syms);

	while (next) {
		pos = rb_entry(next, struct symbol, rb_node);
		next = rb_next(&pos->rb_node);
82
		rb_erase(&pos->rb_node, &self->syms);
83
		symbol__delete(pos, self->sym_priv_size);
84 85 86 87 88 89 90 91 92 93 94 95 96
	}
}

void dso__delete(struct dso *self)
{
	dso__delete_symbols(self);
	free(self);
}

static void dso__insert_symbol(struct dso *self, struct symbol *sym)
{
	struct rb_node **p = &self->syms.rb_node;
	struct rb_node *parent = NULL;
97
	const u64 ip = sym->start;
98 99 100 101 102 103 104 105 106 107 108 109 110 111
	struct symbol *s;

	while (*p != NULL) {
		parent = *p;
		s = rb_entry(parent, struct symbol, rb_node);
		if (ip < s->start)
			p = &(*p)->rb_left;
		else
			p = &(*p)->rb_right;
	}
	rb_link_node(&sym->rb_node, parent, p);
	rb_insert_color(&sym->rb_node, &self->syms);
}

112
struct symbol *dso__find_symbol(struct dso *self, u64 ip)
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
{
	struct rb_node *n;

	if (self == NULL)
		return NULL;

	n = self->syms.rb_node;

	while (n) {
		struct symbol *s = rb_entry(n, struct symbol, rb_node);

		if (ip < s->start)
			n = n->rb_left;
		else if (ip > s->end)
			n = n->rb_right;
		else
			return s;
	}

	return NULL;
}

size_t dso__fprintf(struct dso *self, FILE *fp)
{
	size_t ret = fprintf(fp, "dso: %s\n", self->name);

	struct rb_node *nd;
	for (nd = rb_first(&self->syms); nd; nd = rb_next(nd)) {
		struct symbol *pos = rb_entry(nd, struct symbol, rb_node);
		ret += symbol__fprintf(pos, fp);
	}

	return ret;
}

148
static int dso__load_kallsyms(struct dso *self, symbol_filter_t filter, int verbose)
149 150 151 152 153
{
	struct rb_node *nd, *prevnd;
	char *line = NULL;
	size_t n;
	FILE *file = fopen("/proc/kallsyms", "r");
154
	int count = 0;
155 156 157 158 159

	if (file == NULL)
		goto out_failure;

	while (!feof(file)) {
160
		u64 start;
161 162 163 164 165 166 167 168 169 170 171 172 173
		struct symbol *sym;
		int line_len, len;
		char symbol_type;

		line_len = getline(&line, &n, file);
		if (line_len < 0)
			break;

		if (!line)
			goto out_failure;

		line[--line_len] = '\0'; /* \n */

174
		len = hex2u64(line, &start);
175 176 177 178 179 180 181 182 183 184 185 186 187 188

		len++;
		if (len + 2 >= line_len)
			continue;

		symbol_type = toupper(line[len]);
		/*
		 * We're interested only in code ('T'ext)
		 */
		if (symbol_type != 'T' && symbol_type != 'W')
			continue;
		/*
		 * Well fix up the end later, when we have all sorted.
		 */
189
		sym = symbol__new(start, 0xdead, line + len + 2,
190
				  self->sym_priv_size, 0, verbose);
191 192 193 194

		if (sym == NULL)
			goto out_delete_line;

195 196
		if (filter && filter(self, sym))
			symbol__delete(sym, self->sym_priv_size);
197
		else {
198
			dso__insert_symbol(self, sym);
199 200
			count++;
		}
201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222
	}

	/*
	 * Now that we have all sorted out, just set the ->end of all
	 * symbols
	 */
	prevnd = rb_first(&self->syms);

	if (prevnd == NULL)
		goto out_delete_line;

	for (nd = rb_next(prevnd); nd; nd = rb_next(nd)) {
		struct symbol *prev = rb_entry(prevnd, struct symbol, rb_node),
			      *curr = rb_entry(nd, struct symbol, rb_node);

		prev->end = curr->start - 1;
		prevnd = nd;
	}

	free(line);
	fclose(file);

223
	return count;
224 225 226 227 228 229 230

out_delete_line:
	free(line);
out_failure:
	return -1;
}

231 232 233 234 235 236 237 238 239 240 241 242
static int dso__load_perf_map(struct dso *self, symbol_filter_t filter, int verbose)
{
	char *line = NULL;
	size_t n;
	FILE *file;
	int nr_syms = 0;

	file = fopen(self->name, "r");
	if (file == NULL)
		goto out_failure;

	while (!feof(file)) {
243
		u64 start, size;
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 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292
		struct symbol *sym;
		int line_len, len;

		line_len = getline(&line, &n, file);
		if (line_len < 0)
			break;

		if (!line)
			goto out_failure;

		line[--line_len] = '\0'; /* \n */

		len = hex2u64(line, &start);

		len++;
		if (len + 2 >= line_len)
			continue;

		len += hex2u64(line + len, &size);

		len++;
		if (len + 2 >= line_len)
			continue;

		sym = symbol__new(start, size, line + len,
				  self->sym_priv_size, start, verbose);

		if (sym == NULL)
			goto out_delete_line;

		if (filter && filter(self, sym))
			symbol__delete(sym, self->sym_priv_size);
		else {
			dso__insert_symbol(self, sym);
			nr_syms++;
		}
	}

	free(line);
	fclose(file);

	return nr_syms;

out_delete_line:
	free(line);
out_failure:
	return -1;
}

293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317
/**
 * elf_symtab__for_each_symbol - iterate thru all the symbols
 *
 * @self: struct elf_symtab instance to iterate
 * @index: uint32_t index
 * @sym: GElf_Sym iterator
 */
#define elf_symtab__for_each_symbol(syms, nr_syms, index, sym) \
	for (index = 0, gelf_getsym(syms, index, &sym);\
	     index < nr_syms; \
	     index++, gelf_getsym(syms, index, &sym))

static inline uint8_t elf_sym__type(const GElf_Sym *sym)
{
	return GELF_ST_TYPE(sym->st_info);
}

static inline int elf_sym__is_function(const GElf_Sym *sym)
{
	return elf_sym__type(sym) == STT_FUNC &&
	       sym->st_name != 0 &&
	       sym->st_shndx != SHN_UNDEF &&
	       sym->st_size != 0;
}

318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337
static inline int elf_sym__is_label(const GElf_Sym *sym)
{
	return elf_sym__type(sym) == STT_NOTYPE &&
		sym->st_name != 0 &&
		sym->st_shndx != SHN_UNDEF &&
		sym->st_shndx != SHN_ABS;
}

static inline const char *elf_sec__name(const GElf_Shdr *shdr,
					const Elf_Data *secstrs)
{
	return secstrs->d_buf + shdr->sh_name;
}

static inline int elf_sec__is_text(const GElf_Shdr *shdr,
					const Elf_Data *secstrs)
{
	return strstr(elf_sec__name(shdr, secstrs), "text") != NULL;
}

338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366
static inline const char *elf_sym__name(const GElf_Sym *sym,
					const Elf_Data *symstrs)
{
	return symstrs->d_buf + sym->st_name;
}

static Elf_Scn *elf_section_by_name(Elf *elf, GElf_Ehdr *ep,
				    GElf_Shdr *shp, const char *name,
				    size_t *index)
{
	Elf_Scn *sec = NULL;
	size_t cnt = 1;

	while ((sec = elf_nextscn(elf, sec)) != NULL) {
		char *str;

		gelf_getshdr(sec, shp);
		str = elf_strptr(elf, ep->e_shstrndx, shp->sh_name);
		if (!strcmp(name, str)) {
			if (index)
				*index = cnt;
			break;
		}
		++cnt;
	}

	return sec;
}

367 368 369 370 371 372 373 374 375 376
#define elf_section__for_each_rel(reldata, pos, pos_mem, idx, nr_entries) \
	for (idx = 0, pos = gelf_getrel(reldata, 0, &pos_mem); \
	     idx < nr_entries; \
	     ++idx, pos = gelf_getrel(reldata, idx, &pos_mem))

#define elf_section__for_each_rela(reldata, pos, pos_mem, idx, nr_entries) \
	for (idx = 0, pos = gelf_getrela(reldata, 0, &pos_mem); \
	     idx < nr_entries; \
	     ++idx, pos = gelf_getrela(reldata, idx, &pos_mem))

377 378 379 380 381 382 383 384
/*
 * We need to check if we have a .dynsym, so that we can handle the
 * .plt, synthesizing its symbols, that aren't on the symtabs (be it
 * .dynsym or .symtab).
 * And always look at the original dso, not at debuginfo packages, that
 * have the PLT data stripped out (shdr_rel_plt.sh_type == SHT_NOBITS).
 */
static int dso__synthesize_plt_symbols(struct  dso *self, int verbose)
385 386 387
{
	uint32_t nr_rel_entries, idx;
	GElf_Sym sym;
388
	u64 plt_offset;
389 390
	GElf_Shdr shdr_plt;
	struct symbol *f;
391
	GElf_Shdr shdr_rel_plt, shdr_dynsym;
392
	Elf_Data *reldata, *syms, *symstrs;
393 394 395
	Elf_Scn *scn_plt_rel, *scn_symstrs, *scn_dynsym;
	size_t dynsym_idx;
	GElf_Ehdr ehdr;
396
	char sympltname[1024];
397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414
	Elf *elf;
	int nr = 0, symidx, fd, err = 0;

	fd = open(self->name, O_RDONLY);
	if (fd < 0)
		goto out;

	elf = elf_begin(fd, ELF_C_READ_MMAP, NULL);
	if (elf == NULL)
		goto out_close;

	if (gelf_getehdr(elf, &ehdr) == NULL)
		goto out_elf_end;

	scn_dynsym = elf_section_by_name(elf, &ehdr, &shdr_dynsym,
					 ".dynsym", &dynsym_idx);
	if (scn_dynsym == NULL)
		goto out_elf_end;
415

416
	scn_plt_rel = elf_section_by_name(elf, &ehdr, &shdr_rel_plt,
417 418
					  ".rela.plt", NULL);
	if (scn_plt_rel == NULL) {
419
		scn_plt_rel = elf_section_by_name(elf, &ehdr, &shdr_rel_plt,
420 421
						  ".rel.plt", NULL);
		if (scn_plt_rel == NULL)
422
			goto out_elf_end;
423 424
	}

425 426
	err = -1;

427
	if (shdr_rel_plt.sh_link != dynsym_idx)
428
		goto out_elf_end;
429

430 431
	if (elf_section_by_name(elf, &ehdr, &shdr_plt, ".plt", NULL) == NULL)
		goto out_elf_end;
432 433 434 435 436 437 438

	/*
	 * Fetch the relocation section to find the indexes to the GOT
	 * and the symbols in the .dynsym they refer to.
	 */
	reldata = elf_getdata(scn_plt_rel, NULL);
	if (reldata == NULL)
439
		goto out_elf_end;
440 441 442

	syms = elf_getdata(scn_dynsym, NULL);
	if (syms == NULL)
443
		goto out_elf_end;
444

445
	scn_symstrs = elf_getscn(elf, shdr_dynsym.sh_link);
446
	if (scn_symstrs == NULL)
447
		goto out_elf_end;
448 449 450

	symstrs = elf_getdata(scn_symstrs, NULL);
	if (symstrs == NULL)
451
		goto out_elf_end;
452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467

	nr_rel_entries = shdr_rel_plt.sh_size / shdr_rel_plt.sh_entsize;
	plt_offset = shdr_plt.sh_offset;

	if (shdr_rel_plt.sh_type == SHT_RELA) {
		GElf_Rela pos_mem, *pos;

		elf_section__for_each_rela(reldata, pos, pos_mem, idx,
					   nr_rel_entries) {
			symidx = GELF_R_SYM(pos->r_info);
			plt_offset += shdr_plt.sh_entsize;
			gelf_getsym(syms, symidx, &sym);
			snprintf(sympltname, sizeof(sympltname),
				 "%s@plt", elf_sym__name(&sym, symstrs));

			f = symbol__new(plt_offset, shdr_plt.sh_entsize,
468
					sympltname, self->sym_priv_size, 0, verbose);
469
			if (!f)
470
				goto out_elf_end;
471 472 473 474 475 476 477 478 479 480 481 482 483 484 485

			dso__insert_symbol(self, f);
			++nr;
		}
	} else if (shdr_rel_plt.sh_type == SHT_REL) {
		GElf_Rel pos_mem, *pos;
		elf_section__for_each_rel(reldata, pos, pos_mem, idx,
					  nr_rel_entries) {
			symidx = GELF_R_SYM(pos->r_info);
			plt_offset += shdr_plt.sh_entsize;
			gelf_getsym(syms, symidx, &sym);
			snprintf(sympltname, sizeof(sympltname),
				 "%s@plt", elf_sym__name(&sym, symstrs));

			f = symbol__new(plt_offset, shdr_plt.sh_entsize,
486
					sympltname, self->sym_priv_size, 0, verbose);
487
			if (!f)
488
				goto out_elf_end;
489 490 491 492 493 494

			dso__insert_symbol(self, f);
			++nr;
		}
	}

495 496 497 498 499 500 501 502 503 504 505 506
	err = 0;
out_elf_end:
	elf_end(elf);
out_close:
	close(fd);

	if (err == 0)
		return nr;
out:
	fprintf(stderr, "%s: problems reading %s PLT info.\n",
		__func__, self->name);
	return 0;
507 508
}

509
static int dso__load_sym(struct dso *self, int fd, const char *name,
510
			 symbol_filter_t filter, int verbose, struct module *mod)
511
{
512
	Elf_Data *symstrs, *secstrs;
513 514 515 516 517 518 519
	uint32_t nr_syms;
	int err = -1;
	uint32_t index;
	GElf_Ehdr ehdr;
	GElf_Shdr shdr;
	Elf_Data *syms;
	GElf_Sym sym;
520
	Elf_Scn *sec, *sec_strndx;
521 522 523 524 525
	Elf *elf;
	int nr = 0;

	elf = elf_begin(fd, ELF_C_READ_MMAP, NULL);
	if (elf == NULL) {
526 527 528
		if (verbose)
			fprintf(stderr, "%s: cannot read %s ELF file.\n",
				__func__, name);
529 530 531 532
		goto out_close;
	}

	if (gelf_getehdr(elf, &ehdr) == NULL) {
533 534
		if (verbose)
			fprintf(stderr, "%s: cannot get elf header.\n", __func__);
535 536 537 538
		goto out_elf_end;
	}

	sec = elf_section_by_name(elf, &ehdr, &shdr, ".symtab", NULL);
539
	if (sec == NULL) {
540 541
		sec = elf_section_by_name(elf, &ehdr, &shdr, ".dynsym", NULL);
		if (sec == NULL)
542 543
			goto out_elf_end;
	}
544 545 546 547 548 549 550 551 552 553 554 555 556

	syms = elf_getdata(sec, NULL);
	if (syms == NULL)
		goto out_elf_end;

	sec = elf_getscn(elf, shdr.sh_link);
	if (sec == NULL)
		goto out_elf_end;

	symstrs = elf_getdata(sec, NULL);
	if (symstrs == NULL)
		goto out_elf_end;

557 558 559 560 561 562 563 564
	sec_strndx = elf_getscn(elf, ehdr.e_shstrndx);
	if (sec_strndx == NULL)
		goto out_elf_end;

	secstrs = elf_getdata(sec_strndx, NULL);
	if (symstrs == NULL)
		goto out_elf_end;

565 566
	nr_syms = shdr.sh_size / shdr.sh_entsize;

567
	memset(&sym, 0, sizeof(sym));
568 569 570 571
	self->adjust_symbols = (ehdr.e_type == ET_EXEC ||
				elf_section_by_name(elf, &ehdr, &shdr,
						     ".gnu.prelink_undo",
						     NULL) != NULL);
572 573
	elf_symtab__for_each_symbol(syms, nr_syms, index, sym) {
		struct symbol *f;
574
		u64 obj_start;
575 576 577
		struct section *section = NULL;
		int is_label = elf_sym__is_label(&sym);
		const char *section_name;
578

579
		if (!is_label && !elf_sym__is_function(&sym))
580 581 582 583 584 585 586
			continue;

		sec = elf_getscn(elf, sym.st_shndx);
		if (!sec)
			goto out_elf_end;

		gelf_getshdr(sec, &shdr);
587 588 589 590 591

		if (is_label && !elf_sec__is_text(&shdr, secstrs))
			continue;

		section_name = elf_sec__name(&shdr, secstrs);
592 593
		obj_start = sym.st_value;

594
		if (self->adjust_symbols) {
595 596 597
			if (verbose >= 2)
				printf("adjusting symbol: st_value: %Lx sh_addr: %Lx sh_offset: %Lx\n",
					(u64)sym.st_value, (u64)shdr.sh_addr, (u64)shdr.sh_offset);
598

599 600
			sym.st_value -= shdr.sh_addr - shdr.sh_offset;
		}
601

602 603 604 605 606 607 608 609 610 611 612
		if (mod) {
			section = mod->sections->find_section(mod->sections, section_name);
			if (section)
				sym.st_value += section->vma;
			else {
				fprintf(stderr, "dso__load_sym() module %s lookup of %s failed\n",
					mod->name, section_name);
				goto out_elf_end;
			}
		}

613
		f = symbol__new(sym.st_value, sym.st_size,
614
				elf_sym__name(&sym, symstrs),
615
				self->sym_priv_size, obj_start, verbose);
616 617 618
		if (!f)
			goto out_elf_end;

619 620 621
		if (filter && filter(self, f))
			symbol__delete(f, self->sym_priv_size);
		else {
622
			f->module = mod;
623 624 625
			dso__insert_symbol(self, f);
			nr++;
		}
626 627 628 629 630 631 632 633 634
	}

	err = nr;
out_elf_end:
	elf_end(elf);
out_close:
	return err;
}

635
int dso__load(struct dso *self, symbol_filter_t filter, int verbose)
636 637 638 639 640 641 642 643 644 645
{
	int size = strlen(self->name) + sizeof("/usr/lib/debug%s.debug");
	char *name = malloc(size);
	int variant = 0;
	int ret = -1;
	int fd;

	if (!name)
		return -1;

646
	self->adjust_symbols = 0;
647

648 649 650
	if (strncmp(self->name, "/tmp/perf-", 10) == 0)
		return dso__load_perf_map(self, filter, verbose);

651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671
more:
	do {
		switch (variant) {
		case 0: /* Fedora */
			snprintf(name, size, "/usr/lib/debug%s.debug", self->name);
			break;
		case 1: /* Ubuntu */
			snprintf(name, size, "/usr/lib/debug%s", self->name);
			break;
		case 2: /* Sane people */
			snprintf(name, size, "%s", self->name);
			break;

		default:
			goto out;
		}
		variant++;

		fd = open(name, O_RDONLY);
	} while (fd < 0);

672
	ret = dso__load_sym(self, fd, name, filter, verbose, NULL);
673 674 675 676 677 678 679 680
	close(fd);

	/*
	 * Some people seem to have debuginfo files _WITHOUT_ debug info!?!?
	 */
	if (!ret)
		goto more;

681 682 683 684 685
	if (ret > 0) {
		int nr_plt = dso__synthesize_plt_symbols(self, verbose);
		if (nr_plt > 0)
			ret += nr_plt;
	}
686 687 688 689 690
out:
	free(name);
	return ret;
}

691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770
static int dso__load_module(struct dso *self, struct mod_dso *mods, const char *name,
			     symbol_filter_t filter, int verbose)
{
	struct module *mod = mod_dso__find_module(mods, name);
	int err = 0, fd;

	if (mod == NULL || !mod->active)
		return err;

	fd = open(mod->path, O_RDONLY);

	if (fd < 0)
		return err;

	err = dso__load_sym(self, fd, name, filter, verbose, mod);
	close(fd);

	return err;
}

int dso__load_modules(struct dso *self, symbol_filter_t filter, int verbose)
{
	struct mod_dso *mods = mod_dso__new_dso("modules");
	struct module *pos;
	struct rb_node *next;
	int err;

	err = mod_dso__load_modules(mods);

	if (err <= 0)
		return err;

	/*
	 * Iterate over modules, and load active symbols.
	 */
	next = rb_first(&mods->mods);
	while (next) {
		pos = rb_entry(next, struct module, rb_node);
		err = dso__load_module(self, mods, pos->name, filter, verbose);

		if (err < 0)
			break;

		next = rb_next(&pos->rb_node);
	}

	if (err < 0) {
		mod_dso__delete_modules(mods);
		mod_dso__delete_self(mods);
	}

	return err;
}

static inline void dso__fill_symbol_holes(struct dso *self)
{
	struct symbol *prev = NULL;
	struct rb_node *nd;

	for (nd = rb_last(&self->syms); nd; nd = rb_prev(nd)) {
		struct symbol *pos = rb_entry(nd, struct symbol, rb_node);

		if (prev) {
			u64 hole = 0;
			int alias = pos->start == prev->start;

			if (!alias)
				hole = prev->start - pos->end - 1;

			if (hole || alias) {
				if (alias)
					pos->end = prev->end;
				else if (hole)
					pos->end = prev->start - 1;
			}
		}
		prev = pos;
	}
}

771
static int dso__load_vmlinux(struct dso *self, const char *vmlinux,
772
			     symbol_filter_t filter, int verbose)
773 774 775 776 777 778
{
	int err, fd = open(vmlinux, O_RDONLY);

	if (fd < 0)
		return -1;

779 780 781 782 783
	err = dso__load_sym(self, fd, vmlinux, filter, verbose, NULL);

	if (err > 0)
		dso__fill_symbol_holes(self);

784 785 786 787 788
	close(fd);

	return err;
}

789
int dso__load_kernel(struct dso *self, const char *vmlinux,
790
		     symbol_filter_t filter, int verbose, int modules)
791 792 793
{
	int err = -1;

794
	if (vmlinux) {
795
		err = dso__load_vmlinux(self, vmlinux, filter, verbose);
796 797 798
		if (err > 0 && modules)
			err = dso__load_modules(self, filter, verbose);
	}
799

800
	if (err <= 0)
801
		err = dso__load_kallsyms(self, filter, verbose);
802 803 804 805

	return err;
}

806 807 808 809
void symbol__init(void)
{
	elf_version(EV_CURRENT);
}