Message ID | 20230418071758.3163529-1-arnd@kernel.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2645574vqo; Tue, 18 Apr 2023 00:26:06 -0700 (PDT) X-Google-Smtp-Source: AKy350aI4BBEYERToWQ5dqQSq1L8IScNzvY17FGFugyxItN1K3yMoou/IG6q9e//oBQRswkfU5HP X-Received: by 2002:a05:6a20:3d8c:b0:ee:e0d8:515d with SMTP id s12-20020a056a203d8c00b000eee0d8515dmr13862759pzi.46.1681802766248; Tue, 18 Apr 2023 00:26:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681802766; cv=none; d=google.com; s=arc-20160816; b=Qbnt3ZQLeg5LFB/dIoAe5dVMWwSUFqyOzF0B61c/DLbdK2/hr3glrgB6FjmXK08EwH htmKneKgDYIiYuVfRKYc3hvYYr4nzduQgJYcRDjBQsBqqMw8vCvoLmgtlGhq71WMlIts LVR3PCevxFOLKNGT0/lf00U7mJoC5WzUEzhp9crRcAziTSC5sBFF2cmYjUDUj2OukhKU FhcQ2RGezwKqzpRZCjnhXUUtWCPXLTiKxn7jC2S8cKDv2MA8GJcuZUzItBqQ+cbw2zW1 vfIQdub2aa6bmrFN0iQCWT8CuYu02xHlYnGEDj544D4M2nbKSErteRysMcMtE3wTWE3t 6sOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=lj5Do8n9L+td1spVo4l+yYmt2N5QdURJME0Kpgwp69Q=; b=qIll8sQAJutzIKvora6eVZCmy2bIFzEPqlQo/9p46XBDwKoMjqhgHlpC4JEEHa1iAZ +TAduWdHU+Aw/o6HGtMD5yiR94p6Yek81b9rl0PN1V2TShVBWYVYxe+45ufmv5GB3A9F oNTa2j5x1g55T3oCqJ7K/7+OCKcAtJ2c6/ogNZOVW2EWnwkl2WNb7a9bM22Saad6aAvT GjoMLH1Z834AjX2rNKrbK0wmyPsosgt3KqdTpDSe3iUdPKwGGZKpK17T9Mnypp4nPrTA c+wEKTAwPzlugaehQrU4TaTmXml3Un9iAGSM+UEeanbOsJ3ZyD10aIe3PZgoVPZ2vrah dVDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=JoJopI2h; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w4-20020a656944000000b0050f817c6c82si12956660pgq.232.2023.04.18.00.25.54; Tue, 18 Apr 2023 00:26:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=JoJopI2h; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231221AbjDRHSO (ORCPT <rfc822;leviz.kernel.dev@gmail.com> + 99 others); Tue, 18 Apr 2023 03:18:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36586 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230349AbjDRHSN (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Tue, 18 Apr 2023 03:18:13 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D12384C28; Tue, 18 Apr 2023 00:18:04 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 3A81262D7F; Tue, 18 Apr 2023 07:18:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8266AC433EF; Tue, 18 Apr 2023 07:18:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1681802283; bh=SBkw+Rl/R2V6yVsXQAH0zMIyTFbmLbUrynptNaG25HE=; h=From:To:Cc:Subject:Date:From; b=JoJopI2hLvvz45LqFEsYWB0LavG63McovtFt7vl4iutbwrt/EuhjRfKpEdwsgfOxb hlSuumS7K//WJmEs7+jYi/xHmMWWVcdWxlqu9ZrcEsjzayRDCzd8+Dt3k1nLMp9EDR 0cibxuJkuIbD0r3CqZfb/rOKwP4XiqLVc7yHWW2S6tLgTiomZS5kr37qqhSVfUuvif vHBgiO2umshsip0Am6wfzmM8JCbJCQA9rhU7WEuqfdrKDCmKOv9oS3uaEirfp6vXIq ZbRhPnqkpoG6S0yc56nyiGs6s2hqkTEctrI+3nE1AYgaXHp3X7msA5iyVEvMIBTHNu jfCqp/pnicsVw== From: Arnd Bergmann <arnd@kernel.org> To: Luis Chamberlain <mcgrof@kernel.org> Cc: Arnd Bergmann <arnd@arndb.de>, linux-modules@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] module: stats: fix invalid_mod_bytes typo Date: Tue, 18 Apr 2023 09:17:51 +0200 Message-Id: <20230418071758.3163529-1-arnd@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763498017064977136?= X-GMAIL-MSGID: =?utf-8?q?1763498017064977136?= |
Series |
module: stats: fix invalid_mod_bytes typo
|
|
Commit Message
Arnd Bergmann
April 18, 2023, 7:17 a.m. UTC
From: Arnd Bergmann <arnd@arndb.de> This was caught by randconfig builds but does not show up in build testing without CONFIG_MODULE_DECOMPRESS: kernel/module/stats.c: In function 'mod_stat_bump_invalid': kernel/module/stats.c:229:42: error: 'invalid_mod_byte' undeclared (first use in this function); did you mean 'invalid_mod_bytes'? 229 | atomic_long_add(info->compressed_len, &invalid_mod_byte); | ^~~~~~~~~~~~~~~~ | invalid_mod_bytes Fixes: 0d4ab68ce983 ("module: add debug stats to help identify memory pressure") Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- This was probably already reported, sending the fix just in case everyone else else missed it so far. --- kernel/module/stats.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Comments
On 4/18/23 00:17, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > This was caught by randconfig builds but does not show up in > build testing without CONFIG_MODULE_DECOMPRESS: > > kernel/module/stats.c: In function 'mod_stat_bump_invalid': > kernel/module/stats.c:229:42: error: 'invalid_mod_byte' undeclared (first use in this function); did you mean 'invalid_mod_bytes'? > 229 | atomic_long_add(info->compressed_len, &invalid_mod_byte); > | ^~~~~~~~~~~~~~~~ > | invalid_mod_bytes > > Fixes: 0d4ab68ce983 ("module: add debug stats to help identify memory pressure") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Randy Dunlap <rdunlap@infradead.org> Tested-by: Randy Dunlap <rdunlap@infradead.org> Thanks. > --- > This was probably already reported, sending the fix just in case everyone > else else missed it so far. > --- > kernel/module/stats.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/kernel/module/stats.c b/kernel/module/stats.c > index cdcd60695399..32959ec9581f 100644 > --- a/kernel/module/stats.c > +++ b/kernel/module/stats.c > @@ -226,7 +226,7 @@ void mod_stat_bump_invalid(struct load_info *info, int flags) > atomic_inc(&failed_load_modules); > #if defined(CONFIG_MODULE_DECOMPRESS) > if (flags & MODULE_INIT_COMPRESSED_FILE) > - atomic_long_add(info->compressed_len, &invalid_mod_byte); > + atomic_long_add(info->compressed_len, &invalid_mod_bytes); > #endif > } >
On Tue, Apr 18, 2023 at 09:17:51AM +0200, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > This was caught by randconfig builds but does not show up in > build testing without CONFIG_MODULE_DECOMPRESS: > > kernel/module/stats.c: In function 'mod_stat_bump_invalid': > kernel/module/stats.c:229:42: error: 'invalid_mod_byte' undeclared (first use in this function); did you mean 'invalid_mod_bytes'? > 229 | atomic_long_add(info->compressed_len, &invalid_mod_byte); > | ^~~~~~~~~~~~~~~~ > | invalid_mod_bytes > > Fixes: 0d4ab68ce983 ("module: add debug stats to help identify memory pressure") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > This was probably already reported, sending the fix just in case everyone > else else missed it so far. Oh it was a decompression ifdef, that's why I didn't catch it! But also I guess 0-day isn't running tests with it enabled either! Thanks! Applied and pushed! Luis
diff --git a/kernel/module/stats.c b/kernel/module/stats.c index cdcd60695399..32959ec9581f 100644 --- a/kernel/module/stats.c +++ b/kernel/module/stats.c @@ -226,7 +226,7 @@ void mod_stat_bump_invalid(struct load_info *info, int flags) atomic_inc(&failed_load_modules); #if defined(CONFIG_MODULE_DECOMPRESS) if (flags & MODULE_INIT_COMPRESSED_FILE) - atomic_long_add(info->compressed_len, &invalid_mod_byte); + atomic_long_add(info->compressed_len, &invalid_mod_bytes); #endif }