leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mm/kfence: Convert kfence_guarded_alloc() to struct slab

Browse Source 
The function sets some fields that are being moved from struct page to
struct slab so it needs to be converted.

Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
Tested-by: Marco Elver <elver@google.com>
Cc: Alexander Potapenko <glider@google.com>
Cc: Marco Elver <elver@google.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: <kasan-dev@googlegroups.com>
This commit is contained in:
Vlastimil Babka 2021-11-03 18:19:48 +01:00
parent 6e48a966df
commit 8dae0cfed5
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mm/kfence/core.c
View File

@ -360,7 +360,7 @@ static void *kfence_guarded_alloc(struct kmem_cache *cache, size_t size, gfp_t g
{ {
struct kfence_metadata *meta = NULL; struct kfence_metadata *meta = NULL;
unsigned long flags; unsigned long flags;
struct page *page; struct slab *slab;
void *addr; void *addr;
/* Try to obtain a free object. */ /* Try to obtain a free object. */
@ -424,13 +424,13 @@ static void *kfence_guarded_alloc(struct kmem_cache *cache, size_t size, gfp_t g
alloc_covered_add(alloc_stack_hash, 1); alloc_covered_add(alloc_stack_hash, 1);
/* Set required struct page fields. */ /* Set required slab fields. */
page = virt_to_page(meta->addr); slab = virt_to_slab((void *)meta->addr);
page->slab_cache = cache; slab->slab_cache = cache;
if (IS_ENABLED(CONFIG_SLUB)) if (IS_ENABLED(CONFIG_SLUB))
page->objects = 1; slab->objects = 1;
if (IS_ENABLED(CONFIG_SLAB)) if (IS_ENABLED(CONFIG_SLAB))
page->s_mem = addr; slab->s_mem = addr;
/* Memory initialization. */ /* Memory initialization. */
for_each_canary(meta, set_canary_byte); for_each_canary(meta, set_canary_byte);

6
mm/kfence/kfence_test.c
View File

@ -282,7 +282,7 @@ static void *test_alloc(struct kunit *test, size_t size, gfp_t gfp, enum allocat
alloc = kmalloc(size, gfp); alloc = kmalloc(size, gfp);
if (is_kfence_address(alloc)) { if (is_kfence_address(alloc)) {
struct page *page = virt_to_head_page(alloc); struct slab *slab = virt_to_slab(alloc);
struct kmem_cache *s = test_cache ?: struct kmem_cache *s = test_cache ?:
kmalloc_caches[kmalloc_type(GFP_KERNEL)][__kmalloc_index(size, false)]; kmalloc_caches[kmalloc_type(GFP_KERNEL)][__kmalloc_index(size, false)];
@ -291,8 +291,8 @@ static void *test_alloc(struct kunit *test, size_t size, gfp_t gfp, enum allocat
* even for KFENCE objects; these are required so that * even for KFENCE objects; these are required so that
* memcg accounting works correctly. * memcg accounting works correctly.
*/ */
KUNIT_EXPECT_EQ(test, obj_to_index(s, page_slab(page), alloc), 0U); KUNIT_EXPECT_EQ(test, obj_to_index(s, slab, alloc), 0U);
KUNIT_EXPECT_EQ(test, objs_per_slab(s, page_slab(page)), 1); KUNIT_EXPECT_EQ(test, objs_per_slab(s, slab), 1);
if (policy == ALLOCATE_ANY) if (policy == ALLOCATE_ANY)
return alloc; return alloc;