Ros-diffs March 2012

ros-diffs@reactos.org

22 participants
351 discussions

[cgutman] 56022: [NEWCC] - Add missing wait entry handling
by cgutman＠svn.reactos.org 04 Mar '12

04 Mar '12

Author: cgutman Date: Sun Mar 4 23:45:16 2012 New Revision: 56022 URL: http://svn.reactos.org/svn/reactos?rev=56022&view=rev Log: [NEWCC] - Add missing wait entry handling Modified: trunk/reactos/ntoskrnl/cache/section/fault.c trunk/reactos/ntoskrnl/cache/section/swapout.c Modified: trunk/reactos/ntoskrnl/cache/section/fault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/fau… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/fault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/fault.c [iso-8859-1] Sun Mar 4 23:45:16 2012 @@ -158,10 +158,22 @@ return Status; } } + else if (MM_IS_WAIT_PTE(Entry)) + { + MmUnlockSectionSegment(Segment); + return STATUS_SUCCESS + 1; + } else if (Entry) { PFN_NUMBER Page = PFN_FROM_SSE(Entry); DPRINT("Take reference to page %x #\n", Page); + + if (MiGetPfnEntry(Page) == NULL) + { + DPRINT1("Found no PFN entry for page 0x%x in page entry 0x%x (segment: 0x%p, offset: %08x%08x)\n", + Page, Entry, Segment, TotalOffset.HighPart, TotalOffset.LowPart); + KeBugCheck(CACHE_MANAGER); + } MmReferencePage(Page); Modified: trunk/reactos/ntoskrnl/cache/section/swapout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/swa… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/swapout.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/swapout.c [iso-8859-1] Sun Mar 4 23:45:16 2012 @@ -204,6 +204,12 @@ Entry = MmGetPageEntrySectionSegment(Segment, &TotalOffset); + if (MM_IS_WAIT_PTE(Entry)) + { + MmUnlockSectionSegment(Segment); + return STATUS_SUCCESS + 1; + } + if (Dirty) { DPRINT("Dirty page: %p:%p segment %p offset %08x%08x\n", Process, Address, Segment, TotalOffset.HighPart, TotalOffset.LowPart); MmSetPageEntrySectionSegment(Segment, &TotalOffset, DIRTY_SSE(Entry)); @@ -362,7 +368,7 @@ if (Status == STATUS_SUCCESS + 1) { // Wait page ... the other guy has it, so we'll just fail for now - DPRINTC("Wait entry ... can't continue\n"); + DPRINT1("Wait entry ... can't continue\n"); Status = STATUS_UNSUCCESSFUL; goto bail; }

1 0

[pschweitzer] 56021: [RAMDISK] Implement RamdiskRemoveBusDevice. Stubplement RamdiskDeleteDiskDevice. Use them in RamdiskPnp.
by pschweitzer＠svn.reactos.org 04 Mar '12

04 Mar '12

Author: pschweitzer Date: Sun Mar 4 23:08:33 2012 New Revision: 56021 URL: http://svn.reactos.org/svn/reactos?rev=56021&view=rev Log: [RAMDISK] Implement RamdiskRemoveBusDevice. Stubplement RamdiskDeleteDiskDevice. Use them in RamdiskPnp. Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] Sun Mar 4 23:08:33 2012 @@ -1976,6 +1976,120 @@ NTSTATUS NTAPI +RamdiskDeleteDiskDevice(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + UNIMPLEMENTED; + while (TRUE); + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +RamdiskRemoveBusDevice(IN PDEVICE_OBJECT DeviceObject, + IN PIRP Irp) +{ + NTSTATUS Status; + PLIST_ENTRY ListHead, NextEntry; + PRAMDISK_BUS_EXTENSION DeviceExtension; + PRAMDISK_DRIVE_EXTENSION DriveExtension; + + DeviceExtension = DeviceObject->DeviceExtension; + + // + // Acquire disks list lock + // + KeEnterCriticalRegion(); + ExAcquireFastMutex(&DeviceExtension->DiskListLock); + + // + // Loop over drives + // + ListHead = &DeviceExtension->DiskList; + NextEntry = ListHead->Flink; + while (NextEntry != ListHead) + { + DriveExtension = CONTAINING_RECORD(NextEntry, + RAMDISK_DRIVE_EXTENSION, + DiskList); + + // + // Delete the disk + // + IoAcquireRemoveLock(&DriveExtension->RemoveLock, NULL); + RamdiskDeleteDiskDevice(DriveExtension->PhysicalDeviceObject, NULL); + + // + // RamdiskDeleteDiskDevice releases list lock, so reacquire it + // + KeEnterCriticalRegion(); + ExAcquireFastMutex(&DeviceExtension->DiskListLock); + } + + // + // Release disks list lock + // + ExReleaseFastMutex(&DeviceExtension->DiskListLock); + KeLeaveCriticalRegion(); + + // + // Prepare to pass to the lower driver + // + IoSkipCurrentIrpStackLocation(Irp); + // + // Here everything went fine + // + Irp->IoStatus.Status = STATUS_SUCCESS; + + // + // Call lower driver + // + Status = IoCallDriver(DeviceExtension->AttachedDevice, Irp); + + // + // Update state + // + DeviceExtension->State = RamdiskStateBusRemoved; + + // + // Release the lock, and ensure that everyone + // has finished its job before we continue + // The lock has been acquired by the dispatcher + // + IoReleaseRemoveLockAndWait(&DeviceExtension->RemoveLock, Irp); + + // + // If there's a drive name + // + if (DeviceExtension->DriveDeviceName.Buffer) + { + // + // Inform it's going to be disabled + // and free the drive name + // + IoSetDeviceInterfaceState(&DeviceExtension->DriveDeviceName, FALSE); + RtlFreeUnicodeString(&DeviceExtension->DriveDeviceName); + } + + // + // Part from the stack, detach from lower device + // + IoDetachDevice(DeviceExtension->AttachedDevice); + + // + // Finally, delete device + // + RamdiskBusFdo = NULL; + IoDeleteDevice(DeviceObject); + + // + // Return status from lower driver + // + return Status; +} + +NTSTATUS +NTAPI RamdiskPnp(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { @@ -2068,10 +2182,33 @@ break; case IRP_MN_REMOVE_DEVICE: - - DPRINT1("PnP IRP: %lx\n", Minor); - while (TRUE); - break; + + // + // Remove the proper device + // + if (DeviceExtension->Type == RamdiskBus) + { + Status = RamdiskRemoveBusDevice(DeviceObject, Irp); + + // + // Return here, lower device has already been called + // And remove lock released. This is needed by the function. + // + return Status; + } + else + { + Status = RamdiskDeleteDiskDevice(DeviceObject, Irp); + + // + // Complete the IRP here and return + // Here again we don't have to release remove lock + // This has already been done by the function. + // + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return Status; + } case IRP_MN_SURPRISE_REMOVAL:

1 0

[cgutman] 56020: [NTOSKRNL] - Kill this straggler from last commit
by cgutman＠svn.reactos.org 04 Mar '12

04 Mar '12

Author: cgutman Date: Sun Mar 4 22:45:46 2012 New Revision: 56020 URL: http://svn.reactos.org/svn/reactos?rev=56020&view=rev Log: [NTOSKRNL] - Kill this straggler from last commit Modified: trunk/reactos/ntoskrnl/cache/section/fault.c Modified: trunk/reactos/ntoskrnl/cache/section/fault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/fau… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/fault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/fault.c [iso-8859-1] Sun Mar 4 22:45:46 2012 @@ -142,13 +142,6 @@ { DPRINT("Set %x in address space @ %x\n", Required->Page[0], Address); Status = MmCreateVirtualMapping(Process, Address, Attributes, Required->Page, 1); -#if (_MI_PAGING_LEVELS == 2) - if (Address < MmSystemRangeStart) - { - Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]++; - ASSERT(Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] <= PTE_COUNT); - } -#endif if (NT_SUCCESS(Status)) { MmInsertRmap(Required->Page[0], Process, Address);

1 0

[jgardou] 56019: [NTOSKRNL/MM] - do not initialize idle process address space lock twice
by jgardou＠svn.reactos.org 04 Mar '12

04 Mar '12

Author: jgardou Date: Sun Mar 4 22:39:15 2012 New Revision: 56019 URL: http://svn.reactos.org/svn/reactos?rev=56019&view=rev Log: [NTOSKRNL/MM] - do not initialize idle process address space lock twice Modified: trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Sun Mar 4 22:39:15 2012 @@ -407,7 +407,6 @@ // the balance manager MmInitializeMemoryConsumer(MC_CACHE, MiRosTrimCache); - KeInitializeGuardedMutex(&PsIdleProcess->AddressCreationLock); MmKernelAddressSpace = &PsIdleProcess->Vm; /* Intialize system memory areas */

1 0

[cgutman] 56018: [NTOSKRNL] - Consolidate most of the PDE reference counting code into the arch-specific RosMm folder where it belongs
by cgutman＠svn.reactos.org 04 Mar '12

04 Mar '12

Author: cgutman Date: Sun Mar 4 22:31:30 2012 New Revision: 56018 URL: http://svn.reactos.org/svn/reactos?rev=56018&view=rev Log: [NTOSKRNL] - Consolidate most of the PDE reference counting code into the arch-specific RosMm folder where it belongs Modified: trunk/reactos/ntoskrnl/cache/section/data.c trunk/reactos/ntoskrnl/cache/section/fault.c trunk/reactos/ntoskrnl/cache/section/swapout.c trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/marea.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/cache/section/data.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/dat… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] Sun Mar 4 22:31:30 2012 @@ -143,14 +143,6 @@ MmReferencePage(Page); MmCreateVirtualMapping(NULL, Address, PAGE_READWRITE, &Page, 1); MmInsertRmap(Page, NULL, Address); -#if (_MI_PAGING_LEVELS == 2) - /* Reference Page Directory Entry */ - if(Address < MmSystemRangeStart) - { - MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]++; - ASSERT(MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] <= PTE_COUNT); - } -#endif } else MmReleasePageMemoryConsumer(MC_CACHE, Page); @@ -676,10 +668,6 @@ MmDeleteRmap(Page, Process, Address); MmDeleteVirtualMapping(Process, Address, FALSE, NULL, NULL); MmReleasePageMemoryConsumer(MC_CACHE, Page); -#if (_MI_PAGING_LEVELS == 2) - if (Address < MmSystemRangeStart) - Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]--; -#endif } if (SwapEntry != 0) { Modified: trunk/reactos/ntoskrnl/cache/section/fault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/fau… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/fault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/fault.c [iso-8859-1] Sun Mar 4 22:31:30 2012 @@ -173,13 +173,6 @@ MmReferencePage(Page); Status = MmCreateVirtualMapping(Process, Address, Attributes, &Page, 1); -#if (_MI_PAGING_LEVELS == 2) - if (Address < MmSystemRangeStart) - { - Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]++; - ASSERT(Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] <= PTE_COUNT); - } -#endif if (NT_SUCCESS(Status)) { MmInsertRmap(Page, Process, Address); Modified: trunk/reactos/ntoskrnl/cache/section/swapout.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/swa… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/swapout.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/swapout.c [iso-8859-1] Sun Mar 4 22:31:30 2012 @@ -215,11 +215,6 @@ MmReleasePageMemoryConsumer(MC_CACHE, Required->Page[0]); -#if (_MI_PAGING_LEVELS == 2) - if (Address < MmSystemRangeStart) - Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]--; -#endif - MmUnlockSectionSegment(Segment); MiSetPageEvent(Process, Address); return STATUS_SUCCESS; Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Sun Mar 4 22:31:30 2012 @@ -461,6 +461,13 @@ * are removed from the cache */ MiFlushTlb(Pt, Address); + if (Address < MmSystemRangeStart) + { + /* Remove PDE reference */ + Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]--; + ASSERT(Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] < PTE_COUNT); + } + Pfn = PTE_TO_PFN(Pte); if (FreePage) @@ -524,6 +531,13 @@ */ Pte = InterlockedExchangePte(Pt, 0); + if (Address < MmSystemRangeStart) + { + /* Remove PDE reference */ + Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]--; + ASSERT(Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] < PTE_COUNT); + } + /* We don't need to flush here because page file entries * are invalid translations, so the processor won't cache them */ MmUnmapPageTable(Pt); @@ -716,6 +730,13 @@ { KeBugCheck(MEMORY_MANAGEMENT); } + + if (Address < MmSystemRangeStart) + { + /* Add PDE reference */ + Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]++; + ASSERT(Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] <= PTE_COUNT); + } /* We don't need to flush the TLB here because it * only caches valid translations and a zero PTE @@ -826,6 +847,13 @@ /* We don't need to flush the TLB here because it only caches valid translations * and we're moving this PTE from invalid to valid so it can't be cached right now */ + + if (Addr < MmSystemRangeStart) + { + /* Add PDE reference */ + Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Addr)]++; + ASSERT(Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Addr)] <= PTE_COUNT); + } } ASSERT(Addr > Address); Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=56… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Sun Mar 4 22:31:30 2012 @@ -750,8 +750,6 @@ if((SwapEntry || Page) && ((PVOID)Address < MmSystemRangeStart)) { ASSERT(AddressSpace != MmGetKernelAddressSpace()); - MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]--; - ASSERT(MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] < PTE_COUNT); if(MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] == 0) { /* No PTE relies on this PDE. Release it */ Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sun Mar 4 22:31:30 2012 @@ -1370,15 +1370,6 @@ Page = PFN_FROM_SSE(Entry); MmSharePageEntrySectionSegment(Segment, &Offset); - - #if (_MI_PAGING_LEVELS == 2) - /* Reference Page Directory Entry */ - if(Address < MmSystemRangeStart) - { - MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]++; - ASSERT(MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] <= PTE_COUNT); - } -#endif /* FIXME: Should we call MmCreateVirtualMappingUnsafe if * (Section->AllocationAttributes & SEC_PHYSICALMEMORY) is true? @@ -1469,15 +1460,6 @@ return(STATUS_SUCCESS); } -#if (_MI_PAGING_LEVELS == 2) - /* Reference Page Directory Entry */ - if(Address < MmSystemRangeStart) - { - MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]++; - ASSERT(MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] <= PTE_COUNT); - } -#endif - /* * Satisfying a page fault on a map of /Device/PhysicalMemory is easy */ @@ -1598,13 +1580,6 @@ /* * Cleanup and release locks */ -#if (_MI_PAGING_LEVELS == 2) - if(Address < MmSystemRangeStart) - { - MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]--; - ASSERT(MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] < PTE_COUNT); - } -#endif MmLockAddressSpace(AddressSpace); PageOp->Status = Status; MmspCompleteAndReleasePageOp(PageOp); @@ -1973,15 +1948,6 @@ { MmReleasePageMemoryConsumer(MC_USER, Page); } - -#if (_MI_PAGING_LEVELS == 2) - /* If this is for the calling process, we take care of te reference in the main function */ - if((Address < MmSystemRangeStart) && (Process != PageOutContext->CallingProcess)) - { - Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]--; - ASSERT(Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] < PTE_COUNT); - } -#endif DPRINT("PhysicalAddress %x, Address %x\n", Page << PAGE_SHIFT, Address); } @@ -2154,14 +2120,6 @@ } if (!Context.WasDirty && SwapEntry != 0) { -#if (_MI_PAGING_LEVELS == 2) - /* We keep the pagefile index global to the segment, not in the PTE */ - if(Address < MmSystemRangeStart) - { - Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]--; - ASSERT(Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] < PTE_COUNT); - } -#endif MmSetSavedSwapEntryPage(Page, 0); MmLockSectionSegment(Context.Segment); MmSetPageEntrySectionSegment(Context.Segment, &Context.Offset, MAKE_SWAP_SSE(SwapEntry)); @@ -2182,14 +2140,6 @@ } if (!Context.WasDirty || SwapEntry != 0) { -#if (_MI_PAGING_LEVELS == 2) - /* We keep the pagefile index global to the segment, not in the PTE */ - if(Address < MmSystemRangeStart) - { - Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]--; - ASSERT(Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] < PTE_COUNT); - } -#endif MmSetSavedSwapEntryPage(Page, 0); if (SwapEntry != 0) { @@ -2205,14 +2155,6 @@ } else if (!Context.Private && DirectMapped) { -#if (_MI_PAGING_LEVELS == 2) - /* Read only page, no need for a pagefile entry -> PDE-- */ - if(Address < MmSystemRangeStart) - { - Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]--; - ASSERT(Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] <= PTE_COUNT); - } -#endif if (SwapEntry != 0) { DPRINT1("Found a swapentry for a non private and direct mapped page (address %x)\n", @@ -2243,14 +2185,6 @@ Address); KeBugCheckEx(MEMORY_MANAGEMENT, SwapEntry, Page, (ULONG_PTR)Process, (ULONG_PTR)Address); } -#if (_MI_PAGING_LEVELS == 2) - /* Non dirty, non private, non direct-mapped -> PDE-- */ - if(Address < MmSystemRangeStart) - { - Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]--; - ASSERT(Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] < PTE_COUNT); - } -#endif MmReleasePageMemoryConsumer(MC_USER, Page); PageOp->Status = STATUS_SUCCESS; MmspCompleteAndReleasePageOp(PageOp); @@ -2409,14 +2343,6 @@ } else { -#if (_MI_PAGING_LEVELS == 2) - /* We keep the pagefile index global to the segment, not in the PTE */ - if(Address < MmSystemRangeStart) - { - Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)]--; - ASSERT(Process->Vm.VmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Address)] < PTE_COUNT); - } -#endif Entry = MAKE_SWAP_SSE(SwapEntry); MmSetPageEntrySectionSegment(Context.Segment, &Context.Offset, Entry); }

1 0

[pschweitzer] 56016: [RAMDISK] Implement RamdiskScsi, RamdiskSystemControl, RamdiskPower
by pschweitzer＠svn.reactos.org 04 Mar '12

04 Mar '12

Author: pschweitzer Date: Sun Mar 4 21:42:16 2012 New Revision: 56016 URL: http://svn.reactos.org/svn/reactos?rev=56016&view=rev Log: [RAMDISK] Implement RamdiskScsi, RamdiskSystemControl, RamdiskPower Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c Modified: trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/ramd… ============================================================================== --- trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/ramdisk/ramdisk.c [iso-8859-1] Sun Mar 4 21:42:16 2012 @@ -2191,9 +2191,87 @@ RamdiskPower(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - UNIMPLEMENTED; - while (TRUE); - return STATUS_SUCCESS; + NTSTATUS Status; + PIO_STACK_LOCATION IoStackLocation; + PRAMDISK_BUS_EXTENSION DeviceExtension; + + DeviceExtension = DeviceObject->DeviceExtension; + + // + // If we have a device extension, take extra caution + // with the lower driver + // + if (DeviceExtension != NULL) + { + PoStartNextPowerIrp(Irp); + + // + // Device has not been removed yet, so + // pass to the attached/lower driver + // + if (DeviceExtension->State < RamdiskStateBusRemoved) + { + IoSkipCurrentIrpStackLocation(Irp); + return PoCallDriver(DeviceExtension->AttachedDevice, Irp); + } + // + // Otherwise, simply complete the IRP + // Notifying that deletion is pending + // + else + { + Irp->IoStatus.Status = STATUS_DELETE_PENDING; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_DELETE_PENDING; + } + } + + // + // Get stack and deal with minor functions + // + IoStackLocation = IoGetCurrentIrpStackLocation(Irp); + switch (IoStackLocation->MinorFunction) + { + case IRP_MN_SET_POWER: + // + // If setting device power state + // it's all fine and return success + // + if (DevicePowerState) + { + Irp->IoStatus.Status = STATUS_SUCCESS; + } + + // + // Get appropriate status for return + // + Status = Irp->IoStatus.Status; + PoStartNextPowerIrp(Irp); + IoCompleteRequest(Irp, IO_NO_INCREMENT); + break; + + case IRP_MN_QUERY_POWER: + // + // We can obviously accept all states + // So just return success + // + Status = + Irp->IoStatus.Status = STATUS_SUCCESS; + PoStartNextPowerIrp(Irp); + IoCompleteRequest(Irp, IO_NO_INCREMENT); + break; + + default: + // + // Just complete and save status for return + // + Status = Irp->IoStatus.Status; + PoStartNextPowerIrp(Irp); + IoCompleteRequest(Irp, IO_NO_INCREMENT); + break; + } + + return Status; } NTSTATUS @@ -2201,9 +2279,31 @@ RamdiskSystemControl(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - UNIMPLEMENTED; - while (TRUE); - return STATUS_SUCCESS; + NTSTATUS Status; + PRAMDISK_BUS_EXTENSION DeviceExtension; + + DeviceExtension = DeviceObject->DeviceExtension; + + // + // If we have a device extension, forward the IRP + // to the attached device + // + if (DeviceExtension != NULL) + { + IoSkipCurrentIrpStackLocation(Irp); + Status = IoCallDriver(DeviceExtension->AttachedDevice, Irp); + } + // + // Otherwise just complete the request + // And return the status with which we complete it + // + else + { + Status = Irp->IoStatus.Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + } + + return Status; } NTSTATUS @@ -2211,9 +2311,51 @@ RamdiskScsi(IN PDEVICE_OBJECT DeviceObject, IN PIRP Irp) { - UNIMPLEMENTED; - while (TRUE); - return STATUS_SUCCESS; + NTSTATUS Status; + PRAMDISK_BUS_EXTENSION DeviceExtension; + + DeviceExtension = DeviceObject->DeviceExtension; + + // + // Having a proper device is mandatory + // + if (DeviceExtension->State > RamdiskStateStopped) + { + Status = STATUS_DEVICE_DOES_NOT_EXIST; + goto CompleteIRP; + } + + // + // Acquire the remove lock + // + Status = IoAcquireRemoveLock(&DeviceExtension->RemoveLock, Irp); + if (!NT_SUCCESS(Status)) + { + goto CompleteIRP; + } + + // + // Queue the IRP for worker + // + Status = SendIrpToThread(DeviceObject, Irp); + if (Status != STATUS_PENDING) + { + goto CompleteIRP; + } + + // + // Release the remove lock + // + IoReleaseRemoveLock(&DeviceExtension->RemoveLock, Irp); + goto Quit; + +CompleteIRP: + Irp->IoStatus.Information = 0; + Irp->IoStatus.Status = Status; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + +Quit: + return Status; } NTSTATUS @@ -2241,7 +2383,7 @@ } // - // Queue the IRP from worker + // Queue the IRP for worker // Status = SendIrpToThread(DeviceObject, Irp); if (Status != STATUS_PENDING)

1 0

[cgutman] 56015: [NEWCC] - Turn off a bit more debugging so NewCC is largely quiet unless there's a problem
by cgutman＠svn.reactos.org 04 Mar '12

04 Mar '12

Author: cgutman Date: Sun Mar 4 21:36:34 2012 New Revision: 56015 URL: http://svn.reactos.org/svn/reactos?rev=56015&view=rev Log: [NEWCC] - Turn off a bit more debugging so NewCC is largely quiet unless there's a problem Modified: trunk/reactos/ntoskrnl/cache/cachesub.c trunk/reactos/ntoskrnl/cache/fssup.c Modified: trunk/reactos/ntoskrnl/cache/cachesub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/cachesub.c?… ============================================================================== --- trunk/reactos/ntoskrnl/cache/cachesub.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/cachesub.c [iso-8859-1] Sun Mar 4 21:36:34 2012 @@ -12,7 +12,7 @@ #include <ntoskrnl.h> #include "newcc.h" #include "section/newmm.h" -//#define NDEBUG +#define NDEBUG #include <debug.h> /* STRUCTURES *****************************************************************/ @@ -50,7 +50,7 @@ LARGE_INTEGER Offset; PWORK_QUEUE_WITH_READ_AHEAD WorkItem = (PWORK_QUEUE_WITH_READ_AHEAD)Context; PNOCC_CACHE_MAP Map = (PNOCC_CACHE_MAP)WorkItem->FileObject->SectionObjectPointer->SharedCacheMap; - DPRINT("Reading ahead %08x%08x:%x %wZ\n", + DPRINT1("Reading ahead %08x%08x:%x %wZ\n", WorkItem->FileOffset.HighPart, WorkItem->FileOffset.LowPart, WorkItem->Length, Modified: trunk/reactos/ntoskrnl/cache/fssup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/fssup.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/cache/fssup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/fssup.c [iso-8859-1] Sun Mar 4 21:36:34 2012 @@ -12,7 +12,7 @@ #include <ntoskrnl.h> #include "newcc.h" #include "section/newmm.h" -//#define NDEBUG +#define NDEBUG #include <debug.h> /* GLOBALS ********************************************************************/ @@ -59,7 +59,7 @@ CcCacheBitmap->Buffer = ((PULONG)&CcCacheBitmap[1]); CcCacheBitmap->SizeOfBitMap = ROUND_UP(CACHE_NUM_SECTIONS, 32); - DPRINT("Cache has %d entries\n", CcCacheBitmap->SizeOfBitMap); + DPRINT1("Cache has %d entries\n", CcCacheBitmap->SizeOfBitMap); ExInitializeFastMutex(&CcMutex); return TRUE;

1 0

[cgutman] 56014: [NTOSKRNL] - Fix a major bug in the failure path of IoCreateDevice that would cause corruption of kernel memory if IopCreateVpb failed
by cgutman＠svn.reactos.org 04 Mar '12

04 Mar '12

Author: cgutman Date: Sun Mar 4 21:18:01 2012 New Revision: 56014 URL: http://svn.reactos.org/svn/reactos?rev=56014&view=rev Log: [NTOSKRNL] - Fix a major bug in the failure path of IoCreateDevice that would cause corruption of kernel memory if IopCreateVpb failed Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] Sun Mar 4 21:18:01 2012 @@ -978,8 +978,8 @@ Status = IopCreateVpb(CreatedDeviceObject); if (!NT_SUCCESS(Status)) { - /* Reference the device object and fail */ - ObDereferenceObject(DeviceObject); + /* Dereference the device object and fail */ + ObDereferenceObject(CreatedDeviceObject); return Status; }

1 0

[jgardou] 56012: [NTOSKRNL/MM] - initialize VmWorkingSet pointer for system process. Should fix random crashes when paging out.
by jgardou＠svn.reactos.org 04 Mar '12

04 Mar '12

Author: jgardou Date: Sun Mar 4 20:30:42 2012 New Revision: 56012 URL: http://svn.reactos.org/svn/reactos?rev=56012&view=rev Log: [NTOSKRNL/MM] - initialize VmWorkingSet pointer for system process. Should fix random crashes when paging out. Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Sun Mar 4 20:30:42 2012 @@ -1136,6 +1136,9 @@ ASSERT(Process->VadRoot.NumberGenericTableElements == 0); Process->VadRoot.BalancedRoot.u1.Parent = &Process->VadRoot.BalancedRoot; + /* Use idle process Working set */ + Process->Vm.VmWorkingSetList = PsGetCurrentProcess()->Vm.VmWorkingSetList; + /* Done */ Process->HasAddressSpace = TRUE;//?? return STATUS_SUCCESS;

1 0

[sir_richard] 56010: [NTOS]: For debugging only, want to see what is excercising MmAllocatePagesForMdl. The way I wrote this seems broken, but I can't find anything to test it with.
by sir_richard＠svn.reactos.org 04 Mar '12

04 Mar '12

Author: sir_richard Date: Sun Mar 4 19:51:22 2012 New Revision: 56010 URL: http://svn.reactos.org/svn/reactos?rev=56010&view=rev Log: [NTOS]: For debugging only, want to see what is excercising MmAllocatePagesForMdl. The way I wrote this seems broken, but I can't find anything to test it with. Modified: trunk/reactos/ntoskrnl/mm/freelist.c Modified: trunk/reactos/ntoskrnl/mm/freelist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/freelist.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/freelist.c [iso-8859-1] Sun Mar 4 19:51:22 2012 @@ -167,6 +167,7 @@ PPHYSICAL_PAGE Pfn1; INT LookForZeroedPages; ASSERT(KeGetCurrentIrql() <= APC_LEVEL); + DPRINT1("ARM3-DEBUG: Being called with %I64x %I64x %I64x %lx %d %d\n", LowAddress, HighAddress, SkipBytes, TotalBytes, CacheAttribute, MdlFlags); // // Convert the low address into a PFN

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
36
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 March 2012