1
0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00

malloc: Use global flag instead of function pointer dispatch for mtag

A flag check can be faster than function pointers because of how
branch prediction and speculation works and it can also remove a layer
of indirection when there is a mismatch between the malloc internal
tag_* api and __libc_mtag_* target hooks.

Memory tagging wrapper functions are moved to malloc.c from arena.c and
the logic now checks mmap_enabled.  The definition of tag_new_usable is
moved after chunk related definitions.

This refactoring also allows using mtag_enabled checks instead of
USE_MTAG ifdefs when memory tagging support only changes code logic
when memory tagging is enabled at runtime. Note: an "if (false)" code
block is optimized away even at -O0 by gcc.

Reviewed-by: DJ Delorie <dj@redhat.com>
This commit is contained in:
Szabolcs Nagy
2021-01-27 15:45:43 +00:00
parent 0c719cf42c
commit 42bac88a21
2 changed files with 43 additions and 56 deletions

View File

@ -441,36 +441,42 @@ void *(*__morecore)(ptrdiff_t) = __default_morecore;
*/
#ifdef USE_MTAG
/* Default implementaions when memory tagging is supported, but disabled. */
static void *
__default_tag_region (void *ptr, size_t size)
{
return ptr;
}
static void *
__default_tag_nop (void *ptr)
{
return ptr;
}
static bool mtag_enabled = false;
static int mtag_mmap_flags = 0;
static size_t mtag_granule_mask = ~(size_t)0;
static void *(*tag_new_memset)(void *, int, size_t) = memset;
static void *(*tag_region)(void *, size_t) = __default_tag_region;
static void *(*tag_new_usable)(void *) = __default_tag_nop;
static void *(*tag_at)(void *) = __default_tag_nop;
#else
# define mtag_enabled false
# define mtag_mmap_flags 0
# define tag_new_memset(ptr, val, size) memset (ptr, val, size)
# define tag_region(ptr, size) (ptr)
# define tag_new_usable(ptr) (ptr)
# define tag_at(ptr) (ptr)
#endif
static __always_inline void *
tag_region (void *ptr, size_t size)
{
if (__glibc_unlikely (mtag_enabled))
return __libc_mtag_tag_region (ptr, size);
return ptr;
}
static __always_inline void *
tag_new_memset (void *ptr, int val, size_t size)
{
if (__glibc_unlikely (mtag_enabled))
return __libc_mtag_memset_with_tag (__libc_mtag_new_tag (ptr), val, size);
return memset (ptr, val, size);
}
/* Defined later. */
static void *
tag_new_usable (void *ptr);
static __always_inline void *
tag_at (void *ptr)
{
if (__glibc_unlikely (mtag_enabled))
return __libc_mtag_address_get_tag (ptr);
return ptr;
}
#include <string.h>
/*
@ -1460,6 +1466,18 @@ checked_request2size (size_t req, size_t *sz) __nonnull (1)
#pragma GCC poison mchunk_size
#pragma GCC poison mchunk_prev_size
static __always_inline void *
tag_new_usable (void *ptr)
{
if (__glibc_unlikely (mtag_enabled) && ptr)
{
mchunkptr cp = mem2chunk(ptr);
ptr = __libc_mtag_tag_region (__libc_mtag_new_tag (ptr),
CHUNK_AVAILABLE_SIZE (cp) - CHUNK_HDR_SZ);
}
return ptr;
}
/*
-------------------- Internal data structures --------------------