Skip to content

X
xv6-public
提交 608991f0 创建 作者: Nickolai Zeldovich's avatar Nickolai Zeldovich
浏览文件
操作

always rcu-free vm stuff

上级 176b9120
隐藏空白字符变更
内嵌 并排
正在显示 包含 6 行增加 和 6 行删除
vm.c
浏览文件 @ 608991f0
...@@ -388,21 +388,21 @@ vmn_free(struct vmnode *n) ...@@ -388,21 +388,21 @@ vmn_free(struct vmnode *n)
{ {
for(uint i = 0; i < n->npages; i++) { for(uint i = 0; i < n->npages; i++) {
if (n->page[i]) { if (n->page[i]) {
kfree(n->page[i]); // vmn_free is rcu delayed, when kfree must be delayed, don't delay rcu_delayed(n->page[i], kfree);
n->page[i] = 0; n->page[i] = 0;
} }
} }
if (n->ip) if (n->ip)
iput(n->ip); iput(n->ip);
n->ip = 0; n->ip = 0;
kmfree(n); // vmn_free is rcu delayed, when kmfree must be delayed, don't delay again rcu_delayed(n, kmfree);
} }
static void static void
vmn_decref(struct vmnode *n) vmn_decref(struct vmnode *n)
{ {
if(__sync_sub_and_fetch(&n->ref, 1) == 0) if(__sync_sub_and_fetch(&n->ref, 1) == 0)
vmn_free(n); // XXX delay? rcu_delayed(vmn_free, (void*)n);
} }
struct vmnode * struct vmnode *
...@@ -470,7 +470,7 @@ vma_free(void *p) ...@@ -470,7 +470,7 @@ vma_free(void *p)
struct vma *e = (struct vma *) p; struct vma *e = (struct vma *) p;
if(e->n) if(e->n)
vmn_decref(e->n); vmn_decref(e->n);
kmfree(e); // already rcu delayed rcu_delayed(e, kmfree);
} }
static void static void
...@@ -479,9 +479,9 @@ vmap_free(void *p) ...@@ -479,9 +479,9 @@ vmap_free(void *p)
struct vmap *m = (struct vmap *) p; struct vmap *m = (struct vmap *) p;
for(uint i = 0; i < NELEM(m->e); i++) { for(uint i = 0; i < NELEM(m->e); i++) {
if (m->e[i]) if (m->e[i])
vma_free(m->e[i]); // already rcu delayed rcu_delayed(m->e[i], vma_free);
} }
freevm(m->pgdir); // already rcu delayed rcu_delayed(m->pgdir, (void*)freevm);
m->pgdir = 0; m->pgdir = 0;
m->alloc = 0; m->alloc = 0;
} }
......
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论