perf tools: Make it possible to read object code from vmlinux (39b12f78) · Commits · 戴 / test

tools/perf/util/dso.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -78,6 +78,8 @@ int dso__binary_type_file(struct dso *dso, enum dso_binary_type type,
		symbol_conf.symfs, build_id_hex, build_id_hex + 2);
		break;

		case DSO_BINARY_TYPE__VMLINUX:
		case DSO_BINARY_TYPE__GUEST_VMLINUX:
		case DSO_BINARY_TYPE__SYSTEM_PATH_DSO:
		snprintf(file, size, "%s%s",
		symbol_conf.symfs, dso->long_name);
		@@ -95,9 +97,7 @@ int dso__binary_type_file(struct dso *dso, enum dso_binary_type type,

		default:
		case DSO_BINARY_TYPE__KALLSYMS:
		case DSO_BINARY_TYPE__VMLINUX:
		case DSO_BINARY_TYPE__GUEST_KALLSYMS:
		case DSO_BINARY_TYPE__GUEST_VMLINUX:
		case DSO_BINARY_TYPE__JAVA_JIT:
		case DSO_BINARY_TYPE__NOT_FOUND:
		ret = -1;

tools/perf/util/dso.h

+8 −0

Original line number	Diff line number	Diff line
		@@ -3,6 +3,7 @@

		#include <linux/types.h>
		#include <linux/rbtree.h>
		#include <stdbool.h>
		#include "types.h"
		#include "map.h"

		@@ -146,4 +147,11 @@ size_t dso__fprintf_buildid(struct dso dso, FILE fp);
		size_t dso__fprintf_symbols_by_name(struct dso *dso,
		enum map_type type, FILE *fp);
		size_t dso__fprintf(struct dso dso, enum map_type type, FILE fp);

		static inline bool dso__is_vmlinux(struct dso *dso)
		{
		return dso->data_type == DSO_BINARY_TYPE__VMLINUX \|\|
		dso->data_type == DSO_BINARY_TYPE__GUEST_VMLINUX;
		}

		#endif /* __PERF_DSO */

tools/perf/util/machine.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -628,10 +628,8 @@ int machine__load_vmlinux_path(struct machine *machine, enum map_type type,
		struct map *map = machine->vmlinux_maps[type];
		int ret = dso__load_vmlinux_path(map->dso, map, filter);

		if (ret > 0) {
		if (ret > 0)
		dso__set_loaded(map->dso, type);
		map__reloc_vmlinux(map);
		}

		return ret;
		}

tools/perf/util/map.c

+0 −35

Original line number	Diff line number	Diff line
		@@ -182,12 +182,6 @@ int map__load(struct map *map, symbol_filter_t filter)
		#endif
		return -1;
		}
		/*
		* Only applies to the kernel, as its symtabs aren't relative like the
		* module ones.
		*/
		if (map->dso->kernel)
		map__reloc_vmlinux(map);

		return 0;
		}
		@@ -513,35 +507,6 @@ int map_groups__clone(struct map_groups *mg,
		return 0;
		}

		static u64 map__reloc_map_ip(struct map *map, u64 ip)
		{
		return ip + (s64)map->pgoff;
		}

		static u64 map__reloc_unmap_ip(struct map *map, u64 ip)
		{
		return ip - (s64)map->pgoff;
		}

		void map__reloc_vmlinux(struct map *map)
		{
		struct kmap *kmap = map__kmap(map);
		s64 reloc;

		if (!kmap->ref_reloc_sym \|\| !kmap->ref_reloc_sym->unrelocated_addr)
		return;

		reloc = (kmap->ref_reloc_sym->unrelocated_addr -
		kmap->ref_reloc_sym->addr);

		if (!reloc)
		return;

		map->map_ip = map__reloc_map_ip;
		map->unmap_ip = map__reloc_unmap_ip;
		map->pgoff = reloc;
		}

		void maps__insert(struct rb_root maps, struct map map)
		{
		struct rb_node **p = &maps->rb_node;

tools/perf/util/symbol-elf.c

+91 −9

Original line number	Diff line number	Diff line
		@@ -603,7 +603,7 @@ int symsrc__init(struct symsrc ss, struct dso dso, const char *name,
		".gnu.prelink_undo",
		NULL) != NULL);
		} else {
		ss->adjust_symbols = 0;
		ss->adjust_symbols = ehdr.e_type == ET_EXEC;
		}

		ss->name = strdup(name);
		@@ -624,6 +624,37 @@ out_close:
		return err;
		}

		/**
		* ref_reloc_sym_not_found - has kernel relocation symbol been found.
		* @kmap: kernel maps and relocation reference symbol
		*
		* This function returns %true if we are dealing with the kernel maps and the
		* relocation reference symbol has not yet been found. Otherwise %false is
		* returned.
		*/
		static bool ref_reloc_sym_not_found(struct kmap *kmap)
		{
		return kmap && kmap->ref_reloc_sym && kmap->ref_reloc_sym->name &&
		!kmap->ref_reloc_sym->unrelocated_addr;
		}

		/**
		* ref_reloc - kernel relocation offset.
		* @kmap: kernel maps and relocation reference symbol
		*
		* This function returns the offset of kernel addresses as determined by using
		* the relocation reference symbol i.e. if the kernel has not been relocated
		* then the return value is zero.
		*/
		static u64 ref_reloc(struct kmap *kmap)
		{
		if (kmap && kmap->ref_reloc_sym &&
		kmap->ref_reloc_sym->unrelocated_addr)
		return kmap->ref_reloc_sym->addr -
		kmap->ref_reloc_sym->unrelocated_addr;
		return 0;
		}

		int dso__load_sym(struct dso dso, struct map map,
		struct symsrc syms_ss, struct symsrc runtime_ss,
		symbol_filter_t filter, int kmodule)
		@@ -642,6 +673,7 @@ int dso__load_sym(struct dso dso, struct map map,
		Elf_Scn sec, sec_strndx;
		Elf *elf;
		int nr = 0;
		bool remap_kernel = false, adjust_kernel_syms = false;

		dso->symtab_type = syms_ss->type;

		@@ -681,7 +713,31 @@ int dso__load_sym(struct dso dso, struct map map,
		nr_syms = shdr.sh_size / shdr.sh_entsize;

		memset(&sym, 0, sizeof(sym));
		dso->adjust_symbols = runtime_ss->adjust_symbols;

		/*
		* The kernel relocation symbol is needed in advance in order to adjust
		* kernel maps correctly.
		*/
		if (ref_reloc_sym_not_found(kmap)) {
		elf_symtab__for_each_symbol(syms, nr_syms, idx, sym) {
		const char *elf_name = elf_sym__name(&sym, symstrs);

		if (strcmp(elf_name, kmap->ref_reloc_sym->name))
		continue;
		kmap->ref_reloc_sym->unrelocated_addr = sym.st_value;
		break;
		}
		}

		dso->adjust_symbols = runtime_ss->adjust_symbols \|\| ref_reloc(kmap);
		/*
		* Initial kernel and module mappings do not map to the dso. For
		* function mappings, flag the fixups.
		*/
		if (map->type == MAP__FUNCTION && (dso->kernel \|\| kmodule)) {
		remap_kernel = true;
		adjust_kernel_syms = dso->adjust_symbols;
		}
		elf_symtab__for_each_symbol(syms, nr_syms, idx, sym) {
		struct symbol *f;
		const char *elf_name = elf_sym__name(&sym, symstrs);
		@@ -690,10 +746,6 @@ int dso__load_sym(struct dso dso, struct map map,
		const char *section_name;
		bool used_opd = false;

		if (kmap && kmap->ref_reloc_sym && kmap->ref_reloc_sym->name &&
		strcmp(elf_name, kmap->ref_reloc_sym->name) == 0)
		kmap->ref_reloc_sym->unrelocated_addr = sym.st_value;

		if (!is_label && !elf_sym__is_a(&sym, map->type))
		continue;

		@@ -745,15 +797,37 @@ int dso__load_sym(struct dso dso, struct map map,
		(sym.st_value & 1))
		--sym.st_value;

		if (dso->kernel != DSO_TYPE_USER \|\| kmodule) {
		if (dso->kernel \|\| kmodule) {
		char dso_name[PATH_MAX];

		/* Adjust symbol to map to file offset */
		if (adjust_kernel_syms)
		sym.st_value -= shdr.sh_addr - shdr.sh_offset;

		if (strcmp(section_name,
		(curr_dso->short_name +
		dso->short_name_len)) == 0)
		goto new_symbol;

		if (strcmp(section_name, ".text") == 0) {
		/*
		* The initial kernel mapping is based on
		* kallsyms and identity maps. Overwrite it to
		* map to the kernel dso.
		*/
		if (remap_kernel && dso->kernel) {
		remap_kernel = false;
		map->start = shdr.sh_addr +
		ref_reloc(kmap);
		map->end = map->start + shdr.sh_size;
		map->pgoff = shdr.sh_offset;
		map->map_ip = map__map_ip;
		map->unmap_ip = map__unmap_ip;
		/* Ensure maps are correctly ordered */
		map_groups__remove(kmap->kmaps, map);
		map_groups__insert(kmap->kmaps, map);
		}

		curr_map = map;
		curr_dso = dso;
		goto new_symbol;
		@@ -781,8 +855,16 @@ int dso__load_sym(struct dso dso, struct map map,
		dso__delete(curr_dso);
		goto out_elf_end;
		}
		if (adjust_kernel_syms) {
		curr_map->start = shdr.sh_addr +
		ref_reloc(kmap);
		curr_map->end = curr_map->start +
		shdr.sh_size;
		curr_map->pgoff = shdr.sh_offset;
		} else {
		curr_map->map_ip = identity__map_ip;
		curr_map->unmap_ip = identity__map_ip;
		}
		curr_dso->symtab_type = dso->symtab_type;
		map_groups__insert(kmap->kmaps, curr_map);
		dsos__add(&dso->node, curr_dso);

Admin message