From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from insect.birch.relay.mailchannels.net (insect.birch.relay.mailchannels.net [23.83.209.93]) by sourceware.org (Postfix) with ESMTPS id 9AC6239B0426 for ; Thu, 24 Jun 2021 18:24:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 9AC6239B0426 X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 091E4227D0; Thu, 24 Jun 2021 18:23:59 +0000 (UTC) Received: from pdx1-sub0-mail-a66.g.dreamhost.com (100-96-133-115.trex.outbound.svc.cluster.local [100.96.133.115]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 853E3229FE; Thu, 24 Jun 2021 18:23:58 +0000 (UTC) X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from pdx1-sub0-mail-a66.g.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384) by 100.96.133.115 (trex/6.3.3); Thu, 24 Jun 2021 18:23:58 +0000 X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-Eight-Harmony: 05fe8bdc3aef4594_1624559038840_3042307045 X-MC-Loop-Signature: 1624559038840:773165301 X-MC-Ingress-Time: 1624559038840 Received: from pdx1-sub0-mail-a66.g.dreamhost.com (localhost [127.0.0.1]) by pdx1-sub0-mail-a66.g.dreamhost.com (Postfix) with ESMTP id 40A708DD5D; Thu, 24 Jun 2021 11:23:58 -0700 (PDT) Received: from rhbox.intra.reserved-bit.com (unknown [1.186.101.110]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: siddhesh@gotplt.org) by pdx1-sub0-mail-a66.g.dreamhost.com (Postfix) with ESMTPSA id E0E2A8CE56; Thu, 24 Jun 2021 11:23:54 -0700 (PDT) X-DH-BACKEND: pdx1-sub0-mail-a66 From: Siddhesh Poyarekar To: libc-alpha@sourceware.org Cc: dj@redhat.com, carlos@redhat.com, fweimer@redhat.com Subject: [PATCH 8/8] Remove __morecore and __default_morecore Date: Thu, 24 Jun 2021 23:53:12 +0530 Message-Id: <20210624182312.236596-9-siddhesh@sourceware.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210624182312.236596-1-siddhesh@sourceware.org> References: <20210624182312.236596-1-siddhesh@sourceware.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-3494.6 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_NONE, KAM_DMARC_STATUS, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NEUTRAL, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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-List-Received-Date: Thu, 24 Jun 2021 18:24:02 -0000 Make the __morecore and __default_morecore symbols compat-only and remove their declarations from the API. --- NEWS | 5 +++++ include/stdlib.h | 3 --- malloc/arena.c | 12 ++---------- malloc/hooks.c | 3 +++ malloc/malloc-internal.h | 5 +++++ malloc/malloc.c | 4 +--- malloc/malloc.h | 8 -------- malloc/morecore.c | 15 +++++++++++++-- 8 files changed, 29 insertions(+), 26 deletions(-) diff --git a/NEWS b/NEWS index 8a7226aef2..3596593a2a 100644 --- a/NEWS +++ b/NEWS @@ -77,6 +77,11 @@ Deprecated and removed features, and other changes aff= ecting compatibility: legacy programs until they are updated to remove references to the mem= ory allocation hooks. =20 +* The __morecore and __after_morecore_hook malloc hooks and the default + implementation __default_morecore have been removed from the API. Exi= sting + applications will continue to link against these symbols but the inter= faces + no longer have any effect on malloc. + Changes to build and runtime requirements: =20 * On Linux, the shm_open, sem_open, and related functions now expect the diff --git a/include/stdlib.h b/include/stdlib.h index e2453c1896..c5cccce85c 100644 --- a/include/stdlib.h +++ b/include/stdlib.h @@ -300,9 +300,6 @@ libc_hidden_proto (__qfcvt_r) # define MB_CUR_MAX (_NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_MB_CUR_MAX)) # endif =20 -extern void *__default_morecore (ptrdiff_t) __THROW; -libc_hidden_proto (__default_morecore) - struct abort_msg_s { unsigned int size; diff --git a/malloc/arena.c b/malloc/arena.c index 8591c8ea56..00e8b5a32f 100644 --- a/malloc/arena.c +++ b/malloc/arena.c @@ -272,14 +272,6 @@ next_env_entry (char ***position) #endif =20 =20 -#if defined(SHARED) || defined(USE_MTAG) -static void * -__failing_morecore (ptrdiff_t d) -{ - return (void *) MORECORE_FAILURE; -} -#endif - #ifdef SHARED extern struct dl_open_hook *_dl_open_hook; libc_hidden_proto (_dl_open_hook); @@ -300,7 +292,7 @@ ptmalloc_init (void) and that morecore does not support tagged regions, then disable it. */ if (__MTAG_SBRK_UNTAGGED) - __morecore =3D __failing_morecore; + __always_fail_morecore =3D true; =20 mtag_enabled =3D true; mtag_mmap_flags =3D __MTAG_MMAP_FLAGS; @@ -313,7 +305,7 @@ ptmalloc_init (void) generic sbrk implementation also enforces this, but it is not used on Hurd. */ if (!__libc_initial) - __morecore =3D __failing_morecore; + __always_fail_morecore =3D true; #endif =20 thread_arena =3D &main_arena; diff --git a/malloc/hooks.c b/malloc/hooks.c index fa6b3f4c16..934b6f90d0 100644 --- a/malloc/hooks.c +++ b/malloc/hooks.c @@ -81,6 +81,9 @@ compat_symbol (libc, __memalign_hook, __memalign_hook, = GLIBC_2_0); void weak_variable (*__after_morecore_hook) (void) =3D NULL; compat_symbol (libc, __after_morecore_hook, __after_morecore_hook, GLIBC= _2_0); =20 +void *(*__morecore)(ptrdiff_t); +compat_symbol (libc, __morecore, __morecore, GLIBC_2_0); + /* These hooks will get executed only through the interposed allocator functions in libmalloc_compathooks. This means that the calls to mal= loc, realloc, etc. will lead back into the interposed functions, which is = what we diff --git a/malloc/malloc-internal.h b/malloc/malloc-internal.h index ee0f5697af..b104f7cdbf 100644 --- a/malloc/malloc-internal.h +++ b/malloc/malloc-internal.h @@ -21,6 +21,7 @@ =20 #include #include +#include =20 /* INTERNAL_SIZE_T is the word-size used for internal bookkeeping of chunk sizes. @@ -63,6 +64,8 @@ =20 #define top(ar_ptr) ((ar_ptr)->top) =20 +extern bool __always_fail_morecore attribute_hidden; + /* Called in the parent process before a fork. */ void __malloc_fork_lock_parent (void) attribute_hidden; =20 @@ -78,4 +81,6 @@ void __malloc_arena_thread_freeres (void) attribute_hid= den; /* Activate a standard set of debugging hooks. */ void __malloc_check_init (void) attribute_hidden; =20 +extern void *__glibc_morecore (ptrdiff_t) attribute_hidden; + #endif /* _MALLOC_INTERNAL_H */ diff --git a/malloc/malloc.c b/malloc/malloc.c index 51970105b5..f5058f0f0c 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -382,10 +382,8 @@ __malloc_assert (const char *assertion, const char *= file, unsigned int line, =20 =20 /* Definition for getting more memory from the OS. */ -#define MORECORE (*__morecore) +#define MORECORE (*__glibc_morecore) #define MORECORE_FAILURE 0 -void * __default_morecore (ptrdiff_t); -void *(*__morecore)(ptrdiff_t) =3D __default_morecore; =20 /* Memory tagging. */ =20 diff --git a/malloc/malloc.h b/malloc/malloc.h index d066a05d82..2df0b38050 100644 --- a/malloc/malloc.h +++ b/malloc/malloc.h @@ -76,14 +76,6 @@ extern void *valloc (size_t __size) __THROW __attribut= e_malloc__ extern void *pvalloc (size_t __size) __THROW __attribute_malloc__ __wur __attr_dealloc_free; =20 -/* Underlying allocation function; successive calls should return - contiguous pieces of memory. */ -extern void *(*__morecore) (ptrdiff_t __size) __MALLOC_DEPRECATED; - -/* Default value of `__morecore'. */ -extern void *__default_morecore (ptrdiff_t __size) -__THROW __attribute_malloc__ __MALLOC_DEPRECATED; - /* SVID2/XPG mallinfo structure */ =20 struct mallinfo diff --git a/malloc/morecore.c b/malloc/morecore.c index 047228779b..c85a85c0eb 100644 --- a/malloc/morecore.c +++ b/malloc/morecore.c @@ -38,16 +38,27 @@ libc_hidden_proto (__sbrk) # define NULL 0 #endif =20 +#if defined(SHARED) || defined(USE_MTAG) +bool __always_fail_morecore =3D false; +#endif + /* Allocate INCREMENT more bytes of data space, and return the start of data space, or NULL on errors. If INCREMENT is negative, shrink data space. */ void * -__default_morecore (ptrdiff_t increment) +__glibc_morecore (ptrdiff_t increment) { +#if defined(SHARED) || defined(USE_MTAG) + if (__always_fail_morecore) + return NULL; +#endif + void *result =3D (void *) __sbrk (increment); if (result =3D=3D (void *) -1) return NULL; =20 return result; } -libc_hidden_def (__default_morecore) +#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_34) +compat_symbol (libc, __glibc_morecore, __default_morecore, GLIBC_2_0); +#endif --=20 2.31.1