Skip to content

X
xv6-public
提交 28ead2d3 创建 作者: Silas Boyd-Wickizer's avatar Silas Boyd-Wickizer
浏览文件
操作

Ensure vmnodes increment the inode ref (before decrementing it)

上级 87263b9c
隐藏空白字符变更
内嵌 并排
正在显示 包含 9 行增加 和 3 行删除
include/vm.hh
浏览文件 @ 28ead2d3
...@@ -22,7 +22,6 @@ struct vmnode { ...@@ -22,7 +22,6 @@ struct vmnode {
atomic<bool> empty; atomic<bool> empty;
atomic<char*> page[128]; atomic<char*> page[128];
const enum vmntype type; const enum vmntype type;
struct inode *const ip;
const u64 offset; const u64 offset;
const u64 sz; const u64 sz;
...@@ -42,6 +41,7 @@ struct vmnode { ...@@ -42,6 +41,7 @@ struct vmnode {
NEW_DELETE_OPS(vmnode); NEW_DELETE_OPS(vmnode);
private: private:
atomic<u64> ref_; atomic<u64> ref_;
struct inode *const ip;
}; };
// A mapping of a chunk of an address space to // A mapping of a chunk of an address space to
......
kernel/exec.cc
浏览文件 @ 28ead2d3
...@@ -159,6 +159,9 @@ exec(const char *path, char **argv, void *ascopev) ...@@ -159,6 +159,9 @@ exec(const char *path, char **argv, void *ascopev)
if((ip = namei(myproc()->cwd, path)) == 0) if((ip = namei(myproc()->cwd, path)) == 0)
return -1; return -1;
auto cleanup = scoped_cleanup([&ip](){
iput(ip);
});
if(myproc()->worker != nullptr) if(myproc()->worker != nullptr)
return -1; return -1;
......
kernel/vm.cc
浏览文件 @ 28ead2d3
...@@ -27,8 +27,11 @@ enum { tlb_lazy = 1 }; ...@@ -27,8 +27,11 @@ enum { tlb_lazy = 1 };
vmnode::vmnode(u64 npg, vmntype ntype, inode *i, u64 off, u64 s) vmnode::vmnode(u64 npg, vmntype ntype, inode *i, u64 off, u64 s)
: npages(npg), empty(true), type(ntype), : npages(npg), empty(true), type(ntype),
ip(i), offset(off), sz(s), ref_(0) offset(off), sz(s), ref_(0), ip(i)
{ {
if (ip != nullptr)
ip->inc();
if (npg > NELEM(page)) if (npg > NELEM(page))
panic("vmnode too big\n"); panic("vmnode too big\n");
// XXX Maybe vmnode should take just a byte size // XXX Maybe vmnode should take just a byte size
...@@ -46,7 +49,7 @@ vmnode::~vmnode() ...@@ -46,7 +49,7 @@ vmnode::~vmnode()
for(u64 i = 0; i < npages; i++) for(u64 i = 0; i < npages; i++)
if (page[i]) if (page[i])
kfree(page[i]); kfree(page[i]);
if (ip) if (ip != nullptr)
iput(ip); iput(ip);
} }
......
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论