From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752459AbbD3LAv (ORCPT ); Thu, 30 Apr 2015 07:00:51 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:14471 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751454AbbD3Kxe (ORCPT ); Thu, 30 Apr 2015 06:53:34 -0400 From: Wang Nan To: , , , , , , CC: , , , Subject: [RFC PATCH 13/22] perf bpf: collects relocation sections from object file. Date: Thu, 30 Apr 2015 10:52:36 +0000 Message-ID: <1430391165-30267-14-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.0A020202.554209AC.0183,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: 76c605ebe168f5694ec2c29d75612c10 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch collects relocation sections into 'struct obj'. Such sections are used for associating maps with bpf programs. Signed-off-by: Wang Nan --- tools/perf/util/bpf-loader.c | 17 +++++++++++++++++ tools/perf/util/bpf-loader.h | 5 +++++ 2 files changed, 22 insertions(+) diff --git a/tools/perf/util/bpf-loader.c b/tools/perf/util/bpf-loader.c index bbebaf1..66fbca2 100644 --- a/tools/perf/util/bpf-loader.c +++ b/tools/perf/util/bpf-loader.c @@ -46,6 +46,10 @@ static void bpf_obj_clear_elf(struct bpf_obj *obj) if (!obj_elf_valid(obj)) return; + if (obj->elf.reloc) { + free(obj->elf.reloc); + obj->elf.reloc = NULL; + } if (obj->elf.elf) { elf_end(obj->elf.elf); obj->elf.elf = NULL; @@ -413,6 +417,19 @@ static int bpf_obj_elf_collect(struct bpf_obj *obj) prog->name); list_add(&prog->list, &obj->progs_list); } + } else if (sh.sh_type == SHT_REL) { + obj->elf.reloc = realloc(obj->elf.reloc, + sizeof(*obj->elf.reloc) * + (++obj->elf.nr_reloc)); + if (!obj->elf.reloc) { + pr_err("bpf: realloc reloc record failed\n"); + err = -ENOMEM; + } else { + int n = obj->elf.nr_reloc - 1; + + obj->elf.reloc[n].shdr = sh; + obj->elf.reloc[n].data = data; + } } if (err) goto out; diff --git a/tools/perf/util/bpf-loader.h b/tools/perf/util/bpf-loader.h index f9cb46b..1417c0d 100644 --- a/tools/perf/util/bpf-loader.h +++ b/tools/perf/util/bpf-loader.h @@ -53,6 +53,11 @@ struct bpf_obj { Elf *elf; GElf_Ehdr ehdr; Elf_Data *symbols; + struct { + GElf_Shdr shdr; + Elf_Data *data; + } *reloc; + int nr_reloc; } elf; }; #define obj_elf_valid(o) ((o)->elf.fd >= 0) -- 1.8.3.4