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

Revert "fix REQ-37: remap_one_page: remove to check page size"

Browse Source 
This reverts commit 6790126a23.

- reverted commit should remove a 'pgsize' check in remap_one_page()
  instead of a 'pgsize' check in pte_make_fileoff().
- In IA-32e, PTE format varies with page size. Therefore 'pgsize'
  parameter of pte_make_fileoff() is preferable.
This commit is contained in:
NAKAMURA Gou
2016-04-21 22:55:57 +09:00
parent e2e0fad849
commit 328175547f
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -242,13 +242,12 @@ static inline void pte_make_null(pte_t *ptep, size_t pgsize)
} }
static inline void pte_make_fileoff(off_t off, static inline void pte_make_fileoff(off_t off,
enum ihk_mc_pt_attribute ptattr, pte_t *ptep) enum ihk_mc_pt_attribute ptattr, size_t pgsize, pte_t *ptep)
{ {
uint64_t attr; uint64_t attr;
attr = ptattr & ~PAGE_MASK; attr = ptattr & ~PAGE_MASK;
#if 0
switch (pgsize) { switch (pgsize) {
case PTL1_SIZE: attr |= PFL1_FILEOFF; break; case PTL1_SIZE: attr |= PFL1_FILEOFF; break;
case PTL2_SIZE: attr |= PFL2_FILEOFF | PFL2_SIZE; break; case PTL2_SIZE: attr |= PFL2_FILEOFF | PFL2_SIZE; break;
@ -261,9 +260,6 @@ static inline void pte_make_fileoff(off_t off,
#endif #endif
break; break;
} }
#else
attr |= PFL1_FILEOFF;
#endif
*ptep = (off & PAGE_MASK) | attr; *ptep = (off & PAGE_MASK) | attr;
} }

4
kernel/process.c
View File

@ -1266,7 +1266,7 @@ static int remap_one_page(void *arg0, page_table_t pt, pte_t *ptep,
} }
off = args->off + ((uintptr_t)pgaddr - args->start); off = args->off + ((uintptr_t)pgaddr - args->start);
pte_make_fileoff(off, 0, &apte); pte_make_fileoff(off, 0, pgsize, &apte);
pte_xchg(ptep, &apte); pte_xchg(ptep, &apte);
flush_tlb_single((uintptr_t)pgaddr); /* XXX: TLB flush */ flush_tlb_single((uintptr_t)pgaddr); /* XXX: TLB flush */
@ -1425,7 +1425,7 @@ static int invalidate_one_page(void *arg0, page_table_t pt, pte_t *ptep,
pte_make_null(&apte, pgsize); pte_make_null(&apte, pgsize);
} }
else { else {
pte_make_fileoff(page->offset, 0, &apte); pte_make_fileoff(page->offset, 0, pgsize, &apte);
} }
pte_xchg(ptep, &apte); pte_xchg(ptep, &apte);
flush_tlb_single((uintptr_t)pgaddr); /* XXX: TLB flush */ flush_tlb_single((uintptr_t)pgaddr); /* XXX: TLB flush */