path: root/ipc/shm.c
diff options
authorDavidlohr Bueso <>2013-07-08 16:01:09 -0700
committerLinus Torvalds <>2013-07-09 10:33:26 -0700
commitdbfcd91f06f0e2d5564b2fd184e9c2a43675f9ab (patch)
treedff823ad3c61e2b199fb42c71abe81264d60e5dd /ipc/shm.c
parentc103a4dc4a32f53f095b66cd798d648c652f05b4 (diff)
ipc: move rcu lock out of ipc_addid
This patchset continues the work that began in the sysv ipc semaphore scaling series, see Just like semaphores used to be, sysv shared memory and msg queues also abuse the ipc lock, unnecessarily holding it for operations such as permission and security checks. This patchset mostly deals with mqueues, and while shared mem can be done in a very similar way, I want to get these patches out in the open first. It also does some pending cleanups, mostly focused on the two level locking we have in ipc code, taking care of ipc_addid() and ipcctl_pre_down_nolock() - yes there are still functions that need to be updated as well. This patch: Make all callers explicitly take and release the RCU read lock. This addresses the two level locking seen in newary(), newseg() and newqueue(). For the last two, explicitly unlock the ipc object and the rcu lock, instead of calling the custom shm_unlock and msg_unlock functions. The next patch will deal with the open coded locking for ->perm.lock Signed-off-by: Davidlohr Bueso <> Cc: Andi Kleen <> Cc: Rik van Riel <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
Diffstat (limited to 'ipc/shm.c')
1 files changed, 4 insertions, 1 deletions
diff --git a/ipc/shm.c b/ipc/shm.c
index 85dc001634b1..bd2b14ef1bba 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -535,6 +535,7 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
shp->shm_nattch = 0;
shp->shm_file = file;
shp->shm_creator = current;
* shmid gets reported as "inode#" in /proc/pid/maps.
* proc-ps tools use this. Changing this will break them.
@@ -543,7 +544,9 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
ns->shm_tot += numpages;
error = shp->;
- shm_unlock(shp);
+ spin_unlock(&shp->shm_perm.lock);
+ rcu_read_unlock();
return error;