Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 21:42:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTOS]: Use MI_PFN_ELEMENT in this code, as the extra checks done by MiGetPfnEntry are irrelevant and slow things down.

Browse source 
[NTOS]: Remove some old ReactOS hacks before we had MMROSPFNDATA.

svn path=/trunk/; revision=49558
This commit is contained in:
Sir Richard 2010-11-11 13:13:05 +00:00
parent 0bbcdaf47f
commit d5c3a8295f
1 changed files with 27 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

67
reactos/ntoskrnl/mm/ARM3/pfnlist.c
View file

@ -113,7 +113,7 @@ MiUnlinkFreeOrZeroedPage(IN PMMPFN Entry)
if (OldFlink != LIST_HEAD) if (OldFlink != LIST_HEAD)
{ {
/* It is not, so set the backlink of the actual entry, to our backlink */ /* It is not, so set the backlink of the actual entry, to our backlink */
MiGetPfnEntry(OldFlink)->u2.Blink = OldBlink; MI_PFN_ELEMENT(OldFlink)->u2.Blink = OldBlink;
} }
else else
{ {
@ -125,7 +125,7 @@ MiUnlinkFreeOrZeroedPage(IN PMMPFN Entry)
if (OldBlink != LIST_HEAD) if (OldBlink != LIST_HEAD)
{ {
/* It is not, so set the backlink of the actual entry, to our backlink */ /* It is not, so set the backlink of the actual entry, to our backlink */
MiGetPfnEntry(OldBlink)->u1.Flink = OldFlink; MI_PFN_ELEMENT(OldBlink)->u1.Flink = OldFlink;
} }
else else
{ {
@ -149,7 +149,7 @@ MiUnlinkFreeOrZeroedPage(IN PMMPFN Entry)
if (ColorTable->Flink != LIST_HEAD) if (ColorTable->Flink != LIST_HEAD)
{ {
/* And make the previous link point to the head now */ /* And make the previous link point to the head now */
MiGetPfnEntry(ColorTable->Flink)->u4.PteFrame = COLORED_LIST_HEAD; MI_PFN_ELEMENT(ColorTable->Flink)->u4.PteFrame = COLORED_LIST_HEAD;
} }
else else
{ {
@ -163,14 +163,14 @@ MiUnlinkFreeOrZeroedPage(IN PMMPFN Entry)
ASSERT(Entry->u4.PteFrame != COLORED_LIST_HEAD); ASSERT(Entry->u4.PteFrame != COLORED_LIST_HEAD);
/* Make the back link point to whoever the next page is */ /* Make the back link point to whoever the next page is */
Pfn1 = MiGetPfnEntry(Entry->u4.PteFrame); Pfn1 = MI_PFN_ELEMENT(Entry->u4.PteFrame);
Pfn1->OriginalPte.u.Long = Entry->OriginalPte.u.Long; Pfn1->OriginalPte.u.Long = Entry->OriginalPte.u.Long;
/* Check if this page was pointing to the head */ /* Check if this page was pointing to the head */
if (Entry->OriginalPte.u.Long != LIST_HEAD) if (Entry->OriginalPte.u.Long != LIST_HEAD)
{ {
/* Make the back link point to the head */ /* Make the back link point to the head */
Pfn1 = MiGetPfnEntry(Entry->OriginalPte.u.Long); Pfn1 = MI_PFN_ELEMENT(Entry->OriginalPte.u.Long);
Pfn1->u4.PteFrame = Entry->u4.PteFrame; Pfn1->u4.PteFrame = Entry->u4.PteFrame;
} }
else else
@ -235,7 +235,7 @@ MiRemovePageByColor(IN PFN_NUMBER PageIndex,
ASSERT(Color < MmSecondaryColors); ASSERT(Color < MmSecondaryColors);
/* Get the PFN entry */ /* Get the PFN entry */
Pfn1 = MiGetPfnEntry(PageIndex); Pfn1 = MI_PFN_ELEMENT(PageIndex);
ASSERT(Pfn1->u3.e1.RemovalRequested == 0); ASSERT(Pfn1->u3.e1.RemovalRequested == 0);
ASSERT(Pfn1->u3.e1.Rom == 0); ASSERT(Pfn1->u3.e1.Rom == 0);
@ -260,7 +260,7 @@ MiRemovePageByColor(IN PFN_NUMBER PageIndex,
if (OldFlink != LIST_HEAD) if (OldFlink != LIST_HEAD)
{ {
/* It is not, so set the backlink of the actual entry, to our backlink */ /* It is not, so set the backlink of the actual entry, to our backlink */
MiGetPfnEntry(OldFlink)->u2.Blink = OldBlink; MI_PFN_ELEMENT(OldFlink)->u2.Blink = OldBlink;
} }
else else
{ {
@ -272,7 +272,7 @@ MiRemovePageByColor(IN PFN_NUMBER PageIndex,
if (OldBlink != LIST_HEAD) if (OldBlink != LIST_HEAD)
{ {
/* It is not, so set the backlink of the actual entry, to our backlink */ /* It is not, so set the backlink of the actual entry, to our backlink */
MiGetPfnEntry(OldBlink)->u1.Flink = OldFlink; MI_PFN_ELEMENT(OldBlink)->u1.Flink = OldFlink;
} }
else else
{ {
@ -306,7 +306,7 @@ MiRemovePageByColor(IN PFN_NUMBER PageIndex,
else else
{ {
/* The list is empty, so we are the first page */ /* The list is empty, so we are the first page */
MiGetPfnEntry(ColorTable->Flink)->u4.PteFrame = COLORED_LIST_HEAD; MI_PFN_ELEMENT(ColorTable->Flink)->u4.PteFrame = COLORED_LIST_HEAD;
} }
/* One less page */ /* One less page */
@ -393,7 +393,7 @@ MiRemoveAnyPage(IN ULONG Color)
PageIndex = MiRemovePageByColor(PageIndex, Color); PageIndex = MiRemovePageByColor(PageIndex, Color);
/* Sanity checks */ /* Sanity checks */
Pfn1 = MiGetPfnEntry(PageIndex); Pfn1 = MI_PFN_ELEMENT(PageIndex);
ASSERT((Pfn1->u3.e1.PageLocation == FreePageList) || ASSERT((Pfn1->u3.e1.PageLocation == FreePageList) ||
(Pfn1->u3.e1.PageLocation == ZeroedPageList)); (Pfn1->u3.e1.PageLocation == ZeroedPageList));
ASSERT(Pfn1->u3.e2.ReferenceCount == 0); ASSERT(Pfn1->u3.e2.ReferenceCount == 0);
@ -458,13 +458,13 @@ MiRemoveZeroPage(IN ULONG Color)
#endif #endif
/* Sanity checks */ /* Sanity checks */
Pfn1 = MiGetPfnEntry(PageIndex); Pfn1 = MI_PFN_ELEMENT(PageIndex);
ASSERT((Pfn1->u3.e1.PageLocation == FreePageList) || ASSERT((Pfn1->u3.e1.PageLocation == FreePageList) ||
(Pfn1->u3.e1.PageLocation == ZeroedPageList)); (Pfn1->u3.e1.PageLocation == ZeroedPageList));
/* Remove the page from its list */ /* Remove the page from its list */
PageIndex = MiRemovePageByColor(PageIndex, Color); PageIndex = MiRemovePageByColor(PageIndex, Color);
ASSERT(Pfn1 == MiGetPfnEntry(PageIndex)); ASSERT(Pfn1 == MI_PFN_ELEMENT(PageIndex));
/* Zero it, if needed */ /* Zero it, if needed */
if (Zero) MiZeroPhysicalPage(PageIndex); if (Zero) MiZeroPhysicalPage(PageIndex);
@ -497,7 +497,7 @@ MiInsertPageInFreeList(IN PFN_NUMBER PageFrameIndex)
(PageFrameIndex >= MmLowestPhysicalPage)); (PageFrameIndex >= MmLowestPhysicalPage));
/* Get the PFN entry */ /* Get the PFN entry */
Pfn1 = MiGetPfnEntry(PageFrameIndex); Pfn1 = MI_PFN_ELEMENT(PageFrameIndex);
/* Sanity checks that a right kind of page is being inserted here */ /* Sanity checks that a right kind of page is being inserted here */
ASSERT(Pfn1->u4.MustBeCached == 0); ASSERT(Pfn1->u4.MustBeCached == 0);
@ -516,7 +516,7 @@ MiInsertPageInFreeList(IN PFN_NUMBER PageFrameIndex)
if (LastPage != LIST_HEAD) if (LastPage != LIST_HEAD)
{ {
/* Link us with the previous page, so we're at the end now */ /* Link us with the previous page, so we're at the end now */
MiGetPfnEntry(LastPage)->u1.Flink = PageFrameIndex; MI_PFN_ELEMENT(LastPage)->u1.Flink = PageFrameIndex;
} }
else else
{ {
@ -571,19 +571,15 @@ MiInsertPageInFreeList(IN PFN_NUMBER PageFrameIndex)
/* Get the previous page */ /* Get the previous page */
Blink = (PMMPFN)ColorTable->Blink; Blink = (PMMPFN)ColorTable->Blink;
/* Make it link to us */ /* Make it link to us, and link back to it */
Pfn1->u4.PteFrame = MiGetPfnEntryIndex(Blink);
/* If there is an original pte, it should be an old link, NOT a ReactOS RMAP */
ASSERT(Blink->u4.AweAllocation == FALSE);
Blink->OriginalPte.u.Long = PageFrameIndex; Blink->OriginalPte.u.Long = PageFrameIndex;
Pfn1->u4.PteFrame = MiGetPfnEntryIndex(Blink);
} }
/* Now initialize our own list pointers */ /* Now initialize our own list pointers */
ColorTable->Blink = Pfn1; ColorTable->Blink = Pfn1;
/* If there is an original pte, it should be an old link, NOT a ReactOS RMAP */ /* This page is now the last */
ASSERT(Pfn1->u4.AweAllocation == FALSE);
Pfn1->OriginalPte.u.Long = LIST_HEAD; Pfn1->OriginalPte.u.Long = LIST_HEAD;
/* And increase the count in the colored list */ /* And increase the count in the colored list */
@ -627,7 +623,7 @@ MiInsertPageInList(IN PMMPFNLIST ListHead,
(PageFrameIndex >= MmLowestPhysicalPage)); (PageFrameIndex >= MmLowestPhysicalPage));
/* Page should be unused */ /* Page should be unused */
Pfn1 = MiGetPfnEntry(PageFrameIndex); Pfn1 = MI_PFN_ELEMENT(PageFrameIndex);
ASSERT(Pfn1->u3.e2.ReferenceCount == 0); ASSERT(Pfn1->u3.e2.ReferenceCount == 0);
ASSERT(Pfn1->u3.e1.Rom != 1); ASSERT(Pfn1->u3.e1.Rom != 1);
@ -651,7 +647,7 @@ MiInsertPageInList(IN PMMPFNLIST ListHead,
if (Flink != LIST_HEAD) if (Flink != LIST_HEAD)
{ {
/* It wasn't, so update the backlink of the previous head page */ /* It wasn't, so update the backlink of the previous head page */
Pfn2 = MiGetPfnEntry(Flink); Pfn2 = MI_PFN_ELEMENT(Flink);
Pfn2->u2.Blink = PageFrameIndex; Pfn2->u2.Blink = PageFrameIndex;
} }
else else
@ -691,9 +687,6 @@ MiInsertPageInList(IN PMMPFNLIST ListHead,
/* Get the old head */ /* Get the old head */
Flink = ColorHead->Flink; Flink = ColorHead->Flink;
/* If there is an original pte, it should be an old link, NOT a ReactOS RMAP */
ASSERT(Pfn1->u4.AweAllocation == FALSE);
/* Make this page point back to the list, and point forwards to the old head */ /* Make this page point back to the list, and point forwards to the old head */
Pfn1->OriginalPte.u.Long = Flink; Pfn1->OriginalPte.u.Long = Flink;
Pfn1->u4.PteFrame = COLORED_LIST_HEAD; Pfn1->u4.PteFrame = COLORED_LIST_HEAD;
@ -705,7 +698,7 @@ MiInsertPageInList(IN PMMPFNLIST ListHead,
if (Flink != LIST_HEAD) if (Flink != LIST_HEAD)
{ {
/* No, so make the old head point to this page */ /* No, so make the old head point to this page */
Pfn2 = MiGetPfnEntry(Flink); Pfn2 = MI_PFN_ELEMENT(Flink);
Pfn2->u4.PteFrame = PageFrameIndex; Pfn2->u4.PteFrame = PageFrameIndex;
} }
else else
@ -737,7 +730,7 @@ MiInitializePfn(IN PFN_NUMBER PageFrameIndex,
ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL); ASSERT(KeGetCurrentIrql() == DISPATCH_LEVEL);
/* Setup the PTE */ /* Setup the PTE */
Pfn1 = MiGetPfnEntry(PageFrameIndex); Pfn1 = MI_PFN_ELEMENT(PageFrameIndex);
Pfn1->PteAddress = PointerPte; Pfn1->PteAddress = PointerPte;
/* Check if this PFN is part of a valid address space */ /* Check if this PFN is part of a valid address space */
@ -788,7 +781,7 @@ MiInitializePfn(IN PFN_NUMBER PageFrameIndex,
Pfn1->u4.PteFrame = PageFrameIndex; Pfn1->u4.PteFrame = PageFrameIndex;
/* Increase its share count so we don't get rid of it */ /* Increase its share count so we don't get rid of it */
Pfn1 = MiGetPfnEntry(PageFrameIndex); Pfn1 = MI_PFN_ELEMENT(PageFrameIndex);
Pfn1->u2.ShareCount++; Pfn1->u2.ShareCount++;
} }
@ -842,8 +835,8 @@ MiDecrementShareCount(IN PMMPFN Pfn1,
IN PFN_NUMBER PageFrameIndex) IN PFN_NUMBER PageFrameIndex)
{ {
ASSERT(PageFrameIndex > 0); ASSERT(PageFrameIndex > 0);
ASSERT(MiGetPfnEntry(PageFrameIndex) != NULL); ASSERT(MI_PFN_ELEMENT(PageFrameIndex) != NULL);
ASSERT(Pfn1 == MiGetPfnEntry(PageFrameIndex)); ASSERT(Pfn1 == MI_PFN_ELEMENT(PageFrameIndex));
ASSERT(MI_IS_ROS_PFN(Pfn1) == FALSE); ASSERT(MI_IS_ROS_PFN(Pfn1) == FALSE);
/* Page must be in-use */ /* Page must be in-use */
@ -880,13 +873,7 @@ MiDecrementShareCount(IN PMMPFN Pfn1,
/* Clear the last reference */ /* Clear the last reference */
Pfn1->u3.e2.ReferenceCount = 0; Pfn1->u3.e2.ReferenceCount = 0;
/*
* OriginalPte is used by AweReferenceCount in ReactOS, but either
* ways we shouldn't be seeing RMAP entries at this point
*/
ASSERT(Pfn1->OriginalPte.u.Soft.Prototype == 0); ASSERT(Pfn1->OriginalPte.u.Soft.Prototype == 0);
ASSERT(Pfn1->u4.AweAllocation == FALSE);
/* Mark the page temporarily as valid, we're going to make it free soon */ /* Mark the page temporarily as valid, we're going to make it free soon */
Pfn1->u3.e1.PageLocation = ActiveAndValid; Pfn1->u3.e1.PageLocation = ActiveAndValid;
@ -912,7 +899,7 @@ MiDecrementReferenceCount(IN PMMPFN Pfn1,
/* Sanity checks on the page */ /* Sanity checks on the page */
ASSERT(PageFrameIndex < MmHighestPhysicalPage); ASSERT(PageFrameIndex < MmHighestPhysicalPage);
ASSERT(Pfn1 == MiGetPfnEntry(PageFrameIndex)); ASSERT(Pfn1 == MI_PFN_ELEMENT(PageFrameIndex));
ASSERT(Pfn1->u3.e2.ReferenceCount != 0); ASSERT(Pfn1->u3.e2.ReferenceCount != 0);
/* Dereference the page, bail out if it's still alive */ /* Dereference the page, bail out if it's still alive */
@ -954,7 +941,7 @@ MiInitializePfnForOtherProcess(IN PFN_NUMBER PageFrameIndex,
PMMPFN Pfn1; PMMPFN Pfn1;
/* Setup the PTE */ /* Setup the PTE */
Pfn1 = MiGetPfnEntry(PageFrameIndex); Pfn1 = MI_PFN_ELEMENT(PageFrameIndex);
Pfn1->PteAddress = PointerPte; Pfn1->PteAddress = PointerPte;
/* Make this a software PTE */ /* Make this a software PTE */
@ -975,7 +962,7 @@ MiInitializePfnForOtherProcess(IN PFN_NUMBER PageFrameIndex,
Pfn1->u4.PteFrame = PteFrame; Pfn1->u4.PteFrame = PteFrame;
/* Increase its share count so we don't get rid of it */ /* Increase its share count so we don't get rid of it */
Pfn1 = MiGetPfnEntry(PteFrame); Pfn1 = MI_PFN_ELEMENT(PteFrame);
Pfn1->u2.ShareCount++; Pfn1->u2.ShareCount++;
} }
} }