Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1032822AbdD3Lcb (ORCPT ); Sun, 30 Apr 2017 07:32:31 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:34068 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S940202AbdD3LcJ (ORCPT ); Sun, 30 Apr 2017 07:32:09 -0400 From: Wei Yang To: cl@linux.com, penberg@kernel.org, rientjes@google.com, iamjoonsoo.kim@lge.com, akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Wei Yang Subject: [PATCH 2/3] mm/slub: wrap cpu_slab->partial in CONFIG_SLUB_CPU_PARTIAL Date: Sun, 30 Apr 2017 19:31:51 +0800 Message-Id: <20170430113152.6590-3-richard.weiyang@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170430113152.6590-1-richard.weiyang@gmail.com> References: <20170430113152.6590-1-richard.weiyang@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3281 Lines: 113 cpu_slab's field partial is used when CONFIG_SLUB_CPU_PARTIAL is set, which means we can save a pointer's space on each cpu for every slub item. This patch wrap cpu_slab->partial in CONFIG_SLUB_CPU_PARTIAL and wrap its sysfs too. Signed-off-by: Wei Yang --- include/linux/slub_def.h | 2 ++ mm/slub.c | 16 +++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h index ec13aab32647..0debd8df1a7d 100644 --- a/include/linux/slub_def.h +++ b/include/linux/slub_def.h @@ -41,7 +41,9 @@ struct kmem_cache_cpu { void **freelist; /* Pointer to next available object */ unsigned long tid; /* Globally unique transaction id */ struct page *page; /* The slab from which we are allocating */ +#ifdef CONFIG_SLUB_CPU_PARTIAL struct page *partial; /* Partially allocated frozen slabs */ +#endif #ifdef CONFIG_SLUB_STATS unsigned stat[NR_SLUB_STAT_ITEMS]; #endif diff --git a/mm/slub.c b/mm/slub.c index 7f4bc7027ed5..fde499b6dad8 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -2302,7 +2302,11 @@ static bool has_cpu_slab(int cpu, void *info) struct kmem_cache *s = info; struct kmem_cache_cpu *c = per_cpu_ptr(s->cpu_slab, cpu); - return c->page || c->partial; + return c->page +#ifdef CONFIG_SLUB_CPU_PARTIAL + || c->partial +#endif + ; } static void flush_all(struct kmem_cache *s) @@ -2511,7 +2515,9 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node, page = c->page; if (!page) goto new_slab; +#ifdef CONFIG_SLUB_CPU_PARTIAL redo: +#endif if (unlikely(!node_match(page, node))) { int searchnode = node; @@ -2568,6 +2574,7 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node, new_slab: +#ifdef CONFIG_SLUB_CPU_PARTIAL if (c->partial) { page = c->page = c->partial; c->partial = page->next; @@ -2575,6 +2582,7 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node, c->freelist = NULL; goto redo; } +#endif freelist = new_slab_objects(s, gfpflags, node, &c); @@ -4760,6 +4768,7 @@ static ssize_t show_slab_objects(struct kmem_cache *s, total += x; nodes[node] += x; +#ifdef CONFIG_SLUB_CPU_PARTIAL page = READ_ONCE(c->partial); if (page) { node = page_to_nid(page); @@ -4772,6 +4781,7 @@ static ssize_t show_slab_objects(struct kmem_cache *s, total += x; nodes[node] += x; } +#endif } } @@ -4980,6 +4990,7 @@ static ssize_t objects_partial_show(struct kmem_cache *s, char *buf) } SLAB_ATTR_RO(objects_partial); +#ifdef CONFIG_SLUB_CPU_PARTIAL static ssize_t slabs_cpu_partial_show(struct kmem_cache *s, char *buf) { int objects = 0; @@ -5010,6 +5021,7 @@ static ssize_t slabs_cpu_partial_show(struct kmem_cache *s, char *buf) return len + sprintf(buf + len, "\n"); } SLAB_ATTR_RO(slabs_cpu_partial); +#endif static ssize_t reclaim_account_show(struct kmem_cache *s, char *buf) { @@ -5364,7 +5376,9 @@ static struct attribute *slab_attrs[] = { &destroy_by_rcu_attr.attr, &shrink_attr.attr, &reserved_attr.attr, +#ifdef CONFIG_SLUB_CPU_PARTIAL &slabs_cpu_partial_attr.attr, +#endif #ifdef CONFIG_SLUB_DEBUG &total_objects_attr.attr, &slabs_attr.attr, -- 2.11.0