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

Commit 8b6f50ef authored by Jeremy Kerr's avatar Jeremy Kerr Committed by Linus Torvalds
Browse files

spufs: make signal-notification files readonly for NOSCHED contexts 



Reading from the signal{1,2} files requires a spu_acquire_saved, so make these
files write-only for contexts created with SPU_CREATE_NOSCHED.

Signed-off-by: default avatarJeremy Kerr <jk@ozlabs.org>
Acked-by: default avatarArnd Bergmann <arnd.bergmann@de.ibm.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent cfd13af6

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

+16 −2
Original line number Original line Diff line number Diff line
@@ -941,6 +941,13 @@ static const struct file_operations spufs_signal1_nosched_fops = { 
	.mmap = spufs_signal1_mmap,

	.mmap = spufs_signal1_mmap,

};

};





static const struct file_operations spufs_signal1_nosched_fops = {

	.open = spufs_signal1_open,

	.release = spufs_signal1_release,

	.write = spufs_signal1_write,

	.mmap = spufs_signal1_mmap,

};



static int spufs_signal2_open(struct inode *inode, struct file *file)

static int spufs_signal2_open(struct inode *inode, struct file *file)

{

{

	struct spufs_inode_info *i = SPUFS_I(inode);

	struct spufs_inode_info *i = SPUFS_I(inode);
@@ -1076,6 +1083,13 @@ static const struct file_operations spufs_signal2_nosched_fops = { 
	.mmap = spufs_signal2_mmap,

	.mmap = spufs_signal2_mmap,

};

};





static const struct file_operations spufs_signal2_nosched_fops = {

	.open = spufs_signal2_open,

	.release = spufs_signal2_release,

	.write = spufs_signal2_write,

	.mmap = spufs_signal2_mmap,

};



static void spufs_signal1_type_set(void *data, u64 val)

static void spufs_signal1_type_set(void *data, u64 val)

{

{

	struct spu_context *ctx = data;

	struct spu_context *ctx = data;
@@ -2177,8 +2191,8 @@ struct tree_descr spufs_dir_contents[] = { 
	{ "mbox_stat", &spufs_mbox_stat_fops, 0444, },

	{ "mbox_stat", &spufs_mbox_stat_fops, 0444, },

	{ "ibox_stat", &spufs_ibox_stat_fops, 0444, },

	{ "ibox_stat", &spufs_ibox_stat_fops, 0444, },

	{ "wbox_stat", &spufs_wbox_stat_fops, 0444, },

	{ "wbox_stat", &spufs_wbox_stat_fops, 0444, },

	{ "signal1", &spufs_signal1_fops, 0666, },

	{ "signal1", &spufs_signal1_nosched_fops, 0222, },

	{ "signal2", &spufs_signal2_fops, 0666, },

	{ "signal2", &spufs_signal2_nosched_fops, 0222, },

	{ "signal1_type", &spufs_signal1_type, 0666, },

	{ "signal1_type", &spufs_signal1_type, 0666, },

	{ "signal2_type", &spufs_signal2_type, 0666, },

	{ "signal2_type", &spufs_signal2_type, 0666, },

	{ "cntl", &spufs_cntl_fops,  0666, },

	{ "cntl", &spufs_cntl_fops,  0666, },