[v9,00/10] malloc hooks removal

Message ID 20210719024134.155398-1-siddhesh@sourceware.org
Headers show
Series
  • malloc hooks removal
Related show

Message

Yang Yanchao via Libc-alpha July 19, 2021, 2:41 a.m.
This patchset removes the malloc hooks __malloc_hook, __free_hook,
__realloc_hook and __memalign_hook from the API and leaves compatibility
symbols so that existing applications can continue to link to them.  The
reading and execution of the hooks has been moved to a DSO
libc_malloc_debug.so, which can be preloaded for applications that need
it.  By default these hooks no longer have any effect in the library.

Further, debugging features such as MALLOC_CHECK_, mcheck() and mtrace
have been weaned away from these hooks and also moved to
libc_malloc_debug.so.  With this change, these features are only enabled
when libc_malloc_debug.so is preloaded using LD_PRELOAD.

Finally, the __morecore, __morecore_after_hook and __default_morecore
hooks have also been moved to compat symbols and removed from the API.
Existing applications will continue to link to them but they won't have
any effect on malloc behaviour.

Testing:

The patchset has gone through a full build and test on x86_64, i686,
s390x, ppc64le, armv7l and aarch64 through a scratch build on Fedora
rawhide.  I also installed a test package on x86_64 and rebooted to make
sure the system boots to shell.  I did a build-many-glibcs run with
the patchset and it ran clean on all targets.

Changes from v8:
- Make hook-dependent tests conditional on GLIBC_2.23 instead of
  GLIBC_2.24
- Interpose reallocarray.

Changes from v7:
- Made mcheck tests conditional on GLIBC_2.24
- Added SHLIB_COMPAT guard around __malloc_initialize_hook usage in
  libc_malloc_debug.so
- Fixed hurd build failure.
- Add another patch to fix malloc_usable_size to mcheck

Changes from v6:
- Moved malloc-check into libc_malloc_debug.so. Tweaked malloc.c to
  allow building twice, once inside libc.so and next in
  libc_malloc_debug.so
- Included morecore.c into malloc.c
- Moved hook initialization too into libc_malloc_debug.so.
- Interposed more functions in libc_malloc_debug.so
- Versioned all symbols exported from libc_malloc_debug.so and finalized
  them so that the library cannot be linked against

Changes from v5:
- Rebased on latest master
- Fixed realloc-mcheck
- Removed residual mention of libmalloc_compathooks
- Removed LD_PRELOAD from elf/tst-setuid

Changes from v4:
- Patchset has a different approach, starting with moving out hooks
  first to restrict all major malloc.c changes to the first patch
- Renamed libmalloc_compathooks.so to libc_malloc_debug.so
- Moved all debugging features into libc_malloc_debug.so
- Made more documentation updates
- Simplified __malloc_initialized variable use
- Removed debugging tests on static variables since that is no longer
  supported

Changes from v3:
- Remove source file dependencies
- Commit mcheck tests

Changes from v2:
- Move hooks dependencies to malloc.o{,sS}

Changes from v1:

- Added makefile dependencies for the new hooks files
- Fixed memset call in calloc debugging hooks
- Added the tr_break deprecation patch and mcheck test patch to this
  series

Siddhesh Poyarekar (10):
  Make mcheck tests conditional on GLIBC_2.23 or earlier
  Remove __after_morecore_hook
  Remove __morecore and __default_morecore
  Move malloc hooks into a compat DSO
  mcheck: Wean away from malloc hooks [BZ #23489]
  Simplify __malloc_initialized
  mtrace: Wean away from malloc hooks
  glibc.malloc.check: Wean away from malloc hooks
  Remove malloc hooks [BZ #23328]
  mcheck Fix malloc_usable_size [BZ #22057]

 NEWS                                          |  21 +
 Rules                                         |   9 +-
 catgets/Makefile                              |   4 +-
 elf/Makefile                                  |  15 +-
 elf/tst-leaks1-static.c                       |   1 -
 iconvdata/Makefile                            |   3 +-
 include/malloc.h                              |   6 -
 include/mcheck.h                              |   4 -
 include/stdlib.h                              |   3 -
 intl/tst-gettext.sh                           |   1 +
 libio/Makefile                                |  12 +-
 localedata/Makefile                           |   3 +-
 malloc/Makefile                               |  58 +-
 malloc/Versions                               |  44 ++
 malloc/arena.c                                |  48 +-
 malloc/hooks.c                                |  71 ++-
 malloc/malloc-check.c                         |  63 ++-
 malloc/malloc-debug.c                         | 535 ++++++++++++++++++
 malloc/malloc-hooks.h                         |  24 -
 malloc/malloc.c                               | 163 ++----
 malloc/malloc.h                               |  27 -
 malloc/mcheck-impl.c                          | 412 ++++++++++++++
 malloc/mcheck.c                               | 397 +------------
 malloc/morecore.c                             |  34 +-
 malloc/mtrace-impl.c                          | 226 ++++++++
 malloc/mtrace.c                               | 313 +---------
 malloc/tst-compathooks-off.c                  | 145 +++++
 malloc/tst-compathooks-on.c                   |   2 +
 malloc/tst-malloc-usable-static-tunables.c    |   1 -
 malloc/tst-malloc-usable-static.c             |   1 -
 malloc/tst-mtrace.sh                          |   1 +
 manual/memory.texi                            | 207 +------
 manual/tunables.texi                          |   4 +-
 misc/Makefile                                 |   6 +-
 nptl/Makefile                                 |   3 +-
 posix/Makefile                                |  48 +-
 resolv/Makefile                               |   9 +-
 shlib-versions                                |   3 +
 stdio-common/Makefile                         |  15 +-
 sysdeps/aarch64/Makefile                      |   3 +
 sysdeps/generic/libc_malloc_debug.abilist     |   0
 sysdeps/generic/localplt.data                 |   1 -
 sysdeps/mach/hurd/Makefile                    |   1 +
 .../mach/hurd/i386/libc_malloc_debug.abilist  |  26 +
 sysdeps/mach/hurd/i386/localplt.data          |   1 -
 sysdeps/pthread/Makefile                      |   3 +-
 .../linux/aarch64/libc_malloc_debug.abilist   |  26 +
 sysdeps/unix/sysv/linux/aarch64/localplt.data |   1 -
 .../linux/alpha/libc_malloc_debug.abilist     |  26 +
 sysdeps/unix/sysv/linux/alpha/localplt.data   |   1 -
 .../sysv/linux/arc/libc_malloc_debug.abilist  |  26 +
 sysdeps/unix/sysv/linux/arc/localplt.data     |   1 -
 .../linux/arm/be/libc_malloc_debug.abilist    |  26 +
 .../linux/arm/le/libc_malloc_debug.abilist    |  26 +
 sysdeps/unix/sysv/linux/arm/localplt.data     |   1 -
 .../sysv/linux/csky/libc_malloc_debug.abilist |  26 +
 sysdeps/unix/sysv/linux/csky/localplt.data    |   1 -
 .../sysv/linux/hppa/libc_malloc_debug.abilist |  26 +
 sysdeps/unix/sysv/linux/hppa/localplt.data    |   1 -
 sysdeps/unix/sysv/linux/hppa/shlib-versions   |   2 +
 .../sysv/linux/i386/libc_malloc_debug.abilist |  26 +
 sysdeps/unix/sysv/linux/i386/localplt.data    |   1 -
 .../sysv/linux/ia64/libc_malloc_debug.abilist |  26 +
 sysdeps/unix/sysv/linux/ia64/localplt.data    |   1 -
 sysdeps/unix/sysv/linux/ia64/shlib-versions   |   2 +
 .../m68k/coldfire/libc_malloc_debug.abilist   |  26 +
 .../sysv/linux/m68k/coldfire/localplt.data    |   1 -
 .../m68k/m680x0/libc_malloc_debug.abilist     |  26 +
 .../unix/sysv/linux/m68k/m680x0/localplt.data |   1 -
 .../microblaze/be/libc_malloc_debug.abilist   |  26 +
 .../microblaze/le/libc_malloc_debug.abilist   |  26 +
 .../unix/sysv/linux/microblaze/localplt.data  |   1 -
 .../mips/mips32/fpu/libc_malloc_debug.abilist |  26 +
 .../mips32/nofpu/libc_malloc_debug.abilist    |  26 +
 .../mips/mips64/n32/libc_malloc_debug.abilist |  26 +
 .../mips/mips64/n64/libc_malloc_debug.abilist |  26 +
 sysdeps/unix/sysv/linux/mips/shlib-versions   |   2 +
 .../linux/nios2/libc_malloc_debug.abilist     |  26 +
 sysdeps/unix/sysv/linux/nios2/localplt.data   |   1 -
 .../powerpc32/fpu/libc_malloc_debug.abilist   |  26 +
 .../linux/powerpc/powerpc32/fpu/localplt.data |   1 -
 .../powerpc32/nofpu/libc_malloc_debug.abilist |  26 +
 .../powerpc/powerpc32/nofpu/localplt.data     |   1 -
 .../powerpc64/be/libc_malloc_debug.abilist    |  26 +
 .../powerpc64/le/libc_malloc_debug.abilist    |  26 +
 .../linux/powerpc/powerpc64/localplt.data     |   1 -
 sysdeps/unix/sysv/linux/riscv/localplt.data   |   1 -
 .../riscv/rv32/libc_malloc_debug.abilist      |  26 +
 .../riscv/rv64/libc_malloc_debug.abilist      |  26 +
 sysdeps/unix/sysv/linux/s390/localplt.data    |   1 -
 .../s390/s390-32/libc_malloc_debug.abilist    |  26 +
 .../s390/s390-64/libc_malloc_debug.abilist    |  26 +
 .../linux/sh/be/libc_malloc_debug.abilist     |  26 +
 .../linux/sh/le/libc_malloc_debug.abilist     |  26 +
 sysdeps/unix/sysv/linux/sh/localplt.data      |   1 -
 sysdeps/unix/sysv/linux/sh/shlib-versions     |   1 +
 .../sparc/sparc32/libc_malloc_debug.abilist   |  26 +
 .../sysv/linux/sparc/sparc32/localplt.data    |   1 -
 .../sparc/sparc64/libc_malloc_debug.abilist   |  26 +
 .../sysv/linux/sparc/sparc64/localplt.data    |   1 -
 .../sysv/linux/sparc/sparc64/shlib-versions   |   1 +
 .../linux/x86_64/64/libc_malloc_debug.abilist |  26 +
 .../x86_64/x32/libc_malloc_debug.abilist      |  26 +
 sysdeps/x86_64/localplt.data                  |   1 -
 104 files changed, 2571 insertions(+), 1267 deletions(-)
 delete mode 100644 elf/tst-leaks1-static.c
 create mode 100644 malloc/malloc-debug.c
 delete mode 100644 malloc/malloc-hooks.h
 create mode 100644 malloc/mcheck-impl.c
 create mode 100644 malloc/mtrace-impl.c
 create mode 100644 malloc/tst-compathooks-off.c
 create mode 100644 malloc/tst-compathooks-on.c
 delete mode 100644 malloc/tst-malloc-usable-static-tunables.c
 delete mode 100644 malloc/tst-malloc-usable-static.c
 create mode 100644 sysdeps/generic/libc_malloc_debug.abilist
 create mode 100644 sysdeps/mach/hurd/i386/libc_malloc_debug.abilist
 create mode 100644 sysdeps/unix/sysv/linux/aarch64/libc_malloc_debug.abilist
 create mode 100644 sysdeps/unix/sysv/linux/alpha/libc_malloc_debug.abilist
 create mode 100644 sysdeps/unix/sysv/linux/arc/libc_malloc_debug.abilist
 create mode 100644 sysdeps/unix/sysv/linux/arm/be/libc_malloc_debug.abilist
 create mode 100644 sysdeps/unix/sysv/linux/arm/le/libc_malloc_debug.abilist
 create mode 100644 sysdeps/unix/sysv/linux/csky/libc_malloc_debug.abilist
 create mode 100644 sysdeps/unix/sysv/linux/hppa/libc_malloc_debug.abilist
 create mode 100644 sysdeps/unix/sysv/linux/i386/libc_malloc_debug.abilist
 create mode 100644 sysdeps/unix/sysv/linux/ia64/libc_malloc_debug.abilist
 create mode 100644 sysdeps/unix/sysv/linux/m68k/coldfire/libc_malloc_debug.abilist
 create mode 100644 sysdeps/unix/sysv/linux/m68k/m680x0/libc_malloc_debug.abilist
 create mode 100644 sysdeps/unix/sysv/linux/microblaze/be/libc_malloc_debug.abilist
 create mode 100644 sysdeps/unix/sysv/linux/microblaze/le/libc_malloc_debug.abilist
 create mode 100644 sysdeps/unix/sysv/linux/mips/mips32/fpu/libc_malloc_debug.abilist
 create mode 100644 sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc_malloc_debug.abilist
 create mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n32/libc_malloc_debug.abilist
 create mode 100644 sysdeps/unix/sysv/linux/mips/mips64/n64/libc_malloc_debug.abilist
 create mode 100644 sysdeps/unix/sysv/linux/nios2/libc_malloc_debug.abilist
 create mode 100644 sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc_malloc_debug.abilist
 create mode 100644 sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc_malloc_debug.abilist
 create mode 100644 sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libc_malloc_debug.abilist
 create mode 100644 sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libc_malloc_debug.abilist
 create mode 100644 sysdeps/unix/sysv/linux/riscv/rv32/libc_malloc_debug.abilist
 create mode 100644 sysdeps/unix/sysv/linux/riscv/rv64/libc_malloc_debug.abilist
 create mode 100644 sysdeps/unix/sysv/linux/s390/s390-32/libc_malloc_debug.abilist
 create mode 100644 sysdeps/unix/sysv/linux/s390/s390-64/libc_malloc_debug.abilist
 create mode 100644 sysdeps/unix/sysv/linux/sh/be/libc_malloc_debug.abilist
 create mode 100644 sysdeps/unix/sysv/linux/sh/le/libc_malloc_debug.abilist
 create mode 100644 sysdeps/unix/sysv/linux/sparc/sparc32/libc_malloc_debug.abilist
 create mode 100644 sysdeps/unix/sysv/linux/sparc/sparc64/libc_malloc_debug.abilist
 create mode 100644 sysdeps/unix/sysv/linux/x86_64/64/libc_malloc_debug.abilist
 create mode 100644 sysdeps/unix/sysv/linux/x86_64/x32/libc_malloc_debug.abilist

-- 
2.31.1

Comments

Yang Yanchao via Libc-alpha July 19, 2021, 11:07 a.m. | #1
This series break old Emacs binaries (e.g. emacs-24.3-23.el7.x86_64):

$ bash testrun.sh /usr/bin/emacs

Fatal error 11: Segmentation fault
Backtrace:
/usr/bin/emacs[0x4f8653]
/usr/bin/emacs[0x4ddc81]
/usr/bin/emacs[0x4f70ee]
/usr/bin/emacs[0x4f7273]
./libc.so.6(+0x3cd80)[0x7f88c1a14d80]
./libc.so.6(+0x90c21)[0x7f88c1a68c21]
./libc.so.6(+0x94011)[0x7f88c1a6c011]
./libc.so.6(realloc+0x291)[0x7f88c1a6cea1]
/usr/bin/emacs[0x536ef2]
/usr/bin/emacs(re_compile_pattern+0x9cc)[0x53074c]
/usr/bin/emacs[0x5242c7]
/usr/bin/emacs[0x524d69]
/usr/bin/emacs[0x526259]
/usr/bin/emacs[0x5264bc]
/usr/bin/emacs[0x551b87]
/usr/bin/emacs[0x586c0b]
/usr/bin/emacs[0x55171f]
/usr/bin/emacs[0x551a2b]
/usr/bin/emacs[0x586c0b]
/usr/bin/emacs[0x55171f]
/usr/bin/emacs[0x551a2b]
/usr/bin/emacs[0x586c0b]
/usr/bin/emacs[0x55171f]
/usr/bin/emacs[0x551a2b]
/usr/bin/emacs[0x551dcf]
/usr/bin/emacs[0x51243c]
/usr/bin/emacs[0x551b6e]
/usr/bin/emacs[0x586c0b]
/usr/bin/emacs[0x55171f]
/usr/bin/emacs[0x551a2b]
/usr/bin/emacs[0x586c0b]
/usr/bin/emacs[0x55171f]
/usr/bin/emacs[0x551a2b]
/usr/bin/emacs[0x586c0b]
/usr/bin/emacs[0x551a2b]
/usr/bin/emacs[0x586c0b]
/usr/bin/emacs[0x550b3d]
/usr/bin/emacs[0x550f02]
/usr/bin/emacs[0x5544ad]
/usr/bin/emacs[0x55002a]
/usr/bin/emacs[0x4de186]
...
Segmentation fault

It is customary to call malloc_set_state from __malloc_initialize_hook.
If we no longer call __malloc_initialize_hook, we probably should change
malloc_set_state to provide a better error message (via __libc_fatal).

Thanks,
Florian
Yang Yanchao via Libc-alpha July 19, 2021, 11:09 a.m. | #2
On 7/19/21 4:37 PM, Florian Weimer via Libc-alpha wrote:
> This series break old Emacs binaries (e.g. emacs-24.3-23.el7.x86_64):

> 

> $ bash testrun.sh /usr/bin/emacs


Do they work if you run with LD_PRELOAD=malloc/libc_malloc_debug.so?

Siddhesh
Yang Yanchao via Libc-alpha July 19, 2021, 11:11 a.m. | #3
* Siddhesh Poyarekar:

> On 7/19/21 4:37 PM, Florian Weimer via Libc-alpha wrote:

>> This series break old Emacs binaries (e.g. emacs-24.3-23.el7.x86_64):

>> $ bash testrun.sh /usr/bin/emacs

>

> Do they work if you run with LD_PRELOAD=malloc/libc_malloc_debug.so?


Basic testing suggests it works.

Thanks,
Florian
Yang Yanchao via Libc-alpha July 19, 2021, 11:17 a.m. | #4
On 7/19/21 4:41 PM, Florian Weimer wrote:
> * Siddhesh Poyarekar:

> 

>> On 7/19/21 4:37 PM, Florian Weimer via Libc-alpha wrote:

>>> This series break old Emacs binaries (e.g. emacs-24.3-23.el7.x86_64):

>>> $ bash testrun.sh /usr/bin/emacs

>>

>> Do they work if you run with LD_PRELOAD=malloc/libc_malloc_debug.so?

> 

> Basic testing suggests it works.


The thing is, set_malloc_state will just not be called without the 
preload, so it doesn't matter what it returns.  What we need to make a 
more graceful exit is to detect the existence of a non-NULL 
__malloc_initialize_hook within libc.so and abort.  I'm not sure if it's 
worth the effort.

Siddhesh
Yang Yanchao via Libc-alpha July 19, 2021, 11:20 a.m. | #5
* Siddhesh Poyarekar:

> On 7/19/21 4:41 PM, Florian Weimer wrote:

>> * Siddhesh Poyarekar:

>> 

>>> On 7/19/21 4:37 PM, Florian Weimer via Libc-alpha wrote:

>>>> This series break old Emacs binaries (e.g. emacs-24.3-23.el7.x86_64):

>>>> $ bash testrun.sh /usr/bin/emacs

>>>

>>> Do they work if you run with LD_PRELOAD=malloc/libc_malloc_debug.so?

>> Basic testing suggests it works.

>

> The thing is, set_malloc_state will just not be called without the

> preload, so it doesn't matter what it returns.  What we need to make a 

> more graceful exit is to detect the existence of a non-NULL

> __malloc_initialize_hook within libc.so and abort.  I'm not sure if

> it's worth the effort.


We could remove both symbols from libc.so.6.  That would result in error
that can be found with search engines.

Thanks,
Florian
Yang Yanchao via Libc-alpha July 19, 2021, 11:40 a.m. | #6
On 7/19/21 4:50 PM, Florian Weimer via Libc-alpha wrote:
>> The thing is, set_malloc_state will just not be called without the

>> preload, so it doesn't matter what it returns.  What we need to make a

>> more graceful exit is to detect the existence of a non-NULL

>> __malloc_initialize_hook within libc.so and abort.  I'm not sure if

>> it's worth the effort.

> 

> We could remove both symbols from libc.so.6.  That would result in error

> that can be found with search engines.


__malloc_initialize_hook is defined in the executable so we don't 
control that, but we could remove malloc_set_state (and maybe also 
malloc_get_state to be consistent?) and keep it only in 
libc_malloc_debug.so.

May I do it on top of this set though?  I'd like to avoid respinning 
this set if I could.

Siddhesh