UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

uml: add virt_to_pte 

Turn um_virt_to_phys into virt_to_pte, cleaning up a horrid interface.

It's also made non-static and declared in pgtable.h because it'll be
needed when the stubs get a vma.

Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Jeff Dike 2008-02-04 22:30:55 -08:00 committed by Linus Torvalds
parent 655e4ed0c5
commit ca77b555c0
2 changed files with 26 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
arch/um/kernel/skas/uaccess.c
View File

@ -13,70 +13,60 @@
#include "kern_util.h" #include "kern_util.h"
#include "os.h" #include "os.h"
static void *um_virt_to_phys(struct task_struct *task, unsigned long addr, pte_t *virt_to_pte(struct mm_struct *mm, unsigned long addr)
pte_t *pte_out)
{ {
pgd_t *pgd; pgd_t *pgd;
pud_t *pud; pud_t *pud;
pmd_t *pmd; pmd_t *pmd;
pte_t *pte;
pte_t ptent;
if (task->mm == NULL) if (mm == NULL)
return ERR_PTR(-EINVAL); return NULL;
pgd = pgd_offset(task->mm, addr);
pgd = pgd_offset(mm, addr);
if (!pgd_present(*pgd)) if (!pgd_present(*pgd))
return ERR_PTR(-EINVAL); return NULL;
pud = pud_offset(pgd, addr); pud = pud_offset(pgd, addr);
if (!pud_present(*pud)) if (!pud_present(*pud))
return ERR_PTR(-EINVAL); return NULL;
pmd = pmd_offset(pud, addr); pmd = pmd_offset(pud, addr);
if (!pmd_present(*pmd)) if (!pmd_present(*pmd))
return ERR_PTR(-EINVAL); return NULL;
pte = pte_offset_kernel(pmd, addr); return pte_offset_kernel(pmd, addr);
ptent = *pte;
if (!pte_present(ptent))
return ERR_PTR(-EINVAL);
if (pte_out != NULL)
*pte_out = ptent;
return (void *) (pte_val(ptent) & PAGE_MASK) + (addr & ~PAGE_MASK);
} }
static unsigned long maybe_map(unsigned long virt, int is_write) static pte_t *maybe_map(unsigned long virt, int is_write)
{ {
pte_t pte; pte_t *pte = virt_to_pte(current->mm, virt);
int err; int err, dummy_code;
void *phys = um_virt_to_phys(current, virt, &pte); if ((pte == NULL) || !pte_present(*pte) ||
int dummy_code; (is_write && !pte_write(*pte))) {
if (IS_ERR(phys) || (is_write && !pte_write(pte))) {
err = handle_page_fault(virt, 0, is_write, 1, &dummy_code); err = handle_page_fault(virt, 0, is_write, 1, &dummy_code);
if (err) if (err)
return -1UL; return NULL;
phys = um_virt_to_phys(current, virt, NULL); pte = virt_to_pte(current->mm, virt);
} }
if (IS_ERR(phys)) if (!pte_present(*pte))
phys = (void *) -1; pte = NULL;
return (unsigned long) phys; return pte;
} }
static int do_op_one_page(unsigned long addr, int len, int is_write, static int do_op_one_page(unsigned long addr, int len, int is_write,
int (*op)(unsigned long addr, int len, void *arg), void *arg) int (*op)(unsigned long addr, int len, void *arg), void *arg)
{ {
struct page *page; struct page *page;
pte_t *pte;
int n; int n;
addr = maybe_map(addr, is_write); pte = maybe_map(addr, is_write);
if (addr == -1UL) if (pte == NULL)
return -1; return -1;
page = phys_to_page(addr); page = pte_page(*pte);
addr = (unsigned long) kmap_atomic(page, KM_UML_USERCOPY) + addr = (unsigned long) kmap_atomic(page, KM_UML_USERCOPY) +
(addr & ~PAGE_MASK); (addr & ~PAGE_MASK);

3
include/asm-um/pgtable.h
View File

@ -323,6 +323,9 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
#define pte_unmap(pte) do { } while (0) #define pte_unmap(pte) do { } while (0)
#define pte_unmap_nested(pte) do { } while (0) #define pte_unmap_nested(pte) do { } while (0)
struct mm_struct;
extern pte_t *virt_to_pte(struct mm_struct *mm, unsigned long addr);
#define update_mmu_cache(vma,address,pte) do ; while (0) #define update_mmu_cache(vma,address,pte) do ; while (0)
/* Encode and de-code a swap entry */ /* Encode and de-code a swap entry */