[SSI] openssi/kernel/mm shmem.c,1.9,1.10
Roger Tsang <[email protected]> Fri, 05 Mar 2010 06:30:23 +0000
| Newsgroups | gmane.linux.cluster.ssic.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/ssic-linux/openssi/kernel/mm
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv9483/kernel/mm
Modified Files:
Tag: OPENSSI-FC
shmem.c
Log Message:
IPC:
- Fix partially initialized shmid_kernel_svr.shm_perm structure.
- Fix ipc/sem.c:exit_sem() GCC warning: ISO C90 forbids mixed declarations and
code.
- Split ssi_shm_setup() into separate functions ssi_shm_setup_client/new() to
reduce stack usage in some paths.
IPC (#ifdef IPC_SHM_RACE_FIX):
- Fix shm_svr_rmid() called without spinlock for the ID.
- Fix race deferencing invalid struct shmid_kernel, shmid_kernel_svr.
- Enable lockfree shmid_kernel_svr IPC id lookup. Use ipc_rcu_alloc and IPC
reference counting.
- Reduce contention. Avoid the ipc_ids mutex. Use per IPC id spinlock.
- Fix cli_ipcname_findid() race with cli_ipcname_getid() could overwrite
existing IPC segment.
- Fix non-critical section under shm_ids.sem lock in shm_create_cli_entry().
- Prevent re-acquire shm_ids.sem in shm_destroy() path. ripc_shm_rmid() no
longer returns with shm_ids.sem unlocked.
- Remove contention in shmem_svr_lookup(); no longer acquire shm_ids_svr.sem.
- Fix do_shmat() possible hang calling dput() while holding spinlock.
- Fix cfs_shm_node_mnts[] race.
- Fix inode leak in ssi_shm_setup() error path when do_shm_register() fails.
IPC (#ifdef IPC_SHM_LOCK_DEST_FIX):
- Fix [ ssic-linux-Bug 2838006 ] Corrupt SHM_LOCK_DEST flag.
- Refactor ipc_shm_nodedown() for SHM_LOCK_DEST flag. Use SHM_LOCK_DEST flag.
- Fix ripc_drop_locks() error path dereferencing NULL pointer in
ipc_drop_locks().
IPC (#ifdef CFS_IPCSHM_DENTRY):
- ssi_shm_setup_client() use d_instantiate_unique() to prevent duplicate
entries.
cluster/ssi/cfs/cfs_ipcshm.c | 422 ++++++++++++++++++-----------
cluster/ssi/cfs/cfsproc.c | 6
cluster/ssi/ipc/ipcshm_svr.c | 280 +++++++++++--------
cluster/ssi/ipc/namesvr_func.c | 12
cluster/ssi/vproc/reopen.c | 30 +-
include/cluster/ssi/cfs/cfs_fs.h | 16 +
include/cluster/ssi/ipc/shm.h | 13
include/linux/shm.h | 7
ipc/msg.c | 6
ipc/sem.c | 17 -
ipc/shm.c | 450 ++++++++++++++++++++-----------
ipc/util.c | 18 -
ipc/util.h | 5
mm/shmem.c | 9
14 files changed, 845 insertions(+), 446 deletions(-)
Index: shmem.c
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel/mm/shmem.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- shmem.c 7 Aug 2007 03:06:15 -0000 1.9
+++ shmem.c 5 Mar 2010 06:30:21 -0000 1.10
@@ -1245,7 +1245,11 @@
int retval = -ENOMEM;
#ifdef CONFIG_SSI
+#ifdef IPC_SHM_RACE_FIX
+ if ((inode = shm_svr_grab_inode(inode->i_ino)) == NULL)
+#else
if ((inode = shm_svr_get_inode(inode->i_ino)) == NULL)
+#endif
return -EINVAL;
#endif
info = SHMEM_I(inode);
@@ -1263,6 +1267,11 @@
retval = 0;
out_nomem:
spin_unlock(&info->lock);
+#ifdef CONFIG_SSI
+#ifdef IPC_SHM_RACE_FIX
+ iput(inode);
+#endif
+#endif
return retval;
}
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev