Skip to content

AMDGPU: harden hotswap ELF growth and descriptors #3145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
harsh-amd wants to merge 1 commit into
base: users/harsh/comgr-hotswap-redundancy-cleanup
Choose a base branch
from
Open

AMDGPU: harden hotswap ELF growth and descriptors #3145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 13 additions & 11 deletions amd/comgr/src/comgr-hotswap-b0a0.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,23 +475,25 @@ fixupTrampolineBranches(std::vector<Trampoline> &Trampolines, uint8_t *Text,
}

/// Fix up DWARF sections of the grown ELF after trampolines have been
/// appended: adds trampoline symbols to the symbol table, shifts
/// .debug_line / .debug_ranges / .debug_info / .debug_frame addresses by
/// the total trampoline footprint, and reports per-section failures via
/// log(). Individual patchDebug* helpers are weak stubs here; concrete
/// appended. \p SymbolTrampolines contains only B0/A0 trampolines that
/// correspond to rewritten source instructions and therefore may get
/// trampoline symbols / line entries. \p TextGrowthBytes is the full .text
/// growth, including entry stubs and padding, used to shift post-.text debug
/// addresses. Individual patchDebug* helpers are weak stubs here; concrete
/// implementations land in separate PRs.
static void patchDebugSections(WritableMemoryBuffer &ElfBuf,
ArrayRef<Trampoline> Trampolines,
const ElfView &Elf, size_t GrowthTotal) {
ArrayRef<Trampoline> SymbolTrampolines,
const ElfView &Elf, size_t TextGrowthBytes) {
uint8_t *Data = reinterpret_cast<uint8_t *>(ElfBuf.getBufferStart());
size_t Size = ElfBuf.getBufferSize();
if (!addTrampolineSymbols(ElfBuf, Trampolines, Elf.textSize(),
if (!addTrampolineSymbols(ElfBuf, SymbolTrampolines, Elf.textSize(),
Elf.textSectionIndex()))
log() << "hotswap: error: addTrampolineSymbols failed\n";
patchDebugRanges(Data, Size, Elf.textAddr(), Elf.textSize(), GrowthTotal);
patchDebugInfo(Data, Size, Elf.textAddr(), Elf.textSize(), GrowthTotal);
patchDebugFrame(Data, Size, Elf.textAddr(), Elf.textSize(), GrowthTotal);
if (!patchDebugLine(ElfBuf, Trampolines, Elf.textSize(), Elf.textAddr()))
patchDebugRanges(Data, Size, Elf.textAddr(), Elf.textSize(), TextGrowthBytes);
patchDebugInfo(Data, Size, Elf.textAddr(), Elf.textSize(), TextGrowthBytes);
patchDebugFrame(Data, Size, Elf.textAddr(), Elf.textSize(), TextGrowthBytes);
if (!patchDebugLine(ElfBuf, SymbolTrampolines, Elf.textSize(),
Elf.textAddr()))
log() << "hotswap: error: patchDebugLine failed\n";
}

Expand Down
Loading