Ros-diffs August 2011

ros-diffs@reactos.org

18 participants
498 discussions

[tkreuzer] 53151: [INTRIN] memory barriers - implement a fixed version of __invlpg for MSVC, since the intrinsic is broken and can generate wrong instructions, when optimization is enabled - add MS...
by tkreuzer＠svn.reactos.org 09 Aug '11

09 Aug '11

Author: tkreuzer Date: Tue Aug 9 14:22:29 2011 New Revision: 53151 URL: http://svn.reactos.org/svn/reactos?rev=53151&view=rev Log: [INTRIN] memory barriers - implement a fixed version of __invlpg for MSVC, since the intrinsic is broken and can generate wrong instructions, when optimization is enabled - add MSVC versions of _mm_mfence, _mm_lfence, _mm_sfence and __faststorefence - add _mm_mfence() for gcc - give _mm_lfence, _mm_sfence, __invlpg and __wbinvd proper Modified: trunk/reactos/include/crt/mingw32/intrin_x86.h trunk/reactos/include/crt/msc/intrin.h Modified: trunk/reactos/include/crt/mingw32/intrin_x86.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/mingw32/intrin… ============================================================================== --- trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/mingw32/intrin_x86.h [iso-8859-1] Tue Aug 9 14:22:29 2011 @@ -81,24 +81,6 @@ /*** Memory barriers ***/ -#ifdef _x86_64 -__INTRIN_INLINE void __faststorefence(void) -{ - long local; - __asm__ __volatile__("lock; orl $0, %0;" : : "m"(local)); -} -#endif - -__INTRIN_INLINE void _mm_lfence(void) -{ - __asm__ __volatile__("lfence"); -} - -__INTRIN_INLINE void _mm_sfence(void) -{ - __asm__ __volatile__("sfence"); -} - __INTRIN_INLINE void _ReadWriteBarrier(void) { __asm__ __volatile__("" : : : "memory"); @@ -107,6 +89,34 @@ /* GCC only supports full barriers */ #define _ReadBarrier _ReadWriteBarrier #define _WriteBarrier _ReadWriteBarrier + +__INTRIN_INLINE void _mm_mfence(void) +{ + __asm__ __volatile__("mfence" : : : "memory"); +} + +__INTRIN_INLINE void _mm_lfence(void) +{ + _ReadBarrier(); + __asm__ __volatile__("lfence"); + _ReadBarrier(); +} + +__INTRIN_INLINE void _mm_sfence(void) +{ + _WriteBarrier(); + __asm__ __volatile__("sfence"); + _WriteBarrier(); +} + +#ifdef _x86_64 +__INTRIN_INLINE void __faststorefence(void) +{ + long local; + __asm__ __volatile__("lock; orl $0, %0;" : : "m"(local)); +} +#endif + /*** Atomic operations ***/ @@ -1438,7 +1448,7 @@ __INTRIN_INLINE void __invlpg(void * const Address) { - __asm__("invlpg %[Address]" : : [Address] "m" (*((unsigned char *)(Address)))); + __asm__("invlpg %[Address]" : : [Address] "m" (*((unsigned char *)(Address))) : "memory"); } @@ -1482,7 +1492,7 @@ __INTRIN_INLINE void __wbinvd(void) { - __asm__ __volatile__("wbinvd"); + __asm__ __volatile__("wbinvd" : : : "memory"); } __INTRIN_INLINE void __lidt(void *Source) Modified: trunk/reactos/include/crt/msc/intrin.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/msc/intrin.h?r… ============================================================================== --- trunk/reactos/include/crt/msc/intrin.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/msc/intrin.h [iso-8859-1] Tue Aug 9 14:22:29 2011 @@ -13,14 +13,25 @@ unsigned int __getcallerseflags(void); #pragma intrinsic(__getcallerseflags) -/*** Atomic operations ***/ +/*** Memory barriers ***/ void _ReadWriteBarrier(void); #pragma intrinsic(_ReadWriteBarrier) void _ReadBarrier(void); #pragma intrinsic(_ReadBarrier) void _WriteBarrier(void); #pragma intrinsic(_WriteBarrier) - +void _mm_mfence(void); +#pragma intrinsic(_mm_mfence) +void _mm_lfence(void); +#pragma intrinsic(_mm_lfence) +void _mm_sfence(void); +#pragma intrinsic(_mm_sfence) +#ifdef _M_AMD64 +void __faststorefence(void); +#pragma intrinsic(__faststorefence) +#endif + +/*** Atomic operations ***/ long _InterlockedCompareExchange(volatile long * const Destination, const long Exchange, const long Comperand); #pragma intrinsic(_InterlockedCompareExchange) long _InterlockedExchange(volatile long * const Target, const long Value); @@ -297,6 +308,23 @@ void __invlpg(void * const Address); #pragma intrinsic(__invlpg) +// This intrinsic is broken and generates wrong opcodes, +// when optimization is enabled! +#pragma warning(push) +#pragma warning(disable:4711) +void __forceinline __invlpg_fixed(void * const Address) +{ + _ReadWriteBarrier(); + __asm + { + mov eax, Address + invlpg [eax] + } + _ReadWriteBarrier(); +} +#pragma warning(pop) +#define __invlpg __invlpg_fixed + /*** System operations ***/ unsigned __int64 __readmsr(const int reg); #pragma intrinsic(__readmsr)

1 0

[akhaldi] 53150: [NTDLL_WINETEST] * Skip ntdll exception tests until bug 6404 is fixed.
by akhaldi＠svn.reactos.org 09 Aug '11

09 Aug '11

Author: akhaldi Date: Tue Aug 9 12:10:04 2011 New Revision: 53150 URL: http://svn.reactos.org/svn/reactos?rev=53150&view=rev Log: [NTDLL_WINETEST] * Skip ntdll exception tests until bug 6404 is fixed. Modified: trunk/rostests/winetests/ntdll/exception.c Modified: trunk/rostests/winetests/ntdll/exception.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/exception… ============================================================================== --- trunk/rostests/winetests/ntdll/exception.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/exception.c [iso-8859-1] Tue Aug 9 12:10:04 2011 @@ -1390,6 +1390,12 @@ START_TEST(exception) { + + if(!winetest_interactive) { + skip("ReactOS Bug 6404: ntdll_winetest:exception enters kdbg on the int3 exception test.\n"); + return; + } + HMODULE hntdll = GetModuleHandleA("ntdll.dll"); code_mem = VirtualAlloc(NULL, 65536, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE);

1 0

[cgutman] 53149: [PCNET] - Implement a simple buffer allocation algorithm which backs off the buffer size until all buffer allocations succeed See issue #6284 for more details.
by cgutman＠svn.reactos.org 09 Aug '11

09 Aug '11

Author: cgutman Date: Tue Aug 9 07:30:10 2011 New Revision: 53149 URL: http://svn.reactos.org/svn/reactos?rev=53149&view=rev Log: [PCNET] - Implement a simple buffer allocation algorithm which backs off the buffer size until all buffer allocations succeed See issue #6284 for more details. Modified: trunk/reactos/drivers/network/dd/pcnet/pcnet.c trunk/reactos/drivers/network/dd/pcnet/pcnet.h Modified: trunk/reactos/drivers/network/dd/pcnet/pcnet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/pcnet/p… ============================================================================== --- trunk/reactos/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] Tue Aug 9 07:30:10 2011 @@ -145,7 +145,7 @@ Descriptor->FLAGS |= RD_OWN; Adapter->CurrentReceiveDescriptorIndex++; - Adapter->CurrentReceiveDescriptorIndex %= NUMBER_OF_BUFFERS; + Adapter->CurrentReceiveDescriptorIndex %= Adapter->BufferCount; Adapter->Statistics.RcvGoodFrames++; } @@ -201,7 +201,7 @@ } Adapter->CurrentTransmitStartIndex++; - Adapter->CurrentTransmitStartIndex %= NUMBER_OF_BUFFERS; + Adapter->CurrentTransmitStartIndex %= Adapter->BufferCount; Adapter->Statistics.XmtGoodFrames++; } @@ -297,6 +297,60 @@ return NDIS_STATUS_SUCCESS; } +static VOID +MiFreeSharedMemory( + PADAPTER Adapter) +/* + * FUNCTION: Free all allocated shared memory + * ARGUMENTS: + * Adapter: pointer to the miniport's adapter struct + */ +{ + NDIS_PHYSICAL_ADDRESS PhysicalAddress; + + PhysicalAddress.u.HighPart = 0; + + if(Adapter->InitializationBlockVirt) + { + PhysicalAddress.u.LowPart = (ULONG)Adapter->InitializationBlockPhys; + NdisMFreeSharedMemory(Adapter->MiniportAdapterHandle, Adapter->InitializationBlockLength, + FALSE, Adapter->InitializationBlockVirt, PhysicalAddress); + Adapter->InitializationBlockVirt = NULL; + } + + if(Adapter->TransmitDescriptorRingVirt) + { + PhysicalAddress.u.LowPart = (ULONG)Adapter->TransmitDescriptorRingPhys; + NdisMFreeSharedMemory(Adapter->MiniportAdapterHandle, Adapter->TransmitDescriptorRingLength, + FALSE, Adapter->TransmitDescriptorRingVirt, PhysicalAddress); + Adapter->TransmitDescriptorRingVirt = NULL; + } + + if(Adapter->ReceiveDescriptorRingVirt) + { + PhysicalAddress.u.LowPart = (ULONG)Adapter->ReceiveDescriptorRingPhys; + NdisMFreeSharedMemory(Adapter->MiniportAdapterHandle, Adapter->ReceiveDescriptorRingLength, + FALSE, Adapter->ReceiveDescriptorRingVirt, PhysicalAddress); + Adapter->ReceiveDescriptorRingVirt = NULL; + } + + if(Adapter->TransmitBufferPtrVirt) + { + PhysicalAddress.u.LowPart = (ULONG)Adapter->TransmitBufferPtrPhys; + NdisMFreeSharedMemory(Adapter->MiniportAdapterHandle, Adapter->TransmitBufferLength, + TRUE, Adapter->TransmitBufferPtrVirt, PhysicalAddress); + Adapter->TransmitBufferPtrVirt = NULL; + } + + if(Adapter->ReceiveBufferPtrVirt) + { + PhysicalAddress.u.LowPart = (ULONG)Adapter->ReceiveBufferPtrPhys; + NdisMFreeSharedMemory(Adapter->MiniportAdapterHandle, Adapter->ReceiveBufferLength, + TRUE, Adapter->ReceiveBufferPtrVirt, PhysicalAddress); + Adapter->ReceiveBufferPtrVirt = NULL; + } +} + static NDIS_STATUS MiAllocateSharedMemory( PADAPTER Adapter) @@ -313,104 +367,133 @@ PRECEIVE_DESCRIPTOR ReceiveDescriptor; NDIS_PHYSICAL_ADDRESS PhysicalAddress; ULONG i; - - /* allocate the initialization block */ - Adapter->InitializationBlockLength = sizeof(INITIALIZATION_BLOCK); - NdisMAllocateSharedMemory(Adapter->MiniportAdapterHandle, Adapter->InitializationBlockLength, - FALSE, (PVOID *)&Adapter->InitializationBlockVirt, &PhysicalAddress); - if(!Adapter->InitializationBlockVirt) - { - DPRINT1("insufficient resources\n"); + ULONG BufferCount = NUMBER_OF_BUFFERS; + ULONG LogBufferCount = LOG_NUMBER_OF_BUFFERS; + + while (BufferCount != 0) + { + /* allocate the initialization block (we have this in the loop so we can use MiFreeSharedMemory) */ + Adapter->InitializationBlockLength = sizeof(INITIALIZATION_BLOCK); + NdisMAllocateSharedMemory(Adapter->MiniportAdapterHandle, Adapter->InitializationBlockLength, + FALSE, (PVOID *)&Adapter->InitializationBlockVirt, &PhysicalAddress); + if(!Adapter->InitializationBlockVirt) + { + /* Buffer backoff won't help us here */ + DPRINT1("insufficient resources\n"); + return NDIS_STATUS_RESOURCES; + } + + if(((ULONG)Adapter->InitializationBlockVirt & 0x00000003) != 0) + { + DPRINT1("address 0x%x not dword-aligned\n", Adapter->InitializationBlockVirt); + return NDIS_STATUS_RESOURCES; + } + + Adapter->InitializationBlockPhys = (PINITIALIZATION_BLOCK)NdisGetPhysicalAddressLow(PhysicalAddress); + + /* allocate the transport descriptor ring */ + Adapter->TransmitDescriptorRingLength = sizeof(TRANSMIT_DESCRIPTOR) * BufferCount; + NdisMAllocateSharedMemory(Adapter->MiniportAdapterHandle, Adapter->TransmitDescriptorRingLength, + FALSE, (PVOID *)&Adapter->TransmitDescriptorRingVirt, &PhysicalAddress); + if (!Adapter->TransmitDescriptorRingVirt) + { + DPRINT1("Backing off buffer count by %d buffers due to allocation failure\n", (BufferCount >> 1)); + BufferCount = BufferCount >> 1; + LogBufferCount--; + MiFreeSharedMemory(Adapter); + continue; + } + + if (((ULONG)Adapter->TransmitDescriptorRingVirt & 0x00000003) != 0) + { + DPRINT1("address 0x%x not dword-aligned\n", Adapter->TransmitDescriptorRingVirt); + return NDIS_STATUS_RESOURCES; + } + + Adapter->TransmitDescriptorRingPhys = (PTRANSMIT_DESCRIPTOR)NdisGetPhysicalAddressLow(PhysicalAddress); + RtlZeroMemory(Adapter->TransmitDescriptorRingVirt, sizeof(TRANSMIT_DESCRIPTOR) * BufferCount); + + /* allocate the receive descriptor ring */ + Adapter->ReceiveDescriptorRingLength = sizeof(RECEIVE_DESCRIPTOR) * BufferCount; + NdisMAllocateSharedMemory(Adapter->MiniportAdapterHandle, Adapter->ReceiveDescriptorRingLength, + FALSE, (PVOID *)&Adapter->ReceiveDescriptorRingVirt, &PhysicalAddress); + if (!Adapter->ReceiveDescriptorRingVirt) + { + DPRINT1("Backing off buffer count by %d buffers due to allocation failure\n", (BufferCount >> 1)); + BufferCount = BufferCount >> 1; + LogBufferCount--; + MiFreeSharedMemory(Adapter); + continue; + } + + if (((ULONG)Adapter->ReceiveDescriptorRingVirt & 0x00000003) != 0) + { + DPRINT1("address 0x%x not dword-aligned\n", Adapter->ReceiveDescriptorRingVirt); + return NDIS_STATUS_RESOURCES; + } + + Adapter->ReceiveDescriptorRingPhys = (PRECEIVE_DESCRIPTOR)NdisGetPhysicalAddressLow(PhysicalAddress); + RtlZeroMemory(Adapter->ReceiveDescriptorRingVirt, sizeof(RECEIVE_DESCRIPTOR) * BufferCount); + + /* allocate transmit buffers */ + Adapter->TransmitBufferLength = BUFFER_SIZE * BufferCount; + NdisMAllocateSharedMemory(Adapter->MiniportAdapterHandle, Adapter->TransmitBufferLength, + TRUE, (PVOID *)&Adapter->TransmitBufferPtrVirt, &PhysicalAddress); + if(!Adapter->TransmitBufferPtrVirt) + { + DPRINT1("Backing off buffer count by %d buffers due to allocation failure\n", (BufferCount >> 1)); + BufferCount = BufferCount >> 1; + LogBufferCount--; + MiFreeSharedMemory(Adapter); + continue; + } + + if (((ULONG)Adapter->TransmitBufferPtrVirt & 0x00000003) != 0) + { + DPRINT1("address 0x%x not dword-aligned\n", Adapter->TransmitBufferPtrVirt); + return NDIS_STATUS_RESOURCES; + } + + Adapter->TransmitBufferPtrPhys = (PCHAR)NdisGetPhysicalAddressLow(PhysicalAddress); + RtlZeroMemory(Adapter->TransmitBufferPtrVirt, BUFFER_SIZE * BufferCount); + + /* allocate receive buffers */ + Adapter->ReceiveBufferLength = BUFFER_SIZE * BufferCount; + NdisMAllocateSharedMemory(Adapter->MiniportAdapterHandle, Adapter->ReceiveBufferLength, + TRUE, (PVOID *)&Adapter->ReceiveBufferPtrVirt, &PhysicalAddress); + if(!Adapter->ReceiveBufferPtrVirt) + { + DPRINT1("Backing off buffer count by %d buffers due to allocation failure\n", (BufferCount >> 1)); + BufferCount = BufferCount >> 1; + LogBufferCount--; + MiFreeSharedMemory(Adapter); + continue; + } + + if (((ULONG)Adapter->ReceiveBufferPtrVirt & 0x00000003) != 0) + { + DPRINT1("address 0x%x not dword-aligned\n", Adapter->ReceiveBufferPtrVirt); + return NDIS_STATUS_RESOURCES; + } + + Adapter->ReceiveBufferPtrPhys = (PCHAR)NdisGetPhysicalAddressLow(PhysicalAddress); + RtlZeroMemory(Adapter->ReceiveBufferPtrVirt, BUFFER_SIZE * BufferCount); + + break; + } + + if (!BufferCount) + { + DPRINT1("Failed to allocate adapter buffers\n"); return NDIS_STATUS_RESOURCES; - } - - if(((ULONG)Adapter->InitializationBlockVirt & 0x00000003) != 0) - { - DPRINT1("address 0x%x not dword-aligned\n", Adapter->InitializationBlockVirt); - return NDIS_STATUS_RESOURCES; - } - - Adapter->InitializationBlockPhys = (PINITIALIZATION_BLOCK)NdisGetPhysicalAddressLow(PhysicalAddress); - - /* allocate the transport descriptor ring */ - Adapter->TransmitDescriptorRingLength = sizeof(TRANSMIT_DESCRIPTOR) * NUMBER_OF_BUFFERS; - NdisMAllocateSharedMemory(Adapter->MiniportAdapterHandle, Adapter->TransmitDescriptorRingLength, - FALSE, (PVOID *)&Adapter->TransmitDescriptorRingVirt, &PhysicalAddress); - if(!Adapter->TransmitDescriptorRingVirt) - { - DPRINT1("insufficient resources\n"); - return NDIS_STATUS_RESOURCES; - } - - if(((ULONG)Adapter->TransmitDescriptorRingVirt & 0x00000003) != 0) - { - DPRINT1("address 0x%x not dword-aligned\n", Adapter->TransmitDescriptorRingVirt); - return NDIS_STATUS_RESOURCES; - } - - Adapter->TransmitDescriptorRingPhys = (PTRANSMIT_DESCRIPTOR)NdisGetPhysicalAddressLow(PhysicalAddress); - RtlZeroMemory(Adapter->TransmitDescriptorRingVirt, sizeof(TRANSMIT_DESCRIPTOR) * NUMBER_OF_BUFFERS); - - /* allocate the receive descriptor ring */ - Adapter->ReceiveDescriptorRingLength = sizeof(RECEIVE_DESCRIPTOR) * NUMBER_OF_BUFFERS; - NdisMAllocateSharedMemory(Adapter->MiniportAdapterHandle, Adapter->ReceiveDescriptorRingLength, - FALSE, (PVOID *)&Adapter->ReceiveDescriptorRingVirt, &PhysicalAddress); - if(!Adapter->ReceiveDescriptorRingVirt) - { - DPRINT1("insufficient resources\n"); - return NDIS_STATUS_RESOURCES; - } - - if(((ULONG)Adapter->ReceiveDescriptorRingVirt & 0x00000003) != 0) - { - DPRINT1("address 0x%x not dword-aligned\n", Adapter->ReceiveDescriptorRingVirt); - return NDIS_STATUS_RESOURCES; - } - - Adapter->ReceiveDescriptorRingPhys = (PRECEIVE_DESCRIPTOR)NdisGetPhysicalAddressLow(PhysicalAddress); - RtlZeroMemory(Adapter->ReceiveDescriptorRingVirt, sizeof(RECEIVE_DESCRIPTOR) * NUMBER_OF_BUFFERS); - - /* allocate transmit buffers */ - Adapter->TransmitBufferLength = BUFFER_SIZE * NUMBER_OF_BUFFERS; - NdisMAllocateSharedMemory(Adapter->MiniportAdapterHandle, Adapter->TransmitBufferLength, - TRUE, (PVOID *)&Adapter->TransmitBufferPtrVirt, &PhysicalAddress); - if(!Adapter->TransmitBufferPtrVirt) - { - DPRINT1("insufficient resources\n"); - return NDIS_STATUS_RESOURCES; - } - - if(((ULONG)Adapter->TransmitBufferPtrVirt & 0x00000003) != 0) - { - DPRINT1("address 0x%x not dword-aligned\n", Adapter->TransmitBufferPtrVirt); - return NDIS_STATUS_RESOURCES; - } - - Adapter->TransmitBufferPtrPhys = (PCHAR)NdisGetPhysicalAddressLow(PhysicalAddress); - RtlZeroMemory(Adapter->TransmitBufferPtrVirt, BUFFER_SIZE * NUMBER_OF_BUFFERS); - - /* allocate receive buffers */ - Adapter->ReceiveBufferLength = BUFFER_SIZE * NUMBER_OF_BUFFERS; - NdisMAllocateSharedMemory(Adapter->MiniportAdapterHandle, Adapter->ReceiveBufferLength, - TRUE, (PVOID *)&Adapter->ReceiveBufferPtrVirt, &PhysicalAddress); - if(!Adapter->ReceiveBufferPtrVirt) - { - DPRINT1("insufficient resources\n"); - return NDIS_STATUS_RESOURCES; - } - - if(((ULONG)Adapter->ReceiveBufferPtrVirt & 0x00000003) != 0) - { - DPRINT1("address 0x%x not dword-aligned\n", Adapter->ReceiveBufferPtrVirt); - return NDIS_STATUS_RESOURCES; - } - - Adapter->ReceiveBufferPtrPhys = (PCHAR)NdisGetPhysicalAddressLow(PhysicalAddress); - RtlZeroMemory(Adapter->ReceiveBufferPtrVirt, BUFFER_SIZE * NUMBER_OF_BUFFERS); + } + + Adapter->BufferCount = BufferCount; + Adapter->LogBufferCount = LogBufferCount; /* initialize tx descriptors */ TransmitDescriptor = Adapter->TransmitDescriptorRingVirt; - for(i = 0; i < NUMBER_OF_BUFFERS; i++) + for(i = 0; i < BufferCount; i++) { (TransmitDescriptor+i)->TBADR = (ULONG)Adapter->TransmitBufferPtrPhys + i * BUFFER_SIZE; (TransmitDescriptor+i)->BCNT = 0xf000 | -BUFFER_SIZE; /* 2's compliment + set top 4 bits */ @@ -421,7 +504,7 @@ /* initialize rx */ ReceiveDescriptor = Adapter->ReceiveDescriptorRingVirt; - for(i = 0; i < NUMBER_OF_BUFFERS; i++) + for(i = 0; i < BufferCount; i++) { (ReceiveDescriptor+i)->RBADR = (ULONG)Adapter->ReceiveBufferPtrPhys + i * BUFFER_SIZE; (ReceiveDescriptor+i)->BCNT = 0xf000 | -BUFFER_SIZE; /* 2's compliment + set top 4 bits */ @@ -460,61 +543,12 @@ /* set up receive ring */ DPRINT("Receive ring physical address: 0x%x\n", Adapter->ReceiveDescriptorRingPhys); Adapter->InitializationBlockVirt->RDRA = (ULONG)Adapter->ReceiveDescriptorRingPhys; - Adapter->InitializationBlockVirt->RLEN = (LOG_NUMBER_OF_BUFFERS << 4) & 0xf0; + Adapter->InitializationBlockVirt->RLEN = (Adapter->LogBufferCount << 4) & 0xf0; /* set up transmit ring */ DPRINT("Transmit ring physical address: 0x%x\n", Adapter->TransmitDescriptorRingPhys); Adapter->InitializationBlockVirt->TDRA = (ULONG)Adapter->TransmitDescriptorRingPhys; - Adapter->InitializationBlockVirt->TLEN = (LOG_NUMBER_OF_BUFFERS << 4) & 0xf0; -} - -static VOID -MiFreeSharedMemory( - PADAPTER Adapter) -/* - * FUNCTION: Free all allocated shared memory - * ARGUMENTS: - * Adapter: pointer to the miniport's adapter struct - */ -{ - NDIS_PHYSICAL_ADDRESS PhysicalAddress; - - PhysicalAddress.u.HighPart = 0; - - if(Adapter->InitializationBlockVirt) - { - PhysicalAddress.u.LowPart = (ULONG)Adapter->InitializationBlockPhys; - NdisMFreeSharedMemory(Adapter->MiniportAdapterHandle, Adapter->InitializationBlockLength, - FALSE, Adapter->InitializationBlockVirt, PhysicalAddress); - } - - if(Adapter->TransmitDescriptorRingVirt) - { - PhysicalAddress.u.LowPart = (ULONG)Adapter->TransmitDescriptorRingPhys; - NdisMFreeSharedMemory(Adapter->MiniportAdapterHandle, Adapter->TransmitDescriptorRingLength, - FALSE, Adapter->TransmitDescriptorRingVirt, PhysicalAddress); - } - - if(Adapter->ReceiveDescriptorRingVirt) - { - PhysicalAddress.u.LowPart = (ULONG)Adapter->ReceiveDescriptorRingPhys; - NdisMFreeSharedMemory(Adapter->MiniportAdapterHandle, Adapter->ReceiveDescriptorRingLength, - FALSE, Adapter->ReceiveDescriptorRingVirt, PhysicalAddress); - } - - if(Adapter->TransmitBufferPtrVirt) - { - PhysicalAddress.u.LowPart = (ULONG)Adapter->TransmitBufferPtrPhys; - NdisMFreeSharedMemory(Adapter->MiniportAdapterHandle, Adapter->TransmitBufferLength, - FALSE, Adapter->TransmitBufferPtrVirt, PhysicalAddress); - } - - if(Adapter->ReceiveBufferPtrVirt) - { - PhysicalAddress.u.LowPart = (ULONG)Adapter->ReceiveBufferPtrPhys; - NdisMFreeSharedMemory(Adapter->MiniportAdapterHandle, Adapter->ReceiveBufferLength, - FALSE, Adapter->ReceiveBufferPtrVirt, PhysicalAddress); - } + Adapter->InitializationBlockVirt->TLEN = (Adapter->LogBufferCount << 4) & 0xf0; } static BOOLEAN @@ -1136,7 +1170,7 @@ /* Check if we have free entry in our circular buffer. */ if ((Adapter->CurrentTransmitEndIndex + 1 == Adapter->CurrentTransmitStartIndex) || - (Adapter->CurrentTransmitEndIndex == NUMBER_OF_BUFFERS - 1 && + (Adapter->CurrentTransmitEndIndex == Adapter->BufferCount - 1 && Adapter->CurrentTransmitStartIndex == 0)) { DPRINT1("No free space in circular buffer\n"); @@ -1181,7 +1215,7 @@ #endif Adapter->CurrentTransmitEndIndex++; - Adapter->CurrentTransmitEndIndex %= NUMBER_OF_BUFFERS; + Adapter->CurrentTransmitEndIndex %= Adapter->BufferCount; Desc->FLAGS = TD1_OWN | TD1_STP | TD1_ENP; Desc->BCNT = 0xf000 | -TotalPacketLength; Modified: trunk/reactos/drivers/network/dd/pcnet/pcnet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/pcnet/p… ============================================================================== --- trunk/reactos/drivers/network/dd/pcnet/pcnet.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/pcnet/pcnet.h [iso-8859-1] Tue Aug 9 07:30:10 2011 @@ -97,6 +97,10 @@ PCHAR ReceiveBufferPtrVirt; PCHAR ReceiveBufferPtrPhys; + /* buffer count */ + ULONG BufferCount; + ULONG LogBufferCount; + ADAPTER_STATS Statistics; } ADAPTER, *PADAPTER;

1 0

[cgutman] 53148: [PCNET] - Allocate receive and transmit buffers (each 49152 bytes) as cached shared memory to increase the likelihood of a successful allocation in a low memory scenario See issue ...
by cgutman＠svn.reactos.org 09 Aug '11

09 Aug '11

Author: cgutman Date: Tue Aug 9 06:36:10 2011 New Revision: 53148 URL: http://svn.reactos.org/svn/reactos?rev=53148&view=rev Log: [PCNET] - Allocate receive and transmit buffers (each 49152 bytes) as cached shared memory to increase the likelihood of a successful allocation in a low memory scenario See issue #6284 for more details. Modified: trunk/reactos/drivers/network/dd/pcnet/pcnet.c Modified: trunk/reactos/drivers/network/dd/pcnet/pcnet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/pcnet/p… ============================================================================== --- trunk/reactos/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] Tue Aug 9 06:36:10 2011 @@ -373,7 +373,7 @@ /* allocate transmit buffers */ Adapter->TransmitBufferLength = BUFFER_SIZE * NUMBER_OF_BUFFERS; NdisMAllocateSharedMemory(Adapter->MiniportAdapterHandle, Adapter->TransmitBufferLength, - FALSE, (PVOID *)&Adapter->TransmitBufferPtrVirt, &PhysicalAddress); + TRUE, (PVOID *)&Adapter->TransmitBufferPtrVirt, &PhysicalAddress); if(!Adapter->TransmitBufferPtrVirt) { DPRINT1("insufficient resources\n"); @@ -392,7 +392,7 @@ /* allocate receive buffers */ Adapter->ReceiveBufferLength = BUFFER_SIZE * NUMBER_OF_BUFFERS; NdisMAllocateSharedMemory(Adapter->MiniportAdapterHandle, Adapter->ReceiveBufferLength, - FALSE, (PVOID *)&Adapter->ReceiveBufferPtrVirt, &PhysicalAddress); + TRUE, (PVOID *)&Adapter->ReceiveBufferPtrVirt, &PhysicalAddress); if(!Adapter->ReceiveBufferPtrVirt) { DPRINT1("insufficient resources\n");

1 0

[cgutman] 53147: [NDIS] - Implement NdisMDeregisterIoPortRange [PCNET] - Don't call NdisMFreeMapRegisters if no map registers were allocated - Call MiFreeSharedMemory before freeing map registers t...
by cgutman＠svn.reactos.org 09 Aug '11

09 Aug '11

Author: cgutman Date: Tue Aug 9 06:00:38 2011 New Revision: 53147 URL: http://svn.reactos.org/svn/reactos?rev=53147&view=rev Log: [NDIS] - Implement NdisMDeregisterIoPortRange [PCNET] - Don't call NdisMFreeMapRegisters if no map registers were allocated - Call MiFreeSharedMemory before freeing map registers to avoid a crash because freeing map registers deallocates the adapter object Modified: trunk/reactos/drivers/network/dd/pcnet/pcnet.c trunk/reactos/drivers/network/ndis/ndis/50stubs.c trunk/reactos/drivers/network/ndis/ndis/io.c Modified: trunk/reactos/drivers/network/dd/pcnet/pcnet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/dd/pcnet/p… ============================================================================== --- trunk/reactos/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] Tue Aug 9 06:00:38 2011 @@ -844,7 +844,7 @@ UINT i = 0; PADAPTER Adapter = 0; NDIS_STATUS Status = NDIS_STATUS_FAILURE; - BOOLEAN InterruptRegistered = FALSE; + BOOLEAN InterruptRegistered = FALSE, MapRegistersAllocated = FALSE; NDIS_HANDLE ConfigurationHandle; UINT *RegNetworkAddress = 0; UINT RegNetworkAddressLength = 0; @@ -912,6 +912,8 @@ break; } + MapRegistersAllocated = TRUE; + /* set up the interrupt */ Status = NdisMRegisterInterrupt(&Adapter->InterruptObject, Adapter->MiniportAdapterHandle, Adapter->InterruptVector, Adapter->InterruptVector, TRUE, TRUE, NdisInterruptLevelSensitive); @@ -928,7 +930,7 @@ if(Status != NDIS_STATUS_SUCCESS) { Status = NDIS_STATUS_RESOURCES; - DPRINT1("MiAllocateSharedMemory failed", Status); + DPRINT1("MiAllocateSharedMemory failed\n", Status); break; } @@ -969,15 +971,16 @@ { DPRINT("Error; freeing stuff\n"); - NdisMFreeMapRegisters(Adapter->MiniportAdapterHandle); /* doesn't hurt to free if we never alloc'd? */ + MiFreeSharedMemory(Adapter); + + if(MapRegistersAllocated) + NdisMFreeMapRegisters(Adapter->MiniportAdapterHandle); if(Adapter->PortOffset) NdisMDeregisterIoPortRange(Adapter->MiniportAdapterHandle, Adapter->IoBaseAddress, NUMBER_OF_PORTS, (PVOID)Adapter->PortOffset); if(InterruptRegistered) NdisMDeregisterInterrupt(&Adapter->InterruptObject); - - MiFreeSharedMemory(Adapter); NdisFreeMemory(Adapter, 0, 0); } Modified: trunk/reactos/drivers/network/ndis/ndis/50stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/50stubs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/50stubs.c [iso-8859-1] Tue Aug 9 06:00:38 2011 @@ -523,26 +523,3 @@ return 0; } - - -/* - * @unimplemented - */ -VOID -EXPORT -NdisMDeregisterIoPortRange( - IN NDIS_HANDLE MiniportAdapterHandle, - IN UINT InitialPort, - IN UINT NumberOfPorts, - IN PVOID PortOffset) -/* - * FUNCTION: Releases a register mapping to I/O ports - * ARGUMENTS: - * MiniportAdapterHandle = Specifies handle input to MiniportInitialize - * InitialPort = Bus-relative base port address of a range to be mapped - * NumberOfPorts = Specifies number of ports to be mapped - * PortOffset = Pointer to mapped base port address - */ -{ - UNIMPLEMENTED -} Modified: trunk/reactos/drivers/network/ndis/ndis/io.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/io.c [iso-8859-1] Tue Aug 9 06:00:38 2011 @@ -898,6 +898,51 @@ return NDIS_STATUS_SUCCESS; } +/* + * @implemented + */ +VOID +EXPORT +NdisMDeregisterIoPortRange(IN NDIS_HANDLE MiniportAdapterHandle, + IN UINT InitialPort, + IN UINT NumberOfPorts, + IN PVOID PortOffset) +/* + * FUNCTION: Releases a register mapping to I/O ports + * ARGUMENTS: + * MiniportAdapterHandle = Specifies handle input to MiniportInitialize + * InitialPort = Bus-relative base port address of a range to be mapped + * NumberOfPorts = Specifies number of ports to be mapped + * PortOffset = Pointer to mapped base port address + */ +{ + PLOGICAL_ADAPTER Adapter = (PLOGICAL_ADAPTER)MiniportAdapterHandle; + PHYSICAL_ADDRESS PortAddress = RtlConvertUlongToLargeInteger(InitialPort); + PHYSICAL_ADDRESS TranslatedAddress; + ULONG AddressSpace = 1; + + NDIS_DbgPrint(MAX_TRACE, ("Called - InitialPort 0x%x, NumberOfPorts 0x%x, Port Offset 0x%x\n", InitialPort, NumberOfPorts, PortOffset)); + + /* Translate the initial port again to find the address space of the translated address */ + if(!HalTranslateBusAddress(Adapter->NdisMiniportBlock.BusType, Adapter->NdisMiniportBlock.BusNumber, + PortAddress, &AddressSpace, &TranslatedAddress)) + { + NDIS_DbgPrint(MIN_TRACE, ("Unable to translate address\n")); + return; + } + + /* Make sure we got the same translation as last time */ + ASSERT(TranslatedAddress.QuadPart == (ULONG_PTR)PortOffset); + + /* Check if we're in memory space */ + if (!AddressSpace) + { + NDIS_DbgPrint(MAX_TRACE, ("Calling MmUnmapIoSpace\n")); + + /* Unmap the memory */ + MmUnmapIoSpace(PortOffset, NumberOfPorts); + } +} /* * @implemented

1 0

[tkreuzer] 53146: [RTL] Fix MSVC warnings
by tkreuzer＠svn.reactos.org 08 Aug '11

08 Aug '11

Author: tkreuzer Date: Mon Aug 8 22:13:02 2011 New Revision: 53146 URL: http://svn.reactos.org/svn/reactos?rev=53146&view=rev Log: [RTL] Fix MSVC warnings Modified: trunk/reactos/lib/rtl/heap.c Modified: trunk/reactos/lib/rtl/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heap.c?rev=53146&r… ============================================================================== --- trunk/reactos/lib/rtl/heap.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/heap.c [iso-8859-1] Mon Aug 8 22:13:02 2011 @@ -121,7 +121,7 @@ ASSERT(*HeaderSize <= PAGE_SIZE); /* Initialize heap's header */ - Heap->Entry.Size = (*HeaderSize) >> HEAP_ENTRY_SHIFT; + Heap->Entry.Size = (USHORT)((*HeaderSize) >> HEAP_ENTRY_SHIFT); Heap->Entry.Flags = HEAP_ENTRY_BUSY; Heap->Signature = HEAP_SIGNATURE; @@ -306,7 +306,7 @@ } else { - Size = BlockSize; + Size = (USHORT)BlockSize; FreeEntry->Flags = Flags; } @@ -640,18 +640,18 @@ DPRINT("Updating UcrDescriptor %p, new Address %p, size %d\n", UcrDescriptor, UcrDescriptor->Address, UcrDescriptor->Size); - + /* Set various first entry fields*/ FirstEntry->SegmentOffset = LastEntry->SegmentOffset; - FirstEntry->Size = *Size >> HEAP_ENTRY_SHIFT; + FirstEntry->Size = (USHORT)(*Size >> HEAP_ENTRY_SHIFT); FirstEntry->PreviousSize = LastEntry->Size; /* Check if anything left in this UCR */ if (UcrDescriptor->Size == 0) { /* It's fully exhausted */ - - /* Check if this is the end of the segment */ + + /* Check if this is the end of the segment */ if(UcrDescriptor->Address == Segment->LastValidEntry) { FirstEntry->Flags = HEAP_ENTRY_LAST_ENTRY; @@ -674,7 +674,7 @@ { FirstEntry->Flags = HEAP_ENTRY_LAST_ENTRY; } - + /* We're done */ return (PHEAP_FREE_ENTRY)FirstEntry; } @@ -792,7 +792,7 @@ { /* Adjust size of this free entry and insert it */ FreeEntry->Flags = HEAP_ENTRY_LAST_ENTRY; - FreeEntry->Size = PrecedingSize; + FreeEntry->Size = (USHORT)PrecedingSize; Heap->TotalFreeSize += PrecedingSize; /* Insert it into the free list */ @@ -811,9 +811,9 @@ NextFreeEntry->Flags = 0; NextFreeEntry->PreviousSize = 0; NextFreeEntry->SegmentOffset = Segment->Entry.SegmentOffset; - NextFreeEntry->Size = NextSize; - - ((PHEAP_FREE_ENTRY)((PHEAP_ENTRY)NextFreeEntry + NextSize))->PreviousSize = NextSize; + NextFreeEntry->Size = (USHORT)NextSize; + + ((PHEAP_FREE_ENTRY)((PHEAP_ENTRY)NextFreeEntry + NextSize))->PreviousSize = (USHORT)NextSize; Heap->TotalFreeSize += NextSize; RtlpInsertFreeBlockHelper(Heap, NextFreeEntry, NextSize, FALSE); @@ -961,7 +961,7 @@ /* Add the heap to the process heaps */ Peb->ProcessHeaps[Peb->NumberOfHeaps] = Heap; Peb->NumberOfHeaps++; - Heap->ProcessHeapsListIndex = Peb->NumberOfHeaps; + Heap->ProcessHeapsListIndex = (USHORT)Peb->NumberOfHeaps; // } _SEH2_FINALLY { /* Release the lock */ @@ -1075,12 +1075,12 @@ FreeEntry = CurrentEntry; *FreeSize = *FreeSize + CurrentEntry->Size; Heap->TotalFreeSize -= CurrentEntry->Size; - FreeEntry->Size = *FreeSize; + FreeEntry->Size = (USHORT)(*FreeSize); /* Also update previous size if needed */ if (!(FreeEntry->Flags & HEAP_ENTRY_LAST_ENTRY)) { - ((PHEAP_ENTRY)FreeEntry + *FreeSize)->PreviousSize = *FreeSize; + ((PHEAP_ENTRY)FreeEntry + *FreeSize)->PreviousSize = (USHORT)(*FreeSize); } } @@ -1110,12 +1110,12 @@ /* Update sizes */ *FreeSize = *FreeSize + NextEntry->Size; Heap->TotalFreeSize -= NextEntry->Size; - FreeEntry->Size = *FreeSize; + FreeEntry->Size = (USHORT)(*FreeSize); /* Also update previous size if needed */ if (!(FreeEntry->Flags & HEAP_ENTRY_LAST_ENTRY)) { - ((PHEAP_ENTRY)FreeEntry + *FreeSize)->PreviousSize = *FreeSize; + ((PHEAP_ENTRY)FreeEntry + *FreeSize)->PreviousSize = (USHORT)(*FreeSize); } } } @@ -1767,8 +1767,8 @@ FreeSize = InUseEntry->Size - Index; /* Update it's size fields (we don't need their data anymore) */ - InUseEntry->Size = Index; - InUseEntry->UnusedBytes = AllocationSize - Size; + InUseEntry->Size = (USHORT)Index; + InUseEntry->UnusedBytes = (UCHAR)(AllocationSize - Size); /* If there is something to split - do the split */ if (FreeSize != 0) @@ -1789,8 +1789,8 @@ /* Initialize it */ SplitBlock->Flags = FreeFlags; SplitBlock->SegmentOffset = InUseEntry->SegmentOffset; - SplitBlock->Size = FreeSize; - SplitBlock->PreviousSize = Index; + SplitBlock->Size = (USHORT)FreeSize; + SplitBlock->PreviousSize = (USHORT)Index; /* Check if it's the last entry */ if (FreeFlags & HEAP_ENTRY_LAST_ENTRY) @@ -1825,12 +1825,12 @@ if (FreeSize <= HEAP_MAX_BLOCK_SIZE) { /* Insert it back */ - SplitBlock->Size = FreeSize; + SplitBlock->Size = (USHORT)FreeSize; /* Don't forget to update previous size of the next entry! */ if (!(SplitBlock->Flags & HEAP_ENTRY_LAST_ENTRY)) { - ((PHEAP_FREE_ENTRY)((PHEAP_ENTRY)SplitBlock + FreeSize))->PreviousSize = FreeSize; + ((PHEAP_FREE_ENTRY)((PHEAP_ENTRY)SplitBlock + FreeSize))->PreviousSize = (USHORT)FreeSize; } /* Actually insert it */ @@ -2094,7 +2094,7 @@ /* Initialize this block */ InUseEntry = (PHEAP_ENTRY)FreeBlock; InUseEntry->Flags = HEAP_ENTRY_BUSY | (FreeFlags & HEAP_ENTRY_LAST_ENTRY); - InUseEntry->UnusedBytes = AllocationSize - Size; + InUseEntry->UnusedBytes = (UCHAR)(AllocationSize - Size); InUseEntry->SmallTagIndex = 0; } else @@ -2197,7 +2197,7 @@ } /* Initialize the newly allocated block */ - VirtualBlock->BusyBlock.Size = (AllocationSize - Size); + VirtualBlock->BusyBlock.Size = (USHORT)(AllocationSize - Size); VirtualBlock->BusyBlock.Flags = HEAP_ENTRY_VIRTUAL_ALLOC | HEAP_ENTRY_EXTRA_PRESENT | HEAP_ENTRY_BUSY; VirtualBlock->CommitSize = AllocationSize; VirtualBlock->ReserveSize = AllocationSize; @@ -2473,8 +2473,8 @@ } /* Update sizes */ - InUseEntry->Size = Index; - InUseEntry->UnusedBytes = ((Index << HEAP_ENTRY_SHIFT) - Size); + InUseEntry->Size = (USHORT)Index; + InUseEntry->UnusedBytes = (UCHAR)((Index << HEAP_ENTRY_SHIFT) - Size); /* Check if there is a free space remaining after merging those blocks */ if (!FreeSize) @@ -2492,7 +2492,7 @@ /* Complex case, we need to split the block to give unused free space back to the heap */ UnusedEntry = (PHEAP_FREE_ENTRY)(InUseEntry + Index); - UnusedEntry->PreviousSize = Index; + UnusedEntry->PreviousSize = (USHORT)Index; UnusedEntry->SegmentOffset = InUseEntry->SegmentOffset; /* Update the following block or set the last entry in the segment */ @@ -2500,7 +2500,7 @@ { /* Set flags and size */ UnusedEntry->Flags = RememberFlags; - UnusedEntry->Size = FreeSize; + UnusedEntry->Size = (USHORT)FreeSize; /* Insert it to the heap and update total size */ RtlpInsertFreeBlockHelper(Heap, UnusedEntry, FreeSize, FALSE); @@ -2515,10 +2515,10 @@ { /* Update flags and set size of the unused space entry */ UnusedEntry->Flags = RememberFlags & (~HEAP_ENTRY_LAST_ENTRY); - UnusedEntry->Size = FreeSize; + UnusedEntry->Size = (USHORT)FreeSize; /* Update previous size of the following entry */ - FollowingEntry->PreviousSize = FreeSize; + FollowingEntry->PreviousSize = (USHORT)FreeSize; /* Insert it to the heap and update total free size */ RtlpInsertFreeBlockHelper(Heap, UnusedEntry, FreeSize, FALSE); @@ -2541,10 +2541,10 @@ if (FreeSize <= HEAP_MAX_BLOCK_SIZE) { /* Fine for a dedicated list */ - UnusedEntry->Size = FreeSize; + UnusedEntry->Size = (USHORT)FreeSize; if (!(RememberFlags & HEAP_ENTRY_LAST_ENTRY)) - ((PHEAP_ENTRY)UnusedEntry + FreeSize)->PreviousSize = FreeSize; + ((PHEAP_ENTRY)UnusedEntry + FreeSize)->PreviousSize = (USHORT)FreeSize; /* Insert it back and update total size */ RtlpInsertFreeBlockHelper(Heap, UnusedEntry, FreeSize, FALSE); @@ -2750,7 +2750,7 @@ if (InUseEntry->Flags & HEAP_ENTRY_VIRTUAL_ALLOC) { /* Simple in case of a virtual alloc - just an unused size */ - InUseEntry->Size = AllocationSize - Size; + InUseEntry->Size = (USHORT)(AllocationSize - Size); } else if (InUseEntry->Flags & HEAP_ENTRY_EXTRA_PRESENT) { @@ -2762,12 +2762,12 @@ // FIXME Tagging, TagIndex /* Update unused bytes count */ - InUseEntry->UnusedBytes = AllocationSize - Size; + InUseEntry->UnusedBytes = (UCHAR)(AllocationSize - Size); } else { // FIXME Tagging, SmallTagIndex - InUseEntry->UnusedBytes = AllocationSize - Size; + InUseEntry->UnusedBytes = (UCHAR)(AllocationSize - Size); } /* If new size is bigger than the old size */ @@ -2849,14 +2849,14 @@ /* Initialize this entry */ SplitBlock->Flags = FreeFlags; - SplitBlock->PreviousSize = Index; + SplitBlock->PreviousSize = (USHORT)Index; SplitBlock->SegmentOffset = InUseEntry->SegmentOffset; /* Remember free size */ FreeSize = InUseEntry->Size - Index; /* Set new size */ - InUseEntry->Size = Index; + InUseEntry->Size = (USHORT)Index; InUseEntry->Flags &= ~HEAP_ENTRY_LAST_ENTRY; /* Is that the last entry */ @@ -2902,12 +2902,12 @@ if (FreeSize <= HEAP_MAX_BLOCK_SIZE) { - SplitBlock->Size = FreeSize; + SplitBlock->Size = (USHORT)FreeSize; if (!(SplitBlock->Flags & HEAP_ENTRY_LAST_ENTRY)) { /* Update previous size of the next entry */ - ((PHEAP_FREE_ENTRY)((PHEAP_ENTRY)SplitBlock + FreeSize))->PreviousSize = FreeSize; + ((PHEAP_FREE_ENTRY)((PHEAP_ENTRY)SplitBlock + FreeSize))->PreviousSize = (USHORT)FreeSize; } /* Insert the new one back and update total size */ @@ -3244,7 +3244,7 @@ HeapEntry >= Segment->LastValidEntry)) goto invalid_entry; - if ((HeapEntry->Flags & HEAP_ENTRY_FILL_PATTERN) && + if ((HeapEntry->Flags & HEAP_ENTRY_FILL_PATTERN) && !RtlpCheckInUsePattern(HeapEntry)) goto invalid_entry;

1 0

[cgutman] 53145: [AFD] - Handle canceled reads on datagram sockets
by cgutman＠svn.reactos.org 08 Aug '11

08 Aug '11

Author: cgutman Date: Mon Aug 8 22:02:55 2011 New Revision: 53145 URL: http://svn.reactos.org/svn/reactos?rev=53145&view=rev Log: [AFD] - Handle canceled reads on datagram sockets Modified: trunk/reactos/drivers/network/afd/afd/main.c trunk/reactos/drivers/network/afd/afd/read.c Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Mon Aug 8 22:02:55 2011 @@ -693,23 +693,19 @@ /* Mark that we can't issue another receive request */ FCB->TdiReceiveClosed = TRUE; - /* These are only for connection-oriented sockets */ - if (!(FCB->Flags & AFD_ENDPOINT_CONNECTIONLESS)) - { - /* Try to cancel a pending TDI receive IRP if there was one in progress */ - if (FCB->ReceiveIrp.InFlightRequest) - IoCancelIrp(FCB->ReceiveIrp.InFlightRequest); - - /* Discard any pending data */ - FCB->Recv.Content = 0; - FCB->Recv.BytesUsed = 0; - - /* Mark us as overread to complete future reads with an error */ - FCB->Overread = TRUE; - - /* Set a successful close status to indicate a shutdown on overread */ - FCB->PollStatus[FD_CLOSE_BIT] = STATUS_SUCCESS; - } + /* Try to cancel a pending TDI receive IRP if there was one in progress */ + if (FCB->ReceiveIrp.InFlightRequest) + IoCancelIrp(FCB->ReceiveIrp.InFlightRequest); + + /* Discard any pending data */ + FCB->Recv.Content = 0; + FCB->Recv.BytesUsed = 0; + + /* Mark us as overread to complete future reads with an error */ + FCB->Overread = TRUE; + + /* Set a successful close status to indicate a shutdown on overread */ + FCB->PollStatus[FD_CLOSE_BIT] = STATUS_SUCCESS; /* Clear the receive event */ FCB->PollState &= ~AFD_EVENT_RECEIVE; Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Mon Aug 8 22:02:55 2011 @@ -588,6 +588,12 @@ return Irp->IoStatus.Status; } + if (FCB->TdiReceiveClosed) + { + SocketStateUnlock(FCB); + return STATUS_FILE_CLOSED; + } + DatagramRecv = ExAllocatePool( NonPagedPool, DGSize ); if( DatagramRecv ) {

1 0

[cgutman] 53144: [AFD] - Fix shutdown() for datagram sockets - Share some code between SD_BOTH and SD_RECEIVE
by cgutman＠svn.reactos.org 08 Aug '11

08 Aug '11

Author: cgutman Date: Mon Aug 8 21:57:06 2011 New Revision: 53144 URL: http://svn.reactos.org/svn/reactos?rev=53144&view=rev Log: [AFD] - Fix shutdown() for datagram sockets - Share some code between SD_BOTH and SD_RECEIVE Modified: trunk/reactos/drivers/network/afd/afd/main.c trunk/reactos/drivers/network/afd/afd/read.c trunk/reactos/drivers/network/afd/afd/write.c Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Mon Aug 8 21:57:06 2011 @@ -680,38 +680,52 @@ return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0 ); - /* Shutdown(SD_SEND) */ + /* Send direction only */ if ((DisReq->DisconnectType & AFD_DISCONNECT_SEND) && !(DisReq->DisconnectType & AFD_DISCONNECT_RECV)) { /* Perform a controlled disconnect */ Flags = TDI_DISCONNECT_RELEASE; } - /* Shutdown(SD_RECEIVE) */ - else if ((DisReq->DisconnectType & AFD_DISCONNECT_RECV) && - !(DisReq->DisconnectType & AFD_DISCONNECT_SEND)) + /* Receive direction or both */ + else { /* Mark that we can't issue another receive request */ FCB->TdiReceiveClosed = TRUE; - /* Discard any pending data */ - FCB->Recv.Content = 0; - FCB->Recv.BytesUsed = 0; - - /* Mark us as overread to complete future reads with an error */ - FCB->Overread = TRUE; + /* These are only for connection-oriented sockets */ + if (!(FCB->Flags & AFD_ENDPOINT_CONNECTIONLESS)) + { + /* Try to cancel a pending TDI receive IRP if there was one in progress */ + if (FCB->ReceiveIrp.InFlightRequest) + IoCancelIrp(FCB->ReceiveIrp.InFlightRequest); + + /* Discard any pending data */ + FCB->Recv.Content = 0; + FCB->Recv.BytesUsed = 0; + + /* Mark us as overread to complete future reads with an error */ + FCB->Overread = TRUE; + + /* Set a successful close status to indicate a shutdown on overread */ + FCB->PollStatus[FD_CLOSE_BIT] = STATUS_SUCCESS; + } /* Clear the receive event */ FCB->PollState &= ~AFD_EVENT_RECEIVE; - /* We're done (no need to tell the TDI transport driver) */ - return UnlockAndMaybeComplete( FCB, STATUS_SUCCESS, Irp, 0 ); - } - /* Shutdown(SD_BOTH) */ - else - { - /* Perform an abortive disconnect */ - Flags = TDI_DISCONNECT_ABORT; + /* Receive direction only */ + if ((DisReq->DisconnectType & AFD_DISCONNECT_RECV) && + !(DisReq->DisconnectType & AFD_DISCONNECT_SEND)) + { + /* No need to tell the transport driver for receive direction only */ + return UnlockAndMaybeComplete( FCB, STATUS_SUCCESS, Irp, 0 ); + } + else + { + /* Perform an abortive disconnect */ + Flags = TDI_DISCONNECT_ABORT; + } } if (!(FCB->Flags & AFD_ENDPOINT_CONNECTIONLESS)) @@ -785,9 +799,10 @@ ExFreePool(FCB->RemoteAddress); FCB->RemoteAddress = NULL; + } - FCB->PollState &= ~AFD_EVENT_SEND; - } + FCB->PollState &= ~AFD_EVENT_SEND; + FCB->SendClosed = TRUE; } return UnlockAndMaybeComplete( FCB, Status, Irp, 0 ); Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Mon Aug 8 21:57:06 2011 @@ -27,8 +27,13 @@ { FCB->Recv.BytesUsed = 0; + /* We got closed while the receive was in progress */ + if (FCB->TdiReceiveClosed) + { + FCB->Recv.Content = 0; + } /* Receive successful with new data */ - if (Status == STATUS_SUCCESS && Information) + else if (Status == STATUS_SUCCESS && Information) { FCB->Recv.Content = Information; } @@ -693,6 +698,13 @@ return UnlockAndMaybeComplete ( FCB, STATUS_INVALID_PARAMETER, Irp, 0 ); } + + if (FCB->TdiReceiveClosed) + { + AFD_DbgPrint(MIN_TRACE,("Receive closed\n")); + return UnlockAndMaybeComplete(FCB, STATUS_FILE_CLOSED, Irp, 0); + } + if( !(RecvReq = LockRequest( Irp, IrpSp )) ) return UnlockAndMaybeComplete ( FCB, STATUS_NO_MEMORY, Irp, 0 ); Modified: trunk/reactos/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/wr… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] Mon Aug 8 21:57:06 2011 @@ -516,6 +516,13 @@ return UnlockAndMaybeComplete ( FCB, STATUS_INVALID_PARAMETER, Irp, 0 ); } + + if (FCB->SendClosed) + { + AFD_DbgPrint(MIN_TRACE,("No more sends\n")); + return UnlockAndMaybeComplete(FCB, STATUS_FILE_CLOSED, Irp, 0); + } + if( !(SendReq = LockRequest( Irp, IrpSp )) ) return UnlockAndMaybeComplete ( FCB, STATUS_NO_MEMORY, Irp, 0 );

1 0

[cgutman] 53143: [IP] - Merge r53134 and r53135 from the GSoC TCP/IP branch
by cgutman＠svn.reactos.org 08 Aug '11

08 Aug '11

Author: cgutman Date: Mon Aug 8 21:28:50 2011 New Revision: 53143 URL: http://svn.reactos.org/svn/reactos?rev=53143&view=rev Log: [IP] - Merge r53134 and r53135 from the GSoC TCP/IP branch Modified: trunk/reactos/lib/drivers/ip/transport/tcp/accept.c trunk/reactos/lib/drivers/ip/transport/tcp/event.c trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c Modified: trunk/reactos/lib/drivers/ip/transport/tcp/accept.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/accept.c [iso-8859-1] Mon Aug 8 21:28:50 2011 @@ -11,6 +11,8 @@ #include "precomp.h" #include "rosip.h" + +extern NPAGED_LOOKASIDE_LIST TdiBucketLookasideList; NTSTATUS TCPCheckPeerForAccept(PVOID Context, PTDI_REQUEST_KERNEL Request) @@ -118,7 +120,7 @@ { DereferenceObject(Bucket->AssociatedEndpoint); RemoveEntryList( &Bucket->Entry ); - ExFreePoolWithTag( Bucket, TDI_BUCKET_TAG ); + ExFreeToNPagedLookasideList(&TdiBucketLookasideList, Bucket); Found = TRUE; break; } @@ -143,9 +145,7 @@ LockObject(Listener, &OldIrql); - Bucket = (PTDI_BUCKET)ExAllocatePoolWithTag(NonPagedPool, - sizeof(*Bucket), - TDI_BUCKET_TAG ); + Bucket = ExAllocateFromNPagedLookasideList(&TdiBucketLookasideList); if (Bucket) { Modified: trunk/reactos/lib/drivers/ip/transport/tcp/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/event.c [iso-8859-1] Mon Aug 8 21:28:50 2011 @@ -30,6 +30,8 @@ "TIME_WAIT" }; +extern NPAGED_LOOKASIDE_LIST TdiBucketLookasideList; + static VOID BucketCompletionWorker(PVOID Context) @@ -43,7 +45,7 @@ DereferenceObject(Bucket->AssociatedEndpoint); - ExFreePoolWithTag(Bucket, TDI_BUCKET_TAG); + ExFreeToNPagedLookasideList(&TdiBucketLookasideList, Bucket); } VOID Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Mon Aug 8 21:28:50 2011 @@ -23,6 +23,8 @@ #include "rosip.h" +NPAGED_LOOKASIDE_LIST TdiBucketLookasideList; + VOID NTAPI DisconnectTimeoutDpc(PKDPC Dpc, PVOID DeferredContext, @@ -85,8 +87,8 @@ PCONNECTION_ENDPOINT TCPAllocateConnectionEndpoint( PVOID ClientContext ) { PCONNECTION_ENDPOINT Connection = (PCONNECTION_ENDPOINT) - ExAllocatePoolWithTag(NonPagedPool, sizeof(CONNECTION_ENDPOINT), - CONN_ENDPT_TAG); + ExAllocatePoolWithTag(NonPagedPool, sizeof(CONNECTION_ENDPOINT), CONN_ENDPT_TAG); + if (!Connection) return Connection; @@ -196,6 +198,14 @@ { return Status; } + + ExInitializeNPagedLookasideList(&TdiBucketLookasideList, + NULL, + NULL, + 0, + sizeof(TDI_BUCKET), + TDI_BUCKET_TAG, + 0); /* Initialize our IP library */ LibIPInitialize(); @@ -218,6 +228,8 @@ { if (!TCPInitialized) return STATUS_SUCCESS; + + ExDeleteNPagedLookasideList(&TdiBucketLookasideList); LibIPShutdown(); @@ -348,7 +360,7 @@ { connaddr.addr = RemoteAddress.Address.IPv4Address; - Bucket = ExAllocatePoolWithTag( NonPagedPool, sizeof(*Bucket), TDI_BUCKET_TAG ); + Bucket = ExAllocateFromNPagedLookasideList(&TdiBucketLookasideList); if (!Bucket) { UnlockObject(Connection, OldIrql); @@ -418,13 +430,13 @@ } /* We couldn't complete the request now because we need to wait for outstanding I/O */ - Bucket = ExAllocatePoolWithTag(NonPagedPool, sizeof(*Bucket), TDI_BUCKET_TAG); + Bucket = ExAllocateFromNPagedLookasideList(&TdiBucketLookasideList); if (!Bucket) { UnlockObject(Connection, OldIrql); return STATUS_NO_MEMORY; } - + Bucket->Request.RequestNotifyObject = (PVOID)Complete; Bucket->Request.RequestContext = Context; @@ -485,7 +497,7 @@ if (Status == STATUS_PENDING) { - Bucket = ExAllocatePoolWithTag(NonPagedPool, sizeof(*Bucket), TDI_BUCKET_TAG); + Bucket = ExAllocateFromNPagedLookasideList(&TdiBucketLookasideList); if (!Bucket) { TI_DbgPrint(DEBUG_TCP,("[IP, TCPReceiveData] Failed to allocate bucket\n")); @@ -544,7 +556,7 @@ if (Status == STATUS_PENDING) { /* Freed in TCPSocketState */ - Bucket = ExAllocatePoolWithTag( NonPagedPool, sizeof(*Bucket), TDI_BUCKET_TAG ); + Bucket = ExAllocateFromNPagedLookasideList(&TdiBucketLookasideList); if (!Bucket) { UnlockObject(Connection, OldIrql); @@ -659,7 +671,7 @@ if( Bucket->Request.RequestContext == Irp ) { RemoveEntryList( &Bucket->Entry ); - ExFreePoolWithTag( Bucket, TDI_BUCKET_TAG ); + ExFreeToNPagedLookasideList(&TdiBucketLookasideList, Bucket); Found = TRUE; break; }

1 0

[cgutman] 53142: - Just kidding. Fix it for real.
by cgutman＠svn.reactos.org 08 Aug '11

08 Aug '11

Author: cgutman Date: Mon Aug 8 21:27:08 2011 New Revision: 53142 URL: http://svn.reactos.org/svn/reactos?rev=53142&view=rev Log: - Just kidding. Fix it for real. Modified: trunk/reactos/drivers/network/afd/afd/main.c Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Mon Aug 8 21:27:08 2011 @@ -688,7 +688,8 @@ Flags = TDI_DISCONNECT_RELEASE; } /* Shutdown(SD_RECEIVE) */ - else if (DisReq->DisconnectType & AFD_DISCONNECT_RECV) + else if ((DisReq->DisconnectType & AFD_DISCONNECT_RECV) && + !(DisReq->DisconnectType & AFD_DISCONNECT_SEND)) { /* Mark that we can't issue another receive request */ FCB->TdiReceiveClosed = TRUE;

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2011