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 3192FC6FD1F for ; Thu, 16 Mar 2023 22:31:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B092D900003; Thu, 16 Mar 2023 18:31:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A927E900002; Thu, 16 Mar 2023 18:31:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 90B5E900003; Thu, 16 Mar 2023 18:31:49 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 7A89F900002 for ; Thu, 16 Mar 2023 18:31:49 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 5421CA0A36 for ; Thu, 16 Mar 2023 22:31:49 +0000 (UTC) X-FDA: 80576209938.08.51873F6 Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com [209.85.208.48]) by imf25.hostedemail.com (Postfix) with ESMTP id 7DDEBA0024 for ; Thu, 16 Mar 2023 22:31:47 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=oY2B7x8w; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf25.hostedemail.com: domain of andrii.nakryiko@gmail.com designates 209.85.208.48 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=1679005907; 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=/3zLWyHPVNxQpPGRXFL1+XihZgc7nxVWWTNMj/1mwl8=; b=MxZd9vxL4QDHBYrq+Wjeq8iPwnw36kSpJ0PnIzappG5sF+cIai/U9ioYlc2cmJAcDi7m8F oxsWdoTmgFHXY2e991E2YY14GWc39W55cg0ZOC3lz5Kku3YFXeKbam2CciPGS9hcF4Mqrw T8vqrsovWWJx+zuNBB8MPwOI6MLyZTw= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=oY2B7x8w; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf25.hostedemail.com: domain of andrii.nakryiko@gmail.com designates 209.85.208.48 as permitted sender) smtp.mailfrom=andrii.nakryiko@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1679005907; a=rsa-sha256; cv=none; b=PisT5biah4vGZ5yez3iLeIyIjABrn2hNHup6UQeAoGArySFRGWVvg0B5M9Qf3M2z4+hplH DIY3fgVPAmiFD3O5buy1N0utPom0JmoEwH+a6f+gWDJIssyFt6sxlv+pbah7pGsWDqRMpT b0cTvOf0g24sbVBkiDB3qXKbpbXJXic= Received: by mail-ed1-f48.google.com with SMTP id r11so13597189edd.5 for ; Thu, 16 Mar 2023 15:31:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1679005906; 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=/3zLWyHPVNxQpPGRXFL1+XihZgc7nxVWWTNMj/1mwl8=; b=oY2B7x8wnqsGwcCpIVExvWjMN6zqSVawA617kP+hKY8qwY8tMDxE1GTf8NJGN3DX2t D8qispaJSZ763gwsQBot30RSYleujJyrn6EMJcDdQhVNLZB5ndgFC3fDX7NqJI0MKEkD J8s7TDzRATJlrpel1+/VODW4xObjtY4IAmX7ZJ8irh6XGXQ4sbU7kmEPsMZiUCJmqPv+ CGBp3skNfM4SMBYiR7tWOF7ydc/PY+ugz/zPhh3nd9Ch9yl8d+VFUlvWcLKa6BC5HW5B mSqJpLA81jn3LuMwNxMGrT+4TVqnHV2kYTI3X3dAkDdsLT3sdKgk7T60YXibQJFU8HeO M5YQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1679005906; 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=/3zLWyHPVNxQpPGRXFL1+XihZgc7nxVWWTNMj/1mwl8=; b=6vretyZT6ieMiFiOCRUK3jCsxzQRdtBsaOCQmIE0X25f8jUYlSo1IKQ+MHhOmycj0M KRhz7zvb1c2dw93/+1V+W5XgwsLQAvVG3sPQY985pC4cd9FqnrjQ1Kz0pDF47/RS0S/X XmkElvvvzGiKtw8Z/6koaSGRJlQ5sQxsSg6GHnTt9M7RFjiM654w51yyT/WzhT8qV1JQ qc8T7jy+TWd+GWHd5ZR/LmVCVsg4Zy7dm+UDhnNWq8uH4afXSSaq9KQNeepw3pz7REuS RK9mt1qufPZZccp+8Dl4OIiPC9D2z9yOlCtMMZ4y3I7F84WsT6lPgK9Tln5gtXz2Zha2 Q0XQ== X-Gm-Message-State: AO0yUKVylWMDJIk743lIgCDgM5Nn6nyHRIfTWgDuBQzyVK72h30NRWeB JaBK8Ja4PKA4aE/usXFJPVkHzY7LBktwsBOqIM8= X-Google-Smtp-Source: AK7set8l5zfO9GJlRowCWeytxjenFzFoUcsMoAd0b6XFdlHAhpu9dFDxw0gQXlKT0FZyLzSjXj7kOq7I7J2m/70171I= X-Received: by 2002:a17:906:8552:b0:8ab:b606:9728 with SMTP id h18-20020a170906855200b008abb6069728mr6191916ejy.5.1679005905761; Thu, 16 Mar 2023 15:31:45 -0700 (PDT) MIME-Version: 1.0 References: <20230316170149.4106586-1-jolsa@kernel.org> <20230316170149.4106586-9-jolsa@kernel.org> In-Reply-To: <20230316170149.4106586-9-jolsa@kernel.org> From: Andrii Nakryiko Date: Thu, 16 Mar 2023 15:31:33 -0700 Message-ID: Subject: Re: [PATCHv3 bpf-next 8/9] selftests/bpf: Add iter_task_vma_buildid test 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 , Dave Chinner Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 7DDEBA0024 X-Stat-Signature: 5thoym864cirawosmjyz5h9o94157yne X-HE-Tag: 1679005907-285951 X-HE-Meta: U2FsdGVkX1/+tEkcT+qU4r9Q5SaENmK5rlXOUS48cAL7uj+yJ/KV1uaED86Wst1/KcBOhL+u0dDcjpTWm137DmJlzYI+Uo8WlZkadke++phWy1ocNtTGQm7Pt3NCA47hu4Nql2979O75z4flh3Do+7SVJVG4JT+1q0+HIvkxuZ6TlIIVgLnI3xTSrbxou0LqWhiAvEk5O/pu66dCKebh7uKLX6H9irtq+52CVS8VoLW4WW64NfNKucBZaCVY8/i3IXz+6Ai/6ukdYc1kdB9RzkxkfbM02COCtPi/+4B4wFhfLNQurbnoNPNn75kIB0oOjDJ/+gHJrmJIw+OdlbueUH62Rw5hW6keYc95tt9rJhjTP2kpT1vhfy8ZbXsjxEEBQq7gMkXQJceGB2m/I99mDs9IKIPoOaaM1mRMMdYABZh32O3QCM6Lku6VX+v60jElvlgFOFmaa1+hs17/uxe9k3stDtITMXBAVEbcQ9QYsJyVRIoBhRQyCRTmr6bUNy6jjCNpfUCimIE/LkbagELngZpazJJYjVOEJ0SNHsoBPk2qqYW4xpKOGdgzwztwJcfjdRjiyf3dbJIEmBaRPUUIHS4zbEY+ag+9chFxUsC1725z2dSvXJRdrlh8acCtCnRYRi6dFbWrleaE9PCjGn/yxx0vMWzzjqYMtTr/K802t400RX0G9JNeHwmh5EeHGt8l2skVcDCP+aN+0+OGNmZ0O8ThxPI+GH2FHSsurQm7L0H6GCXy90BOeLWr4k8ApKpfVHnNypOToSIxchAi5Y6uE+LYA5nSWaKimO0LN/9vuDOUsIrOLV48g2eBHADgWz2S3zZu9uaM9eRDKMJHG67na4Vk6kDKbkn43TKVW8GHhpb6iyL7d9GPKvUtzaJp34mDaARhUK/iHlDd+42kakeeUldsqTIOJdACv4s6d/98M7/EZglpnlBz6SLqtiY0hXg1NCjzGFVh7oed+NjI2GQ 6y+m6Naw uX5U3dS0IEqPoGma1y/NoceGaoBJjgIVqdME1GBwK5+TkcZM2vQWuxTaMR7+p9ctVOHxly9Q010mU5THTKvXt5e1tS/GKGtNLNn/RRVCZMjOsW1mI+4GP21RZYKLJ+k1IiUhac+97KtCqnkQXhnmJ+f/gFERXI19cAvlLAt1skRvkZz7YnU3zCiPyah+aHEcaBkMgX20bi80ix52R0zg4XKbLPFI3zt3JhFEzNtyEqDKgTudUUdnJpx0IkTcCEudURSOwwWe5O/PypCj8LtPM8sCtvrnMYCDb1yNoRwW7KWrVtetro6e7HW3o8dK7sfRG/o9w/lg5zQhGF9GqAutrbrJ6fiUBj6upfTd5uG38A2fWtiY+6q/yCwLZGCHkdqN2sSRK0EHmQdhx2pBzdvTb+m+QSa34cXSZquLw+o3dx+JvZqKZMYbbfHTtTDQQ1lk5tkcCz2ayPBOqqRW9owgpG8WEt1TllDy5OQl41YHdiINeryTri+dXG70qtrbGoRSQ/HNFsIgJPHXX6YFDJPUyP0PaYKnTLuqfZghWzHflIDyyXaD/6LSxbYBRG+ej9C966RIMnMyRoeMx2UFpjeMXtHXCpvAAj637tCW2hVSIDcz+meE= 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 Thu, Mar 16, 2023 at 10:03=E2=80=AFAM Jiri Olsa wrote= : > > Testing iterator access to build id in vma->vm_file object by storing > each binary with build id into map and checking it against build id > retrieved in user space. > > Signed-off-by: Jiri Olsa > --- > .../selftests/bpf/prog_tests/bpf_iter.c | 78 +++++++++++++++++++ > .../bpf/progs/bpf_iter_task_vma_buildid.c | 56 +++++++++++++ > 2 files changed, 134 insertions(+) > create mode 100644 tools/testing/selftests/bpf/progs/bpf_iter_task_vma_b= uildid.c > > diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_iter.c b/tools/te= sting/selftests/bpf/prog_tests/bpf_iter.c > index 1f02168103dd..c7dd89e7cad0 100644 > --- a/tools/testing/selftests/bpf/prog_tests/bpf_iter.c > +++ b/tools/testing/selftests/bpf/prog_tests/bpf_iter.c > @@ -33,6 +33,7 @@ > #include "bpf_iter_bpf_link.skel.h" > #include "bpf_iter_ksym.skel.h" > #include "bpf_iter_sockmap.skel.h" > +#include "bpf_iter_task_vma_buildid.skel.h" > > static int duration; > > @@ -1536,6 +1537,81 @@ static void test_task_vma_dead_task(void) > bpf_iter_task_vma__destroy(skel); > } > > +#define D_PATH_BUF_SIZE 1024 > + > +struct build_id { > + u32 sz; > + char data[BPF_BUILD_ID_SIZE]; > +}; > + > +static void test_task_vma_buildid(void) > +{ > + int err, iter_fd =3D -1, proc_maps_fd =3D -1, sz; > + struct bpf_iter_task_vma_buildid *skel; > + char key[D_PATH_BUF_SIZE], *prev_key; > + char build_id[BPF_BUILD_ID_SIZE]; > + int len, files_fd, cnt =3D 0; > + struct build_id val; > + char c; > + > + skel =3D bpf_iter_task_vma_buildid__open_and_load(); > + if (!ASSERT_OK_PTR(skel, "bpf_iter_task_vma_buildid__open_and_loa= d")) > + return; > + > + skel->links.proc_maps =3D bpf_program__attach_iter( > + skel->progs.proc_maps, NULL); > + > + if (!ASSERT_OK_PTR(skel->links.proc_maps, "bpf_program__attach_it= er")) { > + skel->links.proc_maps =3D NULL; > + goto out; > + } > + > + iter_fd =3D bpf_iter_create(bpf_link__fd(skel->links.proc_maps)); > + if (!ASSERT_GE(iter_fd, 0, "create_iter")) > + goto out; > + > + /* trigger the iterator, there's no output, just map */ > + len =3D read(iter_fd, &c, 1); > + ASSERT_EQ(len, 0, "len_check"); > + > + files_fd =3D bpf_map__fd(skel->maps.files); > + > + prev_key =3D NULL; > + > + while (true) { > + err =3D bpf_map_get_next_key(files_fd, prev_key, &key); > + if (err) { > + if (errno =3D=3D ENOENT) > + err =3D 0; > + break; > + } > + if (bpf_map_lookup_elem(files_fd, key, &val)) > + break; > + if (!ASSERT_LE(val.sz, BPF_BUILD_ID_SIZE, "buildid_size")= ) > + break; > + > + sz =3D read_build_id(key, build_id); > + /* If there's an error, the build id is not present or ma= lformed, kernel > + * should see the same result and bpf program pushed zero= build id. > + */ > + if (sz < 0) { > + memset(build_id, 0x0, BPF_BUILD_ID_SIZE); > + sz =3D BPF_BUILD_ID_SIZE; > + } > + ASSERT_EQ(val.sz, sz, "build_id_size"); > + ASSERT_MEMEQ(val.data, build_id, sz, "build_id_data"); > + > + prev_key =3D key; > + cnt++; > + } > + > + printf("checked %d files\n", cnt); ASSERT_GT(cnt, 0, "file_cnt"); better than printf, and tests no results condition > +out: > + close(proc_maps_fd); > + close(iter_fd); `if (proc_maps_fd >=3D 0)` and `if (iter_fd >=3D 0)` are missing > + bpf_iter_task_vma_buildid__destroy(skel); > +} > + > void test_bpf_sockmap_map_iter_fd(void) > { > struct bpf_iter_sockmap *skel; > @@ -1659,6 +1735,8 @@ void test_bpf_iter(void) > test_task_vma(); > if (test__start_subtest("task_vma_dead_task")) > test_task_vma_dead_task(); > + if (test__start_subtest("task_vma_buildid")) > + test_task_vma_buildid(); > if (test__start_subtest("task_btf")) > test_task_btf(); > if (test__start_subtest("tcp4")) > diff --git a/tools/testing/selftests/bpf/progs/bpf_iter_task_vma_buildid.= c b/tools/testing/selftests/bpf/progs/bpf_iter_task_vma_buildid.c > new file mode 100644 > index 000000000000..11a59c0f1aba > --- /dev/null > +++ b/tools/testing/selftests/bpf/progs/bpf_iter_task_vma_buildid.c > @@ -0,0 +1,56 @@ > +// SPDX-License-Identifier: GPL-2.0 > + > +#include "bpf_iter.h" > +#include "err.h" > +#include > +#include do you need include? I don't think BPF-side is supposed to inclu= de it > + > +char _license[] SEC("license") =3D "GPL"; > + > +#define VM_EXEC 0x00000004 > +#define D_PATH_BUF_SIZE 1024 > + > +struct { > + __uint(type, BPF_MAP_TYPE_HASH); > + __uint(max_entries, 10000); > + __type(key, char[D_PATH_BUF_SIZE]); > + __type(value, struct build_id); > +} files SEC(".maps"); > + > +static char path[D_PATH_BUF_SIZE]; > +static struct build_id build_id; > + > +SEC("iter/task_vma") > +int proc_maps(struct bpf_iter__task_vma *ctx) > +{ > + struct vm_area_struct *vma =3D ctx->vma; > + struct task_struct *task =3D ctx->task; > + struct file *file; > + > + if (task =3D=3D (void *)0 || vma =3D=3D (void *)0) > + return 0; > + > + if (!(vma->vm_flags & VM_EXEC)) > + return 0; > + > + file =3D vma->vm_file; > + if (!file) > + return 0; > + > + __builtin_memset(path, 0x0, D_PATH_BUF_SIZE); > + bpf_d_path(&file->f_path, (char *) &path, D_PATH_BUF_SIZE); > + > + if (bpf_map_lookup_elem(&files, &path)) > + return 0; > + > + if (IS_ERR_OR_NULL(file->f_build_id)) { > + /* On error return empty build id. */ > + __builtin_memset(&build_id.data, 0x0, sizeof(build_id.dat= a)); > + build_id.sz =3D BUILD_ID_SIZE_MAX; > + } else { > + __builtin_memcpy(&build_id, file->f_build_id, sizeof(*fil= e->f_build_id)); > + } > + > + bpf_map_update_elem(&files, &path, &build_id, 0); > + return 0; > +} > -- > 2.39.2 >