d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

powerpc64/mmu: Use a SLIST for the PVO delete list, instead of a RB_TREE

Browse Source 
Summary:
Although it's convenient to reuse the pvo_plist for deletion, RB_TREE
insertion and removal is not free, and can result in a lot of extra work
to rebalance the tree.  Instead, use a SLIST as a LIFO delete queue,
which gives us almost free insertion, deletion, and traversal.

Reviewed by:	luporl
Differential Revision: https://reviews.freebsd.org/D21061
This commit is contained in:
Justin Hibbits 2019-08-01 03:55:58 +00:00
parent 490d56c527
commit be01018809
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=350493
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/powerpc/aim/mmu_oea64.c
View File

@ -2364,9 +2364,9 @@ void
moea64_remove_pages(mmu_t mmu, pmap_t pm)
{
struct pvo_entry *pvo, *tpvo;
struct pvo_tree tofree;
struct pvo_dlist tofree;
RB_INIT(&tofree);
SLIST_INIT(&tofree);
PMAP_LOCK(pm);
RB_FOREACH_SAFE(pvo, pvo_tree, &pm->pmap_pvo, tpvo) {
@ -2379,13 +2379,14 @@ moea64_remove_pages(mmu_t mmu, pmap_t pm)
* pass
*/
moea64_pvo_remove_from_pmap(mmu, pvo);
RB_INSERT(pvo_tree, &tofree, pvo);
SLIST_INSERT_HEAD(&tofree, pvo, pvo_dlink);
}
PMAP_UNLOCK(pm);
RB_FOREACH_SAFE(pvo, pvo_tree, &tofree, tpvo) {
while (!SLIST_EMPTY(&tofree)) {
pvo = SLIST_FIRST(&tofree);
SLIST_REMOVE_HEAD(&tofree, pvo_dlink);
moea64_pvo_remove_from_page(mmu, pvo);
RB_REMOVE(pvo_tree, &tofree, pvo);
free_pvo_entry(pvo);
}
}
@ -2397,7 +2398,7 @@ void
moea64_remove(mmu_t mmu, pmap_t pm, vm_offset_t sva, vm_offset_t eva)
{
struct pvo_entry *pvo, *tpvo, key;
struct pvo_tree tofree;
struct pvo_dlist tofree;
/*
* Perform an unsynchronized read. This is, however, safe.
@ -2407,7 +2408,7 @@ moea64_remove(mmu_t mmu, pmap_t pm, vm_offset_t sva, vm_offset_t eva)
key.pvo_vaddr = sva;
RB_INIT(&tofree);
SLIST_INIT(&tofree);
PMAP_LOCK(pm);
for (pvo = RB_NFIND(pvo_tree, &pm->pmap_pvo, &key);
@ -2420,13 +2421,14 @@ moea64_remove(mmu_t mmu, pmap_t pm, vm_offset_t sva, vm_offset_t eva)
* pass
*/
moea64_pvo_remove_from_pmap(mmu, pvo);
RB_INSERT(pvo_tree, &tofree, pvo);
SLIST_INSERT_HEAD(&tofree, pvo, pvo_dlink);
}
PMAP_UNLOCK(pm);
RB_FOREACH_SAFE(pvo, pvo_tree, &tofree, tpvo) {
while (!SLIST_EMPTY(&tofree)) {
pvo = SLIST_FIRST(&tofree);
SLIST_REMOVE_HEAD(&tofree, pvo_dlink);
moea64_pvo_remove_from_page(mmu, pvo);
RB_REMOVE(pvo_tree, &tofree, pvo);
free_pvo_entry(pvo);
}
}

6
sys/powerpc/include/pmap.h
View File

@ -90,7 +90,10 @@ struct pvo_entry {
#ifndef __powerpc64__
LIST_ENTRY(pvo_entry) pvo_olink; /* Link to overflow entry */
#endif
RB_ENTRY(pvo_entry) pvo_plink; /* Link to pmap entries */
union {
RB_ENTRY(pvo_entry) pvo_plink; /* Link to pmap entries */
SLIST_ENTRY(pvo_entry) pvo_dlink; /* Link to delete enty */
};
struct {
#ifndef __powerpc64__
/* 32-bit fields */
@ -106,6 +109,7 @@ struct pvo_entry {
uint64_t pvo_vpn; /* Virtual page number */
};
LIST_HEAD(pvo_head, pvo_entry);
SLIST_HEAD(pvo_dlist, pvo_entry);
RB_HEAD(pvo_tree, pvo_entry);
int pvo_vaddr_compare(struct pvo_entry *, struct pvo_entry *);
RB_PROTOTYPE(pvo_tree, pvo_entry, pvo_plink, pvo_vaddr_compare);