fix: read the paged-out session back from zram after a resume (#1839)

This commit is contained in:
l4nr3 authored and GitHub committed 2026-11-01 00:24:04 -04:00
1 parent 901c453c16
commit 3fc80a03d9
3 files changed
+207 -1

No files matched your search

@@ -88,6 +88,105 @@ class SessionSuspendControllerTest {
assertTrue(disabled.pagedOut.isEmpty())
}
@Test fun resumeReadsThePagedOutMemoryBack() {
val fixture = fixture(17)
fixture.control.writeText("0")
fixture.controller.freeze(pageOut = true) { assertTrue(it) }
val before = fixture.signals.size
fixture.controller.resume { assertTrue(it) }
val resumed = fixture.signals.drop(before)
assertEquals(listOf(GAME), resumed.filter { it.signal == URG }.map { it.pid })
assertTrue(resumed.indexOfLast { it.signal == CONT } < resumed.indexOfFirst { it.signal == URG })
assertEquals("0", fixture.control.readText())
assertEquals(listOf(Triple(1, 0L, 3_000_000L)), fixture.pagedIn)
assertTrue(fixture.game.threads.all { it.state == 'S' })
val again = fixture.signals.size
fixture.controller.freeze { assertTrue(it) }
fixture.controller.resume { assertTrue(it) }
assertFalse(fixture.signals.drop(again).any { it.signal == URG })
assertEquals(1, fixture.pagedIn.size)
}
@Test fun noReadBackAfterAFreezeWithoutPageOut() {
val fixture = fixture(17)
fixture.control.writeText("0")
fixture.controller.freeze { assertTrue(it) }
fixture.controller.resume { assertTrue(it) }
assertFalse(fixture.signals.any { it.signal == URG })
assertTrue(fixture.pagedIn.isEmpty())
}
@Test fun readBackIsSkippedWhenAvailableMemoryCannotTakeIt() {
val fixture = fixture(17)
fixture.control.writeText("0")
fixture.availableKb = 3_500_000L
fixture.controller.freeze(pageOut = true) { assertTrue(it) }
val before = fixture.signals.size
fixture.controller.resume { assertTrue(it) }
assertFalse(fixture.signals.drop(before).any { it.signal == URG })
assertEquals("1", fixture.control.readText())
assertEquals(listOf(Triple(0, 3_000_000L, 3_000_000L)), fixture.pagedIn)
}
@Test fun readBackNeedsTwiceTheSwapAvailable() {
val fixture = fixture(17)
fixture.control.writeText("0")
fixture.availableKb = 5_500_000L
fixture.controller.freeze(pageOut = true) { assertTrue(it) }
val before = fixture.signals.size
fixture.controller.resume { assertTrue(it) }
assertFalse(fixture.signals.drop(before).any { it.signal == URG })
assertEquals(listOf(Triple(0, 3_000_000L, 3_000_000L)), fixture.pagedIn)
}
@Test fun readBackKeepsATenthOfMemTotalAvailable() {
val fixture = fixture(17)
fixture.control.writeText("0")
fixture.totalKb = 40_000_000L
fixture.availableKb = 6_500_000L
fixture.controller.freeze(pageOut = true) { assertTrue(it) }
val before = fixture.signals.size
fixture.controller.resume { assertTrue(it) }
assertFalse(fixture.signals.drop(before).any { it.signal == URG })
assertEquals(listOf(Triple(0, 3_000_000L, 3_000_000L)), fixture.pagedIn)
}
@Test fun noReadBackWithARamCap() {
val fixture = fixture(17)
fixture.control.writeText("0")
fixture.readBackAllowed = false
fixture.controller.freeze(pageOut = true) { assertTrue(it) }
val before = fixture.signals.size
fixture.controller.resume { assertTrue(it) }
assertFalse(fixture.signals.drop(before).any { it.signal == URG })
assertEquals("1", fixture.control.readText())
assertEquals(listOf(Triple(0, 3_000_000L, 3_000_000L)), fixture.pagedIn)
}
@Test fun cancelledFreezeReadsBackWhatThePageOutAlreadyMoved() {
val fixture = fixture(17)
fixture.control.writeText("0")
fixture.afterSleep = { if (fixture.now >= 200 && fixture.signals.none { it.signal == STOP }) fixture.controller.cancelFreeze() }
fixture.controller.freeze(pageOut = true) { assertFalse(it) }
assertFalse(fixture.signals.any { it.signal == STOP })
assertEquals(2, fixture.signals.count { it.signal == URG })
assertEquals("0", fixture.control.readText())
assertEquals(1, fixture.pagedIn.single().first)
assertEquals(0L, fixture.pagedIn.single().second)
assertTrue(fixture.pagedIn.single().third > 0L)
}
@Test fun cancelledFreezeLeavesAPendingPageOutHandlerReadingBack() {
val fixture = fixture(17)
fixture.control.writeText("0")
fixture.handlerStalls = true
fixture.afterSleep = { if (fixture.now >= 500) fixture.controller.cancelFreeze() }
fixture.controller.freeze(pageOut = true) { assertFalse(it) }
assertEquals(2, fixture.signals.count { it.signal == URG })
assertEquals("0", fixture.control.readText())
assertEquals(Triple(1, 0L, 0L), fixture.pagedIn.single())
}
@Test fun cpuMustBeStableAcrossTwoCompleteSnapshots() {
val fixture = fixture(17)
var changes = 0
@@ -380,9 +479,14 @@ class SessionSuspendControllerTest {
val clock = File(tmp, ".bl-clock")
var clockAtContinue: Long? = null
val pagedOut = mutableListOf<Triple<Int, Long, Long>>()
val pagedIn = mutableListOf<Triple<Int, Long, Long>>()
var availableKb = 8_000_000L
var totalKb = 16_000_000L
var readBackAllowed = true
private var gameResidentKb = 4_000_000L
private var gameSwapKb = 0L
private var pagingOut = false
private var pagingIn = false
var unacknowledged = -1
var handlerStalls = false
var handlerReplaced = false
@@ -397,6 +501,8 @@ class SessionSuspendControllerTest {
pagedOut += Triple(processes, resident, swap)
this.unacknowledged = unacknowledged
},
readBackAllowed = { readBackAllowed },
pagedIn = { processes, swap, swapBefore, _, _ -> pagedIn += Triple(processes, swap, swapBefore) },
)
init { sync() }
@@ -411,7 +517,7 @@ class SessionSuspendControllerTest {
it.state !in listOf('T', 't', 'Z', 'X') && !(neverStop && it == game.threads.last())
}?.state = 't'
} else if (signal == URG) {
pagingOut = true
if (control.readText() == "0") { pagingOut = false; pagingIn = true } else pagingOut = true
} else if (signal == CONT) {
if (clockAtContinue == null && clock.isFile) {
clockAtContinue = ByteBuffer.wrap(clock.readBytes()).order(ByteOrder.LITTLE_ENDIAN).long
@@ -445,6 +551,12 @@ class SessionSuspendControllerTest {
pagingOut = false
}
}
if (pagingIn) {
val moved = minOf(gameSwapKb, 1_000_000L)
gameSwapKb -= moved
gameResidentKb += moved
if (gameSwapKb == 0L) pagingIn = false
}
if (root.threads.first().state != 'T' && !continuing) game.threads.forEach {
if (it.state != 'Z') { it.state = 'S'; it.cpu++ }
}
@@ -453,6 +565,7 @@ class SessionSuspendControllerTest {
}
fun sync() {
File(proc, "meminfo").writeText("MemTotal:\t$totalKb kB\nMemFree:\t1000 kB\nMemAvailable:\t$availableKb kB\n")
for (group in groups) {
val dir = File(proc, group.pid.toString())
if (group == root && rootGone) { dir.deleteRecursively(); continue }