public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Szabolcs Nagy <nsz@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc/nsz/mtag] aarch64: inline __libc_mtag_new_tag Date: Fri, 19 Mar 2021 11:57:59 +0000 (GMT) [thread overview] Message-ID: <20210319115759.11D9D3851C0B@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=5def14a58d846e7c96e7e883df53b1efaaeb1fb9 commit 5def14a58d846e7c96e7e883df53b1efaaeb1fb9 Author: Szabolcs Nagy <szabolcs.nagy@arm.com> Date: Thu Feb 4 17:05:28 2021 +0000 aarch64: inline __libc_mtag_new_tag This is a common operation when heap tagging is enabled, so inline the instructions instead of using an extern call. Diff: --- sysdeps/aarch64/Makefile | 1 - sysdeps/aarch64/__mtag_new_tag.S | 37 ------------------------------------- sysdeps/aarch64/libc-mtag.h | 14 +++++++++++--- 3 files changed, 11 insertions(+), 41 deletions(-) diff --git a/sysdeps/aarch64/Makefile b/sysdeps/aarch64/Makefile index 5d594debea..1099f1d657 100644 --- a/sysdeps/aarch64/Makefile +++ b/sysdeps/aarch64/Makefile @@ -41,7 +41,6 @@ endif ifeq ($(subdir),misc) sysdep_headers += sys/ifunc.h sysdep_routines += __mtag_tag_zero_region \ - __mtag_new_tag \ __mtag_tag_region endif diff --git a/sysdeps/aarch64/__mtag_new_tag.S b/sysdeps/aarch64/__mtag_new_tag.S deleted file mode 100644 index 72c1aded4c..0000000000 --- a/sysdeps/aarch64/__mtag_new_tag.S +++ /dev/null @@ -1,37 +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 - - .arch armv8.5-a - .arch_extension memtag - -/* NB, only supported on variants with 64-bit pointers. */ - -#define ptr x0 -#define xset x1 - -ENTRY(__libc_mtag_new_tag) - // Guarantee that the new tag is not the same as now. - gmi xset, ptr, xzr - irg ptr, ptr, xset - ret -END (__libc_mtag_new_tag) -#endif /* USE_MTAG */ diff --git a/sysdeps/aarch64/libc-mtag.h b/sysdeps/aarch64/libc-mtag.h index da1b6be776..7588c6de9e 100644 --- a/sysdeps/aarch64/libc-mtag.h +++ b/sysdeps/aarch64/libc-mtag.h @@ -52,9 +52,17 @@ __libc_mtag_address_get_tag (void *p) } /* Assign a new (random) tag to a pointer P (does not adjust the tag on - the memory addressed). - void *__libc_mtag_new_tag (void*) */ -void *__libc_mtag_new_tag (void *); + the memory addressed). */ +static __always_inline void * +__libc_mtag_new_tag (void *p) +{ + register void *x0 asm ("x0") = p; + register unsigned long x1 asm ("x1"); + /* Guarantee that the new tag is not the same as now. */ + asm (".inst 0x9adf1401 /* gmi x1, x0, xzr */\n" + ".inst 0x9ac11000 /* irg x0, x0, x1 */" : "+r" (x0), "=r" (x1)); + return x0; +} #endif /* USE_MTAG */
next reply other threads:[~2021-03-19 11:57 UTC|newest] Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-03-19 11:57 Szabolcs Nagy [this message] -- strict thread matches above, loose matches on Subject: below -- 2021-03-11 17:41 Szabolcs Nagy 2021-03-11 17:39 Szabolcs Nagy 2021-03-04 16:26 Szabolcs Nagy
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210319115759.11D9D3851C0B@sourceware.org \ --to=nsz@sourceware.org \ --cc=glibc-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).