Commit 38a17568 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc: Don't allow the use of EMIT_BUG_ENTRY with BUGFLAG_WARNING 



Warnings in assembly must use EMIT_WARN_ENTRY in order to generate
the necessary entry in exception table.

Check in EMIT_BUG_ENTRY that flags don't include BUGFLAG_WARNING.

This change avoids problems like the one fixed by
commit fd1eaaaa ("powerpc/64s: Use EMIT_WARN_ENTRY for SRR debug
warnings").

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/ddcb422102a37eb45f57694c7ef0ec6187964dff.1644742951.git.christophe.leroy@csgroup.eu
parent 5a72345e

arch/powerpc/include/asm/bug.h

+10 −3
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ 
#ifdef __ASSEMBLY__

#include <asm/asm-offsets.h>

#ifdef CONFIG_DEBUG_BUGVERBOSE

.macro EMIT_BUG_ENTRY addr,file,line,flags

.macro __EMIT_BUG_ENTRY addr,file,line,flags

	 .section __bug_table,"aw"

5001:	 .4byte \addr - 5001b, 5002f - 5001b

	 .short \line, \flags
@@ -22,7 +22,7 @@ 
	 .previous

.endm

#else

.macro EMIT_BUG_ENTRY addr,file,line,flags

.macro __EMIT_BUG_ENTRY addr,file,line,flags

	 .section __bug_table,"aw"

5001:	 .4byte \addr - 5001b

	 .short \flags
@@ -33,7 +33,14 @@ 


.macro EMIT_WARN_ENTRY addr,file,line,flags

	EX_TABLE(\addr,\addr+4)

	EMIT_BUG_ENTRY \addr,\file,\line,\flags

	__EMIT_BUG_ENTRY \addr,\file,\line,\flags

.endm



.macro EMIT_BUG_ENTRY addr,file,line,flags

	.if \flags & 1 /* BUGFLAG_WARNING */

	.err /* Use EMIT_WARN_ENTRY for warnings */

	.endif

	__EMIT_BUG_ENTRY \addr,\file,\line,\flags

.endm



#else /* !__ASSEMBLY__ */