From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id B74C9C64EC7 for ; Tue, 28 Feb 2023 09:33:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4FDDE6B0071; Tue, 28 Feb 2023 04:33:21 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 4D4376B0072; Tue, 28 Feb 2023 04:33:21 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 327646B0073; Tue, 28 Feb 2023 04:33:21 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 23C706B0071 for ; Tue, 28 Feb 2023 04:33:21 -0500 (EST) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id F21871612B6 for ; Tue, 28 Feb 2023 09:33:20 +0000 (UTC) X-FDA: 80516187360.06.D24867A Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf06.hostedemail.com (Postfix) with ESMTP id 51B7D18001A for ; Tue, 28 Feb 2023 09:33:19 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=ig3GSFl6; spf=pass (imf06.hostedemail.com: domain of jolsa@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=jolsa@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1677576799; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=RCfAOoOtUYQjyPklEAGADj6Gp4MryDiUuzxiCRFMKOY=; b=eM7wu6q+BikGIb6CxJ0k8r3P3FVZgDAzABi3prg86+i5+z7d5NvALcReHvBh0b0n94GXF/ D4WZmzE4pAODDpaIKmgioGuLp7AUvgUicmy5RErfgbbyMtpdentx08cNZXjtPRJADRW4oW SDnRDPL+98xPh77uuGNArPNPjO0zWUw= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=ig3GSFl6; spf=pass (imf06.hostedemail.com: domain of jolsa@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=jolsa@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1677576799; a=rsa-sha256; cv=none; b=AKo8kvZA4g6L2GFNjNodYGygImbn2WCki49HQRUX+d34vJUYs8dVWLUpmrOhDeungPfpLi XXmVFyL6odFryQrm0klmWpgUlLKG3kdDuDwSisqeM59AVFPXeocR1x0xfiCDAQ8WMvXseG 1BPhqZvxvDlBVdMXOMLhrGui8C9UTiI= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 7FAA96103C; Tue, 28 Feb 2023 09:33:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C43FEC433D2; Tue, 28 Feb 2023 09:33:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1677576797; bh=c9z68q+WdAEZYqVryh8zZBbeNYueFUIM9/Jpow2jaNA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ig3GSFl6mH1gtKMNYEwibcAW7JNIHR8jX9SMP4+o1z10djXhgAmdA70qQeTXISQwj 6kmZOFt/BRo35UGXyT0MyxaJM2gT20Dc/OAvY/sOrQLOkc1UPuDL+3nYvsJ5vey6SW 78yXIfTc8YS62UD+6vhwCq+Mdh1g8lCRcT44EX9+Sjbv8IAoiTAsjrvxw93aTKTX0i jTtDaeU5cvMgDE4B0W/LxBiMBgmc0rCvJv4xKYYwWK/rCxNSmZ6AIcQgPyhCDqQK7X GQVQJa8izimvaKUlWPYrb5rvrs0dQg1E9pF77uWyFo0d+kPaNk+ahJXpO+hArWBPYa Tvd2HkhnVTk4w== From: Jiri Olsa To: Alexei Starovoitov , Andrii Nakryiko , Hao Luo , Andrew Morton , Alexander Viro , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Matthew Wilcox Cc: bpf@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-perf-users@vger.kernel.org, Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Daniel Borkmann , Namhyung Kim Subject: [PATCH RFC v2 bpf-next 5/9] selftests/bpf: Add read_buildid function Date: Tue, 28 Feb 2023 10:32:02 +0100 Message-Id: <20230228093206.821563-6-jolsa@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230228093206.821563-1-jolsa@kernel.org> References: <20230228093206.821563-1-jolsa@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 51B7D18001A X-Stat-Signature: p6p8qeqd8ggnw1zyzz64ppia9e96po1s X-Rspam-User: X-HE-Tag: 1677576799-411934 X-HE-Meta: U2FsdGVkX195/JfhFQNJpCDIDreRIqv8awEam6EXouLlwASpvWUIodn5EsJY9iTDHe/v2geDc+gZi50Q6dLeTsKtcDCsIR622mkDDOQmoh8MlBwZjUIHpWRHqYIY/66j1g7Rlu9DxkPu0DbrxO/cNpRuNqOya6XjurnZx1Ebs+XkleMuapbRdIxATCdGvex/xsx9RgL1l4fUg016rCdeRdvIfWJlZk5OypGoneWNh4S8ZhPUkLLDqa+NdE1K5mJKb32uGjm2NkTa4xVwgxu6P6VmhHEMY5VV6LWkUPIIbeOAYWhfQZCv/mgPISO2XZ9eqfXhfDI4jcrA/1mybFNj2Usv+ZyjAO9Q1vy1Yd9R/4geF6F3rrdWU0Azhqz91ACMy2eJmtoF/Z/JCRBCAZDg5KPRP6eaw/gtfq+8TzaIbkbw405o1KwK0Rm1uu4wZSB9H1i1+O5pkU8NMKL1W34236YPtUyb+/ELJuWlThIbvmOZ2tYG10jrYYlIClaoCX1bl6PqzxUJX4oOBwmGWXqDAzjoj3+ocgE0EWn5uST32orYdi/JP0kcB7/ZyjvpoeOgvos4J9gyagApe24lz8XyvZ99gTDWkGrOYvO2GQyFXSx2zdbhd/g3U9PH4BveVFJmIdHhLEouHwt3Lv3h6FMzN6VgTjd3tLhrgPLGjQ0sbROpZ3mVD35Ag/zpYZx8ufNoZ2FxRR8VRI5AyCNrkS4V4SzP697x3XGUXdrH7Cps1733YFBiaKo+ANaD4ijA1zqysO/kGp6qPj2Pqs7Bd30uUVWMveY/cwecvgBW3WsXbswtA6xTBHSJXryjC0XBPLKDFX5XETv8vkG1bY6FmzuUIfb0ClGgb4VnQ1oX9WIhO5ZcB0eEBRoE/E9lguaXm6MC+rgqojiNj/vdu3x/miXHrfQtUILTAUgZl/4jI1gzzI+uNvruj8i+WDfmxfY5Anr+Y20dVJszbji5IW3Nflp pePjLFg2 ppU/Rpfl+MCkdLUni3GRfGOzGLXVdXcxRCbFAe2kx0XrYHciSwy5u/qtdIjQUwlIWXYO1vRBb3//VPOCWyn3YOtC6Na64/4hg2O7DiTkFffBTdbWAc+1ERcVo3A5W2S9tm9x772z1T8zOYvFutSIX4wC4wo3uSY+jx/3W8gPNaTUpiDyzU4Bw/PSkXlPXfACWXtjhinzKFc7IsbInfz3TGUHvAcKCZIEFer6kjOZ/n8OsI3WwtAid3DUCwFN5D3bQEj7PXs/3yDHckr4NzK82ivtc0hcR5WmWi2sMy6UkFl1aeUcq2WcUpGtG4MSd5uPKTwTFzUGzHal9FQPm9lu29+dhuDEo8HFH5kwMxxy3uI9tMxeUjdgkn5eAZyAYodumlZBMvU4L3hRMVlkhNi40bOc7Uy9e2sc48/A0UEViIb3oYHgu64vcaKxqUzvNYHplV9zCsOChjATTPHS0Xkp2/9HYjdcOiIlYPIOh X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Adding read_build_id function that parses out build id from specified binary. It will replace extract_build_id and also be used in following changes. Signed-off-by: Jiri Olsa --- tools/testing/selftests/bpf/trace_helpers.c | 98 +++++++++++++++++++++ tools/testing/selftests/bpf/trace_helpers.h | 5 ++ 2 files changed, 103 insertions(+) diff --git a/tools/testing/selftests/bpf/trace_helpers.c b/tools/testing/selftests/bpf/trace_helpers.c index 09a16a77bae4..c10e16626cd3 100644 --- a/tools/testing/selftests/bpf/trace_helpers.c +++ b/tools/testing/selftests/bpf/trace_helpers.c @@ -11,6 +11,9 @@ #include #include #include "trace_helpers.h" +#include +#include +#include #define DEBUGFS "/sys/kernel/debug/tracing/" @@ -230,3 +233,98 @@ ssize_t get_rel_offset(uintptr_t addr) fclose(f); return -EINVAL; } + +static int +parse_build_id_buf(const void *note_start, Elf32_Word note_size, + char *build_id) +{ + Elf32_Word note_offs = 0, new_offs; + + while (note_offs + sizeof(Elf32_Nhdr) < note_size) { + Elf32_Nhdr *nhdr = (Elf32_Nhdr *)(note_start + note_offs); + + if (nhdr->n_type == 3 && + nhdr->n_namesz == sizeof("GNU") && + !strcmp((char *)(nhdr + 1), "GNU") && + nhdr->n_descsz > 0 && + nhdr->n_descsz <= BPF_BUILD_ID_SIZE) { + memcpy(build_id, note_start + note_offs + + ALIGN(sizeof("GNU"), 4) + sizeof(Elf32_Nhdr), + nhdr->n_descsz); + memset(build_id + nhdr->n_descsz, 0, + BPF_BUILD_ID_SIZE - nhdr->n_descsz); + return (int) nhdr->n_descsz; + } + + new_offs = note_offs + sizeof(Elf32_Nhdr) + + ALIGN(nhdr->n_namesz, 4) + ALIGN(nhdr->n_descsz, 4); + + if (new_offs >= note_size) + break; + note_offs = new_offs; + } + + return -EINVAL; +} + +/* Reads binary from *path* file and returns it in the *build_id* + * which is expected to be at least BPF_BUILD_ID_SIZE bytes. + * Returns size of build id on success. On error the error value + * is returned. + */ +int read_build_id(const char *path, char *build_id) +{ + int fd, err = -EINVAL; + Elf *elf = NULL; + GElf_Ehdr ehdr; + size_t max, i; + + fd = open(path, O_RDONLY | O_CLOEXEC); + if (fd < 0) + return -errno; + + (void)elf_version(EV_CURRENT); + + elf = elf_begin(fd, ELF_C_READ, NULL); + if (!elf) + goto out; + + if (elf_kind(elf) != ELF_K_ELF) + goto out; + + if (gelf_getehdr(elf, &ehdr) == NULL) + goto out; + + if (ehdr.e_ident[EI_CLASS] != ELFCLASS64) + goto out; + + for (i = 0; i < ehdr.e_phnum; i++) { + GElf_Phdr mem, *phdr; + char *data; + + phdr = gelf_getphdr(elf, i, &mem); + if (!phdr) + goto out; + + if (phdr->p_type != PT_NOTE) + continue; + + data = elf_rawfile(elf, &max); + if (!data) + goto out; + + if (phdr->p_offset >= max || + (phdr->p_offset + phdr->p_memsz >= max)) + goto out; + + err = parse_build_id_buf(data + phdr->p_offset, phdr->p_memsz, build_id); + if (err > 0) + goto out; + } + +out: + if (elf) + elf_end(elf); + close(fd); + return err; +} diff --git a/tools/testing/selftests/bpf/trace_helpers.h b/tools/testing/selftests/bpf/trace_helpers.h index 53efde0e2998..50b2cc498ba7 100644 --- a/tools/testing/selftests/bpf/trace_helpers.h +++ b/tools/testing/selftests/bpf/trace_helpers.h @@ -4,6 +4,9 @@ #include +#define ALIGN(x, a) __ALIGN_MASK(x, (typeof(x))(a)-1) +#define __ALIGN_MASK(x, mask) (((x)+(mask))&~(mask)) + struct ksym { long addr; char *name; @@ -23,4 +26,6 @@ void read_trace_pipe(void); ssize_t get_uprobe_offset(const void *addr); ssize_t get_rel_offset(uintptr_t addr); +int read_build_id(const char *path, char *build_id); + #endif -- 2.39.2