MIRRORS/linux-yocto
1
0
Fork 0
mirror of git://git.yoctoproject.org/linux-yocto.git synced 2025-10-22 23:13:01 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

mm, slab: cleanup slab_bug() parameters

Browse Source 
slab_err() has variadic printf arguments but instead of passing them to
slab_bug() it does vsnprintf() to a buffer and passes %s, buf.

To allow passing them directly, turn slab_bug() to __slab_bug() with a
va_list parameter, and slab_bug() a wrapper with fmt, ... parameters.
Then slab_err() can call __slab_bug() without the intermediate buffer.

Also constify fmt everywhere, which also simplifies object_err()'s
call to slab_bug().

Signed-off-by: Vlastimil Babka <vbabka@suse.cz>
Reviewed-by: Harry Yoo <harry.yoo@oracle.com>
This commit is contained in:
Vlastimil Babka 2025-02-27 16:05:46 +01:00
parent 3f6f32b14a
commit 4b183dd935
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
mm/slub.c
View File

@ -1017,12 +1017,12 @@ void skip_orig_size_check(struct kmem_cache *s, const void *object)
set_orig_size(s, (void *)object, s->object_size); set_orig_size(s, (void *)object, s->object_size);
} }
static void slab_bug(struct kmem_cache *s, char *fmt, ...) static void __slab_bug(struct kmem_cache *s, const char *fmt, va_list argsp)
{ {
struct va_format vaf; struct va_format vaf;
va_list args; va_list args;
va_start(args, fmt); va_copy(args, argsp);
vaf.fmt = fmt; vaf.fmt = fmt;
vaf.va = &args; vaf.va = &args;
pr_err("=============================================================================\n"); pr_err("=============================================================================\n");
@ -1031,8 +1031,17 @@ static void slab_bug(struct kmem_cache *s, char *fmt, ...)
va_end(args); va_end(args);
} }
static void slab_bug(struct kmem_cache *s, const char *fmt, ...)
{
va_list args;
va_start(args, fmt);
__slab_bug(s, fmt, args);
va_end(args);
}
__printf(2, 3) __printf(2, 3)
static void slab_fix(struct kmem_cache *s, char *fmt, ...) static void slab_fix(struct kmem_cache *s, const char *fmt, ...)
{ {
struct va_format vaf; struct va_format vaf;
va_list args; va_list args;
@ -1088,12 +1097,12 @@ static void print_trailer(struct kmem_cache *s, struct slab *slab, u8 *p)
} }
static void object_err(struct kmem_cache *s, struct slab *slab, static void object_err(struct kmem_cache *s, struct slab *slab,
u8 *object, char *reason) u8 *object, const char *reason)
{ {
if (slab_add_kunit_errors()) if (slab_add_kunit_errors())
return; return;
slab_bug(s, "%s", reason); slab_bug(s, reason);
print_trailer(s, slab, object); print_trailer(s, slab, object);
add_taint(TAINT_BAD_PAGE, LOCKDEP_NOW_UNRELIABLE); add_taint(TAINT_BAD_PAGE, LOCKDEP_NOW_UNRELIABLE);
@ -1129,15 +1138,14 @@ static __printf(3, 4) void slab_err(struct kmem_cache *s, struct slab *slab,
const char *fmt, ...) const char *fmt, ...)
{ {
va_list args; va_list args;
char buf[100];
if (slab_add_kunit_errors()) if (slab_add_kunit_errors())
return; return;
va_start(args, fmt); va_start(args, fmt);
vsnprintf(buf, sizeof(buf), fmt, args); __slab_bug(s, fmt, args);
va_end(args); va_end(args);
slab_bug(s, "%s", buf);
__slab_err(slab); __slab_err(slab);
} }
@ -1175,7 +1183,7 @@ static void init_object(struct kmem_cache *s, void *object, u8 val)
s->inuse - poison_size); s->inuse - poison_size);
} }
static void restore_bytes(struct kmem_cache *s, char *message, u8 data, static void restore_bytes(struct kmem_cache *s, const char *message, u8 data,
void *from, void *to) void *from, void *to)
{ {
slab_fix(s, "Restoring %s 0x%p-0x%p=0x%x", message, from, to - 1, data); slab_fix(s, "Restoring %s 0x%p-0x%p=0x%x", message, from, to - 1, data);
@ -1190,7 +1198,7 @@ static void restore_bytes(struct kmem_cache *s, char *message, u8 data,
static pad_check_attributes int static pad_check_attributes int
check_bytes_and_report(struct kmem_cache *s, struct slab *slab, check_bytes_and_report(struct kmem_cache *s, struct slab *slab,
u8 *object, char *what, u8 *start, unsigned int value, u8 *object, const char *what, u8 *start, unsigned int value,
unsigned int bytes, bool slab_obj_print) unsigned int bytes, bool slab_obj_print)
{ {
u8 *fault; u8 *fault;