* [PATCH 1/2] Enable SPU switch notification to detect currently active SPU tasks.
@ 2007-07-12 23:45 Bob Nelson
2007-07-13 10:12 ` Christoph Hellwig
0 siblings, 1 reply; 6+ messages in thread
From: Bob Nelson @ 2007-07-12 23:45 UTC (permalink / raw)
To: Andrew Morton; +Cc: linuxppc, oprofile, Philippe Elie
We would like this patch included in -mm and in 2.6.23.
Subject: Enable SPU switch notification to detect currently active SPU
tasks.
From: Maynard Johnson <mpjohn@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>
Signed-off-by: Carl Love <carll@us.ibm.com>
Signed-off-by: Bob Nelson <rrnelson@us.ibm.com>
Acked-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Acked-by: Paul Mackerras <paulus@samba.org>
Index: powerpc.git/arch/powerpc/platforms/cell/spufs/sched.c
===================================================================
--- powerpc.git.orig/arch/powerpc/platforms/cell/spufs/sched.c
+++ powerpc.git/arch/powerpc/platforms/cell/spufs/sched.c
@@ -204,21 +204,47 @@ static void spu_remove_from_active_list(
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
+ * see 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;
+ set_bit(SPU_SCHED_NOTIFY_ACTIVE, &ctx->sched_flags);
+ mb();
+ 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);
/**
* spu_bind_context - bind spu context to physical spu
Index: powerpc.git/arch/powerpc/platforms/cell/spufs/spufs.h
===================================================================
--- powerpc.git.orig/arch/powerpc/platforms/cell/spufs/spufs.h
+++ powerpc.git/arch/powerpc/platforms/cell/spufs/spufs.h
@@ -53,6 +53,11 @@ enum spuctx_execution_state {
SPUCTX_UTIL_MAX
};
+/* ctx->sched_flags */
+enum {
+ SPU_SCHED_NOTIFY_ACTIVE,
+};
+
struct spu_context {
struct spu *spu; /* pointer to a physical SPU */
struct spu_state csa; /* SPU context save area. */
@@ -231,6 +236,7 @@ void spu_acquire_saved(struct spu_contex
int spu_activate(struct spu_context *ctx, unsigned long 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);
void spu_set_timeslice(struct spu_context *ctx);
void spu_update_sched_info(struct spu_context *ctx);
void __spu_update_sched_info(struct spu_context *ctx);
Index: powerpc.git/arch/powerpc/platforms/cell/spufs/run.c
===================================================================
--- powerpc.git.orig/arch/powerpc/platforms/cell/spufs/run.c
+++ powerpc.git/arch/powerpc/platforms/cell/spufs/run.c
@@ -18,15 +18,17 @@ void spufs_stop_callback(struct spu *spu
wake_up_all(&ctx->stop_wq);
}
-static inline int spu_stopped(struct spu_context *ctx, u32 * stat)
+static inline int spu_stopped(struct spu_context *ctx, u32 *stat)
{
struct spu *spu;
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 ||
+ test_bit(SPU_SCHED_NOTIFY_ACTIVE, &ctx->sched_flags))
+ return 1;
pte_fault = spu->dsisr &
(MFC_DSISR_PTE_NOT_FOUND | MFC_DSISR_ACCESS_DENIED);
return (!(*stat & SPU_STATUS_RUNNING) || pte_fault ||
spu->class_0_pending) ?
@@ -124,7 +126,7 @@ out:
return ret;
}
-static int spu_run_init(struct spu_context *ctx, u32 * npc)
+static int spu_run_init(struct spu_context *ctx, u32 *npc)
{
if (ctx->flags & SPU_CREATE_ISOLATE) {
unsigned long runcntl;
@@ -154,8 +156,8 @@ static int spu_run_init(struct spu_conte
return 0;
}
-static int spu_run_fini(struct spu_context *ctx, u32 * npc,
- u32 * status)
+static int spu_run_fini(struct spu_context *ctx, u32 *npc,
+ u32 *status)
{
int ret = 0;
@@ -293,6 +295,7 @@ long spufs_run_spu(struct file *file, st
u32 *npc, u32 *event)
{
int ret;
+ struct spu *spu;
u32 status;
if (mutex_lock_interruptible(&ctx->run_mutex))
@@ -326,8 +329,17 @@ long spufs_run_spu(struct file *file, st
do {
ret = spufs_wait(ctx->stop_wq, spu_stopped(ctx, &status));
+ spu = ctx->spu;
if (unlikely(ret))
break;
+ if (unlikely(test_bit(SPU_SCHED_NOTIFY_ACTIVE,
+ &ctx->sched_flags))) {
+ clear_bit(SPU_SCHED_NOTIFY_ACTIVE, &ctx->sched_flags);
+ 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);
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] Enable SPU switch notification to detect currently active SPU tasks.
2007-07-12 23:45 [PATCH 1/2] Enable SPU switch notification to detect currently active SPU tasks Bob Nelson
@ 2007-07-13 10:12 ` Christoph Hellwig
2007-07-13 10:13 ` Christoph Hellwig
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Christoph Hellwig @ 2007-07-13 10:12 UTC (permalink / raw)
To: Bob Nelson; +Cc: linuxppc, Andrew Morton, oprofile, Philippe Elie
On Thu, Jul 12, 2007 at 06:45:40PM -0500, Bob Nelson wrote:
> We would like this patch included in -mm and in 2.6.23.
Do you plan to submit oprofile support aswell? In that case it's fine
otherwise please send it together with the actual oprofile support.
> +static void notify_spus_active(void)
> +{
> + int node;
> + /* Wake up the active spu_contexts. When the awakened processes
> + * see their "notify_active" flag is set, they will call
> + * spu_switch_notify();
> + */
Small style issue, this should be:
int node;
/*
* Wake up the active spu_contexts.
*
* When the awakened processes see their "notify_active" flag is set,
* they will call spu_switch_notify().
*/
> -static inline int spu_stopped(struct spu_context *ctx, u32 * stat)
> +static inline int spu_stopped(struct spu_context *ctx, u32 *stat)
useless (and wrong) reformatting, please remove.
> -static int spu_run_init(struct spu_context *ctx, u32 * npc)
> +static int spu_run_init(struct spu_context *ctx, u32 *npc)
Same here.
> -static int spu_run_fini(struct spu_context *ctx, u32 * npc,
> - u32 * status)
> +static int spu_run_fini(struct spu_context *ctx, u32 *npc,
> + u32 *status)
Same here.
> + if (unlikely(test_bit(SPU_SCHED_NOTIFY_ACTIVE,
> + &ctx->sched_flags))) {
> + clear_bit(SPU_SCHED_NOTIFY_ACTIVE, &ctx->sched_flags);
this should use test_and_clear_bit
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] Enable SPU switch notification to detect currently active SPU tasks.
2007-07-13 10:12 ` Christoph Hellwig
@ 2007-07-13 10:13 ` Christoph Hellwig
2007-07-13 12:34 ` Benjamin Herrenschmidt
2007-07-13 13:25 ` Christoph Hellwig
2 siblings, 0 replies; 6+ messages in thread
From: Christoph Hellwig @ 2007-07-13 10:13 UTC (permalink / raw)
To: Bob Nelson; +Cc: linuxppc, Andrew Morton, oprofile, Philippe Elie
On Fri, Jul 13, 2007 at 12:12:33PM +0200, Christoph Hellwig wrote:
> On Thu, Jul 12, 2007 at 06:45:40PM -0500, Bob Nelson wrote:
> > We would like this patch included in -mm and in 2.6.23.
>
> Do you plan to submit oprofile support aswell? In that case it's fine
> otherwise please send it together with the actual oprofile support.
I just saw the oprofile patch is next, so this is okay.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] Enable SPU switch notification to detect currently active SPU tasks.
2007-07-13 10:12 ` Christoph Hellwig
2007-07-13 10:13 ` Christoph Hellwig
@ 2007-07-13 12:34 ` Benjamin Herrenschmidt
2007-07-13 12:45 ` Christoph Hellwig
2007-07-13 13:25 ` Christoph Hellwig
2 siblings, 1 reply; 6+ messages in thread
From: Benjamin Herrenschmidt @ 2007-07-13 12:34 UTC (permalink / raw)
To: Christoph Hellwig
Cc: linuxppc, Andrew Morton, Bob Nelson, oprofile, Philippe Elie
> > + if (unlikely(test_bit(SPU_SCHED_NOTIFY_ACTIVE,
> > + &ctx->sched_flags))) {
> > + clear_bit(SPU_SCHED_NOTIFY_ACTIVE, &ctx->sched_flags);
>
> this should use test_and_clear_bit
This also looks like an abuse of atomics to effectively implement a lock
or did I miss something ?
Ben.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] Enable SPU switch notification to detect currently active SPU tasks.
2007-07-13 12:34 ` Benjamin Herrenschmidt
@ 2007-07-13 12:45 ` Christoph Hellwig
0 siblings, 0 replies; 6+ messages in thread
From: Christoph Hellwig @ 2007-07-13 12:45 UTC (permalink / raw)
To: Benjamin Herrenschmidt
Cc: Philippe Elie, linuxppc, Bob Nelson, oprofile, Andrew Morton,
Christoph Hellwig
On Fri, Jul 13, 2007 at 10:34:50PM +1000, Benjamin Herrenschmidt wrote:
>
> > > + if (unlikely(test_bit(SPU_SCHED_NOTIFY_ACTIVE,
> > > + &ctx->sched_flags))) {
> > > + clear_bit(SPU_SCHED_NOTIFY_ACTIVE, &ctx->sched_flags);
> >
> > this should use test_and_clear_bit
>
> This also looks like an abuse of atomics to effectively implement a lock
> or did I miss something ?
not really. We set a flag on the context to make sure some action is
performed when it comes through spu_run the next time. It's not exactly
elegant, but cleaning this up will have to wait for the grand spu_run
rewrite.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] Enable SPU switch notification to detect currently active SPU tasks.
2007-07-13 10:12 ` Christoph Hellwig
2007-07-13 10:13 ` Christoph Hellwig
2007-07-13 12:34 ` Benjamin Herrenschmidt
@ 2007-07-13 13:25 ` Christoph Hellwig
2 siblings, 0 replies; 6+ messages in thread
From: Christoph Hellwig @ 2007-07-13 13:25 UTC (permalink / raw)
To: Bob Nelson; +Cc: linuxppc, Andrew Morton, oprofile, Philippe Elie
On Fri, Jul 13, 2007 at 12:12:33PM +0200, Christoph Hellwig wrote:
> > -static inline int spu_stopped(struct spu_context *ctx, u32 * stat)
> > +static inline int spu_stopped(struct spu_context *ctx, u32 *stat)
>
> useless (and wrong) reformatting, please remove.
Sorry, this looked like going the wrong way to me. I'm still not
sure the reformatting belongs into this patch, but if it makes it easier
for you we can keep it.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2007-07-13 13:26 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-07-12 23:45 [PATCH 1/2] Enable SPU switch notification to detect currently active SPU tasks Bob Nelson
2007-07-13 10:12 ` Christoph Hellwig
2007-07-13 10:13 ` Christoph Hellwig
2007-07-13 12:34 ` Benjamin Herrenschmidt
2007-07-13 12:45 ` Christoph Hellwig
2007-07-13 13:25 ` Christoph Hellwig
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).