The patch titled
Subject: treewide: remove stringification from __alias macro definition
has been removed from the -mm tree. Its filename was
treewide-remove-stringification-from-__alias-macro-definition.patch
This patch was dropped because it was nacked
------------------------------------------------------
From: Joe Perches <joe@xxxxxxxxxxx>
Subject: treewide: remove stringification from __alias macro definition
Like the old __section macro, the __alias macro uses macro #
stringification to create quotes around the symbol name used in the
__attribute__.
This can cause differences between gcc and clang when the stringification
itself contains a quote character. So avoid these differences by always
using quotes to define the aliased symbol.
Remove the stringification and add quotes and when necessary a
stringification when existing uses have a ## concatenation.
Unlike the __section macro conversion in commit 33def8498fdd ("treewide:
Convert macro and uses of __section(foo) to __section("foo")") this one
was done by hand.
No other use of __alias exists in the kernel.
This patch does _not_ convert any uses of __attribute__((alias("<foo>")))
so it should not cause any compilation issues.
Link: https://lkml.kernel.org/r/8451df41359b52f048780d19e07b6fa4445b6392.1604026698.git.joe@xxxxxxxxxxx
Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
Reviewed-by: Nathan Chancellor <natechancellor@xxxxxxxxx>
Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Cc: Ard Biesheuvel <ardb@xxxxxxxxxx>
Cc: Miguel Ojeda <miguel.ojeda.sandonis@xxxxxxxxx>
Cc: Marco Elver <elver@xxxxxxxxxx>
Cc: Dmitry Vyukov <dvyukov@xxxxxxxxxx>
Cc: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Cc: Andrey Ryabinin <aryabinin@xxxxxxxxxxxxx>
Cc: Alexander Potapenko <glider@xxxxxxxxxx>
Cc: Nick Desaulniers <ndesaulniers@xxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: Borislav Petkov <bp@xxxxxxxxx>
Cc: "H. Peter Anvin" <hpa@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/x86/boot/compressed/string.c | 6 +++---
arch/x86/include/asm/syscall_wrapper.h | 2 +-
drivers/firmware/efi/runtime-wrappers.c | 2 +-
include/linux/compiler_attributes.h | 2 +-
kernel/kcsan/core.c | 10 +++++-----
lib/crc32.c | 4 ++--
lib/crypto/aes.c | 4 ++--
mm/kasan/generic.c | 8 ++++----
8 files changed, 19 insertions(+), 19 deletions(-)
--- a/arch/x86/boot/compressed/string.c~treewide-remove-stringification-from-__alias-macro-definition
+++ a/arch/x86/boot/compressed/string.c
@@ -75,7 +75,7 @@ void *memcpy(void *dest, const void *src
}
#ifdef CONFIG_KASAN
-extern void *__memset(void *s, int c, size_t n) __alias(memset);
-extern void *__memmove(void *dest, const void *src, size_t n) __alias(memmove);
-extern void *__memcpy(void *dest, const void *src, size_t n) __alias(memcpy);
+extern void *__memset(void *s, int c, size_t n) __alias("memset");
+extern void *__memmove(void *dest, const void *src, size_t n) __alias("memmove");
+extern void *__memcpy(void *dest, const void *src, size_t n) __alias("memcpy");
#endif
--- a/arch/x86/include/asm/syscall_wrapper.h~treewide-remove-stringification-from-__alias-macro-definition
+++ a/arch/x86/include/asm/syscall_wrapper.h
@@ -69,7 +69,7 @@ extern long __ia32_sys_ni_syscall(const
long __##abi##_##name(const struct pt_regs *regs); \
ALLOW_ERROR_INJECTION(__##abi##_##name, ERRNO); \
long __##abi##_##name(const struct pt_regs *regs) \
- __alias(__do_##name);
+ __alias("__do_" #name);
#define __SYS_STUBx(abi, name, ...) \
long __##abi##_##name(const struct pt_regs *regs); \
--- a/drivers/firmware/efi/runtime-wrappers.c~treewide-remove-stringification-from-__alias-macro-definition
+++ a/drivers/firmware/efi/runtime-wrappers.c
@@ -162,7 +162,7 @@ static DEFINE_SEMAPHORE(efi_runtime_lock
* Expose the EFI runtime lock to the UV platform
*/
#ifdef CONFIG_X86_UV
-extern struct semaphore __efi_uv_runtime_lock __alias(efi_runtime_lock);
+extern struct semaphore __efi_uv_runtime_lock __alias("efi_runtime_lock");
#endif
/*
--- a/include/linux/compiler_attributes.h~treewide-remove-stringification-from-__alias-macro-definition
+++ a/include/linux/compiler_attributes.h
@@ -42,7 +42,7 @@
/*
* gcc: https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html#index-alias-function-attribute
*/
-#define __alias(symbol) __attribute__((__alias__(#symbol)))
+#define __alias(symbol) __attribute__((__alias__(symbol)))
/*
* gcc: https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html#index-aligned-function-attribute
--- a/kernel/kcsan/core.c~treewide-remove-stringification-from-__alias-macro-definition
+++ a/kernel/kcsan/core.c
@@ -814,7 +814,7 @@ EXPORT_SYMBOL(__kcsan_check_access);
} \
EXPORT_SYMBOL(__tsan_read##size); \
void __tsan_unaligned_read##size(void *ptr) \
- __alias(__tsan_read##size); \
+ __alias("__tsan_read" #size); \
EXPORT_SYMBOL(__tsan_unaligned_read##size); \
void __tsan_write##size(void *ptr); \
void __tsan_write##size(void *ptr) \
@@ -823,7 +823,7 @@ EXPORT_SYMBOL(__kcsan_check_access);
} \
EXPORT_SYMBOL(__tsan_write##size); \
void __tsan_unaligned_write##size(void *ptr) \
- __alias(__tsan_write##size); \
+ __alias("__tsan_write" #size); \
EXPORT_SYMBOL(__tsan_unaligned_write##size); \
void __tsan_read_write##size(void *ptr); \
void __tsan_read_write##size(void *ptr) \
@@ -833,7 +833,7 @@ EXPORT_SYMBOL(__kcsan_check_access);
} \
EXPORT_SYMBOL(__tsan_read_write##size); \
void __tsan_unaligned_read_write##size(void *ptr) \
- __alias(__tsan_read_write##size); \
+ __alias("__tsan_read_write" #size); \
EXPORT_SYMBOL(__tsan_unaligned_read_write##size)
DEFINE_TSAN_READ_WRITE(1);
@@ -877,7 +877,7 @@ EXPORT_SYMBOL(__tsan_write_range);
} \
EXPORT_SYMBOL(__tsan_volatile_read##size); \
void __tsan_unaligned_volatile_read##size(void *ptr) \
- __alias(__tsan_volatile_read##size); \
+ __alias("__tsan_volatile_read" #size); \
EXPORT_SYMBOL(__tsan_unaligned_volatile_read##size); \
void __tsan_volatile_write##size(void *ptr); \
void __tsan_volatile_write##size(void *ptr) \
@@ -892,7 +892,7 @@ EXPORT_SYMBOL(__tsan_write_range);
} \
EXPORT_SYMBOL(__tsan_volatile_write##size); \
void __tsan_unaligned_volatile_write##size(void *ptr) \
- __alias(__tsan_volatile_write##size); \
+ __alias("__tsan_volatile_write" #size); \
EXPORT_SYMBOL(__tsan_unaligned_volatile_write##size)
DEFINE_TSAN_VOLATILE_READ_WRITE(1);
--- a/lib/crc32.c~treewide-remove-stringification-from-__alias-macro-definition
+++ a/lib/crc32.c
@@ -206,8 +206,8 @@ u32 __pure __weak __crc32c_le(u32 crc, u
EXPORT_SYMBOL(crc32_le);
EXPORT_SYMBOL(__crc32c_le);
-u32 __pure crc32_le_base(u32, unsigned char const *, size_t) __alias(crc32_le);
-u32 __pure __crc32c_le_base(u32, unsigned char const *, size_t) __alias(__crc32c_le);
+u32 __pure crc32_le_base(u32, unsigned char const *, size_t) __alias("crc32_le");
+u32 __pure __crc32c_le_base(u32, unsigned char const *, size_t) __alias("__crc32c_le");
/*
* This multiplies the polynomials x and y modulo the given modulus.
--- a/lib/crypto/aes.c~treewide-remove-stringification-from-__alias-macro-definition
+++ a/lib/crypto/aes.c
@@ -82,8 +82,8 @@ static volatile const u8 __cacheline_ali
0xe1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0c, 0x7d,
};
-extern const u8 crypto_aes_sbox[256] __alias(aes_sbox);
-extern const u8 crypto_aes_inv_sbox[256] __alias(aes_inv_sbox);
+extern const u8 crypto_aes_sbox[256] __alias("aes_sbox");
+extern const u8 crypto_aes_inv_sbox[256] __alias("aes_inv_sbox");
EXPORT_SYMBOL(crypto_aes_sbox);
EXPORT_SYMBOL(crypto_aes_inv_sbox);
--- a/mm/kasan/generic.c~treewide-remove-stringification-from-__alias-macro-definition
+++ a/mm/kasan/generic.c
@@ -234,7 +234,7 @@ EXPORT_SYMBOL(__asan_unregister_globals)
check_memory_region_inline(addr, size, false, _RET_IP_);\
} \
EXPORT_SYMBOL(__asan_load##size); \
- __alias(__asan_load##size) \
+ __alias("__asan_load" #size) \
void __asan_load##size##_noabort(unsigned long); \
EXPORT_SYMBOL(__asan_load##size##_noabort); \
void __asan_store##size(unsigned long addr) \
@@ -242,7 +242,7 @@ EXPORT_SYMBOL(__asan_unregister_globals)
check_memory_region_inline(addr, size, true, _RET_IP_); \
} \
EXPORT_SYMBOL(__asan_store##size); \
- __alias(__asan_store##size) \
+ __alias("__asan_store" #size) \
void __asan_store##size##_noabort(unsigned long); \
EXPORT_SYMBOL(__asan_store##size##_noabort)
@@ -258,7 +258,7 @@ void __asan_loadN(unsigned long addr, si
}
EXPORT_SYMBOL(__asan_loadN);
-__alias(__asan_loadN)
+__alias("__asan_loadN")
void __asan_loadN_noabort(unsigned long, size_t);
EXPORT_SYMBOL(__asan_loadN_noabort);
@@ -268,7 +268,7 @@ void __asan_storeN(unsigned long addr, s
}
EXPORT_SYMBOL(__asan_storeN);
-__alias(__asan_storeN)
+__alias("__asan_storeN")
void __asan_storeN_noabort(unsigned long, size_t);
EXPORT_SYMBOL(__asan_storeN_noabort);
_
Patches currently in -mm which might be from joe@xxxxxxxxxxx are
checkpatch-prefer-static-const-declarations.patch
checkpatch-allow-fix-removal-of-unnecessary-break-statements.patch
checkpatch-update-__attribute__sectionname-quote-removal.patch
checkpatch-update-__attribute__sectionname-quote-removal-v2.patch
checkpatch-add-__alias-and-__weak-to-suggested-__attribute__-conversions.patch
checkpatch-add-printk_once-and-printk_ratelimit-to-prefer-pr_level-warning.patch
checkpatch-add-printk_once-and-printk_ratelimit-to-prefer-pr_level-warning-fix.patch
