2023-04-18 07:19:02

by Arnd Bergmann

Subject: [PATCH] module: stats: fix invalid_mod_bytes typo

From: Arnd Bergmann <[email protected]>

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 <[email protected]>
---
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
}

--
2.39.2

2023-04-18 14:25:07

by Randy Dunlap

Subject: Re: [PATCH] module: stats: fix invalid_mod_bytes typo

On 4/18/23 00:17, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> 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 <[email protected]>

Acked-by: Randy Dunlap <[email protected]>
Tested-by: Randy Dunlap <[email protected]>

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
> }
>

--
~Randy

2023-04-18 15:46:17

by Luis Chamberlain

Subject: Re: [PATCH] module: stats: fix invalid_mod_bytes typo

On Tue, Apr 18, 2023 at 09:17:51AM +0200, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> 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 <[email protected]>
> ---
> 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