lkml.org 
[lkml]   [2004]   [Sep]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: [PATCH][5/8] Arch agnostic completely out of line locks / ppc64
    At some point in the past, Zwane Mwaikambo wrote:
    >> I think that bit is actually intentional since __preempt_spin_lock is also
    >> marked __sched so that it'll get charged as a scheduling function.

    On Fri, Sep 10, 2004 at 01:43:00AM +1000, Anton Blanchard wrote:
    > Yeah, its a bit unfortunate. In profiles with preempt on we end up with
    > almost all our ticks inside __preempt_spin_lock and never get to use the
    > nice profile_pc code. I ended up turning preempt off again.

    Checking in_lock_functions() (not sure what the name in Zwane's code
    was) for non-leaf functions in get_wchan() in addition to
    in_sched_functions() should do. e.g.

    Index: mm4-2.6.9-rc1/arch/ppc64/kernel/process.c
    ===================================================================
    --- mm4-2.6.9-rc1.orig/arch/ppc64/kernel/process.c 2004-09-08 05:46:09.000000000 -0700
    +++ mm4-2.6.9-rc1/arch/ppc64/kernel/process.c 2004-09-09 09:58:47.448326528 -0700
    @@ -555,7 +555,8 @@
    return 0;
    if (count > 0) {
    ip = *(unsigned long *)(sp + 16);
    - if (!in_sched_functions(ip))
    + if (!in_sched_functions(ip) &&
    + || (!count || !in_lock_functions(ip)))
    return ip;
    }
    } while (count++ < 16);
    Index: mm4-2.6.9-rc1/include/linux/spinlock.h
    ===================================================================
    --- mm4-2.6.9-rc1.orig/include/linux/spinlock.h 2004-09-08 05:46:18.000000000 -0700
    +++ mm4-2.6.9-rc1/include/linux/spinlock.h 2004-09-09 09:57:33.529563888 -0700
    @@ -46,6 +46,7 @@

    #define __lockfunc fastcall __attribute__((section(".lock.text")))

    +int in_lock_functions(unsigned long);
    int __lockfunc _spin_trylock(spinlock_t *lock);
    int __lockfunc _write_trylock(rwlock_t *lock);
    void __lockfunc _spin_lock(spinlock_t *lock);
    Index: mm4-2.6.9-rc1/kernel/spinlock.c
    ===================================================================
    --- mm4-2.6.9-rc1.orig/kernel/spinlock.c 2004-09-08 05:46:04.000000000 -0700
    +++ mm4-2.6.9-rc1/kernel/spinlock.c 2004-09-09 09:57:10.569054416 -0700
    @@ -11,6 +11,12 @@
    #include <linux/interrupt.h>
    #include <linux/module.h>

    +int in_lock_functions(unsigned long vaddr)
    +{
    + return vaddr >= (unsigned long)&__lock_text_start
    + && vaddr < (unsigned long)&__lock_text_end;
    +}
    +
    int __lockfunc _spin_trylock(spinlock_t *lock)
    {
    preempt_disable();
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2005-03-22 14:06    [W:0.021 / U:0.016 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site