| Message ID | 20210526025625.601023-4-swboyd@chromium.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | slub: Print non-hashed pointers in slub debugging | expand |
On 5/26/21 4:56 AM, Stephen Boyd wrote: > From: Joe Perches <joe@perches.com> > > Ideally, slab_fix() would be marked with __printf and the format here > would not use \n as that's emitted by the slab_fix(). Make these > changes. > > Signed-off-by: Joe Perches <joe@perches.com> > Signed-off-by: Stephen Boyd <swboyd@chromium.org> Acked-by: Vlastimil Babka <vbabka@suse.cz> > --- > mm/slub.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/mm/slub.c b/mm/slub.c > index 6168b3ce1b3e..bf4949115412 100644 > --- a/mm/slub.c > +++ b/mm/slub.c > @@ -672,6 +672,7 @@ static void slab_bug(struct kmem_cache *s, char *fmt, ...) > va_end(args); > } > > +__printf(2, 3) > static void slab_fix(struct kmem_cache *s, char *fmt, ...) > { > struct va_format vaf; > @@ -777,7 +778,7 @@ 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) > { > - slab_fix(s, "Restoring %s 0x%p-0x%p=0x%x\n", message, from, to - 1, data); > + slab_fix(s, "Restoring %s 0x%p-0x%p=0x%x", message, from, to - 1, data); > memset(from, data, to - from); > } > > @@ -1026,13 +1027,13 @@ static int on_freelist(struct kmem_cache *s, struct page *page, void *search) > slab_err(s, page, "Wrong number of objects. Found %d but should be %d", > page->objects, max_objects); > page->objects = max_objects; > - slab_fix(s, "Number of objects adjusted."); > + slab_fix(s, "Number of objects adjusted"); > } > if (page->inuse != page->objects - nr) { > slab_err(s, page, "Wrong object count. Counter is %d but counted were %d", > page->inuse, page->objects - nr); > page->inuse = page->objects - nr; > - slab_fix(s, "Object count adjusted."); > + slab_fix(s, "Object count adjusted"); > } > return search == NULL; > } >
diff --git a/mm/slub.c b/mm/slub.c index 6168b3ce1b3e..bf4949115412 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -672,6 +672,7 @@ static void slab_bug(struct kmem_cache *s, char *fmt, ...) va_end(args); } +__printf(2, 3) static void slab_fix(struct kmem_cache *s, char *fmt, ...) { struct va_format vaf; @@ -777,7 +778,7 @@ 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) { - slab_fix(s, "Restoring %s 0x%p-0x%p=0x%x\n", message, from, to - 1, data); + slab_fix(s, "Restoring %s 0x%p-0x%p=0x%x", message, from, to - 1, data); memset(from, data, to - from); } @@ -1026,13 +1027,13 @@ static int on_freelist(struct kmem_cache *s, struct page *page, void *search) slab_err(s, page, "Wrong number of objects. Found %d but should be %d", page->objects, max_objects); page->objects = max_objects; - slab_fix(s, "Number of objects adjusted."); + slab_fix(s, "Number of objects adjusted"); } if (page->inuse != page->objects - nr) { slab_err(s, page, "Wrong object count. Counter is %d but counted were %d", page->inuse, page->objects - nr); page->inuse = page->objects - nr; - slab_fix(s, "Object count adjusted."); + slab_fix(s, "Object count adjusted"); } return search == NULL; }