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=-16.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY 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 8FD00C4707F for ; Wed, 26 May 2021 02:32:46 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 24AF9610CE for ; Wed, 26 May 2021 02:32:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 24AF9610CE Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 36C5E6B0036; Tue, 25 May 2021 22:32:45 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2F27E6B006E; Tue, 25 May 2021 22:32:45 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D9C826B0070; Tue, 25 May 2021 22:32:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0187.hostedemail.com [216.40.44.187]) by kanga.kvack.org (Postfix) with ESMTP id 863C66B0036 for ; Tue, 25 May 2021 22:32:44 -0400 (EDT) Received: from smtpin08.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 1EF3BAC0B for ; Wed, 26 May 2021 02:32:44 +0000 (UTC) X-FDA: 78181809048.08.CEE97AD Received: from mail-ot1-f41.google.com (mail-ot1-f41.google.com [209.85.210.41]) by imf28.hostedemail.com (Postfix) with ESMTP id 7155420007FA for ; Wed, 26 May 2021 02:32:37 +0000 (UTC) Received: by mail-ot1-f41.google.com with SMTP id 66-20020a9d02c80000b02903615edf7c1aso8734015otl.13 for ; Tue, 25 May 2021 19:32:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:in-reply-to:references:from:user-agent:date:message-id :subject:to:cc; bh=dUaqe5ooj/3bNo6XBYYqy6v0GEoSXYJ7MyebHBms/88=; b=XC/DW2AYPUyj9I8HZSfeH058rejqHpdwan/4THeH/RpGxK1Bx69kpaS3bb+er4ITmE 60eQ+P4e3MGiFxa9PmyC1rhO+6h6rqWqWC5cnRCsqErG8P9Ww7fDiLXqzjR9Bpchw8dn Ops4OLyj64FLFp0yJgGW75Cc2zR2JbJiDJlSs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from :user-agent:date:message-id:subject:to:cc; bh=dUaqe5ooj/3bNo6XBYYqy6v0GEoSXYJ7MyebHBms/88=; b=gRo4ST9lyhZGXOjFEfKLDGVOc87LRbdxQY/1vNIQ3Qj5CJEUcCtX7eGH4SPBJCUwQh 7dnfB6V+LtPomaD9LLfes2HFsrDii8tM1dNa/7/v/fTS9IQCXPh1mz4yn1VwOIaTOfsx 44l49p0xeQv3JGUJ3oGK0/aepVR1BanEJcbfPEW81t6zb8NZLMZvb7pef7be70Th7tVj TdCqLZi5sLwSCag4OwIWVgoDVGsQ06vYPgwTPy9hvzrD0+sjkYRL7tXSe9cLswgtJayk DGTFAfu+YSPTjcyHEWOQUAsQrCqWNJ/MX3t9awGeQ/XVw2IRgKb9uNqgpTWejW009ipj yV8A== X-Gm-Message-State: AOAM5325oMz0UzTZzK6eML1L3fcW0gOdw1DaZOdeYBi6PjMNggfdDdF4 jokOFaT06HGY7xSRdGXwZpfRf6fSYAMkYbX/5cQTCw== X-Google-Smtp-Source: ABdhPJxMhZvFoxJ/pP3prXL1ahoqgnftmtFnXXh27NlilMrRx0x8Z6XPZSxZHABrliu0Bdku85i0jhgxpTFqlmWmkmo= X-Received: by 2002:a05:6830:1556:: with SMTP id l22mr564426otp.34.1621996363093; Tue, 25 May 2021 19:32:43 -0700 (PDT) Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Tue, 25 May 2021 22:32:42 -0400 MIME-Version: 1.0 In-Reply-To: <858b8d14673a200c3c2162fb7a9bf891ecd2a2d9.camel@perches.com> References: <20210520013539.3733631-1-swboyd@chromium.org> <20210520013539.3733631-4-swboyd@chromium.org> <858b8d14673a200c3c2162fb7a9bf891ecd2a2d9.camel@perches.com> From: Stephen Boyd User-Agent: alot/0.9.1 Date: Tue, 25 May 2021 22:32:42 -0400 Message-ID: Subject: Re: [PATCH 3/3] slub: Actually use 'message' in restore_bytes() To: David Rientjes , Joe Perches Cc: Andrew Morton , linux-kernel@vger.kernel.org, Christoph Lameter , Pekka Enberg , Joonsoo Kim , Vlastimil Babka , linux-mm@kvack.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 7155420007FA Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b="XC/DW2AY"; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf28.hostedemail.com: domain of swboyd@chromium.org designates 209.85.210.41 as permitted sender) smtp.mailfrom=swboyd@chromium.org X-Rspamd-Server: rspam03 X-Stat-Signature: n85368kzaxojn55434pcg99nmugc59f8 X-HE-Tag: 1621996357-24045 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Quoting Joe Perches (2021-05-25 00:37:45) > 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. Thanks. I can make this into a proper patch and author it from you. Can you provide a signed-off-by? The restore_bytes() hunk is slightly different but I can fix that up. > --- > 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; > } > >