From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E4208C47084 for ; Tue, 25 May 2021 07:37:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C8DD96141C for ; Tue, 25 May 2021 07:37:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231825AbhEYHjT (ORCPT ); Tue, 25 May 2021 03:39:19 -0400 Received: from smtprelay0194.hostedemail.com ([216.40.44.194]:57992 "EHLO smtprelay.hostedemail.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S231477AbhEYHjS (ORCPT ); Tue, 25 May 2021 03:39:18 -0400 Received: from omf05.hostedemail.com (clb03-v110.bra.tucows.net [216.40.38.60]) by smtprelay04.hostedemail.com (Postfix) with ESMTP id 9DCD4180A633B; Tue, 25 May 2021 07:37:48 +0000 (UTC) Received: from [HIDDEN] (Authenticated sender: joe@perches.com) by omf05.hostedemail.com (Postfix) with ESMTPA id 23C45B2795; Tue, 25 May 2021 07:37:47 +0000 (UTC) Message-ID: <858b8d14673a200c3c2162fb7a9bf891ecd2a2d9.camel@perches.com> Subject: Re: [PATCH 3/3] slub: Actually use 'message' in restore_bytes() From: Joe Perches To: David Rientjes , Stephen Boyd Cc: Andrew Morton , linux-kernel@vger.kernel.org, Christoph Lameter , Pekka Enberg , Joonsoo Kim , Vlastimil Babka , linux-mm@kvack.org Date: Tue, 25 May 2021 00:37:45 -0700 In-Reply-To: References: <20210520013539.3733631-1-swboyd@chromium.org> <20210520013539.3733631-4-swboyd@chromium.org> Content-Type: text/plain; charset="ISO-8859-1" User-Agent: Evolution 3.38.1-1 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 23C45B2795 X-Stat-Signature: hp4oszkbtk8hibi4rajk97noembbzdyk X-Rspamd-Server: rspamout03 X-Session-Marker: 6A6F6540706572636865732E636F6D X-Session-ID: U2FsdGVkX1+6A9zOxGW+KQrsg23BagpNpPgeApq3g4w= X-HE-Tag: 1621928267-381165 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > > Acked-by: David Rientjes 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; }