mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-27 03:41:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

aarch64: inline __libc_mtag_address_get_tag

Browse Source 
This is a common operation when heap tagging is enabled, so inline the
instruction instead of using an extern call.

The .inst directive is used instead of the name of the instruction (or
acle intrinsics) because malloc.c is not compiled for armv8.5-a+memtag
architecture, runtime cpu support detection is used.

Prototypes are removed from the comments as they were not always
correct.
This commit is contained in:
Szabolcs Nagy 2021-02-04 10:04:07 +00:00
parent d32624802d
commit 40dc773f92
3 changed files with 10 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sysdeps/aarch64/Makefile
View File

@ -40,8 +40,7 @@ endif
ifeq ($(subdir),misc)
sysdep_headers += sys/ifunc.h
sysdep_routines += __mtag_address_get_tag \
__mtag_tag_zero_region \
sysdep_routines += __mtag_tag_zero_region \
__mtag_new_tag \
__mtag_tag_region

32
sysdeps/aarch64/__mtag_address_get_tag.S
View File

@ -1,32 +0,0 @@
/* Copyright (C) 2020-2021 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library. If not, see
<http://www.gnu.org/licenses/>. */
#include <sysdep.h>
#ifdef USE_MTAG
#define ptr x0
.arch armv8.5-a
.arch_extension memtag
ENTRY (__libc_mtag_address_get_tag)
ldg ptr, [ptr]
ret
END (__libc_mtag_address_get_tag)
#endif /* USE_MTAG */

14
sysdeps/aarch64/libc-mtag.h
View File

@ -35,17 +35,21 @@
#define __MTAG_MMAP_FLAGS PROT_MTE
/* Set the tags for a region of memory, which must have size and alignment
that are multiples of __MTAG_GRANULE_SIZE. Size cannot be zero.
void *__libc_mtag_tag_region (const void *, size_t) */
that are multiples of __MTAG_GRANULE_SIZE. Size cannot be zero. */
void *__libc_mtag_tag_region (void *, size_t);
/* Optimized equivalent to __libc_mtag_tag_region followed by memset to 0. */
void *__libc_mtag_tag_zero_region (void *, size_t);
/* Convert address P to a pointer that is tagged correctly for that
location.
void *__libc_mtag_address_get_tag (void*) */
void *__libc_mtag_address_get_tag (void *);
location. */
static __always_inline void *
__libc_mtag_address_get_tag (void *p)
{
register void *x0 asm ("x0") = p;
asm (".inst 0xd9600000 /* ldg x0, [x0] */" : "+r" (x0));
return x0;
}
/* Assign a new (random) tag to a pointer P (does not adjust the tag on
the memory addressed).