Use per-protocol NBL lists on write
Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
parent
9504191ba0
commit
3306c6ec6c
90
wintun.c
90
wintun.c
@ -611,89 +611,109 @@ static NTSTATUS TunWriteFromIrp(_Inout_ TUN_CTX *ctx, _Inout_ IRP *Irp)
|
|||||||
goto cleanup_TunCompletePause;
|
goto cleanup_TunCompletePause;
|
||||||
|
|
||||||
const UCHAR *b = buffer, *b_end = buffer + size;
|
const UCHAR *b = buffer, *b_end = buffer + size;
|
||||||
LONG nbl_count = 0;
|
typedef enum _ethtypeidx_t {
|
||||||
NET_BUFFER_LIST *nbl_head = NULL, *nbl_tail = NULL;
|
ethtypeidx_ipv4 = 0, ethtypeidx_start = 0,
|
||||||
|
ethtypeidx_ipv6,
|
||||||
|
ethtypeidx_end
|
||||||
|
} ethtypeidx_t;
|
||||||
|
static const struct {
|
||||||
|
ULONG nbl_flags;
|
||||||
|
USHORT nbl_proto;
|
||||||
|
} ether_const[ethtypeidx_end] = {
|
||||||
|
{ NDIS_NBL_FLAGS_IS_IPV4, NDIS_ETH_TYPE_IPV4 },
|
||||||
|
{ NDIS_NBL_FLAGS_IS_IPV6, NDIS_ETH_TYPE_IPV6 },
|
||||||
|
};
|
||||||
|
struct {
|
||||||
|
NET_BUFFER_LIST *head, *tail;
|
||||||
|
LONG count;
|
||||||
|
} nbl_queue[ethtypeidx_end] = {
|
||||||
|
{ NULL, NULL, 0 },
|
||||||
|
{ NULL, NULL, 0 }
|
||||||
|
};
|
||||||
while (b + sizeof(TUN_PACKET) <= b_end) {
|
while (b + sizeof(TUN_PACKET) <= b_end) {
|
||||||
if (nbl_count >= MAXLONG) {
|
if (nbl_queue[ethtypeidx_ipv4].count + nbl_queue[ethtypeidx_ipv6].count >= MAXLONG) {
|
||||||
status = STATUS_INVALID_USER_BUFFER;
|
status = STATUS_INVALID_USER_BUFFER;
|
||||||
goto cleanup_nbl_head;
|
goto cleanup_nbl_queues;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
TUN_PACKET *p = (TUN_PACKET *)b;
|
TUN_PACKET *p = (TUN_PACKET *)b;
|
||||||
if (p->Size > TUN_EXCH_MAX_IP_PACKET_SIZE) {
|
if (p->Size > TUN_EXCH_MAX_IP_PACKET_SIZE) {
|
||||||
status = STATUS_INVALID_USER_BUFFER;
|
status = STATUS_INVALID_USER_BUFFER;
|
||||||
goto cleanup_nbl_head;
|
goto cleanup_nbl_queues;
|
||||||
}
|
}
|
||||||
UINT p_size = TunPacketAlign(sizeof(TUN_PACKET) + p->Size);
|
UINT p_size = TunPacketAlign(sizeof(TUN_PACKET) + p->Size);
|
||||||
if (b + p_size > b_end) {
|
if (b + p_size > b_end) {
|
||||||
status = STATUS_INVALID_USER_BUFFER;
|
status = STATUS_INVALID_USER_BUFFER;
|
||||||
goto cleanup_nbl_head;
|
goto cleanup_nbl_queues;
|
||||||
}
|
}
|
||||||
|
|
||||||
ULONG nbl_flags;
|
ethtypeidx_t idx;
|
||||||
USHORT nbl_proto;
|
if (p->Size >= 20 && p->Data[0] >> 4 == 4)
|
||||||
if (p->Size >= 20 && p->Data[0] >> 4 == 4) {
|
idx = ethtypeidx_ipv4;
|
||||||
nbl_flags = NDIS_NBL_FLAGS_IS_IPV4;
|
else if (p->Size >= 40 && p->Data[0] >> 4 == 6)
|
||||||
nbl_proto = NDIS_ETH_TYPE_IPV4;
|
idx = ethtypeidx_ipv6;
|
||||||
} else if (p->Size >= 40 && p->Data[0] >> 4 == 6) {
|
else {
|
||||||
nbl_flags = NDIS_NBL_FLAGS_IS_IPV6;
|
|
||||||
nbl_proto = NDIS_ETH_TYPE_IPV6;
|
|
||||||
} else {
|
|
||||||
status = STATUS_INVALID_USER_BUFFER;
|
status = STATUS_INVALID_USER_BUFFER;
|
||||||
goto cleanup_nbl_head;
|
goto cleanup_nbl_queues;
|
||||||
}
|
}
|
||||||
|
|
||||||
MDL *mdl = NdisAllocateMdl(ctx->MiniportAdapterHandle, p->Data, p->Size);
|
MDL *mdl = NdisAllocateMdl(ctx->MiniportAdapterHandle, p->Data, p->Size);
|
||||||
if (!mdl) {
|
if (!mdl) {
|
||||||
status = STATUS_INSUFFICIENT_RESOURCES;
|
status = STATUS_INSUFFICIENT_RESOURCES;
|
||||||
goto cleanup_nbl_head;
|
goto cleanup_nbl_queues;
|
||||||
}
|
}
|
||||||
|
|
||||||
NET_BUFFER_LIST *nbl = NdisAllocateNetBufferAndNetBufferList(ctx->NBLPool, 0, 0, mdl, 0, p->Size);
|
NET_BUFFER_LIST *nbl = NdisAllocateNetBufferAndNetBufferList(ctx->NBLPool, 0, 0, mdl, 0, p->Size);
|
||||||
if (!nbl) {
|
if (!nbl) {
|
||||||
NdisFreeMdl(mdl);
|
NdisFreeMdl(mdl);
|
||||||
status = STATUS_INSUFFICIENT_RESOURCES;
|
status = STATUS_INSUFFICIENT_RESOURCES;
|
||||||
goto cleanup_nbl_head;
|
goto cleanup_nbl_queues;
|
||||||
}
|
}
|
||||||
|
|
||||||
nbl->SourceHandle = ctx->MiniportAdapterHandle;
|
nbl->SourceHandle = ctx->MiniportAdapterHandle;
|
||||||
NdisSetNblFlag(nbl, nbl_flags);
|
NdisSetNblFlag(nbl, ether_const[idx].nbl_flags);
|
||||||
NET_BUFFER_LIST_INFO(nbl, NetBufferListFrameType) = (PVOID)TunHtons(nbl_proto);
|
NET_BUFFER_LIST_INFO(nbl, NetBufferListFrameType) = (PVOID)TunHtons(ether_const[idx].nbl_proto);
|
||||||
NET_BUFFER_LIST_STATUS(nbl) = NDIS_STATUS_SUCCESS;
|
NET_BUFFER_LIST_STATUS(nbl) = NDIS_STATUS_SUCCESS;
|
||||||
NET_BUFFER_LIST_IRP(nbl) = Irp;
|
NET_BUFFER_LIST_IRP(nbl) = Irp;
|
||||||
TunAppendNBL(&nbl_head, &nbl_tail, nbl);
|
TunAppendNBL(&nbl_queue[idx].head, &nbl_queue[idx].tail, nbl);
|
||||||
nbl_count++;
|
nbl_queue[idx].count++;
|
||||||
b += p_size;
|
b += p_size;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((ULONG)(b - buffer) != size) {
|
if ((ULONG)(b - buffer) != size) {
|
||||||
status = STATUS_INVALID_USER_BUFFER;
|
status = STATUS_INVALID_USER_BUFFER;
|
||||||
goto cleanup_nbl_head;
|
goto cleanup_nbl_queues;
|
||||||
}
|
}
|
||||||
Irp->IoStatus.Information = size;
|
Irp->IoStatus.Information = size;
|
||||||
|
|
||||||
if (!nbl_head) {
|
if (!nbl_queue[ethtypeidx_ipv4].head && !nbl_queue[ethtypeidx_ipv6].head) {
|
||||||
status = STATUS_SUCCESS;
|
status = STATUS_SUCCESS;
|
||||||
goto cleanup_TunCompletePause;
|
goto cleanup_TunCompletePause;
|
||||||
}
|
}
|
||||||
|
|
||||||
InterlockedExchange(IRP_REFCOUNT(Irp), nbl_count);
|
InterlockedExchange(IRP_REFCOUNT(Irp), nbl_queue[ethtypeidx_ipv4].count + nbl_queue[ethtypeidx_ipv6].count);
|
||||||
IoMarkIrpPending(Irp);
|
IoMarkIrpPending(Irp);
|
||||||
|
|
||||||
NdisMIndicateReceiveNetBufferLists(ctx->MiniportAdapterHandle, nbl_head, NDIS_DEFAULT_PORT_NUMBER, nbl_count, 0);
|
if (nbl_queue[ethtypeidx_ipv4].head)
|
||||||
|
NdisMIndicateReceiveNetBufferLists(ctx->MiniportAdapterHandle, nbl_queue[ethtypeidx_ipv4].head, NDIS_DEFAULT_PORT_NUMBER, nbl_queue[ethtypeidx_ipv4].count, NDIS_RECEIVE_FLAGS_SINGLE_ETHER_TYPE);
|
||||||
|
if (nbl_queue[ethtypeidx_ipv6].head)
|
||||||
|
NdisMIndicateReceiveNetBufferLists(ctx->MiniportAdapterHandle, nbl_queue[ethtypeidx_ipv6].head, NDIS_DEFAULT_PORT_NUMBER, nbl_queue[ethtypeidx_ipv6].count, NDIS_RECEIVE_FLAGS_SINGLE_ETHER_TYPE);
|
||||||
ExReleaseSpinLockShared(&ctx->TransitionLock, irql);
|
ExReleaseSpinLockShared(&ctx->TransitionLock, irql);
|
||||||
return STATUS_PENDING;
|
return STATUS_PENDING;
|
||||||
|
|
||||||
cleanup_nbl_head:
|
cleanup_nbl_queues:
|
||||||
for (NET_BUFFER_LIST *nbl = nbl_head, *nbl_next; nbl; nbl = nbl_next) {
|
for (ethtypeidx_t idx = ethtypeidx_start; idx < ethtypeidx_end; idx++) {
|
||||||
nbl_next = NET_BUFFER_LIST_NEXT_NBL(nbl);
|
for (NET_BUFFER_LIST *nbl = nbl_queue[idx].head, *nbl_next; nbl; nbl = nbl_next) {
|
||||||
NET_BUFFER_LIST_NEXT_NBL(nbl) = NULL;
|
nbl_next = NET_BUFFER_LIST_NEXT_NBL(nbl);
|
||||||
NdisFreeMdl(NET_BUFFER_FIRST_MDL(NET_BUFFER_LIST_FIRST_NB(nbl)));
|
NET_BUFFER_LIST_NEXT_NBL(nbl) = NULL;
|
||||||
NdisFreeNetBufferList(nbl);
|
NdisFreeMdl(NET_BUFFER_FIRST_MDL(NET_BUFFER_LIST_FIRST_NB(nbl)));
|
||||||
|
NdisFreeNetBufferList(nbl);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
cleanup_TunCompletePause:
|
cleanup_TunCompletePause:
|
||||||
TunCompletePause(ctx, TRUE);
|
TunCompletePause(ctx, TRUE);
|
||||||
ExReleaseSpinLockShared(&ctx->TransitionLock, irql);
|
ExReleaseSpinLockShared(&ctx->TransitionLock, irql);
|
||||||
|
TunCompleteRequest(ctx, Irp, status, IO_NO_INCREMENT);
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -772,9 +792,7 @@ static NTSTATUS TunDispatch(DEVICE_OBJECT *DeviceObject, IRP *Irp)
|
|||||||
!NT_SUCCESS(status = IoAcquireRemoveLock(&ctx->Device.RemoveLock, Irp)))
|
!NT_SUCCESS(status = IoAcquireRemoveLock(&ctx->Device.RemoveLock, Irp)))
|
||||||
goto cleanup_complete_req;
|
goto cleanup_complete_req;
|
||||||
|
|
||||||
if ((status = TunWriteFromIrp(ctx, Irp)) == STATUS_PENDING)
|
return TunWriteFromIrp(ctx, Irp);
|
||||||
return STATUS_PENDING;
|
|
||||||
goto cleanup_complete_req_and_release_remove_lock;
|
|
||||||
|
|
||||||
case IRP_MJ_CREATE:
|
case IRP_MJ_CREATE:
|
||||||
if ((status = STATUS_DELETE_PENDING, InterlockedGet((LONG *)&ctx->State) < TUN_STATE_PAUSED) ||
|
if ((status = STATUS_DELETE_PENDING, InterlockedGet((LONG *)&ctx->State) < TUN_STATE_PAUSED) ||
|
||||||
|
Loading…
Reference in New Issue
Block a user