mirror of
https://github.com/Fishwaldo/linux-bl808.git
synced 2025-06-17 20:25:19 +00:00
perf/core improvements and fixes:
BPF:
Song Liu:
- Add support for annotating BPF programs, using the PERF_RECORD_BPF_EVENT
and PERF_RECORD_KSYMBOL recently added to the kernel and plugging
binutils's libopcodes disassembly of BPF programs with the existing
annotation interfaces in 'perf annotate', 'perf report' and 'perf top'
various output formats (--stdio, --stdio2, --tui).
perf list:
Andi Kleen:
- Filter metrics when using substring search.
perf record:
Andi Kleen:
- Allow to limit number of reported perf.data files
- Clarify help for --switch-output.
perf report:
Andi Kleen
- Indicate JITed code better.
- Show all sort keys in help output.
perf script:
Andi Kleen:
- Support relative time.
perf stat:
Andi Kleen:
- Improve scaling.
General:
Changbin Du:
- Fix some mostly error path memory and reference count leaks found
using gcc's ASan and UBSan.
Vendor events:
Mamatha Inamdar:
- Remove P8 HW events which are not supported.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-----BEGIN PGP SIGNATURE-----
iHUEABYIAB0WIQR2GiIUctdOfX2qHhGyPKLppCJ+JwUCXJOmigAKCRCyPKLppCJ+
J+EPAQDNzH1M3uJ6cOhyzAMowpsl0Dgs0Q+5iNlOnDYVr2RfhgEA2Sr2fQyl/qiG
h6jRbzvdE+PTXbcMNO79ajmufAHdLgQ=
=DuTU
-----END PGP SIGNATURE-----
Merge tag 'perf-core-for-mingo-5.1-20190321' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/urgent
Pull perf/core improvements and fixes from Arnaldo:
BPF:
Song Liu:
- Add support for annotating BPF programs, using the PERF_RECORD_BPF_EVENT
and PERF_RECORD_KSYMBOL recently added to the kernel and plugging
binutils's libopcodes disassembly of BPF programs with the existing
annotation interfaces in 'perf annotate', 'perf report' and 'perf top'
various output formats (--stdio, --stdio2, --tui).
perf list:
Andi Kleen:
- Filter metrics when using substring search.
perf record:
Andi Kleen:
- Allow to limit number of reported perf.data files
- Clarify help for --switch-output.
perf report:
Andi Kleen
- Indicate JITed code better.
- Show all sort keys in help output.
perf script:
Andi Kleen:
- Support relative time.
perf stat:
Andi Kleen:
- Improve scaling.
General:
Changbin Du:
- Fix some mostly error path memory and reference count leaks found
using gcc's ASan and UBSan.
Vendor events:
Mamatha Inamdar:
- Remove P8 HW events which are not supported.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Thomas Gleixner
commit
d8b5297f6d
78 changed files with 1797 additions and 1031 deletions
|
|
@ -112,6 +112,11 @@ void libbpf_print(enum libbpf_print_level level, const char *format, ...)
|
|||
# define LIBBPF_ELF_C_READ_MMAP ELF_C_READ
|
||||
#endif
|
||||
|
||||
static inline __u64 ptr_to_u64(const void *ptr)
|
||||
{
|
||||
return (__u64) (unsigned long) ptr;
|
||||
}
|
||||
|
||||
struct bpf_capabilities {
|
||||
/* v4.14: kernel support for program & map names. */
|
||||
__u32 name:1;
|
||||
|
|
@ -622,7 +627,7 @@ bpf_object__init_maps(struct bpf_object *obj, int flags)
|
|||
bool strict = !(flags & MAPS_RELAX_COMPAT);
|
||||
int i, map_idx, map_def_sz, nr_maps = 0;
|
||||
Elf_Scn *scn;
|
||||
Elf_Data *data;
|
||||
Elf_Data *data = NULL;
|
||||
Elf_Data *symbols = obj->efile.symbols;
|
||||
|
||||
if (obj->efile.maps_shndx < 0)
|
||||
|
|
@ -2999,3 +3004,249 @@ bpf_perf_event_read_simple(void *mmap_mem, size_t mmap_size, size_t page_size,
|
|||
ring_buffer_write_tail(header, data_tail);
|
||||
return ret;
|
||||
}
|
||||
|
||||
struct bpf_prog_info_array_desc {
|
||||
int array_offset; /* e.g. offset of jited_prog_insns */
|
||||
int count_offset; /* e.g. offset of jited_prog_len */
|
||||
int size_offset; /* > 0: offset of rec size,
|
||||
* < 0: fix size of -size_offset
|
||||
*/
|
||||
};
|
||||
|
||||
static struct bpf_prog_info_array_desc bpf_prog_info_array_desc[] = {
|
||||
[BPF_PROG_INFO_JITED_INSNS] = {
|
||||
offsetof(struct bpf_prog_info, jited_prog_insns),
|
||||
offsetof(struct bpf_prog_info, jited_prog_len),
|
||||
-1,
|
||||
},
|
||||
[BPF_PROG_INFO_XLATED_INSNS] = {
|
||||
offsetof(struct bpf_prog_info, xlated_prog_insns),
|
||||
offsetof(struct bpf_prog_info, xlated_prog_len),
|
||||
-1,
|
||||
},
|
||||
[BPF_PROG_INFO_MAP_IDS] = {
|
||||
offsetof(struct bpf_prog_info, map_ids),
|
||||
offsetof(struct bpf_prog_info, nr_map_ids),
|
||||
-(int)sizeof(__u32),
|
||||
},
|
||||
[BPF_PROG_INFO_JITED_KSYMS] = {
|
||||
offsetof(struct bpf_prog_info, jited_ksyms),
|
||||
offsetof(struct bpf_prog_info, nr_jited_ksyms),
|
||||
-(int)sizeof(__u64),
|
||||
},
|
||||
[BPF_PROG_INFO_JITED_FUNC_LENS] = {
|
||||
offsetof(struct bpf_prog_info, jited_func_lens),
|
||||
offsetof(struct bpf_prog_info, nr_jited_func_lens),
|
||||
-(int)sizeof(__u32),
|
||||
},
|
||||
[BPF_PROG_INFO_FUNC_INFO] = {
|
||||
offsetof(struct bpf_prog_info, func_info),
|
||||
offsetof(struct bpf_prog_info, nr_func_info),
|
||||
offsetof(struct bpf_prog_info, func_info_rec_size),
|
||||
},
|
||||
[BPF_PROG_INFO_LINE_INFO] = {
|
||||
offsetof(struct bpf_prog_info, line_info),
|
||||
offsetof(struct bpf_prog_info, nr_line_info),
|
||||
offsetof(struct bpf_prog_info, line_info_rec_size),
|
||||
},
|
||||
[BPF_PROG_INFO_JITED_LINE_INFO] = {
|
||||
offsetof(struct bpf_prog_info, jited_line_info),
|
||||
offsetof(struct bpf_prog_info, nr_jited_line_info),
|
||||
offsetof(struct bpf_prog_info, jited_line_info_rec_size),
|
||||
},
|
||||
[BPF_PROG_INFO_PROG_TAGS] = {
|
||||
offsetof(struct bpf_prog_info, prog_tags),
|
||||
offsetof(struct bpf_prog_info, nr_prog_tags),
|
||||
-(int)sizeof(__u8) * BPF_TAG_SIZE,
|
||||
},
|
||||
|
||||
};
|
||||
|
||||
static __u32 bpf_prog_info_read_offset_u32(struct bpf_prog_info *info, int offset)
|
||||
{
|
||||
__u32 *array = (__u32 *)info;
|
||||
|
||||
if (offset >= 0)
|
||||
return array[offset / sizeof(__u32)];
|
||||
return -(int)offset;
|
||||
}
|
||||
|
||||
static __u64 bpf_prog_info_read_offset_u64(struct bpf_prog_info *info, int offset)
|
||||
{
|
||||
__u64 *array = (__u64 *)info;
|
||||
|
||||
if (offset >= 0)
|
||||
return array[offset / sizeof(__u64)];
|
||||
return -(int)offset;
|
||||
}
|
||||
|
||||
static void bpf_prog_info_set_offset_u32(struct bpf_prog_info *info, int offset,
|
||||
__u32 val)
|
||||
{
|
||||
__u32 *array = (__u32 *)info;
|
||||
|
||||
if (offset >= 0)
|
||||
array[offset / sizeof(__u32)] = val;
|
||||
}
|
||||
|
||||
static void bpf_prog_info_set_offset_u64(struct bpf_prog_info *info, int offset,
|
||||
__u64 val)
|
||||
{
|
||||
__u64 *array = (__u64 *)info;
|
||||
|
||||
if (offset >= 0)
|
||||
array[offset / sizeof(__u64)] = val;
|
||||
}
|
||||
|
||||
struct bpf_prog_info_linear *
|
||||
bpf_program__get_prog_info_linear(int fd, __u64 arrays)
|
||||
{
|
||||
struct bpf_prog_info_linear *info_linear;
|
||||
struct bpf_prog_info info = {};
|
||||
__u32 info_len = sizeof(info);
|
||||
__u32 data_len = 0;
|
||||
int i, err;
|
||||
void *ptr;
|
||||
|
||||
if (arrays >> BPF_PROG_INFO_LAST_ARRAY)
|
||||
return ERR_PTR(-EINVAL);
|
||||
|
||||
/* step 1: get array dimensions */
|
||||
err = bpf_obj_get_info_by_fd(fd, &info, &info_len);
|
||||
if (err) {
|
||||
pr_debug("can't get prog info: %s", strerror(errno));
|
||||
return ERR_PTR(-EFAULT);
|
||||
}
|
||||
|
||||
/* step 2: calculate total size of all arrays */
|
||||
for (i = BPF_PROG_INFO_FIRST_ARRAY; i < BPF_PROG_INFO_LAST_ARRAY; ++i) {
|
||||
bool include_array = (arrays & (1UL << i)) > 0;
|
||||
struct bpf_prog_info_array_desc *desc;
|
||||
__u32 count, size;
|
||||
|
||||
desc = bpf_prog_info_array_desc + i;
|
||||
|
||||
/* kernel is too old to support this field */
|
||||
if (info_len < desc->array_offset + sizeof(__u32) ||
|
||||
info_len < desc->count_offset + sizeof(__u32) ||
|
||||
(desc->size_offset > 0 && info_len < desc->size_offset))
|
||||
include_array = false;
|
||||
|
||||
if (!include_array) {
|
||||
arrays &= ~(1UL << i); /* clear the bit */
|
||||
continue;
|
||||
}
|
||||
|
||||
count = bpf_prog_info_read_offset_u32(&info, desc->count_offset);
|
||||
size = bpf_prog_info_read_offset_u32(&info, desc->size_offset);
|
||||
|
||||
data_len += count * size;
|
||||
}
|
||||
|
||||
/* step 3: allocate continuous memory */
|
||||
data_len = roundup(data_len, sizeof(__u64));
|
||||
info_linear = malloc(sizeof(struct bpf_prog_info_linear) + data_len);
|
||||
if (!info_linear)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
||||
/* step 4: fill data to info_linear->info */
|
||||
info_linear->arrays = arrays;
|
||||
memset(&info_linear->info, 0, sizeof(info));
|
||||
ptr = info_linear->data;
|
||||
|
||||
for (i = BPF_PROG_INFO_FIRST_ARRAY; i < BPF_PROG_INFO_LAST_ARRAY; ++i) {
|
||||
struct bpf_prog_info_array_desc *desc;
|
||||
__u32 count, size;
|
||||
|
||||
if ((arrays & (1UL << i)) == 0)
|
||||
continue;
|
||||
|
||||
desc = bpf_prog_info_array_desc + i;
|
||||
count = bpf_prog_info_read_offset_u32(&info, desc->count_offset);
|
||||
size = bpf_prog_info_read_offset_u32(&info, desc->size_offset);
|
||||
bpf_prog_info_set_offset_u32(&info_linear->info,
|
||||
desc->count_offset, count);
|
||||
bpf_prog_info_set_offset_u32(&info_linear->info,
|
||||
desc->size_offset, size);
|
||||
bpf_prog_info_set_offset_u64(&info_linear->info,
|
||||
desc->array_offset,
|
||||
ptr_to_u64(ptr));
|
||||
ptr += count * size;
|
||||
}
|
||||
|
||||
/* step 5: call syscall again to get required arrays */
|
||||
err = bpf_obj_get_info_by_fd(fd, &info_linear->info, &info_len);
|
||||
if (err) {
|
||||
pr_debug("can't get prog info: %s", strerror(errno));
|
||||
free(info_linear);
|
||||
return ERR_PTR(-EFAULT);
|
||||
}
|
||||
|
||||
/* step 6: verify the data */
|
||||
for (i = BPF_PROG_INFO_FIRST_ARRAY; i < BPF_PROG_INFO_LAST_ARRAY; ++i) {
|
||||
struct bpf_prog_info_array_desc *desc;
|
||||
__u32 v1, v2;
|
||||
|
||||
if ((arrays & (1UL << i)) == 0)
|
||||
continue;
|
||||
|
||||
desc = bpf_prog_info_array_desc + i;
|
||||
v1 = bpf_prog_info_read_offset_u32(&info, desc->count_offset);
|
||||
v2 = bpf_prog_info_read_offset_u32(&info_linear->info,
|
||||
desc->count_offset);
|
||||
if (v1 != v2)
|
||||
pr_warning("%s: mismatch in element count\n", __func__);
|
||||
|
||||
v1 = bpf_prog_info_read_offset_u32(&info, desc->size_offset);
|
||||
v2 = bpf_prog_info_read_offset_u32(&info_linear->info,
|
||||
desc->size_offset);
|
||||
if (v1 != v2)
|
||||
pr_warning("%s: mismatch in rec size\n", __func__);
|
||||
}
|
||||
|
||||
/* step 7: update info_len and data_len */
|
||||
info_linear->info_len = sizeof(struct bpf_prog_info);
|
||||
info_linear->data_len = data_len;
|
||||
|
||||
return info_linear;
|
||||
}
|
||||
|
||||
void bpf_program__bpil_addr_to_offs(struct bpf_prog_info_linear *info_linear)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = BPF_PROG_INFO_FIRST_ARRAY; i < BPF_PROG_INFO_LAST_ARRAY; ++i) {
|
||||
struct bpf_prog_info_array_desc *desc;
|
||||
__u64 addr, offs;
|
||||
|
||||
if ((info_linear->arrays & (1UL << i)) == 0)
|
||||
continue;
|
||||
|
||||
desc = bpf_prog_info_array_desc + i;
|
||||
addr = bpf_prog_info_read_offset_u64(&info_linear->info,
|
||||
desc->array_offset);
|
||||
offs = addr - ptr_to_u64(info_linear->data);
|
||||
bpf_prog_info_set_offset_u64(&info_linear->info,
|
||||
desc->array_offset, offs);
|
||||
}
|
||||
}
|
||||
|
||||
void bpf_program__bpil_offs_to_addr(struct bpf_prog_info_linear *info_linear)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = BPF_PROG_INFO_FIRST_ARRAY; i < BPF_PROG_INFO_LAST_ARRAY; ++i) {
|
||||
struct bpf_prog_info_array_desc *desc;
|
||||
__u64 addr, offs;
|
||||
|
||||
if ((info_linear->arrays & (1UL << i)) == 0)
|
||||
continue;
|
||||
|
||||
desc = bpf_prog_info_array_desc + i;
|
||||
offs = bpf_prog_info_read_offset_u64(&info_linear->info,
|
||||
desc->array_offset);
|
||||
addr = offs + ptr_to_u64(info_linear->data);
|
||||
bpf_prog_info_set_offset_u64(&info_linear->info,
|
||||
desc->array_offset, addr);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue