|
@@ -44,9 +44,25 @@ spufs_mem_open(struct inode *inode, struct file *file)
|
|
|
{
|
|
|
struct spufs_inode_info *i = SPUFS_I(inode);
|
|
|
struct spu_context *ctx = i->i_ctx;
|
|
|
+
|
|
|
+ spin_lock(&ctx->mapping_lock);
|
|
|
file->private_data = ctx;
|
|
|
- ctx->local_store = inode->i_mapping;
|
|
|
- smp_wmb();
|
|
|
+ if (!i->i_openers++)
|
|
|
+ ctx->local_store = inode->i_mapping;
|
|
|
+ spin_unlock(&ctx->mapping_lock);
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
+static int
|
|
|
+spufs_mem_release(struct inode *inode, struct file *file)
|
|
|
+{
|
|
|
+ struct spufs_inode_info *i = SPUFS_I(inode);
|
|
|
+ struct spu_context *ctx = i->i_ctx;
|
|
|
+
|
|
|
+ spin_lock(&ctx->mapping_lock);
|
|
|
+ if (!--i->i_openers)
|
|
|
+ ctx->local_store = NULL;
|
|
|
+ spin_unlock(&ctx->mapping_lock);
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
@@ -149,6 +165,7 @@ spufs_mem_mmap(struct file *file, struct vm_area_struct *vma)
|
|
|
|
|
|
static const struct file_operations spufs_mem_fops = {
|
|
|
.open = spufs_mem_open,
|
|
|
+ .release = spufs_mem_release,
|
|
|
.read = spufs_mem_read,
|
|
|
.write = spufs_mem_write,
|
|
|
.llseek = generic_file_llseek,
|
|
@@ -238,16 +255,33 @@ static int spufs_cntl_open(struct inode *inode, struct file *file)
|
|
|
struct spufs_inode_info *i = SPUFS_I(inode);
|
|
|
struct spu_context *ctx = i->i_ctx;
|
|
|
|
|
|
+ spin_lock(&ctx->mapping_lock);
|
|
|
file->private_data = ctx;
|
|
|
- ctx->cntl = inode->i_mapping;
|
|
|
- smp_wmb();
|
|
|
+ if (!i->i_openers++)
|
|
|
+ ctx->cntl = inode->i_mapping;
|
|
|
+ spin_unlock(&ctx->mapping_lock);
|
|
|
return simple_attr_open(inode, file, spufs_cntl_get,
|
|
|
spufs_cntl_set, "0x%08lx");
|
|
|
}
|
|
|
|
|
|
+static int
|
|
|
+spufs_cntl_release(struct inode *inode, struct file *file)
|
|
|
+{
|
|
|
+ struct spufs_inode_info *i = SPUFS_I(inode);
|
|
|
+ struct spu_context *ctx = i->i_ctx;
|
|
|
+
|
|
|
+ simple_attr_close(inode, file);
|
|
|
+
|
|
|
+ spin_lock(&ctx->mapping_lock);
|
|
|
+ if (!--i->i_openers)
|
|
|
+ ctx->cntl = NULL;
|
|
|
+ spin_unlock(&ctx->mapping_lock);
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
static const struct file_operations spufs_cntl_fops = {
|
|
|
.open = spufs_cntl_open,
|
|
|
- .release = simple_attr_close,
|
|
|
+ .release = spufs_cntl_release,
|
|
|
.read = simple_attr_read,
|
|
|
.write = simple_attr_write,
|
|
|
.mmap = spufs_cntl_mmap,
|
|
@@ -723,12 +757,28 @@ static int spufs_signal1_open(struct inode *inode, struct file *file)
|
|
|
{
|
|
|
struct spufs_inode_info *i = SPUFS_I(inode);
|
|
|
struct spu_context *ctx = i->i_ctx;
|
|
|
+
|
|
|
+ spin_lock(&ctx->mapping_lock);
|
|
|
file->private_data = ctx;
|
|
|
- ctx->signal1 = inode->i_mapping;
|
|
|
- smp_wmb();
|
|
|
+ if (!i->i_openers++)
|
|
|
+ ctx->signal1 = inode->i_mapping;
|
|
|
+ spin_unlock(&ctx->mapping_lock);
|
|
|
return nonseekable_open(inode, file);
|
|
|
}
|
|
|
|
|
|
+static int
|
|
|
+spufs_signal1_release(struct inode *inode, struct file *file)
|
|
|
+{
|
|
|
+ struct spufs_inode_info *i = SPUFS_I(inode);
|
|
|
+ struct spu_context *ctx = i->i_ctx;
|
|
|
+
|
|
|
+ spin_lock(&ctx->mapping_lock);
|
|
|
+ if (!--i->i_openers)
|
|
|
+ ctx->signal1 = NULL;
|
|
|
+ spin_unlock(&ctx->mapping_lock);
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
static ssize_t __spufs_signal1_read(struct spu_context *ctx, char __user *buf,
|
|
|
size_t len, loff_t *pos)
|
|
|
{
|
|
@@ -821,6 +871,7 @@ static int spufs_signal1_mmap(struct file *file, struct vm_area_struct *vma)
|
|
|
|
|
|
static const struct file_operations spufs_signal1_fops = {
|
|
|
.open = spufs_signal1_open,
|
|
|
+ .release = spufs_signal1_release,
|
|
|
.read = spufs_signal1_read,
|
|
|
.write = spufs_signal1_write,
|
|
|
.mmap = spufs_signal1_mmap,
|
|
@@ -830,12 +881,28 @@ static int spufs_signal2_open(struct inode *inode, struct file *file)
|
|
|
{
|
|
|
struct spufs_inode_info *i = SPUFS_I(inode);
|
|
|
struct spu_context *ctx = i->i_ctx;
|
|
|
+
|
|
|
+ spin_lock(&ctx->mapping_lock);
|
|
|
file->private_data = ctx;
|
|
|
- ctx->signal2 = inode->i_mapping;
|
|
|
- smp_wmb();
|
|
|
+ if (!i->i_openers++)
|
|
|
+ ctx->signal2 = inode->i_mapping;
|
|
|
+ spin_unlock(&ctx->mapping_lock);
|
|
|
return nonseekable_open(inode, file);
|
|
|
}
|
|
|
|
|
|
+static int
|
|
|
+spufs_signal2_release(struct inode *inode, struct file *file)
|
|
|
+{
|
|
|
+ struct spufs_inode_info *i = SPUFS_I(inode);
|
|
|
+ struct spu_context *ctx = i->i_ctx;
|
|
|
+
|
|
|
+ spin_lock(&ctx->mapping_lock);
|
|
|
+ if (!--i->i_openers)
|
|
|
+ ctx->signal2 = NULL;
|
|
|
+ spin_unlock(&ctx->mapping_lock);
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
static ssize_t __spufs_signal2_read(struct spu_context *ctx, char __user *buf,
|
|
|
size_t len, loff_t *pos)
|
|
|
{
|
|
@@ -932,6 +999,7 @@ static int spufs_signal2_mmap(struct file *file, struct vm_area_struct *vma)
|
|
|
|
|
|
static const struct file_operations spufs_signal2_fops = {
|
|
|
.open = spufs_signal2_open,
|
|
|
+ .release = spufs_signal2_release,
|
|
|
.read = spufs_signal2_read,
|
|
|
.write = spufs_signal2_write,
|
|
|
.mmap = spufs_signal2_mmap,
|
|
@@ -1031,13 +1099,30 @@ static int spufs_mss_open(struct inode *inode, struct file *file)
|
|
|
struct spu_context *ctx = i->i_ctx;
|
|
|
|
|
|
file->private_data = i->i_ctx;
|
|
|
- ctx->mss = inode->i_mapping;
|
|
|
- smp_wmb();
|
|
|
+
|
|
|
+ spin_lock(&ctx->mapping_lock);
|
|
|
+ if (!i->i_openers++)
|
|
|
+ ctx->mss = inode->i_mapping;
|
|
|
+ spin_unlock(&ctx->mapping_lock);
|
|
|
return nonseekable_open(inode, file);
|
|
|
}
|
|
|
|
|
|
+static int
|
|
|
+spufs_mss_release(struct inode *inode, struct file *file)
|
|
|
+{
|
|
|
+ struct spufs_inode_info *i = SPUFS_I(inode);
|
|
|
+ struct spu_context *ctx = i->i_ctx;
|
|
|
+
|
|
|
+ spin_lock(&ctx->mapping_lock);
|
|
|
+ if (!--i->i_openers)
|
|
|
+ ctx->mss = NULL;
|
|
|
+ spin_unlock(&ctx->mapping_lock);
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
static const struct file_operations spufs_mss_fops = {
|
|
|
.open = spufs_mss_open,
|
|
|
+ .release = spufs_mss_release,
|
|
|
.mmap = spufs_mss_mmap,
|
|
|
};
|
|
|
|
|
@@ -1072,14 +1157,30 @@ static int spufs_psmap_open(struct inode *inode, struct file *file)
|
|
|
struct spufs_inode_info *i = SPUFS_I(inode);
|
|
|
struct spu_context *ctx = i->i_ctx;
|
|
|
|
|
|
+ spin_lock(&ctx->mapping_lock);
|
|
|
file->private_data = i->i_ctx;
|
|
|
- ctx->psmap = inode->i_mapping;
|
|
|
- smp_wmb();
|
|
|
+ if (!i->i_openers++)
|
|
|
+ ctx->psmap = inode->i_mapping;
|
|
|
+ spin_unlock(&ctx->mapping_lock);
|
|
|
return nonseekable_open(inode, file);
|
|
|
}
|
|
|
|
|
|
+static int
|
|
|
+spufs_psmap_release(struct inode *inode, struct file *file)
|
|
|
+{
|
|
|
+ struct spufs_inode_info *i = SPUFS_I(inode);
|
|
|
+ struct spu_context *ctx = i->i_ctx;
|
|
|
+
|
|
|
+ spin_lock(&ctx->mapping_lock);
|
|
|
+ if (!--i->i_openers)
|
|
|
+ ctx->psmap = NULL;
|
|
|
+ spin_unlock(&ctx->mapping_lock);
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
static const struct file_operations spufs_psmap_fops = {
|
|
|
.open = spufs_psmap_open,
|
|
|
+ .release = spufs_psmap_release,
|
|
|
.mmap = spufs_psmap_mmap,
|
|
|
};
|
|
|
|
|
@@ -1126,12 +1227,27 @@ static int spufs_mfc_open(struct inode *inode, struct file *file)
|
|
|
if (atomic_read(&inode->i_count) != 1)
|
|
|
return -EBUSY;
|
|
|
|
|
|
+ spin_lock(&ctx->mapping_lock);
|
|
|
file->private_data = ctx;
|
|
|
- ctx->mfc = inode->i_mapping;
|
|
|
- smp_wmb();
|
|
|
+ if (!i->i_openers++)
|
|
|
+ ctx->mfc = inode->i_mapping;
|
|
|
+ spin_unlock(&ctx->mapping_lock);
|
|
|
return nonseekable_open(inode, file);
|
|
|
}
|
|
|
|
|
|
+static int
|
|
|
+spufs_mfc_release(struct inode *inode, struct file *file)
|
|
|
+{
|
|
|
+ struct spufs_inode_info *i = SPUFS_I(inode);
|
|
|
+ struct spu_context *ctx = i->i_ctx;
|
|
|
+
|
|
|
+ spin_lock(&ctx->mapping_lock);
|
|
|
+ if (!--i->i_openers)
|
|
|
+ ctx->mfc = NULL;
|
|
|
+ spin_unlock(&ctx->mapping_lock);
|
|
|
+ return 0;
|
|
|
+}
|
|
|
+
|
|
|
/* interrupt-level mfc callback function. */
|
|
|
void spufs_mfc_callback(struct spu *spu)
|
|
|
{
|
|
@@ -1313,7 +1429,10 @@ static ssize_t spufs_mfc_write(struct file *file, const char __user *buffer,
|
|
|
if (ret)
|
|
|
goto out;
|
|
|
|
|
|
- spu_acquire_runnable(ctx, 0);
|
|
|
+ ret = spu_acquire_runnable(ctx, 0);
|
|
|
+ if (ret)
|
|
|
+ goto out;
|
|
|
+
|
|
|
if (file->f_flags & O_NONBLOCK) {
|
|
|
ret = ctx->ops->send_mfc_command(ctx, &cmd);
|
|
|
} else {
|
|
@@ -1399,6 +1518,7 @@ static int spufs_mfc_fasync(int fd, struct file *file, int on)
|
|
|
|
|
|
static const struct file_operations spufs_mfc_fops = {
|
|
|
.open = spufs_mfc_open,
|
|
|
+ .release = spufs_mfc_release,
|
|
|
.read = spufs_mfc_read,
|
|
|
.write = spufs_mfc_write,
|
|
|
.poll = spufs_mfc_poll,
|