mirror of
https://github.com/tangerineturtle1/NX2navi.git
synced 2026-11-20 01:49:59 -04:00
Make wb_lazy_unlocked = 0 bring back 0.10.1's locking in evictions and releases as well, which the review found it did not.
With the setting at 0, frz_lock was held across every fault's and release's fetch again and mem_thaw released under the lock, but two parts of the new code stayed. vk_memory.c mirror_evict and hot_check still fetched their victims' armed ranges before taking pool_lock again, and a release still put up to 16 copies in one submission. Those are the parts that run only with a device and have no check without one, so a device loss caused by them was the one case the switch could not take back. Now vk_memory.c reads the setting too (evict_unlocked, once on the replay thread, where both run): at 0 neither drops pool_lock, and the release under it fetches everything, victim by victim, as before. And memory.c lazy_take_batch_locked takes one segment at a time at 0, so each is fetched on its own. What stays at 0 is the table of ranges in flight: a touch of a range being fetched waits for that fetch and runs again (a write no longer goes on to thaw_fault and releases its region), the hold is set as the range goes out, and mem_lazy_touches counts the range. memory.c "Ranges in flight", nx2navi.ini.example and docs/building.md say so. tests/lazy_fetch_check.py gains locked_release, the release scenario at 0: three fetches of one copy each, where the batched release makes two of up to two copies. It fails with the cap taken out. The eviction's side has a compile check only. Not reproduced before the change; lazy_fetch_check passed in all its scenarios. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -331,7 +331,8 @@ int main(int argc, char **argv) {
|
||||
CHECK(fetch_calls == 2, "%d fetches", fetch_calls);
|
||||
} else if (!strcmp(what, "release")) {
|
||||
// A release of one buffer's ranges (a mirror eviction): one fetch of its two armed stale segments, and it
|
||||
// returns after the fetch another thread runs of its third; the other buffer's range stays armed.
|
||||
// returns after the fetch another thread runs of its third; the other buffer's range stays armed. With
|
||||
// NX2NAVI_WB_LAZY_UNLOCKED=0 each segment is fetched on its own, as in 0.10.1.
|
||||
uint64_t base = heap + 64 * M;
|
||||
uint64_t x1 = base, x2 = base + M, x3 = base + 3 * M, y = base + 2 * M;
|
||||
CHECK(arm_buf(x1, K64, 1) == K64 && arm_buf(x2, K64, 1) == K64 && arm_buf(x3, K64, 1) == K64, "arms of X");
|
||||
@@ -345,9 +346,10 @@ int main(int argc, char **argv) {
|
||||
CHECK(fe && now >= fe, "the release returned before the other thread's fetch of the buffer ended");
|
||||
CHECK(!armed(x1, K64) && !armed(x2, K64) && page_rw(x1) && page_rw(x2), "X still armed");
|
||||
CHECK(armed(y, K64), "Y was released");
|
||||
CHECK(fetch_batch_most == 2, "the release's fetch had %d copies", fetch_batch_most);
|
||||
CHECK(fetch_batch_most == (lz_unlocked ? 2 : 1), "the release's fetch had %d copies", fetch_batch_most);
|
||||
plat_thread_join(ta);
|
||||
CHECK(fetch_calls == 2 && fetch_copies == 3, "%d fetches of %d copies", fetch_calls, fetch_copies);
|
||||
CHECK(fetch_calls == (lz_unlocked ? 2 : 3) && fetch_copies == 3, "%d fetches of %d copies", fetch_calls,
|
||||
fetch_copies);
|
||||
} else if (!strcmp(what, "release_join")) {
|
||||
// a thread writes a range a release (a mirror eviction) is fetching: it waits for that fetch, its write
|
||||
// survives, one fetch in all
|
||||
|
||||
@@ -42,6 +42,7 @@ SCENARIOS = {
|
||||
'locked_join': ('join', LOCKED),
|
||||
'locked_loser': ('loser', LOCKED),
|
||||
'locked_arm_race': ('arm_race_slow', LOCKED),
|
||||
'locked_release': ('release', LOCKED),
|
||||
'report': ('report', {}),
|
||||
'flood': ('flood', {}),
|
||||
'freeze': ('freeze', {}),
|
||||
|
||||
Reference in New Issue
Block a user