Skip to content

Commit

Permalink
riscv: switch to relative exception tables
Browse files Browse the repository at this point in the history
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: Jisheng Zhang <jszhang@kernel.org>
Reviewed-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
  • Loading branch information
Jisheng Zhang authored and Palmer Dabbelt committed Jan 6, 2022
1 parent f8f2ad0 commit bb1f85d
Show file tree
Hide file tree
Showing 7 changed files with 46 additions and 7 deletions.
1 change: 0 additions & 1 deletion arch/riscv/include/asm/Kbuild
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
# 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
Expand Down
25 changes: 25 additions & 0 deletions arch/riscv/include/asm/extable.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
/* 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
4 changes: 2 additions & 2 deletions arch/riscv/include/asm/uaccess.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"

/*
Expand Down
4 changes: 2 additions & 2 deletions arch/riscv/lib/uaccess.S
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion arch/riscv/mm/extable.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
15 changes: 15 additions & 0 deletions scripts/mod/modpost.c
Original file line number Diff line number Diff line change
Expand Up @@ -1830,6 +1830,14 @@ static int addend_mips_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r)
return 0;
}

#ifndef EM_RISCV
#define EM_RISCV 243
#endif

#ifndef R_RISCV_SUB32
#define R_RISCV_SUB32 39
#endif

static void section_rela(const char *modname, struct elf_info *elf,
Elf_Shdr *sechdr)
{
Expand Down Expand Up @@ -1866,6 +1874,13 @@ static void section_rela(const char *modname, struct elf_info *elf,
r_sym = ELF_R_SYM(r.r_info);
#endif
r.r_addend = TO_NATIVE(rela->r_addend);
switch (elf->hdr->e_machine) {
case EM_RISCV:
if (!strcmp("__ex_table", fromsec) &&
ELF_R_TYPE(r.r_info) == R_RISCV_SUB32)
continue;
break;
}
sym = elf->symtab_start + r_sym;
/* Skip special sections */
if (is_shndx_special(sym->st_shndx))
Expand Down
2 changes: 1 addition & 1 deletion scripts/sorttable.c
Original file line number Diff line number Diff line change
Expand Up @@ -346,14 +346,14 @@ static int do_file(char const *const fname, void *addr)
case EM_PARISC:
case EM_PPC:
case EM_PPC64:
case EM_RISCV:
custom_sort = sort_relative_table;
break;
case EM_ARCOMPACT:
case EM_ARCV2:
case EM_ARM:
case EM_MICROBLAZE:
case EM_MIPS:
case EM_RISCV:
case EM_XTENSA:
break;
default:
Expand Down

0 comments on commit bb1f85d

Please sign in to comment.