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 17A69C6FA99 for ; Wed, 8 Mar 2023 01:23:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6D6D06B0072; Tue, 7 Mar 2023 20:23:07 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 687146B0073; Tue, 7 Mar 2023 20:23:07 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5275D6B0074; Tue, 7 Mar 2023 20:23:07 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 440AE6B0072 for ; Tue, 7 Mar 2023 20:23:07 -0500 (EST) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 286EB1C673B for ; Wed, 8 Mar 2023 01:23:07 +0000 (UTC) X-FDA: 80543982414.02.C36E6C6 Received: from mail-ed1-f53.google.com (mail-ed1-f53.google.com [209.85.208.53]) by imf13.hostedemail.com (Postfix) with ESMTP id 577F62000E for ; Wed, 8 Mar 2023 01:23:05 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=JkQ0bhqC; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf13.hostedemail.com: domain of andrii.nakryiko@gmail.com designates 209.85.208.53 as permitted sender) smtp.mailfrom=andrii.nakryiko@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1678238585; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=KskDoY551EmOHdJiRobDKDE+GFk+1yzE3Gg+RoSEyLY=; b=plq47YhFNW/ADRTSoq3PnRPNkHTAkdypuGhsjlzPfPiOt2lArR/G+3pRXRCdvQeW0WiR3A yHmwgTX8m+6TJFrxFEAvsNDzXJpQxT9R4SqY82jAdB9n1TZFBALGaGI08Q/uyVz01Uf40u 19iLAXVDsvdLWNsPXirTgWOk+PgtWgE= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=JkQ0bhqC; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf13.hostedemail.com: domain of andrii.nakryiko@gmail.com designates 209.85.208.53 as permitted sender) smtp.mailfrom=andrii.nakryiko@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1678238585; a=rsa-sha256; cv=none; b=N9Hadohzqk/rOJVxJBLgERFwiTk3yC96ISzN+WTYuPkOstsVR75gIPM7xy949XpQgBO/dR Lwzo+LmI/HKVkRNy9xV/8pgyYXxbgWctQoSaPilFnncDThjcNcANQ/yPEMFcATAoIVWtpJ aSe06gCYyDN6BHznH+FTHCakepcFUm4= Received: by mail-ed1-f53.google.com with SMTP id g3so59918312eda.1 for ; Tue, 07 Mar 2023 17:23:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678238584; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=KskDoY551EmOHdJiRobDKDE+GFk+1yzE3Gg+RoSEyLY=; b=JkQ0bhqC4Am3GcwuI0OROo84uG8MtJapLie7+68UMHC5Os+sArhf+fMXrkFCEwU6ih z3CNo5ZBcJnEAEyOG50vquTJXubVuAGEqRAiR31KBRlocW8rqfEsPA4BnETM4Yh7xcAm YcKY/PFP7waSJx5BEx6c3DL89+jR12G/ty2oqNEFShnLxgaNCdxXu0tZH5LLqyra+MCT HJwIeOkqve/OxsgaKJwKzTCSC9eb6CRCnxh4jAJ/6l9LNpdjbC+gwWf0sVXvg2pW9aUk ozl55DldiDnJFtOtvrzhwLtnTEeybIg8Xv/RGwgIJyjv8wyNtfFqeb7kjyerqQ2I9QSO lycA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678238584; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KskDoY551EmOHdJiRobDKDE+GFk+1yzE3Gg+RoSEyLY=; b=PVm9N69NYbl0qweQ89PT2pbhfQR5Th4PHTObcsrIQRbTDIMvg2zXuE8oPg7rcvWQfF lvwwefZ2MYig+KEJxb0jR/ZQj9XYfrFw1R8CO5RK4qI8vJmj/6LNSaeXIsrlTQpGtj/u RJIUM4vUdrJInKAY6pNxERC0HvBiUQIkqLGUWV6aT2KrYgb7RzJ0pwNyl58HtoUM7yey 3qRgG4ptaQMDUNt9D/Km/5nhOVYa+9gpmp65zZRAiIZk9jVpIv1+HRd0dMMcYYQ6w8Qk +ViNnOdO3HJUy0Syd8hYi5BSdRI8ouXEwVSpj20krgJWd4XltqxUBVdAbyyczvKE+i8m t3cw== X-Gm-Message-State: AO0yUKVcX1PbyR8qP9I9FJJTX9XFCgV3QvPODjgigbE/XrbC8yKtSd2u XfMpf3ewwvXyz0yFTFHOEytsVY+PBVBfpWF7bYE= X-Google-Smtp-Source: AK7set8UF2ElgsF28TDecwVtSd8IHMfsKKXYJQppk+w1+yzC8tJQLsFc92Ik1julFeaWkn6KOgvNREeU2jUpuJ0aQbY= X-Received: by 2002:a17:907:33c1:b0:8b0:fbd5:2145 with SMTP id zk1-20020a17090733c100b008b0fbd52145mr8286182ejb.15.1678238583714; Tue, 07 Mar 2023 17:23:03 -0800 (PST) MIME-Version: 1.0 References: <20230228093206.821563-1-jolsa@kernel.org> <20230228093206.821563-6-jolsa@kernel.org> In-Reply-To: <20230228093206.821563-6-jolsa@kernel.org> From: Andrii Nakryiko Date: Tue, 7 Mar 2023 17:22:51 -0800 Message-ID: Subject: Re: [PATCH RFC v2 bpf-next 5/9] selftests/bpf: Add read_buildid function To: Jiri Olsa Cc: Alexei Starovoitov , Andrii Nakryiko , Hao Luo , Andrew Morton , Alexander Viro , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Matthew Wilcox , 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 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 577F62000E X-Stat-Signature: jcd14kaqnfzyzx3ghki99tznesayxkco X-HE-Tag: 1678238585-203250 X-HE-Meta: U2FsdGVkX1/+bYaakHVPuSEnDAYZiBYHk0gmqa1wD32nBJViSDe4z9ad6YSAvLv21/ulrwVMsxTGxs2pf9dDtvOBQB88l48ar6nmHIk6JRe6JwIZxa5RXT/ZkYzqaxbSAsQUOyzCxUBSCm5p7047sxJXfZZDWk6ijiPFwodIhrut2+L6y3RsDcfETIWU3Aa94U42oDDfJ1vp6qaAR8KqmJQA8UZocuf+wmUSHFOBZOAoO7wXtzU9IA6LPXfLtSHcAw249efMdSaFUkyugSvZnL51OqPy4yyo8ZyDbUtJlPxIcuos5aW3iFYvQDGpCqxfBz3b3bo/pRUJOF9SIecS0Pr87RGkWOIgYGmhGiPHz4H9/7tdFiAaeX2dI2KbeMyK7VGvkh2ynSZmySfZAkejU8Iqb0rJFEsyNI9R93ed34zn5gUHKpiH8iceofAuoCBoXpy9uL5pA/ocpwkZlWTn6+ywZ7m7/LE0kh/ZxqhCoTpZmVP9SZNOWzwJm+RtWxnaFXWs1tpjuzn8UWCC/9gkoVIM65WHnDAm+qGCS8LFk6KBDSW2dW+X/2EJytO1kasNb4ooG8/tVjPR09mxJToUycXuEs7vmrplefGNHK8xb15jYbZ8JwrtRe1lfCLLqhKUuBawCm2/ZzOpL9N4uHv9dUOyeDzwAqysHLSogRJwN0T5u4zZ2y0G+JnBjKoHPHEByarC5NDcX1/LzsnFxnU/nkiMmysv4xTtTRRDSjacuFPQj0BOq6H8S8/4ldMI8zARKbjO3nnbzzlIih7bJjMl7BRCQ6I34Q2Q9VIskEKSAPVWa0ri+NNvVnwFwATaPF7yB4x12MYY+uTHiBmNwCNTxTN7zx/ZSnpdKthYXv/NzYysKC2ziGgnU4wFX1Iud7Z4T64UnmZm/J/22sHaYO+QDSF65zgk7o4/fT/iia6tKpAgMReXCiIN8PbIbZ74O3swNyezb04YlQAuKhzTEJK rZDepWmT tqCT/N/eyQPgQMavjNyzBLU1OvxnqGT3SWLl6Nvdbk0T3KMTM9rLgwi6raFoqtiVT9hKa84p+jO2Mw8IBGm7Rk3pE91rXn715MqaT7ePZ9mmFcK7BKV8do9Sl3guOZgTPjF9csnLr7U2G3DkPV2Rli7iVVLnSw6rLgOCJ7qXayEdUFmg00EXvOIS6Dna0+GK0cDyRSNmjLuMYLE8YyWHPNuyoHDBU+wft6GtewK8rFlxKMM3g8YuGfR1lDO/Idvml/X4INDyl+azlSkzz2sQIlYzlKi8568mbX+idHxP4b2yPhWQ7d+BN3q2HVeLRir1PiBpcXHhvC7FxNgc9qfzvckIDFb6LNQoSaZRnKH6F0fQwD8SzIqbmWtJOMomWV/HSDSfdbN7C5A4BXjW1RlbOAbBtV/rvp3zh3dTLRwqpPcgvMFNv8zoiN9awo6pPd5wvBwuMb5gAeR+AOqszr1smabUXyvBdLB88PfcO3NoXAgGAJrEwTsR6y3M7697bY46RTEVVoMaqzZ2ttrrgvz44bYuZTJbKa8GBex2xhBZIkekI3UKHTnBnkfPju/+OUbql34dQggdmUE54jgRckDtIrnW3x5pKTpipu/y36EtUlYtjhYU= 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: On Tue, Feb 28, 2023 at 1:33=E2=80=AFAM Jiri Olsa wrote: > > 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 =3D 0, new_offs; > + > + while (note_offs + sizeof(Elf32_Nhdr) < note_size) { > + Elf32_Nhdr *nhdr =3D (Elf32_Nhdr *)(note_start + note_off= s); > + > + if (nhdr->n_type =3D=3D 3 && > + nhdr->n_namesz =3D=3D sizeof("GNU") && > + !strcmp((char *)(nhdr + 1), "GNU") && > + nhdr->n_descsz > 0 && > + nhdr->n_descsz <=3D BPF_BUILD_ID_SIZE) { > + memcpy(build_id, note_start + note_offs + > + ALIGN(sizeof("GNU"), 4) + sizeof(Elf32_Nhd= r), > + nhdr->n_descsz); > + memset(build_id + nhdr->n_descsz, 0, > + BPF_BUILD_ID_SIZE - nhdr->n_descsz); I won't count :) but if something fits within 100 characters, please keep it on single line > + return (int) nhdr->n_descsz; > + } > + > + new_offs =3D note_offs + sizeof(Elf32_Nhdr) + > + ALIGN(nhdr->n_namesz, 4) + ALIGN(nhdr->n_descs= z, 4); > + > + if (new_offs >=3D note_size) > + break; > + note_offs =3D 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 =3D -EINVAL; > + Elf *elf =3D NULL; > + GElf_Ehdr ehdr; > + size_t max, i; > + > + fd =3D open(path, O_RDONLY | O_CLOEXEC); > + if (fd < 0) > + return -errno; > + > + (void)elf_version(EV_CURRENT); > + > + elf =3D elf_begin(fd, ELF_C_READ, NULL); > + if (!elf) > + goto out; > + > + if (elf_kind(elf) !=3D ELF_K_ELF) > + goto out; > + > + if (gelf_getehdr(elf, &ehdr) =3D=3D NULL) > + goto out; > + > + if (ehdr.e_ident[EI_CLASS] !=3D ELFCLASS64) > + goto out; > + > + for (i =3D 0; i < ehdr.e_phnum; i++) { > + GElf_Phdr mem, *phdr; > + char *data; > + > + phdr =3D gelf_getphdr(elf, i, &mem); > + if (!phdr) > + goto out; > + > + if (phdr->p_type !=3D PT_NOTE) > + continue; > + > + data =3D elf_rawfile(elf, &max); > + if (!data) > + goto out; > + > + if (phdr->p_offset >=3D max || > + (phdr->p_offset + phdr->p_memsz >=3D max)) > + goto out; > + > + err =3D 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)) nit: I know these are macros, but why would you first use __ALIGN_MASK and then #define it? swap them? > + > 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 >