Skip to content

Commit

Permalink
clean up pending NBLs in FNMP and FNLWF using RAII (#534)
Browse files Browse the repository at this point in the history
  • Loading branch information
@mtfriesen
mtfriesen committed Jun 7, 2024
1 parent df65771 commit 0f03e05
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 17 deletions.
2 changes: 1 addition & 1 deletion src/xdp.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<!-- Project-wide properties -->
<EbpfPackagePath>$(SolutionDir)packages\eBPF-for-Windows.0.15.1\</EbpfPackagePath>
<WiXPackagePath>$(SolutionDir)packages\wix.3.14.1\</WiXPackagePath>
<FnPackagePath>$(SolutionDir)artifacts\fn\devkit-0.4.1\</FnPackagePath>
<FnPackagePath>$(SolutionDir)artifacts\fn\devkit-0.4.3\</FnPackagePath>
</PropertyGroup>
<!-- The set of (eventually?) supported configurations -->
<ItemGroup Label="ProjectConfigurations">
Expand Down
58 changes: 43 additions & 15 deletions test/functional/lib/tests.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,13 +116,32 @@ static const XDP_HOOK_ID XdpInspectTxL2 =
C_ASSERT(POLL_INTERVAL_MS * 5 <= TEST_TIMEOUT_ASYNC_MS);
C_ASSERT(POLL_INTERVAL_MS * 5 <= std::chrono::milliseconds(MP_RESTART_TIMEOUT).count());

static
VOID
MpTxFilterReset(
_In_ const FNMP_HANDLE Handle
)
{
TEST_HRESULT(FnMpTxFilter(Handle, NULL, NULL, 0));
}

static
VOID
LwfRxFilterReset(
_In_ const FNLWF_HANDLE Handle
)
{
TEST_HRESULT(FnLwfRxFilter(Handle, NULL, NULL, 0));
}

template <typename T>
using unique_malloc_ptr = wistd::unique_ptr<T, wil::function_deleter<decltype(&::free), ::free>>;
using unique_xdp_api = wistd::unique_ptr<const XDP_API_TABLE, wil::function_deleter<decltype(&::XdpCloseApi), ::XdpCloseApi>>;
using unique_bpf_object = wistd::unique_ptr<bpf_object, wil::function_deleter<decltype(&::bpf_object__close), ::bpf_object__close>>;
using unique_fnmp_handle = wil::unique_any<FNMP_HANDLE, decltype(::FnMpClose), ::FnMpClose>;
using unique_fnlwf_handle = wil::unique_any<FNLWF_HANDLE, decltype(::FnLwfClose), ::FnLwfClose>;
using unique_fnmp_filter_handle = wil::unique_any<FNMP_HANDLE, decltype(::MpTxFilterReset), ::MpTxFilterReset>;
using unique_fnlwf_filter_handle = wil::unique_any<FNLWF_HANDLE, decltype(::LwfRxFilterReset), ::LwfRxFilterReset>;

static unique_xdp_api XdpApi;
static FNMP_LOAD_API_CONTEXT FnMpLoadApiContext;
Expand Down Expand Up @@ -1582,8 +1601,9 @@ RxInitializeFrame(
Frame->Frame.Buffers = &Frame->SingleBufferStorage;
}

[[nodiscard]]
static
VOID
unique_fnmp_filter_handle
MpTxFilter(
_In_ const unique_fnmp_handle &Handle,
_In_ const VOID *Pattern,
Expand All @@ -1592,6 +1612,8 @@ MpTxFilter(
)
{
TEST_HRESULT(FnMpTxFilter(Handle.get(), Pattern, Mask, Length));

return unique_fnmp_filter_handle(Handle.get());
}

static
Expand Down Expand Up @@ -1700,8 +1722,9 @@ LwfTxFlush(
TEST_HRESULT(Result);
}

[[nodiscard]]
static
VOID
unique_fnlwf_filter_handle
LwfRxFilter(
_In_ const unique_fnlwf_handle &Handle,
_In_ const VOID *Pattern,
Expand All @@ -1710,6 +1733,8 @@ LwfRxFilter(
)
{
TEST_HRESULT(FnLwfRxFilter(Handle.get(), Pattern, Mask, Length));

return unique_fnlwf_filter_handle(Handle.get());
}

static
Expand Down Expand Up @@ -4016,12 +4041,15 @@ GenericRxFragmentBuffer(
Ethernet->Destination = Ethernet->Source;
Ethernet->Source = TempAddress;

unique_fnlwf_filter_handle LwfFilter;
unique_fnmp_filter_handle MpFilter;

if (Params->IsTxInspect) {
LwfRxFilter(FnLwf, &L2FwdPacket[0], &Mask[0], (UINT32)L2FwdPacket.size());
LwfFilter = LwfRxFilter(FnLwf, &L2FwdPacket[0], &Mask[0], (UINT32)L2FwdPacket.size());
LwfTxFlush(FnLwf, &RxFlushOptions);
TxFrame = LwfRxAllocateAndGetFrame(FnLwf, 0);
} else {
MpTxFilter(GenericMp, &L2FwdPacket[0], &Mask[0], (UINT32)L2FwdPacket.size());
MpFilter = MpTxFilter(GenericMp, &L2FwdPacket[0], &Mask[0], (UINT32)L2FwdPacket.size());
MpRxFlush(GenericMp, &RxFlushOptions);
TxFrame = MpTxAllocateAndGetFrame(GenericMp, 0);
}
Expand Down Expand Up @@ -4553,7 +4581,7 @@ GenericRxEbpfDrop()
FnLwf = LwfOpenDefault(If.GetIfIndex());

std::vector<UCHAR> Mask(sizeof(Payload), 0xFF);
LwfRxFilter(FnLwf, Payload, &Mask[0], sizeof(Payload));
auto LwfFilter = LwfRxFilter(FnLwf, Payload, &Mask[0], sizeof(Payload));

RX_FRAME Frame;
RxInitializeFrame(&Frame, If.GetQueueId(), Payload, sizeof(Payload));
Expand Down Expand Up @@ -4582,7 +4610,7 @@ GenericRxEbpfPass()
FnLwf = LwfOpenDefault(If.GetIfIndex());

std::vector<UCHAR> Mask(sizeof(Payload), 0xFF);
LwfRxFilter(FnLwf, Payload, &Mask[0], sizeof(Payload));
auto LwfFilter = LwfRxFilter(FnLwf, Payload, &Mask[0], sizeof(Payload));

RX_FRAME Frame;
RxInitializeFrame(&Frame, If.GetQueueId(), Payload, sizeof(Payload));
Expand All @@ -4606,7 +4634,7 @@ GenericRxEbpfTx()
GenericMp = MpOpenGeneric(If.GetIfIndex());

std::vector<UCHAR> Mask(sizeof(Payload), 0xFF);
MpTxFilter(GenericMp, Payload, &Mask[0], sizeof(Payload));
auto MpFilter = MpTxFilter(GenericMp, Payload, &Mask[0], sizeof(Payload));

RX_FRAME Frame;
RxInitializeFrame(&Frame, If.GetQueueId(), Payload, sizeof(Payload));
Expand Down Expand Up @@ -4644,7 +4672,7 @@ GenericRxEbpfPayload()
&RemoteHw, AF_INET6, &LocalIp, &RemoteIp, LocalPort, RemotePort));

std::vector<UCHAR> Mask(UdpFrameLength, 0xFF);
LwfRxFilter(FnLwf, UdpFrame + Backfill, &Mask[0], UdpFrameLength);
auto LwfFilter = LwfRxFilter(FnLwf, UdpFrame + Backfill, &Mask[0], UdpFrameLength);

RX_FRAME Frame;
DATA_BUFFER Buffer = {0};
Expand Down Expand Up @@ -4747,7 +4775,7 @@ GenericRxEbpfIfIndex()
TEST_EQUAL(0, bpf_map_update_elem(interface_map_fd, &Zero, &IfIndex, BPF_ANY));

std::vector<UCHAR> Mask(sizeof(Payload), 0xFF);
LwfRxFilter(FnLwf, Payload, &Mask[0], sizeof(Payload));
auto LwfFilter = LwfRxFilter(FnLwf, Payload, &Mask[0], sizeof(Payload));

RX_FRAME Frame;
RxInitializeFrame(&Frame, If.GetQueueId(), Payload, sizeof(Payload));
Expand Down Expand Up @@ -4815,7 +4843,7 @@ GenericRxEbpfFragments()
RxInitializeFrame(&Frame, FnMpIf.GetQueueId(), Buffers, RTL_NUMBER_OF(Buffers));

std::vector<UCHAR> Mask(sizeof(Payload) - Backfill - Trailer, 0xFF);
LwfRxFilter(FnLwf, Payload + Backfill, &Mask[0], sizeof(Payload) - Backfill - Trailer);
auto LwfFilter = LwfRxFilter(FnLwf, Payload + Backfill, &Mask[0], sizeof(Payload) - Backfill - Trailer);

TEST_HRESULT(MpRxEnqueueFrame(GenericMp, &Frame));
MpRxFlush(GenericMp);
Expand Down Expand Up @@ -4907,7 +4935,7 @@ GenericTxSingleFrame()
UINT64 Pattern = 0xA5CC7729CE99C16Aui64;
UINT64 Mask = ~0ui64;

MpTxFilter(GenericMp, &Pattern, &Mask, sizeof(Pattern));
auto MpFilter = MpTxFilter(GenericMp, &Pattern, &Mask, sizeof(Pattern));

UINT16 FrameOffset = 13;
UCHAR Payload[] = "GenericTxSingleFrame";
Expand Down Expand Up @@ -4962,7 +4990,7 @@ GenericTxOutOfOrder()
UINT64 Pattern = 0x2865A18EE4DB02F0ui64;
UINT64 Mask = ~0ui64;

MpTxFilter(GenericMp, &Pattern, &Mask, sizeof(Pattern));
auto MpFilter = MpTxFilter(GenericMp, &Pattern, &Mask, sizeof(Pattern));

UINT16 FrameOffset = 13;
UCHAR Payload[] = "GenericTxOutOfOrder";
Expand Down Expand Up @@ -5027,7 +5055,7 @@ GenericTxSharing()
UINT64 Pattern = 0xA5CC7729CE99C16Aui64 + i;
UINT64 Mask = ~0ui64;

MpTxFilter(GenericMp, &Pattern, &Mask, sizeof(Pattern));
auto MpFilter = MpTxFilter(GenericMp, &Pattern, &Mask, sizeof(Pattern));

UINT16 FrameOffset = 13;
UCHAR Payload[] = "GenericTxSharing";
Expand Down Expand Up @@ -5083,7 +5111,7 @@ GenericTxPoke()
UINT64 Pattern = 0x4FA3DF603CC44911ui64;
UINT64 Mask = ~0ui64;

MpTxFilter(GenericMp, &Pattern, &Mask, sizeof(Pattern));
auto MpFilter = MpTxFilter(GenericMp, &Pattern, &Mask, sizeof(Pattern));

UINT16 FrameOffset = 13;
UCHAR Payload[] = "GenericTxPoke";
Expand Down Expand Up @@ -5971,7 +5999,7 @@ VerifyRssDatapath(
auto DefaultLwf = LwfOpenDefault(If.GetIfIndex());
UCHAR Pattern = 0x00;
UCHAR Mask = 0x00;
LwfRxFilter(DefaultLwf, &Pattern, &Mask, sizeof(Pattern));
auto LwfFilter = LwfRxFilter(DefaultLwf, &Pattern, &Mask, sizeof(Pattern));

IndicateOnAllActiveRssQueues(If, (UINT32)RssProcessors.size());

Expand Down
2 changes: 1 addition & 1 deletion tools/common.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ function Get-EbpfPackageUrl {
}

function Get-FnVersion {
return "0.4.1"
return "0.4.3"
}

function Get-FnDevKitUrl {
Expand Down

0 comments on commit 0f03e05

Please sign in to comment.