Skip to contentSkip to conversation

arm64/alternatives: move length validation inside the subsection

PATCH Superseded Sami Tolvanen 5 participants 11 messages Jul 29, 2020 – Jul 31, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm64/alternatives: move length validation inside the subsection

Commit f7b93d42945c ("arm64/alternatives: use subsections for replacement sequences") breaks LLVM's integrated assembler, because due to its one-pass design, it cannot compute instruction sequence lengths before the layout for the subsection has been finalized. This change fixes the build by moving the .org directives inside the subsection, so they are processed after the subsection layout is known.

---
 arch/arm64/include/asm/alternative.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/include/asm/alternative.h +2 -2
index 12f0eb56a1cc..619db9b4c9d5 100644
@@ -77,9 +77,9 @@ static inline void apply_alternatives_module(void *start, size_t length) { }
 	"663:\n\t"							\
 	newinstr "\n"							\
 	"664:\n\t"							\
-	".previous\n\t"							\
 	".org	. - (664b-663b) + (662b-661b)\n\t"			\
-	".org	. - (662b-661b) + (664b-663b)\n"			\
+	".org	. - (662b-661b) + (664b-663b)\n\t"			\
+	".previous\n"							\
 	".endif\n"
 
 #define __ALTERNATIVE_CFG_CB(oldinstr, feature, cfg_enabled, cb)	\

base-commit: 6ba1b005ffc388c2aeaddae20da29e4810dea298

Signature · 1 line
2.28.0.163.g6104cc2f0b6-goog
maintainer
#1 lore raw
Quoted 9 lines · Sami Tolvanen

Commit f7b93d42945c ("arm64/alternatives: use subsections for replacement sequences") breaks LLVM's integrated assembler, because due to its one-pass design, it cannot compute instruction sequence lengths before the layout for the subsection has been finalized. This change fixes the build by moving the .org directives inside the subsection, so they are processed after the subsection layout is known.

Commit f7b93d42945c went in 5.8-rc4. Why is this cc stable from 4.14? If Will picks it up for 5.8, it doesn't even need a cc stable.

Please add a Fixes: tag as well.

Signature · 1 line
Catalin
#2 lore raw
Quoted 9 lines · Catalin Marinas
Quoted 7 lines · Sami Tolvanen

Commit f7b93d42945c ("arm64/alternatives: use subsections for replacement sequences") breaks LLVM's integrated assembler, because due to its one-pass design, it cannot compute instruction sequence lengths before the layout for the subsection has been finalized. This change fixes the build by moving the .org directives inside the subsection, so they are processed after the subsection layout is known.

Quoted 5 lines
Quoted 2 lines

Commit f7b93d42945c went in 5.8-rc4. Why is this cc stable from 4.14? If Will picks it up for 5.8, it doesn't even need a cc stable.

Greg or Sasha can probably answer why, but this patch is in 4.14.189, 4.19.134, 5.4.53, and 5.7.10, which ended up breaking some downstream Android kernel builds.

Quoted 1 line

Please add a Fixes: tag as well.

Sure, I'll send v2 shortly with the tag. Thanks.

Sami

maintainer
#3 lore raw
Quoted 13 lines · Sami Tolvanen
Quoted 12 lines · Catalin Marinas
Quoted 9 lines · Sami Tolvanen

Commit f7b93d42945c ("arm64/alternatives: use subsections for replacement sequences") breaks LLVM's integrated assembler, because due to its one-pass design, it cannot compute instruction sequence lengths before the layout for the subsection has been finalized. This change fixes the build by moving the .org directives inside the subsection, so they are processed after the subsection layout is known.

Quoted 6 lines
Quoted 2 lines

Commit f7b93d42945c went in 5.8-rc4. Why is this cc stable from 4.14? If Will picks it up for 5.8, it doesn't even need a cc stable.

Greg or Sasha can probably answer why, but this patch is in 4.14.189, 4.19.134, 5.4.53, and 5.7.10, which ended up breaking some downstream Android kernel builds.

I see but I don't think we need the explicit cc stable for 4.14. That's why the Fixes tag is important. If a patch was back-ported, the subsequent fixes should be picked by the stable maintainers as well.

Signature · 1 line
Catalin
maintainer
#4 lore raw
Quoted 17 lines · Catalin Marinas
Quoted 16 lines · Sami Tolvanen
Quoted 14 lines · Catalin Marinas
Quoted 9 lines · Sami Tolvanen

Commit f7b93d42945c ("arm64/alternatives: use subsections for replacement sequences") breaks LLVM's integrated assembler, because due to its one-pass design, it cannot compute instruction sequence lengths before the layout for the subsection has been finalized. This change fixes the build by moving the .org directives inside the subsection, so they are processed after the subsection layout is known.

Commit f7b93d42945c went in 5.8-rc4. Why is this cc stable from 4.14? If Will picks it up for 5.8, it doesn't even need a cc stable.

Quoted 7 lines
Quoted 3 lines

Greg or Sasha can probably answer why, but this patch is in 4.14.189, 4.19.134, 5.4.53, and 5.7.10, which ended up breaking some downstream Android kernel builds.

I see but I don't think we need the explicit cc stable for 4.14. That's why the Fixes tag is important. If a patch was back-ported, the subsequent fixes should be picked by the stable maintainers as well.

If you know it ahead of time, the explict "# kernel.version" hint is always nice to have as it ensures I will try to backport it that far, and if I have problems, I will ask for help.

thanks,

greg k-h

maintainer
#5 lore raw
Quoted 22 lines · Greg Kroah-Hartman
Quoted 21 lines · Catalin Marinas
Quoted 19 lines · Sami Tolvanen
Quoted 9 lines · Catalin Marinas
Quoted 7 lines · Sami Tolvanen

Commit f7b93d42945c ("arm64/alternatives: use subsections for replacement sequences") breaks LLVM's integrated assembler, because due to its one-pass design, it cannot compute instruction sequence lengths before the layout for the subsection has been finalized. This change fixes the build by moving the .org directives inside the subsection, so they are processed after the subsection layout is known.

Quoted 5 lines
Quoted 2 lines

Commit f7b93d42945c went in 5.8-rc4. Why is this cc stable from 4.14? If Will picks it up for 5.8, it doesn't even need a cc stable.

Greg or Sasha can probably answer why, but this patch is in 4.14.189, 4.19.134, 5.4.53, and 5.7.10, which ended up breaking some downstream Android kernel builds.

Quoted 7 lines
Quoted 3 lines

I see but I don't think we need the explicit cc stable for 4.14. That's why the Fixes tag is important. If a patch was back-ported, the subsequent fixes should be picked by the stable maintainers as well.

If you know it ahead of time, the explict "# kernel.version" hint is always nice to have as it ensures I will try to backport it that far, and if I have problems, I will ask for help.

Good to know. Thanks for the clarification.

Signature · 1 line
Catalin
#6 lore raw

PATCH v2 1/1 arm64/alternatives: move length validation inside the subsection

In reply to Sami Tolvanen

Commit f7b93d42945c ("arm64/alternatives: use subsections for replacement sequences") breaks LLVM's integrated assembler, because due to its one-pass design, it cannot compute instruction sequence lengths before the layout for the subsection has been finalized. This change fixes the build by moving the .org directives inside the subsection, so they are processed after the subsection layout is known.

Fixes f7b93d42945c ("arm64/alternatives: use subsections for replacement sequences")

---
v1 -> v2:
- Added the missing Fixes tag and dropped CC: stable@.

---
 arch/arm64/include/asm/alternative.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/include/asm/alternative.h +2 -2
index 12f0eb56a1cc..619db9b4c9d5 100644
@@ -77,9 +77,9 @@ static inline void apply_alternatives_module(void *start, size_t length) { }
 	"663:\n\t"							\
 	newinstr "\n"							\
 	"664:\n\t"							\
-	".previous\n\t"							\
 	".org	. - (664b-663b) + (662b-661b)\n\t"			\
-	".org	. - (662b-661b) + (664b-663b)\n"			\
+	".org	. - (662b-661b) + (664b-663b)\n\t"			\
+	".previous\n"							\
 	".endif\n"
 
 #define __ALTERNATIVE_CFG_CB(oldinstr, feature, cfg_enabled, cb)	\

base-commit: 83bdc7275e6206f560d247be856bceba3e1ed8f2

Signature · 1 line
2.28.0.163.g6104cc2f0b6-goog
maintainer Applied
#7 lore raw
Quoted 6 lines · Sami Tolvanen

Commit f7b93d42945c ("arm64/alternatives: use subsections for replacement sequences") breaks LLVM's integrated assembler, because due to its one-pass design, it cannot compute instruction sequence lengths before the layout for the subsection has been finalized. This change fixes the build by moving the .org directives inside the subsection, so they are processed after the subsection layout is known.

Applied to arm64 (for-next/fixes), thanks!

[1/1] arm64/alternatives: move length validation inside the subsection

      https://git.kernel.org/arm64/c/966a0acce2fc

Cheers,

Signature · 5 lines
Will

https://fixes.arm64.dev
https://next.arm64.dev
https://will.arm64.dev
#8 lore raw
In reply to Sami Tolvanen
Quoted 7 lines · Sami Tolvanen' via Clang Built Linux

Commit f7b93d42945c ("arm64/alternatives: use subsections for replacement sequences") breaks LLVM's integrated assembler, because due to its one-pass design, it cannot compute instruction sequence lengths before the layout for the subsection has been finalized. This change fixes the build by moving the .org directives inside the subsection, so they are processed after the subsection layout is known.

Quoted 6 lines
Fixes f7b93d42945c ("arm64/alternatives: use subsections for replacement sequences")

---
v1 -> v2:
- Added the missing Fixes tag and dropped CC: stable@.

I think that the cc to stable should have been kept even with the addition of the fixes tag. AUTOSEL will still most likely pick this up (or even Chrome OS's patch bot that they now have) but the cc to stable would have made it clear that we do need it there and the fixes tag would have guided how far back it should go (rather than an explicit version that is added).

Something for the future I supppose.

Cheers,
Nathan

maintainer Acked-by on v2 1/1
#9 lore raw
In reply to Sami Tolvanen
Quoted 23 lines · Sami Tolvanen

Commit f7b93d42945c ("arm64/alternatives: use subsections for replacement sequences") breaks LLVM's integrated assembler, because due to its one-pass design, it cannot compute instruction sequence lengths before the layout for the subsection has been finalized. This change fixes the build by moving the .org directives inside the subsection, so they are processed after the subsection layout is known.

Fixes f7b93d42945c ("arm64/alternatives: use subsections for replacement sequences")

---
v1 -> v2:
- Added the missing Fixes tag and dropped CC: stable@.

---
 arch/arm64/include/asm/alternative.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/include/asm/alternative.h +0 -0
index 12f0eb56a1cc..619db9b4c9d5 100644

arch/arm64/include/asm/alternative.h static inline void apply_alternatives_module(void *start, size_t length) { } · line 83

Quoted 9 lines
arch/arm64/include/asm/alternative.h +2 -2
@@ -77,9 +77,9 @@ static inline void apply_alternatives_module(void *start, size_t length) { }
 	"663:\n\t"							\
 	newinstr "\n"							\
 	"664:\n\t"							\
-	".previous\n\t"							\
 	".org	. - (664b-663b) + (662b-661b)\n\t"			\
-	".org	. - (662b-661b) + (664b-663b)\n"			\
+	".org	. - (662b-661b) + (664b-663b)\n\t"			\
+	".previous\n"							\
 	".endif\n"

There are a few instances of the .org test outside the subsection, though using in .S files. Are those ok?

Signature · 1 line
Catalin
#10 lore raw
Quoted 37 lines · Catalin Marinas
Quoted 23 lines · Sami Tolvanen

Commit f7b93d42945c ("arm64/alternatives: use subsections for replacement sequences") breaks LLVM's integrated assembler, because due to its one-pass design, it cannot compute instruction sequence lengths before the layout for the subsection has been finalized. This change fixes the build by moving the .org directives inside the subsection, so they are processed after the subsection layout is known.

Fixes f7b93d42945c ("arm64/alternatives: use subsections for replacement sequences")

---
v1 -> v2:
- Added the missing Fixes tag and dropped CC: stable@.

---
 arch/arm64/include/asm/alternative.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/include/asm/alternative.h +0 -0
index 12f0eb56a1cc..619db9b4c9d5 100644

arch/arm64/include/asm/alternative.h static inline void apply_alternatives_module(void *start, size_t length) { } · line 83

Quoted 9 lines
arch/arm64/include/asm/alternative.h +2 -2
@@ -77,9 +77,9 @@ static inline void apply_alternatives_module(void *start, size_t length) { }
      "663:\n\t"                                                      \
      newinstr "\n"                                                   \
      "664:\n\t"                                                      \
-     ".previous\n\t"                                                 \
      ".org   . - (664b-663b) + (662b-661b)\n\t"                      \
-     ".org   . - (662b-661b) + (664b-663b)\n"                        \
+     ".org   . - (662b-661b) + (664b-663b)\n\t"                      \
+     ".previous\n"                                                   \
      ".endif\n"
Quoted 2 lines

There are a few instances of the .org test outside the subsection, though using in .S files. Are those ok?

Yes, this only appears to be a problem when used in inline assembly.

Sami