Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-30 09:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NDIS]

Browse source 
- Make NdisMAllocateSharedMemoryAsync and NdisMFreeSharedMemory safe to call at IRQL <= DISPATCH_LEVEL

svn path=/trunk/; revision=54557
This commit is contained in:
Cameron Gutman 2011-12-01 22:31:54 +00:00
parent eb9eb149da
commit 0cc9adb789
2 changed files with 28 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/drivers/network/ndis/include/miniport.h
View file

@ -71,7 +71,7 @@ typedef struct _MINIPORT_SHARED_MEMORY {
BOOLEAN Cached;
PNDIS_MINIPORT_BLOCK Adapter;
PVOID Context;
PKEVENT Event;
PIO_WORKITEM WorkItem;
} MINIPORT_SHARED_MEMORY, *PMINIPORT_SHARED_MEMORY;
/* A structure of WrapperConfigurationContext (not compatible with the

47
reactos/drivers/network/ndis/ndis/memory.c
View file

@ -188,6 +188,7 @@ NdisMAllocateSharedMemory(
VOID
NTAPI
NdisMFreeSharedMemoryPassive(
PDEVICE_OBJECT DeviceObject,
PVOID Context)
/*
* FUNCTION: Free a common buffer
@ -198,7 +199,6 @@ NdisMFreeSharedMemoryPassive(
*/
{
PMINIPORT_SHARED_MEMORY Memory = (PMINIPORT_SHARED_MEMORY)Context;
PRKEVENT Event = Memory->Event;
NDIS_DbgPrint(MAX_TRACE, ("Called.\n"));
@ -208,11 +208,8 @@ NdisMFreeSharedMemoryPassive(
Memory->AdapterObject, Memory->Length, Memory->PhysicalAddress,
Memory->VirtualAddress, Memory->Cached);
IoFreeWorkItem(Memory->WorkItem);
ExFreePool(Memory);
KeSetEvent(Event,
IO_NO_INCREMENT,
FALSE);
}
@ -240,10 +237,8 @@ NdisMFreeSharedMemory(
* Therefore we have to do this in a worker thread.
*/
{
HANDLE ThreadHandle;
PLOGICAL_ADAPTER Adapter = (PLOGICAL_ADAPTER)MiniportAdapterHandle;
PMINIPORT_SHARED_MEMORY Memory;
KEVENT Event;
NDIS_DbgPrint(MAX_TRACE,("Called.\n"));
@ -258,29 +253,31 @@ NdisMFreeSharedMemory(
return;
}
KeInitializeEvent(&Event, NotificationEvent, FALSE);
Memory->AdapterObject = Adapter->NdisMiniportBlock.SystemAdapterObject;
Memory->Length = Length;
Memory->PhysicalAddress = PhysicalAddress;
Memory->VirtualAddress = VirtualAddress;
Memory->Cached = Cached;
Memory->Adapter = &Adapter->NdisMiniportBlock;
Memory->Event = &Event;
PsCreateSystemThread(&ThreadHandle, THREAD_ALL_ACCESS, 0, 0, 0, NdisMFreeSharedMemoryPassive, Memory);
ZwClose(ThreadHandle);
Memory->WorkItem = IoAllocateWorkItem(Adapter->NdisMiniportBlock.DeviceObject);
if (!Memory->WorkItem)
{
NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources\n"));
ExFreePool(Memory);
return;
}
KeWaitForSingleObject(&Event,
Executive,
KernelMode,
FALSE,
NULL);
IoQueueWorkItem(Memory->WorkItem,
NdisMFreeSharedMemoryPassive,
CriticalWorkQueue,
Memory);
}
VOID
NTAPI
NdisMAllocateSharedMemoryPassive(
PDEVICE_OBJECT DeviceObject,
PVOID Context)
/*
* FUNCTION: Allocate a common buffer
@ -304,6 +301,7 @@ NdisMAllocateSharedMemoryPassive(
Memory->Adapter->MiniportAdapterContext, Memory->VirtualAddress,
&Memory->PhysicalAddress, Memory->Length, Memory->Context);
IoFreeWorkItem(Memory->WorkItem);
ExFreePool(Memory);
}
@ -319,7 +317,6 @@ NdisMAllocateSharedMemoryAsync(
IN BOOLEAN Cached,
IN PVOID Context)
{
HANDLE ThreadHandle;
PLOGICAL_ADAPTER Adapter = (PLOGICAL_ADAPTER)MiniportAdapterHandle;
PMINIPORT_SHARED_MEMORY Memory;
@ -342,8 +339,18 @@ NdisMAllocateSharedMemoryAsync(
Memory->Adapter = &Adapter->NdisMiniportBlock;
Memory->Context = Context;
PsCreateSystemThread(&ThreadHandle, THREAD_ALL_ACCESS, 0, 0, 0, NdisMAllocateSharedMemoryPassive, Memory);
ZwClose(ThreadHandle);
Memory->WorkItem = IoAllocateWorkItem(Adapter->NdisMiniportBlock.DeviceObject);
if (!Memory->WorkItem)
{
NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources\n"));
ExFreePool(Memory);
return NDIS_STATUS_FAILURE;
}
IoQueueWorkItem(Memory->WorkItem,
NdisMAllocateSharedMemoryPassive,
DelayedWorkQueue,
Memory);
return NDIS_STATUS_PENDING;
}