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 19781C678D5 for ; Wed, 8 Mar 2023 01:26:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 944ED6B0072; Tue, 7 Mar 2023 20:26:48 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8F52D6B0073; Tue, 7 Mar 2023 20:26:48 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7E3D36B0074; Tue, 7 Mar 2023 20:26:48 -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 701476B0072 for ; Tue, 7 Mar 2023 20:26:48 -0500 (EST) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 3A1A6803FD for ; Wed, 8 Mar 2023 01:26:48 +0000 (UTC) X-FDA: 80543991696.02.F33ECAC Received: from mail-ed1-f50.google.com (mail-ed1-f50.google.com [209.85.208.50]) by imf04.hostedemail.com (Postfix) with ESMTP id 626004000E for ; Wed, 8 Mar 2023 01:26:46 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b="iZJUH/J3"; spf=pass (imf04.hostedemail.com: domain of andrii.nakryiko@gmail.com designates 209.85.208.50 as permitted sender) smtp.mailfrom=andrii.nakryiko@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1678238806; 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=Li/ZgFXVP1Se56QdUsy/uv0TfvyuXofWTKsHZLAR0u8=; b=mOuUVn82NHaWi53ZKa2KyyDEd0y0f6ceB1hb87GbN7N3AtA8TDl0S1lMMVdpzbEogcJlr5 Y33gxfqN/XmODdx7YmKVm8IAKEzarI0k4+Rdw0Z2enahDg31hfo6EpSTUmh2fCBIThM4YV BFJ8Dn3L0WvyrE/pMTVhEdM6fp6aj4M= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b="iZJUH/J3"; spf=pass (imf04.hostedemail.com: domain of andrii.nakryiko@gmail.com designates 209.85.208.50 as permitted sender) smtp.mailfrom=andrii.nakryiko@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1678238806; a=rsa-sha256; cv=none; b=kGCZIu16Tz6cCEfUQMwC2Yy24/G9q+Jg1Xi+A95/L09+RPkvHQHavPJSX+ve3/0PcIuUoY 2bZhnC3I0vBA30SqGeT0TqBs1q5V+1H5T4TJX8usUGu7vjD+JuVSyF3CxKEJYjO8PLfW0T TAcb0S5L+QDIbI3pjEqYO2Mv5f4rhQk= Received: by mail-ed1-f50.google.com with SMTP id ay14so56108891edb.11 for ; Tue, 07 Mar 2023 17:26:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678238805; 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=Li/ZgFXVP1Se56QdUsy/uv0TfvyuXofWTKsHZLAR0u8=; b=iZJUH/J3LDHn1vSlVYlB7F4OHGs5nuClm3+6k8o+tyMEXcAAf+O8L5y5J+2Pv9Gs4K Bs1GUbaLIH0J6VMGlPCk3vrLv/mDc65kQxDprstIs/Lf/97jeXemaXO9qNYzkWriaknm 7FCQcI0IvaKd4lHCmBfIkTpmicWyPD0zViylk0JeHezdLu+GguQt/JP4vSwuUs6zoj1w 4UwpxTYwgDFIOG9/dpCSqJzEdGkMp1izGNuL7NksYzGThWC50sFa1voZkIyMUyy4H2qM RDOPp+nNKY7/sNZHTFVb6AewEA9FaumABuAEtxckMPOFGgh2G1x5LpuQiEC1evnesim8 JNdw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678238805; 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=Li/ZgFXVP1Se56QdUsy/uv0TfvyuXofWTKsHZLAR0u8=; b=HD+UWn1eLGafbkjP8CBbtmVuL4DSKlXkAOQPFDfcs3leosHDQiqOfctCwb4ZIX4dYa gcIP2oo1REneSVOpwK3p2Kt1feZEYZxDiqOmxoLRRIVUFLtma6SbYec4cJocHHiL+Jjv Jw1KEQHImlIwflIAaHj4H7CLdxafu60K988nhyFmfTeWjuksw2l/HZ6wOyfPLttuTe5R SCsXP7W7+KDwDaEsZAiHhDeVPASWvl6nJkSMC4Og3GybE4XRFtgxfs7zoNmlroSri6Sq OcZDfa7jpVS8KUa61RT4v0wnBw8wSBpXn1jBd41jbxcmYGjCS2SjXctbeQdlN8dhKzXE BY/Q== X-Gm-Message-State: AO0yUKW30PuSMboMAXeXBjiXTtAEMjbs02ntAYOn4+h+QrgdmYTzQMk/ PY/PX4/9Z2fv2MCT7mTIghiDEWUWPLFY0I/5kzc= X-Google-Smtp-Source: AK7set/Yboq1ECwCfm6ab/yrsQXlJu0ggY8MGTJNHj7mLxZr/bf0BTOQb2Z15ZV6UhYJ9ldsL72UsBPkNBwjVCNYx2c= X-Received: by 2002:a50:8711:0:b0:4bb:d098:2138 with SMTP id i17-20020a508711000000b004bbd0982138mr8943838edb.5.1678238804760; Tue, 07 Mar 2023 17:26:44 -0800 (PST) MIME-Version: 1.0 References: <20230228093206.821563-1-jolsa@kernel.org> <20230228093206.821563-8-jolsa@kernel.org> In-Reply-To: <20230228093206.821563-8-jolsa@kernel.org> From: Andrii Nakryiko Date: Tue, 7 Mar 2023 17:26:32 -0800 Message-ID: Subject: Re: [PATCH RFC v2 bpf-next 7/9] selftests/bpf: Replace extract_build_id with read_build_id 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: rspam03 X-Stat-Signature: 776zydjb1rfzy5bazfm3yddu7q6p8a43 X-Rspamd-Queue-Id: 626004000E X-HE-Tag: 1678238806-332235 X-HE-Meta: U2FsdGVkX1+FKrL7l+vO1clO5irgOYq8OOYYERpkQxIwSq2zjMcGYquE8c8pE0v8YhoM2lOAWa05yo8fut7tGG4bYdenbXhMGBqOdpJmPWZrynMlpl4iFT0x9JmOeJOcvpilvxQsP8oCMJA9YQS/LRyNvz9BltxosgEHBCAd7rPaNoidSrRPPgaLzu2dccLQ02KoZCV+uFenbkLTgXCRkjcTFIa+WVoA2FrjInZceh4P3NAo3wCFDsYtkjFLLCUyKXrE0Gf6YOmIRD5/dCDbayzugLy77jS8HX4RoeL5Ph0ZSmjjQz6SKi6Bych8W3dacqPUvSwqjS+vTHQwLVFxeK0UyfsOlbuE1FxfZzcmunvq3mHKFajqPR24l85IvMiaUmRvyrCkD3ei7RLfi2Vm9ty9dg8J+LFoicPtLHUgXPztPoKV/M7PFeecM74amqVhsLeQgNWl98LZLnQ85XE0578JtC8igz0iYbPEP+k1272Tb9QMhjNrCTwQ1991mTPFTJ1CKcKlIfGNCotSk5T/OI8cTvNfZ88RFc4NyobnriZIqglk7X76fsByrhr/8rrNKT10TfCqmn5ysl4m2zqFWECcbNS2hbIV4hLXru2xDObpygXQ1gmEmldar8BBik2AMRTyH9UPDOxkPE3TujZ22UMZqVnwJ6ZQ9Kn6zHvxnhk2KzISy8bV+EQKtjCRlivhEEOtmVBOXlI7oh6N3LSZo9wmJyEcubU70AHfG7Qo8m8tqlIC2ilIXGy9Rrc1CQJenPo+paUyUJr1Rg/eMI70kc7k00f6n1kRjLEgiyH9HH3e5lcXN2d87ON8UnWIN1gTn7a/1Koowzs3Z8zlC/VUpGuFzTzidKwo2Fr8dvp/bH5CGZ24CxkDhHu+RK3UKJOeVra03RTUjVntfeYdF3zxEhY/Ou1YxeQXqr/82zAPkRSbeSKy2WABYKL+J3D9zEaFIuGe84DMxsfRob3AyBt fdf+T9kt GAZo9IYk8rQHSgNbyQCjkANm/hdZbz2jcqCcy6WZdVjJaYfa9GRw17CiQQU32DCcabzS6HBvmkT9wH9/+KtX1Ihlr0bbj5CS7eJ0JiE5SzLMXvXkd/IS0L3qTMrEx8FY6EQ9oqQ35fdVlvCyY5iOb+HyysPLPmt/EmvoVKU13JOMg19m9jpvisLjZP9XUREwNT2Ohl+CruFpzFyVbS0TlpUKS07eAoh+/B8XCeGByGf74l2gkA9DbhlseFKVnnzLJeRGNR5R9tCVIVMcvGJj4r5DV5YsIsSpj12TDUs4xA4qdSbmWVsXcAOexV6SeK6PhpgYZTfhVCgVN3aBSvaJXapEQbMcUoS1OdRTsKI/PGRWL2FhMJ9IdiHqZSCJV0WvNsrLMKl3TLnD91Ct90PJEwCxtpwDksufNlhIABYYqzQ60MODISNn329UerMEYZspNuEzjaOUhj1JfQv8PSQjTml2cjoxORcK+vUe9Fshbny/IGedJVe7N+OhbCoiXxUq7M+gSurGqtHBlkZQbMInNrnfyM7IOgboDPscnQPzrbvWRfsyeu+zE/IDJ3r9ExYGoAN2837Ag+Qw0uUi0L9tKZ+P4YXMsYOi+vjB2V/utjO6BKx4= 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: > > Replacing extract_build_id with read_build_id that parses out > build id directly from elf without using readelf tool. > > Signed-off-by: Jiri Olsa > --- small nit below, but looks good. Thanks for clean up! Acked-by: Andrii Nakryiko > .../bpf/prog_tests/stacktrace_build_id.c | 19 ++++++-------- > .../bpf/prog_tests/stacktrace_build_id_nmi.c | 17 +++++-------- > tools/testing/selftests/bpf/test_progs.c | 25 ------------------- > tools/testing/selftests/bpf/test_progs.h | 1 - > 4 files changed, 13 insertions(+), 49 deletions(-) > > diff --git a/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id.c= b/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id.c > index 9ad09a6c538a..9e4b76ee356f 100644 > --- a/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id.c > +++ b/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id.c > @@ -7,13 +7,12 @@ void test_stacktrace_build_id(void) > > int control_map_fd, stackid_hmap_fd, stackmap_fd, stack_amap_fd; > struct test_stacktrace_build_id *skel; > - int err, stack_trace_len; > + int err, stack_trace_len, build_id_size; > __u32 key, prev_key, val, duration =3D 0; > - char buf[256]; > - int i, j; > + char buf[BPF_BUILD_ID_SIZE]; > struct bpf_stack_build_id id_offs[PERF_MAX_STACK_DEPTH]; > int build_id_matches =3D 0; > - int retry =3D 1; > + int i, retry =3D 1; > > retry: > skel =3D test_stacktrace_build_id__open_and_load(); > @@ -52,9 +51,10 @@ void test_stacktrace_build_id(void) > "err %d errno %d\n", err, errno)) > goto cleanup; > > - err =3D extract_build_id(buf, 256); > + build_id_size =3D read_build_id("./urandom_read", buf); nit: "urandom_read" vs "./urandom_read" matters only when executing binary, not when opening a file. So all these "./" just creates unnecessary confusion, IMO > + err =3D build_id_size < 0 ? build_id_size : 0; > > - if (CHECK(err, "get build_id with readelf", > + if (CHECK(err, "read_build_id", > "err %d errno %d\n", err, errno)) > goto cleanup; > > @@ -64,8 +64,6 @@ void test_stacktrace_build_id(void) > goto cleanup; > > do { > - char build_id[64]; > - > err =3D bpf_map_lookup_elem(stackmap_fd, &key, id_offs); > if (CHECK(err, "lookup_elem from stackmap", > "err %d, errno %d\n", err, errno)) > @@ -73,10 +71,7 @@ void test_stacktrace_build_id(void) > for (i =3D 0; i < PERF_MAX_STACK_DEPTH; ++i) > if (id_offs[i].status =3D=3D BPF_STACK_BUILD_ID_V= ALID && > id_offs[i].offset !=3D 0) { > - for (j =3D 0; j < 20; ++j) > - sprintf(build_id + 2 * j, "%02x", > - id_offs[i].build_id[j] & = 0xff); > - if (strstr(buf, build_id) !=3D NULL) > + if (memcmp(buf, id_offs[i].build_id, buil= d_id_size) =3D=3D 0) > build_id_matches =3D 1; > } > prev_key =3D key; > diff --git a/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_n= mi.c b/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c > index f4ea1a215ce4..8d84149ebcc7 100644 > --- a/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c > +++ b/tools/testing/selftests/bpf/prog_tests/stacktrace_build_id_nmi.c > @@ -28,11 +28,10 @@ void test_stacktrace_build_id_nmi(void) > .config =3D PERF_COUNT_HW_CPU_CYCLES, > }; > __u32 key, prev_key, val, duration =3D 0; > - char buf[256]; > - int i, j; > + char buf[BPF_BUILD_ID_SIZE]; > struct bpf_stack_build_id id_offs[PERF_MAX_STACK_DEPTH]; > - int build_id_matches =3D 0; > - int retry =3D 1; > + int build_id_matches =3D 0, build_id_size; > + int i, retry =3D 1; > > attr.sample_freq =3D read_perf_max_sample_freq(); > > @@ -94,7 +93,8 @@ void test_stacktrace_build_id_nmi(void) > "err %d errno %d\n", err, errno)) > goto cleanup; > > - err =3D extract_build_id(buf, 256); > + build_id_size =3D read_build_id("./urandom_read", buf); > + err =3D build_id_size < 0 ? build_id_size : 0; > > if (CHECK(err, "get build_id with readelf", > "err %d errno %d\n", err, errno)) > @@ -106,8 +106,6 @@ void test_stacktrace_build_id_nmi(void) > goto cleanup; > > do { > - char build_id[64]; > - > err =3D bpf_map__lookup_elem(skel->maps.stackmap, &key, s= izeof(key), > id_offs, sizeof(id_offs), 0); > if (CHECK(err, "lookup_elem from stackmap", > @@ -116,10 +114,7 @@ void test_stacktrace_build_id_nmi(void) > for (i =3D 0; i < PERF_MAX_STACK_DEPTH; ++i) > if (id_offs[i].status =3D=3D BPF_STACK_BUILD_ID_V= ALID && > id_offs[i].offset !=3D 0) { > - for (j =3D 0; j < 20; ++j) > - sprintf(build_id + 2 * j, "%02x", > - id_offs[i].build_id[j] & = 0xff); > - if (strstr(buf, build_id) !=3D NULL) > + if (memcmp(buf, id_offs[i].build_id, buil= d_id_size) =3D=3D 0) > build_id_matches =3D 1; > } > prev_key =3D key; > diff --git a/tools/testing/selftests/bpf/test_progs.c b/tools/testing/sel= ftests/bpf/test_progs.c > index 6d5e3022c75f..9813d53c4878 100644 > --- a/tools/testing/selftests/bpf/test_progs.c > +++ b/tools/testing/selftests/bpf/test_progs.c > @@ -591,31 +591,6 @@ int compare_stack_ips(int smap_fd, int amap_fd, int = stack_trace_len) > return err; > } > > -int extract_build_id(char *build_id, size_t size) > -{ > - FILE *fp; > - char *line =3D NULL; > - size_t len =3D 0; > - > - fp =3D popen("readelf -n ./urandom_read | grep 'Build ID'", "r"); > - if (fp =3D=3D NULL) > - return -1; > - > - if (getline(&line, &len, fp) =3D=3D -1) > - goto err; > - pclose(fp); > - > - if (len > size) > - len =3D size; > - memcpy(build_id, line, len); > - build_id[len] =3D '\0'; > - free(line); > - return 0; > -err: > - pclose(fp); > - return -1; > -} > - > static int finit_module(int fd, const char *param_values, int flags) > { > return syscall(__NR_finit_module, fd, param_values, flags); > diff --git a/tools/testing/selftests/bpf/test_progs.h b/tools/testing/sel= ftests/bpf/test_progs.h > index 9fbdc57c5b57..3825c2797a4b 100644 > --- a/tools/testing/selftests/bpf/test_progs.h > +++ b/tools/testing/selftests/bpf/test_progs.h > @@ -404,7 +404,6 @@ static inline void *u64_to_ptr(__u64 ptr) > int bpf_find_map(const char *test, struct bpf_object *obj, const char *n= ame); > int compare_map_keys(int map1_fd, int map2_fd); > int compare_stack_ips(int smap_fd, int amap_fd, int stack_trace_len); > -int extract_build_id(char *build_id, size_t size); > int kern_sync_rcu(void); > int trigger_module_test_read(int read_sz); > int trigger_module_test_write(int write_sz); > -- > 2.39.2 >