From: Alexey Dobriyan <adobriyan@gmail.com>
To: Andrew Morton <akpm@linux-foundation.org>
Cc: Matt Helsley <matthltc@us.ibm.com>,
xemul@parallels.com, containers@lists.linux-foundation.org,
linux-kernel@vger.kernel.org, dave@linux.vnet.ibm.com,
mingo@elte.hu, torvalds@linux-foundation.org,
linux-fsdevel@vger.kernel.org
Subject: [PATCH 5/9] exec_path 5/9: make struct spu_context::owner task_struct
Date: Thu, 4 Jun 2009 03:06:37 +0400 [thread overview]
Message-ID: <20090603230637.GF853@x200.localdomain> (raw)
In-Reply-To: <20090603230422.GB853@x200.localdomain>
Cell SPU code is going to use ->exec_path to get dcookies and stuff
so it needs task_struct saved, not mm_struct.
Export __put_task_struct() to allow link.
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
---
arch/powerpc/platforms/cell/spufs/context.c | 9 +++++----
arch/powerpc/platforms/cell/spufs/file.c | 2 +-
arch/powerpc/platforms/cell/spufs/sched.c | 2 +-
arch/powerpc/platforms/cell/spufs/spufs.h | 2 +-
kernel/fork.c | 1 +
5 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/arch/powerpc/platforms/cell/spufs/context.c b/arch/powerpc/platforms/cell/spufs/context.c
index db5398c..7ad45e1 100644
--- a/arch/powerpc/platforms/cell/spufs/context.c
+++ b/arch/powerpc/platforms/cell/spufs/context.c
@@ -57,7 +57,8 @@ struct spu_context *alloc_spu_context(struct spu_gang *gang)
init_waitqueue_head(&ctx->run_wq);
ctx->state = SPU_STATE_SAVED;
ctx->ops = &spu_backing_ops;
- ctx->owner = get_task_mm(current);
+ get_task_struct(current);
+ ctx->owner = current;
INIT_LIST_HEAD(&ctx->rq);
INIT_LIST_HEAD(&ctx->aff_list);
if (gang)
@@ -111,7 +112,7 @@ int put_spu_context(struct spu_context *ctx)
/* give up the mm reference when the context is about to be destroyed */
void spu_forget(struct spu_context *ctx)
{
- struct mm_struct *mm;
+ struct task_struct *tsk;
/*
* This is basically an open-coded spu_acquire_saved, except that
@@ -122,9 +123,9 @@ void spu_forget(struct spu_context *ctx)
if (ctx->state != SPU_STATE_SAVED)
spu_deactivate(ctx);
- mm = ctx->owner;
+ tsk = ctx->owner;
ctx->owner = NULL;
- mmput(mm);
+ put_task_struct(tsk);
spu_release(ctx);
}
diff --git a/arch/powerpc/platforms/cell/spufs/file.c b/arch/powerpc/platforms/cell/spufs/file.c
index d6a519e..d781304 100644
--- a/arch/powerpc/platforms/cell/spufs/file.c
+++ b/arch/powerpc/platforms/cell/spufs/file.c
@@ -1545,7 +1545,7 @@ static int spufs_mfc_open(struct inode *inode, struct file *file)
struct spu_context *ctx = i->i_ctx;
/* we don't want to deal with DMA into other processes */
- if (ctx->owner != current->mm)
+ if (ctx->owner != current)
return -EINVAL;
if (atomic_read(&inode->i_count) != 1)
diff --git a/arch/powerpc/platforms/cell/spufs/sched.c b/arch/powerpc/platforms/cell/spufs/sched.c
index f085369..9fbd87a 100644
--- a/arch/powerpc/platforms/cell/spufs/sched.c
+++ b/arch/powerpc/platforms/cell/spufs/sched.c
@@ -230,7 +230,7 @@ static void spu_bind_context(struct spu *spu, struct spu_context *ctx)
ctx->stats.slb_flt_base = spu->stats.slb_flt;
ctx->stats.class2_intr_base = spu->stats.class2_intr;
- spu_associate_mm(spu, ctx->owner);
+ spu_associate_mm(spu, ctx->owner->mm);
spin_lock_irq(&spu->register_lock);
spu->ctx = ctx;
diff --git a/arch/powerpc/platforms/cell/spufs/spufs.h b/arch/powerpc/platforms/cell/spufs/spufs.h
index ae31573..70a7813 100644
--- a/arch/powerpc/platforms/cell/spufs/spufs.h
+++ b/arch/powerpc/platforms/cell/spufs/spufs.h
@@ -95,7 +95,7 @@ struct spu_context {
struct mutex state_mutex;
struct mutex run_mutex;
- struct mm_struct *owner;
+ struct task_struct *owner;
struct kref kref;
wait_queue_head_t ibox_wq;
diff --git a/kernel/fork.c b/kernel/fork.c
index c0ee931..b396c07 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -160,6 +160,7 @@ void __put_task_struct(struct task_struct *tsk)
if (!profile_handoff_task(tsk))
free_task(tsk);
}
+EXPORT_SYMBOL(__put_task_struct);
/*
* macro override instead of weak attribute alias, to workaround
next prev parent reply other threads:[~2009-06-03 23:06 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20090526113618.GJ28083@us.ibm.com>
[not found] ` <20090526162415.fb9cefef.akpm@linux-foundation.org>
[not found] ` <20090531215427.GA29534@x200.localdomain>
[not found] ` <20090531151953.8f8b14b5.akpm@linux-foundation.org>
[not found] ` <20090531151953.8f8b14b5.akpm-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org>
2009-06-03 23:04 ` [PATCH 1/9] exec_path 1/9: introduce ->exec_path and switch /proc/*/exe Alexey Dobriyan
2009-06-03 23:05 ` [PATCH 2/9] exec_path 2/9: switch audit to ->exec_path Alexey Dobriyan
[not found] ` <20090603230422.GB853-2ev+ksY9ol182hYKe6nXyg@public.gmane.org>
2009-06-03 23:05 ` [PATCH 3/9] exec_path 3/9: switch TOMOYO " Alexey Dobriyan
2009-06-03 23:06 ` [PATCH 4/9] exec_path 4/9: switch oprofile " Alexey Dobriyan
2009-06-03 23:06 ` [PATCH 6/9] exec_path 6/9: add struct spu::tsk Alexey Dobriyan
2009-06-03 23:06 ` Alexey Dobriyan [this message]
2009-06-03 23:07 ` [PATCH 7/9] exec_path 7/9: switch cell SPU thing to ->exec_path Alexey Dobriyan
2009-06-03 23:07 ` [PATCH 8/9] exec_path 8/9: remove ->exe_file et al Alexey Dobriyan
2009-06-03 23:08 ` [PATCH 9/9] exec_path 9/9: remove VM_EXECUTABLE Alexey Dobriyan
2009-06-04 7:24 ` Matt Helsley
2009-06-03 23:36 ` [PATCH 1/9] exec_path 1/9: introduce ->exec_path and switch /proc/*/exe Linus Torvalds
2009-06-04 7:55 ` Matt Helsley
2009-06-04 8:10 ` Matt Helsley
2009-06-04 15:07 ` Linus Torvalds
2009-06-04 21:30 ` Matt Helsley
2009-06-04 22:42 ` Alexey Dobriyan
2009-06-05 3:49 ` Matt Helsley
2009-06-05 10:45 ` Christoph Hellwig
2009-06-05 15:10 ` Linus Torvalds
2009-06-05 15:41 ` Alexey Dobriyan
2009-06-05 15:49 ` Linus Torvalds
2009-06-05 16:09 ` Alexey Dobriyan
[not found] ` <20090605160943.GA5262-2ev+ksY9ol182hYKe6nXyg@public.gmane.org>
2009-06-05 16:48 ` Linus Torvalds
2009-06-05 17:46 ` Alexey Dobriyan
2009-06-06 7:22 ` Al Viro
2009-06-15 22:10 ` Alexey Dobriyan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090603230637.GF853@x200.localdomain \
--to=adobriyan@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=containers@lists.linux-foundation.org \
--cc=dave@linux.vnet.ibm.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=matthltc@us.ibm.com \
--cc=mingo@elte.hu \
--cc=torvalds@linux-foundation.org \
--cc=xemul@parallels.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).