mm: introduce page_size()
Patch series "Make working with compound pages easier", v2. These three patches add three helpers and convert the appropriate places to use them. This patch (of 3): It's unnecessarily hard to find out the size of a potentially huge page. Replace 'PAGE_SIZE << compound_order(page)' with page_size(page). Link: http://lkml.kernel.org/r/20190721104612.19120-2-willy@infradead.org Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> Acked-by: Michal Hocko <mhocko@suse.com> Reviewed-by: Andrew Morton <akpm@linux-foundation.org> Reviewed-by: Ira Weiny <ira.weiny@intel.com> Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:

committed by
Linus Torvalds

parent
1f18b29669
commit
a50b854e07
@@ -338,8 +338,7 @@ void kasan_poison_slab(struct page *page)
|
||||
|
||||
for (i = 0; i < (1 << compound_order(page)); i++)
|
||||
page_kasan_tag_reset(page + i);
|
||||
kasan_poison_shadow(page_address(page),
|
||||
PAGE_SIZE << compound_order(page),
|
||||
kasan_poison_shadow(page_address(page), page_size(page),
|
||||
KASAN_KMALLOC_REDZONE);
|
||||
}
|
||||
|
||||
@@ -542,7 +541,7 @@ void * __must_check kasan_kmalloc_large(const void *ptr, size_t size,
|
||||
page = virt_to_page(ptr);
|
||||
redzone_start = round_up((unsigned long)(ptr + size),
|
||||
KASAN_SHADOW_SCALE_SIZE);
|
||||
redzone_end = (unsigned long)ptr + (PAGE_SIZE << compound_order(page));
|
||||
redzone_end = (unsigned long)ptr + page_size(page);
|
||||
|
||||
kasan_unpoison_shadow(ptr, size);
|
||||
kasan_poison_shadow((void *)redzone_start, redzone_end - redzone_start,
|
||||
@@ -578,8 +577,7 @@ void kasan_poison_kfree(void *ptr, unsigned long ip)
|
||||
kasan_report_invalid_free(ptr, ip);
|
||||
return;
|
||||
}
|
||||
kasan_poison_shadow(ptr, PAGE_SIZE << compound_order(page),
|
||||
KASAN_FREE_PAGE);
|
||||
kasan_poison_shadow(ptr, page_size(page), KASAN_FREE_PAGE);
|
||||
} else {
|
||||
__kasan_slab_free(page->slab_cache, ptr, ip, false);
|
||||
}
|
||||
|
Reference in New Issue
Block a user