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=-17.3 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 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 81693C47082 for ; Wed, 26 May 2021 10:40:48 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 2382461453 for ; Wed, 26 May 2021 10:40:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2382461453 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id B226B6B0036; Wed, 26 May 2021 06:40:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AF7516B006E; Wed, 26 May 2021 06:40:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 9714C6B0071; Wed, 26 May 2021 06:40:47 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0153.hostedemail.com [216.40.44.153]) by kanga.kvack.org (Postfix) with ESMTP id 64B486B0036 for ; Wed, 26 May 2021 06:40:47 -0400 (EDT) Received: from smtpin18.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 055558157 for ; Wed, 26 May 2021 10:40:47 +0000 (UTC) X-FDA: 78183038934.18.8874F13 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by imf19.hostedemail.com (Postfix) with ESMTP id 753EA90009DE for ; Wed, 26 May 2021 10:40:38 +0000 (UTC) Received: from imap.suse.de (imap-alt.suse-dmz.suse.de [192.168.254.47]) by smtp-out2.suse.de (Postfix) with ESMTP id C08E91FD29; Wed, 26 May 2021 10:40:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1622025645; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bkCGM14oSutPXR2oQe/Ky///EW/gzPaRnDOrBGh+z4k=; b=l0dGOAizp1uH2nbWe1n/07Jv6BlZPm3AjVt/hoYCn2eu6hcQmaKVc7cX9QsCCcbWBxRiZs Qo0pg6obADZXGSBVQk8vACeTEn8nxu3uYChZxx/RXEE3iziXWn/ya5Q3tRXvBlGiO5BeSa gt6TfiQnRm1oj83rZHheHRaOkF3gkik= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1622025645; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bkCGM14oSutPXR2oQe/Ky///EW/gzPaRnDOrBGh+z4k=; b=05EZKRMu172ocC8cN5HU987P8mLty1KhACWfX2Ex2tHmynPqV277FfAxCHoi1VcP8dbdHY 6VUKaVREZbUmR3Bg== Received: from director2.suse.de (director2.suse-dmz.suse.de [192.168.254.72]) by imap.suse.de (Postfix) with ESMTPSA id A790D11A98; Wed, 26 May 2021 10:40:45 +0000 (UTC) Subject: Re: [PATCH v2 3/4] slub: Indicate slab_fix() uses printf formats To: Stephen Boyd , Andrew Morton Cc: Joe Perches , linux-kernel@vger.kernel.org, Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , linux-mm@kvack.org, Petr Mladek References: <20210526025625.601023-1-swboyd@chromium.org> <20210526025625.601023-4-swboyd@chromium.org> From: Vlastimil Babka Message-ID: <904b3ea3-c308-5807-4288-d6cd9109be5b@suse.cz> Date: Wed, 26 May 2021 12:40:45 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.2 MIME-Version: 1.0 In-Reply-To: <20210526025625.601023-4-swboyd@chromium.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 753EA90009DE Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=l0dGOAiz; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=05EZKRMu; dmarc=none; spf=pass (imf19.hostedemail.com: domain of vbabka@suse.cz designates 195.135.220.29 as permitted sender) smtp.mailfrom=vbabka@suse.cz X-Rspamd-Server: rspam03 X-Stat-Signature: zreim6a9iunto6nkeyzk5gcr5r3465pa X-HE-Tag: 1622025638-215665 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: On 5/26/21 4:56 AM, Stephen Boyd wrote: > From: Joe Perches > > 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 > Signed-off-by: Stephen Boyd Acked-by: Vlastimil Babka > --- > 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; > } >