Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit afa2a23f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mm: slub: panic for object and slab errors"

parents 91b92b3c 4d976899
Loading
Loading
Loading
Loading
+12 −4
Original line number Diff line number Diff line
@@ -613,11 +613,21 @@ static void print_trailer(struct kmem_cache *s, struct page *page, u8 *p)
	dump_stack();
}

#ifdef CONFIG_SLUB_DEBUG_PANIC_ON
static void slab_panic(const char *cause)
{
	panic("%s\n", cause);
}
#else
static inline void slab_panic(const char *cause) {}
#endif

static void object_err(struct kmem_cache *s, struct page *page,
			u8 *object, char *reason)
{
	slab_bug(s, "%s", reason);
	print_trailer(s, page, object);
	slab_panic(reason);
}

static void slab_err(struct kmem_cache *s, struct page *page, const char *fmt, ...)
@@ -631,6 +641,7 @@ static void slab_err(struct kmem_cache *s, struct page *page, const char *fmt, .
	slab_bug(s, "%s", buf);
	print_page_info(page);
	dump_stack();
	slab_panic("slab error");
}

static void init_object(struct kmem_cache *s, void *object, u8 val)
@@ -649,12 +660,9 @@ static void init_object(struct kmem_cache *s, void *object, u8 val)
static void restore_bytes(struct kmem_cache *s, char *message, u8 data,
						void *from, void *to)
{
#ifdef CONFIG_SLUB_DEBUG_PANIC_ON
	panic("Found corruption 0x%p-0x%p=0x%x\n", from, to - 1, data);
#else
	slab_panic("object poison overwritten");
	slab_fix(s, "Restoring 0x%p-0x%p=0x%x\n", from, to - 1, data);
	memset(from, data, to - from);
#endif
}

static int check_bytes_and_report(struct kmem_cache *s, struct page *page,