1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399
|
@@ -63,6 +63,7 @@ void ramdiskrw(struct buf*); void* kalloc(void); void kfree(void *); void kinit(void); +void cow_ref_count(uint64 pa); // log.c void initlog(int, struct superblock*); @@ -170,6 +171,7 @@ uint64 walkaddr(pagetable_t, uint64); int copyout(pagetable_t, uint64, char *, uint64); int copyin(pagetable_t, char *, uint64, uint64); int copyinstr(pagetable_t, char *, uint64, uint64); +pte_t *walk(pagetable_t pagetable, uint64 va, int alloc); // plic.c void plicinit(void);
@@ -13,6 +13,12 @@ void freerange(void *pa_start, void *pa_end); extern char end[]; // first address after kernel. // defined by kernel.ld. +#define NPAGES ((PHYSTOP - KERNBASE) / PGSIZE) + +struct { + struct spinlock lock; + int count[NPAGES]; +} ref; //页面引用计数 struct run { struct run *next; @@ -23,10 +29,17 @@ struct { struct run *freelist; } kmem; +int +refindex(uint64 pa) +{ + return (pa - KERNBASE) / PGSIZE; +} + void kinit() { initlock(&kmem.lock, "kmem"); + initlock(&ref.lock, "ref"); freerange(end, (void*)PHYSTOP); } @@ -36,22 +49,77 @@ freerange(void *pa_start, void *pa_end) char *p; p = (char*)PGROUNDUP((uint64)pa_start); for(; p + PGSIZE <= (char*)pa_end; p += PGSIZE) + { + acquire(&ref.lock); + ref.count[refindex((uint64)p)] = 1; + release(&ref.lock); kfree(p); + } } // Free the page of physical memory pointed at by v, // which normally should have been returned by a // call to kalloc(). (The exception is when // initializing the allocator; see kinit above.) +// void +// kfree(void *pa) +// { +// struct run *r; +// +// if(((uint64)pa % PGSIZE) != 0 || (char*)pa < end || (uint64)pa >= PHYSTOP) +// panic("kfree"); +// +// acquire(&ref.lock); +// ref.count[refindex((uint64)pa)]--; +// if(ref.count[refindex((uint64)pa)] > 0) +// { +// release(&ref.lock); +// return; +// } +// release(&ref.lock); +// +// +// // Fill with junk to catch dangling refs. +// memset(pa, 1, PGSIZE); +// +// r = (struct run*)pa; +// +// acquire(&kmem.lock); +// r->next = kmem.freelist; +// kmem.freelist = r; +// release(&kmem.lock); +// } + + void kfree(void *pa) { struct run *r; + int idx; - if(((uint64)pa % PGSIZE) != 0 || (char*)pa < end || (uint64)pa >= PHYSTOP) + if(((uint64)pa % PGSIZE) != 0 || + (char*)pa < end || + (uint64)pa >= PHYSTOP) panic("kfree"); - // Fill with junk to catch dangling refs. + idx = refindex((uint64)pa); + + acquire(&ref.lock); + + if(ref.count[idx] <= 0){ + release(&ref.lock); + panic("kfree: bad ref"); + } + + ref.count[idx]--; + + if(ref.count[idx] > 0){ + release(&ref.lock); + return; + } + + release(&ref.lock); + memset(pa, 1, PGSIZE); r = (struct run*)pa; @@ -77,6 +145,19 @@ kalloc(void) release(&kmem.lock); if(r) + { memset((char*)r, 5, PGSIZE); // fill with junk + acquire(&ref.lock); + ref.count[refindex((uint64)r)] = 1; + release(&ref.lock); + } + return (void*)r; } + +void cow_ref_count(uint64 pa) +{ + acquire(&ref.lock); + ref.count[refindex(pa)]++; + release(&ref.lock); +} \ No newline at end of file
@@ -343,6 +343,7 @@ sfence_vma() #define PTE_W (1L << 2) #define PTE_X (1L << 3) #define PTE_U (1L << 4) // 1 -> user can access +#define PTE_COW (1L << 8) //reserved for software // shift a physical address to the right place for a PTE. #define PA2PTE(pa) ((((uint64)pa) >> 12) << 10)
@@ -67,7 +67,51 @@ usertrap(void) syscall(); } else if((which_dev = devintr()) != 0){ // ok - } else { + } else if (r_scause() == 15) // page fault + { + + uint64 pa; + uint flags; + char *mem; + uint64 va = r_stval(); + if(va >= MAXVA) + { + p->killed = 1; + } else + { + pa = walkaddr(p->pagetable, va); + pte_t *pte = walk(p->pagetable, va, 0); + + if(pte == 0 || + (*pte & PTE_V) == 0 || + (*pte & PTE_U) == 0 || + (*pte & PTE_COW) == 0) + { + // 不是合法的 COW fault,杀掉进程 + p->killed = 1; + } else + { + if (*pte & PTE_COW) //cow page fault + { + if((mem = kalloc()) == 0) + { + printf("page fault. alloc page fault."); + p->killed = 1; + } else + { + memmove(mem, (char*)pa, PGSIZE); //复制旧页面到新页面中 + flags = PTE_FLAGS(*pte); + flags |= PTE_W; + flags &= ~PTE_COW; + *pte = PA2PTE((uint64)mem) | flags; + + kfree((void *)pa); //释放一个父进程的物理页面的引用,因为子进程的pte已经不指向这个物理页面 + } + } + } + } + } + else { printf("usertrap(): unexpected scause %p pid=%d\n", r_scause(), p->pid); printf(" sepc=%p stval=%p\n", r_sepc(), r_stval()); p->killed = 1; @@ -81,6 +125,10 @@ usertrap(void) yield(); usertrapret(); + +// err: +// printf("page fault. alloc page fault."); +// p->killed = 1; } //
@@ -303,27 +303,57 @@ uvmcopy(pagetable_t old, pagetable_t new, uint64 sz) pte_t *pte; uint64 pa, i; uint flags; - char *mem; - - for(i = 0; i < sz; i += PGSIZE){ - if((pte = walk(old, i, 0)) == 0) + // for(i = 0; i < sz; i += PGSIZE) + // { + // if((pte = walk(old, i, 0)) == 0) + // panic("uvmcopy: pte should exist"); + // if((*pte & PTE_V) == 0) + // panic("uvmcopy: page not present"); + // pa = PTE2PA(*pte); + // flags = PTE_FLAGS(*pte); + // if((mem = kalloc()) == 0) + // goto err; + // memmove(mem, (char*)pa, PGSIZE); + // if(mappages(new, i, PGSIZE, (uint64)mem, flags) != 0){ + // kfree(mem); + // goto err; + // } + // } + + /*cow*/ + for (i = 0; i < sz; i+=PGSIZE) + { + if((pte = walk(old, i, 0)) == 0) //父进程页表项 panic("uvmcopy: pte should exist"); if((*pte & PTE_V) == 0) panic("uvmcopy: page not present"); pa = PTE2PA(*pte); flags = PTE_FLAGS(*pte); - if((mem = kalloc()) == 0) - goto err; - memmove(mem, (char*)pa, PGSIZE); - if(mappages(new, i, PGSIZE, (uint64)mem, flags) != 0){ - kfree(mem); + + if(flags & PTE_W) //清除PTE_W防止写行为并设置PTE_COW + { + flags &= ~PTE_W; + flags |= PTE_COW; + // 修改父进程 PTE + *pte = PA2PTE(pa) | flags; + } + + // mappages(pagetable, va, PGSIZE, pa, flags); + if (mappages(new, i, PGSIZE, pa, flags) != 0) + { + printf("uvmcopy: cow mapping failed"); goto err; } + // 增加物理页面引用计数 + cow_ref_count(pa); } + + + return 0; - err: - uvmunmap(new, 0, i / PGSIZE, 1); + err: + uvmunmap(new, 0, i / PGSIZE, 1); return -1; } @@ -343,14 +373,87 @@ uvmclear(pagetable_t pagetable, uint64 va) // Copy from kernel to user. // Copy len bytes from src to virtual address dstva in a given page table. // Return 0 on success, -1 on error. + +/*copyout准备写用户地址 dstva + ↓ +找到 dstva 对应的 PTE + ↓ + 是不是 COW? + / \ + 不是 是 + ↓ ↓ + 直接写 kalloc + ↓ + 复制旧页 + ↓ + PTE → 新页 + ↓ + W=1 COW=0 + ↓ + kfree(oldpa) + ↓ + 再写数据 +*/ int copyout(pagetable_t pagetable, uint64 dstva, char *src, uint64 len) { uint64 n, va0, pa0; + uint64 oldpa; + uint flags; + pte_t *pte; + char *mem; while(len > 0){ + if(dstva >= MAXVA) + return -1; va0 = PGROUNDDOWN(dstva); - pa0 = walkaddr(pagetable, va0); + //pa0 = walkaddr(pagetable, va0); + pte = walk(pagetable, va0, 0); + + if(pte == 0) + return -1; + + if((*pte & PTE_V) == 0) + return -1; + + if((*pte & PTE_U) == 0) + return -1; + + + + if (*pte & PTE_COW) + { + // 保存旧物理页 + oldpa = PTE2PA(*pte); + + // 保存原来的 flags + flags = PTE_FLAGS(*pte); + + // 分配新的物理页 + mem = kalloc(); + if(mem == 0) + return -1; + + // 复制旧页内容 + memmove(mem, (char *)oldpa, PGSIZE); + + // 新页面允许写,并取消 COW + flags |= PTE_W; + flags &= ~PTE_COW; + + // 当前进程的 PTE 改为指向新页 + *pte = PA2PTE((uint64)mem) | flags; + + // 当前 PTE 不再引用旧页 + kfree((void *)oldpa); + } + + if ((*pte & PTE_W) == 0) + return -1; + + // 在 COW 处理之后获取 pa + pa0 = PTE2PA(*pte); + if(pa0 == 0) return -1; n = PGSIZE - (dstva - va0);
|