Ros-diffs January 2010

ros-diffs@reactos.org

26 participants
522 discussions

[cgutman] 45016: - Unlock the address file before calling IPSendDatagram - We don't need to be locked anymore at that point and it also causes problems with loopback packets - Use the TTL value stored in the address file for ICMP packets

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Jan 9 17:25:11 2010 New Revision: 45016 URL: http://svn.reactos.org/svn/reactos?rev=45016&view=rev Log: - Unlock the address file before calling IPSendDatagram - We don't need to be locked anymore at that point and it also causes problems with loopback packets - Use the TTL value stored in the address file for ICMP packets Modified: branches/aicom-network-branch/lib/drivers/ip/network/icmp.c branches/aicom-network-branch/lib/drivers/ip/transport/rawip/… [View More]rawip.c branches/aicom-network-branch/lib/drivers/ip/transport/udp/udp.c Modified: branches/aicom-network-branch/lib/drivers/ip/network/icmp.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/driver… ============================================================================== --- branches/aicom-network-branch/lib/drivers/ip/network/icmp.c [iso-8859-1] (original) +++ branches/aicom-network-branch/lib/drivers/ip/network/icmp.c [iso-8859-1] Sat Jan 9 17:25:11 2010 @@ -48,6 +48,7 @@ BOOLEAN PrepareICMPPacket( + PADDRESS_FILE AddrFile, PIP_INTERFACE Interface, PIP_PACKET IPPacket, PIP_ADDRESS Destination, @@ -114,8 +115,11 @@ IPHeader->Id = (USHORT)Random(); /* One fragment at offset 0 */ IPHeader->FlagsFragOfs = 0; - /* Time-to-Live is 128 */ - IPHeader->Ttl = 128; + /* Set TTL */ + if (AddrFile) + IPHeader->Ttl = AddrFile->TTL; + else + IPHeader->Ttl = 128; /* Internet Control Message Protocol */ IPHeader->Protocol = IPPROTO_ICMP; /* Checksum is 0 (for later calculation of this) */ @@ -205,30 +209,27 @@ } } - Status = PrepareICMPPacket( NCE->Interface, + Status = PrepareICMPPacket( AddrFile, + NCE->Interface, &Packet, &RemoteAddress, BufferData, DataSize ); + UnlockObject(AddrFile, OldIrql); + if( !NT_SUCCESS(Status) ) - { - UnlockObject(AddrFile, OldIrql); return Status; - } TI_DbgPrint(MID_TRACE,("About to send datagram\n")); if (!NT_SUCCESS(Status = IPSendDatagram( &Packet, NCE, ICMPSendPacketComplete, NULL ))) { - UnlockObject(AddrFile, OldIrql); FreeNdisPacket(Packet.NdisPacket); return Status; } TI_DbgPrint(MID_TRACE,("Leaving\n")); - - UnlockObject(AddrFile, OldIrql); return STATUS_SUCCESS; } @@ -352,7 +353,7 @@ DataSize = IPPacket->TotalSize - IPPacket->HeaderSize; - if( !PrepareICMPPacket(Interface, &NewPacket, &IPPacket->SrcAddr, + if( !PrepareICMPPacket(NULL, Interface, &NewPacket, &IPPacket->SrcAddr, IPPacket->Data, DataSize) ) return; ((PICMP_HEADER)NewPacket.Data)->Type = Type; Modified: branches/aicom-network-branch/lib/drivers/ip/transport/rawip/rawip.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/driver… ============================================================================== --- branches/aicom-network-branch/lib/drivers/ip/transport/rawip/rawip.c [iso-8859-1] (original) +++ branches/aicom-network-branch/lib/drivers/ip/transport/rawip/rawip.c [iso-8859-1] Sat Jan 9 17:25:11 2010 @@ -249,24 +249,20 @@ BufferData, DataSize ); + UnlockObject(AddrFile, OldIrql); + if( !NT_SUCCESS(Status) ) - { - UnlockObject(AddrFile, OldIrql); return Status; - } TI_DbgPrint(MID_TRACE,("About to send datagram\n")); if (!NT_SUCCESS(Status = IPSendDatagram( &Packet, NCE, RawIpSendPacketComplete, NULL ))) { - UnlockObject(AddrFile, OldIrql); FreeNdisPacket(Packet.NdisPacket); return Status; } TI_DbgPrint(MID_TRACE,("Leaving\n")); - - UnlockObject(AddrFile, OldIrql); return STATUS_SUCCESS; } Modified: branches/aicom-network-branch/lib/drivers/ip/transport/udp/udp.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/lib/driver… ============================================================================== --- branches/aicom-network-branch/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] (original) +++ branches/aicom-network-branch/lib/drivers/ip/transport/udp/udp.c [iso-8859-1] Sat Jan 9 17:25:11 2010 @@ -224,20 +224,16 @@ BufferData, DataSize ); + UnlockObject(AddrFile, OldIrql); + if( !NT_SUCCESS(Status) ) - { - UnlockObject(AddrFile, OldIrql); return Status; - } if (!NT_SUCCESS(Status = IPSendDatagram( &Packet, NCE, UDPSendPacketComplete, NULL ))) { - UnlockObject(AddrFile, OldIrql); FreeNdisPacket(Packet.NdisPacket); return Status; } - - UnlockObject(AddrFile, OldIrql); return STATUS_SUCCESS; } [View Less]

15 years, 5 months

[cgutman] 45015: - Store the address file handle in the IOSB - MSAFD relies on this behavior to store the address file handle

by cgutman＠svn.reactos.org

Author: cgutman Date: Sat Jan 9 16:49:39 2010 New Revision: 45015 URL: http://svn.reactos.org/svn/reactos?rev=45015&view=rev Log: - Store the address file handle in the IOSB - MSAFD relies on this behavior to store the address file handle Modified: branches/aicom-network-branch/drivers/network/afd/afd/bind.c Modified: branches/aicom-network-branch/drivers/network/afd/afd/bind.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/drivers/ne… ======================… [View More]

15 years, 5 months

[sir_richard] 45014: Trap handlers in C patch 6 of X: [NTOS]: Implement Trap 7 and 16 in C. These are the last two FPU/NPX traps. Not really good with x86 FPU stuff, so there might be some mistakes to look over later. [NTOS]: Fixed a bug in Trap 19 handler (forgot to write CR0 back).

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Sat Jan 9 16:07:44 2010 New Revision: 45014 URL: http://svn.reactos.org/svn/reactos?rev=45014&view=rev Log: Trap handlers in C patch 6 of X: [NTOS]: Implement Trap 7 and 16 in C. These are the last two FPU/NPX traps. Not really good with x86 FPU stuff, so there might be some mistakes to look over later. [NTOS]: Fixed a bug in Trap 19 handler (forgot to write CR0 back). Modified: trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h trunk/… [View More]reactos/ntoskrnl/include/internal/trap_x.h trunk/reactos/ntoskrnl/ke/i386/trap.s trunk/reactos/ntoskrnl/ke/i386/traphdlr.c Modified: trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h [iso-8859-1] Sat Jan 9 16:07:44 2010 @@ -27,7 +27,21 @@ { __asm__ __volatile__ ("fnsave %0\n wait\n" : : "m"(SaveArea)); } - +} + +FORCEINLINE +VOID +Ke386LoadFpuState(IN PFX_SAVE_AREA SaveArea) +{ + extern ULONG KeI386FxsrPresent; + if (KeI386FxsrPresent) + { + __asm__ __volatile__ ("fxrstor %0\n" : "=m"(SaveArea) : ); + } + else + { + __asm__ __volatile__ (".globl _FrRestore\n _FrRestore: \n frstor %0\n wait\n" : "=m"(SaveArea) : ); + } } FORCEINLINE Modified: trunk/reactos/ntoskrnl/include/internal/trap_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] Sat Jan 9 16:07:44 2010 @@ -137,6 +137,13 @@ ((KiUserTrap(TrapFrame)) && (PsGetCurrentProcess()->VdmObjects))); } +PFX_SAVE_AREA +FORCEINLINE +KiGetThreadNpxArea(IN PKTHREAD Thread) +{ + return (PFX_SAVE_AREA)((ULONG_PTR)Thread->InitialStack - sizeof(FX_SAVE_AREA)); +} + VOID FORCEINLINE KiTrapFrameFromPushaStack(IN PKTRAP_FRAME TrapFrame) Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] Sat Jan 9 16:07:44 2010 @@ -693,317 +693,7 @@ GENERATE_TRAP_HANDLER KiTrap4, 1 GENERATE_TRAP_HANDLER KiTrap5, 1 GENERATE_TRAP_HANDLER KiTrap6, 1 - -.func KiTrap7 -TRAP_FIXUPS kit7_a, kit7_t, DoFixupV86, DoNotFixupAbios -_KiTrap7: - /* Push error code */ - push 0 - - /* Enter trap */ - TRAP_PROLOG kit7_a, kit7_t - - /* Get the current thread and stack */ -StartTrapHandle: - mov eax, PCR[KPCR_CURRENT_THREAD] - mov ecx, [eax+KTHREAD_INITIAL_STACK] - sub ecx, NPX_FRAME_LENGTH - - /* Check if emulation is enabled */ - test byte ptr [ecx+FN_CR0_NPX_STATE], CR0_EM - jnz EmulationEnabled - -CheckState: - /* Check if the NPX state is loaded */ - cmp byte ptr [eax+KTHREAD_NPX_STATE], NPX_STATE_LOADED - mov ebx, cr0 - jz IsLoaded - - /* Remove flags */ - and ebx, ~(CR0_MP + CR0_TS + CR0_EM) - mov cr0, ebx - - /* Check the NPX thread */ - mov edx, PCR[KPCR_NPX_THREAD] - or edx, edx - jz NoNpxThread - - /* Get the NPX Stack */ - mov esi, [edx+KTHREAD_INITIAL_STACK] - sub esi, NPX_FRAME_LENGTH - - /* Check if we have FXSR and check which operand to use */ - test byte ptr _KeI386FxsrPresent, 1 - jz FnSave - fxsave [esi] - jmp AfterSave - -FnSave: - fnsave [esi] - -AfterSave: - /* Set the thread's state to dirty */ - mov byte ptr [edx+KTHREAD_NPX_STATE], NPX_STATE_NOT_LOADED - -NoNpxThread: - /* Check if we have FXSR and choose which operand to use */ - test byte ptr _KeI386FxsrPresent, 1 - jz FrRestore - fxrstor [ecx] - jmp AfterRestore - -FrRestore: - frstor [ecx] - -AfterRestore: - /* Set state loaded */ - mov byte ptr [eax+KTHREAD_NPX_STATE], NPX_STATE_LOADED - mov PCR[KPCR_NPX_THREAD], eax - - /* Enable interrupts to happen now */ - sti - nop - - /* Check if CR0 needs to be reloaded due to a context switch */ - cmp dword ptr [ecx+FN_CR0_NPX_STATE], 0 - jz _Kei386EoiHelper@0 - - /* We have to reload CR0... disable interrupts */ - cli - - /* Get CR0 and update it */ - mov ebx, cr0 - or ebx, [ecx+FN_CR0_NPX_STATE] - mov cr0, ebx - - /* Restore interrupts and check if TS is back on */ - sti - test bl, CR0_TS - jz _Kei386EoiHelper@0 - - /* Clear TS, and loop handling again */ - clts - cli - jmp StartTrapHandle - -KernelNpx: - - /* Set delayed error */ - or dword ptr [ecx+FN_CR0_NPX_STATE], CR0_TS - - /* Check if this happened during restore */ - cmp dword ptr [ebp+KTRAP_FRAME_EIP], offset FrRestore - jnz UserNpx - - /* Skip instruction and dispatch the exception */ - add dword ptr [ebp+KTRAP_FRAME_EIP], 3 - jmp _Kei386EoiHelper@0 - -IsLoaded: - /* Check if TS is set */ - test bl, CR0_TS - jnz TsSetOnLoadedState - -HandleNpxFault: - /* Check if the trap came from V86 mode */ - test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK - jnz V86Npx - - /* Check if it came from kernel mode */ - test byte ptr [ebp+KTRAP_FRAME_CS], MODE_MASK - jz KernelNpx - - /* Check if it came from a VDM */ - cmp word ptr [ebp+KTRAP_FRAME_CS], KGDT_R3_CODE + RPL_MASK - jne V86Npx - -UserNpx: - /* Get the current thread */ - mov eax, PCR[KPCR_CURRENT_THREAD] - - /* Check NPX state */ - cmp byte ptr [eax+KTHREAD_NPX_STATE], NPX_STATE_NOT_LOADED - - /* Get the NPX save area */ - mov ecx, [eax+KTHREAD_INITIAL_STACK] - lea ecx, [ecx-NPX_FRAME_LENGTH] - jz NoSaveRestore - -HandleUserNpx: - - /* Set new CR0 */ - mov ebx, cr0 - and ebx, ~(CR0_MP + CR0_EM + CR0_TS) - mov cr0, ebx - - /* Check if we have FX support */ - test byte ptr _KeI386FxsrPresent, 1 - jz FnSave2 - - /* Save the state */ - fxsave [ecx] - jmp MakeCr0Dirty -FnSave2: - fnsave [ecx] - wait - -MakeCr0Dirty: - /* Make CR0 state not loaded */ - or ebx, NPX_STATE_NOT_LOADED - or ebx, [ecx+FN_CR0_NPX_STATE] - mov cr0, ebx - - /* Update NPX state */ - mov byte ptr [eax+KTHREAD_NPX_STATE], NPX_STATE_NOT_LOADED - mov dword ptr PCR[KPCR_NPX_THREAD], 0 - -NoSaveRestore: - /* Clear the TS bit and re-enable interrupts */ - and dword ptr [ecx+FN_CR0_NPX_STATE], ~CR0_TS - sti - - /* Check if we have FX support */ - test byte ptr _KeI386FxsrPresent, 1 - jz FnError - - /* Get error offset, control and status words */ - mov ebx, [ecx+FX_ERROR_OFFSET] - movzx eax, word ptr [ecx+FX_CONTROL_WORD] - movzx edx, word ptr [ecx+FX_STATUS_WORD] - - /* Get the faulting opcode */ - mov esi, [ecx+FX_DATA_OFFSET] - jmp CheckError - -FnError: - /* Get error offset, control and status words */ - mov ebx, [ecx+FP_ERROR_OFFSET] - movzx eax, word ptr [ecx+FP_CONTROL_WORD] - movzx edx, word ptr [ecx+FP_STATUS_WORD] - - /* Get the faulting opcode */ - mov esi, [ecx+FP_DATA_OFFSET] - -CheckError: - /* Mask exceptions */ - and eax, 0x3F - not eax - and eax, edx - - /* Check if what's left is invalid */ - test al, 1 - jz ValidNpxOpcode - - /* Check if it was a stack fault */ - test al, 64 - jnz InvalidStack - - /* Raise exception */ - mov eax, STATUS_FLOAT_INVALID_OPERATION - jmp _DispatchOneParamZero - -InvalidStack: - - /* Raise exception */ - mov eax, STATUS_FLOAT_STACK_CHECK - jmp _DispatchTwoParamZero - -ValidNpxOpcode: - - /* Check for divide by 0 */ - test al, 4 - jz 1f - - /* Raise exception */ - mov eax, STATUS_FLOAT_DIVIDE_BY_ZERO - jmp _DispatchOneParamZero - -1: - /* Check for denormal */ - test al, 2 - jz 1f - - /* Raise exception */ - mov eax, STATUS_FLOAT_INVALID_OPERATION - jmp _DispatchOneParamZero - -1: - /* Check for overflow */ - test al, 8 - jz 1f - - /* Raise exception */ - mov eax, STATUS_FLOAT_OVERFLOW - jmp _DispatchOneParamZero - -1: - /* Check for underflow */ - test al, 16 - jz 1f - - /* Raise exception */ - mov eax, STATUS_FLOAT_UNDERFLOW - jmp _DispatchOneParamZero - -1: - /* Check for precision fault */ - test al, 32 - jz UnexpectedNpx - - /* Raise exception */ - mov eax, STATUS_FLOAT_INEXACT_RESULT - jmp _DispatchOneParamZero - -UnexpectedNpx: - - /* Strange result, bugcheck the OS */ - sti - push ebp - push 0 - push 0 - push eax - push 1 - push TRAP_CAUSE_UNKNOWN - call _KeBugCheckWithTf@24 - -V86Npx: - /* Check if this is a VDM */ - mov eax, PCR[KPCR_CURRENT_THREAD] - mov ebx, [eax+KTHREAD_APCSTATE_PROCESS] - cmp dword ptr [ebx+EPROCESS_VDM_OBJECTS], 0 - jz HandleUserNpx - - /* V86 NPX not handled */ - UNHANDLED_V86_PATH - -EmulationEnabled: - /* Did this come from kernel-mode? */ - cmp word ptr [ebp+KTRAP_FRAME_CS], KGDT_R0_CODE - jz CheckState - - /* It came from user-mode, so this would only be valid inside a VDM */ - /* Since we don't actually have VDMs in ROS, bugcheck. */ - jmp UnexpectedNpx - -TsSetOnLoadedState: - /* TS shouldn't be set, unless this we don't have a Math Processor */ - test bl, CR0_MP - jnz BogusTrap - - /* Strange that we got a trap at all, but ignore and continue */ - clts - jmp _Kei386EoiHelper@0 - -BogusTrap: - /* Cause a bugcheck */ - push 0 - push 0 - push ebx - push 2 - push TRAP_CAUSE_UNKNOWN - call _KeBugCheckEx@20 -.endfunc - +GENERATE_TRAP_HANDLER KiTrap7, 1 GENERATE_TRAP_HANDLER KiTrap8, 0 GENERATE_TRAP_HANDLER KiTrap9, 1 GENERATE_TRAP_HANDLER KiTrap10, 0 @@ -1496,33 +1186,7 @@ GENERATE_TRAP_HANDLER KiTrap14, 0 GENERATE_TRAP_HANDLER KiTrap0F, 1 - -.func KiTrap16 -TRAP_FIXUPS kit10_a, kit10_t, DoFixupV86, DoNotFixupAbios -_KiTrap16: - /* Push error code */ - push 0 - - /* Enter trap */ - TRAP_PROLOG kit10_a, kit10_t - - /* Check if this is the NPX Thread */ - mov eax, PCR[KPCR_CURRENT_THREAD] - cmp eax, PCR[KPCR_NPX_THREAD] - - /* Get the initial stack and NPX frame */ - mov ecx, [eax+KTHREAD_INITIAL_STACK] - lea ecx, [ecx-NPX_FRAME_LENGTH] - - /* If this is a valid fault, handle it */ - jz HandleNpxFault - - /* Otherwise, re-enable interrupts and set delayed error */ - sti - or dword ptr [ecx+FN_CR0_NPX_STATE], CR0_TS - jmp _Kei386EoiHelper@0 -.endfunc - +GENERATE_TRAP_HANDLER KiTrap16, 1 GENERATE_TRAP_HANDLER KiTrap17, 1 GENERATE_TRAP_HANDLER KiTrap19, 1 Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Sat Jan 9 16:07:44 2010 @@ -249,6 +249,163 @@ Parameter2, Parameter3, TrapFrame); +} + +VOID +FASTCALL +KiNpxHandler(IN PKTRAP_FRAME TrapFrame, + IN PKTHREAD Thread, + IN PFX_SAVE_AREA SaveArea) +{ + ULONG Cr0, Mask, Error, ErrorOffset, DataOffset; + extern VOID FrRestore(VOID); + + /* Check for VDM trap */ + ASSERT((KiVdmTrap(TrapFrame)) == FALSE); + + /* Check for kernel trap */ + if (!KiUserTrap(TrapFrame)) + { + /* Kernel might've tripped a delayed error */ + SaveArea->Cr0NpxState |= CR0_TS; + + /* Only valid if it happened during a restore */ + if ((PVOID)TrapFrame->Eip == FrRestore) + { + /* It did, so just skip the instruction */ + TrapFrame->Eip += 3; /* sizeof(FRSTOR) */ + KiEoiHelper(TrapFrame); + } + } + + /* User or kernel trap -- get ready to issue an exception */ + if (Thread->NpxState == NPX_STATE_NOT_LOADED) + { + /* Update CR0 */ + Cr0 = __readcr0(); + Cr0 &= ~(CR0_MP | CR0_EM | CR0_TS); + __writecr0(Cr0); + + /* Save FPU state */ + Ke386SaveFpuState(SaveArea); + + /* Mark CR0 state dirty */ + Cr0 |= NPX_STATE_NOT_LOADED; + Cr0 |= SaveArea->Cr0NpxState; + __writecr0(Cr0); + + /* Update NPX state */ + Thread->NpxState = NPX_STATE_NOT_LOADED; + KeGetCurrentPrcb()->NpxThread = NULL; + } + + /* Clear the TS bit and re-enable interrupts */ + SaveArea->Cr0NpxState &= ~CR0_TS; + _enable(); + + /* Check if we should get the FN or FX error */ + if (KeI386FxsrPresent) + { + /* Get it from FX */ + Mask = SaveArea->U.FxArea.ControlWord; + Error = SaveArea->U.FxArea.StatusWord; + + /* Get the FPU exception address too */ + ErrorOffset = SaveArea->U.FxArea.ErrorOffset; + DataOffset = SaveArea->U.FxArea.DataOffset; + } + else + { + /* Get it from FN */ + Mask = SaveArea->U.FnArea.ControlWord; + Error = SaveArea->U.FnArea.StatusWord; + + /* Get the FPU exception address too */ + ErrorOffset = SaveArea->U.FnArea.ErrorOffset; + DataOffset = SaveArea->U.FnArea.DataOffset; + } + + /* Get legal exceptions that software should handle */ + Error &= (FSW_INVALID_OPERATION | + FSW_DENORMAL | + FSW_ZERO_DIVIDE | + FSW_OVERFLOW | + FSW_UNDERFLOW | + FSW_PRECISION); + Error &= ~Mask; + + if (Error & FSW_STACK_FAULT) + { + /* Issue stack check fault */ + KiDispatchException2Args(STATUS_FLOAT_STACK_CHECK, + ErrorOffset, + 0, + DataOffset, + TrapFrame); + } + + /* Check for invalid operation */ + if (Error & FSW_INVALID_OPERATION) + { + /* Issue fault */ + KiDispatchException1Args(STATUS_FLOAT_INVALID_OPERATION, + ErrorOffset, + 0, + TrapFrame); + } + + /* Check for divide by zero */ + if (Error & FSW_ZERO_DIVIDE) + { + /* Issue fault */ + KiDispatchException1Args(STATUS_FLOAT_DIVIDE_BY_ZERO, + ErrorOffset, + 0, + TrapFrame); + } + + /* Check for denormal */ + if (Error & FSW_DENORMAL) + { + /* Issue fault */ + KiDispatchException1Args(STATUS_FLOAT_INVALID_OPERATION, + ErrorOffset, + 0, + TrapFrame); + } + + /* Check for overflow */ + if (Error & FSW_OVERFLOW) + { + /* Issue fault */ + KiDispatchException1Args(STATUS_FLOAT_OVERFLOW, + ErrorOffset, + 0, + TrapFrame); + } + + /* Check for underflow */ + if (Error & FSW_UNDERFLOW) + { + /* Issue fault */ + KiDispatchException1Args(STATUS_FLOAT_UNDERFLOW, + ErrorOffset, + 0, + TrapFrame); + } + + /* Check for precision fault */ + if (Error & FSW_PRECISION) + { + /* Issue fault */ + KiDispatchException1Args(STATUS_FLOAT_INEXACT_RESULT, + ErrorOffset, + 0, + TrapFrame); + } + + /* Unknown FPU fault */ + KeBugCheckWithTf(TRAP_CAUSE_UNKNOWN, 1, Error, 0, 0, TrapFrame); } VOID @@ -385,6 +542,115 @@ TrapFrame->Eip, TrapFrame); +} + +VOID +FASTCALL +KiTrap7Handler(IN PKTRAP_FRAME TrapFrame) +{ + PKTHREAD Thread, NpxThread; + PFX_SAVE_AREA SaveArea, NpxSaveArea; + ULONG Cr0; + + /* Save trap frame */ + KiEnterTrap(TrapFrame); + + /* Try to handle NPX delay load */ + while (TRUE) + { + /* Get the current thread */ + Thread = KeGetCurrentThread(); + + /* Get the NPX frame */ + SaveArea = KiGetThreadNpxArea(Thread); + + /* Check if emulation is enabled */ + if (SaveArea->Cr0NpxState & CR0_EM) + { + /* Not implemented */ + UNIMPLEMENTED; + while (TRUE); + } + + /* Save CR0 and check NPX state */ + Cr0 = __readcr0(); + if (Thread->NpxState != NPX_STATE_LOADED) + { + /* Update CR0 */ + Cr0 &= ~(CR0_MP | CR0_EM | CR0_TS); + __writecr0(Cr0); + + /* Get the NPX thread */ + NpxThread = KeGetCurrentPrcb()->NpxThread; + if (NpxThread) + { + /* Get the NPX frame */ + NpxSaveArea = KiGetThreadNpxArea(NpxThread); + + /* Save FPU state */ + Ke386SaveFpuState(NpxSaveArea); + + /* Update NPX state */ + Thread->NpxState = NPX_STATE_NOT_LOADED; + } + + /* Load FPU state */ + Ke386LoadFpuState(SaveArea); + + /* Update NPX state */ + Thread->NpxState = NPX_STATE_LOADED; + KeGetCurrentPrcb()->NpxThread = Thread; + + /* Enable interrupts */ + _enable(); + + /* Check if CR0 needs to be reloaded due to context switch */ + if (!SaveArea->Cr0NpxState) KiEoiHelper(TrapFrame); + + /* Otherwise, we need to reload CR0, disable interrupts */ + _disable(); + + /* Reload CR0 */ + Cr0 = __readcr0(); + Cr0 |= SaveArea->Cr0NpxState; + __writecr0(Cr0); + + /* Now restore interrupts and check for TS */ + _enable(); + if (Cr0 & CR0_TS) KiEoiHelper(TrapFrame); + + /* We're still here -- clear TS and try again */ + __writecr0(__readcr0() &~ CR0_TS); + _disable(); + } + else + { + /* This is an actual fault, not a lack of FPU state */ + break; + } + } + + /* TS should not be set */ + if (Cr0 & CR0_TS) + { + /* + * If it's incorrectly set, then maybe the state is actually still valid + * but we could've lock track of that due to a BIOS call. + * Make sure MP is still set, which should verify the theory. + */ + if (Cr0 & CR0_MP) + { + /* Indeed, the state is actually still valid, so clear TS */ + __writecr0(__readcr0() &~ CR0_TS); + KiEoiHelper(TrapFrame); + } + + /* Otherwise, something strange is going on */ + KeBugCheckWithTf(TRAP_CAUSE_UNKNOWN, 2, Cr0, 0, 0, TrapFrame); + } + + /* It's not a delayed load, so process this trap as an NPX fault */ + KiNpxHandler(TrapFrame, Thread, SaveArea); } VOID @@ -581,6 +847,34 @@ KiSystemFatalException(EXCEPTION_RESERVED_TRAP, TrapFrame); } + +VOID +FASTCALL +KiTrap16Handler(IN PKTRAP_FRAME TrapFrame) +{ + PKTHREAD Thread; + PFX_SAVE_AREA SaveArea; + + /* Save trap frame */ + KiEnterTrap(TrapFrame); + + /* Check if this is the NPX thrad */ + Thread = KeGetCurrentThread(); + SaveArea = KiGetThreadNpxArea(Thread); + if (Thread != KeGetCurrentPrcb()->NpxThread) + { + /* It isn't, enable interrupts and set delayed error */ + _enable(); + SaveArea->Cr0NpxState |= CR0_TS; + + /* End trap */ + KiEoiHelper(TrapFrame); + } + + /* Otherwise, proceed with NPX fault handling */ + KiNpxHandler(TrapFrame, Thread, SaveArea); +} + VOID FASTCALL KiTrap17Handler(IN PKTRAP_FRAME TrapFrame) @@ -613,7 +907,7 @@ } /* Get the NPX frame */ - SaveArea = (PFX_SAVE_AREA)((ULONG_PTR)Thread->InitialStack - sizeof(FX_SAVE_AREA)); + SaveArea = KiGetThreadNpxArea(Thread); /* Check for VDM trap */ ASSERT((KiVdmTrap(TrapFrame)) == FALSE); @@ -636,6 +930,7 @@ /* Mark CR0 state dirty */ Cr0 |= NPX_STATE_NOT_LOADED; Cr0 |= SaveArea->Cr0NpxState; + __writecr0(Cr0); /* Update NPX state */ Thread->NpxState = NPX_STATE_NOT_LOADED; [View Less]

15 years, 5 months

[jimtabor] 45013: [User32] - Add corrected behavior for SetWindowRgn, delete region object after setting windows region. See bug 4980. - After a successful call to SetWindowRgn, the system owns the region specified by the region handle hRgn. The system does not make a copy of the region. Thus, you should not make any further function calls with this region handle. In particular, do not delete this region handle. The system deletes the region handle when it no longer needed. - References : http:/

by jimtabor＠svn.reactos.org

Author: jimtabor Date: Sat Jan 9 07:16:51 2010 New Revision: 45013 URL: http://svn.reactos.org/svn/reactos?rev=45013&view=rev Log: [User32] - Add corrected behavior for SetWindowRgn, delete region object after setting windows region. See bug 4980. - After a successful call to SetWindowRgn, the system owns the region specified by the region handle hRgn. The system does not make a copy of the region. Thus, you should not make any further function calls with this region handle. In particular,… [View More]

15 years, 5 months

[arty] 45012: Fix copy/paste error. We weren't using a page from the resources struct.

by arty＠svn.reactos.org

Author: arty Date: Fri Jan 8 23:24:55 2010 New Revision: 45012 URL: http://svn.reactos.org/svn/reactos?rev=45012&view=rev Log: Fix copy/paste error. We weren't using a page from the resources struct. Modified: branches/arty-newcc/ntoskrnl/mm/section/fault.c Modified: branches/arty-newcc/ntoskrnl/mm/section/fault.c URL: http://svn.reactos.org/svn/reactos/branches/arty-newcc/ntoskrnl/mm/section/… ============================================================================== --- … [View More]

15 years, 5 months

[martinf] 45011: avoid warning messages on Explorer startup when missing configuration files

by martinf＠svn.reactos.org

Author: martinf Date: Fri Jan 8 22:51:43 2010 New Revision: 45011 URL: http://svn.reactos.org/svn/reactos?rev=45011&view=rev Log: avoid warning messages on Explorer startup when missing configuration files Modified: trunk/reactos/base/shell/explorer/explorer.cpp trunk/reactos/base/shell/explorer/taskbar/favorites.cpp Modified: trunk/reactos/base/shell/explorer/explorer.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… =========================… [View More]

15 years, 5 months

[sir_richard] 45010: Trap handlers in C Patch 5 of X: [NDK]: Add FSW defines for FPU exception bits. [NTOS]: Convert trap 19 (XMMI exception) to C.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Fri Jan 8 20:24:10 2010 New Revision: 45010 URL: http://svn.reactos.org/svn/reactos?rev=45010&view=rev Log: Trap handlers in C Patch 5 of X: [NDK]: Add FSW defines for FPU exception bits. [NTOS]: Convert trap 19 (XMMI exception) to C. Modified: trunk/reactos/include/ndk/i386/ketypes.h trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h trunk/reactos/ntoskrnl/include/internal/trap_x.h trunk/reactos/ntoskrnl/ke/i386/trap.s trunk/… [View More]reactos/ntoskrnl/ke/i386/traphdlr.c Modified: trunk/reactos/include/ndk/i386/ketypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/i386/ketypes.h… ============================================================================== --- trunk/reactos/include/ndk/i386/ketypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/i386/ketypes.h [iso-8859-1] Fri Jan 8 20:24:10 2010 @@ -104,6 +104,17 @@ #define EFLAGS_USER_SANITIZE 0x3F4DD7 #define EFLAG_SIGN 0x8000 #define EFLAG_ZERO 0x4000 + +// +// Legacy floating status word bit masks. +// +#define FSW_INVALID_OPERATION 0x1 +#define FSW_DENORMAL 0x2 +#define FSW_ZERO_DIVIDE 0x4 +#define FSW_OVERFLOW 0x8 +#define FSW_UNDERFLOW 0x10 +#define FSW_PRECISION 0x20 +#define FSW_STACK_FAULT 0x40 // // IPI Types Modified: trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/intrin_i.h [iso-8859-1] Fri Jan 8 20:24:10 2010 @@ -13,6 +13,22 @@ : "=m" (*X) \ : /* no input */ \ : "memory"); + +FORCEINLINE +VOID +Ke386SaveFpuState(IN PFX_SAVE_AREA SaveArea) +{ + extern ULONG KeI386FxsrPresent; + if (KeI386FxsrPresent) + { + __asm__ __volatile__ ("fxsave %0\n" : : "m"(SaveArea)); + } + else + { + __asm__ __volatile__ ("fnsave %0\n wait\n" : : "m"(SaveArea)); + } + +} FORCEINLINE USHORT Modified: trunk/reactos/ntoskrnl/include/internal/trap_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/trap_x.h [iso-8859-1] Fri Jan 8 20:24:10 2010 @@ -222,6 +222,17 @@ VOID FORCEINLINE +KiDispatchException1Args(IN NTSTATUS Code, + IN ULONG_PTR Address, + IN ULONG P1, + IN PKTRAP_FRAME TrapFrame) +{ + /* Helper for exceptions with no arguments */ + KiDispatchExceptionFromTrapFrame(Code, Address, 1, P1, 0, 0, TrapFrame); +} + +VOID +FORCEINLINE KiDispatchException2Args(IN NTSTATUS Code, IN ULONG_PTR Address, IN ULONG P1, Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] Fri Jan 8 20:24:10 2010 @@ -1524,178 +1524,7 @@ .endfunc GENERATE_TRAP_HANDLER KiTrap17, 1 - -.func KiTrap19 -TRAP_FIXUPS kit19_a, kit19_t, DoFixupV86, DoNotFixupAbios -_KiTrap19: - /* Push error code */ - push 0 - - /* Enter trap */ - TRAP_PROLOG kit19_a, kit19_t - - /* Check if this is the NPX Thread */ - mov eax, PCR[KPCR_CURRENT_THREAD] - cmp eax, PCR[KPCR_NPX_THREAD] - - /* If this is a valid fault, handle it */ - jz HandleXmmiFault - - /* Otherwise, bugcheck */ - mov eax, 19 - jmp _KiSystemFatalException - -HandleXmmiFault: - /* Get the initial stack and NPX frame */ - mov ecx, [eax+KTHREAD_INITIAL_STACK] - lea ecx, [ecx-NPX_FRAME_LENGTH] - - /* Check if the trap came from V86 mode */ - test dword ptr [ebp+KTRAP_FRAME_EFLAGS], EFLAGS_V86_MASK - jnz V86Xmmi - - /* Check if it came from kernel mode */ - test byte ptr [ebp+KTRAP_FRAME_CS], MODE_MASK - jz KernelXmmi - - /* Check if it came from a VDM */ - cmp word ptr [ebp+KTRAP_FRAME_CS], KGDT_R3_CODE + RPL_MASK - jne VdmXmmi - -HandleUserXmmi: - /* Set new CR0 */ - mov ebx, cr0 - and ebx, ~(CR0_MP + CR0_EM + CR0_TS) - mov cr0, ebx - - /* Check if we have FX support */ - test byte ptr _KeI386FxsrPresent, 1 - jz XmmiFnSave2 - - /* Save the state */ - fxsave [ecx] - jmp XmmiMakeCr0Dirty -XmmiFnSave2: - fnsave [ecx] - wait - -XmmiMakeCr0Dirty: - /* Make CR0 state not loaded */ - or ebx, NPX_STATE_NOT_LOADED - or ebx, [ecx+FN_CR0_NPX_STATE] - mov cr0, ebx - - /* Update NPX state */ - mov byte ptr [eax+KTHREAD_NPX_STATE], NPX_STATE_NOT_LOADED - mov dword ptr PCR[KPCR_NPX_THREAD], 0 - - /* Clear the TS bit and re-enable interrupts */ - and dword ptr [ecx+FN_CR0_NPX_STATE], ~CR0_TS - - /* Re-enable interrupts for user-mode and send the exception */ - sti - mov ebx, [ebp+KTRAP_FRAME_EIP] - - /* Get MxCSR and get current mask (bits 7-12) */ - movzx eax, word ptr [ecx+FX_MXCSR] - mov edx, eax - shr edx, 7 - not edx - - /* Set faulting opcode address to 0 */ - mov esi, 0 - - /* Apply legal exceptions mask */ - and eax, 0x3f - - /* Apply the mask we got in MXCSR itself */ - and eax, edx - - /* Check for invalid operation */ - test al, 1 - jz 1f - - /* Raise exception */ - mov eax, STATUS_FLOAT_MULTIPLE_TRAPS - jmp _DispatchOneParamZero - -1: - /* Check for zero divide */ - test al, 2 - jz 1f - - /* Raise exception */ - mov eax, STATUS_FLOAT_MULTIPLE_TRAPS - jmp _DispatchOneParamZero - -1: - /* Check for denormal */ - test al, 4 - jz 1f - - /* Raise exception */ - mov eax, STATUS_FLOAT_MULTIPLE_TRAPS - jmp _DispatchOneParamZero - -1: - /* Check for overflow*/ - test al, 8 - jz 1f - - /* Raise exception */ - mov eax, STATUS_FLOAT_MULTIPLE_FAULTS - jmp _DispatchOneParamZero - -1: - /* Check for denormal */ - test al, 16 - jz 1f - - /* Raise exception */ - mov eax, STATUS_FLOAT_MULTIPLE_FAULTS - jmp _DispatchOneParamZero - -1: - /* Check for Precision */ - test al, 32 - jz UnexpectedXmmi - - /* Raise exception */ - mov eax, STATUS_FLOAT_MULTIPLE_FAULTS - jmp _DispatchOneParamZero - -UnexpectedXmmi: - /* Strange result, bugcheck the OS */ - sti - push ebp - push 1 - push 0 - push eax - push 13 - push TRAP_CAUSE_UNKNOWN - call _KeBugCheckWithTf@24 - -VdmXmmi: - /* Check if this is a VDM */ - mov eax, PCR[KPCR_CURRENT_THREAD] - mov ebx, [eax+KTHREAD_APCSTATE_PROCESS] - cmp dword ptr [ebx+EPROCESS_VDM_OBJECTS], 0 - jz HandleUserXmmi - -V86Xmmi: - /* V86 XMMI not handled */ - UNHANDLED_V86_PATH - -KernelXmmi: - /* Another weird situation */ - push ebp - push 2 - push 0 - push eax - push 13 - push TRAP_CAUSE_UNKNOWN - call _KeBugCheckWithTf@24 -.endfunc +GENERATE_TRAP_HANDLER KiTrap19, 1 .func KiSystemFatalException _KiSystemFatalException: Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Fri Jan 8 20:24:10 2010 @@ -595,6 +595,89 @@ VOID FASTCALL +KiTrap19Handler(IN PKTRAP_FRAME TrapFrame) +{ + PKTHREAD Thread; + PFX_SAVE_AREA SaveArea; + ULONG Cr0, MxCsrMask, Error; + + /* Save trap frame */ + KiEnterTrap(TrapFrame); + + /* Check if this is the NPX thrad */ + Thread = KeGetCurrentThread(); + if (Thread != KeGetCurrentPrcb()->NpxThread) + { + /* It isn't, kill the system */ + KeBugCheckWithTf(TRAP_CAUSE_UNKNOWN, 13, (ULONG_PTR)Thread, 0, 0, TrapFrame); + } + + /* Get the NPX frame */ + SaveArea = (PFX_SAVE_AREA)((ULONG_PTR)Thread->InitialStack - sizeof(FX_SAVE_AREA)); + + /* Check for VDM trap */ + ASSERT((KiVdmTrap(TrapFrame)) == FALSE); + + /* Check for user trap */ + if (!KiUserTrap(TrapFrame)) + { + /* Kernel should not fault on XMMI */ + KeBugCheckWithTf(TRAP_CAUSE_UNKNOWN, 13, 0, 0, 2, TrapFrame); + } + + /* Update CR0 */ + Cr0 = __readcr0(); + Cr0 &= ~(CR0_MP | CR0_EM | CR0_TS); + __writecr0(Cr0); + + /* Save FPU state */ + Ke386SaveFpuState(SaveArea); + + /* Mark CR0 state dirty */ + Cr0 |= NPX_STATE_NOT_LOADED; + Cr0 |= SaveArea->Cr0NpxState; + + /* Update NPX state */ + Thread->NpxState = NPX_STATE_NOT_LOADED; + KeGetCurrentPrcb()->NpxThread = NULL; + + /* Clear the TS bit and re-enable interrupts */ + SaveArea->Cr0NpxState &= ~CR0_TS; + _enable(); + + /* Now look at MxCsr to get the mask of errors we should care about */ + MxCsrMask = ~((USHORT)SaveArea->U.FxArea.MXCsr >> 7); + + /* Get legal exceptions that software should handle */ + Error = (USHORT)SaveArea->U.FxArea.MXCsr & (FSW_INVALID_OPERATION | + FSW_DENORMAL | + FSW_ZERO_DIVIDE | + FSW_OVERFLOW | + FSW_UNDERFLOW | + FSW_PRECISION); + Error &= MxCsrMask; + + /* Now handle any of those legal errors */ + if (Error & (FSW_INVALID_OPERATION | + FSW_DENORMAL | + FSW_ZERO_DIVIDE | + FSW_OVERFLOW | + FSW_UNDERFLOW | + FSW_PRECISION)) + { + /* By issuing an exception */ + KiDispatchException1Args(STATUS_FLOAT_MULTIPLE_TRAPS, + TrapFrame->Eip, + 0, + TrapFrame); + } + + /* Unknown XMMI fault */ + KeBugCheckWithTf(TRAP_CAUSE_UNKNOWN, 13, 0, 0, 1, TrapFrame); +} + +VOID +FASTCALL KiRaiseAssertionHandler(IN PKTRAP_FRAME TrapFrame) { /* Save trap frame */ [View Less]

15 years, 5 months

[cgutman] 45009: - Rewrite request queuing - We now use the documented members of NDIS_MINIPORT_BLOCK - It also fixes the issue of determining if the miniport is currently processing a request - Remove unneeded IRQL raises - Half-plement MiniSendResourcesAvailable (NdisMSendResourcesAvailable) - Comment out the code inside ProSendPackets (only used by protocols, not miniports)

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Jan 8 20:15:03 2010 New Revision: 45009 URL: http://svn.reactos.org/svn/reactos?rev=45009&view=rev Log: - Rewrite request queuing - We now use the documented members of NDIS_MINIPORT_BLOCK - It also fixes the issue of determining if the miniport is currently processing a request - Remove unneeded IRQL raises - Half-plement MiniSendResourcesAvailable (NdisMSendResourcesAvailable) - Comment out the code inside ProSendPackets (only used by protocols, not … [View More]miniports) Modified: branches/aicom-network-branch/drivers/network/ndis/include/miniport.h branches/aicom-network-branch/drivers/network/ndis/ndis/miniport.c branches/aicom-network-branch/drivers/network/ndis/ndis/protocol.c Modified: branches/aicom-network-branch/drivers/network/ndis/include/miniport.h URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/drivers/ne… ============================================================================== --- branches/aicom-network-branch/drivers/network/ndis/include/miniport.h [iso-8859-1] (original) +++ branches/aicom-network-branch/drivers/network/ndis/include/miniport.h [iso-8859-1] Fri Jan 8 20:15:03 2010 @@ -90,8 +90,6 @@ typedef struct _LOGICAL_ADAPTER { NDIS_MINIPORT_BLOCK NdisMiniportBlock; /* NDIS defined fields */ - PNDIS_MINIPORT_WORK_ITEM WorkQueueHead; /* Head of work queue */ - PNDIS_MINIPORT_WORK_ITEM WorkQueueTail; /* Tail of work queue */ LIST_ENTRY ListEntry; /* Entry on global list */ LIST_ENTRY MiniportListEntry; /* Entry on miniport driver list */ LIST_ENTRY ProtocolListHead; /* List of bound protocols */ @@ -142,20 +140,22 @@ PVOID Buffer, PULONG BytesWritten); -VOID -FASTCALL -MiniQueueWorkItem( +NDIS_STATUS +MiniBeginRequest( PLOGICAL_ADAPTER Adapter, NDIS_WORK_ITEM_TYPE WorkItemType, - PVOID WorkItemContext, - BOOLEAN Top); - -NDIS_STATUS -FASTCALL -MiniDequeueWorkItem( - PLOGICAL_ADAPTER Adapter, - NDIS_WORK_ITEM_TYPE *WorkItemType, - PVOID *WorkItemContext); + PVOID WorkItemContext); + +NDIS_STATUS +MiniQueueWorkItemHead( + PLOGICAL_ADAPTER Adapter, + NDIS_WORK_ITEM_TYPE WorkItemType, + PVOID WorkItemContext); + +VOID +MiniEndRequest( + PLOGICAL_ADAPTER Adapter, + NDIS_WORK_ITEM_TYPE WorkItemType); NDIS_STATUS MiniDoRequest( Modified: branches/aicom-network-branch/drivers/network/ndis/ndis/miniport.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/drivers/ne… ============================================================================== --- branches/aicom-network-branch/drivers/network/ndis/ndis/miniport.c [iso-8859-1] (original) +++ branches/aicom-network-branch/drivers/network/ndis/ndis/miniport.c [iso-8859-1] Fri Jan 8 20:15:03 2010 @@ -121,55 +121,6 @@ #endif /* DBG */ } -PNDIS_MINIPORT_WORK_ITEM -MiniGetFirstWorkItem( - PLOGICAL_ADAPTER Adapter, - NDIS_WORK_ITEM_TYPE Type) -{ - PNDIS_MINIPORT_WORK_ITEM CurrentEntry = Adapter->WorkQueueHead; - - while (CurrentEntry) - { - if (CurrentEntry->WorkItemType == Type) - return CurrentEntry; - - CurrentEntry = (PNDIS_MINIPORT_WORK_ITEM)CurrentEntry->Link.Next; - } - - return NULL; -} - -BOOLEAN -MiniIsBusy( - PLOGICAL_ADAPTER Adapter, - NDIS_WORK_ITEM_TYPE Type) -{ - BOOLEAN Busy = FALSE; - KIRQL OldIrql; - - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); - - if (Type == NdisWorkItemRequest && - (Adapter->NdisMiniportBlock.PendingRequest || MiniGetFirstWorkItem(Adapter, NdisWorkItemRequest))) - { - Busy = TRUE; - } - else if (Type == NdisWorkItemSend && - (Adapter->NdisMiniportBlock.FirstPendingPacket || MiniGetFirstWorkItem(Adapter, NdisWorkItemSend))) - { - Busy = TRUE; - } - else if (Type == NdisWorkItemResetRequested && - (Adapter->NdisMiniportBlock.ResetStatus == NDIS_STATUS_PENDING || MiniGetFirstWorkItem(Adapter, NdisWorkItemResetRequested))) - { - Busy = TRUE; - } - - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); - - return Busy; -} - VOID MiniIndicateData( @@ -316,6 +267,7 @@ if (!LookAheadBuffer) { NDIS_DbgPrint(MIN_TRACE, ("Failed to allocate lookahead buffer!\n")); + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); return; } @@ -357,6 +309,8 @@ PADAPTER_BINDING AdapterBinding; KIRQL OldIrql; + MiniEndRequest(Adapter, NdisWorkItemResetRequested); + if (AddressingReset) MiniDoAddressingReset(Adapter); @@ -364,8 +318,6 @@ NdisMIndicateStatusComplete(Adapter); KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); - - Adapter->NdisMiniportBlock.ResetStatus = Status; CurrentEntry = Adapter->ProtocolListHead.Flink; @@ -395,11 +347,11 @@ NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); - KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); - - KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); Request = Adapter->NdisMiniportBlock.PendingRequest; - KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); + + MiniEndRequest(Adapter, NdisWorkItemRequest); MacBlock = (PNDIS_REQUEST_MAC_BLOCK)Request->MacReserved; @@ -409,12 +361,22 @@ Request, Status); } - - KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); - Adapter->NdisMiniportBlock.PendingRequest = NULL; - KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); - - KeLowerIrql(OldIrql); +} + +VOID NTAPI +MiniIndicateComplete( + IN NDIS_HANDLE MiniportAdapterHandle, + IN PNDIS_PACKET Packet, + IN NDIS_STATUS Status) +{ + PADAPTER_BINDING AdapterBinding = (PADAPTER_BINDING)Packet->Reserved[1]; + + MiniEndRequest(MiniportAdapterHandle, NdisWorkItemSendLoopback); + + (*AdapterBinding->ProtocolBinding->Chars.SendCompleteHandler)( + AdapterBinding->NdisOpenBlock.ProtocolBindingContext, + Packet, + Status); } VOID NTAPI @@ -440,14 +402,14 @@ AdapterBinding = (PADAPTER_BINDING)Packet->Reserved[1]; - KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); - if (Adapter->NdisMiniportBlock.ScatterGatherListSize != 0) { NDIS_DbgPrint(MAX_TRACE, ("Freeing Scatter/Gather list\n")); SGList = NDIS_PER_PACKET_INFO_FROM_PACKET(Packet, ScatterGatherListPacketInfo); + + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); Adapter->NdisMiniportBlock.SystemAdapterObject-> DmaOperations->PutScatterGatherList( @@ -455,28 +417,42 @@ SGList, TRUE); + KeLowerIrql(OldIrql); + NDIS_PER_PACKET_INFO_FROM_PACKET(Packet, ScatterGatherListPacketInfo) = NULL; } + + MiniEndRequest(Adapter, NdisWorkItemSend); (*AdapterBinding->ProtocolBinding->Chars.SendCompleteHandler)( AdapterBinding->NdisOpenBlock.ProtocolBindingContext, Packet, Status); - - KeLowerIrql(OldIrql); -} - +} + +NDIS_STATUS +SignalQueue(PLOGICAL_ADAPTER Adapter) +{ + PIO_WORKITEM WorkItem = IoAllocateWorkItem(Adapter->NdisMiniportBlock.DeviceObject); + + ASSERT(WorkItem); + if (!WorkItem) return NDIS_STATUS_RESOURCES; + + IoQueueWorkItem(WorkItem, + MiniportWorker, + DelayedWorkQueue, + WorkItem); + + return NDIS_STATUS_SUCCESS; +} VOID NTAPI MiniSendResourcesAvailable( IN NDIS_HANDLE MiniportAdapterHandle) { -/* - UNIMPLEMENTED -*/ -} - + SignalQueue(MiniportAdapterHandle); +} VOID NTAPI MiniTransferDataComplete( @@ -486,19 +462,16 @@ IN UINT BytesTransferred) { PADAPTER_BINDING AdapterBinding; - KIRQL OldIrql; NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); AdapterBinding = (PADAPTER_BINDING)Packet->Reserved[1]; - KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); (*AdapterBinding->ProtocolBinding->Chars.TransferDataCompleteHandler)( AdapterBinding->NdisOpenBlock.ProtocolBindingContext, Packet, Status, BytesTransferred); - KeLowerIrql(OldIrql); } @@ -597,12 +570,6 @@ ASSERT(AdapterName); NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); - - if(IsListEmpty(&AdapterListHead)) - { - NDIS_DbgPrint(MIN_TRACE, ("No registered miniports for protocol to bind to\n")); - return NULL; - } KeAcquireSpinLock(&AdapterListLock, &OldIrql); { @@ -667,9 +634,15 @@ NdisRequest->DATA.SET_INFORMATION.InformationBuffer = Buffer; NdisRequest->DATA.SET_INFORMATION.InformationBufferLength = Size; + NdisStatus = MiniBeginRequest(Adapter, NdisWorkItemRequest, NdisRequest); + if (!NT_SUCCESS(NdisStatus)) + return NdisStatus; + NdisStatus = MiniDoRequest(Adapter, NdisRequest); /* FIXME: Wait in pending case! */ + if (NdisStatus != NDIS_STATUS_PENDING) + MiniEndRequest(Adapter, NdisWorkItemRequest); ASSERT(NdisStatus != NDIS_STATUS_PENDING); @@ -717,9 +690,15 @@ NdisRequest->DATA.QUERY_INFORMATION.InformationBuffer = Buffer; NdisRequest->DATA.QUERY_INFORMATION.InformationBufferLength = Size; + NdisStatus = MiniBeginRequest(Adapter, NdisWorkItemRequest, NdisRequest); + if (!NT_SUCCESS(NdisStatus)) + return NdisStatus; + NdisStatus = MiniDoRequest(Adapter, NdisRequest); /* FIXME: Wait in pending case! */ + if (NdisStatus != NDIS_STATUS_PENDING) + MiniEndRequest(Adapter, NdisWorkItemRequest); ASSERT(NdisStatus != NDIS_STATUS_PENDING); @@ -742,13 +721,10 @@ */ { BOOLEAN Ret = FALSE; - KIRQL OldIrql; - - KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + if (Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.CheckForHangHandler) Ret = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.CheckForHangHandler)( Adapter->NdisMiniportBlock.MiniportAdapterContext); - KeLowerIrql(OldIrql); return Ret; } @@ -779,31 +755,24 @@ */ { NDIS_STATUS Status; - KIRQL OldIrql; BOOLEAN AddressingReset = TRUE; - if (MiniIsBusy(Adapter, NdisWorkItemResetRequested)) { - MiniQueueWorkItem(Adapter, NdisWorkItemResetRequested, NULL, FALSE); - return NDIS_STATUS_PENDING; - } + Status = MiniBeginRequest(Adapter, NdisWorkItemResetRequested, NULL); + if (!NT_SUCCESS(Status)) + return Status; NdisMIndicateStatus(Adapter, NDIS_STATUS_RESET_START, NULL, 0); NdisMIndicateStatusComplete(Adapter); - KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); Status = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.ResetHandler)( Adapter->NdisMiniportBlock.MiniportAdapterContext, &AddressingReset); - KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); - Adapter->NdisMiniportBlock.ResetStatus = Status; - KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); - - KeLowerIrql(OldIrql); - if (Status != NDIS_STATUS_PENDING) { if (AddressingReset) MiniDoAddressingReset(Adapter); + + MiniEndRequest(Adapter, NdisWorkItemResetRequested); NdisMIndicateStatus(Adapter, NDIS_STATUS_RESET_END, NULL, 0); NdisMIndicateStatusComplete(Adapter); @@ -827,78 +796,45 @@ } } - -VOID -FASTCALL -MiniQueueWorkItem( +NDIS_STATUS +MiniBeginRequest( PLOGICAL_ADAPTER Adapter, NDIS_WORK_ITEM_TYPE WorkItemType, - PVOID WorkItemContext, - BOOLEAN Top) -/* - * FUNCTION: Queues a work item for execution at a later time - * ARGUMENTS: - * Adapter = Pointer to the logical adapter object to queue work item on - * WorkItemType = Type of work item to queue - * WorkItemContext = Pointer to context information for work item - * RETURNS: - * Status of operation - */ -{ + PVOID WorkItemContext) +{ + KIRQL OldIrql; + BOOLEAN QueueBusy; PNDIS_MINIPORT_WORK_ITEM MiniportWorkItem; - PIO_WORKITEM IoWorkItem; - KIRQL OldIrql; - - NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); - - ASSERT(Adapter); + PSINGLE_LIST_ENTRY CurrentEntry; KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); - if (Top) - { - if (WorkItemType == NdisWorkItemSend) - { - NDIS_DbgPrint(MIN_TRACE, ("Requeuing failed packet (%x).\n", WorkItemContext)); - Adapter->NdisMiniportBlock.FirstPendingPacket = WorkItemContext; - } - else - { - //This should never happen - ASSERT(FALSE); - } - } - else - { - MiniportWorkItem = ExAllocatePool(NonPagedPool, sizeof(NDIS_MINIPORT_WORK_ITEM)); - if (!MiniportWorkItem) - { - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); - NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); - return; - } - - MiniportWorkItem->WorkItemType = WorkItemType; - MiniportWorkItem->WorkItemContext = WorkItemContext; - - /* safe due to adapter lock held */ - MiniportWorkItem->Link.Next = NULL; - if (!Adapter->WorkQueueHead) - { - Adapter->WorkQueueHead = MiniportWorkItem; - Adapter->WorkQueueTail = MiniportWorkItem; - } - else - { - Adapter->WorkQueueTail->Link.Next = (PSINGLE_LIST_ENTRY)MiniportWorkItem; - Adapter->WorkQueueTail = MiniportWorkItem; - } - } - - IoWorkItem = IoAllocateWorkItem(Adapter->NdisMiniportBlock.DeviceObject); - if (IoWorkItem) - IoQueueWorkItem(IoWorkItem, MiniportWorker, DelayedWorkQueue, IoWorkItem); + + QueueBusy = (Adapter->NdisMiniportBlock.WorkQueue[WorkItemType].Next != NULL); + + MiniportWorkItem = ExAllocatePool(NonPagedPool, sizeof(NDIS_MINIPORT_WORK_ITEM)); + if (!MiniportWorkItem) + { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); + return NDIS_STATUS_RESOURCES; + } + + MiniportWorkItem->WorkItemType = WorkItemType; + MiniportWorkItem->WorkItemContext = WorkItemContext; + MiniportWorkItem->Link.Next = NULL; + + CurrentEntry = &Adapter->NdisMiniportBlock.WorkQueue[WorkItemType]; + while (CurrentEntry->Next) + CurrentEntry = CurrentEntry->Next; + + CurrentEntry->Next = (PSINGLE_LIST_ENTRY)MiniportWorkItem; KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); + + if (QueueBusy) + NDIS_DbgPrint(MIN_TRACE, ("Queue %d busy!\n", WorkItemType)); + + return (QueueBusy ? NDIS_STATUS_PENDING : NDIS_STATUS_SUCCESS); } @@ -906,7 +842,7 @@ FASTCALL MiniDequeueWorkItem( PLOGICAL_ADAPTER Adapter, - NDIS_WORK_ITEM_TYPE *WorkItemType, + NDIS_WORK_ITEM_TYPE WorkItemType, PVOID *WorkItemContext) /* * FUNCTION: Dequeues a work item from the work queue of a logical adapter @@ -922,42 +858,49 @@ */ { PNDIS_MINIPORT_WORK_ITEM MiniportWorkItem; - PNDIS_PACKET Packet; + KIRQL OldIrql; NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); - MiniportWorkItem = Adapter->WorkQueueHead; - - if ((Packet = Adapter->NdisMiniportBlock.FirstPendingPacket)) - { - Adapter->NdisMiniportBlock.FirstPendingPacket = NULL; - - *WorkItemType = NdisWorkItemSend; - *WorkItemContext = Packet; + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); + MiniportWorkItem = (PNDIS_MINIPORT_WORK_ITEM)Adapter->NdisMiniportBlock.WorkQueue[WorkItemType].Next; + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); + + if (MiniportWorkItem) + { + /* This is VERY IMPORTANT! We dequeue the work item AFTER completion */ + + *WorkItemContext = MiniportWorkItem->WorkItemContext; return NDIS_STATUS_SUCCESS; } - else if (MiniportWorkItem) - { - /* safe due to adapter lock held */ - Adapter->WorkQueueHead = (PNDIS_MINIPORT_WORK_ITEM)MiniportWorkItem->Link.Next; - - if (MiniportWorkItem == Adapter->WorkQueueTail) - Adapter->WorkQueueTail = NULL; - - *WorkItemType = MiniportWorkItem->WorkItemType; - *WorkItemContext = MiniportWorkItem->WorkItemContext; - - ExFreePool(MiniportWorkItem); - - return NDIS_STATUS_SUCCESS; - } else { - NDIS_DbgPrint(MIN_TRACE, ("No work item to dequeue\n")); - return NDIS_STATUS_FAILURE; } +} + +VOID +MiniEndRequest( + PLOGICAL_ADAPTER Adapter, + NDIS_WORK_ITEM_TYPE WorkItemType) +{ + KIRQL OldIrql; + BOOLEAN QueueBusy; + PNDIS_MINIPORT_WORK_ITEM MiniportWorkItem; + + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); + + MiniportWorkItem = (PNDIS_MINIPORT_WORK_ITEM)Adapter->NdisMiniportBlock.WorkQueue[WorkItemType].Next; + ASSERT(MiniportWorkItem); + Adapter->NdisMiniportBlock.WorkQueue[WorkItemType].Next = MiniportWorkItem->Link.Next; + ExFreePool(MiniportWorkItem); + + QueueBusy = (Adapter->NdisMiniportBlock.WorkQueue[WorkItemType].Next != NULL); + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); + + if (QueueBusy) + SignalQueue(Adapter); } @@ -976,13 +919,12 @@ { NDIS_STATUS Status; KIRQL OldIrql; + NDIS_DbgPrint(DEBUG_MINIPORT, ("Called.\n")); - KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); - - KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); Adapter->NdisMiniportBlock.PendingRequest = NdisRequest; - KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); if (!Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.CoRequestHandler) { @@ -1021,13 +963,13 @@ NdisRequest); } - if (Status != NDIS_STATUS_PENDING) { - KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); + if (Status != NDIS_STATUS_PENDING) + { + KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); Adapter->NdisMiniportBlock.PendingRequest = NULL; - KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); - } - - KeLowerIrql(OldIrql); + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); + } + return Status; } @@ -1044,12 +986,10 @@ { PLOGICAL_ADAPTER Adapter = (PLOGICAL_ADAPTER)MiniportAdapterHandle; - KIRQL OldIrql; - ASSERT(Adapter); - KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); - if (Adapter->NdisMiniportBlock.SetCompleteHandler) - (Adapter->NdisMiniportBlock.SetCompleteHandler)(MiniportAdapterHandle, Status); - KeLowerIrql(OldIrql); + + (Adapter->NdisMiniportBlock.SetCompleteHandler)(MiniportAdapterHandle, Status); + + MiniEndRequest(Adapter, NdisWorkItemRequest); } @@ -1065,12 +1005,10 @@ { PLOGICAL_ADAPTER Adapter = (PLOGICAL_ADAPTER)MiniportAdapterHandle; - KIRQL OldIrql; - ASSERT(Adapter); - KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); - if( Adapter->NdisMiniportBlock.QueryCompleteHandler ) - (Adapter->NdisMiniportBlock.QueryCompleteHandler)(MiniportAdapterHandle, Status); - KeLowerIrql(OldIrql); + + (Adapter->NdisMiniportBlock.QueryCompleteHandler)(MiniportAdapterHandle, Status); + + MiniEndRequest(Adapter, NdisWorkItemRequest); } VOID @@ -1078,25 +1016,20 @@ MiniportWorker(IN PDEVICE_OBJECT DeviceObject, IN PVOID Context) { PLOGICAL_ADAPTER Adapter = DeviceObject->DeviceExtension; - KIRQL OldIrql, RaiseOldIrql; + KIRQL RaiseOldIrql; NDIS_STATUS NdisStatus; PVOID WorkItemContext; NDIS_WORK_ITEM_TYPE WorkItemType; - BOOLEAN AddressingReset; + BOOLEAN AddressingReset, NextQueue; IoFreeWorkItem((PIO_WORKITEM)Context); - KeAcquireSpinLock(&Adapter->NdisMiniportBlock.Lock, &OldIrql); - - NdisStatus = - MiniDequeueWorkItem - (Adapter, &WorkItemType, &WorkItemContext); - - KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); - - if (NdisStatus == NDIS_STATUS_SUCCESS) - { - switch (WorkItemType) + for (WorkItemType = 0; WorkItemType < NUMBER_OF_WORK_ITEM_TYPES; WorkItemType++) + { + NextQueue = FALSE; + while (!NextQueue && MiniDequeueWorkItem(Adapter, WorkItemType, &WorkItemContext) == NDIS_STATUS_SUCCESS) + { + switch (WorkItemType) { case NdisWorkItemSend: /* @@ -1125,7 +1058,7 @@ NdisStatus = NDIS_GET_PACKET_STATUS((PNDIS_PACKET)WorkItemContext); if( NdisStatus == NDIS_STATUS_RESOURCES ) { - MiniQueueWorkItem(Adapter, WorkItemType, WorkItemContext, TRUE); + NextQueue = TRUE; break; } } @@ -1151,7 +1084,7 @@ NDIS_DbgPrint(MAX_TRACE, ("back from miniport's send handler\n")); KeLowerIrql(RaiseOldIrql); if( NdisStatus == NDIS_STATUS_RESOURCES ) { - MiniQueueWorkItem(Adapter, WorkItemType, WorkItemContext, TRUE); + NextQueue = TRUE; break; } } @@ -1171,26 +1104,16 @@ NdisStatus = ProIndicatePacket(Adapter, (PNDIS_PACKET)WorkItemContext); if( NdisStatus != NDIS_STATUS_PENDING ) - MiniSendComplete((NDIS_HANDLE)Adapter, (PNDIS_PACKET)WorkItemContext, NdisStatus); + MiniIndicateComplete((NDIS_HANDLE)Adapter, (PNDIS_PACKET)WorkItemContext, NdisStatus); break; case NdisWorkItemReturnPackets: break; case NdisWorkItemResetRequested: - NdisMIndicateStatus(Adapter, NDIS_STATUS_RESET_START, NULL, 0); - NdisMIndicateStatusComplete(Adapter); - - KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); NdisStatus = (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.ResetHandler)( Adapter->NdisMiniportBlock.MiniportAdapterContext, &AddressingReset); - - KeAcquireSpinLockAtDpcLevel(&Adapter->NdisMiniportBlock.Lock); - Adapter->NdisMiniportBlock.ResetStatus = NdisStatus; - KeReleaseSpinLockFromDpcLevel(&Adapter->NdisMiniportBlock.Lock); - - KeLowerIrql(OldIrql); if (NdisStatus != NDIS_STATUS_PENDING) MiniResetComplete(Adapter, NdisStatus, AddressingReset); @@ -1220,15 +1143,18 @@ default: NDIS_DbgPrint(MIN_TRACE, ("Unknown NDIS request type.\n")); + MiniEndRequest(Adapter, NdisWorkItemRequest); break; } break; default: + MiniEndRequest(Adapter, WorkItemType); NDIS_DbgPrint(MIN_TRACE, ("Unknown NDIS work item type (%d).\n", WorkItemType)); break; } - } + } + } } @@ -1337,6 +1263,7 @@ if (Adapter->NdisMiniportBlock.Log) { *LogHandle = NULL; + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); return NDIS_STATUS_FAILURE; } @@ -1344,6 +1271,7 @@ if (!Log) { *LogHandle = NULL; + KeReleaseSpinLock(&Adapter->NdisMiniportBlock.Lock, OldIrql); return NDIS_STATUS_RESOURCES; } @@ -2231,6 +2159,7 @@ PDEVICE_OBJECT DeviceObject; PLOGICAL_ADAPTER Adapter; NTSTATUS Status; + UINT i; /* * Gain the access to the miniport data structure first. @@ -2353,6 +2282,9 @@ Adapter->NdisMiniportBlock.OldPnPDeviceState = 0; Adapter->NdisMiniportBlock.PnPDeviceState = NdisPnPDeviceAdded; + + for (i = 0; i < NUMBER_OF_WORK_ITEM_TYPES; i++) + Adapter->NdisMiniportBlock.WorkQueue[i].Next = NULL; KeInitializeTimer(&Adapter->NdisMiniportBlock.WakeUpDpcTimer.Timer); KeInitializeDpc(&Adapter->NdisMiniportBlock.WakeUpDpcTimer.Dpc, MiniportHangDpc, Adapter); Modified: branches/aicom-network-branch/drivers/network/ndis/ndis/protocol.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/drivers/ne… ============================================================================== --- branches/aicom-network-branch/drivers/network/ndis/ndis/protocol.c [iso-8859-1] (original) +++ branches/aicom-network-branch/drivers/network/ndis/ndis/protocol.c [iso-8859-1] Fri Jan 8 20:15:03 2010 @@ -325,6 +325,7 @@ PADAPTER_BINDING AdapterBinding; PLOGICAL_ADAPTER Adapter; PNDIS_REQUEST_MAC_BLOCK MacBlock = (PNDIS_REQUEST_MAC_BLOCK)NdisRequest->MacReserved; + NDIS_STATUS Status; NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); @@ -336,17 +337,15 @@ MacBlock->Binding = &AdapterBinding->NdisOpenBlock; -#if WORKER_TEST - MiniQueueWorkItem(Adapter, NdisWorkItemRequest, NdisRequest, FALSE); - return NDIS_STATUS_PENDING; -#else - if (MiniIsBusy(Adapter, NdisWorkItemRequest)) { - MiniQueueWorkItem(Adapter, NdisWorkItemRequest, NdisRequest, FALSE); - return NDIS_STATUS_PENDING; - } - - return MiniDoRequest(Adapter, NdisRequest); -#endif + Status = MiniBeginRequest(Adapter, NdisWorkItemRequest, NdisRequest); + if (!NT_SUCCESS(Status)) + return Status; + + Status = MiniDoRequest(Adapter, NdisRequest); + if (Status != NDIS_STATUS_PENDING) + MiniEndRequest(Adapter, NdisWorkItemRequest); + + return Status; } @@ -393,17 +392,12 @@ NDIS_STATUS proSendPacketToMiniport(PLOGICAL_ADAPTER Adapter, PNDIS_PACKET Packet) { -#if WORKER_TEST - MiniQueueWorkItem(Adapter, NdisWorkItemSend, Packet, FALSE); - return NDIS_STATUS_PENDING; -#else KIRQL RaiseOldIrql; NDIS_STATUS NdisStatus; - if(MiniIsBusy(Adapter, NdisWorkItemSend)) { - MiniQueueWorkItem(Adapter, NdisWorkItemSend, Packet, FALSE); - return NDIS_STATUS_PENDING; - } + NdisStatus = MiniBeginRequest(Adapter, NdisWorkItemSend, Packet); + if (!NT_SUCCESS(NdisStatus)) + return NdisStatus; if(Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendPacketsHandler) { @@ -425,10 +419,14 @@ NdisStatus = NDIS_GET_PACKET_STATUS(Packet); if (NdisStatus == NDIS_STATUS_RESOURCES) { - MiniQueueWorkItem(Adapter, NdisWorkItemSend, Packet, TRUE); + /* We don't need to add to head here because it's already guaranteed to the + the first packet in the queue */ NdisStatus = NDIS_STATUS_PENDING; } } + + if (NdisStatus != NDIS_STATUS_PENDING) + MiniEndRequest(Adapter, NdisWorkItemSend); return NdisStatus; } else { @@ -448,14 +446,16 @@ KeLowerIrql(RaiseOldIrql); if (NdisStatus == NDIS_STATUS_RESOURCES) { - MiniQueueWorkItem(Adapter, NdisWorkItemSend, Packet, TRUE); + /* See comment above */ NdisStatus = NDIS_STATUS_PENDING; } } + if (NdisStatus != NDIS_STATUS_PENDING) + MiniEndRequest(Adapter, NdisWorkItemSend); + return NdisStatus; } -#endif } @@ -508,12 +508,7 @@ if ((Adapter->NdisMiniportBlock.MacOptions & NDIS_MAC_OPTION_NO_LOOPBACK) && MiniAdapterHasAddress(Adapter, Packet)) { -#if WORKER_TEST - MiniQueueWorkItem(Adapter, NdisWorkItemSendLoopback, Packet, FALSE); - return NDIS_STATUS_PENDING; -#else return ProIndicatePacket(Adapter, Packet); -#endif } else { if (Adapter->NdisMiniportBlock.ScatterGatherListSize != 0) { @@ -570,11 +565,14 @@ IN PPNDIS_PACKET PacketArray, IN UINT NumberOfPackets) { + UNIMPLEMENTED +#if 0 PADAPTER_BINDING AdapterBinding = NdisBindingHandle; PLOGICAL_ADAPTER Adapter = AdapterBinding->Adapter; KIRQL RaiseOldIrql; NDIS_STATUS NdisStatus; UINT i; + BOOLEAN QueuePackets; if(Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendPacketsHandler) { @@ -590,10 +588,15 @@ (*Adapter->NdisMiniportBlock.DriverHandle->MiniportCharacteristics.SendPacketsHandler)( Adapter->NdisMiniportBlock.MiniportAdapterContext, PacketArray, NumberOfPackets); KeLowerIrql(RaiseOldIrql); - for (i = 0; i < NumberOfPackets; i++) + for (i = 0, QueuePackets = FALSE; i < NumberOfPackets; i++) { NdisStatus = NDIS_GET_PACKET_STATUS(PacketArray[i]); - if (NdisStatus != NDIS_STATUS_PENDING) + if (NdisStatus == NDIS_STATUS_RESOURCES) + QueuePackets = TRUE; + + if (QueuePackets) + NdisQueueWorkItemHead(Adapter, NdisWorkItemSend, PacketArray[i]); + else MiniSendComplete(Adapter, PacketArray[i], NdisStatus); } } @@ -624,6 +627,7 @@ KeLowerIrql(RaiseOldIrql); } } +#endif } [View Less]

15 years, 5 months

[sir_richard] 45008: Trap handlers in C Patch 4 of X: [NTOS]: Implement trap 6 (invalid opcode) in C.

by sir_richard＠svn.reactos.org

Author: sir_richard Date: Fri Jan 8 19:45:04 2010 New Revision: 45008 URL: http://svn.reactos.org/svn/reactos?rev=45008&view=rev Log: Trap handlers in C Patch 4 of X: [NTOS]: Implement trap 6 (invalid opcode) in C. Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s trunk/reactos/ntoskrnl/ke/i386/traphdlr.c Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================… [View More]================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] Fri Jan 8 19:45:04 2010 @@ -664,13 +664,6 @@ /* HARDWARE TRAP HANDLERS ****************************************************/ -.func KiFixupFrame -_KiFixupFrame: - - /* TODO: Routine to fixup a KTRAP_FRAME when faulting from a syscall. */ - UNHANDLED_PATH "Trap Frame Fixup" -.endfunc - GENERATE_TRAP_HANDLER KiTrap0, 1 GENERATE_TRAP_HANDLER KiTrap1, 1 @@ -699,122 +692,7 @@ GENERATE_TRAP_HANDLER KiTrap3, 1 GENERATE_TRAP_HANDLER KiTrap4, 1 GENERATE_TRAP_HANDLER KiTrap5, 1 - -.func KiTrap6 -TRAP_FIXUPS kit6_a, kit6_t, DoFixupV86, DoNotFixupAbios -_KiTrap6: - - /* It this a V86 GPF? */ - test dword ptr [esp+8], EFLAGS_V86_MASK - jz NotV86UD - - /* Enter V86 Trap */ - V86_TRAP_PROLOG kit6_a, kit6_v - -VdmOpCodeFault: - /* Not yet supported (Invalid OPCODE from V86) */ - UNHANDLED_V86_PATH - -NotV86UD: - /* Push error code */ - push 0 - - /* Enter trap */ - TRAP_PROLOG kit6_a, kit6_t - -DispatchLockErrata: - /* Check if this happened in kernel mode */ - test byte ptr [ebp+KTRAP_FRAME_CS], MODE_MASK - jz KmodeOpcode - - /* Check for VDM */ - cmp word ptr [ebp+KTRAP_FRAME_CS], KGDT_R3_CODE + RPL_MASK - jz UmodeOpcode - - /* Check if the process is vDM */ - mov ebx, PCR[KPCR_CURRENT_THREAD] - mov ebx, [ebx+KTHREAD_APCSTATE_PROCESS] - cmp dword ptr [ebx+EPROCESS_VDM_OBJECTS], 0 - jnz IsVdmOpcode - -UmodeOpcode: - /* Get EIP and enable interrupts at this point */ - mov esi, [ebp+KTRAP_FRAME_EIP] - sti - - /* Set intruction prefix length */ - mov ecx, 4 - - /* Setup a SEH frame */ - push ebp - push OpcodeSEH - push PCR[KPCR_EXCEPTION_LIST] - mov PCR[KPCR_EXCEPTION_LIST], esp - -OpcodeLoop: - /* Get the instruction and check if it's LOCK */ - mov al, [esi] - cmp al, 0xF0 - jz LockCrash - - /* Keep moving */ - add esi, 1 - loop OpcodeLoop - - /* Undo SEH frame */ - pop PCR[KPCR_EXCEPTION_LIST] - add esp, 8 - -KmodeOpcode: - - /* Re-enable interrupts */ - sti - - /* Setup illegal instruction exception and dispatch it */ - mov ebx, [ebp+KTRAP_FRAME_EIP] - mov eax, STATUS_ILLEGAL_INSTRUCTION - jmp _DispatchNoParam - -LockCrash: - - /* Undo SEH Frame */ - pop PCR[KPCR_EXCEPTION_LIST] - add esp, 8 - - /* Setup invalid lock exception and dispatch it */ - mov ebx, [ebp+KTRAP_FRAME_EIP] - mov eax, STATUS_INVALID_LOCK_SEQUENCE - jmp _DispatchNoParam - -IsVdmOpcode: - - /* Unhandled yet */ - UNHANDLED_V86_PATH - - /* Return to caller */ - jmp _Kei386EoiHelper@0 - -OpcodeSEH: - - /* Get SEH frame */ - mov esp, [esp+8] - pop PCR[KPCR_EXCEPTION_LIST] - add esp, 4 - pop ebp - - /* Check if this was user mode */ - test dword ptr [ebp+KTRAP_FRAME_CS], MODE_MASK - jnz KmodeOpcode - - /* Do a bugcheck */ - push ebp - push 0 - push 0 - push 0 - push 0 - push KMODE_EXCEPTION_NOT_HANDLED - call _KeBugCheckWithTf@24 -.endfunc +GENERATE_TRAP_HANDLER KiTrap6, 1 .func KiTrap7 TRAP_FIXUPS kit7_a, kit7_t, DoFixupV86, DoNotFixupAbios @@ -1473,8 +1351,13 @@ pop PCR[KPCR_EXCEPTION_LIST] add esp, 8 - /* Illegal instruction */ - jmp KmodeOpcode + /* Re-enable interrupts */ + sti + + /* Setup illegal instruction exception and dispatch it */ + mov ebx, [ebp+KTRAP_FRAME_EIP] + mov eax, STATUS_ILLEGAL_INSTRUCTION + jmp _DispatchNoParam NotPrefixByte: /* Check if it's a HLT */ Modified: trunk/reactos/ntoskrnl/ke/i386/traphdlr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/traphdlr.… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/traphdlr.c [iso-8859-1] Fri Jan 8 19:45:04 2010 @@ -340,6 +340,51 @@ KiDispatchException0Args(STATUS_ARRAY_BOUNDS_EXCEEDED, TrapFrame->Eip, TrapFrame); +} + +VOID +FASTCALL +KiTrap6Handler(IN PKTRAP_FRAME TrapFrame) +{ + PUCHAR Instruction; + ULONG i; + + /* Save trap frame */ + KiEnterTrap(TrapFrame); + + /* Check for VDM trap */ + ASSERT((KiVdmTrap(TrapFrame)) == FALSE); + + /* Enable interrupts */ + Instruction = (PUCHAR)TrapFrame->Eip; + _enable(); + + /* Check for user trap */ + if (KiUserTrap(TrapFrame)) + { + /* FIXME: Use SEH */ + + /* Scan next 4 opcodes */ + for (i = 0; i < 4; i++) + { + /* Check for LOCK instruction */ + if (Instruction[i] == 0xF0) + { + /* Send invalid lock sequence exception */ + KiDispatchException0Args(STATUS_INVALID_LOCK_SEQUENCE, + TrapFrame->Eip, + TrapFrame); + } + } + + /* FIXME: SEH ends here */ + } + + /* Kernel-mode or user-mode fault (but not LOCK) */ + KiDispatchException0Args(STATUS_ILLEGAL_INSTRUCTION, + TrapFrame->Eip, + TrapFrame); + } VOID [View Less]

15 years, 5 months

[cgutman] 45007: - Remove some incorrect IRQL checks (needed for the NDIS fixes coming soon) - Change some NdisDprAcquireSpinLock/NdisDprReleaseSpinLock calls to NdisAcquireSpinLock/NdisReleaseSpinLock

by cgutman＠svn.reactos.org

Author: cgutman Date: Fri Jan 8 19:36:59 2010 New Revision: 45007 URL: http://svn.reactos.org/svn/reactos?rev=45007&view=rev Log: - Remove some incorrect IRQL checks (needed for the NDIS fixes coming soon) - Change some NdisDprAcquireSpinLock/NdisDprReleaseSpinLock calls to NdisAcquireSpinLock/NdisReleaseSpinLock Modified: branches/aicom-network-branch/drivers/network/dd/ne2000/ne2000/main.c branches/aicom-network-branch/drivers/network/dd/pcnet/pcnet.c branches/aicom-… [View More]network-branch/drivers/network/dd/pcnet/requests.c Modified: branches/aicom-network-branch/drivers/network/dd/ne2000/ne2000/main.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/drivers/ne… ============================================================================== --- branches/aicom-network-branch/drivers/network/dd/ne2000/ne2000/main.c [iso-8859-1] (original) +++ branches/aicom-network-branch/drivers/network/dd/ne2000/ne2000/main.c [iso-8859-1] Fri Jan 8 19:36:59 2010 @@ -501,8 +501,6 @@ NDIS_MEDIUM Medium = NdisMedium802_3; PNIC_ADAPTER Adapter = (PNIC_ADAPTER)MiniportAdapterContext; - ASSERT_IRQL_EQUAL(DISPATCH_LEVEL); - NDIS_DbgPrint(MAX_TRACE, ("Called. Oid (0x%X).\n", Oid)); Status = NDIS_STATUS_SUCCESS; @@ -671,8 +669,6 @@ { NDIS_STATUS NdisStatus = NDIS_STATUS_SUCCESS; - ASSERT_IRQL_EQUAL(DISPATCH_LEVEL); - NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); #ifndef NOCARD @@ -751,8 +747,6 @@ ULONG GenericULONG; NDIS_STATUS Status = NDIS_STATUS_SUCCESS; PNIC_ADAPTER Adapter = (PNIC_ADAPTER)MiniportAdapterContext; - - ASSERT_IRQL_EQUAL(DISPATCH_LEVEL); NDIS_DbgPrint(MAX_TRACE, ("Called. Oid (0x%X).\n", Oid)); @@ -862,8 +856,6 @@ UINT RecvStart; UINT RecvStop; PNIC_ADAPTER Adapter = (PNIC_ADAPTER)MiniportAdapterContext; - - ASSERT_IRQL_EQUAL(DISPATCH_LEVEL); NDIS_DbgPrint(MAX_TRACE, ("Called. Packet (0x%X) ByteOffset (0x%X) BytesToTransfer (%d).\n", Packet, ByteOffset, BytesToTransfer)); Modified: branches/aicom-network-branch/drivers/network/dd/pcnet/pcnet.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/drivers/ne… ============================================================================== --- branches/aicom-network-branch/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] (original) +++ branches/aicom-network-branch/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] Fri Jan 8 19:36:59 2010 @@ -1101,8 +1101,6 @@ { DPRINT("Called\n"); - ASSERT_IRQL_EQUAL(PASSIVE_LEVEL); - /* MiniportReset doesn't do anything at the moment... perhaps this should be fixed. */ *AddressingReset = FALSE; Modified: branches/aicom-network-branch/drivers/network/dd/pcnet/requests.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-branch/drivers/ne… ============================================================================== --- branches/aicom-network-branch/drivers/network/dd/pcnet/requests.c [iso-8859-1] (original) +++ branches/aicom-network-branch/drivers/network/dd/pcnet/requests.c [iso-8859-1] Fri Jan 8 19:36:59 2010 @@ -118,11 +118,9 @@ DPRINT("Called. OID 0x%x\n", Oid); - ASSERT_IRQL_EQUAL(DISPATCH_LEVEL); - ASSERT(Adapter); - NdisDprAcquireSpinLock(&Adapter->Lock); + NdisAcquireSpinLock(&Adapter->Lock); Status = NDIS_STATUS_SUCCESS; CopyFrom = (PVOID)&GenericULONG; @@ -369,7 +367,7 @@ *BytesNeeded = 0; } - NdisDprReleaseSpinLock(&Adapter->Lock); + NdisReleaseSpinLock(&Adapter->Lock); DPRINT("Leaving. Status is 0x%x\n", Status); @@ -408,11 +406,9 @@ ASSERT(Adapter); - ASSERT_IRQL_EQUAL(DISPATCH_LEVEL); - DPRINT("Called, OID 0x%x\n", Oid); - NdisDprAcquireSpinLock(&Adapter->Lock); + NdisAcquireSpinLock(&Adapter->Lock); switch (Oid) { @@ -511,7 +507,7 @@ *BytesNeeded = 0; } - NdisDprReleaseSpinLock(&Adapter->Lock); + NdisReleaseSpinLock(&Adapter->Lock); DPRINT("Leaving. Status (0x%X).\n", Status); [View Less]

15 years, 5 months

← Newer
1
...
33
34
35
36
37
38
39
...
53
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 January 2010