shrink lib/string.i via IWYU
Subsystems (12)
v6 cover shrink lib/string.i via IWYU
This patch series changes the include list of string.c to minimize the preprocessing size. The patch series intends to remove REPEAT_BYE from kernel.h and move it into its own header file because word-at-a-time.h has an implicit dependancy on it but it is declared in kernel.h which is bloated.
---
---
Changes in v6:
- added linux/bitops.h to wordpart.h
- removed kernel.h from x86
- Link to v5: https://lore.kernel.org/r/[email protected]
Changes in v5:
- Removed bad copyright.
- Link to v4: https://lore.kernel.org/r/[email protected]
Changes in v4:
- Fixed personal email client so name appears instead of just email
- Removed kernel.h where not needed.
- Sorted include list in lib/string.c and used linux/limits.h
- Link to v3: https://lore.kernel.org/r/[email protected]
Changes in v3:
- Moved REPEAT_BYTE out of kernel.h and into wordpart.h.
- Included wordpart.h where REPEAT_BYTE was necessary.
- Link to v2: https://lore.kernel.org/r/[email protected]
Changes in v2:
- Transformed into a patch series
- Changed asm inclusions to linux inclusions
- added a patch to sh
- Link to v1: https://lore.kernel.org/r/[email protected]
---
Tanzir Hasan (2):
kernel.h: removed REPEAT_BYTE from kernel.h
lib/string: shrink lib/string.i via IWYU
arch/arm/include/asm/word-at-a-time.h | 3 ++- arch/arm64/include/asm/word-at-a-time.h | 3 ++- arch/powerpc/include/asm/word-at-a-time.h | 4 ++-- arch/riscv/include/asm/word-at-a-time.h | 3 ++- arch/s390/include/asm/word-at-a-time.h | 3 ++- arch/sh/include/asm/word-at-a-time.h | 2 ++ arch/x86/include/asm/word-at-a-time.h | 3 ++- arch/x86/kvm/mmu/mmu.c | 1 + fs/namei.c | 2 +- include/asm-generic/word-at-a-time.h | 3 ++- include/linux/kernel.h | 7 ------- include/linux/wordpart.h | 14 ++++++++++++++ lib/string.c | 17 +++++++++-------- 13 files changed, 41 insertions(+), 24 deletions(-)
---
base-commit: ceb6a6f023fd3e8b07761ed900352ef574010bcb
change-id: 20231204-libstringheader-e238e2af5eec
Best regards,
Signature · 1 line
Tanzir Hasan <[email protected]>
PATCH v6 1/2 kernel.h: removed REPEAT_BYTE from kernel.h
This patch creates wordpart.h and includes it in asm/word-at-a-time.h for all architectures. WORD_AT_A_TIME_CONSTANTS depends on kernel.h because of REPEAT_BYTE. Moving this to another header and including it where necessary allows us to not include the bloated kernel.h. Making this implicit dependency on REPEAT_BYTE explicit allows for later improvements in the lib/string.c inclusion list.
--- arch/arm/include/asm/word-at-a-time.h | 3 ++- arch/arm64/include/asm/word-at-a-time.h | 3 ++- arch/powerpc/include/asm/word-at-a-time.h | 4 ++-- arch/riscv/include/asm/word-at-a-time.h | 3 ++- arch/s390/include/asm/word-at-a-time.h | 3 ++- arch/sh/include/asm/word-at-a-time.h | 2 ++ arch/x86/include/asm/word-at-a-time.h | 3 ++- arch/x86/kvm/mmu/mmu.c | 1 + fs/namei.c | 2 +- include/asm-generic/word-at-a-time.h | 3 ++- include/linux/kernel.h | 7 ------- include/linux/wordpart.h | 14 ++++++++++++++ 12 files changed, 32 insertions(+), 16 deletions(-)
arch/arm/include/asm/word-at-a-time.h +2 -1
@@ -8,7 +8,8 @@* Little-endian word-at-a-time zero byte handling. * Heavily based on the x86 algorithm. */ -#include <linux/kernel.h> +#include <linux/bitops.h> +#include <linux/wordpart.h> struct word_at_a_time {const unsigned long one_bits, high_bits;
arch/arm64/include/asm/word-at-a-time.h +2 -1
@@ -9,7 +9,8 @@ #ifndef __AARCH64EB__ -#include <linux/kernel.h> +#include <linux/bitops.h> +#include <linux/wordpart.h> struct word_at_a_time { const unsigned long one_bits, high_bits;
arch/powerpc/include/asm/word-at-a-time.h +2 -2
@@ -4,8 +4,8 @@/* * Word-at-a-time interfaces for PowerPC. */ - -#include <linux/kernel.h> +#include <linux/bitops.h> +#include <linux/wordpart.h> #include <asm/asm-compat.h> #include <asm/extable.h>
arch/riscv/include/asm/word-at-a-time.h +2 -1
@@ -9,7 +9,8 @@#define _ASM_RISCV_WORD_AT_A_TIME_H -#include <linux/kernel.h> +#include <linux/bitops.h> +#include <linux/wordpart.h> struct word_at_a_time {const unsigned long one_bits, high_bits;
arch/s390/include/asm/word-at-a-time.h +2 -1
@@ -2,7 +2,8 @@#ifndef _ASM_WORD_AT_A_TIME_H#define _ASM_WORD_AT_A_TIME_H -#include <linux/kernel.h> +#include <linux/bitops.h> +#include <linux/wordpart.h> #include <asm/asm-extable.h> #include <asm/bitsperlong.h>
arch/sh/include/asm/word-at-a-time.h +2 -0
@@ -5,6 +5,8 @@#ifdef CONFIG_CPU_BIG_ENDIAN # include <asm-generic/word-at-a-time.h> #else +#include <linux/bitops.h> +#include <linux/wordpart.h> /* * Little-endian version cribbed from x86. */
arch/x86/include/asm/word-at-a-time.h +2 -1
@@ -2,7 +2,8 @@#ifndef _ASM_WORD_AT_A_TIME_H#define _ASM_WORD_AT_A_TIME_H -#include <linux/kernel.h> +#include <linux/bitops.h> +#include <linux/wordpart.h> /* * This is largely generic for little-endian machines, but the
arch/x86/kvm/mmu/mmu.c +1 -0
@@ -47,6 +47,7 @@#include <linux/kern_levels.h> #include <linux/kstrtox.h> #include <linux/kthread.h> +#include <linux/wordpart.h> #include <asm/page.h> #include <asm/memtype.h>
fs/namei.c +1 -1
@@ -17,8 +17,8 @@#include <linux/init.h> #include <linux/export.h> -#include <linux/kernel.h> #include <linux/slab.h> +#include <linux/wordpart.h> #include <linux/fs.h> #include <linux/filelock.h> #include <linux/namei.h>
include/asm-generic/word-at-a-time.h +2 -1
@@ -2,7 +2,8 @@#ifndef _ASM_WORD_AT_A_TIME_H#define _ASM_WORD_AT_A_TIME_H -#include <linux/kernel.h> +#include <linux/bitops.h> +#include <linux/wordpart.h> #include <asm/byteorder.h> #ifdef __BIG_ENDIAN
include/linux/kernel.h +0 -7
@@ -39,13 +39,6 @@#define STACK_MAGIC 0xdeadbeef -/** -* REPEAT_BYTE - repeat the value @x multiple times as an unsigned long value -* @x: value to repeat -* -* NOTE: @x is not checked for > 0xff; larger values produce odd results. -*/ -#define REPEAT_BYTE (x) ((~0ul / 0xff) * (x))/* generic data direction definitions */ #define READ 0
include/linux/wordpart.h new file +14 -0
@@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef _LINUX_WORDPART_H +#define _LINUX_WORDPART_H +/** +* REPEAT_BYTE - repeat the value @x multiple times as an unsigned long value +* @x: value to repeat +* +* NOTE: @x is not checked for > 0xff; larger values produce odd results. +*/ +#define REPEAT_BYTE (x) ((~0ul / 0xff) * (x)) + +#endif // _LINUX_WORDPART_H +
Signature · 1 line
2.43.0.472.g3155946c3a-goog
Re: [PATCH v6 1/2] kernel.h: removed REPEAT_BYTE from kernel.h
Quoted 6 lines · Tanzir Hasan
This patch creates
wordpart.hand includes it inasm/word-at-a-time.hfor all architectures.WORD_AT_A_TIME_CONSTANTSdepends onkernel.hbecause ofREPEAT_BYTE. Moving this to another header and including it where necessary allows us to not include the bloatedkernel.h. Making this implicit dependency onREPEAT_BYTEexplicit allows for later improvements in thelib/string.cinclusion list.
LGTM, and I hope this will not trigger CIs and other build checkers.
...
arch/powerpc/include/asm/word-at-a-time.h line 8
Quoted 8 lines
arch/powerpc/include/asm/word-at-a-time.h +0
-1@@ -4,8 +4,8 @@/* * Word-at-a-time interfaces for PowerPC. */ -
You can preserve this blank line...
arch/powerpc/include/asm/word-at-a-time.h line 9
Quoted 3 lines
arch/powerpc/include/asm/word-at-a-time.h +2
-1-#include <linux/kernel.h> +#include <linux/bitops.h> +#include <linux/wordpart.h>
...here.
Quoted 2 lines
arch/powerpc/include/asm/word-at-a-time.h +0
-0#include <asm/asm-compat.h> #include <asm/extable.h>
Signature · 2 lines
With Best Regards, Andy Shevchenko
PATCH v6 2/2 lib/string: shrink lib/string.i via IWYU
In reply to Tanzir HasanThis diff uses an open source tool include-what-you-use (IWYU) to modify the include list, changing indirect includes to direct includes. IWYU is implemented using the IWYUScripts github repository which is a tool that is currently undergoing development. These changes seek to improve build times.
This change to lib/string.c resulted in a preprocessed size of lib/string.i from 26371 lines to 5321 lines (-80%) for the x86 defconfig.
--- lib/string.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
lib/string.c +9 -8
@@ -15,19 +15,20 @@*/ #define __NO_FORTIFY -#include <linux/types.h> -#include <linux/string.h> -#include <linux/ctype.h> -#include <linux/kernel.h> -#include <linux/export.h> +#include <linux/bits.h> #include <linux/bug.h> +#include <linux/ctype.h> #include <linux/errno.h> -#include <linux/slab.h> +#include <linux/limits.h> +#include <linux/linkage.h> +#include <linux/stddef.h> +#include <linux/string.h> +#include <linux/types.h> +#include <asm/page.h> +#include <asm/rwonce.h> #include <asm/unaligned.h> -#include <asm/byteorder.h> #include <asm/word-at-a-time.h> -#include <asm/page.h> #ifndef __HAVE_ARCH_STRNCASECMP/**
Signature · 1 line
2.43.0.472.g3155946c3a-goog
Re: [PATCH v6 2/2] lib/string: shrink lib/string.i via IWYU
Quoted 10 lines · Tanzir Hasan
This diff uses an open source tool include-what-you-use (IWYU) to modify the include list, changing indirect includes to direct includes. IWYU is implemented using the IWYUScripts github repository which is a tool that is currently undergoing development. These changes seek to improve build times.
This change to
lib/string.cresulted in a preprocessed size oflib/string.ifrom 26371 lines to 5321 lines (-80%) for the x86 defconfig.
Why did you ignore my tag?
--
With Best Regards,
Andy Shevchenko
Tanzir Hasan
Reviewed-by Andy ShevchenkoRe: [PATCH v6 2/2] lib/string: shrink lib/string.i via IWYU
Quoted 9 lines · Andy Shevchenko
Quoted 7 lines · Tanzir Hasan
This diff uses an open source tool include-what-you-use (IWYU) to modify the include list, changing indirect includes to direct includes. IWYU is implemented using the IWYUScripts github repository which is a tool that is currently undergoing development. These changes seek to improve build times.
Quoted 5 lines
Quoted 3 lines
This change to
lib/string.cresulted in a preprocessed size oflib/string.ifrom 26371 lines to 5321 lines (-80%) for the x86 defconfig.Why did you ignore my tag?
I'm sorry. I forgot you had already reviewed this one. In a future revision I will include this:
Best,
Tanzir
Kees Cook
AppliedQuoted 6 lines · Tanzir Hasan
This patch series changes the include list of
string.cto minimize the preprocessing size. The patch series intends to removeREPEAT_BYEfromkernel.hand move it into its own header file becauseword-at-a-time.hhas an implicit dependancy on it but it is declared inkernel.hwhich is bloated.
Applied to for-next/hardening, thanks!
[1/2] kernel.h: removed REPEAT_BYTE from kernel.h
https://git.kernel.org/kees/c/66a5c40f60f5 [2/2] lib/string: shrink lib/string.i via IWYU https://git.kernel.org/kees/c/38b9baf19469
Take care,
Signature · 1 line
Kees Cook