[PATCH] do not limit locked memory when RLIMIT_MEMLOCK is RLIM_INFINITY

[PATCH] do not limit locked memory when RLIMIT_MEMLOCK is RLIM_INFINITY

[Herbert van den Bergh]

This patch fixes a bug in mm/mlock.c on 32-bit architectures that prevents
a user from locking more than 4GB of shared memory, or allocating more
than 4GB of shared memory in hugepages, when rlim[RLIMIT_MEMLOCK] is
set to RLIM_INFINITY.

Signed-off-by: Herbert van den Bergh <herbert.van.den.bergh@oracle.com>
Acked-by: Chris Mason <chris.mason@oracle.com>

--- linux-2.6.22-rc6/mm/mlock.c.orig    2007-06-26 15:17:22.000000000 -0700
+++ linux-2.6.22-rc6/mm/mlock.c    2007-06-28 11:18:48.000000000 -0700
@@ -244,9 +244,12 @@ int user_shm_lock(size_t size, struct us
 
     locked = (size + PAGE_SIZE - 1) >> PAGE_SHIFT;
     lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur;
+    if (lock_limit == RLIM_INFINITY)
+        allowed = 1;
     lock_limit >>= PAGE_SHIFT;
     spin_lock(&shmlock_user_lock);
-    if (locked + user->locked_shm > lock_limit && !capable(CAP_IPC_LOCK))
+    if (!allowed &&
+        locked + user->locked_shm > lock_limit && !capable(CAP_IPC_LOCK))
         goto out;
     get_uid(user);
     user->locked_shm += locked;

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

[PATCH] do not limit locked memory when RLIMIT_MEMLOCK is RLIM_INFINITY

[Herbert van den Bergh]

This patch fixes a bug in mm/mlock.c on 32-bit architectures that prevents
a user from locking more than 4GB of shared memory, or allocating more
than 4GB of shared memory in hugepages, when rlim[RLIMIT_MEMLOCK] is
set to RLIM_INFINITY.

Signed-off-by: Herbert van den Bergh <herbert.van.den.bergh@oracle.com>
Acked-by: Chris Mason <chris.mason@oracle.com>

--- linux-2.6.22/mm/mlock.c.orig    2007-07-09 10:19:31.000000000 -0700
+++ linux-2.6.22/mm/mlock.c    2007-07-09 10:19:19.000000000 -0700
@@ -244,9 +244,12 @@ int user_shm_lock(size_t size, struct us
 
     locked = (size + PAGE_SIZE - 1) >> PAGE_SHIFT;
     lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur;
+    if (lock_limit == RLIM_INFINITY)
+        allowed = 1;
     lock_limit >>= PAGE_SHIFT;
     spin_lock(&shmlock_user_lock);
-    if (locked + user->locked_shm > lock_limit && !capable(CAP_IPC_LOCK))
+    if (!allowed &&
+        locked + user->locked_shm > lock_limit && !capable(CAP_IPC_LOCK))
         goto out;
     get_uid(user);
     user->locked_shm += locked;

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

Re: [PATCH] do not limit locked memory when RLIMIT_MEMLOCK is RLIM_INFINITY

[KAMEZAWA Hiroyuki]

On Mon, 09 Jul 2007 17:26:24 -0700
Herbert van den Bergh <Herbert.van.den.Bergh@oracle.com> wrote:

> 
> This patch fixes a bug in mm/mlock.c on 32-bit architectures that prevents
> a user from locking more than 4GB of shared memory, or allocating more
> than 4GB of shared memory in hugepages, when rlim[RLIMIT_MEMLOCK] is
> set to RLIM_INFINITY.
> 
just curious...why a resouce which can be used longer than a process's
lifetime is limited by RLIMIT ?

Thanks,
-Kame


> Signed-off-by: Herbert van den Bergh <herbert.van.den.bergh@oracle.com>
> Acked-by: Chris Mason <chris.mason@oracle.com>
> 
> --- linux-2.6.22/mm/mlock.c.orig    2007-07-09 10:19:31.000000000 -0700
> +++ linux-2.6.22/mm/mlock.c    2007-07-09 10:19:19.000000000 -0700
> @@ -244,9 +244,12 @@ int user_shm_lock(size_t size, struct us
>  
>      locked = (size + PAGE_SIZE - 1) >> PAGE_SHIFT;
>      lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur;
> +    if (lock_limit == RLIM_INFINITY)
> +        allowed = 1;
>      lock_limit >>= PAGE_SHIFT;
>      spin_lock(&shmlock_user_lock);
> -    if (locked + user->locked_shm > lock_limit && !capable(CAP_IPC_LOCK))
> +    if (!allowed &&
> +        locked + user->locked_shm > lock_limit && !capable(CAP_IPC_LOCK))
>          goto out;
>      get_uid(user);
>      user->locked_shm += locked;
> 
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/
> 

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

Re: [PATCH] do not limit locked memory when RLIMIT_MEMLOCK is RLIM_INFINITY

[Randy Dunlap]

On Mon, 09 Jul 2007 17:26:24 -0700 Herbert van den Bergh wrote:

> 
> This patch fixes a bug in mm/mlock.c on 32-bit architectures that prevents
> a user from locking more than 4GB of shared memory, or allocating more
> than 4GB of shared memory in hugepages, when rlim[RLIMIT_MEMLOCK] is
> set to RLIM_INFINITY.

Something has converted tabs to spaces in your patch.
Ah, thunderbird.  Did you use an external editor plugin?

If not, did you use preformat and other instructions from
http://mbligh.org/linuxdocs/Email/Clients/Thunderbird ?

Please send a patch to yourself and make sure that you can apply
the received patch cleanly.

> Signed-off-by: Herbert van den Bergh <herbert.van.den.bergh@oracle.com>
> Acked-by: Chris Mason <chris.mason@oracle.com>
> 
> --- linux-2.6.22/mm/mlock.c.orig    2007-07-09 10:19:31.000000000 -0700
> +++ linux-2.6.22/mm/mlock.c    2007-07-09 10:19:19.000000000 -0700
> @@ -244,9 +244,12 @@ int user_shm_lock(size_t size, struct us
>  
>      locked = (size + PAGE_SIZE - 1) >> PAGE_SHIFT;
>      lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur;
> +    if (lock_limit == RLIM_INFINITY)
> +        allowed = 1;
>      lock_limit >>= PAGE_SHIFT;
>      spin_lock(&shmlock_user_lock);
> -    if (locked + user->locked_shm > lock_limit && !capable(CAP_IPC_LOCK))
> +    if (!allowed &&
> +        locked + user->locked_shm > lock_limit && !capable(CAP_IPC_LOCK))
>          goto out;
>      get_uid(user);
>      user->locked_shm += locked;

---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

[PATCH] do not limit locked memory when RLIMIT_MEMLOCK is RLIM_INFINITY

[Herbert van den Bergh]

[resending, since my previous message had tabs converted to spaces]

This patch fixes a bug in mm/mlock.c on 32-bit architectures that prevents
a user from locking more than 4GB of shared memory, or allocating more
than 4GB of shared memory in hugepages, when rlim[RLIMIT_MEMLOCK] is
set to RLIM_INFINITY.

Signed-off-by: Herbert van den Bergh <herbert.van.den.bergh@oracle.com>
Acked-by: Chris Mason <chris.mason@oracle.com>

--- linux-2.6.22/mm/mlock.c.orig	2007-07-09 10:19:31.000000000 -0700
+++ linux-2.6.22/mm/mlock.c	2007-07-09 10:19:19.000000000 -0700
@@ -244,9 +244,12 @@ int user_shm_lock(size_t size, struct us
 
 	locked = (size + PAGE_SIZE - 1) >> PAGE_SHIFT;
 	lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur;
+	if (lock_limit == RLIM_INFINITY)
+		allowed = 1;
 	lock_limit >>= PAGE_SHIFT;
 	spin_lock(&shmlock_user_lock);
-	if (locked + user->locked_shm > lock_limit && !capable(CAP_IPC_LOCK))
+	if (!allowed &&
+	    locked + user->locked_shm > lock_limit && !capable(CAP_IPC_LOCK))
 		goto out;
 	get_uid(user);
 	user->locked_shm += locked;

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

Re: [PATCH] do not limit locked memory when RLIMIT_MEMLOCK is RLIM_INFINITY

[Andrew Morton]

On Mon, 09 Jul 2007 17:59:12 -0700 Herbert van den Bergh <Herbert.van.den.Bergh@oracle.com> wrote:

> 
> [resending, since my previous message had tabs converted to spaces]
> 
> This patch fixes a bug in mm/mlock.c on 32-bit architectures that prevents
> a user from locking more than 4GB of shared memory, or allocating more
> than 4GB of shared memory in hugepages, when rlim[RLIMIT_MEMLOCK] is
> set to RLIM_INFINITY.
> 
> Signed-off-by: Herbert van den Bergh <herbert.van.den.bergh@oracle.com>
> Acked-by: Chris Mason <chris.mason@oracle.com>
> 
> --- linux-2.6.22/mm/mlock.c.orig	2007-07-09 10:19:31.000000000 -0700
> +++ linux-2.6.22/mm/mlock.c	2007-07-09 10:19:19.000000000 -0700
> @@ -244,9 +244,12 @@ int user_shm_lock(size_t size, struct us
>  
>  	locked = (size + PAGE_SIZE - 1) >> PAGE_SHIFT;
>  	lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur;
> +	if (lock_limit == RLIM_INFINITY)
> +		allowed = 1;
>  	lock_limit >>= PAGE_SHIFT;
>  	spin_lock(&shmlock_user_lock);
> -	if (locked + user->locked_shm > lock_limit && !capable(CAP_IPC_LOCK))
> +	if (!allowed &&
> +	    locked + user->locked_shm > lock_limit && !capable(CAP_IPC_LOCK))
>  		goto out;
>  	get_uid(user);
>  	user->locked_shm += locked;

OK.  Seems like a nasty bug if one happens to want to do that.  Should we
backport this into 2.6.22.x?

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

Re: [PATCH] do not limit locked memory when RLIMIT_MEMLOCK is RLIM_INFINITY

[Herbert van den Bergh]

Andrew Morton wrote:
> 
> OK.  Seems like a nasty bug if one happens to want to do that.  Should we
> backport this into 2.6.22.x?
> 

Yes, please.  Do you need me to do anything for that?

Thanks,
Herbert.

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

Re: [PATCH] do not limit locked memory when RLIMIT_MEMLOCK is RLIM_INFINITY

[Andrew Morton]

On Fri, 13 Jul 2007 08:37:50 -0700 Herbert van den Bergh <herbert.van.den.bergh@oracle.com> wrote:

> Andrew Morton wrote:
> > 
> > OK.  Seems like a nasty bug if one happens to want to do that.  Should we
> > backport this into 2.6.22.x?
> > 
> 
> Yes, please.  Do you need me to do anything for that?
> 

Nope.  I stick a "Cc: <stable@kernel.org>" into the changelog and then
magic happens: the -stable maintainers get a copy of the patch when it goes
to Linus, they get notification when I drop it after Linus merged it and
then they (hopeully) take the patch from Linus's tree.

(But the last step is a bit of a hassle - I suspect they take my emailed
version instead, but it would be super-rare for that to differ from the
version which Linus merged)

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>