Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-23 08:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Patch by Cameron Gutman (aicommander <at> gmail <dot> com)

Browse source 
- Reenable spinlocks in MiniIndicateData
- Don't raise IRQL when calling MiniDoRequest

svn path=/trunk/; revision=34574
This commit is contained in:
Art Yerkes 2008-07-18 11:19:29 +00:00
parent 11f2456fdf
commit 747d575347
2 changed files with 8 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
reactos/drivers/network/ndis/ndis/miniport.c
View file

@ -156,7 +156,7 @@ MiniIndicateData(
* PacketSize = Total size of received packet
*/
{
/* KIRQL OldIrql; */
KIRQL OldIrql;
PLIST_ENTRY CurrentEntry;
PADAPTER_BINDING AdapterBinding;
@ -166,27 +166,8 @@ MiniIndicateData(
MiniDisplayPacket2(HeaderBuffer, HeaderBufferSize, LookaheadBuffer, LookaheadBufferSize);
/*
* XXX Think about this. This is probably broken. Spinlocks are
* taken out for now until i comprehend the Right Way to do this.
*
* This used to acquire the MiniportBlock spinlock and hold it until
* just before the call to ReceiveHandler. It would then release and
* subsequently re-acquire the lock.
*
* I don't see how this does any good, as it would seem he's just
* trying to protect the packet list. If somebody else dequeues
* a packet, we are in fact in bad shape, but we don't want to
* necessarily call the receive handler at elevated irql either.
*
* therefore: We *are* going to call the receive handler at high irql
* (due to holding the lock) for now, and eventually we have to
* figure out another way to protect this packet list.
*
* UPDATE: this is busted; this results in a recursive lock acquisition.
*/
//NDIS_DbgPrint(MAX_TRACE, ("acquiring miniport block lock\n"));
//KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql);
NDIS_DbgPrint(MAX_TRACE, ("acquiring miniport block lock\n"));
KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql);
{
CurrentEntry = Adapter->ProtocolListHead.Flink;
NDIS_DbgPrint(DEBUG_MINIPORT, ("CurrentEntry = %x\n", CurrentEntry));
@ -201,8 +182,7 @@ MiniIndicateData(
AdapterBinding = CONTAINING_RECORD(CurrentEntry, ADAPTER_BINDING, AdapterListEntry);
NDIS_DbgPrint(DEBUG_MINIPORT, ("AdapterBinding = %x\n", AdapterBinding));
/* see above */
/* KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); */
KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql);
#ifdef DBG
if(!AdapterBinding)
@ -246,13 +226,12 @@ MiniIndicateData(
LookaheadBufferSize,
PacketSize);
/* see above */
/* KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); */
KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql);
CurrentEntry = CurrentEntry->Flink;
}
}
//KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql);
KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql);
NDIS_DbgPrint(MAX_TRACE, ("Leaving.\n"));
}

10
reactos/drivers/network/ndis/ndis/protocol.c
View file

@ -161,14 +161,10 @@ ProRequest(
KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql);
/* MiniportQueryInformation (called by MiniDoRequest) runs at DISPATCH_LEVEL */
/* TODO (?): move the irql raise into MiniDoRequest */
KeRaiseIrql(DISPATCH_LEVEL, &OldIrql);
{
NdisStatus = MiniDoRequest(&Adapter->NdisMiniportBlock, NdisRequest);
NDIS_DbgPrint(MAX_TRACE, ("acquiring miniport block lock\n"));
KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock);
KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql);
{
NDIS_DbgPrint(MAX_TRACE, ("Setting adapter 0x%x to free\n"));
Adapter->MiniportBusy = FALSE;
@ -176,9 +172,7 @@ ProRequest(
if (Adapter->WorkQueueHead)
KeInsertQueueDpc(&Adapter->NdisMiniportBlock.DeferredDpc, NULL, NULL);
}
KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock);
}
KeLowerIrql(OldIrql);
KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql);
return NdisStatus;
}