From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E896DC47258 for ; Fri, 1 May 2020 16:01:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D32DD24956 for ; Fri, 1 May 2020 16:01:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730042AbgEAQB4 (ORCPT ); Fri, 1 May 2020 12:01:56 -0400 Received: from fieldses.org ([173.255.197.46]:40336 "EHLO fieldses.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729625AbgEAQBy (ORCPT ); Fri, 1 May 2020 12:01:54 -0400 Received: by fieldses.org (Postfix, from userid 2815) id E6D1E4F42; Fri, 1 May 2020 12:01:53 -0400 (EDT) From: "J. Bruce Fields" To: Linus Torvalds Cc: linux-nfs@vger.kernel.org, Jeff Layton , David Howells , Tejun Heo , Shaohua Li , Oleg Nesterov , linux-kernel@vger.kernel.org, "J. Bruce Fields" Subject: [PATCH 2/4] kthreads: Simplify tsk_fork_get_node Date: Fri, 1 May 2020 12:01:50 -0400 Message-Id: <1588348912-24781-3-git-send-email-bfields@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1588348912-24781-1-git-send-email-bfields@redhat.com> References: <1588348912-24781-1-git-send-email-bfields@redhat.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "J. Bruce Fields" This will also simplify a following patch that allows multiple kthreadd's. Signed-off-by: J. Bruce Fields --- init/init_task.c | 3 +++ kernel/fork.c | 4 ++++ kernel/kthread.c | 3 +-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/init/init_task.c b/init/init_task.c index bd403ed3e418..fdd760393760 100644 --- a/init/init_task.c +++ b/init/init_task.c @@ -154,6 +154,9 @@ struct task_struct init_task .vtime.starttime = 0, .vtime.state = VTIME_SYS, #endif +#ifdef CONFIG_NUMA + .pref_node_fork = NUMA_NO_NODE, +#endif #ifdef CONFIG_NUMA_BALANCING .numa_preferred_nid = NUMA_NO_NODE, .numa_group = NULL, diff --git a/kernel/fork.c b/kernel/fork.c index 8c700f881d92..fa35890534d5 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -942,6 +942,10 @@ static struct task_struct *dup_task_struct(struct task_struct *orig, int node) tsk->fail_nth = 0; #endif +#ifdef CONFIG_NUMA + tsk->pref_node_fork = NUMA_NO_NODE; +#endif + #ifdef CONFIG_BLK_CGROUP tsk->throttle_queue = NULL; tsk->use_memdelay = 0; diff --git a/kernel/kthread.c b/kernel/kthread.c index 4217fded891a..483bee57a9c8 100644 --- a/kernel/kthread.c +++ b/kernel/kthread.c @@ -274,8 +274,7 @@ static int kthread(void *_create) int tsk_fork_get_node(struct task_struct *tsk) { #ifdef CONFIG_NUMA - if (tsk == kthreadd_task) - return tsk->pref_node_fork; + return tsk->pref_node_fork; #endif return NUMA_NO_NODE; } -- 2.26.2