From patchwork Sat May 4 00:30:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrii Nakryiko X-Patchwork-Id: 13653690 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 1B38DC4345F for ; Sat, 4 May 2024 00:30:25 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 60DFC6B0098; Fri, 3 May 2024 20:30:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5BDDC6B0099; Fri, 3 May 2024 20:30:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 45D5E6B009A; Fri, 3 May 2024 20:30:24 -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 268676B0098 for ; Fri, 3 May 2024 20:30:24 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id D528F1C1990 for ; Sat, 4 May 2024 00:30:23 +0000 (UTC) X-FDA: 82078831926.22.512D9C4 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf27.hostedemail.com (Postfix) with ESMTP id 3E04240005 for ; Sat, 4 May 2024 00:30:22 +0000 (UTC) Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=KEgnPpHB; spf=pass (imf27.hostedemail.com: domain of andrii@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=andrii@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1714782622; a=rsa-sha256; cv=none; b=FdCvLWk2Eof2sghu+ks+0UtxeVNBl+sYgE1/+rBNV6pEDwA60zZ92OZx04tpf5e2LuOYJ/ 4J7NiHobjl68wKh9VvCrwUaHKi5+2/VV2qTFTe2DjHC/CPZRc1PFC/mUofV61lMdQUgxPX Wx3mMc/biWjgTZxeh8ceKaSzsCbuHwc= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=KEgnPpHB; spf=pass (imf27.hostedemail.com: domain of andrii@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=andrii@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1714782622; 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=vXES7tPOi+ax+stziBjbPUd71B/W12XV1wdwvYVrgRw=; b=5Lr5AuhJEKW+LUATnsFiA8dTeiQ2XEjYOcLDIJnxmXDUkIZagUXU/9qybfxEB3BeuzALhb tAEqdXdJVHrDbEjkzx2A6UN8R2vrJOgCQoHO9r3KjLd5CJqLiL1TKHNm4Icdn26yZguFUv XYWsbigCWOaa6tAdiYSGar4fs53RKNU= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 68E3D61E38; Sat, 4 May 2024 00:30:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 08AAFC32789; Sat, 4 May 2024 00:30:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1714782621; bh=YxeS+sLpQRnaSgu/9E3ClWUqEPF8Db9NHuIyW1Jsti8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KEgnPpHBAUag30KLKXRbcwwv5eSBfqoQqRe1IJe1bSxSom7XCLuXPyPJlx+VCp2A7 FRJ9upZx8QAsxZqb0ywEIr12qdiefeoYMQgEcQE3sFCkVzlo4BwwLTfVTS17gQ8pXS MJSfEPbXXyRUsJXYDTuy39AISOPZoOmP6UH+97Msw1OdtCErksIrOyWu9A8bOBR8DN gP20QGIvODzLTCLXHQhPR11wcdaZ5z/5ThA6YuXsRqoaLQMyy2i5LQBWwstFu91JBd 1cd08eKVWgqk1Iwc1kfGCnC7+S49U5eFUZNjZekrVZn2eM9uxF5rk8IdO/qkuaaxga x3SBOYcifgczw== 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, Andrii Nakryiko Subject: [PATCH 4/5] selftests/bpf: make use of PROCFS_PROCMAP_QUERY ioctl, if available Date: Fri, 3 May 2024 17:30:05 -0700 Message-ID: <20240504003006.3303334-5-andrii@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240504003006.3303334-1-andrii@kernel.org> References: <20240504003006.3303334-1-andrii@kernel.org> MIME-Version: 1.0 X-Stat-Signature: 8sz7gmtgxknfujkaq5ny5k93z61afuna X-Rspam-User: X-Rspamd-Server: rspam02 X-Rspamd-Queue-Id: 3E04240005 X-HE-Tag: 1714782622-207495 X-HE-Meta: U2FsdGVkX1/tVHVAcCkk6OlOsrei9Ko9ksIypG9OO2IuFlKlVMJ37pmtSPhQZMOJNmstFmxwPs2RDCA67ZaccA0kKNuE0DwJfWX3DvH2sLF2TeYOZ5SMjctw/vtZu3WESYLtcA1gDYAWk8YA35POR7f7CXJ+FBZMkScvoBqe5rxDuSSHBiF1gW2r5qJoVlecvEuaaHLTMWWJrxVqzR/zautqWvJq51c9WEURiSxpmf7VOp2mIGTB8sxvOB/iDF2sb4fLsbTXNXXaZKyPOe35U96trNQjAKSU/yhFJNVLkJUGWQoffKliio5YtfjENBd6YTzd36uE2XFL4/3z/Tkn3H1cFgS1I7qEAr/m+Y36Kev5qMaiwvApo8p/agXcbu0/7HlFogTpnF9w4VLaAmnA9UuCcSUmSgQVyA6B93c0linzrmJHNrUGkGQyelf/O4Oa5xEUkuHwReGHDUvsC+NhL05wXIrs+RhMVLDa6bgNokebYvUH4YIBI1U+V0k3XVEAd5kMRWGZAIwuQGuOSImGlKSzUq6I7uA22SRanRY4U/jBVlK2Xc4CRO67iat1voRNa6OpnN2+d6ChpLoEcvAvsz2Z2AIutyhAYe7qwrGqxIToifvDMIanLDEvz4wd64rBnmv04lWh0vWECzxAEO1hl/GWu2GO6eYP2HuJrLNTz2gbJM6iyxYtvkBRieInuQhyLdyyV9pUGhluEZGz/VsVyjCNMPh1jcXVG2u2DzqBV86a5iTklLcksu2hTmNvjJysmbXv8z53bW9gICd72Yb+3tX9WRoOTD/YtFclv10aDvx1ZttQb+h848laMgQ6ruFCbrLuE9zq+NqDoVvTG8o9JwIomFMopOyTWYcOTEJPr6gZVcCnwzkPipUwm1pFT/8zSGaD4PC6nUClgU87lvD5g5NsCkD9sTLY3R4W3fr/2aWn0Ws5KcR5hUCAxzOXmReQJ14bhKI4mYoAzBy3PPz fXu697X0 7mhd/XwFHbkc54jygUqMjW1oXO0RM7Imi66L3umt2naEt6t+hL2tweQTlHxh6PYU53Ezxws8FhO6HJ911kidRJ64CVqIcl8yMwibjEs3ZLW3RyJ8md9TqfnoiLYH6W4zyf2Oon3iQaJOj886QBD8wsVXNVnx6u5kkHIk1cP1cPE045TxEWLn9T4iokeE08oYhfZJWym20/WsO7HyqXjO6nDD2r31l7eu7/ML6nxymxrHnW+VV/O9EEwpx/7ZjPZo4iDbH+YROS6jRMJnmoSwHZMmvNeZbsnvjATaX 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 PROCFS_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 | 105 +++++++++++++++++--- 3 files changed, 95 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..8ac71e73d173 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,92 @@ int kallsyms_find(const char *sym, unsigned long long *addr) return err; } +#ifdef PROCFS_PROCMAP_QUERY +int env_verbosity __weak = 0; + +int procmap_query(int fd, const void *addr, size_t *start, size_t *offset, int *flags) +{ + char path_buf[PATH_MAX], build_id_buf[20]; + struct procfs_procmap_query q; + int err; + + memset(&q, 0, sizeof(q)); + q.size = sizeof(q); + 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, PROCFS_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 & PROCFS_PROCMAP_VMA_READABLE) ? 'r' : '-', + (q.vma_flags & PROCFS_PROCMAP_VMA_WRITABLE) ? 'w' : '-', + (q.vma_flags & PROCFS_PROCMAP_VMA_EXECUTABLE) ? 'x' : '-', + (q.vma_flags & PROCFS_PROCMAP_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; + err = procmap_query(fileno(f), addr, &start, &base, &flags); + if (err == 0) { + if (!(flags & PROCFS_PROCMAP_VMA_EXECUTABLE)) + return -ESRCH; + } else if (err != -EOPNOTSUPP) { + fclose(f); + return err; + } else if (err) { + 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; } } - fclose(f); - if (!found) - return -ESRCH; - #if defined(__powerpc64__) && defined(_CALL_ELF) && _CALL_ELF == 2 #define OP_RT_RA_MASK 0xffff0000UL @@ -296,15 +361,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, &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; + } } }