[glibc/nsz/mtag] malloc: Ensure the generic mtag hooks are not used

[glibc/nsz/mtag] malloc: Ensure the generic mtag hooks are not used

[Szabolcs Nagy]

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=7233d1016f300e06f357c9e009ba2d98f1d25ebf

commit 7233d1016f300e06f357c9e009ba2d98f1d25ebf
Author: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date:   Wed Feb 17 10:39:37 2021 +0000

    malloc: Ensure the generic mtag hooks are not used
    
    Use inline functions instead of macros, because macros can cause unused
    variable warnings and type conversion issues.  We assume these functions
    may appear in the code but only in dead code paths (hidden by a runtime
    check), so it's important that they can compile with correct types, but
    if they are actually used that should be an error.
    
    Currently the hooks are only used when USE_MTAG is true which only
    happens on aarch64 and then the aarch64 specific code is used not this
    generic header.  However followup refactoring will allow the hooks to
    be used with !USE_MTAG.
    
    Note: the const qualifier in the comment was wrong: changing tags is a
    write operation.

Diff:
---
 sysdeps/generic/libc-mtag.h | 41 +++++++++++++++++++++++++++++++----------
 1 file changed, 31 insertions(+), 10 deletions(-)

diff --git a/sysdeps/generic/libc-mtag.h b/sysdeps/generic/libc-mtag.h
index 1a866cdc0c..e8fc236b6c 100644
--- a/sysdeps/generic/libc-mtag.h
+++ b/sysdeps/generic/libc-mtag.h
@@ -31,22 +31,43 @@
 /* Extra flags to pass to mmap() to request a tagged region of memory.  */
 #define __MTAG_MMAP_FLAGS 0
 
+/* Memory tagging target hooks are only called when memory tagging is
+   enabled at runtime.  The generic definitions here must not be used.  */
+void __libc_mtag_link_error (void);
+
 /* 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)  */
-#define __libc_mtag_tag_region(p, s) (p)
+   that are multiples of __MTAG_GRANULE_SIZE.  Size cannot be zero.  */
+static inline void *
+__libc_mtag_tag_region (void *p, size_t n)
+{
+  __libc_mtag_link_error ();
+  return p;
+}
 
 /* Optimized equivalent to __libc_mtag_tag_region followed by memset.  */
-#define __libc_mtag_memset_with_tag memset
+static inline void *
+__libc_mtag_memset_with_tag (void *p, int c, size_t n)
+{
+  __libc_mtag_link_error ();
+  return memset (p, c, n);
+}
 
 /* Convert address P to a pointer that is tagged correctly for that
-   location.
-   void *__libc_mtag_address_get_tag (void*)  */
-#define __libc_mtag_address_get_tag(p) (p)
+   location.  */
+static inline void *
+__libc_mtag_address_get_tag (void *p)
+{
+  __libc_mtag_link_error ();
+  return 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*)  */
-#define __libc_mtag_new_tag(p) (p)
+   the memory addressed).  */
+static inline void *
+__libc_mtag_new_tag (void *p)
+{
+  __libc_mtag_link_error ();
+  return p;
+}
 
 #endif /* _GENERIC_LIBC_MTAG_H */

[glibc/nsz/mtag] malloc: Ensure the generic mtag hooks are not used

[Szabolcs Nagy]

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=ff9770ce81023694085d8e0638c93e811fc6fafc

commit ff9770ce81023694085d8e0638c93e811fc6fafc
Author: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date:   Wed Feb 17 10:39:37 2021 +0000

    malloc: Ensure the generic mtag hooks are not used
    
    Use inline functions instead of macros, because macros can cause unused
    variable warnings and type conversion issues.  We assume these functions
    may appear in the code but only in dead code paths (hidden by a runtime
    check), so it's important that they can compile with correct types, but
    if they are actually used that should be an error.
    
    Currently the hooks are only used when USE_MTAG is true which only
    happens on aarch64 and then the aarch64 specific code is used not this
    generic header.  However followup refactoring will allow the hooks to
    be used with !USE_MTAG.
    
    Note: the const qualifier in the comment was wrong: changing tags is a
    write operation.
    
    Reviewed-by: DJ Delorie <dj@redhat.com>

Diff:
---
 sysdeps/generic/libc-mtag.h | 41 +++++++++++++++++++++++++++++++----------
 1 file changed, 31 insertions(+), 10 deletions(-)

diff --git a/sysdeps/generic/libc-mtag.h b/sysdeps/generic/libc-mtag.h
index 1a866cdc0c..e8fc236b6c 100644
--- a/sysdeps/generic/libc-mtag.h
+++ b/sysdeps/generic/libc-mtag.h
@@ -31,22 +31,43 @@
 /* Extra flags to pass to mmap() to request a tagged region of memory.  */
 #define __MTAG_MMAP_FLAGS 0
 
+/* Memory tagging target hooks are only called when memory tagging is
+   enabled at runtime.  The generic definitions here must not be used.  */
+void __libc_mtag_link_error (void);
+
 /* 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)  */
-#define __libc_mtag_tag_region(p, s) (p)
+   that are multiples of __MTAG_GRANULE_SIZE.  Size cannot be zero.  */
+static inline void *
+__libc_mtag_tag_region (void *p, size_t n)
+{
+  __libc_mtag_link_error ();
+  return p;
+}
 
 /* Optimized equivalent to __libc_mtag_tag_region followed by memset.  */
-#define __libc_mtag_memset_with_tag memset
+static inline void *
+__libc_mtag_memset_with_tag (void *p, int c, size_t n)
+{
+  __libc_mtag_link_error ();
+  return memset (p, c, n);
+}
 
 /* Convert address P to a pointer that is tagged correctly for that
-   location.
-   void *__libc_mtag_address_get_tag (void*)  */
-#define __libc_mtag_address_get_tag(p) (p)
+   location.  */
+static inline void *
+__libc_mtag_address_get_tag (void *p)
+{
+  __libc_mtag_link_error ();
+  return 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*)  */
-#define __libc_mtag_new_tag(p) (p)
+   the memory addressed).  */
+static inline void *
+__libc_mtag_new_tag (void *p)
+{
+  __libc_mtag_link_error ();
+  return p;
+}
 
 #endif /* _GENERIC_LIBC_MTAG_H */

[glibc/nsz/mtag] malloc: Ensure the generic mtag hooks are not used

[Szabolcs Nagy]

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=467cc28dd703af465cbe233b2df153d44085481a

commit 467cc28dd703af465cbe233b2df153d44085481a
Author: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date:   Wed Feb 17 10:39:37 2021 +0000

    malloc: Ensure the generic mtag hooks are not used
    
    Use inline functions instead of macros, because macros can cause unused
    variable warnings and type conversion issues.  We assume these functions
    may appear in the code but only in dead code paths (hidden by a runtime
    check), so it's important that they can compile with correct types, but
    if they are actually used that should be an error.
    
    Currently the hooks are only used when USE_MTAG is true which only
    happens on aarch64 and then the aarch64 specific code is used not this
    generic header.  However followup refactoring will allow the hooks to
    be used with !USE_MTAG.
    
    Note: the const qualifier in the comment was wrong: changing tags is a
    write operation.
    
    Reviewed-by: DJ Delorie <dj@redhat.com>

Diff:
---
 sysdeps/generic/libc-mtag.h | 41 +++++++++++++++++++++++++++++++----------
 1 file changed, 31 insertions(+), 10 deletions(-)

diff --git a/sysdeps/generic/libc-mtag.h b/sysdeps/generic/libc-mtag.h
index 1a866cdc0c..e8fc236b6c 100644
--- a/sysdeps/generic/libc-mtag.h
+++ b/sysdeps/generic/libc-mtag.h
@@ -31,22 +31,43 @@
 /* Extra flags to pass to mmap() to request a tagged region of memory.  */
 #define __MTAG_MMAP_FLAGS 0
 
+/* Memory tagging target hooks are only called when memory tagging is
+   enabled at runtime.  The generic definitions here must not be used.  */
+void __libc_mtag_link_error (void);
+
 /* 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)  */
-#define __libc_mtag_tag_region(p, s) (p)
+   that are multiples of __MTAG_GRANULE_SIZE.  Size cannot be zero.  */
+static inline void *
+__libc_mtag_tag_region (void *p, size_t n)
+{
+  __libc_mtag_link_error ();
+  return p;
+}
 
 /* Optimized equivalent to __libc_mtag_tag_region followed by memset.  */
-#define __libc_mtag_memset_with_tag memset
+static inline void *
+__libc_mtag_memset_with_tag (void *p, int c, size_t n)
+{
+  __libc_mtag_link_error ();
+  return memset (p, c, n);
+}
 
 /* Convert address P to a pointer that is tagged correctly for that
-   location.
-   void *__libc_mtag_address_get_tag (void*)  */
-#define __libc_mtag_address_get_tag(p) (p)
+   location.  */
+static inline void *
+__libc_mtag_address_get_tag (void *p)
+{
+  __libc_mtag_link_error ();
+  return 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*)  */
-#define __libc_mtag_new_tag(p) (p)
+   the memory addressed).  */
+static inline void *
+__libc_mtag_new_tag (void *p)
+{
+  __libc_mtag_link_error ();
+  return p;
+}
 
 #endif /* _GENERIC_LIBC_MTAG_H */

[glibc/nsz/mtag] malloc: Ensure the generic mtag hooks are not used

[Szabolcs Nagy]

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=467cc28dd703af465cbe233b2df153d44085481a

commit 467cc28dd703af465cbe233b2df153d44085481a
Author: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date:   Wed Feb 17 10:39:37 2021 +0000

    malloc: Ensure the generic mtag hooks are not used
    
    Use inline functions instead of macros, because macros can cause unused
    variable warnings and type conversion issues.  We assume these functions
    may appear in the code but only in dead code paths (hidden by a runtime
    check), so it's important that they can compile with correct types, but
    if they are actually used that should be an error.
    
    Currently the hooks are only used when USE_MTAG is true which only
    happens on aarch64 and then the aarch64 specific code is used not this
    generic header.  However followup refactoring will allow the hooks to
    be used with !USE_MTAG.
    
    Note: the const qualifier in the comment was wrong: changing tags is a
    write operation.
    
    Reviewed-by: DJ Delorie <dj@redhat.com>

Diff:
---
 sysdeps/generic/libc-mtag.h | 41 +++++++++++++++++++++++++++++++----------
 1 file changed, 31 insertions(+), 10 deletions(-)

diff --git a/sysdeps/generic/libc-mtag.h b/sysdeps/generic/libc-mtag.h
index 1a866cdc0c..e8fc236b6c 100644
--- a/sysdeps/generic/libc-mtag.h
+++ b/sysdeps/generic/libc-mtag.h
@@ -31,22 +31,43 @@
 /* Extra flags to pass to mmap() to request a tagged region of memory.  */
 #define __MTAG_MMAP_FLAGS 0
 
+/* Memory tagging target hooks are only called when memory tagging is
+   enabled at runtime.  The generic definitions here must not be used.  */
+void __libc_mtag_link_error (void);
+
 /* 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)  */
-#define __libc_mtag_tag_region(p, s) (p)
+   that are multiples of __MTAG_GRANULE_SIZE.  Size cannot be zero.  */
+static inline void *
+__libc_mtag_tag_region (void *p, size_t n)
+{
+  __libc_mtag_link_error ();
+  return p;
+}
 
 /* Optimized equivalent to __libc_mtag_tag_region followed by memset.  */
-#define __libc_mtag_memset_with_tag memset
+static inline void *
+__libc_mtag_memset_with_tag (void *p, int c, size_t n)
+{
+  __libc_mtag_link_error ();
+  return memset (p, c, n);
+}
 
 /* Convert address P to a pointer that is tagged correctly for that
-   location.
-   void *__libc_mtag_address_get_tag (void*)  */
-#define __libc_mtag_address_get_tag(p) (p)
+   location.  */
+static inline void *
+__libc_mtag_address_get_tag (void *p)
+{
+  __libc_mtag_link_error ();
+  return 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*)  */
-#define __libc_mtag_new_tag(p) (p)
+   the memory addressed).  */
+static inline void *
+__libc_mtag_new_tag (void *p)
+{
+  __libc_mtag_link_error ();
+  return p;
+}
 
 #endif /* _GENERIC_LIBC_MTAG_H */