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 D0EC1C636D4 for ; Thu, 9 Feb 2023 00:01:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5C86E6B0071; Wed, 8 Feb 2023 19:01:59 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 578C16B0072; Wed, 8 Feb 2023 19:01:59 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 41A4C6B0074; Wed, 8 Feb 2023 19:01:59 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 309886B0071 for ; Wed, 8 Feb 2023 19:01:59 -0500 (EST) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id C9D11120DB8 for ; Thu, 9 Feb 2023 00:01:58 +0000 (UTC) X-FDA: 80445800316.01.BE32DB3 Received: from mail-ej1-f41.google.com (mail-ej1-f41.google.com [209.85.218.41]) by imf05.hostedemail.com (Postfix) with ESMTP id E6FF2100019 for ; Thu, 9 Feb 2023 00:01:56 +0000 (UTC) Authentication-Results: imf05.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=T5vXmkSA; spf=pass (imf05.hostedemail.com: domain of andrii.nakryiko@gmail.com designates 209.85.218.41 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=1675900917; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=lnRMEps90VBoUvPiX08maYejjp0JR+MirybtrLIIsis=; b=8Y0bTUupy0K/se/Ww37cmJ07AyQQwANz0PuxoM4IM5u+pgGakFVzp55FHaI3cELTQrHxYk CfbmnkAcnX1t5YtnhgywoPAcu6e2j0bis3YCG/m4Qlj3VLTp+mSJ+bERHActA3RBEKThTq nJOiLt4iUwPkw0ZrbgIj7uvVZz9loqs= ARC-Authentication-Results: i=1; imf05.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=T5vXmkSA; spf=pass (imf05.hostedemail.com: domain of andrii.nakryiko@gmail.com designates 209.85.218.41 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=1675900917; a=rsa-sha256; cv=none; b=ifFzEvPIpBqaW+zLaN/zOyJ+BnctRXWdpF3eiWZmt+cXbSbZyQZ6XIipkdWhVEwygTQo/x GdLVvepdeO5l5BKtpZXbuNEnpkS9Z2z7SSdsD4FOm6uJv1EtKZ8nD+MX6C64wQHFgY45t1 MNXiHFYbGKGaDMKS8tdhke1cPYc9sZc= Received: by mail-ej1-f41.google.com with SMTP id qw12so1761731ejc.2 for ; Wed, 08 Feb 2023 16:01:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=lnRMEps90VBoUvPiX08maYejjp0JR+MirybtrLIIsis=; b=T5vXmkSASESMqX2UeOtjZS2ssxJ4Lud3Ev/pHOB37KxdU7nqMTlccFCoXl5/kuvuJG iDkpBA5yWQbQCdpLjaxzzH1NeGAWyt40CVZ7om44kcl3jk0hFcsfGaGTi5uE3gSjTLaR 1FlxNpFlQtTzb37W0EfKYl/NscEUSGyKaji1FuDB1O7PttswoWwqKC3hJyQaU1bFbXF7 sgmBCTVfnS3DrW3FdjpXt84YaVliQ1HyppdlPiSFlYVCEA0uONRx1uh2hA4JpxshUMJu q36pYfg3TadiS38JRI3rjpDwWEBv0Q3wn8c62VgYx5nx8B0ygpD2K4eUlRcmv5hEKsPK b7Bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=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=lnRMEps90VBoUvPiX08maYejjp0JR+MirybtrLIIsis=; b=lY3fBFsEE3CWq7NSHXL5v1e7chulqNsCDM/uuVe9rlcSKf9WEeMUEQ0aZYJxWl+hXQ BNwsP1TtbGRtpK1lyPvohfzzKj/JNCifDHhBffaVdTJ1FbXBfo15wo3jiVWM0xKdLRtA z2YDfMeB26/mqfXzyYAqnyLQDZnxkUIJCOTkXJYpjqKo4boXIIeTNCDrpQHhov5RkYDR 34SNozz4rZtChgiZ+dLg4jKowbujdZLk/26c1tcIyX7Hk8I1C4Ox3UwX+ZqWMgqYAgs2 5xS0GmD+zQICJcnJNHx+Q4tlzCwJpXEFqx+1cMxCzc8m0D9ERpEgwSjLWlKUHH7LJzkW AeWw== X-Gm-Message-State: AO0yUKWaO78Ytn/lHs7n4VA8Xa0CIGcyJGWRu/LRWmX9VjM88PjzAYl+ fcjoFhIq1MJPyVM0bgl7Ew8NMH04GCEGPlVycDQ= X-Google-Smtp-Source: AK7set9eTP3Th07NxSDOa0p2NHCLdt7oO6rrdgVRBu4RBAY5MQEs4rGjBczC0SNe48hctP7Rz+XK23kCSuAIK9BlgnA= X-Received: by 2002:a17:906:4c43:b0:8ab:3d5a:bb3b with SMTP id d3-20020a1709064c4300b008ab3d5abb3bmr101265ejw.2.1675900915310; Wed, 08 Feb 2023 16:01:55 -0800 (PST) MIME-Version: 1.0 References: <20230201135737.800527-1-jolsa@kernel.org> <20230201135737.800527-6-jolsa@kernel.org> In-Reply-To: <20230201135737.800527-6-jolsa@kernel.org> From: Andrii Nakryiko Date: Wed, 8 Feb 2023 16:01:42 -0800 Message-ID: Subject: Re: [PATCH RFC 5/5] 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 , 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 Content-Type: text/plain; charset="UTF-8" X-Stat-Signature: 544ytjexquqb7o5eqxdnz54fxpf7r3z9 X-Rspam-User: X-Rspamd-Queue-Id: E6FF2100019 X-Rspamd-Server: rspam06 X-HE-Tag: 1675900916-637253 X-HE-Meta: U2FsdGVkX1/rVr9gK7BL3hiP+IGftIqGCTu3/fAEb3oN8G7TpEYp9VcexdkT+X+Onc1yB1SVKytWqB94L/UjMlHiYOQMjZflD/Srvei+4sXkK7xsESKE67ll/sv1x0sNc9zh0rt5dCU7Z3mdx3ACYNm84YLu44FThAMG5aNvChG8lUYgt7GNwNEchC/TB8pWlk/HW4gaaMIR7904VL8UXZoseOmndJf7dE+Q9Dszxd7w9/Wr7nZRhfcxuDzcwZ8Iv5kPVO+/4MATu1KAJid6maFIQ9zBJ7IETULuIrokIGqP7ArkI9zsUGX/RnB5I5WuFO3QQ69L8TzTs0MeZo4peDiBDXj8UPhEvMdHzX2+PW9bnfaChjWEPuKd6EWlra5aXXRZ9RtllxmaPytctWfyt0jwsDfMRW+ixlyWZnqKwM3XunJN4/zs6THh+F7K0lJqtS7np15RQVE9DD5C+WsHwgaRv9EFWv8aIOOIws6ImX+D2Q2GxE7viYK1Cixqz2VuoO7naO6AYx6qmpkma5oa++BDJg4Ink6KSFHk/phIIdbNG/+NiETiOy1c/B2MX56fz2Mtgsxrvn1gHAwy47cXvxfC0JHOpjKojrzZhpndyit5A4i1P0QUy/EMv0TcvNsJWfkooiwJ4U0pzc6kQN0bOS8AJsB5giOTYjAcimmAsfH7nL8+ATGZrIpV+9DqKsGZaBO+9YAeWLBqU239cN55eAimleMGf5TYxQjAPBfseXvZ0GyPyZYHtwiD5AXF2WkROJVP9JYa3p0uRc6eRh9wGIx8zNRXtjvgOGG+xT2LQ8sMzw5cv4LiMTcH7+kwXv/H97s7QCkeVh892Asf9BTj2k9KCrdC2PxeUVkqG/5dg/hEDwytnHbgGowXbR6/7sSJJWJuJEZPDLtyRszGteu8ez0AVo/7hrGa4tl5L931m7niXlTgGdHOu6esvrELAJNfOsOmZhN+N4o1Uy/DyEg TpoqwMPr uf0odAeJP2mAB6C/ahBNoMwlpTABYYYvuPrkgnYgUwGDUmnLWhuOlqfgZea7Kt7QNxxSP2Igy4LEb2Z4TZZ8d7KaoXOGDY3HPVpFWzw27S9UpU4pKI2tqSCVt7DhPoEaV++CFkv2VW820WexCfz5qiisOeVj8GSaofTcO+AA2PuLRyB06x0Mrt8xuU1hWtNITotpLLfv+JW2BhQ7cZ5b8zi7Zb1Q9XZCMoOVqoyNdZ7qfuoKaLdkZxvG30/EPcRAC/CHdfPoMQYgAsMBeFMzxnXt52W6XSovQ0UB9sSn6pkxbbzhCctindWQTvVcJmnX6pZQq6k1WgzZB8iqvIE6B5uUhxtAF872Seo+rtGikf2NBZ2A7NZu0RrGPtsovZpTpY5jJNMx6XHyar4N3iE96rhl97n38pq5wlZ133QbhX+HJ8ZsID0oPVy6ZlMEPTaoOGGkBV9Q0sd981/+pfbR4bvt+sYDmj7pt4Nwi+xem6Bn1EpNxfm0I0LzO5iITOTLFU50VRsHoVz9uspXB39vYxAGYWKdsOwc+RlwEWzHDDW0OeZ2S7DcdNmJzgT4UJzNUdQDsibrx9W9lC8E8uKHHtKnzzfmhuWnYUquoFZ48rfR+/MA= 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 Wed, Feb 1, 2023 at 5:58 AM Jiri Olsa wrote: > > Testing iterator access to build id in vma->vm_file object > by storing each binary with buildid into map and checking > it against buildid retrieved in user space. > > Signed-off-by: Jiri Olsa > --- > .../selftests/bpf/prog_tests/bpf_iter.c | 88 +++++++++++++++++++ > .../bpf/progs/bpf_iter_task_vma_buildid.c | 49 +++++++++++ > 2 files changed, 137 insertions(+) > create mode 100644 tools/testing/selftests/bpf/progs/bpf_iter_task_vma_buildid.c > > diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_iter.c b/tools/testing/selftests/bpf/prog_tests/bpf_iter.c > index 3af6450763e9..fd3217b68c2e 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,91 @@ static void test_task_vma_dead_task(void) > bpf_iter_task_vma__destroy(skel); > } > > +#define D_PATH_BUF_SIZE 1024 > +#define BUILD_ID_SIZE_MAX 20 > + > +struct build_id { > + u32 sz; > + char data[BUILD_ID_SIZE_MAX]; > +}; > + > +#define BUILDID_STR_SIZE (BPF_BUILD_ID_SIZE*2 + 1) > + > +static void test_task_vma_buildid(void) > +{ > + int err, iter_fd = -1, proc_maps_fd = -1; > + struct bpf_iter_task_vma_buildid *skel; > + char key[D_PATH_BUF_SIZE], *prev_key; > + char bpf_build_id[BUILDID_STR_SIZE]; > + int len, files_fd, i, cnt = 0; > + struct build_id val; > + char *build_id; > + char c; > + > + skel = bpf_iter_task_vma_buildid__open(); > + if (!ASSERT_OK_PTR(skel, "bpf_iter_task_vma_buildid__open")) > + return; > + > + err = bpf_iter_task_vma_buildid__load(skel); > + if (!ASSERT_OK(err, "bpf_iter_task_vma_buildid__load")) > + goto out; minor: you can do __open_and_load() in one step > + > + skel->links.proc_maps = bpf_program__attach_iter( > + skel->progs.proc_maps, NULL); > + > + if (!ASSERT_OK_PTR(skel->links.proc_maps, "bpf_program__attach_iter")) { > + skel->links.proc_maps = NULL; > + goto out; > + } > + > + iter_fd = 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 = read(iter_fd, &c, 1); > + ASSERT_EQ(len, 0, "len_check"); > + > + files_fd = bpf_map__fd(skel->maps.files); > + > + prev_key = NULL; > + > + while (true) { > + err = bpf_map_get_next_key(files_fd, prev_key, &key); > + if (err) { > + if (errno == ENOENT) > + err = 0; > + break; > + } > + if (bpf_map_lookup_elem(files_fd, key, &val)) > + break; > + if (!ASSERT_LE(val.sz, BUILD_ID_SIZE_MAX, "buildid_size")) > + break; > + > + memset(bpf_build_id, 0x0, sizeof(bpf_build_id)); > + for (i = 0; i < val.sz; i++) { > + sprintf(bpf_build_id + i*2, "%02x", > + (unsigned char) val.data[i]); > + } > + > + if (!ASSERT_OK(read_buildid(key, &build_id), "read_buildid")) > + break; > + > + printf("BUILDID %s %s %s\n", bpf_build_id, build_id, key); debugging leftover or intentional? > + ASSERT_OK(strncmp(bpf_build_id, build_id, strlen(bpf_build_id)), "buildid_cmp"); > + > + free(build_id); > + prev_key = key; > + cnt++; > + } > + > + printf("checked %d files\n", cnt); ditto > +out: > + close(proc_maps_fd); > + close(iter_fd); > + bpf_iter_task_vma_buildid__destroy(skel); > +} > + > void test_bpf_sockmap_map_iter_fd(void) > { > struct bpf_iter_sockmap *skel; > @@ -1659,6 +1745,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..25e2179ae5f4 > --- /dev/null > +++ b/tools/testing/selftests/bpf/progs/bpf_iter_task_vma_buildid.c > @@ -0,0 +1,49 @@ > +// SPDX-License-Identifier: GPL-2.0 > + > +#include "bpf_iter.h" > +#include > +#include > + > +char _license[] SEC("license") = "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 tmp_key[D_PATH_BUF_SIZE]; > +static struct build_id tmp_data; > + > +SEC("iter/task_vma") int proc_maps(struct bpf_iter__task_vma *ctx) nit: let's keep SEC() on separate line from function itself > +{ > + struct vm_area_struct *vma = ctx->vma; > + struct seq_file *seq = ctx->meta->seq; > + struct task_struct *task = ctx->task; > + unsigned long file_key; > + struct file *file; > + > + if (task == (void *)0 || vma == (void *)0) > + return 0; > + > + if (!(vma->vm_flags & VM_EXEC)) > + return 0; > + > + file = vma->vm_file; > + if (!file) > + return 0; > + > + memset(tmp_key, 0x0, D_PATH_BUF_SIZE); __builtin_memset() to not rely on compiler optimization? > + bpf_d_path(&file->f_path, (char *) &tmp_key, D_PATH_BUF_SIZE); > + > + if (bpf_map_lookup_elem(&files, &tmp_key)) > + return 0; > + > + memcpy(&tmp_data, file->f_bid, sizeof(*file->f_bid)); same about __builtin_memcpy() > + bpf_map_update_elem(&files, &tmp_key, &tmp_data, 0); > + return 0; > +} > -- > 2.39.1 >