Skip to contentSkip to conversation

arm64: kvm: Delete duplicated label: in invalid_vector

PATCH In review Fangrui Song 3 participants 3 messages Apr 13, 2020 – Apr 14, 2020

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

PATCH 1/1 arm64: kvm: Delete duplicated label: in invalid_vector

SYM_CODE_START defines \label , so it is redundant to define \label again. A redefinition at the same place is accepted by GNU as
(https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=159fbb6088f17a341bcaaac960623cab881b4981)
but rejected by the clang integrated assembler.

Fixes 617a2f392c92 ("arm64: kvm: Annotate assembly using modern annoations")
---
 arch/arm64/kvm/hyp/hyp-entry.S | 1 -
 1 file changed, 1 deletion(-)
arch/arm64/kvm/hyp/hyp-entry.S +0 -1
index c2a13ab3c471..9c5cfb04170e 100644
@@ -198,7 +198,6 @@ SYM_CODE_END(__hyp_panic)
 .macro invalid_vector	label, target = __hyp_panic
 	.align	2
 SYM_CODE_START(\label)
-\label:
 	b \target
 SYM_CODE_END(\label)
 .endm
Signature · 1 line
2.26.0.110.g2183baf09c-goog
Reviewed-by Tested-by on v1 1/1
#1 lore raw
Quoted 7 lines · Fangrui Song

SYM_CODE_START defines \label , so it is redundant to define \label again. A redefinition at the same place is accepted by GNU as
(https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=159fbb6088f17a341bcaaac960623cab881b4981)
but rejected by the clang integrated assembler.

Fixes 617a2f392c92 ("arm64: kvm: Annotate assembly using modern annoations")

Thanks for the patch! I think a more accurate Fixes tag would be:

Fixes 2b28162cf65a ("arm64: KVM: HYP mode entry points")

With this patch applied, and your other arm64 integrated assembler
patch (https://lore.kernel.org/linux-arm-kernel/[email protected]/T/#u),
I can now assemble arch/arm64/kvm/.

Quoted 21 lines
---
 arch/arm64/kvm/hyp/hyp-entry.S | 1 -
 1 file changed, 1 deletion(-)
arch/arm64/kvm/hyp/hyp-entry.S +0 -2
index c2a13ab3c471..9c5cfb04170e 100644
@@ -198,7 +198,6 @@ SYM_CODE_END(__hyp_panic)
 .macro invalid_vector  label, target = __hyp_panic
        .align  2
 SYM_CODE_START(\label)
-\label:
        b \target
 SYM_CODE_END(\label)
 .endm
--

2.26.0.110.g2183baf09c-goog

Signature · 2 lines
Thanks,
~Nick Desaulniers
maintainer
#2 lore raw

Hi Nick,

Quoted 11 lines · On Mon, 13 Apr 2020 16:37:10 -0700 Nick Desaulniers <[email protected]>…
Quoted 7 lines · Fangrui Song

SYM_CODE_START defines \label , so it is redundant to define \label again. A redefinition at the same place is accepted by GNU as
(https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=159fbb6088f17a341bcaaac960623cab881b4981)
but rejected by the clang integrated assembler.

Fixes 617a2f392c92 ("arm64: kvm: Annotate assembly using modern annoations")

Thanks for the patch! I think a more accurate Fixes tag would be:

Fixes 2b28162cf65a ("arm64: KVM: HYP mode entry points")

I'm not sure this commit is accurate. At that time, there was no other declaration for \label and dropping it would simply break compilation. I believe that Fangrui is correct in his analysis that 617a2f392c92 is the first broken commit.

Quoted 3 lines

With this patch applied, and your other arm64 integrated assembler
patch (https://lore.kernel.org/linux-arm-kernel/[email protected]/T/#u),
I can now assemble arch/arm64/kvm/.

Progress! ;-)

Quoted 9 lines
Quoted 6 lines
---
 arch/arm64/kvm/hyp/hyp-entry.S | 1 -
 1 file changed, 1 deletion(-)
Quoted 17 lines
Quoted 13 lines
arch/arm64/kvm/hyp/hyp-entry.S +0 -2
index c2a13ab3c471..9c5cfb04170e 100644
@@ -198,7 +198,6 @@ SYM_CODE_END(__hyp_panic)
 .macro invalid_vector  label, target = __hyp_panic
        .align  2
 SYM_CODE_START(\label)
-\label:
        b \target
 SYM_CODE_END(\label)
 .endm
--
Quoted 2 lines

2.26.0.110.g2183baf09c-goog

I'll pick this up as soon as we've sorted the queue with the rest of the fixes.

Thanks,

	M.
Signature · 6 lines
Jazz is not dead. It just smells funny...

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel