Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423354AbbEOHyL (ORCPT ); Fri, 15 May 2015 03:54:11 -0400 Received: from szxga01-in.huawei.com ([58.251.152.64]:62672 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422781AbbEOHyI (ORCPT ); Fri, 15 May 2015 03:54:08 -0400 From: Wang Nan To: , , , , , , , , , , , CC: , , , Subject: [RFC PATCH v2 14/37] tools lib bpf: collect symbol table in object files. Date: Fri, 15 May 2015 07:51:07 +0000 Message-ID: <1431676290-1230-15-git-send-email-wangnan0@huawei.com> X-Mailer: git-send-email 1.8.3.4 In-Reply-To: <1431676290-1230-1-git-send-email-wangnan0@huawei.com> References: <1431676290-1230-1-git-send-email-wangnan0@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.107.197.200] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1427 Lines: 52 This patch collects symbols section. This section is useful when linking ELF maps. Signed-off-by: Wang Nan --- tools/lib/bpf/libbpf.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 43b22a5..2068f0b 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -94,6 +94,7 @@ struct bpf_object { int fd; Elf *elf; GElf_Ehdr ehdr; + Elf_Data *symbols; } elf; }; #define obj_elf_valid(o) ((o)->elf.fd >= 0) @@ -142,6 +143,8 @@ static void bpf_obj_clear_elf(struct bpf_object *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; @@ -370,6 +373,14 @@ static int bpf_obj_elf_collect(struct bpf_object *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_warning("bpf: multiple SYMTAB in %s\n", + obj->path); + err = -EEXIST; + } else + obj->elf.symbols = data; + } if (err) goto out; } -- 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/