dwarf_loader: Handle DW_AT_location attrs containing DW_OP_plus_uconst
PATCH 1/1 dwarf_loader: Handle DW_AT_location attrs containing DW_OP_plus_uconst
LLVM has a GlobalMerge pass, which tries to group multiple global variables together and address them with through a single register with offsets coded in instructions, to reduce register pressure. Address of symbols transformed by the pass may be represented by an DWARF expression consisting of DW_OP_addrx and DW_OP_plus_uconst, which naturally matches the way a merged variable is addressed.
However, our dwarf_loader currently ignores anything but the first in the location expression, including the DW_OP_plus_uconst atom, which appears the second operation in this case. This could result in broken BTF information produced by pahole, where several merged symbols are given the same offset, even though in fact they don't overlap.
LLVM has enabled MergeGlobal pass for PowerPC[1] and RISC-V[2] by default since version 20, let's handle DW_OP_plus_uconst operations in DW_AT_location attributes correctly to ensure correct BTF could be produced for LLVM-built kernels.
---
The problem is found by several distros building Linux kernel with LLVM and BTF enabled, after upgrading to LLVM 20 or later, kernels built for RISC-V and PowerPC issue errors like
[ 1.296358] BPF: type_id=4457 offset=4224 size=8 [ 1.296767] BPF: [ 1.296919] BPF: Invalid offset
on startup, and loading any modules fails with -EINVAL unless CONFIG_MODULE_ALLOW_BTF_MISMATCH is turned on,
# insmod tun.ko [ 12.892421] failed to validate module [tun] BTF: -22 [ 12.936971] failed to validate module [tun] BTF: -22 insmod: can't insert 'tun.ko': Invalid argument
By comparing DWARF dump and BTF dump, it's found BTF contains symbols with the same offset,
type_id=4148 offset=4208 size=8 (VAR 'vector_misaligned_access') type_id=4147 offset=4208 size=8 (VAR 'misaligned_access_speed')
while the same symbols are described with different DW_AT_location attributes,
0x0011ade7: DW_TAG_variable
DW_AT_name ("misaligned_access_speed")
DW_AT_type (0x0011adf2 "long")
DW_AT_decl_file ("...")
DW_AT_external (true)
DW_AT_decl_line (24)
DW_AT_location (DW_OP_addrx 0x0)...
0x0011adf6: DW_TAG_variable
DW_AT_name ("vector_misaligned_access")
DW_AT_type (0x0011adf2 "long")
DW_AT_external (true)
DW_AT_decl_file ("...")
DW_AT_decl_line (25)
DW_AT_location (DW_OP_addrx 0x0, DW_OP_plus_uconst 0x8)For more detailed analysis and kernel config for reproducing the issue, please refer to the Closes link. Thanks for your time and review.
dwarf_loader.c | 5 +++++ 1 file changed, 5 insertions(+)
dwarf_loader.c +5 -0
@@ -708,6 +708,11 @@ static enum vscope dwarf__location(Dwarf_Die *die, uint64_t *addr, struct locaticase DW_OP_addrx: scope =VSCOPE_GLOBAL ; *addr = expr[0 ].number; + +if (location->exprlen ==2 && + expr[1 ].atom == DW_OP_plus_uconst) + addr += expr[1 ].number; +break ; case DW_OP_reg1 ... DW_OP_reg31: case DW_OP_breg0 ... DW_OP_breg31:
Signature · 1 line
2.51.2
Yonghong Song
reviewerQuoted 80 lines · Yao Zi
LLVM has a GlobalMerge pass, which tries to group multiple global variables together and address them with through a single register with offsets coded in instructions, to reduce register pressure. Address of symbols transformed by the pass may be represented by an DWARF expression consisting of
DW_OP_addrxandDW_OP_plus_uconst, which naturally matches the way a merged variable is addressed.However, our
dwarf_loadercurrently ignores anything but the first in the location expression, including theDW_OP_plus_uconstatom, which appears the second operation in this case. This could result in broken BTF information produced by pahole, where several merged symbols are given the same offset, even though in fact they don't overlap.LLVM has enabled MergeGlobal pass for PowerPC[1] and RISC-V[2] by default since version 20, let's handle
DW_OP_plus_uconstoperations inDW_AT_locationattributes correctly to ensure correct BTF could be produced for LLVM-built kernels.Fixes a6ea527aab91 ("variable: Add ->addr member")Reported-by q66 <[email protected]>Signed-off-by Yao Zi <[email protected]>---
The problem is found by several distros building Linux kernel with LLVM and BTF enabled, after upgrading to LLVM 20 or later, kernels built for RISC-V and PowerPC issue errors like
[ 1.296358] BPF: type_id=4457 offset=4224 size=8 [ 1.296767] BPF: [ 1.296919] BPF: Invalid offseton startup, and loading any modules fails with
-EINVALunlessCONFIG_MODULE_ALLOW_BTF_MISMATCHis turned on,# insmod tun.ko [ 12.892421] failed to validate module [tun] BTF: -22 [ 12.936971] failed to validate module [tun] BTF: -22 insmod: can't insert 'tun.ko': Invalid argumentBy comparing DWARF dump and BTF dump, it's found BTF contains symbols with the same offset,
type_id=4148 offset=4208 size=8 (VAR '
vector_misaligned_access') type_id=4147 offset=4208 size=8 (VAR 'misaligned_access_speed')while the same symbols are described with different
DW_AT_locationattributes,
0x0011ade7:DW_TAG_variableDW_AT_name ("misaligned_access_speed") DW_AT_type (0x0011adf2 "long") DW_AT_decl_file ("...") DW_AT_external (true) DW_AT_decl_line (24) DW_AT_location (DW_OP_addrx 0x0)...
0x0011adf6:DW_TAG_variableDW_AT_name ("vector_misaligned_access") DW_AT_type (0x0011adf2 "long") DW_AT_external (true) DW_AT_decl_file ("...") DW_AT_decl_line (25) DW_AT_location (DW_OP_addrx 0x0, DW_OP_plus_uconst 0x8)For more detailed analysis and kernel config for reproducing the issue, please refer to the Closes link. Thanks for your time and review.
dwarf_loader.c | 5 +++++ 1 file changed, 5 insertions(+)dwarf_loader.c +0
-0
dwarf_loader.c static enum vscope dwarf__location(Dwarf_Die *die, uint64_t *addr, struct locati · line 714
Quoted 7 lines
dwarf_loader.c +4
-0@@ -708,6 +708,11 @@ static enum vscope dwarf__location(Dwarf_Die *die, uint64_t *addr, struct locaticase DW_OP_addrx: scope =VSCOPE_GLOBAL ; *addr = expr[0 ].number; + +if (location->exprlen ==2 && + expr[1 ].atom == DW_OP_plus_uconst) + addr += expr[1 ].number;
This does not work. 'addr' is the parameter and the above new 'addr' value won't pass back to caller so the above is effectively a noop.
I think we need to add an additional parameter to pass the 'expr[1].number' back to the caller, e.g.,
static enum vscope dwarf__location(Dwarf_Die *die, uint64_t *addr, uint32_t *offset, struct location *location) { ... }
and
in the above
*offset = expr[1].number.
Now the caller has the following information:
. The deference of *addr stores the index to .debug_addr . The offset to the address in .debug_addr
and the final address will be debug_addr[*addr] + offset.
Quoted 4 lines
dwarf_loader.c +1
-0+break ; case DW_OP_reg1 ... DW_OP_reg31: case DW_OP_breg0 ... DW_OP_breg31:
Hi Yonghong,
Sorry for the late reply,
Quoted 3 lines · Yonghong Song
On 11/29/25 7:21 PM, Yao Zi wrote:
...
Quoted 7 lines
Quoted 7 lines
dwarf_loader.c +0
-0@@ -708,6 +708,11 @@ static enum vscope dwarf__location(Dwarf_Die *die, uint64_t *addr, struct locaticase DW_OP_addrx: scope =VSCOPE_GLOBAL ;
Quoted 8 lines
dwarf_loader.c static enum vscope dwarf__location(Dwarf_Die *die, uint64_t *addr, struct locati · line 714
Quoted 5 lines
dwarf_loader.c +4
-0*addr = expr[0 ].number; + +if (location->exprlen ==2 && + expr[1 ].atom == DW_OP_plus_uconst) + addr += expr[1 ].number;This does not work. 'addr' is the parameter and the above new 'addr' value won't pass back to caller so the above is effectively a noop.
Oops, this is a silly problem.
Quoted 2 lines
I think we need to add an additional parameter to pass the 'expr[1].number' back to the caller, e.g.,
However, I don't think it's necessary. See my explanation below,
Quoted 9 lines
static enum vscope
dwarf__location(Dwarf_Die *die, uint64_t *addr, uint32_t *offset, struct location *location){ ... }and
in the above
*offset = expr[1].number.Now the caller has the following information:
. The deference of *addr stores the index to .debug_addr
No, dwarf__location() invokes attr_location(), which calls dwarf_getlocation() and dwarf_formaddr(), the latter already performs a lookup in .debug_addr[1], so what is stored in *addr is right the symbol address.
Thus I think it's enough to keep the signature, but add the offset to *addr.
Quoted 8 lines
. The offset to the address in .debug_addr
and the final address will be debug_addr[*addr] + offset.Quoted 4 lines
dwarf_loader.c +1
-0+break ; case DW_OP_reg1 ... DW_OP_reg31: case DW_OP_breg0 ... DW_OP_breg31:
Thanks for your review, I'll soon send a patch with the missing pointer dereference to addr added.
Best regards,
Yao Zi
Yonghong Song
reviewerQuoted 38 lines · Yao Zi
Hi Yonghong,
Sorry for the late reply,
Quoted 2 lines · Yonghong Song
On 11/29/25 7:21 PM, Yao Zi wrote:
...
Quoted 6 lines
Quoted 6 lines
dwarf_loader.c +0
-0@@ -708,6 +708,11 @@ static enum vscope dwarf__location(Dwarf_Die *die, uint64_t *addr, struct locaticase DW_OP_addrx:Quoted 8 lines
dwarf_loader.c static enum vscope dwarf__location(Dwarf_Die *die, uint64_t *addr, struct locati · line 714
Quoted 6 lines
dwarf_loader.c +4
-0scope =VSCOPE_GLOBAL ; *addr = expr[0 ].number; + +if (location->exprlen ==2 && + expr[1 ].atom == DW_OP_plus_uconst) + addr += expr[1 ].number;This does not work. 'addr' is the parameter and the above new 'addr' value won't pass back to caller so the above is effectively a noop.
Oops, this is a silly problem.
Quoted 2 lines
I think we need to add an additional parameter to pass the 'expr[1].number' back to the caller, e.g.,
However, I don't think it's necessary. See my explanation below,
Quoted 9 lines
static enum vscope
dwarf__location(Dwarf_Die *die, uint64_t *addr, uint32_t *offset, struct location *location){ ... }and
in the above
*offset = expr[1].number.Now the caller has the following information:
. The deference of *addr stores the index to .debug_addr
Quoted 7 lines
No,
dwarf__location()invokesattr_location(), which callsdwarf_getlocation()anddwarf_formaddr(), the latter already performs a lookup in .debug_addr[1], so what is stored in *addr is right the symbol address.Thus I think it's enough to keep the signature, but add the offset to *addr.
Indeed, this does make sense. Thanks for explanation.
Quoted 15 lines
Quoted 8 lines
. The offset to the address in .debug_addr
and the final address will be debug_addr[*addr] + offset.Quoted 4 lines
dwarf_loader.c +1
-0+break ; case DW_OP_reg1 ... DW_OP_reg31: case DW_OP_breg0 ... DW_OP_breg31:Thanks for your review, I'll soon send a patch with the missing pointer dereference to addr added.
Best regards,
Yao Zi