All of lore.kernel.org
 help / color / mirror / Atom feed
From: Pengfei Li <lpf.vector@gmail.com>
To: akpm@linux-foundation.org
Cc: cl@linux.com, penberg@kernel.org, rientjes@google.com,
	iamjoonsoo.kim@lge.com, linux-mm@kvack.org,
	linux-kernel@vger.kernel.org, Pengfei Li <lpf.vector@gmail.com>
Subject: [PATCH 3/5] mm, slab: Remove unused kmalloc_size()
Date: Wed,  4 Sep 2019 00:04:28 +0800	[thread overview]
Message-ID: <20190903160430.1368-4-lpf.vector@gmail.com> (raw)
In-Reply-To: <20190903160430.1368-1-lpf.vector@gmail.com>

The size of kmalloc can be obtained from kmalloc_info[],
so remove kmalloc_size() that will not be used anymore.

Signed-off-by: Pengfei Li <lpf.vector@gmail.com>
---
 include/linux/slab.h | 20 --------------------
 mm/slab.c            |  5 +++--
 mm/slab_common.c     |  5 ++---
 3 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/include/linux/slab.h b/include/linux/slab.h
index 56c9c7eed34e..e773e5764b7b 100644
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
@@ -557,26 +557,6 @@ static __always_inline void *kmalloc(size_t size, gfp_t flags)
 	return __kmalloc(size, flags);
 }
 
-/*
- * Determine size used for the nth kmalloc cache.
- * return size or 0 if a kmalloc cache for that
- * size does not exist
- */
-static __always_inline unsigned int kmalloc_size(unsigned int n)
-{
-#ifndef CONFIG_SLOB
-	if (n > 2)
-		return 1U << n;
-
-	if (n == 1 && KMALLOC_MIN_SIZE <= 32)
-		return 96;
-
-	if (n == 2 && KMALLOC_MIN_SIZE <= 64)
-		return 192;
-#endif
-	return 0;
-}
-
 static __always_inline void *kmalloc_node(size_t size, gfp_t flags, int node)
 {
 #ifndef CONFIG_SLOB
diff --git a/mm/slab.c b/mm/slab.c
index c42b6211f42e..7bc4e90e1147 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -1248,8 +1248,9 @@ void __init kmem_cache_init(void)
 	 */
 	kmalloc_caches[KMALLOC_NORMAL][INDEX_NODE] = create_kmalloc_cache(
 				kmalloc_info[INDEX_NODE].name[KMALLOC_NORMAL],
-				kmalloc_size(INDEX_NODE), ARCH_KMALLOC_FLAGS,
-				0, kmalloc_size(INDEX_NODE));
+				kmalloc_info[INDEX_NODE].size,
+				ARCH_KMALLOC_FLAGS, 0,
+				kmalloc_info[INDEX_NODE].size);
 	slab_state = PARTIAL_NODE;
 	setup_kmalloc_cache_index_table();
 
diff --git a/mm/slab_common.c b/mm/slab_common.c
index 002e16673581..8b542cfcc4f2 100644
--- a/mm/slab_common.c
+++ b/mm/slab_common.c
@@ -1239,11 +1239,10 @@ void __init create_kmalloc_caches(slab_flags_t flags)
 		struct kmem_cache *s = kmalloc_caches[KMALLOC_NORMAL][i];
 
 		if (s) {
-			unsigned int size = kmalloc_size(i);
-
 			kmalloc_caches[KMALLOC_DMA][i] = create_kmalloc_cache(
 				kmalloc_info[i].name[KMALLOC_DMA],
-				size, SLAB_CACHE_DMA | flags, 0, 0);
+				kmalloc_info[i].size,
+				SLAB_CACHE_DMA | flags, 0, 0);
 		}
 	}
 #endif
-- 
2.21.0


  parent reply	other threads:[~2019-09-03 16:06 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-03 16:04 [PATCH 0/5] mm, slab: Make kmalloc_info[] contain all types of names Pengfei Li
2019-09-03 16:04 ` [PATCH 1/5] " Pengfei Li
2019-09-09 14:59   ` Vlastimil Babka
2019-09-09 16:53     ` Pengfei Li
2019-09-09 16:53       ` Pengfei Li
2019-09-09 18:30       ` Rasmus Villemoes
2019-09-09 19:48         ` Vlastimil Babka
2019-09-10  0:52         ` Pengfei Li
2019-09-10  0:52           ` Pengfei Li
2019-09-03 16:04 ` [PATCH 2/5] mm, slab_common: Remove unused kmalloc_cache_name() Pengfei Li
2019-09-09 14:59   ` Vlastimil Babka
2019-09-09 16:54     ` Pengfei Li
2019-09-09 16:54       ` Pengfei Li
2019-09-03 16:04 ` Pengfei Li [this message]
2019-09-09 15:07   ` [PATCH 3/5] mm, slab: Remove unused kmalloc_size() Vlastimil Babka
2019-09-03 16:04 ` [PATCH 4/5] mm, slab_common: Make 'type' is enum kmalloc_cache_type Pengfei Li
2019-09-09 15:08   ` Vlastimil Babka
2019-09-03 16:04 ` [PATCH 5/5] mm, slab_common: Make initializing KMALLOC_DMA start from 1 Pengfei Li
2019-09-04 19:27 ` [PATCH 0/5] mm, slab: Make kmalloc_info[] contain all types of names Christopher Lameter
2019-09-04 19:27   ` Christopher Lameter
2019-09-05  0:40   ` Pengfei Li
2019-09-05  0:40     ` Pengfei Li
2019-09-05 12:25 ` Vlastimil Babka
2019-09-05 13:51   ` Pengfei Li
2019-09-05 13:51     ` Pengfei Li

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190903160430.1368-4-lpf.vector@gmail.com \
    --to=lpf.vector@gmail.com \
    --cc=akpm@linux-foundation.org \
    --cc=cl@linux.com \
    --cc=iamjoonsoo.kim@lge.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=penberg@kernel.org \
    --cc=rientjes@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.