FAILED: patch "[PATCH] arm64: Change .weak to SYM_FUNC_START_WEAK_PI for" failed to apply to 4.19-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From ec9d78070de986ecf581ea204fd322af4d2477ec Mon Sep 17 00:00:00 2001
From: Fangrui Song <[email protected]>
Date: Thu, 29 Oct 2020 11:19:51 -0700
Subject: [PATCH] arm64: Change .weak to SYM_FUNC_START_WEAK_PI for
arch/arm64/lib/mem*.S
Commit 39d114ddc682 ("arm64: add KASAN support") added .weak directives to arch/arm64/lib/mem*.S instead of changing the existing SYM_FUNC_START_PI macros. This can lead to the assembly snippet .weak memcpy ... .globl memcpy which will produce a STB_WEAK memcpy with GNU as but STB_GLOBAL memcpy with LLVM's integrated assembler before LLVM 12. LLVM 12 (since
https://reviews.llvm.org/D90108) will error on such an overridden symbol binding.
Use the appropriate SYM_FUNC_START_WEAK_PI instead.
arch/arm64/lib/memcpy.S +1 -2
@@ -56,9 +56,8 @@ stp \reg1, \reg2, [\ptr], \val .endm - .weak memcpy SYM_FUNC_START_ALIAS(__memcpy) -SYM_FUNC_START_PI(memcpy) +SYM_FUNC_START_WEAK_PI(memcpy) #include "copy_template.S" ret SYM_FUNC_END_PI(memcpy)
arch/arm64/lib/memmove.S +1 -2
@@ -45,9 +45,8 @@ C_h .req x12 D_l .req x13 D_h .req x14 - .weak memmove SYM_FUNC_START_ALIAS(__memmove) -SYM_FUNC_START_PI(memmove) +SYM_FUNC_START_WEAK_PI(memmove) cmp dstin, src b.lo __memcpy add tmp1, src, count
arch/arm64/lib/memset.S +1 -2
@@ -42,9 +42,8 @@ dst .req x8 tmp3w .req w9 tmp3 .req x9 - .weak memset SYM_FUNC_START_ALIAS(__memset) -SYM_FUNC_START_PI(memset) +SYM_FUNC_START_WEAK_PI(memset) mov dst, dstin /* Preserve return value. */ and A_lw, val, #255 orr A_lw, A_lw, A_lw, lsl #8
Quoted 11 lines · On Tue, Nov 3, 2020 at 11:18 AM <[email protected]> wrote:
The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.thanks,
greg k-h
Quoted 7 lines
------------------ original commit in Linus's tree ------------------
From
ec9d78070de986ecf581ea204fd322af4d2477ecMon Sep 17 00:00:00 2001
From: Fangrui Song <[email protected]>
Date: Thu, 29 Oct 2020 11:19:51 -0700
Subject: [PATCH] arm64: Change .weak toSYM_FUNC_START_WEAK_PIfor
arch/arm64/lib/mem*.S
Dear stable kernel maintainers, please consider applying the attached patch for 4.19.y. It is adjusted to avoid conflicts due to:
commit 3ac0f4526dfb ("arm64: lib: Use modern annotations for
assembly functions")
commit 35e61c77ef38 ("arm64: asm: Add new-style positionindependent function annotations")]
not being backported to 4.19.y. It helps us enable LLVM_IAS=1 builds for aarch64 for Android and CrOS.
Signature · 2 lines
Thanks, ~Nick Desaulniers
From 6f7915cdf2332f1ff9108cd16936e2d115c3119d Mon Sep 17 00:00:00 2001
From: Fangrui Song <[email protected]>
Date: Thu, 29 Oct 2020 11:19:51 -0700
Subject: [PATCH] arm64: Change .weak to SYM_FUNC_START_WEAK_PI for
arch/arm64/lib/mem*.S
commit ec9d78070de986ecf581ea204fd322af4d2477ec upstream.
Commit 39d114ddc682 ("arm64: add KASAN support") added .weak directives to arch/arm64/lib/mem*.S instead of changing the existing SYM_FUNC_START_PI macros. This can lead to the assembly snippet .weak memcpy ... .globl memcpy which will produce a STB_WEAK memcpy with GNU as but STB_GLOBAL memcpy with LLVM's integrated assembler before LLVM 12. LLVM 12 (since
https://reviews.llvm.org/D90108) will error on such an overridden symbol binding.
Use the appropriate SYM_FUNC_START_WEAK_PI instead.
[nd: backport to adjust for missing:
commit 3ac0f4526dfb ("arm64: lib: Use modern annotations for assembly functions") commit 35e61c77ef38 ("arm64: asm: Add new-style position independent function annotations")]
--- arch/arm64/lib/memcpy.S | 3 +-- arch/arm64/lib/memmove.S | 3 +-- arch/arm64/lib/memset.S | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-)
arch/arm64/lib/memcpy.S +1 -2
@@ -68,9 +68,8 @@ stp \ptr, \regB, [\regC], \val .endm - .weak memcpy ENTRY(__memcpy) -ENTRY(memcpy) +WEAK(memcpy) #include "copy_template.S" ret ENDPIPROC(memcpy)
arch/arm64/lib/memmove.S +1 -2
@@ -57,9 +57,8 @@ C_h .req x12 D_l .req x13 D_h .req x14 - .weak memmove ENTRY(__memmove) -ENTRY(memmove) +WEAK(memmove) cmp dstin, src b.lo __memcpy add tmp1, src, count
arch/arm64/lib/memset.S +1 -2
@@ -54,9 +54,8 @@ dst .req x8 tmp3w .req w9 tmp3 .req x9 - .weak memset ENTRY(__memset) -ENTRY(memset) +WEAK(memset) mov dst, dstin /* Preserve return value. */ and A_lw, val, #255 orr A_lw, A_lw, A_lw, lsl #8
Signature · 1 line
2.29.2.684.gfbc64c5ab5-goog
Greg KH
maintainerQuoted 20 lines · Nick Desaulniers
Quoted 11 lines · On Tue, Nov 3, 2020 at 11:18 AM <[email protected]> wrote:
The patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.thanks,
greg k-h
Quoted 7 lines
------------------ original commit in Linus's tree ------------------
From
ec9d78070de986ecf581ea204fd322af4d2477ecMon Sep 17 00:00:00 2001
From: Fangrui Song <[email protected]>
Date: Thu, 29 Oct 2020 11:19:51 -0700
Subject: [PATCH] arm64: Change .weak toSYM_FUNC_START_WEAK_PIfor
arch/arm64/lib/mem*.S
Quoted 8 lines
Dear stable kernel maintainers, please consider applying the attached patch for 4.19.y. It is adjusted to avoid conflicts due to:
commit3ac0f4526dfb("arm64: lib: Use modern annotations for
assembly functions")commit 35e61c77ef38 ("arm64: asm: Add new-style positionindependent function annotations")]
not being backported to 4.19.y. It helps us enable LLVM_IAS=1 builds for aarch64 for Android and CrOS.
Now applied, thanks.
greg k-h