Files that changed from the base of the PR and between c50905b and 271112f.

• src/asm_files.cpp (7 hunks)
• src/test/test_verify.cpp (2 hunks)

src/test/test_verify.cpp (4)

79-82: LGTM: New macro for testing programs expected to fail verification.

The TEST_PROGRAM_REJECT macro is well-defined and consistent with the existing testing framework. It correctly sets up a test case for programs that should fail verification, which enhances the test coverage.

---

505-505: LGTM: New test case for subprogram expected to fail verification.

This test case correctly uses the new TEST_PROGRAM_REJECT macro to test the "plus1" subprogram, which is expected to fail verification. This adds valuable coverage to the test suite.

---

506-506: LGTM: New test case for subprogram expected to pass verification.

This test case appropriately uses the TEST_PROGRAM macro to test the "func" program, which is expected to pass verification. The comment clarifies that this subprogram can be called from the main program, explaining its expected behavior.

---

79-82: Summary: Enhancements to eBPF program verification testing.

The changes in this file improve the test coverage for eBPF program verification:

1. A new macro TEST_PROGRAM_REJECT has been added to facilitate testing of programs expected to fail verification.
2. Two new test cases have been added:
   • One using TEST_PROGRAM_REJECT to test a subprogram expected to fail verification.
   • Another using TEST_PROGRAM to test a subprogram expected to pass verification.

These additions enhance the robustness of the test suite by explicitly covering both positive and negative test scenarios for bpf2bpf calls across separate program objects.

Also applies to: 505-506

src/asm_files.cpp (3)

Line range hint 63-76: Consistent Type Usage for Index Parameter

The function get_symbol_name_and_section_index now uses ELFIO::Elf_Xword for the index parameter instead of ELFIO::Elf_Word. This change allows the function to handle larger symbol tables, which is consistent with the ELF64 specification and ensures correctness when processing files with a large number of symbols.

---

Line range hint 77-90: Update Index Parameter Type to ELFIO::Elf_Xword

The get_value function's index parameter has been updated from ELFIO::Elf_Word to ELFIO::Elf_Xword. This adjustment aligns with the changes made in get_symbol_name_and_section_index and ensures that the function can handle symbol tables with a larger number of entries, enhancing compatibility with ELF64 files.

---

411-421: Verify Correctness of prog_index Assignment

In the creation of function_relocation, prog_index is set using res.size() before prog is pushed into res:

function_relocation fr{.prog_index = res.size(), /* ... */ };

Since prog is added to res after this point, there is a possibility that prog_index might not correctly reference the current program.

Please confirm that res.size() accurately represents the index of the current prog. If not, consider adjusting the code to add prog to res before this assignment or modify prog_index accordingly.

Files that changed from the base of the PR and between 271112f and 6590861.

• src/asm_files.cpp (7 hunks)

src/asm_files.cpp (3)

202-207: Declaration of function_relocation struct is appropriate

The new struct function_relocation neatly encapsulates the data required for queuing function relocations, enhancing code clarity and maintainability.

---

443-450: Logic for appending subprograms is correctly implemented

The append_subprograms function appropriately processes function relocations and appends subprograms to ensure that all calls are resolved within the same program for verification.

---

Line range hint 63-77: Verify usage of updated function parameter types

The functions get_symbol_name_and_section_index and get_value now have the index parameter type changed from ELFIO::Elf_Word to ELFIO::Elf_Xword. Ensure that all calls to these functions throughout the codebase are updated to use ELFIO::Elf_Xword to prevent potential type mismatches or truncation.

Run the following script to find and review all usages:

Files that changed from the base of the PR and between 6590861 and b08a7cb.

• src/asm_files.cpp (7 hunks)

src/asm_files.cpp (5)

209-229: append_subprogram Function Implementation

The append_subprogram function correctly locates and appends the subprogram instructions to the main program. The checks for zero-size subprograms and proper error handling are appropriate.

---

231-259: Efficient Management of Function Relocations in append_subprograms

The append_subprograms function efficiently handles function relocations and ensures that each subprogram is appended only once. The use of subprogram_offsets to track appended subprograms improves performance by avoiding duplicate processing.

---

421-428: Confirm Correctness of Function Relocation Handling

The code queues up function relocations for local call instructions. Ensure that the relocation_entry_index corresponds correctly to the target function, and that the function name resolution is accurate.

---

445-445: Avoid Storing References in Containers

The segment_to_program map stores references to raw_program objects:

std::map<std::string, raw_program&> segment_to_program;

Storing references in standard containers can lead to dangling references if the referenced objects are moved or if the container is copied. Consider storing pointers or indices instead to ensure the references remain valid.

---

379-384: ⚠️ Potential issue

Remove Unused Variable subprograms

The variable subprograms is declared and program_name is inserted into it, but it is not used elsewhere in the code. This unused variable can be safely removed to clean up the code.

Apply this diff to remove the unused variable:

-                std::set<string> subprograms{};
-                subprograms.insert(program_name);

Likely invalid or redundant comment.

Files that changed from the base of the PR and between b08a7cb and f005051.

• src/asm_files.cpp (7 hunks)

src/asm_files.cpp (3)

202-209: Well-documented function_relocation structure

The added documentation above the function_relocation struct definition enhances code readability and maintainability.

---

63-63: Consistency in ELFIO Types for Symbol Indices

The functions get_symbol_name_and_section_index and get_value now use ELFIO::Elf_Xword for the index parameter, supporting larger symbol tables. This change improves compatibility with ELF files containing more symbols.

Also applies to: 77-77

---

253-258: Check for Potential Integer Overflow in Offset Calculation

The code correctly checks for overflow when calculating offset_diff:

int64_t offset_diff = (int64_t)(target_offset - reloc.source_offset - 1);
if (offset_diff < INT32_MIN || offset_diff > INT32_MAX) {
    throw std::runtime_error("Offset difference out of int32_t range for instruction at source offset " +
                             std::to_string(reloc.source_offset));
}
prog.prog[reloc.source_offset].imm = (int32_t)offset_diff;

This ensures that the cast to int32_t is safe and prevents potential errors.