Ros-diffs October 2009

ros-diffs@reactos.org

26 participants
641 discussions

[cgutman] 43509: - Define GUIDs correctly to prevent "multiple definition" errors
by cgutman＠svn.reactos.org 16 Oct '09

16 Oct '09

Author: cgutman Date: Fri Oct 16 06:20:34 2009 New Revision: 43509 URL: http://svn.reactos.org/svn/reactos?rev=43509&view=rev Log: - Define GUIDs correctly to prevent "multiple definition" errors Modified: trunk/reactos/include/reactos/winsock/nsp_dns.h Modified: trunk/reactos/include/reactos/winsock/nsp_dns.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/winsock/ns… ============================================================================== --- trunk/reactos/include/reactos/winsock/nsp_dns.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/winsock/nsp_dns.h [iso-8859-1] Fri Oct 16 06:20:34 2009 @@ -11,14 +11,15 @@ /* Includes */ #include <svcguid.h> +#include <guiddef.h> /* Globals */ -GUID HostnameGuid = SVCID_HOSTNAME; -GUID AddressGuid = SVCID_INET_HOSTADDRBYINETSTRING; -GUID HostAddrByNameGuid = SVCID_INET_HOSTADDRBYNAME; -GUID IANAGuid = SVCID_INET_SERVICEBYNAME; -GUID InetHostName = SVCID_INET_HOSTADDRBYNAME; -GUID Ipv6Guid = SVCID_DNS_TYPE_AAAA; +const GUID DECLSPEC_SELECTANY HostnameGuid = SVCID_HOSTNAME; +const GUID DECLSPEC_SELECTANY AddressGuid = SVCID_INET_HOSTADDRBYINETSTRING; +const GUID DECLSPEC_SELECTANY HostAddrByNameGuid = SVCID_INET_HOSTADDRBYNAME; +const GUID DECLSPEC_SELECTANY IANAGuid = SVCID_INET_SERVICEBYNAME; +const GUID DECLSPEC_SELECTANY InetHostName = SVCID_INET_HOSTADDRBYNAME; +const GUID DECLSPEC_SELECTANY Ipv6Guid = SVCID_DNS_TYPE_AAAA; /* Macros and Defines */ #define RNR_BUFFER_SIZE 512

1 0

[ros-arm-bringup] 43508: - Move some unimplemented Ex* Pool routines into ARM3's expool.c. - Move some unimplemented Mm* Pool routines into ARM3's pool.c.
by ros-arm-bringup＠svn.reactos.org 16 Oct '09

16 Oct '09

Author: ros-arm-bringup Date: Fri Oct 16 02:28:33 2009 New Revision: 43508 URL: http://svn.reactos.org/svn/reactos?rev=43508&view=rev Log: - Move some unimplemented Ex* Pool routines into ARM3's expool.c. - Move some unimplemented Mm* Pool routines into ARM3's pool.c. Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c trunk/reactos/ntoskrnl/mm/ARM3/pool.c trunk/reactos/ntoskrnl/mm/pool.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/expool.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] Fri Oct 16 02:28:33 2009 @@ -15,6 +15,9 @@ #line 15 "ARMÂ³::EXPOOL" #define MODULE_INVOLVED_IN_ARM3 #include "../ARM3/miarm.h" + +#undef ExAllocatePoolWithQuota +#undef ExAllocatePoolWithQuotaTag /* GLOBALS ********************************************************************/ @@ -637,4 +640,67 @@ ExFreeArmPoolWithTag(P, 0); } +/* + * @unimplemented + */ +SIZE_T +NTAPI +ExQueryPoolBlockSize(IN PVOID PoolBlock, + OUT PBOOLEAN QuotaCharged) +{ + // + // Not implemented + // + UNIMPLEMENTED; + return FALSE; +} + +/* + * @implemented + */ + +PVOID +NTAPI +ExAllocatePoolWithQuota(IN POOL_TYPE PoolType, + IN ULONG NumberOfBytes) +{ + // + // Allocate the pool + // + return ExAllocatePoolWithQuotaTag(PoolType, NumberOfBytes, 'enoN'); +} + +/* + * @implemented + */ +PVOID +NTAPI +ExAllocatePoolWithTagPriority(IN POOL_TYPE PoolType, + IN SIZE_T NumberOfBytes, + IN ULONG Tag, + IN EX_POOL_PRIORITY Priority) +{ + // + // Allocate the pool + // + UNIMPLEMENTED; + return ExAllocatePoolWithTag(PoolType, NumberOfBytes, Tag); +} + +/* + * @implemented + */ +PVOID +NTAPI +ExAllocatePoolWithQuotaTag(IN POOL_TYPE PoolType, + IN ULONG NumberOfBytes, + IN ULONG Tag) +{ + // + // Allocate the pool + // + UNIMPLEMENTED; + return ExAllocatePoolWithTag(PoolType, NumberOfBytes, Tag); +} + /* EOF */ Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pool.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] Fri Oct 16 02:28:33 2009 @@ -711,4 +711,44 @@ return NumberOfPages; } + +BOOLEAN +NTAPI +MiRaisePoolQuota(IN POOL_TYPE PoolType, + IN ULONG CurrentMaxQuota, + OUT PULONG NewMaxQuota) +{ + // + // Not implemented + // + UNIMPLEMENTED; + *NewMaxQuota = CurrentMaxQuota + 65536; + return TRUE; +} + +/* PUBLIC FUNCTIONS ***********************************************************/ + +/* + * @unimplemented + */ +PVOID +NTAPI +MmAllocateMappingAddress(IN SIZE_T NumberOfBytes, + IN ULONG PoolTag) +{ + UNIMPLEMENTED; + return NULL; +} + +/* + * @unimplemented + */ +VOID +NTAPI +MmFreeMappingAddress(IN PVOID BaseAddress, + IN ULONG PoolTag) +{ + UNIMPLEMENTED; +} + /* EOF */ Modified: trunk/reactos/ntoskrnl/mm/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pool.c?rev=435… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pool.c [iso-8859-1] Fri Oct 16 02:28:33 2009 @@ -165,79 +165,6 @@ return(Block); } - -/* - * @implemented - */ -#undef ExAllocatePoolWithQuota -#undef ExAllocatePoolWithQuotaTag -PVOID NTAPI -ExAllocatePoolWithQuota (POOL_TYPE PoolType, ULONG NumberOfBytes) -{ - return(ExAllocatePoolWithQuotaTag(PoolType, NumberOfBytes, TAG_NONE)); -} - -/* - * @implemented - */ -PVOID -NTAPI -ExAllocatePoolWithTagPriority( - IN POOL_TYPE PoolType, - IN SIZE_T NumberOfBytes, - IN ULONG Tag, - IN EX_POOL_PRIORITY Priority - ) -{ - /* Do the allocation */ - UNIMPLEMENTED; - return ExAllocatePoolWithTag(PoolType, NumberOfBytes, Tag); -} - -/* - * @implemented - */ -PVOID -NTAPI -ExAllocatePoolWithQuotaTag (IN POOL_TYPE PoolType, - IN ULONG NumberOfBytes, - IN ULONG Tag) -{ - PEPROCESS Process; - PVOID Block; - - /* Allocate the Pool First */ - Block = EiAllocatePool(PoolType, - NumberOfBytes, - Tag, - &ExAllocatePoolWithQuotaTag); - - /* "Quota is not charged to the thread for allocations >= PAGE_SIZE" - OSR Docs */ - if (!(NumberOfBytes >= PAGE_SIZE)) - { - /* Get the Current Process */ - Process = PsGetCurrentProcess(); - - /* PsChargePoolQuota returns an exception, so this needs SEH */ - _SEH2_TRY - { - /* FIXME: Is there a way to get the actual Pool size allocated from the pool header? */ - PsChargePoolQuota(Process, - PoolType & PAGED_POOL_MASK, - NumberOfBytes); - } - _SEH2_EXCEPT((ExFreePool(Block), EXCEPTION_CONTINUE_SEARCH)) - { - /* Quota Exceeded and the caller had no SEH! */ - KeBugCheck(STATUS_QUOTA_EXCEEDED); - } - _SEH2_END; - } - - /* Return the allocated block */ - return Block; -} - /* * @implemented */ @@ -307,77 +234,4 @@ } } -/* - * @unimplemented - */ -SIZE_T -NTAPI -ExQueryPoolBlockSize ( - IN PVOID PoolBlock, - OUT PBOOLEAN QuotaCharged - ) -{ - UNIMPLEMENTED; - return FALSE; -} - -/* - * @unimplemented - */ -PVOID -NTAPI -MmAllocateMappingAddress ( - IN SIZE_T NumberOfBytes, - IN ULONG PoolTag - ) -{ - UNIMPLEMENTED; - return 0; -} - - -/* - * @unimplemented - */ -VOID -NTAPI -MmFreeMappingAddress ( - IN PVOID BaseAddress, - IN ULONG PoolTag - ) -{ - UNIMPLEMENTED; -} - -BOOLEAN -NTAPI -MiRaisePoolQuota( - IN POOL_TYPE PoolType, - IN ULONG CurrentMaxQuota, - OUT PULONG NewMaxQuota - ) -{ - /* Different quota raises depending on the type (64K vs 512K) */ - if (PoolType == PagedPool) { - - /* Make sure that 4MB is still left */ - if ((MM_PAGED_POOL_SIZE >> 12) < ((MmPagedPoolSize + 4194304) >> 12)) { - return FALSE; - } - - /* Increase Paged Pool Quota by 512K */ - MmTotalPagedPoolQuota += 524288; - *NewMaxQuota = CurrentMaxQuota + 524288; - return TRUE; - - } else { /* Nonpaged Pool */ - - /* Check if we still have 200 pages free*/ - if (MmStats.NrFreePages < 200) return FALSE; - - *NewMaxQuota = CurrentMaxQuota + 65536; - return TRUE; - } -} - /* EOF */

1 0

[ros-arm-bringup] 43507: - Implement ARM3 page fault handling. - Paged pool PTEs are demand zero PTEs while the memory hasn't been accessed -- this is the only type of fault supported. - Because paged pool PDEs are also demand-paged, added code to handle demand paging of PDEs as well. - Also, because paged pool is non-resident, but can be accessed from any process, we need a mechanism to sync up the kernel's page directory with the per-process one, on demand. This is done at startup, but other p
by ros-arm-bringup＠svn.reactos.org 15 Oct '09

15 Oct '09

Author: ros-arm-bringup Date: Fri Oct 16 00:08:26 2009 New Revision: 43507 URL: http://svn.reactos.org/svn/reactos?rev=43507&view=rev Log: - Implement ARM3 page fault handling. - Paged pool PTEs are demand zero PTEs while the memory hasn't been accessed -- this is the only type of fault supported. - Because paged pool PDEs are also demand-paged, added code to handle demand paging of PDEs as well. - Also, because paged pool is non-resident, but can be accessed from any process, we need a mechanism to sync up the kernel's page directory with the per-process one, on demand. This is done at startup, but other processes may have paged in paged pool that another process knows nothing about when he faults. - Similar to the hack ReactOS Mm uses, but done properly. - This is what that shadow system page directory is finally being used for. - Assert if we get a user-mode fault, a transition fault, or a soft fault, since these shouldn't happen. - Disable APCs while dispatching faults, and pseudo-use the working set lock. - Assert if we get write errors on read-only pages, since we don't use those in ARM3 yet. - Assert if we have a paged out PTE, this shouldn't happen yet. - Enable test to see if we can touch a paged pool allocation. Added: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c (with props) Modified: trunk/reactos/ntoskrnl/mm/mmfault.c trunk/reactos/ntoskrnl/mm/mminit.c trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Added: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c (added) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Fri Oct 16 00:08:26 2009 @@ -1,0 +1,391 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: ntoskrnl/mm/ARM3/pagfault.c + * PURPOSE: ARM Memory Manager Page Fault Handling + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +#line 15 "ARMÂ³::PAGFAULT" +#define MODULE_INVOLVED_IN_ARM3 +#include "../ARM3/miarm.h" + +/* GLOBALS ********************************************************************/ + +/* PRIVATE FUNCTIONS **********************************************************/ + +NTSTATUS +FASTCALL +MiCheckPdeForPagedPool(IN PVOID Address) +{ + PMMPTE PointerPde; + NTSTATUS Status = STATUS_SUCCESS; + + // + // Check if this is a fault while trying to access the page table itself + // + if ((Address >= (PVOID)MiAddressToPte(MmSystemRangeStart)) && + (Address < (PVOID)PTE_TOP)) + { + // + // Send a hint to the page fault handler that this is only a valid fault + // if we already detected this was access within the page table range + // + PointerPde = MiAddressToPte(Address); + Status = STATUS_WAIT_1; + } + else if (Address < MmSystemRangeStart) + { + // + // This is totally illegal + // + return STATUS_ACCESS_VIOLATION; + } + else + { + // + // Get the PDE for the address + // + PointerPde = MiAddressToPde(Address); + } + + // + // Check if it's not valid + // + if (PointerPde->u.Hard.Valid == 0) + { + // + // Copy it from our double-mapped system page directory + // + InterlockedExchangePte(PointerPde, + MmSystemPagePtes[((ULONG_PTR)PointerPde & + (PAGE_SIZE - 1)) / + sizeof(MMPTE)].u.Long); + } + + // + // Return status + // + return Status; +} + +NTSTATUS +NTAPI +MiResolveDemandZeroFault(IN PVOID Address, + IN PMMPTE PointerPte, + IN PEPROCESS Process, + IN KIRQL OldIrql) +{ + PFN_NUMBER PageFrameNumber; + MMPTE TempPte; + DPRINT("ARM3 Demand Zero Page Fault Handler for address: %p in process: %p\n", + Address, + Process); + + // + // Lock the PFN database + // + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + ASSERT(PointerPte->u.Hard.Valid == 0); + + // + // Get a page + // + PageFrameNumber = MmAllocPage(MC_PPOOL, 0); + DPRINT("New pool page: %lx\n", PageFrameNumber); + + // + // Release PFN lock + // + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + + // + // Increment demand zero faults + // + InterlockedIncrement(&KeGetCurrentPrcb()->MmDemandZeroCount); + + // + // Build the PTE + // + TempPte = HyperTemplatePte; + TempPte.u.Hard.PageFrameNumber = PageFrameNumber; + *PointerPte = TempPte; + ASSERT(PointerPte->u.Hard.Valid == 1); + + // + // It's all good now + // + DPRINT("Paged pool page has now been paged in\n"); + return STATUS_PAGE_FAULT_DEMAND_ZERO; +} + +NTSTATUS +NTAPI +MiDispatchFault(IN BOOLEAN StoreInstruction, + IN PVOID Address, + IN PMMPTE PointerPte, + IN PMMPTE PrototypePte, + IN BOOLEAN Recursive, + IN PEPROCESS Process, + IN PVOID TrapInformation, + IN PVOID Vad) +{ + MMPTE TempPte; + KIRQL OldIrql; + NTSTATUS Status; + DPRINT("ARM3 Page Fault Dispatcher for address: %p in process: %p\n", + Address, + Process); + + // + // Make sure APCs are off and we're not at dispatch + // + OldIrql = KeGetCurrentIrql (); + ASSERT(OldIrql <= APC_LEVEL); + ASSERT(KeAreAllApcsDisabled () == TRUE); + + // + // Grab a copy of the PTE + // + TempPte = *PointerPte; + + // + // The PTE must be invalid, but not totally blank + // + ASSERT(TempPte.u.Hard.Valid == 0); + ASSERT(TempPte.u.Long != 0); + + // + // No prototype, transition or page file software PTEs in ARM3 yet + // + ASSERT(TempPte.u.Soft.Prototype == 0); + ASSERT(TempPte.u.Soft.Transition == 0); + ASSERT(TempPte.u.Soft.PageFileHigh == 0); + + // + // If we got this far, the PTE can only be a demand zero PTE, which is what + // we want. Go handle it! + // + Status = MiResolveDemandZeroFault(Address, + PointerPte, + Process, + -1); + if (NT_SUCCESS(Status)) + { + // + // Make sure we're returning in a sane state and pass the status down + // + ASSERT(OldIrql == KeGetCurrentIrql ()); + ASSERT(KeGetCurrentIrql() <= APC_LEVEL); + return Status; + } + + // + // Generate an access fault + // + return STATUS_ACCESS_VIOLATION; +} + +NTSTATUS +NTAPI +MmArmAccessFault(IN BOOLEAN StoreInstruction, + IN PVOID Address, + IN KPROCESSOR_MODE Mode, + IN PVOID TrapInformation) +{ + KIRQL OldIrql = KeGetCurrentIrql(), LockIrql; + PMMPTE PointerPde, PointerPte; + MMPTE TempPte; + PETHREAD CurrentThread; + NTSTATUS Status; + DPRINT("ARM3 FAULT AT: %p\n", Address); + + // + // Get the PTE and PDE + // + PointerPte = MiAddressToPte(Address); + PointerPde = MiAddressToPde(Address); + + // + // Check for dispatch-level snafu + // + if (OldIrql > APC_LEVEL) + { + // + // There are some special cases where this is okay, but not in ARM3 yet + // + DbgPrint("MM:***PAGE FAULT AT IRQL > 1 Va %p, IRQL %lx\n", + Address, + OldIrql); + ASSERT(OldIrql <= APC_LEVEL); + } + + // + // Check for kernel fault + // + if (Address >= MmSystemRangeStart) + { + // + // What are you even DOING here? + // + if (Mode == UserMode) return STATUS_ACCESS_VIOLATION; + + // + // Is the PDE valid? + // + if (!PointerPde->u.Hard.Valid == 0) + { + // + // Debug spew (eww!) + // + DPRINT("Invalid PDE\n"); + + // + // Handle mapping in "Special" PDE directoreis + // + MiCheckPdeForPagedPool(Address); + + // + // Now we SHOULD be good + // + if (PointerPde->u.Hard.Valid == 0) + { + // + // FIXFIX: Do the S-LIST hack + // + + // + // Kill the system + // + KeBugCheckEx(PAGE_FAULT_IN_NONPAGED_AREA, + (ULONG_PTR)Address, + StoreInstruction, + (ULONG_PTR)TrapInformation, + 2); + } + } + + // + // The PDE is valid, so read the PTE + // + TempPte = *PointerPte; + if (TempPte.u.Hard.Valid == 1) + { + // + // Only two things can go wrong here: + // Executing NX page (we couldn't care less) + // Writing to a read-only page (the stuff ARM3 works with is write, + // so again, moot point). + // + if (StoreInstruction) + { + DPRINT1("Should NEVER happen on ARM3!!!\n"); + return STATUS_ACCESS_VIOLATION; + } + + // + // Otherwise, the PDE was probably invalid, and all is good now + // + return STATUS_SUCCESS; + } + + // + // Check for a fault on the page table or hyperspace itself + // FIXME: Use MmHyperSpaceEnd + // + if ((Address >= (PVOID)PTE_BASE) && (Address <= (PVOID)0xC0800000)) + { + // + // This might happen...not sure yet + // + DPRINT1("FAULT ON PAGE TABLES!\n"); + return STATUS_ACCESS_VIOLATION; + } + + // + // Now we must raise to APC_LEVEL and mark the thread as owner + // We don't actually implement a working set pushlock, so this is only + // for internal consistency (and blocking APCs) + // + KeRaiseIrql(APC_LEVEL, &LockIrql); + CurrentThread = PsGetCurrentThread(); + KeEnterGuardedRegion(); + ASSERT((CurrentThread->OwnsSystemWorkingSetExclusive == 0) && + (CurrentThread->OwnsSystemWorkingSetShared == 0)); + CurrentThread->OwnsSystemWorkingSetExclusive = 1; + + // + // Re-read PTE now that the IRQL has been raised + // + TempPte = *PointerPte; + if (TempPte.u.Hard.Valid == 1) + { + // + // Only two things can go wrong here: + // Executing NX page (we couldn't care less) + // Writing to a read-only page (the stuff ARM3 works with is write, + // so again, moot point. + // + if (StoreInstruction) + { + DPRINT1("Should NEVER happen on ARM3!!!\n"); + return STATUS_ACCESS_VIOLATION; + } + + // + // Otherwise, the PDE was probably invalid, and all is good now + // + return STATUS_SUCCESS; + } + + // + // We don't implement prototype PTEs + // + ASSERT(TempPte.u.Soft.Prototype == 0); + + // + // We don't implement transition PTEs + // + ASSERT(TempPte.u.Soft.Transition == 0); + + // + // Now do the real fault handling + // + Status = MiDispatchFault(StoreInstruction, + Address, + PointerPte, + NULL, + FALSE, + NULL, + TrapInformation, + NULL); + + // + // Re-enable APCs + // + ASSERT(KeAreAllApcsDisabled() == TRUE); + CurrentThread->OwnsSystemWorkingSetExclusive = 0; + KeLeaveGuardedRegion(); + KeLowerIrql(LockIrql); + + // + // We are done! + // + DPRINT("Fault resolved with status: %lx\n", Status); + return Status; + } + + // + // DIE DIE DIE + // + DPRINT1("WARNING: USER MODE FAULT IN ARM3???\n"); + return STATUS_ACCESS_VIOLATION; +} + +/* EOF */ Propchange: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/ntoskrnl/mm/mmfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mmfault.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mmfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mmfault.c [iso-8859-1] Fri Oct 16 00:08:26 2009 @@ -283,9 +283,7 @@ // // Hand it off to more competent hands... // - UNIMPLEMENTED; - KeBugCheckEx(MEMORY_AREA_OWNED_BY_ARM3, Mode, (ULONG_PTR)Address, 0, 0); - //return MmArmAccessFault(StoreInstruction, Address, Mode, TrapInformation); + return MmArmAccessFault(StoreInstruction, Address, Mode, TrapInformation); } /* Keep same old ReactOS Behaviour */ Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Fri Oct 16 00:08:26 2009 @@ -403,12 +403,12 @@ // STEP 3: Allocate a page and touch it. // We should get an ARM3 page fault and it should handle the fault // - if (0) // NOT YET IMPLEMENTED + if (1) { PULONG Test; Test = MiAllocatePoolPages(PagedPool, PAGE_SIZE); - DPRINT1("Value: %lx", *Test); + ASSERT(*Test == 0); MiFreePoolPages(Test); } Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Fri Oct 16 00:08:26 2009 @@ -392,6 +392,7 @@ <file>mdlsup.c</file> <file>mmsup.c</file> <file>ncache.c</file> + <file>pagfault.c</file> <file>pool.c</file> <file>procsup.c</file> <file>syspte.c</file>

1 0

[tkreuzer] 43506: Fix definition of CryptReleaseContext
by tkreuzer＠svn.reactos.org 15 Oct '09

15 Oct '09

Author: tkreuzer Date: Thu Oct 15 23:54:39 2009 New Revision: 43506 URL: http://svn.reactos.org/svn/reactos?rev=43506&view=rev Log: Fix definition of CryptReleaseContext Modified: branches/ros-amd64-bringup/reactos/include/psdk/wincrypt.h Modified: branches/ros-amd64-bringup/reactos/include/psdk/wincrypt.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/psdk/wincrypt.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/psdk/wincrypt.h [iso-8859-1] Thu Oct 15 23:54:39 2009 @@ -3822,7 +3822,11 @@ WINADVAPI BOOL WINAPI CryptHashData (HCRYPTHASH, CONST BYTE *, DWORD, DWORD); WINADVAPI BOOL WINAPI CryptHashSessionKey (HCRYPTHASH, HCRYPTKEY, DWORD); WINADVAPI BOOL WINAPI CryptImportKey (HCRYPTPROV, CONST BYTE *, DWORD, HCRYPTKEY, DWORD, HCRYPTKEY *); +#if (NTDDI_VERSION >= NTDDI_WINXP) +WINADVAPI BOOL WINAPI CryptReleaseContext (HCRYPTPROV, DWORD); +#else WINADVAPI BOOL WINAPI CryptReleaseContext (HCRYPTPROV, ULONG_PTR); +#endif WINADVAPI BOOL WINAPI CryptSetHashParam (HCRYPTHASH, DWORD, CONST BYTE *, DWORD); WINADVAPI BOOL WINAPI CryptSetKeyParam (HCRYPTKEY, DWORD, CONST BYTE *, DWORD); WINADVAPI BOOL WINAPI CryptSetProviderA (LPCSTR, DWORD);

1 0

[tkreuzer] 43505: Update MMPTE
by tkreuzer＠svn.reactos.org 15 Oct '09

15 Oct '09

Author: tkreuzer Date: Thu Oct 15 23:50:51 2009 New Revision: 43505 URL: http://svn.reactos.org/svn/reactos?rev=43505&view=rev Log: Update MMPTE Modified: branches/ros-amd64-bringup/reactos/include/ndk/mmtypes.h Modified: branches/ros-amd64-bringup/reactos/include/ndk/mmtypes.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/mmtypes.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/mmtypes.h [iso-8859-1] Thu Oct 15 23:50:51 2009 @@ -321,14 +321,21 @@ { union { - ULONG Long; + ULONG_PTR Long; HARDWARE_PTE Flush; MMPTE_HARDWARE Hard; +#ifdef _M_AMD64 + MMPTE_HARDWARE_LARGEPAGE HardLarge; +#endif MMPTE_PROTOTYPE Proto; MMPTE_SOFTWARE Soft; MMPTE_TRANSITION Trans; MMPTE_SUBSECTION Subsect; MMPTE_LIST List; +#if (NTDDI_VERSION >= NTDDI_LONGHORN) + volatile ULONG_PTR VolatileLong; + MMPTE_TIMESTAMP TimeStamp; +#endif } u; } MMPTE, *PMMPTE;

1 0

[tkreuzer] 43504: [HAL] - Implement HalpQuery8254Counter - replace Ke386HaltProcessor() with __halt() - remove excess #endif
by tkreuzer＠svn.reactos.org 15 Oct '09

15 Oct '09

Author: tkreuzer Date: Thu Oct 15 23:40:00 2009 New Revision: 43504 URL: http://svn.reactos.org/svn/reactos?rev=43504&view=rev Log: [HAL] - Implement HalpQuery8254Counter - replace Ke386HaltProcessor() with __halt() - remove excess #endif Modified: branches/ros-amd64-bringup/reactos/hal/halamd64/generic/systimer.S branches/ros-amd64-bringup/reactos/hal/halamd64/up/processor.c branches/ros-amd64-bringup/reactos/hal/halx86/mp/apic.c Modified: branches/ros-amd64-bringup/reactos/hal/halamd64/generic/systimer.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halamd64/generic/systimer.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halamd64/generic/systimer.S [iso-8859-1] Thu Oct 15 23:40:00 2009 @@ -53,6 +53,34 @@ ret 4 .endfunc + +.globl _HalpQuery8254Counter +.func HalpQuery8254Counter +_HalpQuery8254Counter: + + /* Save EFLAGS and disable interrupts */ + pushfq + cli + + /* Set timer data */ + mov al, 0 + out 0x43, al + jmp $+2 + + /* Read current timer */ + in al, 0x40 + jmp $+2 + movzx ecx, al + in al, 0x40 + mov ch, al + + /* Return it and restore interrupt state */ + mov eax, ecx + popfq + ret +.endfunc + + .global _KeQueryPerformanceCounter .func KeQueryPerformanceCounter _KeQueryPerformanceCounter: Modified: branches/ros-amd64-bringup/reactos/hal/halamd64/up/processor.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halamd64/up/processor.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halamd64/up/processor.c [iso-8859-1] Thu Oct 15 23:40:00 2009 @@ -70,7 +70,7 @@ { /* Enable interrupts and halt the processor */ _enable(); - Ke386HaltProcessor(); + __halt(); } /* Modified: branches/ros-amd64-bringup/reactos/hal/halx86/mp/apic.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/mp/apic.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/mp/apic.c [iso-8859-1] Thu Oct 15 23:40:00 2009 @@ -882,7 +882,6 @@ idt->Access = Access.Value; idt->ExtendedOffset = (USHORT)(address >> 16); #endif -#endif } VOID HaliInitBSP(VOID)

1 0

[ros-arm-bringup] 43503: - Add some simple code to handle paged pool page allocation and freeing in MiAllocatePoolPages and MiFreePoolPages. - Allocation does not support paged pool expansion yet, so we're limited to the initial 4MB that are initialized on startup. - This only tests the raw page allocation routines so touching memory will fail as we don't handle paged pool faults yet. - Nothing excercises this code path other than some simple tests while booting.
by ros-arm-bringup＠svn.reactos.org 15 Oct '09

15 Oct '09

Author: ros-arm-bringup Date: Thu Oct 15 23:23:24 2009 New Revision: 43503 URL: http://svn.reactos.org/svn/reactos?rev=43503&view=rev Log: - Add some simple code to handle paged pool page allocation and freeing in MiAllocatePoolPages and MiFreePoolPages. - Allocation does not support paged pool expansion yet, so we're limited to the initial 4MB that are initialized on startup. - This only tests the raw page allocation routines so touching memory will fail as we don't handle paged pool faults yet. - Nothing excercises this code path other than some simple tests while booting. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c trunk/reactos/ntoskrnl/mm/mminit.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pool.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] Thu Oct 15 23:23:24 2009 @@ -149,6 +149,83 @@ SizeInPages = BYTES_TO_PAGES(SizeInBytes); // + // Handle paged pool + // + if (PoolType == PagedPool) + { + // + // Lock the paged pool mutex + // + KeAcquireGuardedMutex(&MmPagedPoolMutex); + + // + // Find some empty allocation space + // + i = RtlFindClearBitsAndSet(MmPagedPoolInfo.PagedPoolAllocationMap, + SizeInPages, + MmPagedPoolInfo.PagedPoolHint); + if (i == 0xFFFFFFFF) + { + // + // Out of memory! + // + DPRINT1("OUT OF PAGED POOL!!!\n"); + KeReleaseGuardedMutex(&MmPagedPoolMutex); + return NULL; + } + + // + // Update the pool hint if the request was just one page + // + if (SizeInPages == 1) MmPagedPoolInfo.PagedPoolHint = i + 1; + + // + // Update the end bitmap so we know the bounds of this allocation when + // the time comes to free it + // + RtlSetBit(MmPagedPoolInfo.EndOfPagedPoolBitmap, i + SizeInPages - 1); + + // + // Now we can release the lock (it mainly protects the bitmap) + // + KeReleaseGuardedMutex(&MmPagedPoolMutex); + + // + // Now figure out where this allocation starts + // + BaseVa = (PVOID)((ULONG_PTR)MmPagedPoolStart + (i << PAGE_SHIFT)); + + // + // Flush the TLB + // + KeFlushEntireTb(TRUE, TRUE); + + // + // Setup a demand-zero writable PTE + // + TempPte.u.Long = 0; + MI_MAKE_WRITE_PAGE(&TempPte); + + // + // Find the first and last PTE, then loop them all + // + PointerPte = MiAddressToPte(BaseVa); + StartPte = PointerPte + SizeInPages; + do + { + // + // Write the demand zero PTE and keep going + // + *PointerPte++ = TempPte; + } while (PointerPte < StartPte); + + // + // Return the allocation address to the caller + // + return BaseVa; + } + + // // Allocations of less than 4 pages go into their individual buckets // i = SizeInPages - 1; @@ -346,7 +423,57 @@ PFN_NUMBER FreePages, NumberOfPages; KIRQL OldIrql; PMMFREE_POOL_ENTRY FreeEntry, NextEntry, LastEntry; - ULONG i; + ULONG i, End; + + // + // Handle paged pool + // + if ((StartingVa >= MmPagedPoolStart) && (StartingVa <= MmPagedPoolEnd)) + { + // + // Calculate the offset from the beginning of paged pool, and convert it + // into pages + // + i = ((ULONG_PTR)StartingVa - (ULONG_PTR)MmPagedPoolStart) >> PAGE_SHIFT; + End = i; + + // + // Now use the end bitmap to scan until we find a set bit, meaning that + // this allocation finishes here + // + while (!RtlTestBit(MmPagedPoolInfo.EndOfPagedPoolBitmap, End)) End++; + + // + // Now calculate the total number of pages this allocation spans + // + NumberOfPages = End - i + 1; + + // + // Acquire the paged pool lock + // + KeAcquireGuardedMutex(&MmPagedPoolMutex); + + // + // Clear the allocation and free bits + // + RtlClearBit(MmPagedPoolInfo.EndOfPagedPoolBitmap, i); + RtlClearBits(MmPagedPoolInfo.PagedPoolAllocationMap, i, NumberOfPages); + + // + // Update the hint if we need to + // + if (i < MmPagedPoolInfo.PagedPoolHint) MmPagedPoolInfo.PagedPoolHint = i; + + // + // Release the lock protecting the bitmaps + // + KeReleaseGuardedMutex(&MmPagedPoolMutex); + + // + // And finally return the number of pages freed + // + return NumberOfPages; + } // // Get the first PTE and its corresponding PFN entry Modified: trunk/reactos/ntoskrnl/mm/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/mminit.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/mminit.c [iso-8859-1] Thu Oct 15 23:23:24 2009 @@ -353,6 +353,65 @@ /* Intialize system memory areas */ MiInitSystemMemoryAreas(); + // + // STEP 1: Allocate and free a single page, repeatedly + // We should always get the same address back + // + if (1) + { + PULONG Test, OldTest; + ULONG i; + + OldTest = Test = MiAllocatePoolPages(PagedPool, PAGE_SIZE); + ASSERT(Test); + for (i = 0; i < 16; i++) + { + MiFreePoolPages(Test); + Test = MiAllocatePoolPages(PagedPool, PAGE_SIZE); + ASSERT(OldTest == Test); + } + MiFreePoolPages(Test); + } + + // + // STEP 2: Allocate 2048 pages without freeing them + // We should run out of space at 1024 pages, since we don't support + // expansion yet. + // + if (1) + { + PULONG Test[2048]; + ULONG i; + + for (i = 0; i < 2048; i++) + { + Test[i] = MiAllocatePoolPages(PagedPool, PAGE_SIZE); + if (!Test[i]) + { + ASSERT(i == 1024); + break; + } + } + + // + // Cleanup + // + while (--i) if (Test[i]) MiFreePoolPages(Test[i]); + } + + // + // STEP 3: Allocate a page and touch it. + // We should get an ARM3 page fault and it should handle the fault + // + if (0) // NOT YET IMPLEMENTED + { + PULONG Test; + + Test = MiAllocatePoolPages(PagedPool, PAGE_SIZE); + DPRINT1("Value: %lx", *Test); + MiFreePoolPages(Test); + } + /* Dump the address space */ MiDbgDumpAddressSpace();

1 0

[janderwald] 43502: - Revert accidental change
by janderwald＠svn.reactos.org 15 Oct '09

15 Oct '09

Author: janderwald Date: Thu Oct 15 22:29:04 2009 New Revision: 43502 URL: http://svn.reactos.org/svn/reactos?rev=43502&view=rev Log: - Revert accidental change Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/interfaces.hpp [iso-8859-1] Thu Oct 15 22:29:04 2009 @@ -970,7 +970,7 @@ { DEFINE_ABSTRACT_UNKNOWN() DEFINE_ABSTRACT_DMACHANNEL_EX() - //DEFINE_ABSTRACT_DMACHANNELSLAVE() + DEFINE_ABSTRACT_DMACHANNELSLAVE() STDMETHOD_(NTSTATUS, Init)( THIS_ IN PDEVICE_DESCRIPTION DeviceDescription,

1 0

[tkreuzer] 43501: The SessionId is not the same as the session pointer. Add fixed code for PsGetThreadSessionId, commented out as we don't have support for Sessions anyway.
by tkreuzer＠svn.reactos.org 15 Oct '09

15 Oct '09

Author: tkreuzer Date: Thu Oct 15 22:07:47 2009 New Revision: 43501 URL: http://svn.reactos.org/svn/reactos?rev=43501&view=rev Log: The SessionId is not the same as the session pointer. Add fixed code for PsGetThreadSessionId, commented out as we don't have support for Sessions anyway. Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ps/thread.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ps/thread.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ps/thread.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ps/thread.c [iso-8859-1] Thu Oct 15 22:07:47 2009 @@ -736,6 +736,11 @@ PsGetThreadSessionId(IN PETHREAD Thread) { return (HANDLE)Thread->ThreadsProcess->Session; +#if 0 + // Should probably return a DWORD + PMM_SESSION_SPACE Session = Thread->ThreadsProcess->Session; + return Session->SessionId; +#endif } /*

1 0

[tkreuzer] 43500: Fix a typo
by tkreuzer＠svn.reactos.org 15 Oct '09

15 Oct '09

Author: tkreuzer Date: Thu Oct 15 22:02:41 2009 New Revision: 43500 URL: http://svn.reactos.org/svn/reactos?rev=43500&view=rev Log: Fix a typo Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/page.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/page.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/page.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/mm/amd64/page.c [iso-8859-1] Thu Oct 15 22:02:41 2009 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: ntoskrnl/mm/i386/page.c + * FILE: ntoskrnl/mm/amd64/page.c * PURPOSE: Low level memory managment manipulation * * PROGRAMMERS: David Welch (welch(a)cwcom.net)

1 0

← Newer
1
...
36
37
38
39
40
41
42
...
65
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 October 2009