From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752942AbbIQCpV (ORCPT ); Wed, 16 Sep 2015 22:45:21 -0400 Received: from m50-111.126.com ([123.125.50.111]:51106 "EHLO m50-111.126.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751708AbbIQCpU (ORCPT ); Wed, 16 Sep 2015 22:45:20 -0400 From: Xunlei Pang To: linux-kernel@vger.kernel.org, Tejun Heo , Lai Jiangshan Cc: Xunlei Pang Subject: [PATCH] workqueue: Free useless memory when disabling NUMA in wq_numa_init() Date: Thu, 17 Sep 2015 10:43:55 +0800 Message-Id: <1442457835-24238-1-git-send-email-xlpang@126.com> X-Mailer: git-send-email 1.9.1 X-CM-TRANSID: jtKowAAHB8ErKfpVjhSHAg--.52139S3 X-Coremail-Antispam: 1Uf129KBjvdXoW7Gw13GFW7ZrWfCr1xGryrtFb_yoWfurX_Gr 93Wrn5KrWDK3W093yjkF4YqryfGr48WFnaka18KayayFyDGw45trZ7AFyrWrs8W3yDGr9x Zw1jgw18WwnxJjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUetfHUUUUUU== X-Originating-IP: [210.21.223.3] X-CM-SenderInfo: p0ost0bj6rjloofrz/1tbiXBN4v1R0YoalbgAAsH Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Xunlei Pang wq_update_unbound_numa_attrs_buf and tbl will never be used in case of invalid NUMA node mapping, so just free them. Signed-off-by: Xunlei Pang --- kernel/workqueue.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/kernel/workqueue.c b/kernel/workqueue.c index ca71582..22d7747 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c @@ -5197,6 +5197,13 @@ static void __init wq_numa_init(void) node = cpu_to_node(cpu); if (WARN_ON(node == NUMA_NO_NODE)) { pr_warn("workqueue: NUMA node mapping not available for cpu%d, disabling NUMA support\n", cpu); + + for_each_node(node) + free_cpumask_var(tbl[node]); + kfree(tbl); + + free_workqueue_attrs(wq_update_unbound_numa_attrs_buf); + wq_update_unbound_numa_attrs_buf = NULL; /* happens iff arch is bonkers, let's just proceed */ return; } -- 1.9.1