Unverified Commit bb1f85d6 authored by Jisheng Zhang's avatar Jisheng Zhang Committed by Palmer Dabbelt
Browse files

riscv: switch to relative exception tables 



Similar as other architectures such as arm64, x86 and so on, use
offsets relative to the exception table entry values rather than
absolute addresses for both the exception locationand the fixup.

However, RISCV label difference will actually produce two relocations,
a pair of R_RISCV_ADD32 and R_RISCV_SUB32. Take below simple code for
example:

$ cat test.S
.section .text
1:
        nop
.section __ex_table,"a"
        .balign 4
        .long (1b - .)
.previous

$ riscv64-linux-gnu-gcc -c test.S
$ riscv64-linux-gnu-readelf -r test.o
Relocation section '.rela__ex_table' at offset 0x100 contains 2 entries:
  Offset          Info           Type           Sym. Value    Sym. Name + Addend
000000000000  000600000023 R_RISCV_ADD32     0000000000000000 .L1^B1 + 0
000000000000  000500000027 R_RISCV_SUB32     0000000000000000 .L0  + 0

The modpost will complain the R_RISCV_SUB32 relocation, so we need to
patch modpost.c to skip this relocation for .rela__ex_table section.

After this patch, the __ex_table section size of defconfig vmlinux is
reduced from 7072 Bytes to 3536 Bytes.

Signed-off-by: default avatarJisheng Zhang <jszhang@kernel.org>
Reviewed-by: default avatarKefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: default avatarPalmer Dabbelt <palmer@rivosinc.com>
parent f8f2ad02

arch/riscv/include/asm/Kbuild

+0 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

generic-y += early_ioremap.h

generic-y += extable.h

generic-y += flat.h

generic-y += kvm_para.h

generic-y += user.h

arch/riscv/include/asm/extable.h

0 → 100644
+25 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _ASM_RISCV_EXTABLE_H

#define _ASM_RISCV_EXTABLE_H



/*

 * The exception table consists of pairs of relative offsets: the first

 * is the relative offset to an instruction that is allowed to fault,

 * and the second is the relative offset at which the program should

 * continue. No registers are modified, so it is entirely up to the

 * continuation code to figure out what to do.

 *

 * All the routines below use bits of fixup code that are out of line

 * with the main instruction path.  This means when everything is well,

 * we don't even have to jump over them.  Further, they do not intrude

 * on our cache or tlb entries.

 */



struct exception_table_entry {

	int insn, fixup;

};



#define ARCH_HAS_RELATIVE_EXTABLE



int fixup_exception(struct pt_regs *regs);

#endif

arch/riscv/include/asm/uaccess.h

+2 −2
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ 


#define _ASM_EXTABLE(from, to)						\

	"	.pushsection	__ex_table, \"a\"\n"			\

	"	.balign "	RISCV_SZPTR "	 \n"			\

	"	" RISCV_PTR	"(" #from "), (" #to ")\n"		\

	"	.balign		4\n"					\

	"	.long		(" #from " - .), (" #to " - .)\n"	\

	"	.popsection\n"



/*

arch/riscv/lib/uaccess.S

+2 −2
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ 
100:

	\op \reg, \addr

	.section __ex_table,"a"

	.balign RISCV_SZPTR

	RISCV_PTR 100b, \lbl

	.balign 4

	.long (100b - .), (\lbl - .)

	.previous

	.endm

arch/riscv/mm/extable.c

+1 −1
Original line number Diff line number Diff line
@@ -28,6 +28,6 @@ int fixup_exception(struct pt_regs *regs) 
		return rv_bpf_fixup_exception(fixup, regs);

#endif



	regs->epc = fixup->fixup;

	regs->epc = (unsigned long)&fixup->fixup + fixup->fixup;

	return 1;

}