From: Joonsoo Kim <iamjoonsoo.kim@lge.com>
To: Pekka Enberg <penberg@kernel.org>
Cc: Christoph Lameter <cl@linux.com>,
Andrew Morton <akpm@linux-foundation.org>,
Joonsoo Kim <js1304@gmail.com>,
David Rientjes <rientjes@google.com>,
linux-mm@kvack.org, linux-kernel@vger.kernel.org,
Joonsoo Kim <iamjoonsoo.kim@lge.com>
Subject: [PATCH 04/16] slab: remove nodeid in struct slab
Date: Thu, 22 Aug 2013 17:44:13 +0900 [thread overview]
Message-ID: <1377161065-30552-5-git-send-email-iamjoonsoo.kim@lge.com> (raw)
In-Reply-To: <1377161065-30552-1-git-send-email-iamjoonsoo.kim@lge.com>
We can get nodeid using address translation, so this field is not useful.
Therefore, remove it.
Signed-off-by: Joonsoo Kim <iamjoonsoo.kim@lge.com>
diff --git a/mm/slab.c b/mm/slab.c
index d9f81a0..69dc25a 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -222,7 +222,6 @@ struct slab {
void *s_mem; /* including colour offset */
unsigned int inuse; /* num of objs active in slab */
kmem_bufctl_t free;
- unsigned short nodeid;
};
struct slab_rcu __slab_cover_slab_rcu;
};
@@ -1099,8 +1098,7 @@ static void drain_alien_cache(struct kmem_cache *cachep,
static inline int cache_free_alien(struct kmem_cache *cachep, void *objp)
{
- struct slab *slabp = virt_to_slab(objp);
- int nodeid = slabp->nodeid;
+ int nodeid = page_to_nid(virt_to_page(objp));
struct kmem_cache_node *n;
struct array_cache *alien = NULL;
int node;
@@ -1111,7 +1109,7 @@ static inline int cache_free_alien(struct kmem_cache *cachep, void *objp)
* Make sure we are not freeing a object from another node to the array
* cache on this cpu.
*/
- if (likely(slabp->nodeid == node))
+ if (likely(nodeid == node))
return 0;
n = cachep->node[node];
@@ -2624,7 +2622,6 @@ static struct slab *alloc_slabmgmt(struct kmem_cache *cachep,
}
slabp->inuse = 0;
slabp->s_mem = addr + colour_off;
- slabp->nodeid = nodeid;
slabp->free = 0;
return slabp;
}
@@ -2701,7 +2698,7 @@ static void *slab_get_obj(struct kmem_cache *cachep, struct slab *slabp,
next = slab_bufctl(slabp)[slabp->free];
#if DEBUG
slab_bufctl(slabp)[slabp->free] = BUFCTL_FREE;
- WARN_ON(slabp->nodeid != nodeid);
+ WARN_ON(page_to_nid(virt_to_page(objp)) != nodeid);
#endif
slabp->free = next;
@@ -2715,7 +2712,7 @@ static void slab_put_obj(struct kmem_cache *cachep, struct slab *slabp,
#if DEBUG
/* Verify that the slab belongs to the intended node */
- WARN_ON(slabp->nodeid != nodeid);
+ WARN_ON(page_to_nid(virt_to_page(objp)) != nodeid);
if (slab_bufctl(slabp)[objnr] + 1 <= SLAB_LIMIT + 1) {
printk(KERN_ERR "slab: double free detected in cache "
--
1.7.9.5
--
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: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2013-08-22 8:44 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-22 8:44 [PATCH 00/16] slab: overload struct slab over struct page to reduce memory usage Joonsoo Kim
2013-08-22 8:44 ` [PATCH 01/16] slab: correct pfmemalloc check Joonsoo Kim
2013-09-11 14:30 ` Christoph Lameter
2013-09-12 6:51 ` Joonsoo Kim
2013-08-22 8:44 ` [PATCH 02/16] slab: change return type of kmem_getpages() to struct page Joonsoo Kim
2013-08-22 17:49 ` Christoph Lameter
2013-08-23 6:40 ` Joonsoo Kim
2013-09-11 14:31 ` Christoph Lameter
2013-08-22 8:44 ` [PATCH 03/16] slab: remove colouroff in struct slab Joonsoo Kim
2013-09-11 14:32 ` Christoph Lameter
2013-08-22 8:44 ` Joonsoo Kim [this message]
2013-08-22 17:51 ` [PATCH 04/16] slab: remove nodeid " Christoph Lameter
2013-08-23 6:49 ` Joonsoo Kim
2013-08-22 8:44 ` [PATCH 05/16] slab: remove cachep in struct slab_rcu Joonsoo Kim
2013-08-22 17:53 ` Christoph Lameter
2013-08-23 6:53 ` Joonsoo Kim
2013-08-23 13:42 ` Christoph Lameter
2013-08-23 14:24 ` JoonSoo Kim
2013-08-23 15:41 ` Christoph Lameter
2013-08-23 16:12 ` JoonSoo Kim
2013-09-02 8:38 ` [PATCH 0/4] slab: implement byte sized indexes for the freelist of a slab Joonsoo Kim
2013-09-02 8:38 ` [PATCH 1/4] slab: factor out calculate nr objects in cache_estimate Joonsoo Kim
2013-09-02 8:38 ` [PATCH 2/4] slab: introduce helper functions to get/set free object Joonsoo Kim
2013-09-02 8:38 ` [PATCH 3/4] slab: introduce byte sized index for the freelist of a slab Joonsoo Kim
2013-09-02 8:38 ` [PATCH 4/4] slab: make more slab management structure off the slab Joonsoo Kim
2013-09-03 14:15 ` [PATCH 0/4] slab: implement byte sized indexes for the freelist of a slab Christoph Lameter
2013-09-04 8:33 ` Joonsoo Kim
2013-09-05 6:55 ` Joonsoo Kim
2013-09-05 14:33 ` Christoph Lameter
2013-09-06 5:58 ` Joonsoo Kim
2013-09-04 2:17 ` Wanpeng Li
2013-09-04 2:17 ` Wanpeng Li
[not found] ` <5226985f.4475320a.1c61.2623SMTPIN_ADDED_BROKEN@mx.google.com>
2013-09-04 8:28 ` Joonsoo Kim
2013-09-11 14:33 ` [PATCH 05/16] slab: remove cachep in struct slab_rcu Christoph Lameter
2013-08-22 8:44 ` [PATCH 06/16] slab: put forward freeing slab management object Joonsoo Kim
2013-09-11 14:35 ` Christoph Lameter
2013-08-22 8:44 ` [PATCH 07/16] slab: overloading the RCU head over the LRU for RCU free Joonsoo Kim
2013-08-27 22:06 ` Jonathan Corbet
2013-08-28 6:36 ` Joonsoo Kim
2013-09-11 14:39 ` Christoph Lameter
2013-09-12 6:55 ` Joonsoo Kim
2013-09-12 14:21 ` Christoph Lameter
2013-08-22 8:44 ` [PATCH 08/16] slab: use well-defined macro, virt_to_slab() Joonsoo Kim
2013-09-11 14:40 ` Christoph Lameter
2013-08-22 8:44 ` [PATCH 09/16] slab: use __GFP_COMP flag for allocating slab pages Joonsoo Kim
2013-08-22 18:00 ` Christoph Lameter
2013-08-23 6:55 ` Joonsoo Kim
2013-08-22 8:44 ` [PATCH 10/16] slab: change the management method of free objects of the slab Joonsoo Kim
2013-08-22 8:44 ` [PATCH 11/16] slab: remove kmem_bufctl_t Joonsoo Kim
2013-08-22 8:44 ` [PATCH 12/16] slab: remove SLAB_LIMIT Joonsoo Kim
2013-08-22 8:44 ` [PATCH 13/16] slab: replace free and inuse in struct slab with newly introduced active Joonsoo Kim
2013-08-22 8:44 ` [PATCH 14/16] slab: use struct page for slab management Joonsoo Kim
2013-08-22 8:44 ` [PATCH 15/16] slab: remove useless statement for checking pfmemalloc Joonsoo Kim
2013-08-22 8:44 ` [PATCH 16/16] slab: rename slab_bufctl to slab_freelist Joonsoo Kim
2013-08-22 16:47 ` [PATCH 00/16] slab: overload struct slab over struct page to reduce memory usage Christoph Lameter
2013-08-23 6:35 ` Joonsoo Kim
2013-09-04 3:38 ` Wanpeng Li
2013-09-04 3:38 ` Wanpeng Li
[not found] ` <5226ab2c.02092b0a.5eed.ffffd7e4SMTPIN_ADDED_BROKEN@mx.google.com>
2013-09-04 8:25 ` Joonsoo Kim
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=1377161065-30552-5-git-send-email-iamjoonsoo.kim@lge.com \
--to=iamjoonsoo.kim@lge.com \
--cc=akpm@linux-foundation.org \
--cc=cl@linux.com \
--cc=js1304@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox