gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rus_vm_fault(): fix misaligned address before accessing PTE

Browse Source
This commit is contained in:
Balazs Gerofi
2017-06-14 20:28:40 +09:00
parent 07b0954610
commit 1a853e07d7
1 changed files with 37 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
executer/kernel/mcctrl/syscall.c
View File

@@ -593,6 +593,7 @@ static int rus_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
size_t pix; size_t pix;
#endif #endif
struct mcctrl_per_proc_data *ppd; struct mcctrl_per_proc_data *ppd;
struct ikc_scd_packet *packet;
int ret = 0; int ret = 0;
dprintk("mcctrl:page fault:flags %#x pgoff %#lx va %p page %p\n", dprintk("mcctrl:page fault:flags %#x pgoff %#lx va %p page %p\n",
@@ -610,6 +611,14 @@ static int rus_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
return -EINVAL; return -EINVAL;
} }
packet = (struct ikc_scd_packet *)mcctrl_get_per_thread_data(ppd, current);
if (!packet) {
error = -ENOENT;
printk("%s: no packet registered for TID %d\n",
__FUNCTION__, task_pid_vnr(current));
goto put_and_out;
}
for (try = 1; ; ++try) { for (try = 1; ; ++try) {
error = translate_rva_to_rpa(usrdata->os, ppd->rpgtable, error = translate_rva_to_rpa(usrdata->os, ppd->rpgtable,
(unsigned long)vmf->virtual_address, (unsigned long)vmf->virtual_address,
@@ -617,7 +626,10 @@ static int rus_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
#define NTRIES 2 #define NTRIES 2
if (!error || (try >= NTRIES)) { if (!error || (try >= NTRIES)) {
if (error) { if (error) {
printk("translate_rva_to_rpa: error\n"); printk("%s: error translating 0x%p "
"(req: TID: %u, syscall: %lu)\n",
__FUNCTION__, vmf->virtual_address,
packet->req.rtid, packet->req.number);
} }
break; break;
@@ -630,13 +642,14 @@ static int rus_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
} }
error = remote_page_fault(usrdata, vmf->virtual_address, reason); error = remote_page_fault(usrdata, vmf->virtual_address, reason);
if (error) { if (error) {
printk("forward_page_fault failed. %d\n", error); printk("%s: error forwarding PF for 0x%p "
"(req: TID: %d, syscall: %lu)\n",
__FUNCTION__, vmf->virtual_address,
packet->req.rtid, packet->req.number);
break; break;
} }
} }
if (error) { if (error) {
printk("mcctrl:page fault error:flags %#x pgoff %#lx va %p page %p\n",
vmf->flags, vmf->pgoff, vmf->virtual_address, vmf->page);
ret = VM_FAULT_SIGBUS; ret = VM_FAULT_SIGBUS;
goto put_and_out; goto put_and_out;
} }
@@ -650,16 +663,30 @@ static int rus_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
for (pix = 0; pix < (pgsize / PAGE_SIZE); ++pix) { for (pix = 0; pix < (pgsize / PAGE_SIZE); ++pix) {
struct page *page; struct page *page;
/* LWK may hold large page based mappings that align rva outside
* Linux' VMA, make sure we don't try to map to those pages */
if (rva + (pix * PAGE_SIZE) < vma->vm_start) {
continue;
}
if (pfn_valid(pfn+pix)) { if (pfn_valid(pfn+pix)) {
page = pfn_to_page(pfn+pix); page = pfn_to_page(pfn+pix);
if ((error = rus_page_hash_insert(page)) < 0) { if ((error = rus_page_hash_insert(page)) < 0) {
printk("rus_vm_fault: error hashing page??\n"); printk("%s: error adding page to RUS hash for 0x%p "
"(req: TID: %d, syscall: %lu)\n",
__FUNCTION__, vmf->virtual_address,
packet->req.rtid, packet->req.number);
} }
error = vm_insert_page(vma, rva+(pix*PAGE_SIZE), page); error = vm_insert_page(vma, rva+(pix*PAGE_SIZE), page);
if (error) { if (error) {
printk("vm_insert_page: %d\n", error); printk("%s: error inserting mapping for 0x%p "
"(req: TID: %d, syscall: %lu) error: %d, "
"vm_start: 0x%lx, vm_end: 0x%lx\n",
__FUNCTION__, vmf->virtual_address,
packet->req.rtid, packet->req.number, error,
vma->vm_start, vma->vm_end);
} }
} }
else else
@@ -673,8 +700,10 @@ static int rus_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
#endif #endif
ihk_device_unmap_memory(dev, phys, pgsize); ihk_device_unmap_memory(dev, phys, pgsize);
if (error) { if (error) {
printk("mcctrl:page fault:remap error:flags %#x pgoff %#lx va %p page %p\n", printk("%s: remote PF failed for 0x%p, pgoff: %lu "
vmf->flags, vmf->pgoff, vmf->virtual_address, vmf->page); "(req: TID: %d, syscall: %lu)\n",
__FUNCTION__, vmf->virtual_address, vmf->pgoff,
packet->req.rtid, packet->req.number);
ret = VM_FAULT_SIGBUS; ret = VM_FAULT_SIGBUS;
goto put_and_out; goto put_and_out;
} }