Skip to content

Update block along with the block cache #115

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

Merged
merged 1 commit into from
Jun 5, 2025
Merged

Update block along with the block cache #115

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
19 changes: 17 additions & 2 deletions libipt/src/pt_block_decoder.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@
static int pt_blk_proceed_trailing_event(struct pt_block_decoder *,
struct pt_block *);

static int pt_blk_proceed_no_event_cached(struct pt_block_decoder *,
struct pt_block *,
struct pt_block_cache *,
const struct pt_mapped_section *);

static int pt_blk_set_trig_anchor(struct pt_block_decoder *decoder)
{
if (!decoder)
Expand Down Expand Up @@ -2249,6 +2254,7 @@ pt_blk_proceed_no_event_fill_cache(struct pt_block_decoder *decoder,
uint64_t nip, dip, ioff, noff;
int64_t disp;
int status;
int fill_cache;

if (!decoder || !steps)
return -pte_internal;
Expand Down Expand Up @@ -2436,7 +2442,8 @@ pt_blk_proceed_no_event_fill_cache(struct pt_block_decoder *decoder,
* On our way back, we add a cache entry for this instruction based on
* the cache entry of the succeeding instruction.
*/
if (!pt_bce_is_valid(bce)) {
fill_cache = !pt_bce_is_valid(bce);
if (fill_cache) {
/* If we exceeded the maximum number of allowed steps, we insert
* a trampoline to the next instruction.
*
Expand Down Expand Up @@ -2515,7 +2522,15 @@ pt_blk_proceed_no_event_fill_cache(struct pt_block_decoder *decoder,
* Cache updates are atomic so even if the two versions were not
* identical, we wouldn't care because they are both correct.
*/
return pt_bcache_add(bcache, ioff, bce);
status = pt_bcache_add(bcache, ioff, bce);
if (status < 0)
return status;

/* Filling the cache may have extended @block, so we cannot proceed. */
if (fill_cache)
return status;

return pt_blk_proceed_no_event_cached(decoder, block, bcache, msec);
}

/* Proceed at a potentially truncated instruction.
Expand Down