mirror of
https://github.com/MobileGL-Dev/MobileGL
synced 2026-11-19 16:01:57 +09:00
[MG_Remote, MG_Test] (P7): pin the ended-control-stream note with a half-close case in fuzz arm 3
This commit is contained in:
@@ -94,10 +94,10 @@ namespace MobileGL::MG_Remote::Client {
|
|||||||
|
|
||||||
// PH-6's fuzz arm 3 ONLY (EventForfeitPeerTest): the control stream, so a peer that has
|
// PH-6's fuzz arm 3 ONLY (EventForfeitPeerTest): the control stream, so a peer that has
|
||||||
// stopped draining can still put on it the frames no ClientSession path would send at that
|
// stopped draining can still put on it the frames no ClientSession path would send at that
|
||||||
// moment - a malformed one, or a surface op queued behind a wait it did not drain for.
|
// moment - a malformed one, a surface op queued behind a wait it did not drain for, or a
|
||||||
// Every production path that writes control holds
|
// half-close. Every production path that writes control holds m_remoteControlMutex and
|
||||||
// m_remoteControlMutex and drains first; a caller of this does neither, which is the point.
|
// drains first; a caller of this does neither, which is the point. Null unless spawned.
|
||||||
Transport::ITransport* ControlTransportForTest() { return m_transport; }
|
Transport::SocketTransport* ControlSocketForTest() { return m_socketTransport.get(); }
|
||||||
|
|
||||||
// CONTRACT-P6 4.3: THE PID THE SERVER STATED IN ITS Welcome, which is not the same fact
|
// CONTRACT-P6 4.3: THE PID THE SERVER STATED IN ITS Welcome, which is not the same fact
|
||||||
// as the pid this session's launcher recorded - that one is local knowledge, this one
|
// as the pid this session's launcher recorded - that one is local knowledge, this one
|
||||||
|
|||||||
@@ -28,16 +28,19 @@
|
|||||||
// (the event bytes cross the data connection, the peer's drain is a progress frame it never
|
// (the event bytes cross the data connection, the peer's drain is a progress frame it never
|
||||||
// sends). Each plane runs in its own ctest entry under its own lane label.
|
// sends). Each plane runs in its own ctest entry under its own lane label.
|
||||||
//
|
//
|
||||||
// THE SCENARIOS (the last four are the PH-6 fix round's):
|
// THE SCENARIOS (all but the first are the PH-6 fix round's):
|
||||||
// * the peer stops draining and stays - NotDraining after the knob;
|
// * the peer stops draining and stays - NotDraining after the knob;
|
||||||
// * the peer is KILLED while the server waits, with a knob longer than ServerLoop::Stop()'s
|
// * the peer is KILLED while the server waits, with a knob longer than ServerLoop::Stop()'s
|
||||||
// 5000 ms join - PeerGone well inside the knob, exit 0. The control EOF reaches ServerMain,
|
// 5000 ms join - PeerGone well inside the knob, exit 0 (whichever of the data bell's death and
|
||||||
// which says so to the session and stops the loop; the reservation's wait ends on that stop;
|
// the control EOF's stop reaches the waiting apply thread first);
|
||||||
// * the same kill with a SURFACE OP QUEUED behind the wait - ServerMain is then blocked in the
|
// * the same kill with a SURFACE OP QUEUED behind the wait - ServerMain is then blocked in the
|
||||||
// apply thread's mailbox and cannot see the EOF, so only the data bell can report the death:
|
// apply thread's mailbox and cannot see the EOF, so only the data bell can report the death:
|
||||||
// on the shm plane that is the server bell's death witness on the control socket;
|
// on the shm plane that is the server bell's death witness on the control socket;
|
||||||
// * the peer stays but its control stream ENDS (a malformed frame) while the server waits -
|
// * the peer stays but its control stream ENDS (a malformed frame) while the server waits -
|
||||||
// `Stopped`, at once, exit 0, instead of Stop()'s join running out under the long knob;
|
// `Stopped`, at once, exit 0, instead of Stop()'s join running out under the long knob;
|
||||||
|
// * the peer HALF-CLOSES control (ClientSession::Stop's step 2) and keeps its data connection -
|
||||||
|
// PeerGone, at once: on the stream plane only ServerMain's note that the control stream ended
|
||||||
|
// can say so, because the data bell is still alive;
|
||||||
// * the shm plane's server started by Server::LaunchServer, the launcher that SCRUBS the child's
|
// * the shm plane's server started by Server::LaunchServer, the launcher that SCRUBS the child's
|
||||||
// MOBILEGL_IPC_* - the knob must survive the scrub (ServerSpawn.cpp's allow-list).
|
// MOBILEGL_IPC_* - the knob must survive the scrub (ServerSpawn.cpp's allow-list).
|
||||||
// Every knob here is NOT the default (2000), and every forfeit line is read for the value it
|
// Every knob here is NOT the default (2000), and every forfeit line is read for the value it
|
||||||
@@ -342,6 +345,8 @@ namespace {
|
|||||||
KilledWhileWaiting, // SIGKILLed while the server waits: PeerGone, at once
|
KilledWhileWaiting, // SIGKILLed while the server waits: PeerGone, at once
|
||||||
KilledWithAControlOpQueued, // the same, with a surface op stuck behind the wait
|
KilledWithAControlOpQueued, // the same, with a surface op stuck behind the wait
|
||||||
ControlEndsWhileWaiting, // the peer stays; its control stream ends: Stopped, at once
|
ControlEndsWhileWaiting, // the peer stays; its control stream ends: Stopped, at once
|
||||||
|
ControlHalfClosedWhileWaiting, // the peer half-closes control (a teardown's first act),
|
||||||
|
// data still open: PeerGone, at once
|
||||||
};
|
};
|
||||||
|
|
||||||
// A surface op the server's control loop has to post into the apply thread's mailbox - and
|
// A surface op the server's control loop has to post into the apply thread's mailbox - and
|
||||||
@@ -354,7 +359,7 @@ namespace {
|
|||||||
frame.display = 0x4d47;
|
frame.display = 0x4d47;
|
||||||
flatbuffers::FlatBufferBuilder builder(256);
|
flatbuffers::FlatBufferBuilder builder(256);
|
||||||
if (EncodeSurfaceOpFrame(frame, &builder) != SurfaceWireError::None) return false;
|
if (EncodeSurfaceOpFrame(frame, &builder) != SurfaceWireError::None) return false;
|
||||||
auto* control = client.ControlTransportForTest();
|
auto* control = client.ControlSocketForTest();
|
||||||
return control != nullptr &&
|
return control != nullptr &&
|
||||||
control->SendFrame(MobileGLByteSpan{builder.GetBufferPointer(), builder.GetSize()}) == MOBILEGL_OK;
|
control->SendFrame(MobileGLByteSpan{builder.GetBufferPointer(), builder.GetSize()}) == MOBILEGL_OK;
|
||||||
}
|
}
|
||||||
@@ -363,7 +368,7 @@ namespace {
|
|||||||
// (P7 wave 0's named refusal) - a control stream that ENDS while the peer is still there.
|
// (P7 wave 0's named refusal) - a control stream that ENDS while the peer is still there.
|
||||||
bool SendMalformedControlFrame(Client::ClientSession& client) {
|
bool SendMalformedControlFrame(Client::ClientSession& client) {
|
||||||
static const std::uint8_t kJunk[4] = {0xde, 0xad, 0xbe, 0xef};
|
static const std::uint8_t kJunk[4] = {0xde, 0xad, 0xbe, 0xef};
|
||||||
auto* control = client.ControlTransportForTest();
|
auto* control = client.ControlSocketForTest();
|
||||||
return control != nullptr && control->SendFrame(MobileGLByteSpan{kJunk, sizeof(kJunk)}) == MOBILEGL_OK;
|
return control != nullptr && control->SendFrame(MobileGLByteSpan{kJunk, sizeof(kJunk)}) == MOBILEGL_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -380,10 +385,21 @@ namespace {
|
|||||||
if (filled != kChildOk) ::_exit(filled);
|
if (filled != kChildOk) ::_exit(filled);
|
||||||
const char one = 1;
|
const char one = 1;
|
||||||
(void)::write(published, &one, 1);
|
(void)::write(published, &one, 1);
|
||||||
if (scenario == Scenario::KilledWithAControlOpQueued || scenario == Scenario::ControlEndsWhileWaiting) {
|
if (scenario == Scenario::KilledWithAControlOpQueued || scenario == Scenario::ControlEndsWhileWaiting ||
|
||||||
|
scenario == Scenario::ControlHalfClosedWhileWaiting) {
|
||||||
std::this_thread::sleep_for(std::chrono::milliseconds(kRawFrameAfterMs));
|
std::this_thread::sleep_for(std::chrono::milliseconds(kRawFrameAfterMs));
|
||||||
const bool sent = scenario == Scenario::KilledWithAControlOpQueued ? SendSurfaceOpBehindTheWait(client)
|
bool sent = false;
|
||||||
: SendMalformedControlFrame(client);
|
if (scenario == Scenario::KilledWithAControlOpQueued) {
|
||||||
|
sent = SendSurfaceOpBehindTheWait(client);
|
||||||
|
} else if (scenario == Scenario::ControlEndsWhileWaiting) {
|
||||||
|
sent = SendMalformedControlFrame(client);
|
||||||
|
} else {
|
||||||
|
// ClientSession::Stop's step 2, alone: the control stream's write half closes, the
|
||||||
|
// process and its data connection stay. The server sees EOF on control and nothing
|
||||||
|
// at all on the data plane.
|
||||||
|
auto* socket = client.ControlSocketForTest();
|
||||||
|
sent = socket != nullptr && socket->ShutdownSend() == MOBILEGL_OK;
|
||||||
|
}
|
||||||
if (!sent) ::_exit(kRawFrame);
|
if (!sent) ::_exit(kRawFrame);
|
||||||
}
|
}
|
||||||
char go = 0;
|
char go = 0;
|
||||||
@@ -442,6 +458,7 @@ namespace {
|
|||||||
case Scenario::KilledWhileWaiting: return "kill";
|
case Scenario::KilledWhileWaiting: return "kill";
|
||||||
case Scenario::KilledWithAControlOpQueued: return "kill-op";
|
case Scenario::KilledWithAControlOpQueued: return "kill-op";
|
||||||
case Scenario::ControlEndsWhileWaiting: return "ctl-end";
|
case Scenario::ControlEndsWhileWaiting: return "ctl-end";
|
||||||
|
case Scenario::ControlHalfClosedWhileWaiting: return "ctl-half";
|
||||||
}
|
}
|
||||||
return "?";
|
return "?";
|
||||||
}
|
}
|
||||||
@@ -527,8 +544,12 @@ namespace {
|
|||||||
// swallowed Stop()'s ring and waited on, and after 5000 ms the child died of
|
// swallowed Stop()'s ring and waited on, and after 5000 ms the child died of
|
||||||
// Fatal{ApplyThreadJoinTimeout} (`reaped signal=6 sessionsFaulted=1`); at a knob under
|
// Fatal{ApplyThreadJoinTimeout} (`reaped signal=6 sessionsFaulted=1`); at a knob under
|
||||||
// the join it was reported as NotDraining after the whole knob.
|
// the join it was reported as NotDraining after the whole knob.
|
||||||
const char* expected = killed ? "ReverseChannelForfeit{PeerGone} - kEventBufferWriteback"
|
// A half-closed control stream is the peer LEAVING - ServerMain says so to the session
|
||||||
: "ReverseChannelForfeit{Stopped} - kEventBufferWriteback";
|
// before it stops the loop, so it is PeerGone even on the stream plane, whose data bell
|
||||||
|
// is still alive; a malformed frame from a peer that stays is a stop.
|
||||||
|
const char* expected = scenario == Scenario::ControlEndsWhileWaiting
|
||||||
|
? "ReverseChannelForfeit{Stopped} - kEventBufferWriteback"
|
||||||
|
: "ReverseChannelForfeit{PeerGone} - kEventBufferWriteback";
|
||||||
auto endedAt = std::chrono::steady_clock::now();
|
auto endedAt = std::chrono::steady_clock::now();
|
||||||
if (killed) {
|
if (killed) {
|
||||||
std::this_thread::sleep_for(std::chrono::milliseconds(kKillAfterMs));
|
std::this_thread::sleep_for(std::chrono::milliseconds(kKillAfterMs));
|
||||||
@@ -698,6 +719,10 @@ TEST(EventForfeitPeer, ShmControlStreamThatEndsWhileTheServerWaitsStopsTheWaitBy
|
|||||||
RunArm(false, Scenario::ControlEndsWhileWaiting);
|
RunArm(false, Scenario::ControlEndsWhileWaiting);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
TEST(EventForfeitPeer, ShmControlHalfClosedWhileTheServerWaitsIsPeerGone) {
|
||||||
|
RunArm(false, Scenario::ControlHalfClosedWhileWaiting);
|
||||||
|
}
|
||||||
|
|
||||||
TEST(EventForfeitPeer, ShmLaunchedServerTakesTheWaitKnobThroughTheScrubbedEnvironment) { RunLaunchedArm(); }
|
TEST(EventForfeitPeer, ShmLaunchedServerTakesTheWaitKnobThroughTheScrubbedEnvironment) { RunLaunchedArm(); }
|
||||||
|
|
||||||
TEST(EventForfeitPeer, StreamPeerThatStopsDrainingIsForfeitedAndTheNextConnectionIsWelcomed) {
|
TEST(EventForfeitPeer, StreamPeerThatStopsDrainingIsForfeitedAndTheNextConnectionIsWelcomed) {
|
||||||
@@ -716,4 +741,8 @@ TEST(EventForfeitPeer, StreamControlStreamThatEndsWhileTheServerWaitsStopsTheWai
|
|||||||
RunArm(true, Scenario::ControlEndsWhileWaiting);
|
RunArm(true, Scenario::ControlEndsWhileWaiting);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
TEST(EventForfeitPeer, StreamControlHalfClosedWhileTheServerWaitsIsPeerGone) {
|
||||||
|
RunArm(true, Scenario::ControlHalfClosedWhileWaiting);
|
||||||
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
Reference in New Issue
Block a user