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

delete the access restrictions of whole page table.

Browse Source 
access restrictions will be set on individual pages.
This commit is contained in:
NAKAMURA Gou
2013-06-19 11:39:38 +09:00
parent ff5ee67d06
commit 96f02a1d08
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/x86/kernel/include/arch-memory.h
View File

@ -84,6 +84,11 @@
#define PFL2_KERN_ATTR (PFL2_PRESENT | PFL2_WRITABLE) #define PFL2_KERN_ATTR (PFL2_PRESENT | PFL2_WRITABLE)
#define PFL1_KERN_ATTR (PFL1_PRESENT | PFL1_WRITABLE) #define PFL1_KERN_ATTR (PFL1_PRESENT | PFL1_WRITABLE)
/* for the page table entry that points another page table */
#define PFL4_PDIR_ATTR (PFL4_PRESENT | PFL4_WRITABLE | PFL4_USER)
#define PFL3_PDIR_ATTR (PFL3_PRESENT | PFL3_WRITABLE | PFL3_USER)
#define PFL2_PDIR_ATTR (PFL2_PRESENT | PFL2_WRITABLE | PFL2_USER)
/* For easy conversion, it is better to be the same as architecture's ones */ /* For easy conversion, it is better to be the same as architecture's ones */
enum ihk_mc_pt_attribute { enum ihk_mc_pt_attribute {
PTATTR_ACTIVE = 0x01, PTATTR_ACTIVE = 0x01,

17
arch/x86/kernel/memory.c
View File

@ -135,7 +135,7 @@ static unsigned long setup_l3(struct page_table *pt,
} }
pt_phys = setup_l2(arch_alloc_page(IHK_MC_AP_CRITICAL), phys, start, end); pt_phys = setup_l2(arch_alloc_page(IHK_MC_AP_CRITICAL), phys, start, end);
pt->entry[i] = pt_phys | PFL3_KERN_ATTR; pt->entry[i] = pt_phys | PFL3_PDIR_ATTR;
} }
return virt_to_phys(pt); return virt_to_phys(pt);
@ -160,8 +160,8 @@ static void init_normal_area(struct page_table *pt)
pt_phys = setup_l3(arch_alloc_page(IHK_MC_AP_CRITICAL), phys, pt_phys = setup_l3(arch_alloc_page(IHK_MC_AP_CRITICAL), phys,
map_start, map_end); map_start, map_end);
pt->entry[ident_index++] = pt_phys | PFL4_KERN_ATTR; pt->entry[ident_index++] = pt_phys | PFL4_PDIR_ATTR;
pt->entry[virt_index++] = pt_phys | PFL4_KERN_ATTR; pt->entry[virt_index++] = pt_phys | PFL4_PDIR_ATTR;
} }
} }
@ -181,6 +181,7 @@ static struct page_table *__alloc_new_pt(enum ihk_mc_ap_flag ap_flag)
*/ */
#define ATTR_MASK (PTATTR_WRITABLE | PTATTR_USER | PTATTR_ACTIVE) #define ATTR_MASK (PTATTR_WRITABLE | PTATTR_USER | PTATTR_ACTIVE)
#if 0
static unsigned long attr_to_l4attr(enum ihk_mc_pt_attribute attr) static unsigned long attr_to_l4attr(enum ihk_mc_pt_attribute attr)
{ {
return (attr & ATTR_MASK) | PFL4_PRESENT; return (attr & ATTR_MASK) | PFL4_PRESENT;
@ -189,6 +190,7 @@ static unsigned long attr_to_l3attr(enum ihk_mc_pt_attribute attr)
{ {
return (attr & ATTR_MASK) | PFL3_PRESENT; return (attr & ATTR_MASK) | PFL3_PRESENT;
} }
#endif
static unsigned long attr_to_l2attr(enum ihk_mc_pt_attribute attr) static unsigned long attr_to_l2attr(enum ihk_mc_pt_attribute attr)
{ {
unsigned long r = (attr & (ATTR_MASK | PTATTR_LARGEPAGE)); unsigned long r = (attr & (ATTR_MASK | PTATTR_LARGEPAGE));
@ -322,7 +324,7 @@ static int __set_pt_page(struct page_table *pt, void *virt, unsigned long phys,
} else { } else {
if((newpt = __alloc_new_pt(ap_flag)) == NULL) if((newpt = __alloc_new_pt(ap_flag)) == NULL)
return -ENOMEM; return -ENOMEM;
pt->entry[l4idx] = virt_to_phys(newpt) | attr_to_l4attr(attr); pt->entry[l4idx] = virt_to_phys(newpt) | PFL4_PDIR_ATTR;
pt = newpt; pt = newpt;
} }
@ -331,7 +333,7 @@ static int __set_pt_page(struct page_table *pt, void *virt, unsigned long phys,
} else { } else {
if((newpt = __alloc_new_pt(ap_flag)) == NULL) if((newpt = __alloc_new_pt(ap_flag)) == NULL)
return -ENOMEM; return -ENOMEM;
pt->entry[l3idx] = virt_to_phys(newpt) | attr_to_l3attr(attr); pt->entry[l3idx] = virt_to_phys(newpt) | PFL3_PDIR_ATTR;
pt = newpt; pt = newpt;
} }
@ -354,8 +356,7 @@ static int __set_pt_page(struct page_table *pt, void *virt, unsigned long phys,
} else { } else {
if((newpt = __alloc_new_pt(ap_flag)) == NULL) if((newpt = __alloc_new_pt(ap_flag)) == NULL)
return -ENOMEM; return -ENOMEM;
pt->entry[l2idx] = virt_to_phys(newpt) | attr_to_l2attr(attr) pt->entry[l2idx] = virt_to_phys(newpt) | PFL2_PDIR_ATTR;
| PFL2_PRESENT;
pt = newpt; pt = newpt;
} }
@ -547,7 +548,7 @@ int ihk_mc_pt_prepare_map(page_table_t p, void *virt, unsigned long size,
ret = -ENOMEM; ret = -ENOMEM;
} else { } else {
pt->entry[l4idx] = virt_to_phys(newpt) pt->entry[l4idx] = virt_to_phys(newpt)
| attr_to_l4attr(attr); | PFL4_PDIR_ATTR;
} }
} }
} }