Hesham/wintun
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revise TunCompleteRequest() and make it universal

Browse Source 
TunCompleteRequest() no longer sets Information field in IRP and allows
to specify custom priority boost. This makes it suitable replacement for
all "set status; complete request; release remove lock"-tuples
throughout the code.

Functional changes in this patch:

- We no longer reset Information field to 0 for canceled IRPs. In other
  words: ReadFile() of a canceled IRP will get the number of bytes read
  before request was canceled in the lpNumberOfBytesRead, instead of
  always 0.

- After write is complete, we boost user thread priority by +2
  (IO_NETWORK_INCREMENT).

Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
Simon Rozman 2019-05-31 12:49:31 +02:00 committed by Jason A. Donenfeld
parent b9d0b301b8
commit c19da2a99e
1 changed files with 11 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
wintun.c
View File

@ -150,12 +150,11 @@ static void TunIndicateStatus(_In_ NDIS_HANDLE MiniportAdapterHandle, _In_ NDIS_
} }
_IRQL_requires_max_(DISPATCH_LEVEL) _IRQL_requires_max_(DISPATCH_LEVEL)
static void TunCompleteRequest(_Inout_ TUN_CTX *ctx, _Inout_ IRP *Irp, _In_ ULONG_PTR Information, _In_ NTSTATUS Status) static void TunCompleteRequest(_Inout_ TUN_CTX *ctx, _Inout_ IRP *irp, _In_ NTSTATUS status, _In_ CCHAR priority_boost)
{ {
Irp->IoStatus.Information = Information; irp->IoStatus.Status = status;
Irp->IoStatus.Status = Status; IoCompleteRequest(irp, priority_boost);
IoCompleteRequest(Irp, IO_NO_INCREMENT); IoReleaseRemoveLock(&ctx->Device.RemoveLock, irp);
IoReleaseRemoveLock(&ctx->Device.RemoveLock, Irp);
} }
_IRQL_requires_same_ _IRQL_requires_same_
@ -251,7 +250,7 @@ _Use_decl_annotations_
static VOID TunCsqCompleteCanceledIrp(IO_CSQ *Csq, IRP *Irp) static VOID TunCsqCompleteCanceledIrp(IO_CSQ *Csq, IRP *Irp)
{ {
TUN_CTX *ctx = CONTAINING_RECORD(Csq, TUN_CTX, Device.ReadQueue.Csq); TUN_CTX *ctx = CONTAINING_RECORD(Csq, TUN_CTX, Device.ReadQueue.Csq);
TunCompleteRequest(ctx, Irp, 0, STATUS_CANCELLED); TunCompleteRequest(ctx, Irp, STATUS_CANCELLED, IO_NO_INCREMENT);
} }
_IRQL_requires_same_ _IRQL_requires_same_
@ -328,9 +327,7 @@ retry:
NTSTATUS status = TunGetIrpBuffer(irp, buffer, size); NTSTATUS status = TunGetIrpBuffer(irp, buffer, size);
if (!NT_SUCCESS(status)) { if (!NT_SUCCESS(status)) {
irp->IoStatus.Status = status; TunCompleteRequest(ctx, irp, status, IO_NO_INCREMENT);
IoCompleteRequest(irp, IO_NO_INCREMENT);
IoReleaseRemoveLock(&ctx->Device.RemoveLock, irp);
goto retry; goto retry;
} }
@ -572,9 +569,7 @@ static void TunQueueProcess(_Inout_ TUN_CTX *ctx)
irp = NULL; irp = NULL;
} }
} else { } else {
irp->IoStatus.Status = STATUS_SUCCESS; TunCompleteRequest(ctx, irp, STATUS_SUCCESS, IO_NETWORK_INCREMENT);
IoCompleteRequest(irp, IO_NETWORK_INCREMENT);
IoReleaseRemoveLock(&ctx->Device.RemoveLock, irp);
irp = NULL; irp = NULL;
} }
@ -798,7 +793,7 @@ static NTSTATUS TunDispatch(DEVICE_OBJECT *DeviceObject, IRP *Irp)
case IRP_MJ_CLEANUP: case IRP_MJ_CLEANUP:
for (IRP *pending_irp; (pending_irp = IoCsqRemoveNextIrp(&ctx->Device.ReadQueue.Csq, stack->FileObject)) != NULL; ) for (IRP *pending_irp; (pending_irp = IoCsqRemoveNextIrp(&ctx->Device.ReadQueue.Csq, stack->FileObject)) != NULL; )
TunCompleteRequest(ctx, pending_irp, 0, STATUS_CANCELLED); TunCompleteRequest(ctx, pending_irp, STATUS_CANCELLED, IO_NO_INCREMENT);
status = STATUS_SUCCESS; status = STATUS_SUCCESS;
goto cleanup_complete_req; goto cleanup_complete_req;
@ -809,9 +804,7 @@ static NTSTATUS TunDispatch(DEVICE_OBJECT *DeviceObject, IRP *Irp)
} }
cleanup_complete_req_and_release_remove_lock: cleanup_complete_req_and_release_remove_lock:
Irp->IoStatus.Status = status; TunCompleteRequest(ctx, Irp, status, IO_NO_INCREMENT);
IoCompleteRequest(Irp, IO_NO_INCREMENT);
IoReleaseRemoveLock(&ctx->Device.RemoveLock, Irp);
return status; return status;
cleanup_complete_req: cleanup_complete_req:
@ -873,7 +866,7 @@ static void TunReturnNetBufferLists(NDIS_HANDLE MiniportAdapterContext, PNET_BUF
NdisFreeNetBufferList(nbl); NdisFreeNetBufferList(nbl);
if (InterlockedDecrement64(IRP_REFCOUNT(irp)) <= 0) { if (InterlockedDecrement64(IRP_REFCOUNT(irp)) <= 0) {
TunCompleteRequest(ctx, irp, irp->IoStatus.Information, STATUS_SUCCESS); TunCompleteRequest(ctx, irp, STATUS_SUCCESS, IO_NETWORK_INCREMENT);
TunCompletePause(ctx, TRUE); TunCompletePause(ctx, TRUE);
} }
} }
@ -1287,7 +1280,7 @@ static void TunHaltEx(NDIS_HANDLE MiniportAdapterContext, NDIS_HALT_ACTION HaltA
} }
for (IRP *pending_irp; (pending_irp = IoCsqRemoveNextIrp(&ctx->Device.ReadQueue.Csq, NULL)) != NULL;) for (IRP *pending_irp; (pending_irp = IoCsqRemoveNextIrp(&ctx->Device.ReadQueue.Csq, NULL)) != NULL;)
TunCompleteRequest(ctx, pending_irp, 0, STATUS_FILE_FORCED_CLOSED); TunCompleteRequest(ctx, pending_irp, STATUS_FILE_FORCED_CLOSED, IO_NO_INCREMENT);
if (InterlockedGet64(&ctx->Device.RefCount)) if (InterlockedGet64(&ctx->Device.RefCount))
TunForceHandlesClosed(ctx); TunForceHandlesClosed(ctx);