Commit d2da77f4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'parisc-for-6.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux 

Pull parisc architecture fixes from Helge Deller:
 "This patchset fixes and enforces correct section alignments for the
  ex_table, altinstructions, parisc_unwind, jump_table and bug_table
  which are created by inline assembly.

  Due to not being correctly aligned at link & load time they can
  trigger unnecessarily the kernel unaligned exception handler at
  runtime. While at it, I switched the bug table to use relative
  addresses which reduces the size of the table by half on 64-bit.

  We still had the ENOSYM and EREMOTERELEASE errno symbols as left-overs
  from HP-UX, which now trigger build-issues with glibc. We can simply
  remove them.

  Most of the patches are tagged for stable kernel series.

  Summary:

   - Drop HP-UX ENOSYM and EREMOTERELEASE return codes to avoid glibc
     build issues

   - Fix section alignments for ex_table, altinstructions, parisc unwind
     table, jump_table and bug_table

   - Reduce size of bug_table on 64-bit kernel by using relative
     pointers"

* tag 'parisc-for-6.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Reduce size of the bug_table on 64-bit kernel by half
  parisc: Drop the HP-UX ENOSYM and EREMOTERELEASE error codes
  parisc: Use natural CPU alignment for bug_table
  parisc: Ensure 32-bit alignment on parisc unwind section
  parisc: Mark lock_aligned variables 16-byte aligned on SMP
  parisc: Mark jump_table naturally aligned
  parisc: Mark altinstructions read-only and 32-bit aligned
  parisc: Mark ex_table entries 32-bit aligned in uaccess.h
  parisc: Mark ex_table entries 32-bit aligned in assembly.h
parents 4892711a 43266838

arch/parisc/Kconfig

+5 −2
Original line number Diff line number Diff line
@@ -115,9 +115,12 @@ config ARCH_HAS_ILOG2_U64 
	default n



config GENERIC_BUG

	bool

	default y

	def_bool y

	depends on BUG

	select GENERIC_BUG_RELATIVE_POINTERS if 64BIT



config GENERIC_BUG_RELATIVE_POINTERS

	bool



config GENERIC_HWEIGHT

	bool

arch/parisc/include/asm/alternative.h

+6 −3
Original line number Diff line number Diff line
@@ -34,7 +34,8 @@ void apply_alternatives(struct alt_instr *start, struct alt_instr *end, 


/* Alternative SMP implementation. */

#define ALTERNATIVE(cond, replacement)		"!0:"	\

	".section .altinstructions, \"aw\"	!"	\

	".section .altinstructions, \"a\"	!"	\

	".align 4				!"	\

	".word (0b-4-.)				!"	\

	".hword 1, " __stringify(cond) "	!"	\

	".word " __stringify(replacement) "	!"	\
@@ -44,7 +45,8 @@ void apply_alternatives(struct alt_instr *start, struct alt_instr *end, 


/* to replace one single instructions by a new instruction */

#define ALTERNATIVE(from, to, cond, replacement)\

	.section .altinstructions, "aw"	!	\

	.section .altinstructions, "a"	!	\

	.align 4			!	\

	.word (from - .)		!	\

	.hword (to - from)/4, cond	!	\

	.word replacement		!	\
@@ -52,7 +54,8 @@ void apply_alternatives(struct alt_instr *start, struct alt_instr *end, 


/* to replace multiple instructions by new code */

#define ALTERNATIVE_CODE(from, num_instructions, cond, new_instr_ptr)\

	.section .altinstructions, "aw"	!	\

	.section .altinstructions, "a"	!	\

	.align 4			!	\

	.word (from - .)		!	\

	.hword -num_instructions, cond	!	\

	.word (new_instr_ptr - .)	!	\

arch/parisc/include/asm/assembly.h

+1 −0
Original line number Diff line number Diff line
@@ -574,6 +574,7 @@ 
	 */

#define ASM_EXCEPTIONTABLE_ENTRY(fault_addr, except_addr)	\

	.section __ex_table,"aw"			!	\

	.align 4					!	\

	.word (fault_addr - .), (except_addr - .)	!	\

	.previous

arch/parisc/include/asm/bug.h

+22 −16
Original line number Diff line number Diff line
@@ -17,21 +17,24 @@ 
#define	PARISC_BUG_BREAK_ASM	"break 0x1f, 0x1fff"

#define	PARISC_BUG_BREAK_INSN	0x03ffe01f  /* PARISC_BUG_BREAK_ASM */



#if defined(CONFIG_64BIT)

#define ASM_WORD_INSN		".dword\t"

#ifdef CONFIG_GENERIC_BUG_RELATIVE_POINTERS

# define __BUG_REL(val) ".word " __stringify(val) " - ."

#else

#define ASM_WORD_INSN		".word\t"

# define __BUG_REL(val) ".word " __stringify(val)

#endif





#ifdef CONFIG_DEBUG_BUGVERBOSE

#define BUG()								\

	do {								\

		asm volatile("\n"					\

			     "1:\t" PARISC_BUG_BREAK_ASM "\n"		\

			     "\t.pushsection __bug_table,\"aw\"\n"	\

			     "2:\t" ASM_WORD_INSN "1b, %c0\n"		\

			     "\t.short %c1, %c2\n"			\

			     "\t.org 2b+%c3\n"				\

			     "\t.pushsection __bug_table,\"a\"\n"	\

			     "\t.align 4\n"				\

			     "2:\t" __BUG_REL(1b) "\n"			\

			     "\t" __BUG_REL(%c0)  "\n"			\

			     "\t.short %1, %2\n"			\

			     "\t.blockz %3-2*4-2*2\n"			\

			     "\t.popsection"				\

			     : : "i" (__FILE__), "i" (__LINE__),	\

			     "i" (0), "i" (sizeof(struct bug_entry)) );	\
@@ -51,10 +54,12 @@ 
	do {								\

		asm volatile("\n"					\

			     "1:\t" PARISC_BUG_BREAK_ASM "\n"		\

			     "\t.pushsection __bug_table,\"aw\"\n"	\

			     "2:\t" ASM_WORD_INSN "1b, %c0\n"		\

			     "\t.short %c1, %c2\n"			\

			     "\t.org 2b+%c3\n"				\

			     "\t.pushsection __bug_table,\"a\"\n"	\

			     "\t.align 4\n"				\

			     "2:\t" __BUG_REL(1b) "\n"			\

			     "\t" __BUG_REL(%c0)  "\n"			\

			     "\t.short %1, %2\n"			\

			     "\t.blockz %3-2*4-2*2\n"			\

			     "\t.popsection"				\

			     : : "i" (__FILE__), "i" (__LINE__),	\

			     "i" (BUGFLAG_WARNING|(flags)),		\
@@ -65,10 +70,11 @@ 
	do {								\

		asm volatile("\n"					\

			     "1:\t" PARISC_BUG_BREAK_ASM "\n"		\

			     "\t.pushsection __bug_table,\"aw\"\n"	\

			     "2:\t" ASM_WORD_INSN "1b\n"		\

			     "\t.short %c0\n"				\

			     "\t.org 2b+%c1\n"				\

			     "\t.pushsection __bug_table,\"a\"\n"	\

			     "\t.align %2\n"				\

			     "2:\t" __BUG_REL(1b) "\n"			\

			     "\t.short %0\n"				\

			     "\t.blockz %1-4-2\n"			\

			     "\t.popsection"				\

			     : : "i" (BUGFLAG_WARNING|(flags)),		\

			     "i" (sizeof(struct bug_entry)) );		\

arch/parisc/include/asm/jump_label.h

+6 −2
Original line number Diff line number Diff line
@@ -15,10 +15,12 @@ static __always_inline bool arch_static_branch(struct static_key *key, bool bran 
	asm_volatile_goto("1:\n\t"

		 "nop\n\t"

		 ".pushsection __jump_table,  \"aw\"\n\t"

		 ".align %1\n\t"

		 ".word 1b - ., %l[l_yes] - .\n\t"

		 __stringify(ASM_ULONG_INSN) " %c0 - .\n\t"

		 ".popsection\n\t"

		 : :  "i" (&((char *)key)[branch]) :  : l_yes);

		 : : "i" (&((char *)key)[branch]), "i" (sizeof(long))

		 : : l_yes);



	return false;

l_yes:
@@ -30,10 +32,12 @@ static __always_inline bool arch_static_branch_jump(struct static_key *key, bool 
	asm_volatile_goto("1:\n\t"

		 "b,n %l[l_yes]\n\t"

		 ".pushsection __jump_table,  \"aw\"\n\t"

		 ".align %1\n\t"

		 ".word 1b - ., %l[l_yes] - .\n\t"

		 __stringify(ASM_ULONG_INSN) " %c0 - .\n\t"

		 ".popsection\n\t"

		 : :  "i" (&((char *)key)[branch]) :  : l_yes);

		 : : "i" (&((char *)key)[branch]), "i" (sizeof(long))

		 : : l_yes);



	return false;

l_yes: