• Masahiro Yamada's avatar
    modpost: fix section_mismatch message for R_ARM_THM_{CALL,JUMP24,JUMP19} · 3310bae8
    Masahiro Yamada authored
    addend_arm_rel() processes R_ARM_THM_CALL, R_ARM_THM_JUMP24,
    R_ARM_THM_JUMP19 in a wrong way.
    
    Here, test code.
    
    [test code for R_ARM_THM_JUMP24]
    
      .section .init.text,"ax"
      bar:
              bx      lr
    
      .section .text,"ax"
      .globl foo
      foo:
              b       bar
    
    [test code for R_ARM_THM_CALL]
    
      .section .init.text,"ax"
      bar:
              bx      lr
    
      .section .text,"ax"
      .globl foo
      foo:
              push    {lr}
              bl      bar
              pop     {pc}
    
    If you compile it with CONFIG_THUMB2_KERNEL=y, modpost will show the
    symbol name, (unknown).
    
      WARNING: modpost: vmlinux.o: section mismatch in reference: foo (section: .text) -> (unknown) (section: .init.text)
    
    (You need to use GNU linker instead of LLD to reproduce it.)
    
    Fix the code to make modpost show the correct symbol name. I checked
    arch/arm/kernel/module.c to learn the encoding of R_ARM_THM_CALL and
    R_ARM_THM_JUMP24. The module does not support R_ARM_THM_JUMP19, but
    I checked its encoding in ARM ARM.
    
    The '+4' is the compensation for pc-relative instruction. It is
    documented in "ELF for the Arm Architecture" [1].
    
      "If the relocation is pc-relative then compensation for the PC bias
      (the PC value is 8 bytes ahead of the executing instruction in Arm
      state and 4 bytes in Thumb state) must be encoded in the relocation
      by the object producer."
    
    [1]: https://github.com/ARM-software/abi-aa/blob/main/aaelf32/aaelf32.rst
    
    Fixes: c9698e5c ("ARM: 7964/1: Detect section mismatches in thumb relocations")
    Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
    3310bae8
modpost.c 57 KB