From patchwork Tue Jun 11 11:00:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrii Nakryiko X-Patchwork-Id: 13693433 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 A4305C27C5E for ; Tue, 11 Jun 2024 11:01:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 17D796B00B5; Tue, 11 Jun 2024 07:01:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 105D86B00B6; Tue, 11 Jun 2024 07:01:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E9ED56B00B7; Tue, 11 Jun 2024 07:01:26 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id BD2156B00B5 for ; Tue, 11 Jun 2024 07:01:26 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 66BB04140E for ; Tue, 11 Jun 2024 11:01:26 +0000 (UTC) X-FDA: 82218316572.12.58B438F Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf23.hostedemail.com (Postfix) with ESMTP id EAB5D14000B for ; Tue, 11 Jun 2024 11:01:23 +0000 (UTC) Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=HAzACSc4; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf23.hostedemail.com: domain of andrii@kernel.org designates 145.40.73.55 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=1718103684; 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=iWIeUY797J/Toq4h22cPQ/qqLpVl0jFiidUASc+TDck=; b=qWf31VDkvAxMyADnB7otRo+x3YLmoOxpfsjCBbKEJGcNdtqglFiKITyXI+PrAjjGutsyFq 18GcdRqKU4Dx565A410K0Rm+aE9QTa7Mm+RFLTZFI6EYYyE8zD2ieUEvtxAAxyb4KGv4JH UDcqoss3bSjViNlIGN+kjCV7A/fhvHo= ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=HAzACSc4; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf23.hostedemail.com: domain of andrii@kernel.org designates 145.40.73.55 as permitted sender) smtp.mailfrom=andrii@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1718103684; a=rsa-sha256; cv=none; b=trJAy74RxKmPQKNwWQ4D4wyDSNvFTYj0FLapsdexGq2a1lihetnbU5xaM5hXzfrBhxZwBu iTpqyHILaEUKEkiyyOfJljcYl6MQR+yEVQ57SxL3Zov+etpUqw0w2XRK1bK2Jank6UTN9q aGQ6RfxD12x1c89suqJyJLnF60DLKKM= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id F15BDCE1B13; Tue, 11 Jun 2024 11:01:20 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6DA3EC2BD10; Tue, 11 Jun 2024 11:01:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1718103680; bh=3kUqgFqNjNH4Un7okDLhffoSH0ok4bZOeWq40FaW4a4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HAzACSc4x79jXZLplHbLBtNC0Glv1gmrlCtS+BCpxvfhnpjxwpWgGDHsZ/+zrf1Hm xWz/Rc+CYrEAg4EfXIl8ckiApc3Vd6TdOV6ZfTo+YpIgWCOvVhqrStQagXrdKAwqY4 APSfUOUCB7Hk78TzClNwMIDwXTf4R5GqFUQreBCvWwtOBFQMqZx/IzTV61j7os+Zr3 GYGv/B9JXIT9BY31B/kCdbJ7hreETKeyEvdHNzvKsToccJEYZOI9KIoLBP4GC+5oGb 6og+PC2yhblHRr4Rbq1AEMe/1vCZJqRT/gKLlK2cUM8GNZE6d+fN3DWNa3seQphPSm 58i4YBQjD9byA== 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 v4 6/7] selftests/bpf: make use of PROCMAP_QUERY ioctl if available Date: Tue, 11 Jun 2024 04:00:54 -0700 Message-ID: <20240611110058.3444968-7-andrii@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240611110058.3444968-1-andrii@kernel.org> References: <20240611110058.3444968-1-andrii@kernel.org> MIME-Version: 1.0 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: EAB5D14000B X-Stat-Signature: b4djtjxskm8aqo9i8wmypnezw5h1fhj3 X-Rspam-User: X-HE-Tag: 1718103683-982455 X-HE-Meta: U2FsdGVkX1+KluTAEDt8TZ7HqyIeM4/ophKZeuSQWpAa7x3A+1sHa7Cs9xELhBHrzmvp2i0aCc11eingbUHi7xPupid+LqLBVW+V0ODpsI3/CQeqVbtYGwuqDsQFJG/u3GUWvKgeFXNlvuW7mTIGCGXWXe0LCuTNcfXdaxZlNolgovmJ8gn850fpsjWJvOQvPjMnUnD1Drzc4MkK48dGMgqDMudV2JnW1cnuU6zqodkDFBFnSMDj/1Vl0j47npDq7GhLrUzkYGkipx4vhnhNi5GEKkHUE2YhraGk6S02wZmQSteB8BqaEtEfyn8cMNZwIbESj377D+p6xXc9EQfV9GMozpJcRb+WNv9gD3/n4l+gFcUOU+0r4AtClhGU44r9TkK+YAfvEcgesi04sYtR4g7qyMsNoU6V6mfk6W4bohtI8l5yB87Y1Rgy4NfLwNi3YUJYxa4eQ/QeMj2m5/5TtWPHElU99PTHmH+S8TCDl5S+rFyphsyJIi7y52i+OVgDproQ3v+cCrdTUCI5jUbL+iYPgbNNcNuBYIhEmuqmwYCkWtPYDfCmiFAWmMz+lh3MQ1lQaX1ApMxHdTSRf/JwfqJqjNJPHXVkZCtXDVi7TNDOrMlLam91hciXrkYEZ67BuB/WCplnC1X+LEu2p2vaAmp8PVqf78q6WV4HtPhWd8vO3/uM88CLSaOGTsBOChSEYMQIMPgpdCvPzRtmtXz8rXBzWYJa9T+ftGoO9SKnILRZ7gYynXegI+zLkMiM4LMSxAqAbsZBUvXRXViO7IF7rbcGlMmYYXCHvk+GXQmEUL6da8OStMJceN3D5NbZ+7HcDMgjAL2pl8pYS4XDpwpQ3enaS9lbPWnaLMyYLb2VkTaOjvRR8o/3RUTGdtYoeE6duiyelK1jg/l1/jB7CkL3CddJKkzTP47U2xLxl0UbNLUBHp2j+3imlBYIm1h80vcH3R9/RXuu3VN1/LAIDbh hWhypsc5 L+ZYxWZcm+RrCE4KPY2x0YHaz2MDzgtFSXdms0xFCfU06wsymEPH4EfSb5vucPbRepmwazqS6y9QWPxtAthJaB2Z32EoqSXp2qGbSPY6bL3a9cZvhYpt7W8+4fd2z0V35eguvGnvwxGszmSdtiTKVQ6KW/53Yw6LVunEW27nDkGV/JeR2KImkH97pBzH3bMEEOmZ3ImIdbvwt9jcML+qKrfw3RGOcg3m4AHXrqNk30RNW6ozW0uS7Bo+/e8oMytIF7bj/mvqFKju7V1H5JRa+D39OnTy9ufoAL9CdQH0BXYPWO/rf1antTvYTnT/pj8iQAOR8EIqtQTBgsq2Hj39BwiVl69sDFj5NWkCHNDZZzd+R31U= 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 465d196c7165..1bfd881c0e07 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 @@ -244,29 +246,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 @@ -307,15 +371,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; + } } }