Add reference count checking to struct dso, this can help with implementing correct reference counting discipline. To avoid RC_CHK_ACCESS everywhere, add accessor functions for the variables in struct dso. The majority of the change is mechanical in nature and not easy to split up. Committer testing: 'perf test' up to this patch shows no regressions. But: util/symbol.c: In function ‘dso__load_bfd_symbols’: util/symbol.c:1683:9: error: too few arguments to function ‘dso__set_adjust_symbols’ 1683 | dso__set_adjust_symbols(dso); | ^~~~~~~~~~~~~~~~~~~~~~~ In file included from util/symbol.c:21: util/dso.h:268:20: note: declared here 268 | static inline void dso__set_adjust_symbols(struct dso *dso, bool val) | ^~~~~~~~~~~~~~~~~~~~~~~ make[6]: *** [/home/acme/git/perf-tools-next/tools/build/Makefile.build:106: /tmp/tmp.ZWHbQftdN6/util/symbol.o] Error 1 MKDIR /tmp/tmp.ZWHbQftdN6/tests/workloads/ make[6]: *** Waiting for unfinished jobs.... This was updated: - symbols__fixup_end(&dso->symbols, false); - symbols__fixup_duplicate(&dso->symbols); - dso->adjust_symbols = 1; + symbols__fixup_end(dso__symbols(dso), false); + symbols__fixup_duplicate(dso__symbols(dso)); + dso__set_adjust_symbols(dso); But not build tested with BUILD_NONDISTRO and libbfd devel files installed (binutils-devel on fedora). Add the missing argument: symbols__fixup_end(dso__symbols(dso), false); symbols__fixup_duplicate(dso__symbols(dso)); - dso__set_adjust_symbols(dso); + dso__set_adjust_symbols(dso, true); Signed-off-by: Ian Rogers <irogers@google.com> Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Andi Kleen <ak@linux.intel.com> Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com> Cc: Ben Gainey <ben.gainey@arm.com> Cc: Changbin Du <changbin.du@huawei.com> Cc: Chengen Du <chengen.du@canonical.com> Cc: Colin Ian King <colin.i.king@gmail.com> Cc: Dima Kogan <dima@secretsauce.net> Cc: Ilkka Koskinen <ilkka@os.amperecomputing.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: James Clark <james.clark@arm.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: K Prateek Nayak <kprateek.nayak@amd.com> Cc: Kan Liang <kan.liang@linux.intel.com> Cc: Leo Yan <leo.yan@linux.dev> Cc: Li Dong <lidong@vivo.com> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Masami Hiramatsu <mhiramat@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Paran Lee <p4ranlee@gmail.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Song Liu <song@kernel.org> Cc: Sun Haiyong <sunhaiyong@loongson.cn> Cc: Thomas Richter <tmricht@linux.ibm.com> Cc: Tiezhu Yang <yangtiezhu@loongson.cn> Cc: Yanteng Si <siyanteng@loongson.cn> Cc: zhaimingbing <zhaimingbing@cmss.chinamobile.com> Link: https://lore.kernel.org/r/20240504213803.218974-6-irogers@google.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
170 lines
4.3 KiB
C
170 lines
4.3 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
/*
|
|
* Instruction binary disassembler based on capstone.
|
|
*
|
|
* Author(s): Changbin Du <changbin.du@huawei.com>
|
|
*/
|
|
#include <inttypes.h>
|
|
#include <string.h>
|
|
#include <stdbool.h>
|
|
#include "debug.h"
|
|
#include "sample.h"
|
|
#include "symbol.h"
|
|
#include "machine.h"
|
|
#include "thread.h"
|
|
#include "print_insn.h"
|
|
#include "dump-insn.h"
|
|
#include "map.h"
|
|
#include "dso.h"
|
|
|
|
size_t sample__fprintf_insn_raw(struct perf_sample *sample, FILE *fp)
|
|
{
|
|
int printed = 0;
|
|
|
|
for (int i = 0; i < sample->insn_len; i++) {
|
|
printed += fprintf(fp, "%02x", (unsigned char)sample->insn[i]);
|
|
if (sample->insn_len - i > 1)
|
|
printed += fprintf(fp, " ");
|
|
}
|
|
return printed;
|
|
}
|
|
|
|
#ifdef HAVE_LIBCAPSTONE_SUPPORT
|
|
#include <capstone/capstone.h>
|
|
|
|
static int capstone_init(struct machine *machine, csh *cs_handle, bool is64)
|
|
{
|
|
cs_arch arch;
|
|
cs_mode mode;
|
|
|
|
if (machine__is(machine, "x86_64") && is64) {
|
|
arch = CS_ARCH_X86;
|
|
mode = CS_MODE_64;
|
|
} else if (machine__normalized_is(machine, "x86")) {
|
|
arch = CS_ARCH_X86;
|
|
mode = CS_MODE_32;
|
|
} else if (machine__normalized_is(machine, "arm64")) {
|
|
arch = CS_ARCH_ARM64;
|
|
mode = CS_MODE_ARM;
|
|
} else if (machine__normalized_is(machine, "arm")) {
|
|
arch = CS_ARCH_ARM;
|
|
mode = CS_MODE_ARM + CS_MODE_V8;
|
|
} else if (machine__normalized_is(machine, "s390")) {
|
|
arch = CS_ARCH_SYSZ;
|
|
mode = CS_MODE_BIG_ENDIAN;
|
|
} else {
|
|
return -1;
|
|
}
|
|
|
|
if (cs_open(arch, mode, cs_handle) != CS_ERR_OK) {
|
|
pr_warning_once("cs_open failed\n");
|
|
return -1;
|
|
}
|
|
|
|
if (machine__normalized_is(machine, "x86")) {
|
|
cs_option(*cs_handle, CS_OPT_SYNTAX, CS_OPT_SYNTAX_ATT);
|
|
/*
|
|
* Resolving address operands to symbols is implemented
|
|
* on x86 by investigating instruction details.
|
|
*/
|
|
cs_option(*cs_handle, CS_OPT_DETAIL, CS_OPT_ON);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
static size_t print_insn_x86(struct thread *thread, u8 cpumode, cs_insn *insn,
|
|
int print_opts, FILE *fp)
|
|
{
|
|
struct addr_location al;
|
|
size_t printed = 0;
|
|
|
|
if (insn->detail && insn->detail->x86.op_count == 1) {
|
|
cs_x86_op *op = &insn->detail->x86.operands[0];
|
|
|
|
addr_location__init(&al);
|
|
if (op->type == X86_OP_IMM &&
|
|
thread__find_symbol(thread, cpumode, op->imm, &al)) {
|
|
printed += fprintf(fp, "%s ", insn[0].mnemonic);
|
|
printed += symbol__fprintf_symname_offs(al.sym, &al, fp);
|
|
if (print_opts & PRINT_INSN_IMM_HEX)
|
|
printed += fprintf(fp, " [%#" PRIx64 "]", op->imm);
|
|
addr_location__exit(&al);
|
|
return printed;
|
|
}
|
|
addr_location__exit(&al);
|
|
}
|
|
|
|
printed += fprintf(fp, "%s %s", insn[0].mnemonic, insn[0].op_str);
|
|
return printed;
|
|
}
|
|
|
|
static bool is64bitip(struct machine *machine, struct addr_location *al)
|
|
{
|
|
const struct dso *dso = al->map ? map__dso(al->map) : NULL;
|
|
|
|
if (dso)
|
|
return dso__is_64_bit(dso);
|
|
|
|
return machine__is(machine, "x86_64") ||
|
|
machine__normalized_is(machine, "arm64") ||
|
|
machine__normalized_is(machine, "s390");
|
|
}
|
|
|
|
ssize_t fprintf_insn_asm(struct machine *machine, struct thread *thread, u8 cpumode,
|
|
bool is64bit, const uint8_t *code, size_t code_size,
|
|
uint64_t ip, int *lenp, int print_opts, FILE *fp)
|
|
{
|
|
size_t printed;
|
|
cs_insn *insn;
|
|
csh cs_handle;
|
|
size_t count;
|
|
int ret;
|
|
|
|
/* TODO: Try to initiate capstone only once but need a proper place. */
|
|
ret = capstone_init(machine, &cs_handle, is64bit);
|
|
if (ret < 0)
|
|
return ret;
|
|
|
|
count = cs_disasm(cs_handle, code, code_size, ip, 1, &insn);
|
|
if (count > 0) {
|
|
if (machine__normalized_is(machine, "x86"))
|
|
printed = print_insn_x86(thread, cpumode, &insn[0], print_opts, fp);
|
|
else
|
|
printed = fprintf(fp, "%s %s", insn[0].mnemonic, insn[0].op_str);
|
|
if (lenp)
|
|
*lenp = insn->size;
|
|
cs_free(insn, count);
|
|
} else {
|
|
printed = -1;
|
|
}
|
|
|
|
cs_close(&cs_handle);
|
|
return printed;
|
|
}
|
|
|
|
size_t sample__fprintf_insn_asm(struct perf_sample *sample, struct thread *thread,
|
|
struct machine *machine, FILE *fp,
|
|
struct addr_location *al)
|
|
{
|
|
bool is64bit = is64bitip(machine, al);
|
|
ssize_t printed;
|
|
|
|
printed = fprintf_insn_asm(machine, thread, sample->cpumode, is64bit,
|
|
(uint8_t *)sample->insn, sample->insn_len,
|
|
sample->ip, NULL, 0, fp);
|
|
if (printed < 0)
|
|
return sample__fprintf_insn_raw(sample, fp);
|
|
|
|
return printed;
|
|
}
|
|
#else
|
|
size_t sample__fprintf_insn_asm(struct perf_sample *sample __maybe_unused,
|
|
struct thread *thread __maybe_unused,
|
|
struct machine *machine __maybe_unused,
|
|
FILE *fp __maybe_unused,
|
|
struct addr_location *al __maybe_unused)
|
|
{
|
|
return 0;
|
|
}
|
|
#endif
|