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 64D30C2BD09 for ; Tue, 9 Jul 2024 20:43:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DB1326B00A1; Tue, 9 Jul 2024 16:43:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D3A1B6B00A2; Tue, 9 Jul 2024 16:43:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C000F6B00A3; Tue, 9 Jul 2024 16:43:15 -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 A30F96B00A1 for ; Tue, 9 Jul 2024 16:43:15 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 60B5480ADD for ; Tue, 9 Jul 2024 20:43:15 +0000 (UTC) X-FDA: 82321389150.06.29B1177 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by imf03.hostedemail.com (Postfix) with ESMTP id 1BEC12001C for ; Tue, 9 Jul 2024 20:43:12 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=VKNj5L24; spf=pass (imf03.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=1720557779; 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=CvVzl7e48xMmAZAYYYfWEbe7EWp8AyF1ZpNYRqbWocc=; b=cedxomsejxYznziyEaY3FB0d66+WRYQY+W69PYo9k84b1Y2lGoYA9iZ2S8utfBrpENe6TU STyp0OgQKsL0E7H4hUTqAFLoa/s6zxZJGooGeVlZKz8oi4t3qMH9yV8o0J8gEJT6GHQe8Z WM3xeRIgZIxYk2tsV4TYIpHfG6cxHr4= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=VKNj5L24; spf=pass (imf03.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=1720557779; a=rsa-sha256; cv=none; b=DietnJGw0GTn0tElD52h25fwEc6GmPL3R5CEhYxxgsg7SmTtFxQOe6lKyLz167XIiEEArq rX/Vqn/lF94jvvpVWIWmnas6smlZbv4/iho4gi/HwWoP1B5UUTHq2mbywJT0O1npaZzFiQ 0IDIbIvG8N56lc+DjG7IiW5UO/BeA/A= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id 42BB1CE0AEE; Tue, 9 Jul 2024 20:43:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4C012C3277B; Tue, 9 Jul 2024 20:43:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1720557788; bh=+9jpZjOCZAyOPgnFUaMIL0c75rF54bF41tQH1aEgnRg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VKNj5L24TmI7UHUd+8Tc+HQ3syfb1w4WGfckJL3jLjIrwZM6BiJyMio0ayUOCu8ds 5JhEDTMW0GfAj6LRuECJRxoNASWOBsp+9kW4q1Ys4kgoQqAm9Xj+Q32QUjTQTdnV7e vqsYL1E7UnkmTmcS7nZz9Uk7JNRjspulEkktLZrDssyhfoL1q5jY+NMzi7qmCBDwhH BKnFSiC1bhN8KWW9qQSwqL8iUJ7K0NmM7tEC68tzcfhuBjnfs/y7kLJBTCwAcdqWzo shbZBo91h3MwrA/RTUsig7F4hznRtXequGhZ7ElvAw6t7WHlag5ec9Vsj+cKUAH2M2 FTt3Zj/Jcqyig== 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, Andrii Nakryiko , Omar Sandoval Subject: [PATCH bpf-next 05/10] lib/buildid: implement sleepable build_id_parse() API Date: Tue, 9 Jul 2024 13:42:40 -0700 Message-ID: <20240709204245.3847811-6-andrii@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240709204245.3847811-1-andrii@kernel.org> References: <20240709204245.3847811-1-andrii@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: 1BEC12001C X-Stat-Signature: ga5c549kchd4e56tr9fx5ou853k6eymz X-HE-Tag: 1720557792-239240 X-HE-Meta: U2FsdGVkX18CoFgNgBnQn9SvkLWDyaneufytQ5AtT8WK+vFLNN5mwC7tsIu0/5UJy5AyWTiq1U+5H9V8zUh2ulOG2HWf+8ehxYfyyZFUKE1x8YH8dLPEyIA548jgs7SLh4dMf3eNGsRzkTasDdntxtfUAp3Wq2Dqqsk+/P+FIU4p16QmOd/kbI9vffIKN4vyvGleJDqdpz7kum6ZjCYpoTHRxR+x3ExriFAQTdgkWhFXYV0toD8seZkK6kYwcfjc6Kt3cbunsaU5tt7QQZ7n/8ViTPva/6hx9KmsA6KQ27e0xgO7qGt1SCYiVQGfvUj4tRlzYwrOn2ciQTF7kOoEd6O9CgcbYOiKJ1GrS+40wsnf/YXzd8mpKE8+bP8qv+HRIUnZOcllRrSky8Bkc3VY/qbYUPpeVi4OkrzGOgfGgNE9Es9VWipIDZRC0Lx4NSXz5/fYFCfH1JUPCyle2vn47E9NsMrZeyNTJQ4ayzSjqkySG9NU+CgmKAokQkC0MohXnJCInOjssv8IFOmg+OXDvgsKbnWcIKsyWO2LGxJ17nNkztSwyH/1oucgRTDqeMvvaSenXZx3AGT0vz12rt3KJL1qYr1xH3A10QiiVmTolbgtndDku3mpjShDe/2atmOC/tAJwphMaqyIqRM3x/OUAfGpFJ4FzPZLcBF673gQDcbB3TL/JrS0YiD8Gc1Yz5MFCVhlyU86JNOdYiGVq7L1W4EVZeE30Ea6jetjvGD11ISMRXM4lqKFAvjjeJboDLYruvofsRe6VGJG9kGqRFXmyxsZWY+k7+v+uBEs6qViv9iFkQyJC/j7IygOoNmKD2kgjhnIE73ghPbnUtthIljgDMdCAdHrtQtGvcO+hqUN6HyDEFG2h8A+s3Qnn4NwgGy+u3LWg6TfJJnh3+3qyOkKmk5+su2wFpo/WNwIRAhKQE3dDha7aN1MHdCkHkF8M6sRmxIrEHav6nGRxKzwSOC YiO7QvLm DW8LaWiXG348TDE7i1ip/SrPCk2P/oIYckgJyuewnlUm6QGjcrZFIDWQnG/tNOYZtk6LOgK85uEBYb4+nxD7h2a4vMSbNGCt1GQd5vjUyBtAmyGWh1T7w9O8my9f8mqk+5ahupLJpECOHpllQFtLDUdBFXGI5z40kW9llvchJx9xFLk71NVbauCSQtjv7Rwep/8PZZS7GDQf/vlQKxkWAqOQcG/V2c/KydAvNq2YfhTnbSdbV94JxKF1LDVwuBTbUksvhjRWzkWzPL5XOZ3UldLCX4CISczpQQLIEl1jFhc/aOezX1+W0agbk9Rm9YgKF6//MG2yUThQk5ka/MO00PwtzVCEam0UyL2SwPeZoE7/m+85WW2j1W52bqCTL+MZ4Yz9izsjmU+kC7nwpyW4UjNyC3Q== 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: Extend freader with a flag specifying whether it's OK to cause page fault to fetch file data that is not already physically present in memory. With this, it's now easy to wait for data if the caller is running in sleepable (faultable) context. We utilize read_cache_folio() to bring the desired file page into page cache, after which the rest of the logic works just the same at page level. Suggested-by: Omar Sandoval Cc: Shakeel Butt Cc: Johannes Weiner Signed-off-by: Andrii Nakryiko --- lib/buildid.c | 49 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 34 insertions(+), 15 deletions(-) diff --git a/lib/buildid.c b/lib/buildid.c index 5f898fee43d7..23bfc811981a 100644 --- a/lib/buildid.c +++ b/lib/buildid.c @@ -20,6 +20,7 @@ struct freader { struct page *page; void *page_addr; u64 file_off; + bool may_fault; }; struct { const char *data; @@ -29,12 +30,13 @@ struct freader { }; static void freader_init_from_file(struct freader *r, void *buf, u32 buf_sz, - struct address_space *mapping) + struct address_space *mapping, bool may_fault) { memset(r, 0, sizeof(*r)); r->buf = buf; r->buf_sz = buf_sz; r->mapping = mapping; + r->may_fault = may_fault; } static void freader_init_from_mem(struct freader *r, const char *data, u64 data_sz) @@ -60,6 +62,17 @@ static int freader_get_page(struct freader *r, u64 file_off) freader_put_page(r); r->page = find_get_page(r->mapping, pg_off); + + if (!r->page && r->may_fault) { + struct folio *folio; + + folio = read_cache_folio(r->mapping, pg_off, NULL, NULL); + if (IS_ERR(folio)) + return PTR_ERR(folio); + + r->page = folio_file_page(folio, pg_off); + } + if (!r->page) return -EFAULT; /* page not mapped */ @@ -270,18 +283,8 @@ static int get_build_id_64(struct freader *r, unsigned char *build_id, __u32 *si /* enough for Elf64_Ehdr, Elf64_Phdr, and all the smaller requests */ #define MAX_FREADER_BUF_SZ 64 -/* - * 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 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_nofault(struct vm_area_struct *vma, unsigned char *build_id, __u32 *size) +static int __build_id_parse(struct vm_area_struct *vma, unsigned char *build_id, + __u32 *size, bool may_fault) { const Elf32_Ehdr *ehdr; struct freader r; @@ -292,7 +295,7 @@ int build_id_parse_nofault(struct vm_area_struct *vma, unsigned char *build_id, if (!vma->vm_file) return -EINVAL; - freader_init_from_file(&r, buf, sizeof(buf), vma->vm_file->f_mapping); + freader_init_from_file(&r, buf, sizeof(buf), vma->vm_file->f_mapping, may_fault); /* fetch first 18 bytes of ELF header for checks */ ehdr = freader_fetch(&r, 0, offsetofend(Elf32_Ehdr, e_type)); @@ -320,6 +323,22 @@ int build_id_parse_nofault(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 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_nofault(struct vm_area_struct *vma, unsigned char *build_id, __u32 *size) +{ + return __build_id_parse(vma, build_id, size, false /* !may_fault */); +} + /* * Parse build ID of ELF file mapped to VMA * @vma: vma object @@ -333,7 +352,7 @@ int build_id_parse_nofault(struct vm_area_struct *vma, unsigned char *build_id, */ int build_id_parse(struct vm_area_struct *vma, unsigned char *build_id, __u32 *size) { - return -EOPNOTSUPP; + return __build_id_parse(vma, build_id, size, true /* may_fault */); } /** -- 2.43.0