lkml.org 
[lkml]   [2008]   [Apr]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/3] xen: Refactor xen_{alloc,release}_{pt,pd}()
    Date
    Use the pt_level enum with generic alloc_ptpage()
    and release_ptpage() functions to make it a little
    more clear what's going on in next commit.

    Signed-off-by: Mark McLoughlin <markmc@redhat.com>
    ---
    arch/x86/xen/enlighten.c | 27 ++++++++++++++++++++-------
    arch/x86/xen/mmu.c | 7 -------
    arch/x86/xen/mmu.h | 7 +++++++
    3 files changed, 27 insertions(+), 14 deletions(-)

    diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
    index de4e6f0..16e2f80 100644
    --- a/arch/x86/xen/enlighten.c
    +++ b/arch/x86/xen/enlighten.c
    @@ -667,10 +667,10 @@ static void xen_release_pt_init(u32 pfn)
    make_lowmem_page_readwrite(__va(PFN_PHYS(pfn)));
    }

    -static void pin_pagetable_pfn(unsigned level, unsigned long pfn)
    +static void pin_pagetable_pfn(unsigned cmd, unsigned long pfn)
    {
    struct mmuext_op op;
    - op.cmd = level;
    + op.cmd = cmd;
    op.arg1.mfn = pfn_to_mfn(pfn);
    if (HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF))
    BUG();
    @@ -687,7 +687,10 @@ static void xen_alloc_ptpage(struct mm_struct *mm, u32 pfn, unsigned level)

    if (!PageHighMem(page)) {
    make_lowmem_page_readonly(__va(PFN_PHYS(pfn)));
    - pin_pagetable_pfn(level, pfn);
    + if (level == PT_PTE)
    + pin_pagetable_pfn(MMUEXT_PIN_L1_TABLE, pfn);
    + else if (level == PT_PMD)
    + pin_pagetable_pfn(MMUEXT_PIN_L2_TABLE, pfn);
    } else
    /* make sure there are no stray mappings of
    this page */
    @@ -697,16 +700,16 @@ static void xen_alloc_ptpage(struct mm_struct *mm, u32 pfn, unsigned level)

    static void xen_alloc_pt(struct mm_struct *mm, u32 pfn)
    {
    - xen_alloc_ptpage(mm, pfn, MMUEXT_PIN_L1_TABLE);
    + xen_alloc_ptpage(mm, pfn, PT_PTE);
    }

    static void xen_alloc_pd(struct mm_struct *mm, u32 pfn)
    {
    - xen_alloc_ptpage(mm, pfn, MMUEXT_PIN_L2_TABLE);
    + xen_alloc_ptpage(mm, pfn, PT_PMD);
    }

    /* This should never happen until we're OK to use struct page */
    -static void xen_release_pt(u32 pfn)
    +static void xen_release_ptpage(u32 pfn, unsigned level)
    {
    struct page *page = pfn_to_page(pfn);

    @@ -718,6 +721,16 @@ static void xen_release_pt(u32 pfn)
    }
    }

    +static void xen_release_pt(u32 pfn)
    +{
    + xen_release_ptpage(pfn, PT_PTE);
    +}
    +
    +static void xen_release_pd(u32 pfn)
    +{
    + xen_release_ptpage(pfn, PT_PMD);
    +}
    +
    #ifdef CONFIG_HIGHPTE
    static void *xen_kmap_atomic_pte(struct page *page, enum km_type type)
    {
    @@ -838,7 +851,7 @@ static __init void xen_pagetable_setup_done(pgd_t *base)
    pv_mmu_ops.alloc_pt = xen_alloc_pt;
    pv_mmu_ops.alloc_pd = xen_alloc_pd;
    pv_mmu_ops.release_pt = xen_release_pt;
    - pv_mmu_ops.release_pd = xen_release_pt;
    + pv_mmu_ops.release_pd = xen_release_pd;
    pv_mmu_ops.set_pte = xen_set_pte;

    setup_shared_info();
    diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
    index 0144395..2a054ef 100644
    --- a/arch/x86/xen/mmu.c
    +++ b/arch/x86/xen/mmu.c
    @@ -310,13 +310,6 @@ pgd_t xen_make_pgd(unsigned long pgd)
    }
    #endif /* CONFIG_X86_PAE */

    -enum pt_level {
    - PT_PGD,
    - PT_PUD,
    - PT_PMD,
    - PT_PTE
    -};
    -
    /*
    (Yet another) pagetable walker. This one is intended for pinning a
    pagetable. This means that it walks a pagetable and calls the
    diff --git a/arch/x86/xen/mmu.h b/arch/x86/xen/mmu.h
    index c9ff27f..b5e189b 100644
    --- a/arch/x86/xen/mmu.h
    +++ b/arch/x86/xen/mmu.h
    @@ -3,6 +3,13 @@
    #include <linux/linkage.h>
    #include <asm/page.h>

    +enum pt_level {
    + PT_PGD,
    + PT_PUD,
    + PT_PMD,
    + PT_PTE
    +};
    +
    /*
    * Page-directory addresses above 4GB do not fit into architectural %cr3.
    * When accessing %cr3, or equivalent field in vcpu_guest_context, guests
    --
    1.5.4.5


    \
     
     \ /
      Last update: 2008-04-02 16:41    [W:0.024 / U:119.360 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site