p71924506
/
kernel_liteos_a
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!679 fix: 修复OsVmPhysFreeListAdd和OsVmPhysFreeListAddUnsafe函数内容重复 

Merge pull request !679 from kenneth/los_vm_phys
This commit is contained in:
openharmony_ci 2021-11-02 03:00:02 +00:00 committed by Gitee
parent e54eb9e34d 6827bd2a22
commit e0a6e1f9f0
1 changed files with 3 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
kernel/base/vm/los_vm_phys.c
View File

@ -157,23 +157,6 @@ VOID OsVmPhysInit(VOID)
} }
} }
STATIC VOID OsVmPhysFreeListAdd(LosVmPage *page, UINT8 order)
{
struct VmPhysSeg *seg = NULL;
struct VmFreeList *list = NULL;
if (page->segID >= VM_PHYS_SEG_MAX) {
LOS_Panic("The page segment id(%d) is invalid\n", page->segID);
}
page->order = order;
seg = &g_vmPhysSeg[page->segID];
list = &seg->freeList[order];
LOS_ListTailInsert(&list->node, &page->node);
list->listCnt++;
}
STATIC VOID OsVmPhysFreeListAddUnsafe(LosVmPage *page, UINT8 order) STATIC VOID OsVmPhysFreeListAddUnsafe(LosVmPage *page, UINT8 order)
{ {
struct VmPhysSeg *seg = NULL; struct VmPhysSeg *seg = NULL;
@ -207,22 +190,6 @@ STATIC VOID OsVmPhysFreeListDelUnsafe(LosVmPage *page)
page->order = VM_LIST_ORDER_MAX; page->order = VM_LIST_ORDER_MAX;
} }
STATIC VOID OsVmPhysFreeListDel(LosVmPage *page)
{
struct VmPhysSeg *seg = NULL;
struct VmFreeList *list = NULL;
if ((page->segID >= VM_PHYS_SEG_MAX) || (page->order >= VM_LIST_ORDER_MAX)) {
LOS_Panic("The page segment id(%u) or order(%u) is invalid\n", page->segID, page->order);
}
seg = &g_vmPhysSeg[page->segID];
list = &seg->freeList[page->order];
list->listCnt--;
LOS_ListDelete(&page->node);
page->order = VM_LIST_ORDER_MAX;
}
STATIC VOID OsVmPhysPagesSpiltUnsafe(LosVmPage *page, UINT8 oldOrder, UINT8 newOrder) STATIC VOID OsVmPhysPagesSpiltUnsafe(LosVmPage *page, UINT8 oldOrder, UINT8 newOrder)
{ {
UINT32 order; UINT32 order;
@ -376,14 +343,14 @@ VOID OsVmPhysPagesFree(LosVmPage *page, UINT8 order)
if ((buddyPage == NULL) || (buddyPage->order != order)) { if ((buddyPage == NULL) || (buddyPage->order != order)) {
break; break;
} }
OsVmPhysFreeListDel(buddyPage); OsVmPhysFreeListDelUnsafe(buddyPage);
order++; order++;
pa &= ~(VM_ORDER_TO_PHYS(order) - 1); pa &= ~(VM_ORDER_TO_PHYS(order) - 1);
page = OsVmPhysToPage(pa, page->segID); page = OsVmPhysToPage(pa, page->segID);
} while (order < VM_LIST_ORDER_MAX - 1); } while (order < VM_LIST_ORDER_MAX - 1);
} }
OsVmPhysFreeListAdd(page, order); OsVmPhysFreeListAddUnsafe(page, order);
} }
VOID OsVmPhysPagesFreeContiguous(LosVmPage *page, size_t nPages) VOID OsVmPhysPagesFreeContiguous(LosVmPage *page, size_t nPages)
@ -553,7 +520,7 @@ VOID OsPhysSharePageCopy(PADDR_T oldPaddr, PADDR_T *newPaddr, LosVmPage *newPage
oldPage = LOS_VmPageGet(oldPaddr); oldPage = LOS_VmPageGet(oldPaddr);
if (oldPage == NULL) { if (oldPage == NULL) {
VM_ERR("invalid paddr %p", oldPaddr); VM_ERR("invalid oldPaddr %p", oldPaddr);
return; return;
} }