Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756120Ab2F1M7S (ORCPT ); Thu, 28 Jun 2012 08:59:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:1370 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755415Ab2F1M7Q (ORCPT ); Thu, 28 Jun 2012 08:59:16 -0400 From: Andrea Arcangeli To: linux-kernel@vger.kernel.org, linux-mm@kvack.org Cc: Hillf Danton , Dan Smith , Peter Zijlstra , Linus Torvalds , Andrew Morton , Thomas Gleixner , Ingo Molnar , Paul Turner , Suresh Siddha , Mike Galbraith , "Paul E. McKenney" , Lai Jiangshan , Bharata B Rao , Lee Schermerhorn , Rik van Riel , Johannes Weiner , Srivatsa Vaddagiri , Christoph Lameter , Alex Shi , Mauricio Faria de Oliveira , Konrad Rzeszutek Wilk , Don Morris , Benjamin Herrenschmidt Subject: [PATCH 19/40] autonuma: alloc/free/init sched_autonuma Date: Thu, 28 Jun 2012 14:55:59 +0200 Message-Id: <1340888180-15355-20-git-send-email-aarcange@redhat.com> In-Reply-To: <1340888180-15355-1-git-send-email-aarcange@redhat.com> References: <1340888180-15355-1-git-send-email-aarcange@redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2523 Lines: 84 This is where the dynamically allocated sched_autonuma structure is being handled. The reason for keeping this outside of the task_struct besides not using too much kernel stack, is to only allocate it on NUMA hardware. So the not NUMA hardware only pays the memory of a pointer in the kernel stack (which remains NULL at all times in that case). If the kernel is compiled with CONFIG_AUTONUMA=n, not even the pointer is allocated on the kernel stack of course. Signed-off-by: Andrea Arcangeli --- kernel/fork.c | 24 ++++++++++++++---------- 1 files changed, 14 insertions(+), 10 deletions(-) diff --git a/kernel/fork.c b/kernel/fork.c index d3c064c..0adbe09 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -206,6 +206,7 @@ static void account_kernel_stack(struct thread_info *ti, int account) void free_task(struct task_struct *tsk) { account_kernel_stack(tsk->stack, -1); + free_task_autonuma(tsk); free_thread_info(tsk->stack); rt_mutex_debug_task_free(tsk); ftrace_graph_exit_task(tsk); @@ -260,6 +261,8 @@ void __init fork_init(unsigned long mempages) /* do the arch specific task caches init */ arch_task_cache_init(); + task_autonuma_init(); + /* * The default maximum number of threads is set to a safe * value: the thread structures can take up at most half @@ -292,21 +295,21 @@ static struct task_struct *dup_task_struct(struct task_struct *orig) struct thread_info *ti; unsigned long *stackend; int node = tsk_fork_get_node(orig); - int err; tsk = alloc_task_struct_node(node); - if (!tsk) + if (unlikely(!tsk)) return NULL; ti = alloc_thread_info_node(tsk, node); - if (!ti) { - free_task_struct(tsk); - return NULL; - } + if (unlikely(!ti)) + goto out_task_struct; - err = arch_dup_task_struct(tsk, orig); - if (err) - goto out; + if (unlikely(arch_dup_task_struct(tsk, orig))) + goto out_thread_info; + + if (unlikely(alloc_task_autonuma(tsk, orig, node))) + /* free_thread_info() undoes arch_dup_task_struct() too */ + goto out_thread_info; tsk->stack = ti; @@ -334,8 +337,9 @@ static struct task_struct *dup_task_struct(struct task_struct *orig) return tsk; -out: +out_thread_info: free_thread_info(ti); +out_task_struct: free_task_struct(tsk); return NULL; } -- 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/