From patchwork Tue Jun 1 18:22:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 12292061 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.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT 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 D19CEC47093 for ; Tue, 1 Jun 2021 18:22:12 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 81647613D1 for ; Tue, 1 Jun 2021 18:22:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 81647613D1 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 AD85C6B0071; Tue, 1 Jun 2021 14:22:10 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id AB1126B0072; Tue, 1 Jun 2021 14:22:10 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 977606B0073; Tue, 1 Jun 2021 14:22:10 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0058.hostedemail.com [216.40.44.58]) by kanga.kvack.org (Postfix) with ESMTP id 678C76B0071 for ; Tue, 1 Jun 2021 14:22:10 -0400 (EDT) Received: from smtpin13.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id EF5651808A9C2 for ; Tue, 1 Jun 2021 18:22:09 +0000 (UTC) X-FDA: 78205974378.13.0A9C877 Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by imf18.hostedemail.com (Postfix) with ESMTP id 3598C20010A8 for ; Tue, 1 Jun 2021 18:21:58 +0000 (UTC) Received: by mail-pf1-f169.google.com with SMTP id x18so139794pfi.9 for ; Tue, 01 Jun 2021 11:22:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+4kopGrPpDmNYqodYUvkjETu0gKLYPPcKDiSzcCSolk=; b=FdH1YFBnQgCff+7rGQ6EQDjWOQlazi5AGW5irmxbWACfjKF3jf3HzEcxIWIK/D69An 71EwfeSug2avMa2n9ao3JFsMQkXHL4Eg3EVtoSxKvCxhgjCY1PS0YKWV9Cq1shXJqsb1 g9ZkXirTMKZlH7yAO8UtAV9ojzlMdJAKJiAks= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+4kopGrPpDmNYqodYUvkjETu0gKLYPPcKDiSzcCSolk=; b=dnm0ZO3lg9BlQU+Bf5H9/xwAjzoxPpWURTglUgfdiNLIkMHDxuyqcCIMIzRmo05hiG NqWmznQbVgxIFHfCBGvpcQlSywasbS7wLPfepN1lHznFD6UgLKFhlJVilOoqofp3JL8r emzSkmTzVQOdEs8vhFDi7oaGYS6iJ6eJj9rCphkG1/GvmhkrkWU3xQHpqIDTgljiGd70 yaDYUyXw3KUui6Nhd0p+EXSs6fXyIAqjxoD/pSjVx7cw4FDGSb8hNsZ1PwZGh69kaRgm KkTI5LAuY7j6jG6AmWTBSarUtGdd92kwdYwXfx3JOGrRqVMHPW9TZ6dTpX+rpUitvyTQ Q+pw== X-Gm-Message-State: AOAM530JKoI0nG93jGiYHlBp0OwhYMCuxDCimpM4E5EKgz5M6JFA9z9N Y/QWQ6C/iAMsHrAhlDadjlP7wQ== X-Google-Smtp-Source: ABdhPJx26aWTFfzLyGpF4prhXg+t+dlc0PPGGBZjuc0JwvcXYW9VyW07WF5AIG38G74nnkzD7F2i6w== X-Received: by 2002:a63:5218:: with SMTP id g24mr28883071pgb.309.1622571728889; Tue, 01 Jun 2021 11:22:08 -0700 (PDT) Received: from smtp.gmail.com ([2620:15c:202:201:ee82:b2a7:c8bd:18e7]) by smtp.gmail.com with ESMTPSA id g29sm14510982pgm.11.2021.06.01.11.22.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Jun 2021 11:22:08 -0700 (PDT) From: Stephen Boyd To: Andrew Morton Cc: Joe Perches , linux-kernel@vger.kernel.org, Christoph Lameter , Pekka Enberg , David Rientjes , Joonsoo Kim , Vlastimil Babka , linux-mm@kvack.org, Petr Mladek Subject: [PATCH v3 3/4] slub: Indicate slab_fix() uses printf formats Date: Tue, 1 Jun 2021 11:22:01 -0700 Message-Id: <20210601182202.3011020-4-swboyd@chromium.org> X-Mailer: git-send-email 2.32.0.rc0.204.g9fa02ecfa5-goog In-Reply-To: <20210601182202.3011020-1-swboyd@chromium.org> References: <20210601182202.3011020-1-swboyd@chromium.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: 3598C20010A8 Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=FdH1YFBn; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf18.hostedemail.com: domain of swboyd@chromium.org designates 209.85.210.169 as permitted sender) smtp.mailfrom=swboyd@chromium.org X-Rspamd-Server: rspam03 X-Stat-Signature: 71rf4rxgajgbhshg1dgkygu65rbmxfsa X-HE-Tag: 1622571718-881331 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: 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 Acked-by: Vlastimil Babka Signed-off-by: Stephen Boyd Acked-by: David Rientjes --- 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; }