diff options
author | Robin Holt <holt@sgi.com> | 2013-04-30 22:15:54 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-05-01 11:12:58 -0400 |
commit | d69f3bad4675ac519d41ca2b11e1c00ca115cecd (patch) | |
tree | 343d1fab484751290b2044b347372f8a8468e762 | |
parent | 41239fe82d85c135684b09f1e65622d6c1dbe8dc (diff) |
ipc: sysv shared memory limited to 8TiB
Trying to run an application which was trying to put data into half of
memory using shmget(), we found that having a shmall value below 8EiB-8TiB
would prevent us from using anything more than 8TiB. By setting
kernel.shmall greater than 8EiB-8TiB would make the job work.
In the newseg() function, ns->shm_tot which, at 8TiB is INT_MAX.
ipc/shm.c:
458 static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
459 {
...
465 int numpages = (size + PAGE_SIZE -1) >> PAGE_SHIFT;
...
474 if (ns->shm_tot + numpages > ns->shm_ctlall)
475 return -ENOSPC;
[akpm@linux-foundation.org: make ipc/shm.c:newseg()'s numpages size_t, not int]
Signed-off-by: Robin Holt <holt@sgi.com>
Reported-by: Alex Thorlton <athorlton@sgi.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | include/linux/ipc_namespace.h | 2 | ||||
-rw-r--r-- | ipc/shm.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/ipc_namespace.h b/include/linux/ipc_namespace.h index ae221a7b5092..c4d870b0d5e6 100644 --- a/include/linux/ipc_namespace.h +++ b/include/linux/ipc_namespace.h | |||
@@ -43,8 +43,8 @@ struct ipc_namespace { | |||
43 | 43 | ||
44 | size_t shm_ctlmax; | 44 | size_t shm_ctlmax; |
45 | size_t shm_ctlall; | 45 | size_t shm_ctlall; |
46 | unsigned long shm_tot; | ||
46 | int shm_ctlmni; | 47 | int shm_ctlmni; |
47 | int shm_tot; | ||
48 | /* | 48 | /* |
49 | * Defines whether IPC_RMID is forced for _all_ shm segments regardless | 49 | * Defines whether IPC_RMID is forced for _all_ shm segments regardless |
50 | * of shmctl() | 50 | * of shmctl() |
@@ -462,7 +462,7 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params) | |||
462 | size_t size = params->u.size; | 462 | size_t size = params->u.size; |
463 | int error; | 463 | int error; |
464 | struct shmid_kernel *shp; | 464 | struct shmid_kernel *shp; |
465 | int numpages = (size + PAGE_SIZE -1) >> PAGE_SHIFT; | 465 | size_t numpages = (size + PAGE_SIZE - 1) >> PAGE_SHIFT; |
466 | struct file * file; | 466 | struct file * file; |
467 | char name[13]; | 467 | char name[13]; |
468 | int id; | 468 | int id; |