mm/kasan: Convert to struct slab

This should all be split up and done better.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>

diff --git a/include/linux/kasan.h b/include/linux/kasan.h
index dd874a1ee862a359473f3c0c2d3088bbd5923a15..59c860295618325dd1418eb0060fdf3b909b4ce7 100644 (file)
--- a/include/linux/kasan.h
+++ b/include/linux/kasan.h
@@ -188,11 +188,11 @@ static __always_inline size_t kasan_metadata_size(struct kmem_cache *cache)
        return 0;
 }
 
-void __kasan_poison_slab(struct page *page);
-static __always_inline void kasan_poison_slab(struct page *page)
+void __kasan_poison_slab(struct slab *slab);
+static __always_inline void kasan_poison_slab(struct slab *slab)
 {
        if (kasan_enabled())
-               __kasan_poison_slab(page);
+               __kasan_poison_slab(slab);
 }
 
 void __kasan_unpoison_object_data(struct kmem_cache *cache, void *object);
@@ -317,7 +317,7 @@ static inline void kasan_cache_create(struct kmem_cache *cache,
                                      slab_flags_t *flags) {}
 static inline void kasan_cache_create_kmalloc(struct kmem_cache *cache) {}
 static inline size_t kasan_metadata_size(struct kmem_cache *cache) { return 0; }
-static inline void kasan_poison_slab(struct page *page) {}
+static inline void kasan_poison_slab(struct slab *slab) {}
 static inline void kasan_unpoison_object_data(struct kmem_cache *cache,
                                        void *object) {}
 static inline void kasan_poison_object_data(struct kmem_cache *cache,

diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
index f81a41f9d5d15f9f519ea98d491e0982dc12e6b9..f1bfcb10f5e0b9abdb3d4c149ed751c730cbb382 100644 (file)
--- a/include/linux/slab_def.h
+++ b/include/linux/slab_def.h
@@ -87,11 +87,11 @@ struct kmem_cache {
        struct kmem_cache_node *node[MAX_NUMNODES];
 };
 
-static inline void *nearest_obj(struct kmem_cache *cache, struct page *page,
+static inline void *nearest_obj(struct kmem_cache *cache, struct slab *slab,
                                void *x)
 {
-       void *object = x - (x - page->s_mem) % cache->size;
-       void *last_object = page->s_mem + (cache->num - 1) * cache->size;
+       void *object = x - (x - slab->s_mem) % cache->size;
+       void *last_object = slab->s_mem + (cache->num - 1) * cache->size;
 
        if (unlikely(object > last_object))
                return last_object;

diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
index 994a60da2f2e2291061bd360f7af46e52b4b793a..4db01470a9e3416c82a7a3e3bbec98cfc8c33113 100644 (file)
--- a/include/linux/slub_def.h
+++ b/include/linux/slub_def.h
@@ -167,11 +167,11 @@ static inline void sysfs_slab_release(struct kmem_cache *s)
 
 void *fixup_red_left(struct kmem_cache *s, void *p);
 
-static inline void *nearest_obj(struct kmem_cache *cache, struct page *page,
+static inline void *nearest_obj(struct kmem_cache *cache, struct slab *slab,
                                void *x) {
-       void *object = x - (x - page_address(page)) % cache->size;
-       void *last_object = page_address(page) +
-               (page->objects - 1) * cache->size;
+       void *object = x - (x - slab_address(slab)) % cache->size;
+       void *last_object = slab_address(slab) +
+               (slab->objects - 1) * cache->size;
        void *result = (unlikely(object > last_object)) ? last_object : object;
 
        result = fixup_red_left(cache, result);

diff --git a/mm/kasan/common.c b/mm/kasan/common.c
index f3972af7fa1b470f4392c0743ac74842e18144dd..85774174a437b8aeac8b285ef050b36e87d54366 100644 (file)
--- a/mm/kasan/common.c
+++ b/mm/kasan/common.c
@@ -247,8 +247,9 @@ struct kasan_free_meta *kasan_get_free_meta(struct kmem_cache *cache,
 }
 #endif
 
-void __kasan_poison_slab(struct page *page)
+void __kasan_poison_slab(struct slab *slab)
 {
+       struct page *page = slab_page(slab);
        unsigned long i;
 
        for (i = 0; i < compound_nr(page); i++)
@@ -341,7 +342,7 @@ static inline bool ____kasan_slab_free(struct kmem_cache *cache, void *object,
        if (is_kfence_address(object))
                return false;
 
-       if (unlikely(nearest_obj(cache, virt_to_head_page(object), object) !=
+       if (unlikely(nearest_obj(cache, virt_to_slab(object), object) !=
            object)) {
                kasan_report_invalid_free(tagged_object, ip);
                return true;
@@ -401,9 +402,9 @@ void __kasan_kfree_large(void *ptr, unsigned long ip)
 
 void __kasan_slab_free_mempool(void *ptr, unsigned long ip)
 {
-       struct page *page;
+       struct slab *slab;
 
-       page = virt_to_head_page(ptr);
+       slab = virt_to_slab(ptr);
 
        /*
         * Even though this function is only called for kmem_cache_alloc and
@@ -411,12 +412,12 @@ void __kasan_slab_free_mempool(void *ptr, unsigned long ip)
         * !PageSlab() when the size provided to kmalloc is larger than
         * KMALLOC_MAX_SIZE, and kmalloc falls back onto page_alloc.
         */
-       if (unlikely(!PageSlab(page))) {
+       if (unlikely(!slab_test_cache(slab))) {
                if (____kasan_kfree_large(ptr, ip))
                        return;
-               kasan_poison(ptr, page_size(page), KASAN_FREE_PAGE, false);
+               kasan_poison(ptr, slab_size(slab), KASAN_FREE_PAGE, false);
        } else {
-               ____kasan_slab_free(page->slab_cache, ptr, ip, false, false);
+               ____kasan_slab_free(slab->slab_cache, ptr, ip, false, false);
        }
 }
 
@@ -560,7 +561,7 @@ void * __must_check __kasan_kmalloc_large(const void *ptr, size_t size,
 
 void * __must_check __kasan_krealloc(const void *object, size_t size, gfp_t flags)
 {
-       struct page *page;
+       struct slab *slab;
 
        if (unlikely(object == ZERO_SIZE_PTR))
                return (void *)object;
@@ -572,13 +573,13 @@ void * __must_check __kasan_krealloc(const void *object, size_t size, gfp_t flag
         */
        kasan_unpoison(object, size, false);
 
-       page = virt_to_head_page(object);
+       slab = virt_to_slab(object);
 
        /* Piggy-back on kmalloc() instrumentation to poison the redzone. */
-       if (unlikely(!PageSlab(page)))
+       if (unlikely(!slab_test_cache(slab)))
                return __kasan_kmalloc_large(object, size, flags);
        else
-               return ____kasan_kmalloc(page->slab_cache, object, size, flags);
+               return ____kasan_kmalloc(slab->slab_cache, object, size, flags);
 }
 
 bool __kasan_check_byte(const void *address, unsigned long ip)

diff --git a/mm/kasan/generic.c b/mm/kasan/generic.c
index c3f5ba7a294a8ae9c988135c24971e02c6f2660f..6153f85b90cbcfed711cd39df74b3a4971dfee72 100644 (file)
--- a/mm/kasan/generic.c
+++ b/mm/kasan/generic.c
@@ -330,16 +330,16 @@ DEFINE_ASAN_SET_SHADOW(f8);
 
 void kasan_record_aux_stack(void *addr)
 {
-       struct page *page = kasan_addr_to_page(addr);
+       struct slab *slab = kasan_addr_to_slab(addr);
        struct kmem_cache *cache;
        struct kasan_alloc_meta *alloc_meta;
        void *object;
 
-       if (is_kfence_address(addr) || !(page && PageSlab(page)))
+       if (is_kfence_address(addr) || !(slab && slab_test_cache(slab)))
                return;
 
-       cache = page->slab_cache;
-       object = nearest_obj(cache, page, addr);
+       cache = slab->slab_cache;
+       object = nearest_obj(cache, slab, addr);
        alloc_meta = kasan_get_alloc_meta(cache, object);
        if (!alloc_meta)
                return;

diff --git a/mm/kasan/kasan.h b/mm/kasan/kasan.h
index 8bf568a80eb853fbaa17856faaec6219df967ced..8f9aca95db722655ac0bb2af308885505b2b4dc7 100644 (file)
--- a/mm/kasan/kasan.h
+++ b/mm/kasan/kasan.h
@@ -249,7 +249,7 @@ bool kasan_report(unsigned long addr, size_t size,
                bool is_write, unsigned long ip);
 void kasan_report_invalid_free(void *object, unsigned long ip);
 
-struct page *kasan_addr_to_page(const void *addr);
+struct slab *kasan_addr_to_slab(const void *addr);
 
 depot_stack_handle_t kasan_save_stack(gfp_t flags);
 void kasan_set_track(struct kasan_track *track, gfp_t flags);

diff --git a/mm/kasan/quarantine.c b/mm/kasan/quarantine.c
index d8ccff4c1275ec7a7f8081141c2baee8e4798af2..587da8995f2d9b4a9ade1536411c605b37fba7ac 100644 (file)
--- a/mm/kasan/quarantine.c
+++ b/mm/kasan/quarantine.c
@@ -117,7 +117,7 @@ static unsigned long quarantine_batch_size;
 
 static struct kmem_cache *qlink_to_cache(struct qlist_node *qlink)
 {
-       return virt_to_head_page(qlink)->slab_cache;
+       return virt_to_slab(qlink)->slab_cache;
 }
 
 static void *qlink_to_object(struct qlist_node *qlink, struct kmem_cache *cache)

diff --git a/mm/kasan/report.c b/mm/kasan/report.c
index 884a950c7026588985eda97def0d7e6a8329e43b..49b58221755a632ae6a7b791f5d4bfe4845107fd 100644 (file)
--- a/mm/kasan/report.c
+++ b/mm/kasan/report.c
@@ -151,11 +151,11 @@ static void print_track(struct kasan_track *track, const char *prefix)
        }
 }
 
-struct page *kasan_addr_to_page(const void *addr)
+struct slab *kasan_addr_to_slab(const void *addr)
 {
        if ((addr >= (void *)PAGE_OFFSET) &&
                        (addr < high_memory))
-               return virt_to_head_page(addr);
+               return virt_to_slab(addr);
        return NULL;
 }
 
@@ -251,14 +251,14 @@ static inline bool init_task_stack_addr(const void *addr)
 
 static void print_address_description(void *addr, u8 tag)
 {
-       struct page *page = kasan_addr_to_page(addr);
+       struct slab *slab = kasan_addr_to_slab(addr);
 
        dump_stack_lvl(KERN_ERR);
        pr_err("\n");
 
-       if (page && PageSlab(page)) {
-               struct kmem_cache *cache = page->slab_cache;
-               void *object = nearest_obj(cache, page, addr);
+       if (slab && slab_test_cache(slab)) {
+               struct kmem_cache *cache = slab->slab_cache;
+               void *object = nearest_obj(cache, slab, addr);
 
                describe_object(cache, object, addr, tag);
        }
@@ -268,9 +268,9 @@ static void print_address_description(void *addr, u8 tag)
                pr_err(" %pS\n", addr);
        }
 
-       if (page) {
+       if (slab) {
                pr_err("The buggy address belongs to the page:\n");
-               dump_page(page, "kasan: bad access detected");
+               dump_page(slab_page(slab), "kasan: bad access detected");
        }
 
        kasan_print_address_stack_frame(addr);

diff --git a/mm/kasan/report_tags.c b/mm/kasan/report_tags.c
index 8a319fc16dab9742606c78099e774697c416bcca..16a3c55ce6986a87bacb0c12043b5f6113f2f661 100644 (file)
--- a/mm/kasan/report_tags.c
+++ b/mm/kasan/report_tags.c
@@ -12,7 +12,7 @@ const char *kasan_get_bug_type(struct kasan_access_info *info)
 #ifdef CONFIG_KASAN_TAGS_IDENTIFY
        struct kasan_alloc_meta *alloc_meta;
        struct kmem_cache *cache;
-       struct page *page;
+       struct slab *slab;
        const void *addr;
        void *object;
        u8 tag;
@@ -20,10 +20,10 @@ const char *kasan_get_bug_type(struct kasan_access_info *info)
 
        tag = get_tag(info->access_addr);
        addr = kasan_reset_tag(info->access_addr);
-       page = kasan_addr_to_page(addr);
-       if (page && PageSlab(page)) {
-               cache = page->slab_cache;
-               object = nearest_obj(cache, page, (void *)addr);
+       slab = kasan_addr_to_slab(addr);
+       if (slab && SlabAllocation(slab)) {
+               cache = slab->slab_cache;
+               object = nearest_obj(cache, slab, (void *)addr);
                alloc_meta = kasan_get_alloc_meta(cache, object);
 
                if (alloc_meta) {

diff --git a/mm/slab.c b/mm/slab.c
index 3e9cd3ecc9ab3384d0f7b0bc40486272be4ee39a..8cbb6e91922e177daebe4a53deebf280f0868fec 100644 (file)
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -2612,7 +2612,7 @@ static struct slab *cache_grow_begin(struct kmem_cache *cachep,
         * slab_address() in the latter returns a non-tagged pointer,
         * as it should be for slab pages.
         */
-       kasan_poison_slab(slab_page(slab));
+       kasan_poison_slab(slab);
 
        /* Get slab management. */
        freelist = alloc_slabmgmt(cachep, slab, offset,

diff --git a/mm/slub.c b/mm/slub.c
index 659b30afbb58a5ae2a92585445ade9f6f9fa6a40..998c1eefd205949819e17f780c99994fc71c90c9 100644 (file)
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -1918,7 +1918,7 @@ static struct slab *allocate_slab(struct kmem_cache *s, gfp_t flags, int node)
        account_slab(slab, oo_order(oo), s, flags);
 
        slab->slab_cache = s;
-       kasan_poison_slab(slab_page(slab));
+       kasan_poison_slab(slab);
 
        start = slab_address(slab);