From patchwork Wed Aug 14 18:54:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrii Nakryiko X-Patchwork-Id: 13763840 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 CB874C3DA4A for ; Wed, 14 Aug 2024 18:54:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6158D6B0098; Wed, 14 Aug 2024 14:54:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5C4BF6B009A; Wed, 14 Aug 2024 14:54:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4666A6B009B; Wed, 14 Aug 2024 14:54:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 25D876B0098 for ; Wed, 14 Aug 2024 14:54:44 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id C67BF1C4892 for ; Wed, 14 Aug 2024 18:54:43 +0000 (UTC) X-FDA: 82451752446.23.0A9734C Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf19.hostedemail.com (Postfix) with ESMTP id 839A71A0011 for ; Wed, 14 Aug 2024 18:54:41 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=KLgO4BwC; spf=pass (imf19.hostedemail.com: domain of andrii@kernel.org designates 145.40.73.55 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=1723661646; 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=kHXDKQkmgfJJ+JdxkRigxltxVtVBVlUUM01aqP8QYM8=; b=YcdLWAmPlsD85VM363d/YEaFcthrK6pAWhu1oTNGSYenPf3nWSA0ITe1SDKW7pqJFXMeLy 8OKWRujBLjbsRT1mPyST46bv01s8KD1p+720LJzDZ7bf+zdMEijDxXGYqT0+BVU2rL+UbE 8YTu+NqxK+X9bvrEiIGeIm5Syn4mu78= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=KLgO4BwC; spf=pass (imf19.hostedemail.com: domain of andrii@kernel.org designates 145.40.73.55 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=1723661646; a=rsa-sha256; cv=none; b=uh8ZxbfKrNIdfnIoN23k+Pf4lSy9mOEJtZpyBFHvlzJHF+FShVFLAR5CqodTPIlRcORH+w 38YdaDENF0ZUf6JsUEvDdabiOjusNK7LuXK33nrW3JTR5ICOds355Vstd2qusMCyTiQZ79 84/UH0agyWeDTMKPNzMxdCvPaa+wOII= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 9124ACE1ADC; Wed, 14 Aug 2024 18:54:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 65C9DC4AF0D; Wed, 14 Aug 2024 18:54:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1723661677; bh=meM8TTb69/Y4fY3OabSKLiXw5VaLsiU5NV41UXNHZhM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KLgO4BwCbpY9tJo23F10bWnNCJdFyks5asNxMjP6XgzxUpK313FOpp8FQsY4D+d7c spKvluMklIOOhLqmatYCHA9kR2hE4MhJ5JPaCEaYqFvFhJEAUmMkJnSsU70nR1j857 JAICAzLHKH4CmYLOs3KydHdzjXEgToxVOpAT9Lek8R0X3OvB4ggKqr/+Fl98oh21wJ WJZExoaaEbLDrKbQk52GS/OLrnFJWScCQzrMp+LVTXoLFRji3FbI3fnXHT9t3bpNxv ZiodpCvszXvgzjzDI/eay4+Gl8EyTPmEY262Fn/faA7DsdOTSdYkURj48ro+scNw5m PR3Skup654FWg== From: Andrii Nakryiko To: bpf@vger.kernel.org Cc: linux-mm@kvack.org, akpm@linux-foundation.org, adobriyan@gmail.com, shakeel.butt@linux.dev, hannes@cmpxchg.org, ak@linux.intel.com, osandov@osandov.com, song@kernel.org, jannh@google.com, linux-fsdevel@vger.kernel.org, willy@infradead.org, Andrii Nakryiko Subject: [PATCH v6 bpf-next 05/10] lib/buildid: rename build_id_parse() into build_id_parse_nofault() Date: Wed, 14 Aug 2024 11:54:12 -0700 Message-ID: <20240814185417.1171430-6-andrii@kernel.org> X-Mailer: git-send-email 2.43.5 In-Reply-To: <20240814185417.1171430-1-andrii@kernel.org> References: <20240814185417.1171430-1-andrii@kernel.org> MIME-Version: 1.0 X-Rspamd-Server: rspam03 X-Rspam-User: X-Rspamd-Queue-Id: 839A71A0011 X-Stat-Signature: rhygcgry8dwcyaye56zwosg6ywzaakd5 X-HE-Tag: 1723661681-879116 X-HE-Meta: U2FsdGVkX19ZjuzzeZ1CEXQZx2qVOMeKTig3PiQKNjVCxtozvfm2HnARB3G5mAE0FWRGFmWsh8UT/vjGcRiCtgceVyFyocUTBlXc5wWPtA3juiIU01wT8tp0N0seMQd6A87X4Q66F3QKVPqXtKRg5A5A7XBnEaFg2xzpYXtfsy2CGfE64cHTrFoAc/nRyxNGoAgz+Wice6uYn4iLxTuUFt6/xXFZYv4UFhR7l5hqx9qWsUN+RcgQZKBe1Sp6CAV33GpeegoO9uDbEgrEtWm+JCEjbHbf88oz5jPsrg+45NVBQzuidyAJJCrRtf9DuyuixtN9x4pqF94A+RrEHMahKO8TYNDLx944drcl4K+MdBdL8HSMJTpYhhCGxdpdOhr40zafr4djiiNIibeVBCImJ/q+2d/ZN5DvYOoIAjaYj5imEOqR8/0OML6CXUeh9jYiSwEQMnCne5WUXdHaDAsFMiune3jb/g9ZTfcNbXzRvYoWoUhhcCA/hH8Faue7koE1jLWHMU9I2EpHB+AT0MxlRDAkXtXi+MXqJag8mJu6F5zWmf38ypcjacHm82IczJONT49Kwqk2RAkKt9j/YKtXFtqej1le2zVKASPRud6CQ+33d5FJjAhZA4ibxjxbj/VKLTNgeaV4phGun4KNdyRfb6ZaFQvg/K2ybvJhulWrwBm5XlZ5G71r8G0ZOQMDat+a2PZmySLu/QcBBIyGmFZI5r5FDlQcozG5pcGlApIKTKR8vhQtH2GPs2JaO29QmEBQBiU2+ze7l2tUF8eq2gn0eVBXav5rdFABoGZn4xXm0iLO5CFSlUd44u81t5UjcGaQrCHFfSZgNTYGAQ98lFsQXEHe55QxVfgmA/jKdQl6QVi6+fbQjFN/zBtKDTvqyC5FCgjl69y0aO6UvI3TujQeLzZ6xxl6QXh7ATdz6VFSyCTED6fiurPzWiyZdeeH6wBkmKhE7wr+kjvl/iXM01m Qbw3PyS5 j0LLJeG78dJv/jDgSmbmEGjfnHsvDkAxqmIPk3dzbpye46o/TbLZMeg3J/TKMSTsQZh5FJls0xjiD5q7dmXBLDAn/kviHiMabM/x2xxLCt4gClyxY7JWWmbMyo2ktkMe7vJt00sfm2tA/UdfmUJ+pqgnyi3uedGLcS9X3qo84EBaPVtv5+ZKDXmV/iuiAPkxyWf//ACwTFLT0HwkswCwd1hY2WbVjLYluRY12+SD4N/tNsVxXP048gjTXiTIzsnR4lvJcUlGKv83GfJXh1QfHgG/gM/MSKJIGwymv 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: Make it clear that build_id_parse() assumes that it can take no page fault by renaming it and current few users to build_id_parse_nofault(). Also add build_id_parse() stub which for now falls back to non-sleepable implementation, but will be changed in subsequent patches to take advantage of sleepable context. PROCMAP_QUERY ioctl() on /proc//maps file is using build_id_parse() and will automatically take advantage of more reliable sleepable context implementation. Signed-off-by: Andrii Nakryiko --- include/linux/buildid.h | 4 ++-- kernel/bpf/stackmap.c | 2 +- kernel/events/core.c | 2 +- lib/buildid.c | 25 ++++++++++++++++++++++--- 4 files changed, 26 insertions(+), 7 deletions(-) diff --git a/include/linux/buildid.h b/include/linux/buildid.h index 20aa3c2d89f7..014a88c41073 100644 --- a/include/linux/buildid.h +++ b/include/linux/buildid.h @@ -7,8 +7,8 @@ #define BUILD_ID_SIZE_MAX 20 struct vm_area_struct; -int build_id_parse(struct vm_area_struct *vma, unsigned char *build_id, - __u32 *size); +int build_id_parse(struct vm_area_struct *vma, unsigned char *build_id, __u32 *size); +int build_id_parse_nofault(struct vm_area_struct *vma, unsigned char *build_id, __u32 *size); int build_id_parse_buf(const void *buf, unsigned char *build_id, u32 buf_size); #if IS_ENABLED(CONFIG_STACKTRACE_BUILD_ID) || IS_ENABLED(CONFIG_VMCORE_INFO) diff --git a/kernel/bpf/stackmap.c b/kernel/bpf/stackmap.c index c99f8e5234ac..770ae8e88016 100644 --- a/kernel/bpf/stackmap.c +++ b/kernel/bpf/stackmap.c @@ -156,7 +156,7 @@ static void stack_map_get_build_id_offset(struct bpf_stack_build_id *id_offs, goto build_id_valid; } vma = find_vma(current->mm, ips[i]); - if (!vma || build_id_parse(vma, id_offs[i].build_id, NULL)) { + if (!vma || build_id_parse_nofault(vma, id_offs[i].build_id, NULL)) { /* per entry fall back to ips */ id_offs[i].status = BPF_STACK_BUILD_ID_IP; id_offs[i].ip = ips[i]; diff --git a/kernel/events/core.c b/kernel/events/core.c index aa3450bdc227..c263a8b0ce54 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -8851,7 +8851,7 @@ static void perf_event_mmap_event(struct perf_mmap_event *mmap_event) mmap_event->event_id.header.size = sizeof(mmap_event->event_id) + size; if (atomic_read(&nr_build_id_events)) - build_id_parse(vma, mmap_event->build_id, &mmap_event->build_id_size); + build_id_parse_nofault(vma, mmap_event->build_id, &mmap_event->build_id_size); perf_iterate_sb(perf_event_mmap_output, mmap_event, diff --git a/lib/buildid.c b/lib/buildid.c index e8fc4aeb01f2..c1cbd34f3685 100644 --- a/lib/buildid.c +++ b/lib/buildid.c @@ -293,10 +293,12 @@ static int get_build_id_64(struct freader *r, unsigned char *build_id, __u32 *si * @build_id: buffer to store build id, at least BUILD_ID_SIZE long * @size: returns actual build id size in case of success * - * Return: 0 on success, -EINVAL otherwise + * Assumes no page fault can be taken, so if relevant portions of ELF file are + * not already paged in, fetching of build ID fails. + * + * Return: 0 on success; negative error, otherwise */ -int build_id_parse(struct vm_area_struct *vma, unsigned char *build_id, - __u32 *size) +int build_id_parse_nofault(struct vm_area_struct *vma, unsigned char *build_id, __u32 *size) { const Elf32_Ehdr *ehdr; struct freader r; @@ -335,6 +337,23 @@ int build_id_parse(struct vm_area_struct *vma, unsigned char *build_id, return ret; } +/* + * Parse build ID of ELF file mapped to VMA + * @vma: vma object + * @build_id: buffer to store build id, at least BUILD_ID_SIZE long + * @size: returns actual build id size in case of success + * + * Assumes faultable context and can cause page faults to bring in file data + * into page cache. + * + * Return: 0 on success; negative error, otherwise + */ +int build_id_parse(struct vm_area_struct *vma, unsigned char *build_id, __u32 *size) +{ + /* fallback to non-faultable version for now */ + return build_id_parse_nofault(vma, build_id, size); +} + /** * build_id_parse_buf - Get build ID from a buffer * @buf: ELF note section(s) to parse