Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d78592e authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Paul Mackerras
Browse files

[POWERPC] spusched: Fix initial timeslice calculation 



Currently we calculate the first timeslice for every context
incorrectly - alloc_spu_context calls spu_set_timeslice before we set
ctx->prio so we always calculate the longest possible timeslice for the
lowest possible priority.

This patch makes sure to update the schedule-related fields before
calculating the timeslice and also makes sure we update the timeslice for
a non-running context when entering spu_run so a priority change affects
the context as soon as possible.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJeremy Kerr <jk@ozlabs.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 6f6a6dc0

arch/powerpc/platforms/cell/spufs/context.c

+2 −1
Original line number Diff line number Diff line
@@ -59,7 +59,8 @@ struct spu_context *alloc_spu_context(struct spu_gang *gang) 
	INIT_LIST_HEAD(&ctx->aff_list);

	if (gang)

		spu_gang_add_ctx(gang, ctx);

	ctx->cpus_allowed = current->cpus_allowed;



	__spu_update_sched_info(ctx);

	spu_set_timeslice(ctx);

	ctx->stats.util_state = SPU_UTIL_IDLE_LOADED;

arch/powerpc/platforms/cell/spufs/run.c

+4 −0
Original line number Diff line number Diff line
@@ -312,6 +312,7 @@ long spufs_run_spu(struct spu_context *ctx, u32 *npc, u32 *event) 
	spu_acquire(ctx);

	if (ctx->state == SPU_STATE_SAVED) {

		__spu_update_sched_info(ctx);

		spu_set_timeslice(ctx);



		ret = spu_activate(ctx, 0);

		if (ret) {
@@ -322,6 +323,9 @@ long spufs_run_spu(struct spu_context *ctx, u32 *npc, u32 *event) 
		/*

		 * We have to update the scheduling priority under active_mutex

		 * to protect against find_victim().

		 *

		 * No need to update the timeslice ASAP, it will get updated

		 * once the current one has expired.

		 */

		spu_update_sched_info(ctx);

	}