Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp5017531yba; Wed, 8 May 2019 06:42:30 -0700 (PDT) X-Google-Smtp-Source: APXvYqxc9fi1yaE+29lRLt8zVIsIcXwUnnL4CY4YCMUIMcYGoGvZZeRDzUqC7/phL+4gJLk+flPp X-Received: by 2002:a65:5248:: with SMTP id q8mr30113508pgp.92.1557322950457; Wed, 08 May 2019 06:42:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557322950; cv=none; d=google.com; s=arc-20160816; b=PGjHvaADTjrxvaCxzNY+OJi+lVrkflq9kU9U9Vnqfyjt9k9x1PXMhUvZIaVcdzYr7m caSFmJb25GWIemA926gyLeaKfiXIDUgZLXS/NZ3MZkY+jad5u2fqwXkgykfUneTVjGPX PrM0d7St97BKWxEoYcZIGqv3AqbMT8PDO4rO4rW8O1zmgtW/QzAL0WonBJke0R2M1zVY 6vxfE6BgEWNyimFx9JOp9LdUO1JWyTqyu2fBQKITK/xhnyVxP60EKuhIFGS2FbZ5+yud BUpLB37QB7NQ+IfySxwCmpkdgwnkwo4YmOV4rEn1sJiQyPOiyBbBzitOU28/ZCxnf0w6 /ruw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=MSib1n+pOy6RsmTGlkImbi/iTvF7kCGlJSb3tzYVuo8=; b=aswFtsHaDnIcQv6SXm13WmFey6uoptISuzmpsehSP6fm2CoO5l3CiU0NO88tVBQ8c3 B6bkNzd7vLpY5vwB3CUsqYsAHi0MYObpVVJ9JHgbi+OixOiPebhxxf8qjYjA7kz2WBl/ L0gthOrFidEDzsWjxn8Gi6aOeaw8F/GmeeTNmcNA1uvs9PIqI2VmVt0xrBwXs0UB3CO4 AyLVYbLdbZxcsdllh7NRmkbdw5+gTCpSU31zgk5UOWfa42h8Ih9XLw+cF4AH+k6MtCFu nZqUvLM8M4+6QsmUjyb6AEb9m6vZP0V6O1twxqEYb8Adyq4MZQ+AHisAJoOsSBsMgpCw jnWw== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 36si23409252pla.235.2019.05.08.06.42.14; Wed, 08 May 2019 06:42:30 -0700 (PDT) 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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728864AbfEHNUd (ORCPT + 99 others); Wed, 8 May 2019 09:20:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49881 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728855AbfEHNU3 (ORCPT ); Wed, 8 May 2019 09:20:29 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 64CF181E06; Wed, 8 May 2019 13:20:29 +0000 (UTC) Received: from krava.redhat.com (ovpn-204-49.brq.redhat.com [10.40.204.49]) by smtp.corp.redhat.com (Postfix) with ESMTP id BB14C1018A2A; Wed, 8 May 2019 13:20:26 +0000 (UTC) From: Jiri Olsa To: Arnaldo Carvalho de Melo Cc: lkml , Ingo Molnar , Namhyung Kim , Alexander Shishkin , Peter Zijlstra , Stanislav Fomichev , Song Liu , Adrian Hunter , Andi Kleen Subject: [PATCH 04/12] perf tools: Add bpf dso read and size hooks Date: Wed, 8 May 2019 15:20:02 +0200 Message-Id: <20190508132010.14512-5-jolsa@kernel.org> In-Reply-To: <20190508132010.14512-1-jolsa@kernel.org> References: <20190508132010.14512-1-jolsa@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Wed, 08 May 2019 13:20:29 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Adding bpf related code into dso reading paths to return size (bpf_size) and read the bpf code (bpf_read). Link: http://lkml.kernel.org/n/tip-ql6jpegvv5823yc87u0hlzfa@git.kernel.org Signed-off-by: Jiri Olsa --- tools/perf/util/dso.c | 49 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/dso.c b/tools/perf/util/dso.c index 1e6a045adb8c..2c9289621efd 100644 --- a/tools/perf/util/dso.c +++ b/tools/perf/util/dso.c @@ -9,6 +9,8 @@ #include #include #include +#include +#include "bpf-event.h" #include "compress.h" #include "namespaces.h" #include "path.h" @@ -706,6 +708,44 @@ bool dso__data_status_seen(struct dso *dso, enum dso_data_status_seen by) return false; } +static ssize_t bpf_read(struct dso *dso, u64 offset, char *data) +{ + struct bpf_prog_info_node *node; + ssize_t size = DSO__DATA_CACHE_SIZE; + u64 len; + u8 *buf; + + node = perf_env__find_bpf_prog_info(dso->bpf_prog.env, dso->bpf_prog.id); + if (!node || !node->info_linear) { + dso->data.status = DSO_DATA_STATUS_ERROR; + return -1; + } + + len = node->info_linear->info.jited_prog_len; + buf = (u8 *) node->info_linear->info.jited_prog_insns; + + if (offset >= len) + return -1; + + size = (ssize_t) min(len - offset, (u64) size); + memcpy(data, buf + offset, size); + return size; +} + +static int bpf_size(struct dso *dso) +{ + struct bpf_prog_info_node *node; + + node = perf_env__find_bpf_prog_info(dso->bpf_prog.env, dso->bpf_prog.id); + if (!node || !node->info_linear) { + dso->data.status = DSO_DATA_STATUS_ERROR; + return -1; + } + + dso->data.file_size = node->info_linear->info.jited_prog_len; + return 0; +} + static void dso_cache__free(struct dso *dso) { @@ -832,7 +872,11 @@ dso_cache__read(struct dso *dso, struct machine *machine, if (!cache) return -ENOMEM; - ret = file_read(dso, machine, cache_offset, cache->data); + if (dso->binary_type == DSO_BINARY_TYPE__BPF_PROG_INFO) + ret = bpf_read(dso, cache_offset, cache->data); + else + ret = file_read(dso, machine, cache_offset, cache->data); + if (ret > 0) { cache->offset = cache_offset; cache->size = ret; @@ -941,6 +985,9 @@ int dso__data_file_size(struct dso *dso, struct machine *machine) if (dso->data.status == DSO_DATA_STATUS_ERROR) return -1; + if (dso->binary_type == DSO_BINARY_TYPE__BPF_PROG_INFO) + return bpf_size(dso); + return file_size(dso, machine); } -- 2.20.1