init/Kconfig: generalize config COMMAND_LINE_SIZE
Subsystems (17)
cover init/Kconfig: generalize config COMMAND_LINE_SIZE
This patch series promotes COMMAND_LINE_SIZE from arch/s390/Kconfig to init/Kconfig to be generally available to other architectures.
In some use cases, such as netboot kernels, rootfs configurations, larger initramfs setups, require larger sizes. While for embedded workloads, it can be reduced to save memory.
Since COMMAND_LINE_SIZE can be larger, it also makes sense to allow INIT_ENV_ARG_LIMIT to be configured.
Wilson Felipe Pereira (3):
init/Kconfig: generalize config COMMAND_LINE_SIZE to all architectures
arch: use CONFIG_COMMAND_LINE_SIZE across all architectures init/Kconfig: make config INIT_ENV_ARG_LIMIT user-configurable
arch/alpha/include/uapi/asm/setup.h | 4 ++++ arch/arc/include/asm/setup.h | 2 +- arch/arm/include/uapi/asm/setup.h | 6 +++++- arch/arm64/include/uapi/asm/setup.h | 4 ++++ arch/loongarch/include/uapi/asm/setup.h | 4 ++++ arch/m68k/include/uapi/asm/setup.h | 6 +++++- arch/microblaze/include/uapi/asm/setup.h | 4 ++++ arch/mips/include/uapi/asm/setup.h | 4 ++++ arch/parisc/include/uapi/asm/setup.h | 4 ++++ arch/powerpc/include/uapi/asm/setup.h | 4 ++++ arch/riscv/include/uapi/asm/setup.h | 4 ++++ arch/s390/Kconfig | 8 -------- arch/sparc/include/uapi/asm/setup.h | 10 +++++++--- arch/um/include/asm/setup.h | 2 +- arch/x86/include/asm/setup.h | 2 +- arch/xtensa/include/uapi/asm/setup.h | 4 ++++ include/uapi/asm-generic/setup.h | 4 ++++ init/Kconfig | 15 ++++++++++++++- 18 files changed, 74 insertions(+), 17 deletions(-)
--
2.55.0.654.g21b8a5bc05-goog
_______________________________________________
linux-riscv mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-riscv
PATCH 1/3 init/Kconfig: generalize config COMMAND_LINE_SIZE to all architectures
Currently, only s390 has the ability to configure the maximum kernel command line size via Kconfig (CONFIG_COMMAND_LINE_SIZE). Other architectures define a hardcoded COMMAND_LINE_SIZE macro in their setup.sh headers.
In some use cases, such as netboot kernels, rootfs configurations, larger initramfs setups, require larger sizes. While for embedded workloads, it can be reduced to save memory.
Move config COMMAND_LINE_SIZE out of arch/s390/Kconfig and into init/Kconfig under General setup so that all architectures can configure their maximum command line length. The default values were added to keep the values unchanged.
--- arch/s390/Kconfig | 8 -------- init/Kconfig | 12 ++++++++++++ 2 files changed, 12 insertions(+), 8 deletions(-)
arch/s390/Kconfig +0 -8
@@ -511,14 +511,6 @@ endchoice config 64BIT def_bool y -config COMMAND_LINE_SIZE - int "Maximum size of kernel command line" - default 4096 - range 896 1048576 - help - This allows you to specify the maximum length of the kernel command - line. - config SMP def_bool y
init/Kconfig +12 -0
@@ -1569,6 +1569,18 @@ config BOOT_CONFIG_EMBED_FILE This bootconfig will be used if there is no initrd or no other bootconfig in the initrd. +config COMMAND_LINE_SIZE + int "Maximum size of kernel command line" + default 4096 if S390 || LOONGARCH || MIPS || UM + default 2048 if X86 || ARM64 || POWERPC || SPARC64 + default 1024 if ARM || PARISC || RISCV + default 256 if ALPHA || ARC || M68K || MICROBLAZE || SPARC32 || XTENSA + default 512 + range 256 1048576 + help + This allows you to specify the maximum length of the kernel command + line. + config CMDLINE_LOG_WRAP_IDEAL_LEN int "Length to try to wrap the cmdline when logged at boot" default 1021
Signature · 1 line
2.55.0.654.g21b8a5bc05-goog
PATCH 2/3 arch: use CONFIG_COMMAND_LINE_SIZE across all architectures
In reply to Wilson Felipe PereiraNow that CONFIG_COMMAND_LINE_SIZE is available in init/Kconfig for all architectures, update every architecture's setup.h header to define COMMAND_LINE_SIZE as CONFIG_COMMAND_LINE_SIZE.
For user-space API (uapi) headers, wrap the definition in an #ifdef __KERNEL__ guard and retain the historical hardcoded default in the #else block. When user-space headers are installed via make headers_install, unifdef strips out the kernel section, ensuring same value as before for user-space applications including <asm/setup.h>.
--- arch/alpha/include/uapi/asm/setup.h | 4 ++++ arch/arc/include/asm/setup.h | 2 +- arch/arm/include/uapi/asm/setup.h | 6 +++++- arch/arm64/include/uapi/asm/setup.h | 4 ++++ arch/loongarch/include/uapi/asm/setup.h | 4 ++++ arch/m68k/include/uapi/asm/setup.h | 6 +++++- arch/microblaze/include/uapi/asm/setup.h | 4 ++++ arch/mips/include/uapi/asm/setup.h | 4 ++++ arch/parisc/include/uapi/asm/setup.h | 4 ++++ arch/powerpc/include/uapi/asm/setup.h | 4 ++++ arch/riscv/include/uapi/asm/setup.h | 4 ++++ arch/sparc/include/uapi/asm/setup.h | 10 +++++++--- arch/um/include/asm/setup.h | 2 +- arch/x86/include/asm/setup.h | 2 +- arch/xtensa/include/uapi/asm/setup.h | 4 ++++ include/uapi/asm-generic/setup.h | 4 ++++ 16 files changed, 60 insertions(+), 8 deletions(-)
arch/alpha/include/uapi/asm/setup.h +4 -0
@@ -2,6 +2,10 @@#ifndef _UAPI__ALPHA_SETUP_H#define _UAPI__ALPHA_SETUP_H +#ifdef __KERNEL__ +#define COMMAND_LINE_SIZE CONFIG_COMMAND_LINE_SIZE +#else #define COMMAND_LINE_SIZE 256 +#endif #endif /* _UAPI__ALPHA_SETUP_H */
arch/arc/include/asm/setup.h +1 -1
@@ -9,7 +9,7 @@#include <linux/types.h> #include <uapi/asm/setup.h> -#define COMMAND_LINE_SIZE 256 +#define COMMAND_LINE_SIZE CONFIG_COMMAND_LINE_SIZE/* * Data structure to map a ID to string
arch/arm/include/uapi/asm/setup.h +5 -1
@@ -17,7 +17,11 @@#include <linux/types.h> -#define COMMAND_LINE_SIZE 1024 +#ifdef __KERNEL__ +#define COMMAND_LINE_SIZE CONFIG_COMMAND_LINE_SIZE +#else +#define COMMAND_LINE_SIZE 1024 +#endif /* The list ends with an ATAG_NONE node. */ #define ATAG_NONE 0x00000000
arch/arm64/include/uapi/asm/setup.h +4 -0
@@ -22,6 +22,10 @@#include <linux/types.h> +#ifdef __KERNEL__ +#define COMMAND_LINE_SIZE CONFIG_COMMAND_LINE_SIZE +#else #define COMMAND_LINE_SIZE 2048 +#endif #endif
arch/loongarch/include/uapi/asm/setup.h +4 -0
@@ -3,6 +3,10 @@#ifndef _UAPI_ASM_LOONGARCH_SETUP_H#define _UAPI_ASM_LOONGARCH_SETUP_H +#ifdef __KERNEL__ +#define COMMAND_LINE_SIZE CONFIG_COMMAND_LINE_SIZE +#else #define COMMAND_LINE_SIZE 4096 +#endif #endif /* _UAPI_ASM_LOONGARCH_SETUP_H */
arch/m68k/include/uapi/asm/setup.h +5 -1
@@ -12,6 +12,10 @@#ifndef _UAPI_M68K_SETUP_H#define _UAPI_M68K_SETUP_H -#define COMMAND_LINE_SIZE 256 +#ifdef __KERNEL__ +#define COMMAND_LINE_SIZE CONFIG_COMMAND_LINE_SIZE +#else +#define COMMAND_LINE_SIZE 256 +#endif #endif /* _UAPI_M68K_SETUP_H */
arch/microblaze/include/uapi/asm/setup.h +4 -0
@@ -12,6 +12,10 @@#ifndef _UAPI_ASM_MICROBLAZE_SETUP_H#define _UAPI_ASM_MICROBLAZE_SETUP_H +#ifdef __KERNEL__ +#define COMMAND_LINE_SIZE CONFIG_COMMAND_LINE_SIZE +#else #define COMMAND_LINE_SIZE 256 +#endif #endif /* _UAPI_ASM_MICROBLAZE_SETUP_H */
arch/mips/include/uapi/asm/setup.h +4 -0
@@ -2,7 +2,11 @@#ifndef _UAPI_MIPS_SETUP_H#define _UAPI_MIPS_SETUP_H +#ifdef __KERNEL__ +#define COMMAND_LINE_SIZE CONFIG_COMMAND_LINE_SIZE +#else #define COMMAND_LINE_SIZE 4096 +#endif #endif /* _UAPI_MIPS_SETUP_H */
arch/parisc/include/uapi/asm/setup.h +4 -0
@@ -2,6 +2,10 @@#ifndef _PARISC_SETUP_H#define _PARISC_SETUP_H +#ifdef __KERNEL__ +#define COMMAND_LINE_SIZE CONFIG_COMMAND_LINE_SIZE +#else #define COMMAND_LINE_SIZE 1024 +#endif #endif /* _PARISC_SETUP_H */
arch/powerpc/include/uapi/asm/setup.h +4 -0
@@ -2,6 +2,10 @@#ifndef _UAPI_ASM_POWERPC_SETUP_H#define _UAPI_ASM_POWERPC_SETUP_H +#ifdef __KERNEL__ +#define COMMAND_LINE_SIZE CONFIG_COMMAND_LINE_SIZE +#else #define COMMAND_LINE_SIZE 2048 +#endif #endif /* _UAPI_ASM_POWERPC_SETUP_H */
arch/riscv/include/uapi/asm/setup.h +4 -0
@@ -3,6 +3,10 @@#ifndef _UAPI_ASM_RISCV_SETUP_H#define _UAPI_ASM_RISCV_SETUP_H +#ifdef __KERNEL__ +#define COMMAND_LINE_SIZE CONFIG_COMMAND_LINE_SIZE +#else #define COMMAND_LINE_SIZE 2048 +#endif #endif /* _UAPI_ASM_RISCV_SETUP_H */
arch/sparc/include/uapi/asm/setup.h +7 -3
@@ -6,10 +6,14 @@#ifndef _UAPI_SPARC_SETUP_H#define _UAPI_SPARC_SETUP_H -#if defined(__sparc__) && defined(__arch64__) -# define COMMAND_LINE_SIZE 2048 +#ifdef __KERNEL__ +# define COMMAND_LINE_SIZE CONFIG_COMMAND_LINE_SIZE#else -# define COMMAND_LINE_SIZE 256 +# if defined(__sparc__) && defined(__arch64__) +# define COMMAND_LINE_SIZE 2048 +# else +# define COMMAND_LINE_SIZE 256 +# endif #endif
arch/um/include/asm/setup.h +1 -1
@@ -6,6 +6,6 @@* command line, so this choice is ok. */ -#define COMMAND_LINE_SIZE 4096 +#define COMMAND_LINE_SIZE CONFIG_COMMAND_LINE_SIZE#endif /* SETUP_H_INCLUDED */
arch/x86/include/asm/setup.h +1 -1
@@ -4,7 +4,7 @@#include <uapi/asm/setup.h> -#define COMMAND_LINE_SIZE 2048 +#define COMMAND_LINE_SIZE CONFIG_COMMAND_LINE_SIZE#include <linux/linkage.h> #include <asm/page_types.h>
arch/xtensa/include/uapi/asm/setup.h +4 -0
@@ -12,6 +12,10 @@#ifndef _XTENSA_SETUP_H#define _XTENSA_SETUP_H +#ifdef __KERNEL__ +#define COMMAND_LINE_SIZE CONFIG_COMMAND_LINE_SIZE +#else #define COMMAND_LINE_SIZE 256 +#endif #endif
include/uapi/asm-generic/setup.h +4 -0
@@ -2,6 +2,10 @@#ifndef __ASM_GENERIC_SETUP_H#define __ASM_GENERIC_SETUP_H +#ifdef __KERNEL__ +#define COMMAND_LINE_SIZE CONFIG_COMMAND_LINE_SIZE +#else #define COMMAND_LINE_SIZE 512 +#endif #endif /* __ASM_GENERIC_SETUP_H */
Signature · 1 line
2.55.0.654.g21b8a5bc05-goog