mm: tiny-shmem nommu fix
PATCH 1/1 mm: tiny-shmem nommu fix
The previous patch db203d53d474aa068984e409d807628f5841da1b to fix the LOR in tiny-shmem breaks shared anonymous and IPC memory on NOMMU architectures because it was using the expanding truncate to signal ramfs to allocate a physically contiguous RAM backing the inode (otherwise it is unusable for "memory mapping" it to userspace).
However do_truncate is what caused the LOR, due to it taking i_mutex. In this case, we can actually just call ramfs directly to allocate memory for the mapping, rather than go via truncate.
---
include/linux/ramfs.h +1 -0
@@ -6,6 +6,7 @@ extern int ramfs_get_sb(struct file_syst int flags, const char *dev_name, void *data, struct vfsmount *mnt);#ifndef CONFIG_MMU +extern int ramfs_nommu_expand_for_mapping (struct inode *inode,size_t newsize); extern unsigned long ramfs_nommu_get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
mm/tiny-shmem.c +6 -0
@@ -80,6 +80,12 @@ struct file *shmem_file_setup(char *name inode->i_nlink =0 ;/* It is unlinked */ init_file (file, shm_mnt, dentry,FMODE_WRITE |FMODE_READ , &ramfs_file_operations); + +#ifndef CONFIG_MMU + error =ramfs_nommu_expand_for_mapping (inode, size); +if (error) + goto close_file; +#endif return file; close_file:
fs/ramfs/file-nommu.c +1 -1
@@ -58,7 +58,7 @@ const struct inode_operations ramfs_file* size 0 on the assumption that it's going to be used for an mmap of shared * memory */ -static int ramfs_nommu_expand_for_mapping (struct inode *inode,size_t newsize) +int ramfs_nommu_expand_for_mapping (struct inode *inode,size_t newsize) {struct pagevec lru_pvec;unsigned long npages, xpages, loop, limit;
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>