From: Joe Perches <joe@perches.com>
To: David Rientjes <rientjes@google.com>, Stephen Boyd <swboyd@chromium.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
linux-kernel@vger.kernel.org, Christoph Lameter <cl@linux.com>,
Pekka Enberg <penberg@kernel.org>,
Joonsoo Kim <iamjoonsoo.kim@lge.com>,
Vlastimil Babka <vbabka@suse.cz>,
linux-mm@kvack.org
Subject: Re: [PATCH 3/3] slub: Actually use 'message' in restore_bytes()
Date: Tue, 25 May 2021 00:37:45 -0700 [thread overview]
Message-ID: <858b8d14673a200c3c2162fb7a9bf891ecd2a2d9.camel@perches.com> (raw)
In-Reply-To: <f4da67db-a53b-a710-947d-474be7aad07@google.com>
On Sun, 2021-05-23 at 22:12 -0700, David Rientjes wrote:
> On Wed, 19 May 2021, Stephen Boyd wrote:
>
> > The message argument isn't used here. Let's pass the string to the
> > printk message so that the developer can figure out what's happening,
> > instead of guessing that a redzone is being restored, etc.
> >
> > Signed-off-by: Stephen Boyd <swboyd@chromium.org>
>
> Acked-by: David Rientjes <rientjes@google.com>
Ideally, the slab_fix function would be marked with __printf and the
format here would not use \n as that's emitted by the slab_fix.
---
mm/slub.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/mm/slub.c b/mm/slub.c
index ee51857d8e9bc..46f9b043089b6 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -702,6 +702,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;
@@ -816,7 +817,8 @@ 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%px-0x%px=0x%x\n", message, from, to - 1, data);
+ slab_fix(s, "Restoring %s 0x%px-0x%px=0x%x",
+ message, from, to - 1, data);
memset(from, data, to - from);
}
@@ -1069,13 +1071,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;
}
next prev parent reply other threads:[~2021-05-25 7:37 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-20 1:35 [PATCH 0/3] slub: Print non-hashed pointers in slub debugging Stephen Boyd
2021-05-20 1:35 ` [PATCH 1/3] lib/hexdump: Add a raw pointer printing format for " Stephen Boyd
2021-05-24 5:11 ` David Rientjes
2021-05-24 11:36 ` Petr Mladek
2021-05-20 1:35 ` [PATCH 2/3] slub: Print raw pointer addresses when debugging Stephen Boyd
2021-05-24 11:32 ` Petr Mladek
2021-05-25 6:21 ` Stephen Boyd
2021-05-20 1:35 ` [PATCH 3/3] slub: Actually use 'message' in restore_bytes() Stephen Boyd
2021-05-20 10:02 ` Vlastimil Babka
2021-05-24 5:12 ` David Rientjes
2021-05-25 7:37 ` Joe Perches [this message]
2021-05-26 2:32 ` Stephen Boyd
2021-05-26 2:38 ` Joe Perches
2021-05-20 10:01 ` [PATCH 0/3] slub: Print non-hashed pointers in slub debugging Vlastimil Babka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=858b8d14673a200c3c2162fb7a9bf891ecd2a2d9.camel@perches.com \
--to=joe@perches.com \
--cc=akpm@linux-foundation.org \
--cc=cl@linux.com \
--cc=iamjoonsoo.kim@lge.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=penberg@kernel.org \
--cc=rientjes@google.com \
--cc=swboyd@chromium.org \
--cc=vbabka@suse.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).