From patchwork Fri Mar 17 06:32:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: stsp X-Patchwork-Id: 66501 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id BAEDC384B07C for ; Fri, 17 Mar 2023 06:34:27 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BAEDC384B07C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1679034867; bh=gZkQzrmw5u3+dXD35DI5MpEAYnrKU/MD4AURnyO3ho8=; 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=YdE7ck5VIJVy5nqPK/+x0MMTPez7vsYQaAmJ8WKAAYvwIKiS8cFmGHnswSeB3m5QG u/7/vxNtcBQh9djdgbIUqJtv9J49qx9dELzRaHEdoxzRc3eyld/ETy1v0W5Ix9J7iC urXlLFtszDobzC2ECeyjQJ7uWp8WFvfGit0h+niI= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from forward102p.mail.yandex.net (forward102p.mail.yandex.net [77.88.28.102]) by sourceware.org (Postfix) with ESMTPS id 9A581385B536 for ; Fri, 17 Mar 2023 06:32:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9A581385B536 Received: from sas9-2d24a7e69f58.qloud-c.yandex.net (sas9-2d24a7e69f58.qloud-c.yandex.net [IPv6:2a02:6b8:c11:2298:0:640:2d24:a7e6]) by forward102p.mail.yandex.net (Yandex) with ESMTP id 6D3E8393F956 for ; Fri, 17 Mar 2023 09:32:35 +0300 (MSK) Received: by sas9-2d24a7e69f58.qloud-c.yandex.net (smtp/Yandex) with ESMTPSA id QWeJF9abi0U1-MMMVhPp7; Fri, 17 Mar 2023 09:32:34 +0300 X-Yandex-Fwd: 1 To: libc-alpha@sourceware.org Cc: Stas Sergeev Subject: [PATCH 08/11] elf: convert _dl_map_segments's mmap() to a callback Date: Fri, 17 Mar 2023 11:32:07 +0500 Message-Id: <20230317063210.4118076-9-stsp2@yandex.ru> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20230317063210.4118076-1-stsp2@yandex.ru> References: <20230317063210.4118076-1-stsp2@yandex.ru> MIME-Version: 1.0 X-Spam-Status: No, score=-11.1 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, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, 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+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" 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 075a1d1f4c..c5c9bb4163 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; @@ -143,7 +143,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)