From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756527AbYCKGTI (ORCPT ); Tue, 11 Mar 2008 02:19:08 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750992AbYCKGSy (ORCPT ); Tue, 11 Mar 2008 02:18:54 -0400 Received: from e1.ny.us.ibm.com ([32.97.182.141]:48627 "EHLO e1.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751107AbYCKGSx (ORCPT ); Tue, 11 Mar 2008 02:18:53 -0400 From: Balbir Singh To: Andrew Morton , Pavel Emelianov Cc: Hugh Dickins , Sudhir Kumar , YAMAMOTO Takashi , Paul Menage , lizf@cn.fujitsu.com, linux-kernel@vger.kernel.org, taka@valinux.co.jp, linux-mm@kvack.org, David Rientjes , Balbir Singh , KAMEZAWA Hiroyuki Date: Tue, 11 Mar 2008 11:48:36 +0530 Message-Id: <20080311061836.6664.5072.sendpatchset@localhost.localdomain> Subject: [PATCH] Move memory controller allocations to their own slabs (v2) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Move the memory controller data structure page_cgroup to its own slab cache. It saves space on the system, allocations are not necessarily pushed to order of 2 and should provide performance benefits. Users who disable the memory controller can also double check that the memory controller is not allocating page_cgroup's. Signed-off-by: Balbir Singh --- mm/memcontrol.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff -puN mm/memcontrol.c~memory-controller-move-to-own-slab mm/memcontrol.c --- linux-2.6.25-rc4/mm/memcontrol.c~memory-controller-move-to-own-slab 2008-03-10 23:22:34.000000000 +0530 +++ linux-2.6.25-rc4-balbir/mm/memcontrol.c 2008-03-11 10:29:00.000000000 +0530 @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -35,6 +36,7 @@ struct cgroup_subsys mem_cgroup_subsys; static const int MEM_CGROUP_RECLAIM_RETRIES = 5; +static struct kmem_cache *page_cgroup_cache; /* * Statistics for memory cgroup. @@ -560,7 +562,7 @@ retry: } unlock_page_cgroup(page); - pc = kzalloc(sizeof(struct page_cgroup), gfp_mask); + pc = kmem_cache_zalloc(page_cgroup_cache, gfp_mask); if (pc == NULL) goto err; @@ -622,7 +624,7 @@ retry: */ res_counter_uncharge(&mem->res, PAGE_SIZE); css_put(&mem->css); - kfree(pc); + kmem_cache_free(page_cgroup_cache, pc); goto retry; } page_assign_page_cgroup(page, pc); @@ -637,7 +639,7 @@ done: return 0; out: css_put(&mem->css); - kfree(pc); + kmem_cache_free(page_cgroup_cache, pc); err: return -ENOMEM; } @@ -695,7 +697,7 @@ void mem_cgroup_uncharge_page(struct pag res_counter_uncharge(&mem->res, PAGE_SIZE); css_put(&mem->css); - kfree(pc); + kmem_cache_free(page_cgroup_cache, pc); return; } @@ -1020,6 +1022,8 @@ mem_cgroup_create(struct cgroup_subsys * if (unlikely((cont->parent) == NULL)) { mem = &init_mem_cgroup; init_mm.mem_cgroup = mem; + page_cgroup_cache = KMEM_CACHE(page_cgroup, + SLAB_HWCACHE_ALIGN | SLAB_PANIC); } else mem = kzalloc(sizeof(struct mem_cgroup), GFP_KERNEL); diff -puN include/linux/memcontrol.h~memory-controller-move-to-own-slab include/linux/memcontrol.h _ -- Warm Regards, Balbir Singh Linux Technology Center IBM, ISTL