slab: extract virt_to_{cache|slab}
PATCH 8/9 slab: extract virt_to_{cache|slab}
From: Pekka Enberg <[email protected]>
This patch introduces virt_to_cache() and virt_to_slab() functions to reduce duplicate code and introduce a proper abstraction should we want to support other kind of mapping for address to slab and cache (eg. for vmalloc() or I/O memory).
Acked-by Manfred Spraul <[email protected]>
Signed-off-by Pekka Enberg <[email protected]>
---
mm/slab.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-)
mm/slab.c +17 -5
@@ -594,6 +594,18 @@ static inline struct slab *page_get_slabreturn (struct slab *)page->lru.prev; } +static inline struct kmem_cache *virt_to_cache (const void *obj) +{ +struct page *page =virt_to_page (obj); +return page_get_cache (page); +} + +static inline struct slab *virt_to_slab (const void *obj) +{ +struct page *page =virt_to_page (obj); +return page_get_slab (page); +} +/* These are the default caches for kmalloc. Custom caches can have other sizes. */ struct cache_sizes malloc_sizes[] = { #define CACHE(x) { .cs_size = (x) },
@@ -1423,7 +1435,7 @@ static void check_poison_obj(kmem_cache_/* Print some data about the neighboring objects, if they * exist: */ -struct slab *slabp =page_get_slab (virt_to_page (objp)); +struct slab *slabp =virt_to_slab (objp);int objnr; objnr = (objp-slabp->s_mem)/cachep->buffer_size;
@@ -2712,7 +2724,7 @@ static void free_block(kmem_cache_t *cacvoid *objp = objpp[i];struct slab *slabp; - slabp =page_get_slab (virt_to_page (objp)); + slabp =virt_to_slab (objp); l3 = cachep->nodelists[node];list_del (&slabp->list);check_spinlock_acquired_node (cachep, node);
@@ -2814,7 +2826,7 @@ static inline void __cache_free(kmem_cac#ifdef CONFIG_NUMA {struct slab *slabp; - slabp =page_get_slab (virt_to_page (objp)); + slabp =virt_to_slab (objp);if (unlikely (slabp->nodeid !=numa_node_id ())) {struct array_cache *alien =NULL ;int nodeid = slabp->nodeid;
@@ -3089,7 +3101,7 @@ void kfree(const void *objp)return ;local_irq_save (flags);kfree_debugcheck (objp); - c =page_get_cache (virt_to_page (objp)); + c =virt_to_cache (objp);__cache_free (c, (void *)objp);local_irq_restore (flags); }
@@ -3659,7 +3671,7 @@ unsigned int ksize(const void *objp)if (unlikely (objp ==NULL ))return 0 ; -return obj_size (page_get_cache (virt_to_page (objp))); +return obj_size (virt_to_cache (objp)); }
--