This all came up in the context of increasing COMMAND_LINE_SIZE in the
RISC-V port. In theory that's a UABI break, as COMMAND_LINE_SIZE is the
maximum length of /proc/cmdline and userspace could staticly rely on
that to be correct.
Usually I wouldn't mess around with changing this sort of thing, but
PowerPC increased it with a5980d064fe2 ("powerpc: Bump COMMAND_LINE_SIZE
to 2048"). There are also a handful of examples of COMMAND_LINE_SIZE
increasing, but they're from before the UAPI split so I'm not quite sure
what that means: e5a6a1c90948 ("powerpc: derive COMMAND_LINE_SIZE from
asm-generic"), 684d2fd48e71 ("[S390] kernel: Append scpdata to kernel
boot command line"), 22242681cff5 ("MIPS: Extend COMMAND_LINE_SIZE"),
and 2b74b85693c7 ("sh: Derive COMMAND_LINE_SIZE from
asm-generic/setup.h.").
It seems to me like COMMAND_LINE_SIZE really just shouldn't have been
part of the uapi to begin with, and userspace should be able to handle
/proc/cmdline of whatever length it turns out to be. I don't see any
references to COMMAND_LINE_SIZE anywhere but Linux via a quick Google
search, but that's not really enough to consider it unused on my end.
This issue was already considered in s390 and they reached the same
conclusion in commit 622021cd6c56 ("s390: make command line
configurable").
The feedback on the v1 seemed to indicate that COMMAND_LINE_SIZE really
shouldn't be part of uapi, so this now touches all the ports. I've
tried to split this all out and leave it bisectable, but I haven't
tested it all that aggressively.
Changes since v4 <https://lore.kernel.org/all/[email protected]/>:
* Add my own SoB as suggested by Geert
* Add riscv patches as suggested by Björn
* Remove "WITH Linux-syscall-note" from new setup.h not in uapi/, as
suggested by Greg KH, his quoted answer below:
"The "syscall note" makes no sense at all for any files not in the uapi/
directory, so you can remove it just fine as that WITH doesn't mean
anything _UNLESS_ the file is in the uapi directory."
Changes since v3 <https://lore.kernel.org/all/[email protected]/>:
* Added RB/AB
* Added a mention to commit 622021cd6c56 ("s390: make command line
configurable") in the cover letter
Changes since v2 <https://lore.kernel.org/all/[email protected]/>:
* Fix sh, csky and ia64 builds, as reported by kernel test robot
Changes since v1 <https://lore.kernel.org/all/[email protected]/>:
* Touches every arch.
base-commit-tag: next-20230207
Alexandre Ghiti (2):
riscv: Remove COMMAND_LINE_SIZE from uapi
riscv: Remove empty <uapi/asm/setup.h>
Palmer Dabbelt (24):
alpha: Remove COMMAND_LINE_SIZE from uapi
arm64: Remove COMMAND_LINE_SIZE from uapi
arm: Remove COMMAND_LINE_SIZE from uapi
ia64: Remove COMMAND_LINE_SIZE from uapi
m68k: Remove COMMAND_LINE_SIZE from uapi
microblaze: Remove COMMAND_LINE_SIZE from uapi
mips: Remove COMMAND_LINE_SIZE from uapi
parisc: Remove COMMAND_LINE_SIZE from uapi
powerpc: Remove COMMAND_LINE_SIZE from uapi
sparc: Remove COMMAND_LINE_SIZE from uapi
xtensa: Remove COMMAND_LINE_SIZE from uapi
asm-generic: Remove COMMAND_LINE_SIZE from uapi
alpha: Remove empty <uapi/asm/setup.h>
arc: Remove empty <uapi/asm/setup.h>
m68k: Remove empty <uapi/asm/setup.h>
arm64: Remove empty <uapi/asm/setup.h>
microblaze: Remove empty <uapi/asm/setup.h>
sparc: Remove empty <uapi/asm/setup.h>
parisc: Remove empty <uapi/asm/setup.h>
x86: Remove empty <uapi/asm/setup.h>
xtensa: Remove empty <uapi/asm/setup.h>
powerpc: Remove empty <uapi/asm/setup.h>
mips: Remove empty <uapi/asm/setup.h>
s390: Remove empty <uapi/asm/setup.h>
.../admin-guide/kernel-parameters.rst | 2 +-
arch/alpha/include/asm/setup.h | 4 +--
arch/alpha/include/uapi/asm/setup.h | 7 -----
arch/arc/include/asm/setup.h | 1 -
arch/arc/include/uapi/asm/setup.h | 6 -----
arch/arm/include/asm/setup.h | 1 +
arch/arm/include/uapi/asm/setup.h | 2 --
arch/arm64/include/asm/setup.h | 3 ++-
arch/arm64/include/uapi/asm/setup.h | 27 -------------------
arch/ia64/include/asm/setup.h | 10 +++++++
arch/ia64/include/uapi/asm/setup.h | 6 ++---
arch/loongarch/include/asm/setup.h | 2 +-
arch/m68k/include/asm/setup.h | 3 +--
arch/m68k/include/uapi/asm/setup.h | 17 ------------
arch/microblaze/include/asm/setup.h | 2 +-
arch/microblaze/include/uapi/asm/setup.h | 20 --------------
arch/mips/include/asm/setup.h | 3 ++-
arch/mips/include/uapi/asm/setup.h | 8 ------
arch/parisc/include/{uapi => }/asm/setup.h | 2 +-
arch/powerpc/include/asm/setup.h | 2 +-
arch/powerpc/include/uapi/asm/setup.h | 7 -----
arch/riscv/include/asm/setup.h | 7 +++++
arch/riscv/include/uapi/asm/setup.h | 8 ------
arch/s390/include/asm/setup.h | 1 -
arch/s390/include/uapi/asm/setup.h | 1 -
arch/sh/include/asm/setup.h | 2 +-
arch/sparc/include/asm/setup.h | 6 ++++-
arch/sparc/include/uapi/asm/setup.h | 16 -----------
arch/x86/include/asm/setup.h | 2 --
arch/x86/include/uapi/asm/setup.h | 1 -
arch/xtensa/include/{uapi => }/asm/setup.h | 2 +-
include/asm-generic/Kbuild | 1 +
include/{uapi => }/asm-generic/setup.h | 0
include/uapi/asm-generic/Kbuild | 1 -
34 files changed, 40 insertions(+), 143 deletions(-)
delete mode 100644 arch/alpha/include/uapi/asm/setup.h
delete mode 100644 arch/arc/include/uapi/asm/setup.h
delete mode 100644 arch/arm64/include/uapi/asm/setup.h
create mode 100644 arch/ia64/include/asm/setup.h
delete mode 100644 arch/m68k/include/uapi/asm/setup.h
delete mode 100644 arch/microblaze/include/uapi/asm/setup.h
delete mode 100644 arch/mips/include/uapi/asm/setup.h
rename arch/parisc/include/{uapi => }/asm/setup.h (63%)
delete mode 100644 arch/powerpc/include/uapi/asm/setup.h
create mode 100644 arch/riscv/include/asm/setup.h
delete mode 100644 arch/riscv/include/uapi/asm/setup.h
delete mode 100644 arch/s390/include/uapi/asm/setup.h
delete mode 100644 arch/sparc/include/uapi/asm/setup.h
delete mode 100644 arch/x86/include/uapi/asm/setup.h
rename arch/xtensa/include/{uapi => }/asm/setup.h (84%)
rename include/{uapi => }/asm-generic/setup.h (100%)
--
2.37.2
From: Palmer Dabbelt <[email protected]>
As far as I can tell this is not used by userspace and thus should not
be part of the user-visible API.
Signed-off-by: Palmer Dabbelt <[email protected]>
Signed-off-by: Alexandre Ghiti <[email protected]>
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
---
arch/alpha/include/asm/setup.h | 4 ++--
arch/alpha/include/uapi/asm/setup.h | 2 --
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/arch/alpha/include/asm/setup.h b/arch/alpha/include/asm/setup.h
index 262aab99e391..ea08ca45efa8 100644
--- a/arch/alpha/include/asm/setup.h
+++ b/arch/alpha/include/asm/setup.h
@@ -2,8 +2,6 @@
#ifndef __ALPHA_SETUP_H
#define __ALPHA_SETUP_H
-#include <uapi/asm/setup.h>
-
/*
* We leave one page for the initial stack page, and one page for
* the initial process structure. Also, the console eats 3 MB for
@@ -14,6 +12,8 @@
/* Remove when official MILO sources have ELF support: */
#define BOOT_SIZE (16*1024)
+#define COMMAND_LINE_SIZE 256
+
#ifdef CONFIG_ALPHA_LEGACY_START_ADDRESS
#define KERNEL_START_PHYS 0x300000 /* Old bootloaders hardcoded this. */
#else
diff --git a/arch/alpha/include/uapi/asm/setup.h b/arch/alpha/include/uapi/asm/setup.h
index f881ea5947cb..9b3b5ba39b1d 100644
--- a/arch/alpha/include/uapi/asm/setup.h
+++ b/arch/alpha/include/uapi/asm/setup.h
@@ -2,6 +2,4 @@
#ifndef _UAPI__ALPHA_SETUP_H
#define _UAPI__ALPHA_SETUP_H
-#define COMMAND_LINE_SIZE 256
-
#endif /* _UAPI__ALPHA_SETUP_H */
--
2.37.2
From: Palmer Dabbelt <[email protected]>
As far as I can tell this is not used by userspace and thus should not
be part of the user-visible API.
Signed-off-by: Palmer Dabbelt <[email protected]>
Signed-off-by: Alexandre Ghiti <[email protected]>
Acked-by: Catalin Marinas <[email protected]>
---
arch/arm64/include/asm/setup.h | 3 ++-
arch/arm64/include/uapi/asm/setup.h | 2 --
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/arch/arm64/include/asm/setup.h b/arch/arm64/include/asm/setup.h
index f4af547ef54c..7ca70f883cee 100644
--- a/arch/arm64/include/asm/setup.h
+++ b/arch/arm64/include/asm/setup.h
@@ -4,8 +4,9 @@
#define __ARM64_ASM_SETUP_H
#include <linux/string.h>
+#include <linux/types.h>
-#include <uapi/asm/setup.h>
+#define COMMAND_LINE_SIZE 2048
void *get_early_fdt_ptr(void);
void early_fdt_map(u64 dt_phys);
diff --git a/arch/arm64/include/uapi/asm/setup.h b/arch/arm64/include/uapi/asm/setup.h
index 5d703888f351..f9f51e5925aa 100644
--- a/arch/arm64/include/uapi/asm/setup.h
+++ b/arch/arm64/include/uapi/asm/setup.h
@@ -22,6 +22,4 @@
#include <linux/types.h>
-#define COMMAND_LINE_SIZE 2048
-
#endif
--
2.37.2
From: Palmer Dabbelt <[email protected]>
As far as I can tell this is not used by userspace and thus should not
be part of the user-visible API.
Signed-off-by: Palmer Dabbelt <[email protected]>
Signed-off-by: Alexandre Ghiti <[email protected]>
Reviewed-by: Russell King (Oracle) <[email protected]>
---
arch/arm/include/asm/setup.h | 1 +
arch/arm/include/uapi/asm/setup.h | 2 --
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/arm/include/asm/setup.h b/arch/arm/include/asm/setup.h
index ba0872a8dcda..8a1e4f804d1b 100644
--- a/arch/arm/include/asm/setup.h
+++ b/arch/arm/include/asm/setup.h
@@ -13,6 +13,7 @@
#include <uapi/asm/setup.h>
+#define COMMAND_LINE_SIZE 1024
#define __tag __used __section(".taglist.init")
#define __tagtable(tag, fn) \
diff --git a/arch/arm/include/uapi/asm/setup.h b/arch/arm/include/uapi/asm/setup.h
index 25ceda63b284..87a4f4af28e1 100644
--- a/arch/arm/include/uapi/asm/setup.h
+++ b/arch/arm/include/uapi/asm/setup.h
@@ -17,8 +17,6 @@
#include <linux/types.h>
-#define COMMAND_LINE_SIZE 1024
-
/* The list ends with an ATAG_NONE node. */
#define ATAG_NONE 0x00000000
--
2.37.2
From: Palmer Dabbelt <[email protected]>
As far as I can tell this is not used by userspace and thus should not
be part of the user-visible API.
Signed-off-by: Palmer Dabbelt <[email protected]>
Signed-off-by: Alexandre Ghiti <[email protected]>
---
arch/ia64/include/asm/setup.h | 10 ++++++++++
arch/ia64/include/uapi/asm/setup.h | 6 ++----
2 files changed, 12 insertions(+), 4 deletions(-)
create mode 100644 arch/ia64/include/asm/setup.h
diff --git a/arch/ia64/include/asm/setup.h b/arch/ia64/include/asm/setup.h
new file mode 100644
index 000000000000..ba57909cad4c
--- /dev/null
+++ b/arch/ia64/include/asm/setup.h
@@ -0,0 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+
+#ifndef __IA64_SETUP_H
+#define __IA64_SETUP_H
+
+#include <uapi/asm/setup.h>
+
+#define COMMAND_LINE_SIZE 2048
+
+#endif
diff --git a/arch/ia64/include/uapi/asm/setup.h b/arch/ia64/include/uapi/asm/setup.h
index 8d13ce8fb03a..bcbb2b242ded 100644
--- a/arch/ia64/include/uapi/asm/setup.h
+++ b/arch/ia64/include/uapi/asm/setup.h
@@ -1,8 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-#ifndef __IA64_SETUP_H
-#define __IA64_SETUP_H
-
-#define COMMAND_LINE_SIZE 2048
+#ifndef __UAPI_IA64_SETUP_H
+#define __UAPI_IA64_SETUP_H
extern struct ia64_boot_param {
__u64 command_line; /* physical address of command line arguments */
--
2.37.2
From: Palmer Dabbelt <[email protected]>
As far as I can tell this is not used by userspace and thus should not
be part of the user-visible API.
Signed-off-by: Palmer Dabbelt <[email protected]>
Signed-off-by: Alexandre Ghiti <[email protected]>
Acked-by: Geert Uytterhoeven <[email protected]>
---
arch/m68k/include/asm/setup.h | 3 +--
arch/m68k/include/uapi/asm/setup.h | 2 --
2 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/arch/m68k/include/asm/setup.h b/arch/m68k/include/asm/setup.h
index 2c99477aaf89..9a256cc3931d 100644
--- a/arch/m68k/include/asm/setup.h
+++ b/arch/m68k/include/asm/setup.h
@@ -23,9 +23,8 @@
#define _M68K_SETUP_H
#include <uapi/asm/bootinfo.h>
-#include <uapi/asm/setup.h>
-
+#define COMMAND_LINE_SIZE 256
#define CL_SIZE COMMAND_LINE_SIZE
#ifndef __ASSEMBLY__
diff --git a/arch/m68k/include/uapi/asm/setup.h b/arch/m68k/include/uapi/asm/setup.h
index 25fe26d5597c..005593acc7d8 100644
--- a/arch/m68k/include/uapi/asm/setup.h
+++ b/arch/m68k/include/uapi/asm/setup.h
@@ -12,6 +12,4 @@
#ifndef _UAPI_M68K_SETUP_H
#define _UAPI_M68K_SETUP_H
-#define COMMAND_LINE_SIZE 256
-
#endif /* _UAPI_M68K_SETUP_H */
--
2.37.2
From: Palmer Dabbelt <[email protected]>
As far as I can tell this is not used by userspace and thus should not
be part of the user-visible API.
Signed-off-by: Palmer Dabbelt <[email protected]>
Signed-off-by: Alexandre Ghiti <[email protected]>
---
arch/microblaze/include/asm/setup.h | 2 +-
arch/microblaze/include/uapi/asm/setup.h | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/arch/microblaze/include/asm/setup.h b/arch/microblaze/include/asm/setup.h
index a06cc1f97aa9..2becbf3b8baf 100644
--- a/arch/microblaze/include/asm/setup.h
+++ b/arch/microblaze/include/asm/setup.h
@@ -7,7 +7,7 @@
#ifndef _ASM_MICROBLAZE_SETUP_H
#define _ASM_MICROBLAZE_SETUP_H
-#include <uapi/asm/setup.h>
+#define COMMAND_LINE_SIZE 256
# ifndef __ASSEMBLY__
extern char cmd_line[COMMAND_LINE_SIZE];
diff --git a/arch/microblaze/include/uapi/asm/setup.h b/arch/microblaze/include/uapi/asm/setup.h
index 6831794e6f2c..51aed65880e7 100644
--- a/arch/microblaze/include/uapi/asm/setup.h
+++ b/arch/microblaze/include/uapi/asm/setup.h
@@ -12,8 +12,6 @@
#ifndef _UAPI_ASM_MICROBLAZE_SETUP_H
#define _UAPI_ASM_MICROBLAZE_SETUP_H
-#define COMMAND_LINE_SIZE 256
-
# ifndef __ASSEMBLY__
# endif /* __ASSEMBLY__ */
--
2.37.2
From: Palmer Dabbelt <[email protected]>
As far as I can tell this is not used by userspace and thus should not
be part of the user-visible API.
Signed-off-by: Palmer Dabbelt <[email protected]>
Signed-off-by: Alexandre Ghiti <[email protected]>
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
---
arch/mips/include/asm/setup.h | 3 ++-
arch/mips/include/uapi/asm/setup.h | 3 ---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/arch/mips/include/asm/setup.h b/arch/mips/include/asm/setup.h
index 8c56b862fd9c..a13b9259b476 100644
--- a/arch/mips/include/asm/setup.h
+++ b/arch/mips/include/asm/setup.h
@@ -3,7 +3,8 @@
#define _MIPS_SETUP_H
#include <linux/types.h>
-#include <uapi/asm/setup.h>
+
+#define COMMAND_LINE_SIZE 4096
extern void prom_putchar(char);
extern void setup_early_printk(void);
diff --git a/arch/mips/include/uapi/asm/setup.h b/arch/mips/include/uapi/asm/setup.h
index 7d48c433b0c2..157c3c392fb4 100644
--- a/arch/mips/include/uapi/asm/setup.h
+++ b/arch/mips/include/uapi/asm/setup.h
@@ -2,7 +2,4 @@
#ifndef _UAPI_MIPS_SETUP_H
#define _UAPI_MIPS_SETUP_H
-#define COMMAND_LINE_SIZE 4096
-
-
#endif /* _UAPI_MIPS_SETUP_H */
--
2.37.2
From: Palmer Dabbelt <[email protected]>
As far as I can tell this is not used by userspace and thus should not
be part of the user-visible API.
Signed-off-by: Palmer Dabbelt <[email protected]>
Signed-off-by: Alexandre Ghiti <[email protected]>
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
Acked-by: Helge Deller <[email protected]>
---
arch/parisc/include/asm/setup.h | 7 +++++++
arch/parisc/include/uapi/asm/setup.h | 2 --
2 files changed, 7 insertions(+), 2 deletions(-)
create mode 100644 arch/parisc/include/asm/setup.h
diff --git a/arch/parisc/include/asm/setup.h b/arch/parisc/include/asm/setup.h
new file mode 100644
index 000000000000..44e1c42244bb
--- /dev/null
+++ b/arch/parisc/include/asm/setup.h
@@ -0,0 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef _PARISC_SETUP_H
+#define _PARISC_SETUP_H
+
+#define COMMAND_LINE_SIZE 1024
+
+#endif /* _PARISC_SETUP_H */
diff --git a/arch/parisc/include/uapi/asm/setup.h b/arch/parisc/include/uapi/asm/setup.h
index 78b2f4ec7d65..bfad89428e47 100644
--- a/arch/parisc/include/uapi/asm/setup.h
+++ b/arch/parisc/include/uapi/asm/setup.h
@@ -2,6 +2,4 @@
#ifndef _PARISC_SETUP_H
#define _PARISC_SETUP_H
-#define COMMAND_LINE_SIZE 1024
-
#endif /* _PARISC_SETUP_H */
--
2.37.2
From: Palmer Dabbelt <[email protected]>
As far as I can tell this is not used by userspace and thus should not
be part of the user-visible API.
Signed-off-by: Palmer Dabbelt <[email protected]>
Signed-off-by: Alexandre Ghiti <[email protected]>
Acked-by: Michael Ellerman <[email protected]>
---
arch/powerpc/include/asm/setup.h | 2 +-
arch/powerpc/include/uapi/asm/setup.h | 2 --
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/arch/powerpc/include/asm/setup.h b/arch/powerpc/include/asm/setup.h
index e29e83f8a89c..31786d1db2ef 100644
--- a/arch/powerpc/include/asm/setup.h
+++ b/arch/powerpc/include/asm/setup.h
@@ -2,7 +2,7 @@
#ifndef _ASM_POWERPC_SETUP_H
#define _ASM_POWERPC_SETUP_H
-#include <uapi/asm/setup.h>
+#define COMMAND_LINE_SIZE 2048
#ifndef __ASSEMBLY__
extern void ppc_printk_progress(char *s, unsigned short hex);
diff --git a/arch/powerpc/include/uapi/asm/setup.h b/arch/powerpc/include/uapi/asm/setup.h
index c54940b09d06..f2ca747aa45b 100644
--- a/arch/powerpc/include/uapi/asm/setup.h
+++ b/arch/powerpc/include/uapi/asm/setup.h
@@ -2,6 +2,4 @@
#ifndef _UAPI_ASM_POWERPC_SETUP_H
#define _UAPI_ASM_POWERPC_SETUP_H
-#define COMMAND_LINE_SIZE 2048
-
#endif /* _UAPI_ASM_POWERPC_SETUP_H */
--
2.37.2
From: Palmer Dabbelt <[email protected]>
As far as I can tell this is not used by userspace and thus should not
be part of the user-visible API.
Signed-off-by: Palmer Dabbelt <[email protected]>
Signed-off-by: Alexandre Ghiti <[email protected]>
---
arch/sparc/include/asm/setup.h | 6 +++++-
arch/sparc/include/uapi/asm/setup.h | 7 -------
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/arch/sparc/include/asm/setup.h b/arch/sparc/include/asm/setup.h
index 72205684e51e..d1384ed92547 100644
--- a/arch/sparc/include/asm/setup.h
+++ b/arch/sparc/include/asm/setup.h
@@ -7,7 +7,11 @@
#include <linux/interrupt.h>
-#include <uapi/asm/setup.h>
+#if defined(__sparc__) && defined(__arch64__)
+# define COMMAND_LINE_SIZE 2048
+#else
+# define COMMAND_LINE_SIZE 256
+#endif
extern char reboot_command[];
diff --git a/arch/sparc/include/uapi/asm/setup.h b/arch/sparc/include/uapi/asm/setup.h
index 3c208a4dd464..c3cf1b0d30b3 100644
--- a/arch/sparc/include/uapi/asm/setup.h
+++ b/arch/sparc/include/uapi/asm/setup.h
@@ -6,11 +6,4 @@
#ifndef _UAPI_SPARC_SETUP_H
#define _UAPI_SPARC_SETUP_H
-#if defined(__sparc__) && defined(__arch64__)
-# define COMMAND_LINE_SIZE 2048
-#else
-# define COMMAND_LINE_SIZE 256
-#endif
-
-
#endif /* _UAPI_SPARC_SETUP_H */
--
2.37.2
From: Palmer Dabbelt <[email protected]>
As far as I can tell this is not used by userspace and thus should not
be part of the user-visible API.
Signed-off-by: Palmer Dabbelt <[email protected]>
Signed-off-by: Alexandre Ghiti <[email protected]>
Acked-by: Max Filippov <[email protected]>
---
arch/xtensa/include/asm/setup.h | 17 +++++++++++++++++
arch/xtensa/include/uapi/asm/setup.h | 2 --
2 files changed, 17 insertions(+), 2 deletions(-)
create mode 100644 arch/xtensa/include/asm/setup.h
diff --git a/arch/xtensa/include/asm/setup.h b/arch/xtensa/include/asm/setup.h
new file mode 100644
index 000000000000..0fc3ad86e0a5
--- /dev/null
+++ b/arch/xtensa/include/asm/setup.h
@@ -0,0 +1,17 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
+ * include/asm-xtensa/setup.h
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2001 - 2005 Tensilica Inc.
+ */
+
+#ifndef _XTENSA_SETUP_H
+#define _XTENSA_SETUP_H
+
+#define COMMAND_LINE_SIZE 256
+
+#endif
diff --git a/arch/xtensa/include/uapi/asm/setup.h b/arch/xtensa/include/uapi/asm/setup.h
index 5356a5fd4d17..6f982394684a 100644
--- a/arch/xtensa/include/uapi/asm/setup.h
+++ b/arch/xtensa/include/uapi/asm/setup.h
@@ -12,6 +12,4 @@
#ifndef _XTENSA_SETUP_H
#define _XTENSA_SETUP_H
-#define COMMAND_LINE_SIZE 256
-
#endif
--
2.37.2
As far as I can tell this is not used by userspace and thus should not
be part of the user-visible API.
Signed-off-by: Alexandre Ghiti <[email protected]>
---
arch/riscv/include/asm/setup.h | 7 +++++++
arch/riscv/include/uapi/asm/setup.h | 2 --
2 files changed, 7 insertions(+), 2 deletions(-)
create mode 100644 arch/riscv/include/asm/setup.h
diff --git a/arch/riscv/include/asm/setup.h b/arch/riscv/include/asm/setup.h
new file mode 100644
index 000000000000..f165a14344e2
--- /dev/null
+++ b/arch/riscv/include/asm/setup.h
@@ -0,0 +1,7 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+#ifndef _ASM_RISCV_SETUP_H
+#define _ASM_RISCV_SETUP_H
+
+#define COMMAND_LINE_SIZE 1024
+
+#endif /* _ASM_RISCV_SETUP_H */
diff --git a/arch/riscv/include/uapi/asm/setup.h b/arch/riscv/include/uapi/asm/setup.h
index 66b13a522880..17fcecd4a2f8 100644
--- a/arch/riscv/include/uapi/asm/setup.h
+++ b/arch/riscv/include/uapi/asm/setup.h
@@ -3,6 +3,4 @@
#ifndef _UAPI_ASM_RISCV_SETUP_H
#define _UAPI_ASM_RISCV_SETUP_H
-#define COMMAND_LINE_SIZE 1024
-
#endif /* _UAPI_ASM_RISCV_SETUP_H */
--
2.37.2
From: Palmer Dabbelt <[email protected]>
As far as I can tell this is not used by userspace and thus should not
be part of the user-visible API. Since <uapi/asm-generic/setup.h> only
contains COMMAND_LINE_SIZE we can just move it out of uapi to hide the
definition and fix up the only direct use in Loongarch.
Signed-off-by: Palmer Dabbelt <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Palmer Dabbelt <[email protected]>
Signed-off-by: Alexandre Ghiti <[email protected]>
---
Documentation/admin-guide/kernel-parameters.rst | 2 +-
arch/loongarch/include/asm/setup.h | 2 +-
arch/sh/include/asm/setup.h | 2 +-
include/asm-generic/Kbuild | 1 +
include/{uapi => }/asm-generic/setup.h | 0
include/uapi/asm-generic/Kbuild | 1 -
6 files changed, 4 insertions(+), 4 deletions(-)
rename include/{uapi => }/asm-generic/setup.h (100%)
diff --git a/Documentation/admin-guide/kernel-parameters.rst b/Documentation/admin-guide/kernel-parameters.rst
index 19600c50277b..2b94d5a42bd6 100644
--- a/Documentation/admin-guide/kernel-parameters.rst
+++ b/Documentation/admin-guide/kernel-parameters.rst
@@ -207,7 +207,7 @@ The number of kernel parameters is not limited, but the length of the
complete command line (parameters including spaces etc.) is limited to
a fixed number of characters. This limit depends on the architecture
and is between 256 and 4096 characters. It is defined in the file
-./include/uapi/asm-generic/setup.h as COMMAND_LINE_SIZE.
+./include/asm-generic/setup.h as COMMAND_LINE_SIZE.
Finally, the [KMG] suffix is commonly described after a number of kernel
parameter values. These 'K', 'M', and 'G' letters represent the _binary_
diff --git a/arch/loongarch/include/asm/setup.h b/arch/loongarch/include/asm/setup.h
index 72ead58039f3..86c99b183ea0 100644
--- a/arch/loongarch/include/asm/setup.h
+++ b/arch/loongarch/include/asm/setup.h
@@ -7,7 +7,7 @@
#define _LOONGARCH_SETUP_H
#include <linux/types.h>
-#include <uapi/asm/setup.h>
+#include <asm-generic/setup.h>
#define VECSIZE 0x200
diff --git a/arch/sh/include/asm/setup.h b/arch/sh/include/asm/setup.h
index fc807011187f..ae09b1c29fd1 100644
--- a/arch/sh/include/asm/setup.h
+++ b/arch/sh/include/asm/setup.h
@@ -2,7 +2,7 @@
#ifndef _SH_SETUP_H
#define _SH_SETUP_H
-#include <uapi/asm/setup.h>
+#include <asm-generic/setup.h>
/*
* This is set up by the setup-routine at boot-time
diff --git a/include/asm-generic/Kbuild b/include/asm-generic/Kbuild
index 941be574bbe0..0fb55a119f54 100644
--- a/include/asm-generic/Kbuild
+++ b/include/asm-generic/Kbuild
@@ -49,6 +49,7 @@ mandatory-y += preempt.h
mandatory-y += rwonce.h
mandatory-y += sections.h
mandatory-y += serial.h
+mandatory-y += setup.h
mandatory-y += shmparam.h
mandatory-y += simd.h
mandatory-y += softirq_stack.h
diff --git a/include/uapi/asm-generic/setup.h b/include/asm-generic/setup.h
similarity index 100%
rename from include/uapi/asm-generic/setup.h
rename to include/asm-generic/setup.h
diff --git a/include/uapi/asm-generic/Kbuild b/include/uapi/asm-generic/Kbuild
index ebb180aac74e..0e7122339ee9 100644
--- a/include/uapi/asm-generic/Kbuild
+++ b/include/uapi/asm-generic/Kbuild
@@ -20,7 +20,6 @@ mandatory-y += posix_types.h
mandatory-y += ptrace.h
mandatory-y += resource.h
mandatory-y += sembuf.h
-mandatory-y += setup.h
mandatory-y += shmbuf.h
mandatory-y += sigcontext.h
mandatory-y += siginfo.h
--
2.37.2
From: Palmer Dabbelt <[email protected]>
Signed-off-by: Palmer Dabbelt <[email protected]>
Signed-off-by: Alexandre Ghiti <[email protected]>
---
arch/alpha/include/uapi/asm/setup.h | 5 -----
1 file changed, 5 deletions(-)
delete mode 100644 arch/alpha/include/uapi/asm/setup.h
diff --git a/arch/alpha/include/uapi/asm/setup.h b/arch/alpha/include/uapi/asm/setup.h
deleted file mode 100644
index 9b3b5ba39b1d..000000000000
--- a/arch/alpha/include/uapi/asm/setup.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-#ifndef _UAPI__ALPHA_SETUP_H
-#define _UAPI__ALPHA_SETUP_H
-
-#endif /* _UAPI__ALPHA_SETUP_H */
--
2.37.2
From: Palmer Dabbelt <[email protected]>
Signed-off-by: Palmer Dabbelt <[email protected]>
Signed-off-by: Alexandre Ghiti <[email protected]>
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
---
arch/arc/include/asm/setup.h | 1 -
arch/arc/include/uapi/asm/setup.h | 6 ------
2 files changed, 7 deletions(-)
delete mode 100644 arch/arc/include/uapi/asm/setup.h
diff --git a/arch/arc/include/asm/setup.h b/arch/arc/include/asm/setup.h
index 028a8cf76206..fe45ff4681bc 100644
--- a/arch/arc/include/asm/setup.h
+++ b/arch/arc/include/asm/setup.h
@@ -7,7 +7,6 @@
#include <linux/types.h>
-#include <uapi/asm/setup.h>
#define COMMAND_LINE_SIZE 256
diff --git a/arch/arc/include/uapi/asm/setup.h b/arch/arc/include/uapi/asm/setup.h
deleted file mode 100644
index a6d4e44938be..000000000000
--- a/arch/arc/include/uapi/asm/setup.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/*
- * setup.h is part of userspace header ABI so UAPI scripts have to generate it
- * even if there's nothing to export - causing empty <uapi/asm/setup.h>
- * However to prevent "patch" from discarding it we add this placeholder
- * comment
- */
--
2.37.2
From: Palmer Dabbelt <[email protected]>
Signed-off-by: Palmer Dabbelt <[email protected]>
Signed-off-by: Alexandre Ghiti <[email protected]>
Acked-by: Geert Uytterhoeven <[email protected]>
---
arch/m68k/include/uapi/asm/setup.h | 15 ---------------
1 file changed, 15 deletions(-)
delete mode 100644 arch/m68k/include/uapi/asm/setup.h
diff --git a/arch/m68k/include/uapi/asm/setup.h b/arch/m68k/include/uapi/asm/setup.h
deleted file mode 100644
index 005593acc7d8..000000000000
--- a/arch/m68k/include/uapi/asm/setup.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-/*
-** asm/setup.h -- Definition of the Linux/m68k setup information
-**
-** Copyright 1992 by Greg Harp
-**
-** This file is subject to the terms and conditions of the GNU General Public
-** License. See the file COPYING in the main directory of this archive
-** for more details.
-*/
-
-#ifndef _UAPI_M68K_SETUP_H
-#define _UAPI_M68K_SETUP_H
-
-#endif /* _UAPI_M68K_SETUP_H */
--
2.37.2
From: Palmer Dabbelt <[email protected]>
Signed-off-by: Palmer Dabbelt <[email protected]>
Signed-off-by: Alexandre Ghiti <[email protected]>
---
arch/arm64/include/uapi/asm/setup.h | 25 -------------------------
1 file changed, 25 deletions(-)
delete mode 100644 arch/arm64/include/uapi/asm/setup.h
diff --git a/arch/arm64/include/uapi/asm/setup.h b/arch/arm64/include/uapi/asm/setup.h
deleted file mode 100644
index f9f51e5925aa..000000000000
--- a/arch/arm64/include/uapi/asm/setup.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-/*
- * Based on arch/arm/include/asm/setup.h
- *
- * Copyright (C) 1997-1999 Russell King
- * Copyright (C) 2012 ARM Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#ifndef __ASM_SETUP_H
-#define __ASM_SETUP_H
-
-#include <linux/types.h>
-
-#endif
--
2.37.2
From: Palmer Dabbelt <[email protected]>
Signed-off-by: Palmer Dabbelt <[email protected]>
Signed-off-by: Alexandre Ghiti <[email protected]>
---
arch/microblaze/include/uapi/asm/setup.h | 18 ------------------
1 file changed, 18 deletions(-)
delete mode 100644 arch/microblaze/include/uapi/asm/setup.h
diff --git a/arch/microblaze/include/uapi/asm/setup.h b/arch/microblaze/include/uapi/asm/setup.h
deleted file mode 100644
index 51aed65880e7..000000000000
--- a/arch/microblaze/include/uapi/asm/setup.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-/*
- * Copyright (C) 2007-2009 Michal Simek <[email protected]>
- * Copyright (C) 2007-2009 PetaLogix
- * Copyright (C) 2006 Atmark Techno, Inc.
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file "COPYING" in the main directory of this archive
- * for more details.
- */
-
-#ifndef _UAPI_ASM_MICROBLAZE_SETUP_H
-#define _UAPI_ASM_MICROBLAZE_SETUP_H
-
-# ifndef __ASSEMBLY__
-
-# endif /* __ASSEMBLY__ */
-#endif /* _UAPI_ASM_MICROBLAZE_SETUP_H */
--
2.37.2
From: Palmer Dabbelt <[email protected]>
Signed-off-by: Palmer Dabbelt <[email protected]>
Signed-off-by: Alexandre Ghiti <[email protected]>
---
arch/sparc/include/uapi/asm/setup.h | 9 ---------
1 file changed, 9 deletions(-)
delete mode 100644 arch/sparc/include/uapi/asm/setup.h
diff --git a/arch/sparc/include/uapi/asm/setup.h b/arch/sparc/include/uapi/asm/setup.h
deleted file mode 100644
index c3cf1b0d30b3..000000000000
--- a/arch/sparc/include/uapi/asm/setup.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-/*
- * Just a place holder.
- */
-
-#ifndef _UAPI_SPARC_SETUP_H
-#define _UAPI_SPARC_SETUP_H
-
-#endif /* _UAPI_SPARC_SETUP_H */
--
2.37.2
From: Palmer Dabbelt <[email protected]>
Signed-off-by: Palmer Dabbelt <[email protected]>
Signed-off-by: Alexandre Ghiti <[email protected]>
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
Acked-by: Helge Deller <[email protected]>
---
arch/parisc/include/uapi/asm/setup.h | 5 -----
1 file changed, 5 deletions(-)
delete mode 100644 arch/parisc/include/uapi/asm/setup.h
diff --git a/arch/parisc/include/uapi/asm/setup.h b/arch/parisc/include/uapi/asm/setup.h
deleted file mode 100644
index bfad89428e47..000000000000
--- a/arch/parisc/include/uapi/asm/setup.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-#ifndef _PARISC_SETUP_H
-#define _PARISC_SETUP_H
-
-#endif /* _PARISC_SETUP_H */
--
2.37.2
From: Palmer Dabbelt <[email protected]>
Signed-off-by: Palmer Dabbelt <[email protected]>
Signed-off-by: Alexandre Ghiti <[email protected]>
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
---
arch/x86/include/asm/setup.h | 2 --
arch/x86/include/uapi/asm/setup.h | 1 -
2 files changed, 3 deletions(-)
delete mode 100644 arch/x86/include/uapi/asm/setup.h
diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h
index f37cbff7354c..449b50a2f390 100644
--- a/arch/x86/include/asm/setup.h
+++ b/arch/x86/include/asm/setup.h
@@ -2,8 +2,6 @@
#ifndef _ASM_X86_SETUP_H
#define _ASM_X86_SETUP_H
-#include <uapi/asm/setup.h>
-
#define COMMAND_LINE_SIZE 2048
#include <linux/linkage.h>
diff --git a/arch/x86/include/uapi/asm/setup.h b/arch/x86/include/uapi/asm/setup.h
deleted file mode 100644
index 79a9626b5500..000000000000
--- a/arch/x86/include/uapi/asm/setup.h
+++ /dev/null
@@ -1 +0,0 @@
-/* */
--
2.37.2
From: Palmer Dabbelt <[email protected]>
Signed-off-by: Palmer Dabbelt <[email protected]>
Signed-off-by: Alexandre Ghiti <[email protected]>
Acked-by: Max Filippov <[email protected]>
---
arch/xtensa/include/uapi/asm/setup.h | 15 ---------------
1 file changed, 15 deletions(-)
delete mode 100644 arch/xtensa/include/uapi/asm/setup.h
diff --git a/arch/xtensa/include/uapi/asm/setup.h b/arch/xtensa/include/uapi/asm/setup.h
deleted file mode 100644
index 6f982394684a..000000000000
--- a/arch/xtensa/include/uapi/asm/setup.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-/*
- * include/asm-xtensa/setup.h
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file "COPYING" in the main directory of this archive
- * for more details.
- *
- * Copyright (C) 2001 - 2005 Tensilica Inc.
- */
-
-#ifndef _XTENSA_SETUP_H
-#define _XTENSA_SETUP_H
-
-#endif
--
2.37.2
From: Palmer Dabbelt <[email protected]>
Signed-off-by: Palmer Dabbelt <[email protected]>
Signed-off-by: Alexandre Ghiti <[email protected]>
---
arch/powerpc/include/uapi/asm/setup.h | 5 -----
1 file changed, 5 deletions(-)
delete mode 100644 arch/powerpc/include/uapi/asm/setup.h
diff --git a/arch/powerpc/include/uapi/asm/setup.h b/arch/powerpc/include/uapi/asm/setup.h
deleted file mode 100644
index f2ca747aa45b..000000000000
--- a/arch/powerpc/include/uapi/asm/setup.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-#ifndef _UAPI_ASM_POWERPC_SETUP_H
-#define _UAPI_ASM_POWERPC_SETUP_H
-
-#endif /* _UAPI_ASM_POWERPC_SETUP_H */
--
2.37.2
From: Palmer Dabbelt <[email protected]>
Signed-off-by: Palmer Dabbelt <[email protected]>
Signed-off-by: Alexandre Ghiti <[email protected]>
---
arch/mips/include/uapi/asm/setup.h | 5 -----
1 file changed, 5 deletions(-)
delete mode 100644 arch/mips/include/uapi/asm/setup.h
diff --git a/arch/mips/include/uapi/asm/setup.h b/arch/mips/include/uapi/asm/setup.h
deleted file mode 100644
index 157c3c392fb4..000000000000
--- a/arch/mips/include/uapi/asm/setup.h
+++ /dev/null
@@ -1,5 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
-#ifndef _UAPI_MIPS_SETUP_H
-#define _UAPI_MIPS_SETUP_H
-
-#endif /* _UAPI_MIPS_SETUP_H */
--
2.37.2
From: Palmer Dabbelt <[email protected]>
Signed-off-by: Palmer Dabbelt <[email protected]>
Signed-off-by: Alexandre Ghiti <[email protected]>
Acked-by: Heiko Carstens <[email protected]>
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
---
arch/s390/include/asm/setup.h | 1 -
arch/s390/include/uapi/asm/setup.h | 1 -
2 files changed, 2 deletions(-)
delete mode 100644 arch/s390/include/uapi/asm/setup.h
diff --git a/arch/s390/include/asm/setup.h b/arch/s390/include/asm/setup.h
index 177bf6deaa27..99c1cc97350a 100644
--- a/arch/s390/include/asm/setup.h
+++ b/arch/s390/include/asm/setup.h
@@ -7,7 +7,6 @@
#define _ASM_S390_SETUP_H
#include <linux/bits.h>
-#include <uapi/asm/setup.h>
#include <linux/build_bug.h>
#define PARMAREA 0x10400
diff --git a/arch/s390/include/uapi/asm/setup.h b/arch/s390/include/uapi/asm/setup.h
deleted file mode 100644
index 598d769e76df..000000000000
--- a/arch/s390/include/uapi/asm/setup.h
+++ /dev/null
@@ -1 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
--
2.37.2
Signed-off-by: Alexandre Ghiti <[email protected]>
---
arch/riscv/include/uapi/asm/setup.h | 6 ------
1 file changed, 6 deletions(-)
delete mode 100644 arch/riscv/include/uapi/asm/setup.h
diff --git a/arch/riscv/include/uapi/asm/setup.h b/arch/riscv/include/uapi/asm/setup.h
deleted file mode 100644
index 17fcecd4a2f8..000000000000
--- a/arch/riscv/include/uapi/asm/setup.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */
-
-#ifndef _UAPI_ASM_RISCV_SETUP_H
-#define _UAPI_ASM_RISCV_SETUP_H
-
-#endif /* _UAPI_ASM_RISCV_SETUP_H */
--
2.37.2
On 6/3/23 11:04, Alexandre Ghiti wrote:
> This all came up in the context of increasing COMMAND_LINE_SIZE in the
> RISC-V port. In theory that's a UABI break, as COMMAND_LINE_SIZE is the
> maximum length of /proc/cmdline and userspace could staticly rely on
> that to be correct.
>
> Usually I wouldn't mess around with changing this sort of thing, but
> PowerPC increased it with a5980d064fe2 ("powerpc: Bump COMMAND_LINE_SIZE
> to 2048"). There are also a handful of examples of COMMAND_LINE_SIZE
> increasing, but they're from before the UAPI split so I'm not quite sure
> what that means: e5a6a1c90948 ("powerpc: derive COMMAND_LINE_SIZE from
> asm-generic"), 684d2fd48e71 ("[S390] kernel: Append scpdata to kernel
> boot command line"), 22242681cff5 ("MIPS: Extend COMMAND_LINE_SIZE"),
> and 2b74b85693c7 ("sh: Derive COMMAND_LINE_SIZE from
> asm-generic/setup.h.").
>
> It seems to me like COMMAND_LINE_SIZE really just shouldn't have been
> part of the uapi to begin with, and userspace should be able to handle
> /proc/cmdline of whatever length it turns out to be. I don't see any
> references to COMMAND_LINE_SIZE anywhere but Linux via a quick Google
> search, but that's not really enough to consider it unused on my end.
>
> This issue was already considered in s390 and they reached the same
> conclusion in commit 622021cd6c56 ("s390: make command line
> configurable").
>
> The feedback on the v1 seemed to indicate that COMMAND_LINE_SIZE really
> shouldn't be part of uapi, so this now touches all the ports. I've
> tried to split this all out and leave it bisectable, but I haven't
> tested it all that aggressively.
Series:
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
On Mon, 06 Mar 2023 02:04:54 PST (-0800), [email protected] wrote:
> As far as I can tell this is not used by userspace and thus should not
> be part of the user-visible API.
>
> Signed-off-by: Alexandre Ghiti <[email protected]>
> ---
> arch/riscv/include/asm/setup.h | 7 +++++++
> arch/riscv/include/uapi/asm/setup.h | 2 --
> 2 files changed, 7 insertions(+), 2 deletions(-)
> create mode 100644 arch/riscv/include/asm/setup.h
>
> diff --git a/arch/riscv/include/asm/setup.h b/arch/riscv/include/asm/setup.h
> new file mode 100644
> index 000000000000..f165a14344e2
> --- /dev/null
> +++ b/arch/riscv/include/asm/setup.h
> @@ -0,0 +1,7 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> +#ifndef _ASM_RISCV_SETUP_H
> +#define _ASM_RISCV_SETUP_H
> +
> +#define COMMAND_LINE_SIZE 1024
> +
> +#endif /* _ASM_RISCV_SETUP_H */
> diff --git a/arch/riscv/include/uapi/asm/setup.h b/arch/riscv/include/uapi/asm/setup.h
> index 66b13a522880..17fcecd4a2f8 100644
> --- a/arch/riscv/include/uapi/asm/setup.h
> +++ b/arch/riscv/include/uapi/asm/setup.h
> @@ -3,6 +3,4 @@
> #ifndef _UAPI_ASM_RISCV_SETUP_H
> #define _UAPI_ASM_RISCV_SETUP_H
>
> -#define COMMAND_LINE_SIZE 1024
> -
> #endif /* _UAPI_ASM_RISCV_SETUP_H */
Reviewed-by: Palmer Dabbelt <[email protected]>
Acked-by: Palmer Dabbelt <[email protected]>
Thanks!
Hi Arnd,
On Mon, Mar 6, 2023 at 11:05 AM Alexandre Ghiti <[email protected]> wrote:
>
> This all came up in the context of increasing COMMAND_LINE_SIZE in the
> RISC-V port. In theory that's a UABI break, as COMMAND_LINE_SIZE is the
> maximum length of /proc/cmdline and userspace could staticly rely on
> that to be correct.
>
> Usually I wouldn't mess around with changing this sort of thing, but
> PowerPC increased it with a5980d064fe2 ("powerpc: Bump COMMAND_LINE_SIZE
> to 2048"). There are also a handful of examples of COMMAND_LINE_SIZE
> increasing, but they're from before the UAPI split so I'm not quite sure
> what that means: e5a6a1c90948 ("powerpc: derive COMMAND_LINE_SIZE from
> asm-generic"), 684d2fd48e71 ("[S390] kernel: Append scpdata to kernel
> boot command line"), 22242681cff5 ("MIPS: Extend COMMAND_LINE_SIZE"),
> and 2b74b85693c7 ("sh: Derive COMMAND_LINE_SIZE from
> asm-generic/setup.h.").
>
> It seems to me like COMMAND_LINE_SIZE really just shouldn't have been
> part of the uapi to begin with, and userspace should be able to handle
> /proc/cmdline of whatever length it turns out to be. I don't see any
> references to COMMAND_LINE_SIZE anywhere but Linux via a quick Google
> search, but that's not really enough to consider it unused on my end.
>
> This issue was already considered in s390 and they reached the same
> conclusion in commit 622021cd6c56 ("s390: make command line
> configurable").
>
> The feedback on the v1 seemed to indicate that COMMAND_LINE_SIZE really
> shouldn't be part of uapi, so this now touches all the ports. I've
> tried to split this all out and leave it bisectable, but I haven't
> tested it all that aggressively.
>
> Changes since v4 <https://lore.kernel.org/all/[email protected]/>:
> * Add my own SoB as suggested by Geert
> * Add riscv patches as suggested by Björn
> * Remove "WITH Linux-syscall-note" from new setup.h not in uapi/, as
> suggested by Greg KH, his quoted answer below:
>
> "The "syscall note" makes no sense at all for any files not in the uapi/
> directory, so you can remove it just fine as that WITH doesn't mean
> anything _UNLESS_ the file is in the uapi directory."
>
> Changes since v3 <https://lore.kernel.org/all/[email protected]/>:
> * Added RB/AB
> * Added a mention to commit 622021cd6c56 ("s390: make command line
> configurable") in the cover letter
>
> Changes since v2 <https://lore.kernel.org/all/[email protected]/>:
> * Fix sh, csky and ia64 builds, as reported by kernel test robot
>
> Changes since v1 <https://lore.kernel.org/all/[email protected]/>:
> * Touches every arch.
>
> base-commit-tag: next-20230207
>
> Alexandre Ghiti (2):
> riscv: Remove COMMAND_LINE_SIZE from uapi
> riscv: Remove empty <uapi/asm/setup.h>
>
> Palmer Dabbelt (24):
> alpha: Remove COMMAND_LINE_SIZE from uapi
> arm64: Remove COMMAND_LINE_SIZE from uapi
> arm: Remove COMMAND_LINE_SIZE from uapi
> ia64: Remove COMMAND_LINE_SIZE from uapi
> m68k: Remove COMMAND_LINE_SIZE from uapi
> microblaze: Remove COMMAND_LINE_SIZE from uapi
> mips: Remove COMMAND_LINE_SIZE from uapi
> parisc: Remove COMMAND_LINE_SIZE from uapi
> powerpc: Remove COMMAND_LINE_SIZE from uapi
> sparc: Remove COMMAND_LINE_SIZE from uapi
> xtensa: Remove COMMAND_LINE_SIZE from uapi
> asm-generic: Remove COMMAND_LINE_SIZE from uapi
> alpha: Remove empty <uapi/asm/setup.h>
> arc: Remove empty <uapi/asm/setup.h>
> m68k: Remove empty <uapi/asm/setup.h>
> arm64: Remove empty <uapi/asm/setup.h>
> microblaze: Remove empty <uapi/asm/setup.h>
> sparc: Remove empty <uapi/asm/setup.h>
> parisc: Remove empty <uapi/asm/setup.h>
> x86: Remove empty <uapi/asm/setup.h>
> xtensa: Remove empty <uapi/asm/setup.h>
> powerpc: Remove empty <uapi/asm/setup.h>
> mips: Remove empty <uapi/asm/setup.h>
> s390: Remove empty <uapi/asm/setup.h>
>
> .../admin-guide/kernel-parameters.rst | 2 +-
> arch/alpha/include/asm/setup.h | 4 +--
> arch/alpha/include/uapi/asm/setup.h | 7 -----
> arch/arc/include/asm/setup.h | 1 -
> arch/arc/include/uapi/asm/setup.h | 6 -----
> arch/arm/include/asm/setup.h | 1 +
> arch/arm/include/uapi/asm/setup.h | 2 --
> arch/arm64/include/asm/setup.h | 3 ++-
> arch/arm64/include/uapi/asm/setup.h | 27 -------------------
> arch/ia64/include/asm/setup.h | 10 +++++++
> arch/ia64/include/uapi/asm/setup.h | 6 ++---
> arch/loongarch/include/asm/setup.h | 2 +-
> arch/m68k/include/asm/setup.h | 3 +--
> arch/m68k/include/uapi/asm/setup.h | 17 ------------
> arch/microblaze/include/asm/setup.h | 2 +-
> arch/microblaze/include/uapi/asm/setup.h | 20 --------------
> arch/mips/include/asm/setup.h | 3 ++-
> arch/mips/include/uapi/asm/setup.h | 8 ------
> arch/parisc/include/{uapi => }/asm/setup.h | 2 +-
> arch/powerpc/include/asm/setup.h | 2 +-
> arch/powerpc/include/uapi/asm/setup.h | 7 -----
> arch/riscv/include/asm/setup.h | 7 +++++
> arch/riscv/include/uapi/asm/setup.h | 8 ------
> arch/s390/include/asm/setup.h | 1 -
> arch/s390/include/uapi/asm/setup.h | 1 -
> arch/sh/include/asm/setup.h | 2 +-
> arch/sparc/include/asm/setup.h | 6 ++++-
> arch/sparc/include/uapi/asm/setup.h | 16 -----------
> arch/x86/include/asm/setup.h | 2 --
> arch/x86/include/uapi/asm/setup.h | 1 -
> arch/xtensa/include/{uapi => }/asm/setup.h | 2 +-
> include/asm-generic/Kbuild | 1 +
> include/{uapi => }/asm-generic/setup.h | 0
> include/uapi/asm-generic/Kbuild | 1 -
> 34 files changed, 40 insertions(+), 143 deletions(-)
> delete mode 100644 arch/alpha/include/uapi/asm/setup.h
> delete mode 100644 arch/arc/include/uapi/asm/setup.h
> delete mode 100644 arch/arm64/include/uapi/asm/setup.h
> create mode 100644 arch/ia64/include/asm/setup.h
> delete mode 100644 arch/m68k/include/uapi/asm/setup.h
> delete mode 100644 arch/microblaze/include/uapi/asm/setup.h
> delete mode 100644 arch/mips/include/uapi/asm/setup.h
> rename arch/parisc/include/{uapi => }/asm/setup.h (63%)
> delete mode 100644 arch/powerpc/include/uapi/asm/setup.h
> create mode 100644 arch/riscv/include/asm/setup.h
> delete mode 100644 arch/riscv/include/uapi/asm/setup.h
> delete mode 100644 arch/s390/include/uapi/asm/setup.h
> delete mode 100644 arch/sparc/include/uapi/asm/setup.h
> delete mode 100644 arch/x86/include/uapi/asm/setup.h
> rename arch/xtensa/include/{uapi => }/asm/setup.h (84%)
> rename include/{uapi => }/asm-generic/setup.h (100%)
>
> --
> 2.37.2
>
I don't see this series in 6.4-rc1, I don't mean to bother you, I just
want to make sure it did not get lost :)
Thanks,
Alex
On Mon, 6 Mar 2023, Alexandre Ghiti wrote:
> diff --git a/arch/alpha/include/uapi/asm/setup.h b/arch/alpha/include/uapi/asm/setup.h
> deleted file mode 100644
> index 9b3b5ba39b1d..000000000000
> --- a/arch/alpha/include/uapi/asm/setup.h
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
> -#ifndef _UAPI__ALPHA_SETUP_H
> -#define _UAPI__ALPHA_SETUP_H
> -
> -#endif /* _UAPI__ALPHA_SETUP_H */
You can't just remove a UAPI header like this, something will break; cf.
arch/arc/include/uapi/asm/setup.h, or arch/x86/include/uapi/asm/setup.h if
you want it brief.
I suggest that you fold it into 01/26 (it makes no sense to have empty
multiple inclusion protection), and likewise for the relevant remaining
headers.
Maciej