From patchwork Fri Feb 15 00:00:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Song Liu X-Patchwork-Id: 1042521 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=fb.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=fb.com header.i=@fb.com header.b="drDC6Krf"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 440tgt2LJJz9sCh for ; Fri, 15 Feb 2019 11:00:42 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729896AbfBOAAh (ORCPT ); Thu, 14 Feb 2019 19:00:37 -0500 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:53698 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729850AbfBOAAg (ORCPT ); Thu, 14 Feb 2019 19:00:36 -0500 Received: from pps.filterd (m0148461.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x1ENr8Tx006842 for ; Thu, 14 Feb 2019 16:00:34 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=facebook; bh=yMQAxcPycR1Jhz6YarO4xgErcxTRdjw9qneFlE+5uMw=; b=drDC6Krf/pxPOpL4yuhLry7KrmRtdSEqHN2iDghQ9vQAK65kEo+X5mWIkFnEXlQi1Uwt TyAlPKG1MgDgzrrLwxCUp+nMbLMfBdITyLTB0pRLlIVRm5tx6/vu5mtGgzCAPK9N3OTD /IACTfS48uECB1cO8zrzz0WZm+mDZVavEF4= Received: from maileast.thefacebook.com ([199.201.65.23]) by mx0a-00082601.pphosted.com with ESMTP id 2qngdtrdax-12 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Thu, 14 Feb 2019 16:00:34 -0800 Received: from mx-out.facebook.com (2620:10d:c0a1:3::13) by mail.thefacebook.com (2620:10d:c021:18::173) 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 16:00:28 -0800 Received: by devbig006.ftw2.facebook.com (Postfix, from userid 4523) id 3A60962E1CAC; Thu, 14 Feb 2019 16:00:28 -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 08/11] perf, bpf: save btf information as headers to perf.data Date: Thu, 14 Feb 2019 16:00:09 -0800 Message-ID: <20190215000010.2590505-7-songliubraving@fb.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190215000010.2590505-1-songliubraving@fb.com> References: <20190214235624.2579307-1-songliubraving@fb.com> <20190215000010.2590505-1-songliubraving@fb.com> X-FB-Internal: Safe MIME-Version: 1.0 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: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch enables perf-record to save btf information as headers to perf.data A new header type HEADER_BTF is introduced for this data. Signed-off-by: Song Liu --- tools/perf/util/header.c | 99 +++++++++++++++++++++++++++++++++++++++- tools/perf/util/header.h | 1 + 2 files changed, 99 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index 2ae76a9d06f6..3f1562afe8e5 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -1125,6 +1125,45 @@ static int write_bpf_prog_info(struct feat_fd *ff, return ret; } +static int write_btf(struct feat_fd *ff, + struct perf_evlist *evlist __maybe_unused) +{ + struct perf_env *env = &ff->ph->env; + struct rb_root *root; + struct rb_node *next; + u32 count = 0; + int ret; + + down_read(&env->bpf_info_lock); + + root = &env->btfs; + next = rb_first(root); + while (next) { + ++count; + next = rb_next(next); + } + + ret = do_write(ff, &count, sizeof(count)); + + if (ret < 0) + goto out; + + next = rb_first(root); + while (next) { + struct btf_node *node; + + node = rb_entry(next, struct btf_node, rb_node); + next = rb_next(&node->rb_node); + ret = do_write(ff, node, + sizeof(struct btf_node) + node->data_size); + if (ret < 0) + goto out; + } +out: + up_read(&env->bpf_info_lock); + return ret; +} + static int cpu_cache_level__sort(const void *a, const void *b) { struct cpu_cache_level *cache_a = (struct cpu_cache_level *)a; @@ -1628,6 +1667,28 @@ static void print_bpf_prog_info(struct feat_fd *ff, FILE *fp) up_read(&env->bpf_info_lock); } +static void print_btf(struct feat_fd *ff, FILE *fp) +{ + struct perf_env *env = &ff->ph->env; + struct rb_root *root; + struct rb_node *next; + + down_read(&env->bpf_info_lock); + + root = &env->btfs; + next = rb_first(root); + + while (next) { + struct btf_node *node; + + node = rb_entry(next, struct btf_node, rb_node); + next = rb_next(&node->rb_node); + fprintf(fp, "# bpf_prog_info of id %u\n", node->id); + } + + up_read(&env->bpf_info_lock); +} + static void free_event_desc(struct perf_evsel *events) { struct perf_evsel *evsel; @@ -2723,6 +2784,41 @@ static int process_bpf_prog_info(struct feat_fd *ff, return err; } +static int process_btf(struct feat_fd *ff, void *data __maybe_unused) +{ + struct perf_env *env = &ff->ph->env; + u32 count, i; + + if (do_read_u32(ff, &count)) + return -1; + + down_write(&env->bpf_info_lock); + + for (i = 0; i < count; ++i) { + struct btf_node btf_node; + struct btf_node *node; + + if (__do_read(ff, &btf_node, sizeof(struct btf_node))) + return -1; + + node = malloc(sizeof(struct btf_node) + btf_node.data_size); + if (!node) + return -1; + + node->id = btf_node.id; + node->data_size = btf_node.data_size; + + if (__do_read(ff, node->data, btf_node.data_size)) { + free(node); + return -1; + } + perf_env__insert_btf(env, node); + } + + up_write(&env->bpf_info_lock); + return 0; +} + struct feature_ops { int (*write)(struct feat_fd *ff, struct perf_evlist *evlist); void (*print)(struct feat_fd *ff, FILE *fp); @@ -2783,7 +2879,8 @@ static const struct feature_ops feat_ops[HEADER_LAST_FEATURE] = { FEAT_OPR(SAMPLE_TIME, sample_time, false), FEAT_OPR(MEM_TOPOLOGY, mem_topology, true), FEAT_OPR(CLOCKID, clockid, false), - FEAT_OPR(BPF_PROG_INFO, bpf_prog_info, false) + FEAT_OPR(BPF_PROG_INFO, bpf_prog_info, false), + FEAT_OPR(BTF, btf, false) }; struct header_print_data { diff --git a/tools/perf/util/header.h b/tools/perf/util/header.h index 0785c91b4c3a..ba51d8e43c53 100644 --- a/tools/perf/util/header.h +++ b/tools/perf/util/header.h @@ -40,6 +40,7 @@ enum { HEADER_MEM_TOPOLOGY, HEADER_CLOCKID, HEADER_BPF_PROG_INFO, + HEADER_BTF, HEADER_LAST_FEATURE, HEADER_FEAT_BITS = 256, };