From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751396AbdBWNhA (ORCPT ); Thu, 23 Feb 2017 08:37:00 -0500 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:41225 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751131AbdBWNgy (ORCPT ); Thu, 23 Feb 2017 08:36:54 -0500 From: Laurent Dufour To: Johannes Weiner , Michal Hocko , Vladimir Davydov , Balbir Singh Cc: cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/2] mm/cgroup: delay soft limit data allocation Date: Thu, 23 Feb 2017 14:36:39 +0100 X-Mailer: git-send-email 2.7.4 In-Reply-To: <1487856999-16581-1-git-send-email-ldufour@linux.vnet.ibm.com> References: <1487856999-16581-1-git-send-email-ldufour@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 17022313-0012-0000-0000-000004D3C815 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17022313-0013-0000-0000-0000175BC5DC Message-Id: <1487856999-16581-3-git-send-email-ldufour@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-02-23_10:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1612050000 definitions=main-1702230129 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Until a soft limit is set to a cgroup, the soft limit data are useless so delay this allocation when a limit is set. Suggested-by: Michal Hocko Signed-off-by: Laurent Dufour --- mm/memcontrol.c | 67 ++++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 52 insertions(+), 15 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index a9f10fde44a6..c639c898809d 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -142,7 +142,7 @@ struct mem_cgroup_tree { struct mem_cgroup_tree_per_node *rb_tree_per_node[MAX_NUMNODES]; }; -static struct mem_cgroup_tree soft_limit_tree __read_mostly; +static struct mem_cgroup_tree *soft_limit_tree __read_mostly; /* for OOM */ struct mem_cgroup_eventfd_list { @@ -381,10 +381,52 @@ mem_cgroup_page_nodeinfo(struct mem_cgroup *memcg, struct page *page) return memcg->nodeinfo[nid]; } +static bool soft_limit_initialize(void) +{ + static DEFINE_MUTEX(soft_limit_mutex); + struct mem_cgroup_tree *tree; + bool ret = true; + int node; + + mutex_lock(&soft_limit_mutex); + if (soft_limit_tree) + goto bail; + + tree = kmalloc(sizeof(*soft_limit_tree), GFP_KERNEL); + if (!tree) { + ret = false; + goto bail; + } + for_each_node(node) { + struct mem_cgroup_tree_per_node *rtpn; + + rtpn = kzalloc_node(sizeof(*rtpn), GFP_KERNEL, + node_online(node) ? node : NUMA_NO_NODE); + if (!rtpn) + goto cleanup; + + rtpn->rb_root = RB_ROOT; + spin_lock_init(&rtpn->lock); + tree->rb_tree_per_node[node] = rtpn; + } + WRITE_ONCE(soft_limit_tree, tree); +bail: + mutex_unlock(&soft_limit_mutex); + return ret; +cleanup: + for_each_node(node) + kfree(tree->rb_tree_per_node[node]); + kfree(tree); + ret = false; + goto bail; +} + static struct mem_cgroup_tree_per_node * soft_limit_tree_node(int nid) { - return soft_limit_tree.rb_tree_per_node[nid]; + if (!soft_limit_tree) + return NULL; + return soft_limit_tree->rb_tree_per_node[nid]; } static struct mem_cgroup_tree_per_node * @@ -392,7 +434,9 @@ soft_limit_tree_from_page(struct page *page) { int nid = page_to_nid(page); - return soft_limit_tree.rb_tree_per_node[nid]; + if (!soft_limit_tree) + return NULL; + return soft_limit_tree->rb_tree_per_node[nid]; } static void __mem_cgroup_insert_exceeded(struct mem_cgroup_per_node *mz, @@ -3003,6 +3047,10 @@ static ssize_t mem_cgroup_write(struct kernfs_open_file *of, } break; case RES_SOFT_LIMIT: + if (!soft_limit_initialize()) { + ret = -ENOMEM; + break; + } memcg->soft_limit = nr_pages; ret = 0; break; @@ -5777,7 +5825,7 @@ __setup("cgroup.memory=", cgroup_memory); */ static int __init mem_cgroup_init(void) { - int cpu, node; + int cpu; #ifndef CONFIG_SLOB /* @@ -5797,17 +5845,6 @@ static int __init mem_cgroup_init(void) INIT_WORK(&per_cpu_ptr(&memcg_stock, cpu)->work, drain_local_stock); - for_each_node(node) { - struct mem_cgroup_tree_per_node *rtpn; - - rtpn = kzalloc_node(sizeof(*rtpn), GFP_KERNEL, - node_online(node) ? node : NUMA_NO_NODE); - - rtpn->rb_root = RB_ROOT; - spin_lock_init(&rtpn->lock); - soft_limit_tree.rb_tree_per_node[node] = rtpn; - } - return 0; } subsys_initcall(mem_cgroup_init); -- 2.7.4 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Laurent Dufour Subject: [PATCH v2 2/2] mm/cgroup: delay soft limit data allocation Date: Thu, 23 Feb 2017 14:36:39 +0100 Message-ID: <1487856999-16581-3-git-send-email-ldufour@linux.vnet.ibm.com> References: <1487856999-16581-1-git-send-email-ldufour@linux.vnet.ibm.com> Return-path: In-Reply-To: <1487856999-16581-1-git-send-email-ldufour@linux.vnet.ibm.com> Sender: owner-linux-mm@kvack.org List-ID: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Johannes Weiner , Michal Hocko , Vladimir Davydov , Balbir Singh Cc: cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Until a soft limit is set to a cgroup, the soft limit data are useless so delay this allocation when a limit is set. Suggested-by: Michal Hocko Signed-off-by: Laurent Dufour --- mm/memcontrol.c | 67 ++++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 52 insertions(+), 15 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index a9f10fde44a6..c639c898809d 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -142,7 +142,7 @@ struct mem_cgroup_tree { struct mem_cgroup_tree_per_node *rb_tree_per_node[MAX_NUMNODES]; }; -static struct mem_cgroup_tree soft_limit_tree __read_mostly; +static struct mem_cgroup_tree *soft_limit_tree __read_mostly; /* for OOM */ struct mem_cgroup_eventfd_list { @@ -381,10 +381,52 @@ mem_cgroup_page_nodeinfo(struct mem_cgroup *memcg, struct page *page) return memcg->nodeinfo[nid]; } +static bool soft_limit_initialize(void) +{ + static DEFINE_MUTEX(soft_limit_mutex); + struct mem_cgroup_tree *tree; + bool ret = true; + int node; + + mutex_lock(&soft_limit_mutex); + if (soft_limit_tree) + goto bail; + + tree = kmalloc(sizeof(*soft_limit_tree), GFP_KERNEL); + if (!tree) { + ret = false; + goto bail; + } + for_each_node(node) { + struct mem_cgroup_tree_per_node *rtpn; + + rtpn = kzalloc_node(sizeof(*rtpn), GFP_KERNEL, + node_online(node) ? node : NUMA_NO_NODE); + if (!rtpn) + goto cleanup; + + rtpn->rb_root = RB_ROOT; + spin_lock_init(&rtpn->lock); + tree->rb_tree_per_node[node] = rtpn; + } + WRITE_ONCE(soft_limit_tree, tree); +bail: + mutex_unlock(&soft_limit_mutex); + return ret; +cleanup: + for_each_node(node) + kfree(tree->rb_tree_per_node[node]); + kfree(tree); + ret = false; + goto bail; +} + static struct mem_cgroup_tree_per_node * soft_limit_tree_node(int nid) { - return soft_limit_tree.rb_tree_per_node[nid]; + if (!soft_limit_tree) + return NULL; + return soft_limit_tree->rb_tree_per_node[nid]; } static struct mem_cgroup_tree_per_node * @@ -392,7 +434,9 @@ soft_limit_tree_from_page(struct page *page) { int nid = page_to_nid(page); - return soft_limit_tree.rb_tree_per_node[nid]; + if (!soft_limit_tree) + return NULL; + return soft_limit_tree->rb_tree_per_node[nid]; } static void __mem_cgroup_insert_exceeded(struct mem_cgroup_per_node *mz, @@ -3003,6 +3047,10 @@ static ssize_t mem_cgroup_write(struct kernfs_open_file *of, } break; case RES_SOFT_LIMIT: + if (!soft_limit_initialize()) { + ret = -ENOMEM; + break; + } memcg->soft_limit = nr_pages; ret = 0; break; @@ -5777,7 +5825,7 @@ __setup("cgroup.memory=", cgroup_memory); */ static int __init mem_cgroup_init(void) { - int cpu, node; + int cpu; #ifndef CONFIG_SLOB /* @@ -5797,17 +5845,6 @@ static int __init mem_cgroup_init(void) INIT_WORK(&per_cpu_ptr(&memcg_stock, cpu)->work, drain_local_stock); - for_each_node(node) { - struct mem_cgroup_tree_per_node *rtpn; - - rtpn = kzalloc_node(sizeof(*rtpn), GFP_KERNEL, - node_online(node) ? node : NUMA_NO_NODE); - - rtpn->rb_root = RB_ROOT; - spin_lock_init(&rtpn->lock); - soft_limit_tree.rb_tree_per_node[node] = rtpn; - } - return 0; } subsys_initcall(mem_cgroup_init); -- 2.7.4 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org