| Message ID | 20230811204930.1529925-1-arnd@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | asm-generic: partially revert "Unify uapi bitsperlong.h for arm64, riscv and loongarch" | expand |
On Fri, Aug 11, 2023 at 10:49:07PM +0200, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > Unifying the asm-generic headers across 32-bit and 64-bit architectures > based on the compiler provided macros was a good idea and appears to work > with all user space, but it caused a regression when building old kernels > on systems that have the new headers installed in /usr/include, as this > combination trips an inconsistency in the kernel's own tools/include > headers that are a mix of userspace and kernel-internal headers. > > This affects kernel builds on arm64, riscv64 and loongarch64 systems that > might end up using the "#define __BITS_PER_LONG 32" default from the old > tools headers. Backporting the commit into stable kernels would address > this, but it would still break building kernels without that backport, > and waste time for developers trying to understand the problem. > > arm64 build machines are rather common, and on riscv64 this can also > happen in practice, but loongarch64 is probably new enough to not > be used much for building old kernels, so only revert the bits > for arm64 and riscv. > > Link: https://lore.kernel.org/all/20230731160402.GB1823389@dev-arch.thelio-3990X/ > Reported-by: Nathan Chancellor <nathan@kernel.org> > Fixes: 8386f58f8deda ("asm-generic: Unify uapi bitsperlong.h for arm64, riscv and loongarch") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> Tested-by: Nathan Chancellor <nathan@kernel.org> > --- > arch/arm64/include/uapi/asm/bitsperlong.h | 24 +++++++++++++++++++ > arch/riscv/include/uapi/asm/bitsperlong.h | 14 +++++++++++ > .../arch/arm64/include/uapi/asm/bitsperlong.h | 24 +++++++++++++++++++ > .../arch/riscv/include/uapi/asm/bitsperlong.h | 14 +++++++++++ > 4 files changed, 76 insertions(+) > create mode 100644 arch/arm64/include/uapi/asm/bitsperlong.h > create mode 100644 arch/riscv/include/uapi/asm/bitsperlong.h > create mode 100644 tools/arch/arm64/include/uapi/asm/bitsperlong.h > create mode 100644 tools/arch/riscv/include/uapi/asm/bitsperlong.h > > diff --git a/arch/arm64/include/uapi/asm/bitsperlong.h b/arch/arm64/include/uapi/asm/bitsperlong.h > new file mode 100644 > index 0000000000000..485d60bee26ca > --- /dev/null > +++ b/arch/arm64/include/uapi/asm/bitsperlong.h > @@ -0,0 +1,24 @@ > +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ > +/* > + * 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_BITSPERLONG_H > +#define __ASM_BITSPERLONG_H > + > +#define __BITS_PER_LONG 64 > + > +#include <asm-generic/bitsperlong.h> > + > +#endif /* __ASM_BITSPERLONG_H */ > diff --git a/arch/riscv/include/uapi/asm/bitsperlong.h b/arch/riscv/include/uapi/asm/bitsperlong.h > new file mode 100644 > index 0000000000000..7d0b32e3b7017 > --- /dev/null > +++ b/arch/riscv/include/uapi/asm/bitsperlong.h > @@ -0,0 +1,14 @@ > +/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */ > +/* > + * Copyright (C) 2012 ARM Ltd. > + * Copyright (C) 2015 Regents of the University of California > + */ > + > +#ifndef _UAPI_ASM_RISCV_BITSPERLONG_H > +#define _UAPI_ASM_RISCV_BITSPERLONG_H > + > +#define __BITS_PER_LONG (__SIZEOF_POINTER__ * 8) > + > +#include <asm-generic/bitsperlong.h> > + > +#endif /* _UAPI_ASM_RISCV_BITSPERLONG_H */ > diff --git a/tools/arch/arm64/include/uapi/asm/bitsperlong.h b/tools/arch/arm64/include/uapi/asm/bitsperlong.h > new file mode 100644 > index 0000000000000..485d60bee26ca > --- /dev/null > +++ b/tools/arch/arm64/include/uapi/asm/bitsperlong.h > @@ -0,0 +1,24 @@ > +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ > +/* > + * 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_BITSPERLONG_H > +#define __ASM_BITSPERLONG_H > + > +#define __BITS_PER_LONG 64 > + > +#include <asm-generic/bitsperlong.h> > + > +#endif /* __ASM_BITSPERLONG_H */ > diff --git a/tools/arch/riscv/include/uapi/asm/bitsperlong.h b/tools/arch/riscv/include/uapi/asm/bitsperlong.h > new file mode 100644 > index 0000000000000..0b9b58b57ff6e > --- /dev/null > +++ b/tools/arch/riscv/include/uapi/asm/bitsperlong.h > @@ -0,0 +1,14 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > +/* > + * Copyright (C) 2012 ARM Ltd. > + * Copyright (C) 2015 Regents of the University of California > + */ > + > +#ifndef _UAPI_ASM_RISCV_BITSPERLONG_H > +#define _UAPI_ASM_RISCV_BITSPERLONG_H > + > +#define __BITS_PER_LONG (__SIZEOF_POINTER__ * 8) > + > +#include <asm-generic/bitsperlong.h> > + > +#endif /* _UAPI_ASM_RISCV_BITSPERLONG_H */ > -- > 2.39.2 >
On Fri, 11 Aug 2023 13:49:07 PDT (-0700), arnd@kernel.org wrote: > From: Arnd Bergmann <arnd@arndb.de> > > Unifying the asm-generic headers across 32-bit and 64-bit architectures > based on the compiler provided macros was a good idea and appears to work > with all user space, but it caused a regression when building old kernels > on systems that have the new headers installed in /usr/include, as this > combination trips an inconsistency in the kernel's own tools/include > headers that are a mix of userspace and kernel-internal headers. > > This affects kernel builds on arm64, riscv64 and loongarch64 systems that > might end up using the "#define __BITS_PER_LONG 32" default from the old > tools headers. Backporting the commit into stable kernels would address > this, but it would still break building kernels without that backport, > and waste time for developers trying to understand the problem. > > arm64 build machines are rather common, and on riscv64 this can also > happen in practice, but loongarch64 is probably new enough to not > be used much for building old kernels, so only revert the bits > for arm64 and riscv. > > Link: https://lore.kernel.org/all/20230731160402.GB1823389@dev-arch.thelio-3990X/ > Reported-by: Nathan Chancellor <nathan@kernel.org> > Fixes: 8386f58f8deda ("asm-generic: Unify uapi bitsperlong.h for arm64, riscv and loongarch") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > arch/arm64/include/uapi/asm/bitsperlong.h | 24 +++++++++++++++++++ > arch/riscv/include/uapi/asm/bitsperlong.h | 14 +++++++++++ > .../arch/arm64/include/uapi/asm/bitsperlong.h | 24 +++++++++++++++++++ > .../arch/riscv/include/uapi/asm/bitsperlong.h | 14 +++++++++++ Acked-by: Palmer Dabbelt <palmer@rivosinc.com> # RISC-V > 4 files changed, 76 insertions(+) > create mode 100644 arch/arm64/include/uapi/asm/bitsperlong.h > create mode 100644 arch/riscv/include/uapi/asm/bitsperlong.h > create mode 100644 tools/arch/arm64/include/uapi/asm/bitsperlong.h > create mode 100644 tools/arch/riscv/include/uapi/asm/bitsperlong.h > > diff --git a/arch/arm64/include/uapi/asm/bitsperlong.h b/arch/arm64/include/uapi/asm/bitsperlong.h > new file mode 100644 > index 0000000000000..485d60bee26ca > --- /dev/null > +++ b/arch/arm64/include/uapi/asm/bitsperlong.h > @@ -0,0 +1,24 @@ > +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ > +/* > + * 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_BITSPERLONG_H > +#define __ASM_BITSPERLONG_H > + > +#define __BITS_PER_LONG 64 > + > +#include <asm-generic/bitsperlong.h> > + > +#endif /* __ASM_BITSPERLONG_H */ > diff --git a/arch/riscv/include/uapi/asm/bitsperlong.h b/arch/riscv/include/uapi/asm/bitsperlong.h > new file mode 100644 > index 0000000000000..7d0b32e3b7017 > --- /dev/null > +++ b/arch/riscv/include/uapi/asm/bitsperlong.h > @@ -0,0 +1,14 @@ > +/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */ > +/* > + * Copyright (C) 2012 ARM Ltd. > + * Copyright (C) 2015 Regents of the University of California > + */ > + > +#ifndef _UAPI_ASM_RISCV_BITSPERLONG_H > +#define _UAPI_ASM_RISCV_BITSPERLONG_H > + > +#define __BITS_PER_LONG (__SIZEOF_POINTER__ * 8) > + > +#include <asm-generic/bitsperlong.h> > + > +#endif /* _UAPI_ASM_RISCV_BITSPERLONG_H */ > diff --git a/tools/arch/arm64/include/uapi/asm/bitsperlong.h b/tools/arch/arm64/include/uapi/asm/bitsperlong.h > new file mode 100644 > index 0000000000000..485d60bee26ca > --- /dev/null > +++ b/tools/arch/arm64/include/uapi/asm/bitsperlong.h > @@ -0,0 +1,24 @@ > +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ > +/* > + * 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_BITSPERLONG_H > +#define __ASM_BITSPERLONG_H > + > +#define __BITS_PER_LONG 64 > + > +#include <asm-generic/bitsperlong.h> > + > +#endif /* __ASM_BITSPERLONG_H */ > diff --git a/tools/arch/riscv/include/uapi/asm/bitsperlong.h b/tools/arch/riscv/include/uapi/asm/bitsperlong.h > new file mode 100644 > index 0000000000000..0b9b58b57ff6e > --- /dev/null > +++ b/tools/arch/riscv/include/uapi/asm/bitsperlong.h > @@ -0,0 +1,14 @@ > +/* SPDX-License-Identifier: GPL-2.0-only */ > +/* > + * Copyright (C) 2012 ARM Ltd. > + * Copyright (C) 2015 Regents of the University of California > + */ > + > +#ifndef _UAPI_ASM_RISCV_BITSPERLONG_H > +#define _UAPI_ASM_RISCV_BITSPERLONG_H > + > +#define __BITS_PER_LONG (__SIZEOF_POINTER__ * 8) > + > +#include <asm-generic/bitsperlong.h> > + > +#endif /* _UAPI_ASM_RISCV_BITSPERLONG_H */
On Fri, Aug 11, 2023 at 10:49:07PM +0200, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@arndb.de> > > Unifying the asm-generic headers across 32-bit and 64-bit architectures > based on the compiler provided macros was a good idea and appears to work > with all user space, but it caused a regression when building old kernels > on systems that have the new headers installed in /usr/include, as this > combination trips an inconsistency in the kernel's own tools/include > headers that are a mix of userspace and kernel-internal headers. > > This affects kernel builds on arm64, riscv64 and loongarch64 systems that > might end up using the "#define __BITS_PER_LONG 32" default from the old > tools headers. Backporting the commit into stable kernels would address > this, but it would still break building kernels without that backport, > and waste time for developers trying to understand the problem. > > arm64 build machines are rather common, and on riscv64 this can also > happen in practice, but loongarch64 is probably new enough to not > be used much for building old kernels, so only revert the bits > for arm64 and riscv. > > Link: https://lore.kernel.org/all/20230731160402.GB1823389@dev-arch.thelio-3990X/ > Reported-by: Nathan Chancellor <nathan@kernel.org> > Fixes: 8386f58f8deda ("asm-generic: Unify uapi bitsperlong.h for arm64, riscv and loongarch") > Signed-off-by: Arnd Bergmann <arnd@arndb.de> For arm64: Acked-by: Catalin Marinas <catalin.marinas@arm.com>
diff --git a/arch/arm64/include/uapi/asm/bitsperlong.h b/arch/arm64/include/uapi/asm/bitsperlong.h new file mode 100644 index 0000000000000..485d60bee26ca --- /dev/null +++ b/arch/arm64/include/uapi/asm/bitsperlong.h @@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * 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_BITSPERLONG_H +#define __ASM_BITSPERLONG_H + +#define __BITS_PER_LONG 64 + +#include <asm-generic/bitsperlong.h> + +#endif /* __ASM_BITSPERLONG_H */ diff --git a/arch/riscv/include/uapi/asm/bitsperlong.h b/arch/riscv/include/uapi/asm/bitsperlong.h new file mode 100644 index 0000000000000..7d0b32e3b7017 --- /dev/null +++ b/arch/riscv/include/uapi/asm/bitsperlong.h @@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */ +/* + * Copyright (C) 2012 ARM Ltd. + * Copyright (C) 2015 Regents of the University of California + */ + +#ifndef _UAPI_ASM_RISCV_BITSPERLONG_H +#define _UAPI_ASM_RISCV_BITSPERLONG_H + +#define __BITS_PER_LONG (__SIZEOF_POINTER__ * 8) + +#include <asm-generic/bitsperlong.h> + +#endif /* _UAPI_ASM_RISCV_BITSPERLONG_H */ diff --git a/tools/arch/arm64/include/uapi/asm/bitsperlong.h b/tools/arch/arm64/include/uapi/asm/bitsperlong.h new file mode 100644 index 0000000000000..485d60bee26ca --- /dev/null +++ b/tools/arch/arm64/include/uapi/asm/bitsperlong.h @@ -0,0 +1,24 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +/* + * 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_BITSPERLONG_H +#define __ASM_BITSPERLONG_H + +#define __BITS_PER_LONG 64 + +#include <asm-generic/bitsperlong.h> + +#endif /* __ASM_BITSPERLONG_H */ diff --git a/tools/arch/riscv/include/uapi/asm/bitsperlong.h b/tools/arch/riscv/include/uapi/asm/bitsperlong.h new file mode 100644 index 0000000000000..0b9b58b57ff6e --- /dev/null +++ b/tools/arch/riscv/include/uapi/asm/bitsperlong.h @@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright (C) 2012 ARM Ltd. + * Copyright (C) 2015 Regents of the University of California + */ + +#ifndef _UAPI_ASM_RISCV_BITSPERLONG_H +#define _UAPI_ASM_RISCV_BITSPERLONG_H + +#define __BITS_PER_LONG (__SIZEOF_POINTER__ * 8) + +#include <asm-generic/bitsperlong.h> + +#endif /* _UAPI_ASM_RISCV_BITSPERLONG_H */