Skip to content

Commit 96b94ab

Browse files
laoarpmladek
authored andcommitted
mm, slub: don't combine pr_err with INFO
It is strange to combine "pr_err" with "INFO", so let's remove the prefix completely. This patch is motivated by David's comment[1]. - before the patch [ 8846.517809] INFO: Slab 0x00000000f42a2c60 objects=33 used=3 fp=0x0000000060d32ca8 flags=0x17ffffc0010200(slab|head) - after the patch [ 6343.396602] Slab 0x000000004382e02b objects=33 used=3 fp=0x000000009ae06ffc flags=0x17ffffc0010200(slab|head) [1] https://lore.kernel.org/linux-mm/[email protected]/#t Suggested-by: Vlastimil Babka <[email protected]> Signed-off-by: Yafang Shao <[email protected]> Acked-by: Vlastimil Babka <[email protected]> Reviewed-by: Miaohe Lin <[email protected]> Reviewed-by: Andy Shevchenko <[email protected]> Reviewed-by: David Hildenbrand <[email protected]> Acked-by: David Rientjes <[email protected]> Cc: Matthew Wilcox <[email protected]> Reviewed-by: Sergey Senozhatsky <[email protected]> Signed-off-by: Petr Mladek <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 4a8ef19 commit 96b94ab

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

mm/slub.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,7 @@ static void print_track(const char *s, struct track *t, unsigned long pr_time)
615615
if (!t->addr)
616616
return;
617617

618-
pr_err("INFO: %s in %pS age=%lu cpu=%u pid=%d\n",
618+
pr_err("%s in %pS age=%lu cpu=%u pid=%d\n",
619619
s, (void *)t->addr, pr_time - t->when, t->cpu, t->pid);
620620
#ifdef CONFIG_STACKTRACE
621621
{
@@ -641,7 +641,7 @@ void print_tracking(struct kmem_cache *s, void *object)
641641

642642
static void print_page_info(struct page *page)
643643
{
644-
pr_err("INFO: Slab 0x%p objects=%u used=%u fp=0x%p flags=%#lx(%pGp)\n",
644+
pr_err("Slab 0x%p objects=%u used=%u fp=0x%p flags=%#lx(%pGp)\n",
645645
page, page->objects, page->inuse, page->freelist,
646646
page->flags, &page->flags);
647647

@@ -698,7 +698,7 @@ static void print_trailer(struct kmem_cache *s, struct page *page, u8 *p)
698698

699699
print_page_info(page);
700700

701-
pr_err("INFO: Object 0x%p @offset=%tu fp=0x%p\n\n",
701+
pr_err("Object 0x%p @offset=%tu fp=0x%p\n\n",
702702
p, p - addr, get_freepointer(s, p));
703703

704704
if (s->flags & SLAB_RED_ZONE)
@@ -791,7 +791,7 @@ static int check_bytes_and_report(struct kmem_cache *s, struct page *page,
791791
end--;
792792

793793
slab_bug(s, "%s overwritten", what);
794-
pr_err("INFO: 0x%p-0x%p @offset=%tu. First byte 0x%x instead of 0x%x\n",
794+
pr_err("0x%p-0x%p @offset=%tu. First byte 0x%x instead of 0x%x\n",
795795
fault, end - 1, fault - addr,
796796
fault[0], value);
797797
print_trailer(s, page, object);
@@ -3869,7 +3869,7 @@ static void list_slab_objects(struct kmem_cache *s, struct page *page,
38693869
for_each_object(p, s, addr, page->objects) {
38703870

38713871
if (!test_bit(__obj_to_index(s, addr, p), map)) {
3872-
pr_err("INFO: Object 0x%p @offset=%tu\n", p, p - addr);
3872+
pr_err("Object 0x%p @offset=%tu\n", p, p - addr);
38733873
print_tracking(s, p);
38743874
}
38753875
}

0 commit comments

Comments
 (0)