lkml.org 
[lkml]   [2007]   [Jan]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[RFC, PATCH 3/4] Add support to OProfile for profiling Cell BE SPUs -- update

    Subject: Enable SPU switch notification to detect currently active SPU tasks.

    From: Maynard Johnson <maynardj@us.ibm.com>

    This patch adds to the capability of spu_switch_event_register so that the
    caller is also notified of currently active SPU tasks. It also exports
    spu_switch_event_register and spu_switch_event_unregister.

    Signed-off-by: Maynard Johnson <mpjohn@us.ibm.com>


    Index: linux-2.6.20-rc1/arch/powerpc/platforms/cell/spufs/sched.c
    ===================================================================
    --- linux-2.6.20-rc1.orig/arch/powerpc/platforms/cell/spufs/sched.c 2007-01-18 16:43:14.324526032 -0600
    +++ linux-2.6.20-rc1/arch/powerpc/platforms/cell/spufs/sched.c 2007-01-26 16:16:35.219668640 -0600
    @@ -78,21 +78,46 @@

    static BLOCKING_NOTIFIER_HEAD(spu_switch_notifier);

    -static void spu_switch_notify(struct spu *spu, struct spu_context *ctx)
    +void spu_switch_notify(struct spu *spu, struct spu_context *ctx)
    {
    blocking_notifier_call_chain(&spu_switch_notifier,
    ctx ? ctx->object_id : 0, spu);
    }

    +static void notify_spus_active(void)
    +{
    + int node;
    + /* Wake up the active spu_contexts. When the awakened processes
    + * sees their notify_active flag is set, they will call
    + * spu_switch_notify();
    + */
    + for (node = 0; node < MAX_NUMNODES; node++) {
    + struct spu *spu;
    + mutex_lock(&spu_prio->active_mutex[node]);
    + list_for_each_entry(spu, &spu_prio->active_list[node], list) {
    + struct spu_context *ctx = spu->ctx;
    + spu->notify_active = 1;
    + wake_up_all(&ctx->stop_wq);
    + }
    + mutex_unlock(&spu_prio->active_mutex[node]);
    + }
    +}
    +
    int spu_switch_event_register(struct notifier_block * n)
    {
    - return blocking_notifier_chain_register(&spu_switch_notifier, n);
    + int ret;
    + ret = blocking_notifier_chain_register(&spu_switch_notifier, n);
    + if (!ret)
    + notify_spus_active();
    + return ret;
    }
    +EXPORT_SYMBOL_GPL(spu_switch_event_register);

    int spu_switch_event_unregister(struct notifier_block * n)
    {
    return blocking_notifier_chain_unregister(&spu_switch_notifier, n);
    }
    +EXPORT_SYMBOL_GPL(spu_switch_event_unregister);


    static inline void bind_context(struct spu *spu, struct spu_context *ctx)
    Index: linux-2.6.20-rc1/arch/powerpc/platforms/cell/spufs/spufs.h
    ===================================================================
    --- linux-2.6.20-rc1.orig/arch/powerpc/platforms/cell/spufs/spufs.h 2007-01-18 16:43:14.340523600 -0600
    +++ linux-2.6.20-rc1/arch/powerpc/platforms/cell/spufs/spufs.h 2007-01-26 16:26:49.733703448 -0600
    @@ -180,6 +180,7 @@
    int spu_activate(struct spu_context *ctx, u64 flags);
    void spu_deactivate(struct spu_context *ctx);
    void spu_yield(struct spu_context *ctx);
    +void spu_switch_notify(struct spu *spu, struct spu_context *ctx);
    int __init spu_sched_init(void);
    void __exit spu_sched_exit(void);

    Index: linux-2.6.20-rc1/arch/powerpc/platforms/cell/spufs/run.c
    ===================================================================
    --- linux-2.6.20-rc1.orig/arch/powerpc/platforms/cell/spufs/run.c 2007-01-18 16:43:14.340523600 -0600
    +++ linux-2.6.20-rc1/arch/powerpc/platforms/cell/spufs/run.c 2007-01-26 16:24:38.979744856 -0600
    @@ -45,9 +45,10 @@
    u64 pte_fault;

    *stat = ctx->ops->status_read(ctx);
    - if (ctx->state != SPU_STATE_RUNNABLE)
    - return 1;
    +
    spu = ctx->spu;
    + if (ctx->state != SPU_STATE_RUNNABLE || spu->notify_active)
    + return 1;
    pte_fault = spu->dsisr &
    (MFC_DSISR_PTE_NOT_FOUND | MFC_DSISR_ACCESS_DENIED);
    return (!(*stat & 0x1) || pte_fault || spu->class_0_pending) ? 1 : 0;
    @@ -305,6 +306,7 @@
    u32 *npc, u32 *event)
    {
    int ret;
    + struct spu * spu;
    u32 status;

    if (down_interruptible(&ctx->run_sema))
    @@ -318,8 +320,16 @@

    do {
    ret = spufs_wait(ctx->stop_wq, spu_stopped(ctx, &status));
    + spu = ctx->spu;
    if (unlikely(ret))
    break;
    + if (unlikely(spu->notify_active)) {
    + spu->notify_active = 0;
    + if (!(status & SPU_STATUS_STOPPED_BY_STOP)) {
    + spu_switch_notify(spu, ctx);
    + continue;
    + }
    + }
    if ((status & SPU_STATUS_STOPPED_BY_STOP) &&
    (status >> SPU_STOP_STATUS_SHIFT == 0x2104)) {
    ret = spu_process_callback(ctx);
    Index: linux-2.6.20-rc1/include/asm-powerpc/spu.h
    ===================================================================
    --- linux-2.6.20-rc1.orig/include/asm-powerpc/spu.h 2007-01-18 16:43:19.932605072 -0600
    +++ linux-2.6.20-rc1/include/asm-powerpc/spu.h 2007-01-24 12:17:30.209676992 -0600
    @@ -144,6 +144,7 @@

    void* pdata; /* platform private data */
    struct sys_device sysdev;
    + int notify_active;
    };

    struct spu *spu_alloc(void);
    \
     
     \ /
      Last update: 2007-01-29 20:51    [W:0.028 / U:29.808 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site