From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from forward204b.mail.yandex.net (forward204b.mail.yandex.net [IPv6:2a02:6b8:c02:900:1:45:d181:d204]) by sourceware.org (Postfix) with ESMTPS id E9EEA384D191 for ; Sat, 18 Mar 2023 16:51:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E9EEA384D191 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=yandex.ru Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=yandex.ru Received: from myt6-1289f562e823.qloud-c.yandex.net (myt6-1289f562e823.qloud-c.yandex.net [IPv6:2a02:6b8:c12:259d:0:640:1289:f562]) by forward204b.mail.yandex.net (Yandex) with ESMTP id 37760600CC for ; Sat, 18 Mar 2023 19:51:53 +0300 (MSK) Received: by myt6-1289f562e823.qloud-c.yandex.net (smtp/Yandex) with ESMTPSA id cpp3fcrbC8c1-FrP5YePk; Sat, 18 Mar 2023 19:51:52 +0300 X-Yandex-Fwd: 1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1679158312; bh=eKeUzqoz87yTfiZZyL+3S21PYs3P/x5TSgyhW374+3U=; h=Message-Id:Date:In-Reply-To:Cc:Subject:References:To:From; b=SJ+0Z1GcLkpVsHqwM2h/C9Z+FxRoS5sxd2lO/PCgNwetm3OsJSj2pTWI+i5ZTnqD0 Pby4KChxkyXNfGFTq8uQF/XSAAF9hRmEGxhnyn/pLqF8YmA3KirlVLzSKPhBzsCzte AIxIRoRR42MLH4JVOhAtu4EmyEaO8s7J5x+QNv8Q= Authentication-Results: myt6-1289f562e823.qloud-c.yandex.net; dkim=pass header.i=@yandex.ru From: Stas Sergeev To: libc-alpha@sourceware.org Cc: Stas Sergeev Subject: [PATCH 08/13] elf: convert _dl_map_segments's mmap() to a callback Date: Sat, 18 Mar 2023 21:51:05 +0500 Message-Id: <20230318165110.3672749-9-stsp2@yandex.ru> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230318165110.3672749-1-stsp2@yandex.ru> References: <20230318165110.3672749-1-stsp2@yandex.ru> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.7 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 List-Id: This only applies to file-based mmap. Since _dl_map_segment() was converted to anonymous mmap, only 1 place is now converted to a callback. The test-suite was run on x86_64/64 and showed no regressions. Signed-off-by: Stas Sergeev --- elf/dl-load.c | 19 ++++++++++++++----- elf/dl-load.h | 8 ++++++-- elf/dl-map-segments.h | 6 +++--- 3 files changed, 23 insertions(+), 10 deletions(-) diff --git a/elf/dl-load.c b/elf/dl-load.c index 67e4933735..17f16c7dd0 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -954,11 +954,12 @@ _dl_process_pt_gnu_property (struct link_map *l, int fd, const ElfW(Phdr) *ph) } static int -_ld_map_object_1 (struct link_map *l, int fd, +_ld_map_object_1 (struct link_map *l, void *fd, struct filebuf *fbp, int mode, struct link_map *loader, void **stack_endp, int *errval_p, - const char **errstring_p) + const char **errstring_p, + __typeof (do_mmap) *m_map) { const ElfW(Ehdr) *header; const ElfW(Phdr) *phdr; @@ -1158,7 +1159,7 @@ _ld_map_object_1 (struct link_map *l, int 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); + maplength, has_holes, loader, m_map); if (__glibc_unlikely (errstring != NULL)) { /* Mappings can be in an inconsistent state: avoid unmap. */ @@ -1425,6 +1426,14 @@ _ld_map_object_2 (struct link_map *l, int mode, /* Map in the shared object NAME, actually located in REALNAME, and already opened on FD. */ +static void * +do_mmap (void *addr, size_t length, int prot, int flags, + void *arg, off_t offset) +{ + int fd = *(const int *) arg; + return __mmap (addr, length, prot, flags, fd, offset); +} + #ifndef EXTERNAL_MAP_FROM_FD static #endif @@ -1554,8 +1563,8 @@ _dl_map_object_from_fd (const char *name, const char *origname, int fd, goto lose_errno; } - if (_ld_map_object_1 (l, fd, fbp, mode, loader, stack_endp, &errval, - &errstring)) + if (_ld_map_object_1 (l, &fd, fbp, mode, loader, stack_endp, &errval, + &errstring, do_mmap)) goto lose; /* We are done mapping in the file. We no longer need the descriptor. */ diff --git a/elf/dl-load.h b/elf/dl-load.h index ecf6910c68..eff5146acd 100644 --- a/elf/dl-load.h +++ b/elf/dl-load.h @@ -80,6 +80,9 @@ struct loadcmd int prot; /* PROT_* bits. */ }; +static void * +do_mmap (void *addr, size_t length, int prot, int flags, + void *arg, off_t offset); /* 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 @@ -113,13 +116,14 @@ _dl_postprocess_loadcmd (struct link_map *l, const ElfW(Ehdr) *header, The file defines this function. The canonical implementation in elf/dl-map-segments.h might be replaced by a sysdeps version. */ -static const char *_dl_map_segments (struct link_map *l, int fd, +static const char *_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); + struct link_map *loader, + __typeof (do_mmap) *m_map); /* 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 9af8cae188..a5c041c740 100644 --- a/elf/dl-map-segments.h +++ b/elf/dl-map-segments.h @@ -78,11 +78,11 @@ _dl_map_segment (ElfW(Addr) mappref, size_t maplength, size_t mapalign) other use of those parts of the address space). */ static __always_inline const char * -_dl_map_segments (struct link_map *l, int fd, +_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) + struct link_map *loader, __typeof (do_mmap) *m_map) { const struct loadcmd *c = loadcmds; @@ -142,7 +142,7 @@ _dl_map_segments (struct link_map *l, int fd, { if (c->mapend > c->mapstart /* Map the segment contents from the file. */ - && (__mmap ((void *) (l->l_addr + c->mapstart), + && (m_map ((void *) (l->l_addr + c->mapstart), c->mapend - c->mapstart, c->prot, MAP_FIXED|MAP_COPY|MAP_FILE, fd, c->mapoff) -- 2.37.2