| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Mon, 24 Aug 2009 11:23:21 +0900
From: Minchan Kim <minchan.kim@...il.com>
To: KAMEZAWA Hiroyuki <kamezawa.hiroyu@...fujitsu.com>
Cc: Hiroaki Wakabayashi <primulaelatior@...il.com>,
Andrew Morton <akpm@...ux-foundation.org>,
LKML <linux-kernel@...r.kernel.org>, linux-mm@...ck.org,
Paul Menage <menage@...gle.com>, Ying Han <yinghan@...gle.com>,
KOSAKI Motohiro <kosaki.motohiro@...fujitsu.com>,
Pekka Enberg <penberg@...helsinki.fi>,
Lee Schermerhorn <lee.schermerhorn@...com>
Subject: Re: [PATCH] mm: make munlock fast when mlock is canceled by sigkill
On Mon, Aug 24, 2009 at 10:51 AM, KAMEZAWA
Hiroyuki<kamezawa.hiroyu@...fujitsu.com> wrote:
> On Mon, 24 Aug 2009 10:44:41 +0900
> Minchan Kim <minchan.kim@...il.com> wrote:
>
>> On Sun, Aug 23, 2009 at 1:54 AM, Hiroaki
>> Wakabayashi<primulaelatior@...il.com> wrote:
>> > From 27b2fde0222c59049026e7d0bdc4a2a68d0720f5 Mon Sep 17 00:00:00 2001
>> > From: Hiroaki Wakabayashi <primulaelatior@...il.com>
>> > Date: Sat, 22 Aug 2009 19:14:53 +0900
>> > Subject: [PATCH] mm: make munlock fast when mlock is canceled by sigkill
>> >
>> > This patch is for making commit 4779280d1e (mm: make get_user_pages()
>> > interruptible) complete.
>> >
>> > At first, munlock() assumes that all pages in vma are pinned,
>> >
>> > Now, by the commit, mlock() can be interrupted by SIGKILL, etc So, part of
>> > pages are not pinned.
>> > If SIGKILL, In exit() path, munlock is called for unlocking pinned pages
>> > in vma.
>> >
>> > But, there, get_user_pages(write) is used for munlock(). Then, pages are
>> > allocated via page-fault for exsiting process !!! This is problem at canceling
>> > big mlock.
>> > This patch tries to avoid allocating new pages at munlock().
>> >
>> > mlock( big area )
>> > <===== sig kill
>> > do_exit()
>> > ->mmput()
>> > -> do_munlock()
>> > -> get_user_pages()
>> > <allocate *never used* memory>
>> > ->.....freeing allocated memory.
>> >
>> > * Test program
>> > % cat run.sh
>> > #!/bin/sh
>> >
>> > ./mlock_test 2000000000 &
>> > sleep 2
>> > kill -9 $!
>> > wait
>> >
>> > % cat mlock_test.c
>> > #include <stdio.h>
>> > #include <stdlib.h>
>> > #include <string.h>
>> > #include <sys/mman.h>
>> > #include <sys/types.h>
>> > #include <sys/stat.h>
>> > #include <fcntl.h>
>> > #include <errno.h>
>> > #include <time.h>
>> > #include <unistd.h>
>> > #include <sys/time.h>
>> >
>> > int main(int argc, char **argv)
>> > {
>> > size_t length = 50 * 1024 * 1024;
>> > void *addr;
>> > time_t timer;
>> >
>> > if (argc >= 2)
>> > length = strtoul(argv[1], NULL, 10);
>> > printf("PID = %d\n", getpid());
>> > addr = mmap(NULL, length, PROT_READ | PROT_WRITE,
>> > MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
>> > if (addr == MAP_FAILED) {
>> > fprintf(stderr, "mmap failed: %s, length=%lu\n",
>> > strerror(errno), length);
>> > exit(EXIT_FAILURE);
>> > }
>> > printf("try mlock length=%lu\n", length);
>> > timer = time(NULL);
>> > if (mlock(addr, length) < 0) {
>> > fprintf(stderr, "mlock failed: %s, time=%lu[sec]\n",
>> > strerror(errno), time(NULL) - timer);
>> > exit(EXIT_FAILURE);
>> > }
>> > printf("mlock succeed, time=%lu[sec]\n\n", time(NULL) - timer);
>> > printf("try munlock length=%lu\n", length);
>> > timer = time(NULL);
>> > if (munlock(addr, length) < 0) {
>> > fprintf(stderr, "munlock failed: %s, time=%lu[sec]\n",
>> > strerror(errno), time(NULL)-timer);
>> > exit(EXIT_FAILURE);
>> > }
>> > printf("munlock succeed, time=%lu[sec]\n\n", time(NULL) - timer);
>> > if (munmap(addr, length) < 0) {
>> > fprintf(stderr, "munmap failed: %s\n", strerror(errno));
>> > exit(EXIT_FAILURE);
>> > }
>> > return 0;
>> > }
>> >
>> > * Executed Result
>> > -- Original executed result
>> > % time ./run.sh
>> >
>> > PID = 2678
>> > try mlock length=2000000000
>> > ./run.sh: line 6: 2678 Killed ./mlock_test 2000000000
>> > ./run.sh 0.00s user 2.59s system 13% cpu 18.781 total
>> > %
>> >
>> > -- After applied this patch
>> > % time ./run.sh
>> >
>> > PID = 2512
>> > try mlock length=2000000000
>> > ./run.sh: line 6: 2512 Killed ./mlock_test 2000000000
>> > ./run.sh 0.00s user 1.15s system 45% cpu 2.507 total
>> > %
>> >
>> > Signed-off-by: Hiroaki Wakabayashi <primulaelatior@...il.com>
>> > ---
>> > mm/internal.h | 1 +
>> > mm/memory.c | 9 +++++++--
>> > mm/mlock.c | 35 +++++++++++++++++++----------------
>> > 3 files changed, 27 insertions(+), 18 deletions(-)
>> >
>> > diff --git a/mm/internal.h b/mm/internal.h
>> > index f290c4d..4ab5b24 100644
>> > --- a/mm/internal.h
>> > +++ b/mm/internal.h
>> > @@ -254,6 +254,7 @@ static inline void
>> > mminit_validate_memmodel_limits(unsigned long *start_pfn,
>> > #define GUP_FLAGS_FORCE 0x2
>> > #define GUP_FLAGS_IGNORE_VMA_PERMISSIONS 0x4
>> > #define GUP_FLAGS_IGNORE_SIGKILL 0x8
>> > +#define GUP_FLAGS_ALLOW_NULL 0x10
>> >
>>
>> I am worried about adding new flag whenever we need it.
>> But I think this case makes sense to me.
>> In addition, I guess ZERO page can also use this flag.
>>
>> Kame. What do you think about it?
>>
> I do welcome this !
> Then, I don't have to take care of mlock/munlock in ZERO_PAGE patch.
>
> And without this patch, munlock() does copy-on-write just for unpinning memory.
> So, this patch shows some right direction, I think.
>
> One concern is flag name, ALLOW_NULL sounds not very good.
>
> GUP_FLAGS_NOFAULT ?
>
> I wonder we can remove a hack of FOLL_ANON for core-dump by this flag, too.
That's a good point.
It can remove little cache footprint and
unnecessary calls[flush_xxx_page in GUP].
--
Kind regards,
Minchan Kim
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists