]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
powerpc/spufs: Don't spu_acquire_saved unnecessarily in regs read
authorJeremy Kerr <jk@ozlabs.org>
Thu, 16 Oct 2008 00:11:12 +0000 (11:11 +1100)
committerJeremy Kerr <jk@ozlabs.org>
Tue, 21 Oct 2008 00:13:43 +0000 (11:13 +1100)
With most file readers (eg cat, dd), reading a context's regs file will
result in two reads: the first to read the data, and the second to
return EOF. Because each read performs a spu_acquire_saved, we end up
descheduling and re-scheduling the context twice.

This change does a simple check to see if we'd return EOF before
calling spu_acquire_saved(), saving the extra schedule operation.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
arch/powerpc/platforms/cell/spufs/file.c

index f139cd8b594db6accac1757788feb5c9892d65d6..b6f7b917b56c6a4636517b8996120af7941597d1 100644 (file)
@@ -548,6 +548,11 @@ spufs_regs_read(struct file *file, char __user *buffer,
        int ret;
        struct spu_context *ctx = file->private_data;
 
+       /* pre-check for file position: if we'd return EOF, there's no point
+        * causing a deschedule */
+       if (*pos >= sizeof(ctx->csa.lscsa->gprs))
+               return 0;
+
        ret = spu_acquire_saved(ctx);
        if (ret)
                return ret;