Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752510AbbD3LBF (ORCPT ); Thu, 30 Apr 2015 07:01:05 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:14448 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751440AbbD3Kxe (ORCPT ); Thu, 30 Apr 2015 06:53:34 -0400 From: Wang Nan To: , , , , , , CC: , , , Subject: [RFC PATCH 11/22] perf bpf: collect symbol table in object files. Date: Thu, 30 Apr 2015 10:52:34 +0000 Message-ID: <1430391165-30267-12-git-send-email-wangnan0@huawei.com> X-Mailer: git-send-email 1.8.3.4 In-Reply-To: <1430391165-30267-1-git-send-email-wangnan0@huawei.com> References: <1430391165-30267-1-git-send-email-wangnan0@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.107.197.210] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020206.554209AC.0125,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: e9a0d49555ecc84f57e6c6f4081bba46 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1653 Lines: 58 This patch collects symbols section. This section is useful when linking ELF maps. Signed-off-by: Wang Nan --- tools/perf/util/bpf-loader.c | 11 +++++++++++ tools/perf/util/bpf-loader.h | 1 + 2 files changed, 12 insertions(+) diff --git a/tools/perf/util/bpf-loader.c b/tools/perf/util/bpf-loader.c index b913d6f..b9c701a 100644 --- a/tools/perf/util/bpf-loader.c +++ b/tools/perf/util/bpf-loader.c @@ -50,6 +50,9 @@ static void bpf_obj_clear_elf(struct bpf_obj *obj) elf_end(obj->elf.elf); obj->elf.elf = NULL; } + + obj->elf.symbols = NULL; + if (obj->elf.fd >= 0) { close(obj->elf.fd); obj->elf.fd = -1; @@ -312,6 +315,14 @@ static int bpf_obj_elf_collect(struct bpf_obj *obj) else if (strcmp(name, "config") == 0) err = bpf_obj_config_init(obj, data->d_buf, data->d_size); + else if (sh.sh_type == SHT_SYMTAB) { + if (obj->elf.symbols) { + pr_err("bpf: multiple SYMTAB in %s\n", + obj->path); + err = -EEXIST; + } else + obj->elf.symbols = data; + } if (err) goto out; } diff --git a/tools/perf/util/bpf-loader.h b/tools/perf/util/bpf-loader.h index 086f28d..f0b573c 100644 --- a/tools/perf/util/bpf-loader.h +++ b/tools/perf/util/bpf-loader.h @@ -38,6 +38,7 @@ struct bpf_obj { int fd; Elf *elf; GElf_Ehdr ehdr; + Elf_Data *symbols; } elf; }; #define obj_elf_valid(o) ((o)->elf.fd >= 0) -- 1.8.3.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/