From patchwork Mon Apr 3 09:04:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: stsp X-Patchwork-Id: 1764356 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=SltuNrTV; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4PqlRl1c0bz1yYb for ; Mon, 3 Apr 2023 19:08:19 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 25EC73870892 for ; Mon, 3 Apr 2023 09:08:17 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 25EC73870892 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1680512897; bh=69GoGOP2QSndQhslMa9NtNYK3RDb16d4wNtb5SHrJpk=; h=To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From:Reply-To:From; b=SltuNrTVgsid6M03ZKVoXn1HwgfcnRDfxNnxzPagSYRkwLkHDmlrZZku2VGZwFv1u 1UHKqqZGE5r0+y5yIra/KXm6pPTyJuBGDjHpXaevlLkChuMasksUCOVgZl2sEdslOo SW5NGNXLEPyg7c8eajHDBrmpayEtRmazOKXy/48w= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from forward203c.mail.yandex.net (forward203c.mail.yandex.net [IPv6:2a02:6b8:c03:500:1:45:d181:d203]) by sourceware.org (Postfix) with ESMTPS id E264B38432DE for ; Mon, 3 Apr 2023 09:04:57 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E264B38432DE Received: from mail-nwsmtp-smtp-production-main-73.iva.yp-c.yandex.net (mail-nwsmtp-smtp-production-main-73.iva.yp-c.yandex.net [IPv6:2a02:6b8:c0c:a810:0:640:6b9b:0]) by forward203c.mail.yandex.net (Yandex) with ESMTP id 5D688600DD for ; Mon, 3 Apr 2023 12:04:54 +0300 (MSK) Received: by mail-nwsmtp-smtp-production-main-73.iva.yp-c.yandex.net (smtp/Yandex) with ESMTPSA id h4J5UKjDcmI0-dZzThYJZ; Mon, 03 Apr 2023 12:04:53 +0300 X-Yandex-Fwd: 1 To: libc-alpha@sourceware.org Cc: Stas Sergeev Subject: [PATCH 08/12] elf: call _dl_map_segment() via premap callback Date: Mon, 3 Apr 2023 14:04:17 +0500 Message-Id: <20230403090421.560208-9-stsp2@yandex.ru> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230403090421.560208-1-stsp2@yandex.ru> References: <20230403090421.560208-1-stsp2@yandex.ru> MIME-Version: 1.0 X-Spam-Status: No, score=-11.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_ENVFROM_END_DIGIT, FREEMAIL_FROM, GIT_PATCH_0, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Stas Sergeev via Libc-alpha From: stsp Reply-To: Stas Sergeev Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Sender: "Libc-alpha" This allows to install custom premap callbacks in the subsequent patches. The test-suite was run on x86_64/64 and showed no regressions. Signed-off-by: Stas Sergeev --- elf/dl-load.c | 13 ++++++++++--- elf/dl-load.h | 6 +++++- elf/dl-map-segments.h | 7 +++++-- 3 files changed, 20 insertions(+), 6 deletions(-) diff --git a/elf/dl-load.c b/elf/dl-load.c index c0704dc89c..59be8080dd 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -980,7 +980,8 @@ _dl_map_object_1 (struct link_map *l, void *fd, int mode, struct link_map *loader, void **stack_endp, int *errval_p, const char **errstring_p, - __typeof (do_mmap) *m_map) + __typeof (do_mmap) *m_map, + dl_premap_t *premap) { const ElfW(Ehdr) *header; const ElfW(Phdr) *phdr; @@ -1180,7 +1181,7 @@ _dl_map_object_1 (struct link_map *l, void *fd, l_map_start, l_map_end, l_addr, l_contiguous, l_text_end, l_phdr */ errstring = _dl_map_segments (l, fd, header, type, loadcmds, nloadcmds, - maplength, has_holes, loader, m_map); + maplength, has_holes, loader, m_map, premap); if (__glibc_unlikely (errstring != NULL)) { /* Mappings can be in an inconsistent state: avoid unmap. */ @@ -1439,6 +1440,12 @@ do_mmap (void *addr, size_t length, int prot, int flags, return __mmap (addr, length, prot, flags, fd, offset); } +static void * +do_map_segment (void *mappref, size_t maplength, size_t mapalign, void *cookie) +{ + return (void *) _dl_map_segment ((ElfW(Addr)) mappref, maplength, mapalign); +} + #ifndef EXTERNAL_MAP_FROM_FD static #endif @@ -1560,7 +1567,7 @@ _dl_map_object_from_fd (const char *name, const char *origname, int fd, } if (_dl_map_object_1 (l, &fd, fbp, mode, loader, stack_endp, &errval, - &errstring, do_mmap)) + &errstring, do_mmap, do_map_segment)) goto lose; _dl_process_phdrs (l, fd); diff --git a/elf/dl-load.h b/elf/dl-load.h index eff5146acd..e777da5838 100644 --- a/elf/dl-load.h +++ b/elf/dl-load.h @@ -84,6 +84,9 @@ static void * do_mmap (void *addr, size_t length, int prot, int flags, void *arg, off_t offset); +typedef void * +(dl_premap_t) (void *mappref, size_t maplength, size_t mapalign, void *cookie); + /* This is a subroutine of _dl_map_segments. It should be called for each load command, some time after L->l_addr has been set correctly. It is responsible for setting up the l_text_end and l_phdr fields. */ @@ -123,7 +126,8 @@ static const char *_dl_map_segments (struct link_map *l, void *fd, const size_t maplength, bool has_holes, struct link_map *loader, - __typeof (do_mmap) *m_map); + __typeof (do_mmap) *m_map, + dl_premap_t *premap); /* All the error message strings _dl_map_segments might return are listed here so that different implementations in different sysdeps diff --git a/elf/dl-map-segments.h b/elf/dl-map-segments.h index 7bcfcd9eff..7e3c3b6d53 100644 --- a/elf/dl-map-segments.h +++ b/elf/dl-map-segments.h @@ -78,7 +78,8 @@ _dl_map_segments (struct link_map *l, void *fd, const ElfW(Ehdr) *header, int type, const struct loadcmd loadcmds[], size_t nloadcmds, const size_t maplength, bool has_holes, - struct link_map *loader, __typeof (do_mmap) *m_map) + struct link_map *loader, __typeof (do_mmap) *m_map, + dl_premap_t *premap) { const struct loadcmd *c = loadcmds; @@ -100,7 +101,9 @@ _dl_map_segments (struct link_map *l, void *fd, - MAP_BASE_ADDR (l)); /* Remember which part of the address space this object uses. */ - l->l_map_start = _dl_map_segment (mappref, maplength, c->mapalign); + l->l_map_start = (ElfW(Addr)) premap ((void *) mappref, + maplength, c->mapalign, + fd); if (__glibc_unlikely ((void *) l->l_map_start == MAP_FAILED)) return DL_MAP_SEGMENTS_ERROR_MAP_SEGMENT;