[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20081127200459.GA25799@redhat.com>
Date: Thu, 27 Nov 2008 21:04:59 +0100
From: Oleg Nesterov <oleg@...hat.com>
To: Ying Han <yinghan@...gle.com>
Cc: Paul Menage <menage@...gle.com>, Ying Han <yinghan@...gle.com>,
Pekka Enberg <penberg@...helsinki.fi>,
Nick Piggin <nickpiggin@...oo.com.au>,
Hugh Dickins <hugh@...itas.com>,
Matthew Wilcox <matthew@....cx>,
David Rientjes <rientjes@...gle.com>,
Andrew Morton <akpm@...ux-foundation.org>,
linux-kernel@...r.kernel.org
Subject: Re: + make-get_user_pages-interruptible.patch added to -mm tree
Ying Han wrote:
>
> -static int sigkill_pending(struct task_struct *tsk)
> +int sigkill_pending(struct task_struct *tsk)
> {
> return sigismember(&tsk->pending.signal, SIGKILL) ||
> sigismember(&tsk->signal->shared_pending.signal, SIGKILL);
> diff -puN mm/memory.c~make-get_user_pages-interruptible mm/memory.c
> --- a/mm/memory.c~make-get_user_pages-interruptible
> +++ a/mm/memory.c
> @@ -1219,12 +1219,12 @@ int __get_user_pages(struct task_struct
> struct page *page;
>
> /*
> - * If tsk is ooming, cut off its access to large memory
> - * allocations. It has a pending SIGKILL, but it can't
> - * be processed until returning to user space.
> + * If we have a pending SIGKILL, don't keep
> + * allocating memory.
> */
> - if (unlikely(test_tsk_thread_flag(tsk, TIF_MEMDIE)))
> - return i ? i : -ENOMEM;
> + if (unlikely(sigkill_pending(current) ||
> + sigkill_pending(tsk)))
Please do not export/use sigkill_pending(). It is "private" for ptrace_stop()
(and actually should die imho).
We have fatal_signal_pending() for that.
Oleg.
--
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