Imperial-MEng/pintos_22
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: implement page swapping

Browse Source
This commit is contained in:
Themis Demetriades
2024-12-03 16:53:47 +00:00
parent df7d847978
commit 08eafcf7ef
3 changed files with 39 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/userprog/exception.c
View File

@@ -1,10 +1,18 @@
#include "userprog/exception.h"
#include <inttypes.h>
#include <stdio.h>
#include "stdbool.h"
#include "userprog/gdt.h"
#include "threads/interrupt.h"
#include "threads/thread.h"
#include "userprog/pagedir.h"
#ifdef VM
#include "vm/stackgrowth.h"
#include "vm/frame.h"
#include "vm/page.h"
#include "devices/swap.h"
#include "threads/vaddr.h"
#endif
/* Number of page faults processed. */
static long long page_fault_cnt;
@@ -147,9 +155,26 @@ page_fault (struct intr_frame *f)
user = (f->error_code & PF_U) != 0;
#ifdef VM
if (user && not_present)
if (user)
{
if (handle_stack_fault (fault_addr, f->esp)) return;
if (not_present)
{
struct thread *t = thread_current ();
if (page_in_swap (t, fault_addr))
{
size_t swap_slot = page_get_swap (t, fault_addr);
void *upage = pg_round_down (fault_addr);
void *kpage = frame_alloc (0, upage, t);
swap_in (kpage, swap_slot);
bool writeable = pagedir_is_writable (t->pagedir, upage);
if (pagedir_set_page (t->pagedir, upage, kpage, writeable)) return;
}
/* Handle page faults that need to be resolved by dynamic stack growth
by checking if this is such a fault and resolving it appropriately. */
if (handle_stack_fault (fault_addr, f->esp)) return;
}
}
else
{