Received: by 2002:ac0:946b:0:0:0:0:0 with SMTP id j40csp193905imj; Thu, 14 Feb 2019 18:23:59 -0800 (PST) X-Google-Smtp-Source: AHgI3IYGm/KWCsJIRr2AFfVL/0VdHDWVtE4ZlkhtGDqEVXHVHQiVZVtsjHG5pY+wu5OANKoZkmYS X-Received: by 2002:a17:902:2468:: with SMTP id m37mr7631447plg.314.1550197439451; Thu, 14 Feb 2019 18:23:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550197439; cv=none; d=google.com; s=arc-20160816; b=NlC9G00RgFr7m+diQmWyADW627GCaRA0YklrwwAmRHgBGZ6O7fBY7Xev/76logW9Kq etQioHye/79Ru5k3E+LpI5C1hcPn+25YqjcyxfnviXrazoUFoF+FRiWtAXktQa76zSFR EjMw0r8mf8+PGrhjdjo9/qfdoNBy05vv80waOgGK2q0gXElkRh2/DqB5NV6MerBTJP1B r1nVyRu0U7aTRQyJN8lUZ/O8QVpk2uuARwHlqrtiAORTut4mW9TLuVJklpUKovrE2ifG CJetyfXGenO5hP89oU+Jp3fgacS2NeSodb43AgcVKMZC8zKU8K7uN++HUbvhiAljtemU KXTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:date:subject :smtp-origin-cluster:cc:to:smtp-origin-hostname:from :smtp-origin-hostprefix:dkim-signature; bh=hfieoBOYu8zPQy1i4mSEUaR0LF26Z32O7AG7hRxnp0I=; b=CnOV86xvPxGF/i0D9pNNkiGfxx8BXd284GtcwK3gDnOFMirn3ZxoXa9l87Gp+AEwtL LwRsF99zKI+i1xyKrnMBuVjsGmURqrQEyOi/chpSwqI8zVMusETZEhbRXQPddb72S2I/ q6f04uhBI++lyU7O1QkGe4JYD02ifwH8GXUXooTgz6iTeT2/dzYi5pQ/jVoDTBrqxqtM 8OdJIXs3jHfVZRzWMDp0VpiAs4Je5LeB5BsSGd5rIdY6pDIQfUZLrrq3gIY8VPCoSJ5y uRSgsg6wmBBZcsYhn8HY30CFnLwZ4xNV0S3sdH2P23fRTIB5orw7gG4HBoi3Fjn1ttPv pjqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fb.com header.s=facebook header.b=CRKOkajJ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=fb.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id go11si4154881plb.373.2019.02.14.18.23.43; Thu, 14 Feb 2019 18:23:59 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@fb.com header.s=facebook header.b=CRKOkajJ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=fb.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729532AbfBNX4q (ORCPT + 99 others); Thu, 14 Feb 2019 18:56:46 -0500 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:42208 "EHLO mx0b-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729491AbfBNX4p (ORCPT ); Thu, 14 Feb 2019 18:56:45 -0500 Received: from pps.filterd (m0109331.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x1ENqwYM012006 for ; Thu, 14 Feb 2019 15:56:43 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : mime-version : content-type; s=facebook; bh=hfieoBOYu8zPQy1i4mSEUaR0LF26Z32O7AG7hRxnp0I=; b=CRKOkajJMgqO3I4D5JXQ91+upOqY474ljBQkY3HV5wjTOG7QVjVrFqQKKmJkfxNnu3b/ CWa+/+rHFhDishb9v54WOvcqz2LK42w3tOSIBtpj2wG7TW++WQwVJFM6mG9kbEWhbt4i tymD6O9YR9lkPaFNjV1UbfDFbLzoSSkrVnA= Received: from mail.thefacebook.com ([199.201.64.23]) by mx0a-00082601.pphosted.com with ESMTP id 2qnj2dr26u-5 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Thu, 14 Feb 2019 15:56:43 -0800 Received: from mx-out.facebook.com (2620:10d:c081:10::13) by mail.thefacebook.com (2620:10d:c081:35::128) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA) id 15.1.1531.3; Thu, 14 Feb 2019 15:56:42 -0800 Received: by devbig006.ftw2.facebook.com (Postfix, from userid 4523) id 614AB62E1CAC; Thu, 14 Feb 2019 15:56:41 -0800 (PST) Smtp-Origin-Hostprefix: devbig From: Song Liu Smtp-Origin-Hostname: devbig006.ftw2.facebook.com To: , CC: , , , , , , , Song Liu Smtp-Origin-Cluster: ftw2c04 Subject: [PATCH v2 perf,bpf 00/11] perf annotation of BPF programs Date: Thu, 14 Feb 2019 15:56:24 -0800 Message-ID: <20190214235624.2579307-1-songliubraving@fb.com> X-Mailer: git-send-email 2.17.1 X-FB-Internal: Safe MIME-Version: 1.0 Content-Type: text/plain X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-02-14_12:,, signatures=0 X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Changes v1 to v2: 1. Fix compilation error with different feature-disassembler-four-args; 2. Fix a segfault in perf-record; 3. Split patches 5/9 and 6/9 so that perf_env changes and perf.data changes are in separate patches. This series enables annotation of BPF programs in perf. perf tool gathers information via sys_bpf and (optionally) stores them in perf.data as headers. Patch 1/11 fixes a minor issue in kernel; Patch 2/11 to 4/11 introduce new helper functions and use them in perf and bpftool; Patch 5/11 to 8/11 saves information of bpf program in perf_env; Patch 9/11 adds --bpf-event options to perf-top; Patch 10/11 enables annotation of bpf programs based on information gathered in 5/11 to 8/11; Patch 11/11 handles information of short living BPF program that are loaded during perf-record or perf-top. Commands tested during developments are perf-top, perf-record, perf-report, and perf-annotate. ===================== Note on patch dependency ======================== This set has dependency in both bpf-next tree and tip/perf/core. Current version is developed on bpf-next tree with the following commits cherry-picked from tip/perf/core: (from 1/10 to 10/10) commit 76193a94522f ("perf, bpf: Introduce PERF_RECORD_KSYMBOL") commit d764ac646491 ("tools headers uapi: Sync tools/include/uapi/linux/perf_event.h") commit 6ee52e2a3fe4 ("perf, bpf: Introduce PERF_RECORD_BPF_EVENT") commit df063c83aa2c ("tools headers uapi: Sync tools/include/uapi/linux/perf_event.h") commit 9aa0bfa370b2 ("perf tools: Handle PERF_RECORD_KSYMBOL") commit 45178a928a4b ("perf tools: Handle PERF_RECORD_BPF_EVENT") commit 7b612e291a5a ("perf tools: Synthesize PERF_RECORD_* for loaded BPF programs") commit a40b95bcd30c ("perf top: Synthesize BPF events for pre-existing loaded BPF programs") commit 6934058d9fb6 ("bpf: Add module name [bpf] to ksymbols for bpf programs") commit 811184fb6977 ("perf bpf: Fix synthesized PERF_RECORD_KSYMBOL/BPF_EVENT") ======================================================================== This set is also available at: https://github.com/liu-song-6/linux/tree/bpf-annotation Thanks!! Song Liu (11): perf, bpf: consider events with attr.bpf_event as side-band events bpf: libbpf: introduce bpf_program__get_prog_info_linear() bpf: bpftool: use bpf_program__get_prog_info_linear() in prog.c:do_dump() perf, bpf: synthesize bpf events with bpf_program__get_prog_info_linear() perf, bpf: save bpf_prog_info in a rbtree in perf_env perf, bpf: save bpf_prog_info information as headers to perf.data perf, bpf: save btf in a rbtree in perf_env perf, bpf: save btf information as headers to perf.data perf-top: add option --bpf-event perf, bpf: enable annotation of bpf program perf, bpf: save information about short living bpf programs kernel/events/core.c | 3 +- tools/bpf/bpftool/prog.c | 266 ++++++--------------------- tools/lib/bpf/libbpf.c | 251 +++++++++++++++++++++++++ tools/lib/bpf/libbpf.h | 63 +++++++ tools/lib/bpf/libbpf.map | 3 + tools/perf/Makefile.config | 6 +- tools/perf/builtin-record.c | 15 +- tools/perf/builtin-top.c | 15 +- tools/perf/util/annotate.c | 149 ++++++++++++++- tools/perf/util/bpf-event.c | 354 +++++++++++++++++++++++++++--------- tools/perf/util/bpf-event.h | 48 ++++- tools/perf/util/dso.c | 1 + tools/perf/util/dso.h | 33 ++-- tools/perf/util/env.c | 148 +++++++++++++++ tools/perf/util/env.h | 17 ++ tools/perf/util/evlist.c | 20 ++ tools/perf/util/evlist.h | 2 + tools/perf/util/header.c | 231 ++++++++++++++++++++++- tools/perf/util/header.h | 2 + tools/perf/util/symbol.c | 1 + 20 files changed, 1316 insertions(+), 312 deletions(-) -- 2.17.1