From patchwork Wed Jun 5 00:24:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrii Nakryiko X-Patchwork-Id: 13686023 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 C848FC25B78 for ; Wed, 5 Jun 2024 00:25:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4A48F6B00A4; Tue, 4 Jun 2024 20:25:48 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 405C16B00A5; Tue, 4 Jun 2024 20:25:48 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 230CF6B00A6; Tue, 4 Jun 2024 20:25:48 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id F1E0F6B00A4 for ; Tue, 4 Jun 2024 20:25:47 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id B895F411CF for ; Wed, 5 Jun 2024 00:25:47 +0000 (UTC) X-FDA: 82194941934.02.40753B0 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf30.hostedemail.com (Postfix) with ESMTP id 1A9108000E for ; Wed, 5 Jun 2024 00:25:45 +0000 (UTC) Authentication-Results: imf30.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=opmt81wZ; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf30.hostedemail.com: domain of andrii@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=andrii@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1717547146; 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=CMlgdg2wI1o5bNQm04VXZUvOTRDigZ/HVGjsworxyJA=; b=ZeBhZCNAaswVuBh9vi13yT+a4TrOXERw3TSwPkavVbqOsK+YoYLvrkp8QWWmAz7/vvSm9Z Cu9n79B/rYF4XoLruQ5y7v+7HwmZKqcE1lzcoLKJYv7n3doyVIa97N3r81swilpiDngOSj S38G/jYvKsDuQNDa1/zAEcBqBeOuJB4= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1717547146; a=rsa-sha256; cv=none; b=i3Dn7uynhquMtij0wxdrOMN4iXZUT8LPFb1R4LmAnqlXLpo6TiZ4pIOHsTbiVMubZb/C8L /s8UkpIBiqYgjX2Dzk94UdRwJHd/WlbK52Md9ub4Ag+P9nG2v9k5ItsHmyFTYZu1nmG4C6 TGmkQ3XP6pajaWMsk05sRbWHEAQlAyY= ARC-Authentication-Results: i=1; imf30.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=opmt81wZ; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf30.hostedemail.com: domain of andrii@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=andrii@kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 507FA615D2; Wed, 5 Jun 2024 00:25:45 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C6DDFC2BBFC; Wed, 5 Jun 2024 00:25:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717547145; bh=6bfQltsebIDFmP7fT8/qzCkTKSF6gxCrj2vhm2ulkGA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=opmt81wZngUknnQTTOcKDFZcCS76fVo2OK9CC+rIqkSO7slsl+ZrmNXcyw8lAJFfQ lltNT7n3/XTJsliYev/jBmNdHj3L+IkgDxtAWwarYwErSobyTQvv8nwWqq8uHmrfkk f3ZhmU657tfWxPI/MftfyHufeH6/TUFttPah7xKDgJSe2uC7kh9wLK3VkDGDqUDnCO GbJL+gBvZ/vCZ+ll4umgv+XdMnqqrNR15Fa2AvUO1vnvgpCsxepqvyB/de8UzDN0w9 XBpibd02VOFN/+spe2BmXEN6mjX+D6u48sKiTm2+Z0iLyN3esXsMgoViYV5mk2ijk5 RdEjiN6v+knVg== From: Andrii Nakryiko To: linux-fsdevel@vger.kernel.org, brauner@kernel.org, viro@zeniv.linux.org.uk, akpm@linux-foundation.org Cc: linux-kernel@vger.kernel.org, bpf@vger.kernel.org, gregkh@linuxfoundation.org, linux-mm@kvack.org, liam.howlett@oracle.com, surenb@google.com, rppt@kernel.org, Andrii Nakryiko Subject: [PATCH v3 8/9] selftests/bpf: make use of PROCMAP_QUERY ioctl if available Date: Tue, 4 Jun 2024 17:24:53 -0700 Message-ID: <20240605002459.4091285-9-andrii@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240605002459.4091285-1-andrii@kernel.org> References: <20240605002459.4091285-1-andrii@kernel.org> MIME-Version: 1.0 X-Stat-Signature: sumw6c1ijzr5k95ifb9u94s85csuuyhq X-Rspamd-Queue-Id: 1A9108000E X-Rspam-User: X-Rspamd-Server: rspam01 X-HE-Tag: 1717547145-612821 X-HE-Meta: U2FsdGVkX1+Wy8uWsVYWJtuQ4I5EJIbBBDVnpNDuf4KhAjAZIjrBOoMhLNXzuI4Qy8meAE081Bhiv/dFjMU1eHaeQZftJqEiogjrnkz4xFBfRWozab2AHjilQ8kJGTYAGQDLxs9AHPwSZzaJ+cMl1jZj4W96ntyVCGVmo2/fuYbHTKnaJWvBTpHG3YC7NJqkOOCSQJgfhnaMkw5v44JmaYt6pU1Z/Eq9c/IORDza1IbybhxycKrLzIO8yH+eoEVk9dltbX/wJmIXn8eiBHXqqNjWrYT7US5Uj32oNyMgMeMbrKrb5LUiMGKMPktUWxVz9Fp45vt1OC/BHQ1AUzdGtYZInbl638q0dLjzJDoQvOUMMW7kUQp/4RPq2jMKPGvMtJRpAF3fEL9CTPN3SmYQIRsnz2REN7ewsRwLtzLBslrJYJopUZYM8lkeacpBnPpKUbYFnBx1PnUexj3wB79E7M/dWoY5+MRqBOHQrVsPkwAZVybo3jarajCumQFCTgkptCRa4sRbKtOg/VOMLZQXmpN/F809HoUhMO7dHI3R/9qokuBYFSlkQ2i7a3Gp+cLNRY5E4OHQ58KDrrKX8+i8C8DGPTq9TE1PpVNh5kvAgpQi/nAjhQs4vcHcY1bpZEoUuJ1O1qBlwj9zm7c2Rw3hXjWjrrdE0VyhB3yVjyEIoNWHRwr9N1m5OLkP+syB/wdwLwMEVyp2JSjGnkAeqQ192z6KtD/BdtNA12JWWQyr00j+cFVPHmr1cbq3KYAuoJLdFhQ8Dtocnw7qWUMKQ1VEqDOvlCNoN/DBGP2X+afq3fL9GDlmWfFq5inuWYF0N0tZP2TN0th3+YKHPRt2zfWrPZl7hVpVOjVjRltA/MitSEhY4bLWBvt+GL4gO9QHjwgPRc0GDK64AqT+GIAwR3rPSmTW0XTvD4bVo+dfyo92ekPgYD5ii7hmFymjEx8E+CVr5YeEBODWlKeKwvrlOLM 2MPXkm3d o4xuC4RPT4SYJyGEXxS+lYkB4bw/mcj9NGFJf3hoSz1yjLaZJngcWkvBCY/eSRbLTRJmhFP/9NW7JwhGNLBDRGa5yVSpzPRpDsMrR1eeufHNTZKt1t1ReCK0eOBcES4+NIYojostV0O62ElPfg1CY0NP6MNfGfXSmdvMMwr2BiOudwciKJU9SV3KiKzhIlzBmnFpBi7UAv7MDqqIz3K2IRCRptJqi/1lPhV/xyIXPud2dsod/1joIa8WCuTlToW6nGNnD9AfMXN/Vvpq7qWhQXlQ7Tim4ATyrQ5gd 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: List-Subscribe: List-Unsubscribe: Instead of parsing text-based /proc//maps file, try to use PROCMAP_QUERY ioctl() to simplify and speed up data fetching. This logic is used to do uprobe file offset calculation, so any bugs in this logic would manifest as failing uprobe BPF selftests. This also serves as a simple demonstration of one of the intended uses. Signed-off-by: Andrii Nakryiko --- tools/testing/selftests/bpf/test_progs.c | 3 + tools/testing/selftests/bpf/test_progs.h | 2 + tools/testing/selftests/bpf/trace_helpers.c | 104 +++++++++++++++++--- 3 files changed, 94 insertions(+), 15 deletions(-) diff --git a/tools/testing/selftests/bpf/test_progs.c b/tools/testing/selftests/bpf/test_progs.c index 89ff704e9dad..6a19970f2531 100644 --- a/tools/testing/selftests/bpf/test_progs.c +++ b/tools/testing/selftests/bpf/test_progs.c @@ -19,6 +19,8 @@ #include #include "json_writer.h" +int env_verbosity = 0; + static bool verbose(void) { return env.verbosity > VERBOSE_NONE; @@ -848,6 +850,7 @@ static error_t parse_arg(int key, char *arg, struct argp_state *state) return -EINVAL; } } + env_verbosity = env->verbosity; if (verbose()) { if (setenv("SELFTESTS_VERBOSE", "1", 1) == -1) { diff --git a/tools/testing/selftests/bpf/test_progs.h b/tools/testing/selftests/bpf/test_progs.h index 0ba5a20b19ba..6eae7fdab0d7 100644 --- a/tools/testing/selftests/bpf/test_progs.h +++ b/tools/testing/selftests/bpf/test_progs.h @@ -95,6 +95,8 @@ struct test_state { FILE *stdout; }; +extern int env_verbosity; + struct test_env { struct test_selector test_selector; struct test_selector subtest_selector; diff --git a/tools/testing/selftests/bpf/trace_helpers.c b/tools/testing/selftests/bpf/trace_helpers.c index 70e29f316fe7..6723186c46bb 100644 --- a/tools/testing/selftests/bpf/trace_helpers.c +++ b/tools/testing/selftests/bpf/trace_helpers.c @@ -10,6 +10,8 @@ #include #include #include +#include +#include #include #include "trace_helpers.h" #include @@ -233,29 +235,91 @@ int kallsyms_find(const char *sym, unsigned long long *addr) return err; } +#ifdef PROCMAP_QUERY +int env_verbosity __weak = 0; + +int procmap_query(int fd, const void *addr, __u32 query_flags, size_t *start, size_t *offset, int *flags) +{ + char path_buf[PATH_MAX], build_id_buf[20]; + struct procmap_query q; + int err; + + memset(&q, 0, sizeof(q)); + q.size = sizeof(q); + q.query_flags = query_flags; + q.query_addr = (__u64)addr; + q.vma_name_addr = (__u64)path_buf; + q.vma_name_size = sizeof(path_buf); + q.build_id_addr = (__u64)build_id_buf; + q.build_id_size = sizeof(build_id_buf); + + err = ioctl(fd, PROCMAP_QUERY, &q); + if (err < 0) { + err = -errno; + if (err == -ENOTTY) + return -EOPNOTSUPP; /* ioctl() not implemented yet */ + if (err == -ENOENT) + return -ESRCH; /* vma not found */ + return err; + } + + if (env_verbosity >= 1) { + printf("VMA FOUND (addr %08lx): %08lx-%08lx %c%c%c%c %08lx %02x:%02x %ld %s (build ID: %s, %d bytes)\n", + (long)addr, (long)q.vma_start, (long)q.vma_end, + (q.vma_flags & PROCMAP_QUERY_VMA_READABLE) ? 'r' : '-', + (q.vma_flags & PROCMAP_QUERY_VMA_WRITABLE) ? 'w' : '-', + (q.vma_flags & PROCMAP_QUERY_VMA_EXECUTABLE) ? 'x' : '-', + (q.vma_flags & PROCMAP_QUERY_VMA_SHARED) ? 's' : 'p', + (long)q.vma_offset, q.dev_major, q.dev_minor, (long)q.inode, + q.vma_name_size ? path_buf : "", + q.build_id_size ? "YES" : "NO", + q.build_id_size); + } + + *start = q.vma_start; + *offset = q.vma_offset; + *flags = q.vma_flags; + return 0; +} +#else +int procmap_query(int fd, const void *addr, size_t *start, size_t *offset, int *flags) +{ + return -EOPNOTSUPP; +} +#endif + ssize_t get_uprobe_offset(const void *addr) { - size_t start, end, base; - char buf[256]; - bool found = false; + size_t start, base, end; FILE *f; + char buf[256]; + int err, flags; f = fopen("/proc/self/maps", "r"); if (!f) return -errno; - while (fscanf(f, "%zx-%zx %s %zx %*[^\n]\n", &start, &end, buf, &base) == 4) { - if (buf[2] == 'x' && (uintptr_t)addr >= start && (uintptr_t)addr < end) { - found = true; - break; + /* requested executable VMA only */ + err = procmap_query(fileno(f), addr, PROCMAP_QUERY_VMA_EXECUTABLE, &start, &base, &flags); + if (err == -EOPNOTSUPP) { + bool found = false; + + while (fscanf(f, "%zx-%zx %s %zx %*[^\n]\n", &start, &end, buf, &base) == 4) { + if (buf[2] == 'x' && (uintptr_t)addr >= start && (uintptr_t)addr < end) { + found = true; + break; + } + } + if (!found) { + fclose(f); + return -ESRCH; } + } else if (err) { + fclose(f); + return err; } - fclose(f); - if (!found) - return -ESRCH; - #if defined(__powerpc64__) && defined(_CALL_ELF) && _CALL_ELF == 2 #define OP_RT_RA_MASK 0xffff0000UL @@ -296,15 +360,25 @@ ssize_t get_rel_offset(uintptr_t addr) size_t start, end, offset; char buf[256]; FILE *f; + int err, flags; f = fopen("/proc/self/maps", "r"); if (!f) return -errno; - while (fscanf(f, "%zx-%zx %s %zx %*[^\n]\n", &start, &end, buf, &offset) == 4) { - if (addr >= start && addr < end) { - fclose(f); - return (size_t)addr - start + offset; + err = procmap_query(fileno(f), (const void *)addr, 0, &start, &offset, &flags); + if (err == 0) { + fclose(f); + return (size_t)addr - start + offset; + } else if (err != -EOPNOTSUPP) { + fclose(f); + return err; + } else if (err) { + while (fscanf(f, "%zx-%zx %s %zx %*[^\n]\n", &start, &end, buf, &offset) == 4) { + if (addr >= start && addr < end) { + fclose(f); + return (size_t)addr - start + offset; + } } }