Skip to content

Add Cibir tests to Connection Pool tests #4952

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 6 commits into from
Apr 2, 2025
Merged

Add Cibir tests to Connection Pool tests #4952

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9c89862
!!DON'T MERGE!! Add Cibir tests to Connection Pool tests
anrossi Mar 27, 2025
030a846
Add server-side CIBIR support
anrossi Mar 29, 2025
961421b
fix naming
anrossi Mar 29, 2025
c9a345c
Go back to TestConnection and see if that fixes the issue
anrossi Mar 29, 2025
ac5c981
Fix connection pool tests to set configuration on server side accept.
anrossi Apr 1, 2025
de71b76
Simplify test code
anrossi Apr 1, 2025
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
3 changes: 2 additions & 1 deletion src/test/bin/quic_gtest.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,14 +353,15 @@ struct HandshakeArgs12 {
::std::vector<HandshakeArgs12> list;
for (int Family : { 4, 6 })
for (uint16_t NumberOfConnections : { 1, 2, 4 })
for (bool TestCibir : { false, true })
for (bool XdpSupported : { false, true }) {
#if !defined(_WIN32)
if (XdpSupported) continue;
#endif
if (!UseDuoNic && XdpSupported) {
continue;
}
list.push_back({ Family, NumberOfConnections, XdpSupported, false /*Don't test CIBIR*/ });
list.push_back({ Family, NumberOfConnections, XdpSupported, TestCibir });
}
return list;
}
Expand Down
70 changes: 15 additions & 55 deletions src/test/lib/HandshakeTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4100,36 +4100,8 @@ QuicTestHandshakeSpecificLossPatterns(
}
}

struct ServerMultiAcceptContext {
uint32_t StartedConnectionCount;
uint32_t MaxConnections;
CxPlatEvent StartedEvent;
UniquePtr<TestConnection>* Connections;

_Function_class_(NEW_CONNECTION_CALLBACK)
static
bool
ListenerMultiAcceptConnection(
_In_ TestListener* Listener,
_In_ HQUIC ConnectionHandle
)
{
auto* This = (ServerMultiAcceptContext*)Listener->Context;
uint32_t NewCount = (uint32_t)InterlockedIncrement((long*)&This->StartedConnectionCount);
if (NewCount > This->MaxConnections) {
TEST_FAILURE("Too many connections started!");
return false;
}
This->Connections[NewCount - 1] =
UniquePtr<TestConnection>(new(std::nothrow) TestConnection(ConnectionHandle, nullptr));
if (This->StartedConnectionCount == This->MaxConnections) {
This->StartedEvent.Set();
}
return true;
}
};

struct ConnectionPoolConnectionContext {
CxPlatEvent ConnectedEvent;
uint16_t IdealProcessor;
uint16_t PartitionIndex;
bool Connected;
Expand All @@ -4139,6 +4111,7 @@ struct ConnectionPoolConnectionContext {
switch (Event->Type) {
case QUIC_CONNECTION_EVENT_CONNECTED:
This->Connected = true;
This->ConnectedEvent.Set();
break;
case QUIC_CONNECTION_EVENT_IDEAL_PROCESSOR_CHANGED:
This->IdealProcessor = Event->IDEAL_PROCESSOR_CHANGED.IdealProcessor;
Expand Down Expand Up @@ -4169,7 +4142,7 @@ QuicTestConnectionPoolCreate(
MsQuicAlpn Alpn("MsQuicTest");

MsQuicSettings Settings;
Settings.SetIdleTimeoutMs(1000);
Settings.SetIdleTimeoutMs(TestWaitTimeout);
Settings.SetPeerBidiStreamCount(1);

MsQuicConfiguration ServerConfiguration(Registration, Alpn, Settings, ServerSelfSignedCredConfig);
Expand All @@ -4181,16 +4154,9 @@ QuicTestConnectionPoolCreate(
QuicAddr ServerAddr(QuicAddrFamily);
if (XdpSupported) {
QuicAddrSetToDuoNic(&ServerAddr.SockAddr);
} else {
QuicAddrSetToLoopback(&ServerAddr.SockAddr);
}
const uint16_t ServerPort = 4433;
ServerAddr.SetPort(ServerPort);

{
UniquePtrArray<UniquePtr<TestConnection>> ServerConnections(new(std::nothrow) UniquePtr<TestConnection>[NumberOfConnections]);
TEST_NOT_EQUAL(nullptr, ServerConnections);

UniquePtrArray<ConnectionScope> Connections(new(std::nothrow) ConnectionScope[NumberOfConnections]);
TEST_NOT_EQUAL(nullptr, Connections);

Expand All @@ -4207,14 +4173,15 @@ QuicTestConnectionPoolCreate(
Contexts[i].PartitionIndex = 0;
}

ServerMultiAcceptContext ServerAcceptContext {};
ServerAcceptContext.MaxConnections = NumberOfConnections;
ServerAcceptContext.Connections = ServerConnections.get();
ServerAcceptContext.StartedConnectionCount = 0;
TestListener Listener(Registration, ServerMultiAcceptContext::ListenerMultiAcceptConnection, ServerConfiguration);
TEST_TRUE(Listener.IsValid());
Listener.Context = &ServerAcceptContext;
TEST_QUIC_SUCCEEDED(Listener.Start(Alpn, &ServerAddr.SockAddr));
MsQuicAutoAcceptListener Listener(Registration, ServerConfiguration, MsQuicConnection::NoOpCallback);
TEST_QUIC_SUCCEEDED(Listener.GetInitStatus());

if (TestCibirSupport) {
TEST_QUIC_SUCCEEDED(Listener.SetCibirId(CibirId, CibirIdLength));
}

TEST_QUIC_SUCCEEDED(Listener.Start(Alpn, ServerAddr));
TEST_QUIC_SUCCEEDED(Listener.GetLocalAddr(ServerAddr));

{
UniquePtrArray<uint8_t*> CibirIdPtrs(new(std::nothrow) uint8_t*[NumberOfConnections]);
Expand All @@ -4229,7 +4196,7 @@ QuicTestConnectionPoolCreate(
if (XdpSupported) {
PoolConfig.ServerAddress = &ServerAddr.SockAddr;
}
PoolConfig.ServerPort = ServerPort;
PoolConfig.ServerPort = ServerAddr.GetPort();
PoolConfig.Context = (void**)ContextPtrs.get();
PoolConfig.Family = QuicAddrFamily;
PoolConfig.NumberOfConnections = NumberOfConnections;
Expand All @@ -4238,7 +4205,6 @@ QuicTestConnectionPoolCreate(
if (TestCibirSupport) {
for (uint32_t i = 0; i < NumberOfConnections; i++) {
CxPlatCopyMemory(&(CibirIdBuffer[i * CibirIdLength]), CibirId, CibirIdLength);
CibirIdBuffer[(i * CibirIdLength) + (CibirIdLength - 1)] += (uint8_t)i;
CibirIdPtrs[i] = &CibirIdBuffer[i * CibirIdLength];
}
PoolConfig.CibirIds = CibirIdPtrs.get();
Expand All @@ -4248,22 +4214,16 @@ QuicTestConnectionPoolCreate(
QUIC_STATUS Status = MsQuic->ConnectionPoolCreate(&PoolConfig, &(Connections.get()->Handle));
if (XdpSupported) {
TEST_QUIC_SUCCEEDED(Status);
ServerAcceptContext.StartedEvent.WaitForever();
for (uint32_t i = 0; i < NumberOfConnections; i++) {
//
// Verify the server connections are connected. The client connections should also be connected too.
//
ServerConnections[i]->WaitForConnectionComplete();
if (!ServerConnections[i]->GetIsConnected()) {
TEST_FAILURE("Server connection %u failed to connect", i);
}
//
// Verify the client connection is connected.
//
Contexts[i].ConnectedEvent.WaitTimeout(TestWaitTimeout);
if (!Contexts[i].Connected) {
TEST_FAILURE("Client connection %u failed to connect", i);
}
}
TEST_EQUAL(NumberOfConnections, Listener.AcceptedConnectionCount);
} else {
//
// When testing no XDP support, the loopback address is used,
Expand Down
Loading