lkml.org 
[lkml]   [2010]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 14/28] s390: preemptible mmu_gather
    From: Martin Schwidefsky <schwidefsky@de.ibm.com>

    Adapt the stand-alone s390 mmu_gather implementation to the new
    preemptible mmu_gather interface.

    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
    ---
    arch/s390/include/asm/tlb.h | 43 +++++++++++++++++++++++++------------------
    1 file changed, 25 insertions(+), 18 deletions(-)

    Index: linux-2.6/arch/s390/include/asm/tlb.h
    ===================================================================
    --- linux-2.6.orig/arch/s390/include/asm/tlb.h
    +++ linux-2.6/arch/s390/include/asm/tlb.h
    @@ -28,45 +28,51 @@
    #include <asm/smp.h>
    #include <asm/tlbflush.h>

    -#ifndef CONFIG_SMP
    -#define TLB_NR_PTRS 1
    -#else
    -#define TLB_NR_PTRS 508
    -#endif
    -
    struct mmu_gather {
    struct mm_struct *mm;
    unsigned int fullmm;
    unsigned int nr_ptes;
    unsigned int nr_pxds;
    - void *array[TLB_NR_PTRS];
    + unsigned int max;
    + void **array;
    + void *local[8];
    };

    -DECLARE_PER_CPU(struct mmu_gather, mmu_gathers);
    -
    -static inline struct mmu_gather *tlb_gather_mmu(struct mm_struct *mm,
    - unsigned int full_mm_flush)
    +static inline void __tlb_alloc_pages(struct mmu_gather *tlb)
    {
    - struct mmu_gather *tlb = &get_cpu_var(mmu_gathers);
    + unsigned long addr = __get_free_pages(GFP_ATOMIC, 0);
    +
    + if (addr) {
    + tlb->array = (void *) addr;
    + tlb->max = PAGE_SIZE / sizeof(void *);
    + }
    +}

    +static inline void tlb_gather_mmu(struct mmu_gather *tlb,
    + struct mm_struct *mm,
    + unsigned int full_mm_flush)
    +{
    tlb->mm = mm;
    + tlb->max = ARRAY_SIZE(tlb->local);
    + tlb->array = tlb->local;
    tlb->fullmm = full_mm_flush || (num_online_cpus() == 1) ||
    (atomic_read(&mm->mm_users) <= 1 && mm == current->active_mm);
    - tlb->nr_ptes = 0;
    - tlb->nr_pxds = TLB_NR_PTRS;
    if (tlb->fullmm)
    __tlb_flush_mm(mm);
    - return tlb;
    + else
    + __tlb_alloc_pages(tlb);
    + tlb->nr_ptes = 0;
    + tlb->nr_pxds = tlb->max;
    }

    static inline void tlb_flush_mmu(struct mmu_gather *tlb,
    unsigned long start, unsigned long end)
    {
    - if (!tlb->fullmm && (tlb->nr_ptes > 0 || tlb->nr_pxds < TLB_NR_PTRS))
    + if (!tlb->fullmm && (tlb->nr_ptes > 0 || tlb->nr_pxds < tlb->max))
    __tlb_flush_mm(tlb->mm);
    while (tlb->nr_ptes > 0)
    pte_free(tlb->mm, tlb->array[--tlb->nr_ptes]);
    - while (tlb->nr_pxds < TLB_NR_PTRS)
    + while (tlb->nr_pxds < tlb->max)
    /* pgd_free frees the pointer as region or segment table */
    pgd_free(tlb->mm, tlb->array[tlb->nr_pxds++]);
    }
    @@ -79,7 +85,8 @@ static inline void tlb_finish_mmu(struct
    /* keep the page table cache within bounds */
    check_pgt_cache();

    - put_cpu_var(mmu_gathers);
    + if (tlb->array != tlb->local)
    + free_pages((unsigned long) tlb->array, 0);
    }

    /*



    \
     
     \ /
      Last update: 2010-06-07 13:23    [W:0.022 / U:32.708 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site