From: Greg Kroah-Hartman Date: Tue, 17 Jun 2025 14:11:47 +0000 (+0200) Subject: 5.4-stable patches X-Git-Tag: v6.6.94~34 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ce5a5e23a124692d3a7f32dcdb5b9a586e569eaf;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: drm-amd-display-do-not-add-mhard-float-to-dcn2-1-0-_resource.o-for-clang.patch drm-amd-display-do-not-add-mhard-float-to-dml_ccflags-for-clang.patch kbuild-add-clang_flags-to-as-instr.patch kbuild-add-clang_flags-to-kbuild_cppflags.patch kbuild-add-kbuild_cppflags-to-as-option-invocation.patch kbuild-update-assembler-calls-to-use-proper-flags-and-language-target.patch mips-include-kbuild_cppflags-in-checkflags-invocation.patch mips-move-wa-msoft-float-check-from-as-option-to-cc-option.patch posix-cpu-timers-fix-race-between-handle_posix_cpu_timers-and-posix_cpu_timer_del.patch x86-boot-compressed-prefer-cc-option-for-cflags-additions.patch --- diff --git a/queue-5.4/drm-amd-display-do-not-add-mhard-float-to-dcn2-1-0-_resource.o-for-clang.patch b/queue-5.4/drm-amd-display-do-not-add-mhard-float-to-dcn2-1-0-_resource.o-for-clang.patch new file mode 100644 index 0000000000..66aa30882d --- /dev/null +++ b/queue-5.4/drm-amd-display-do-not-add-mhard-float-to-dcn2-1-0-_resource.o-for-clang.patch @@ -0,0 +1,55 @@ +From 935bdb6b1d0545b7c0d9d221f688b5786ab78b86 Mon Sep 17 00:00:00 2001 +From: Nathan Chancellor +Date: Wed, 4 Jun 2025 14:08:09 -0700 +Subject: drm/amd/display: Do not add '-mhard-float' to dcn2{1,0}_resource.o for clang + +From: Nathan Chancellor + +This patch is for linux-5.15.y and earlier only. It is functionally +equivalent to upstream commit 7db038d9790e ("drm/amd/display: Do not add +'-mhard-float' to dml_ccflags for clang"), which was created after all +files that require '-mhard-float' were moved under the dml folder. In +kernels older than 5.18, which do not contain upstream commits + + 22f87d998326 ("drm/amd/display: move FPU operations from dcn21 to dml/dcn20 folder") + cf689e869cf0 ("drm/amd/display: move FPU-related code from dcn20 to dml folder") + +newer versions of clang error with + + clang: error: unsupported option '-mhard-float' for target 'x86_64-linux-gnu' + make[6]: *** [scripts/Makefile.build:289: drivers/gpu/drm/amd/amdgpu/../display/dc/dcn20/dcn20_resource.o] Error 1 + clang: error: unsupported option '-mhard-float' for target 'x86_64-linux-gnu' + make[6]: *** [scripts/Makefile.build:289: drivers/gpu/drm/amd/amdgpu/../display/dc/dcn21/dcn21_resource.o] Error 1 + +Apply a functionally equivalent change to prevent adding '-mhard-float' +with clang for these files. + +Signed-off-by: Nathan Chancellor +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/amd/display/dc/dcn20/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dcn21/Makefile | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/gpu/drm/amd/display/dc/dcn20/Makefile ++++ b/drivers/gpu/drm/amd/display/dc/dcn20/Makefile +@@ -10,7 +10,7 @@ ifdef CONFIG_DRM_AMD_DC_DSC_SUPPORT + DCN20 += dcn20_dsc.o + endif + +-CFLAGS_$(AMDDALPATH)/dc/dcn20/dcn20_resource.o := -mhard-float -msse ++CFLAGS_$(AMDDALPATH)/dc/dcn20/dcn20_resource.o := $(if $(CONFIG_CC_IS_GCC), -mhard-float) -msse + + ifdef CONFIG_CC_IS_GCC + ifeq ($(call cc-ifversion, -lt, 0701, y), y) +--- a/drivers/gpu/drm/amd/display/dc/dcn21/Makefile ++++ b/drivers/gpu/drm/amd/display/dc/dcn21/Makefile +@@ -3,7 +3,7 @@ + + DCN21 = dcn21_hubp.o dcn21_hubbub.o dcn21_resource.o + +-CFLAGS_$(AMDDALPATH)/dc/dcn21/dcn21_resource.o := -mhard-float -msse ++CFLAGS_$(AMDDALPATH)/dc/dcn21/dcn21_resource.o := $(if $(CONFIG_CC_IS_GCC), -mhard-float) -msse + + ifdef CONFIG_CC_IS_GCC + ifeq ($(call cc-ifversion, -lt, 0701, y), y) diff --git a/queue-5.4/drm-amd-display-do-not-add-mhard-float-to-dml_ccflags-for-clang.patch b/queue-5.4/drm-amd-display-do-not-add-mhard-float-to-dml_ccflags-for-clang.patch new file mode 100644 index 0000000000..b010170617 --- /dev/null +++ b/queue-5.4/drm-amd-display-do-not-add-mhard-float-to-dml_ccflags-for-clang.patch @@ -0,0 +1,43 @@ +From 817da77779e9bca5e52da4c1a93dff706732ff91 Mon Sep 17 00:00:00 2001 +From: Nathan Chancellor +Date: Wed, 11 Jan 2023 20:05:09 -0700 +Subject: drm/amd/display: Do not add '-mhard-float' to dml_ccflags for clang + +From: Nathan Chancellor + +commit 7db038d9790eda558dd6c1dde4cdd58b64789c47 upstream. + +When clang's -Qunused-arguments is dropped from KBUILD_CPPFLAGS, it +warns: + + clang-16: error: argument unused during compilation: '-mhard-float' [-Werror,-Wunused-command-line-argument] + +Similar to commit 84edc2eff827 ("selftest/fpu: avoid clang warning"), +just add this flag to GCC builds. Commit 0f0727d971f6 ("drm/amd/display: +readd -msse2 to prevent Clang from emitting libcalls to undefined SW FP +routines") added '-msse2' to prevent clang from emitting software +floating point routines. + +Signed-off-by: Nathan Chancellor +Acked-by: Alex Deucher +Tested-by: Linux Kernel Functional Testing +Tested-by: Anders Roxell +Signed-off-by: Masahiro Yamada +Signed-off-by: Nathan Chancellor +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/amd/display/dc/dml/Makefile | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/gpu/drm/amd/display/dc/dml/Makefile ++++ b/drivers/gpu/drm/amd/display/dc/dml/Makefile +@@ -24,7 +24,8 @@ + # It provides the general basic services required by other DAL + # subcomponents. + +-dml_ccflags := -mhard-float -msse ++dml_ccflags-$(CONFIG_CC_IS_GCC) := -mhard-float ++dml_ccflags := $(dml_ccflags-y) -msse + + ifdef CONFIG_CC_IS_GCC + ifeq ($(call cc-ifversion, -lt, 0701, y), y) diff --git a/queue-5.4/kbuild-add-clang_flags-to-as-instr.patch b/queue-5.4/kbuild-add-clang_flags-to-as-instr.patch new file mode 100644 index 0000000000..617780251f --- /dev/null +++ b/queue-5.4/kbuild-add-clang_flags-to-as-instr.patch @@ -0,0 +1,43 @@ +From b7e68767a827168474d68a6f5ab998eac82f8c90 Mon Sep 17 00:00:00 2001 +From: Nathan Chancellor +Date: Thu, 1 Jun 2023 12:50:39 -0700 +Subject: kbuild: Add CLANG_FLAGS to as-instr + +From: Nathan Chancellor + +commit cff6e7f50bd315e5b39c4e46c704ac587ceb965f upstream. + +A future change will move CLANG_FLAGS from KBUILD_{A,C}FLAGS to +KBUILD_CPPFLAGS so that '--target' is available while preprocessing. +When that occurs, the following errors appear multiple times when +building ARCH=powerpc powernv_defconfig: + + ld.lld: error: vmlinux.a(arch/powerpc/kernel/head_64.o):(.text+0x12d4): relocation R_PPC64_ADDR16_HI out of range: -4611686018409717520 is not in [-2147483648, 2147483647]; references '__start___soft_mask_table' + ld.lld: error: vmlinux.a(arch/powerpc/kernel/head_64.o):(.text+0x12e8): relocation R_PPC64_ADDR16_HI out of range: -4611686018409717392 is not in [-2147483648, 2147483647]; references '__stop___soft_mask_table' + +Diffing the .o.cmd files reveals that -DHAVE_AS_ATHIGH=1 is not present +anymore, because as-instr only uses KBUILD_AFLAGS, which will no longer +contain '--target'. + +Mirror Kconfig's as-instr and add CLANG_FLAGS explicitly to the +invocation to ensure the target information is always present. + +Signed-off-by: Nathan Chancellor +Signed-off-by: Masahiro Yamada +Signed-off-by: Nathan Chancellor +Signed-off-by: Greg Kroah-Hartman +--- + scripts/Kbuild.include | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/scripts/Kbuild.include ++++ b/scripts/Kbuild.include +@@ -108,7 +108,7 @@ as-option = $(call try-run,\ + # Usage: aflags-y += $(call as-instr,instr,option1,option2) + + as-instr = $(call try-run,\ +- printf "%b\n" "$(1)" | $(CC) -Werror $(KBUILD_AFLAGS) -c -x assembler-with-cpp -o "$$TMP" -,$(2),$(3)) ++ printf "%b\n" "$(1)" | $(CC) -Werror $(CLANG_FLAGS) $(KBUILD_AFLAGS) -c -x assembler-with-cpp -o "$$TMP" -,$(2),$(3)) + + # __cc-option + # Usage: MY_CFLAGS += $(call __cc-option,$(CC),$(MY_CFLAGS),-march=winchip-c6,-march=i586) diff --git a/queue-5.4/kbuild-add-clang_flags-to-kbuild_cppflags.patch b/queue-5.4/kbuild-add-clang_flags-to-kbuild_cppflags.patch new file mode 100644 index 0000000000..a3bd448614 --- /dev/null +++ b/queue-5.4/kbuild-add-clang_flags-to-kbuild_cppflags.patch @@ -0,0 +1,53 @@ +From a846e1c74e2c17443e84efefb632f0d759d5f6e1 Mon Sep 17 00:00:00 2001 +From: Masahiro Yamada +Date: Sun, 9 Apr 2023 23:53:57 +0900 +Subject: kbuild: add $(CLANG_FLAGS) to KBUILD_CPPFLAGS + +From: Masahiro Yamada + +commit feb843a469fb0ab00d2d23cfb9bcc379791011bb upstream. + +When preprocessing arch/*/kernel/vmlinux.lds.S, the target triple is +not passed to $(CPP) because we add it only to KBUILD_{C,A}FLAGS. + +As a result, the linker script is preprocessed with predefined macros +for the build host instead of the target. + +Assuming you use an x86 build machine, compare the following: + + $ clang -dM -E -x c /dev/null + $ clang -dM -E -x c /dev/null -target aarch64-linux-gnu + +There is no actual problem presumably because our linker scripts do not +rely on such predefined macros, but it is better to define correct ones. + +Move $(CLANG_FLAGS) to KBUILD_CPPFLAGS, so that all *.c, *.S, *.lds.S +will be processed with the proper target triple. + +[Note] +After the patch submission, we got an actual problem that needs this +commit. (CBL issue 1859) + +Link: https://github.com/ClangBuiltLinux/linux/issues/1859 +Reported-by: Tom Rini +Signed-off-by: Masahiro Yamada +Reviewed-by: Nathan Chancellor +Tested-by: Nathan Chancellor +Signed-off-by: Nathan Chancellor +Signed-off-by: Greg Kroah-Hartman +--- + Makefile | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +--- a/Makefile ++++ b/Makefile +@@ -568,8 +568,7 @@ ifneq ($(LLVM_IAS),1) + CLANG_FLAGS += -no-integrated-as + endif + CLANG_FLAGS += -Werror=unknown-warning-option +-KBUILD_CFLAGS += $(CLANG_FLAGS) +-KBUILD_AFLAGS += $(CLANG_FLAGS) ++KBUILD_CPPFLAGS += $(CLANG_FLAGS) + export CLANG_FLAGS + endif + diff --git a/queue-5.4/kbuild-add-kbuild_cppflags-to-as-option-invocation.patch b/queue-5.4/kbuild-add-kbuild_cppflags-to-as-option-invocation.patch new file mode 100644 index 0000000000..c7451fc4e2 --- /dev/null +++ b/queue-5.4/kbuild-add-kbuild_cppflags-to-as-option-invocation.patch @@ -0,0 +1,58 @@ +From 869854f263162dc80dc632fed8db396789bdf3ab Mon Sep 17 00:00:00 2001 +From: Nathan Chancellor +Date: Tue, 6 Jun 2023 15:40:35 -0700 +Subject: kbuild: Add KBUILD_CPPFLAGS to as-option invocation + +From: Nathan Chancellor + +commit 43fc0a99906e04792786edf8534d8d58d1e9de0c upstream. + +After commit feb843a469fb ("kbuild: add $(CLANG_FLAGS) to +KBUILD_CPPFLAGS"), there is an error while building certain PowerPC +assembly files with clang: + + arch/powerpc/lib/copypage_power7.S: Assembler messages: + arch/powerpc/lib/copypage_power7.S:34: Error: junk at end of line: `0b01000' + arch/powerpc/lib/copypage_power7.S:35: Error: junk at end of line: `0b01010' + arch/powerpc/lib/copypage_power7.S:37: Error: junk at end of line: `0b01000' + arch/powerpc/lib/copypage_power7.S:38: Error: junk at end of line: `0b01010' + arch/powerpc/lib/copypage_power7.S:40: Error: junk at end of line: `0b01010' + clang: error: assembler command failed with exit code 1 (use -v to see invocation) + +as-option only uses KBUILD_AFLAGS, so after removing CLANG_FLAGS from +KBUILD_AFLAGS, there is no more '--target=' or '--prefix=' flags. As a +result of those missing flags, the host target +will be tested during as-option calls and likely fail, meaning necessary +flags may not get added when building assembly files, resulting in +errors like seen above. + +Add KBUILD_CPPFLAGS to as-option invocations to clear up the errors. +This should have been done in commit d5c8d6e0fa61 ("kbuild: Update +assembler calls to use proper flags and language target"), which +switched from using the assembler target to the assembler-with-cpp +target, so flags that affect preprocessing are passed along in all +relevant tests. as-option now mirrors cc-option. + +Fixes: feb843a469fb ("kbuild: add $(CLANG_FLAGS) to KBUILD_CPPFLAGS") +Reported-by: Linux Kernel Functional Testing +Closes: https://lore.kernel.org/CA+G9fYs=koW9WardsTtora+nMgLR3raHz-LSLr58tgX4T5Mxag@mail.gmail.com/ +Signed-off-by: Nathan Chancellor +Tested-by: Naresh Kamboju +Signed-off-by: Masahiro Yamada +Signed-off-by: Nathan Chancellor +Signed-off-by: Greg Kroah-Hartman +--- + scripts/Kbuild.include | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/scripts/Kbuild.include ++++ b/scripts/Kbuild.include +@@ -102,7 +102,7 @@ try-run = $(shell set -e; \ + # Usage: aflags-y += $(call as-option,-Wa$(comma)-isa=foo,) + + as-option = $(call try-run,\ +- $(CC) -Werror $(KBUILD_AFLAGS) $(1) -c -x assembler-with-cpp /dev/null -o "$$TMP",$(1),$(2)) ++ $(CC) -Werror $(KBUILD_CPPFLAGS) $(KBUILD_AFLAGS) $(1) -c -x assembler-with-cpp /dev/null -o "$$TMP",$(1),$(2)) + + # as-instr + # Usage: aflags-y += $(call as-instr,instr,option1,option2) diff --git a/queue-5.4/kbuild-update-assembler-calls-to-use-proper-flags-and-language-target.patch b/queue-5.4/kbuild-update-assembler-calls-to-use-proper-flags-and-language-target.patch new file mode 100644 index 0000000000..0b9b2dd6e4 --- /dev/null +++ b/queue-5.4/kbuild-update-assembler-calls-to-use-proper-flags-and-language-target.patch @@ -0,0 +1,67 @@ +From 53842cd1ecb80f2347244af2a4fdfd2956e010b6 Mon Sep 17 00:00:00 2001 +From: Nick Desaulniers +Date: Wed, 11 Jan 2023 20:05:01 -0700 +Subject: kbuild: Update assembler calls to use proper flags and language target + +From: Nick Desaulniers + +commit d5c8d6e0fa61401a729e9eb6a9c7077b2d3aebb0 upstream. + +as-instr uses KBUILD_AFLAGS, but as-option uses KBUILD_CFLAGS. This can +cause as-option to fail unexpectedly when CONFIG_WERROR is set, because +clang will emit -Werror,-Wunused-command-line-argument for various -m +and -f flags in KBUILD_CFLAGS for assembler sources. + +Callers of as-option and as-instr should be adding flags to +KBUILD_AFLAGS / aflags-y, not KBUILD_CFLAGS / cflags-y. Use +KBUILD_AFLAGS in all macros to clear up the initial problem. + +Unfortunately, -Wunused-command-line-argument can still be triggered +with clang by the presence of warning flags or macro definitions because +'-x assembler' is used, instead of '-x assembler-with-cpp', which will +consume these flags. Switch to '-x assembler-with-cpp' in places where +'-x assembler' is used, as the compiler is always used as the driver for +out of line assembler sources in the kernel. + +Finally, add -Werror to these macros so that they behave consistently +whether or not CONFIG_WERROR is set. + +[nathan: Reworded and expanded on problems in commit message + Use '-x assembler-with-cpp' in a couple more places] + +Link: https://github.com/ClangBuiltLinux/linux/issues/1699 +Suggested-by: Masahiro Yamada +Signed-off-by: Nick Desaulniers +Signed-off-by: Nathan Chancellor +Tested-by: Linux Kernel Functional Testing +Tested-by: Anders Roxell +Signed-off-by: Masahiro Yamada +Signed-off-by: Nathan Chancellor +Signed-off-by: Greg Kroah-Hartman +--- + scripts/Kbuild.include | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +--- a/scripts/Kbuild.include ++++ b/scripts/Kbuild.include +@@ -99,16 +99,16 @@ try-run = $(shell set -e; \ + fi) + + # as-option +-# Usage: cflags-y += $(call as-option,-Wa$(comma)-isa=foo,) ++# Usage: aflags-y += $(call as-option,-Wa$(comma)-isa=foo,) + + as-option = $(call try-run,\ +- $(CC) $(KBUILD_CFLAGS) $(1) -c -x assembler /dev/null -o "$$TMP",$(1),$(2)) ++ $(CC) -Werror $(KBUILD_AFLAGS) $(1) -c -x assembler-with-cpp /dev/null -o "$$TMP",$(1),$(2)) + + # as-instr +-# Usage: cflags-y += $(call as-instr,instr,option1,option2) ++# Usage: aflags-y += $(call as-instr,instr,option1,option2) + + as-instr = $(call try-run,\ +- printf "%b\n" "$(1)" | $(CC) $(KBUILD_AFLAGS) -c -x assembler -o "$$TMP" -,$(2),$(3)) ++ printf "%b\n" "$(1)" | $(CC) -Werror $(KBUILD_AFLAGS) -c -x assembler-with-cpp -o "$$TMP" -,$(2),$(3)) + + # __cc-option + # Usage: MY_CFLAGS += $(call __cc-option,$(CC),$(MY_CFLAGS),-march=winchip-c6,-march=i586) diff --git a/queue-5.4/mips-include-kbuild_cppflags-in-checkflags-invocation.patch b/queue-5.4/mips-include-kbuild_cppflags-in-checkflags-invocation.patch new file mode 100644 index 0000000000..077d75136e --- /dev/null +++ b/queue-5.4/mips-include-kbuild_cppflags-in-checkflags-invocation.patch @@ -0,0 +1,38 @@ +From ee72d68bba47e0a0f045ff33638601ef7ec14260 Mon Sep 17 00:00:00 2001 +From: Nathan Chancellor +Date: Thu, 1 Jun 2023 11:38:24 -0700 +Subject: mips: Include KBUILD_CPPFLAGS in CHECKFLAGS invocation + +From: Nathan Chancellor + +commit 08f6554ff90ef189e6b8f0303e57005bddfdd6a7 upstream. + +A future change will move CLANG_FLAGS from KBUILD_{A,C}FLAGS to +KBUILD_CPPFLAGS so that '--target' is available while preprocessing. +When that occurs, the following error appears when building ARCH=mips +with clang (tip of tree error shown): + + clang: error: unsupported option '-mabi=' for target 'x86_64-pc-linux-gnu' + +Add KBUILD_CPPFLAGS in the CHECKFLAGS invocation to keep everything +working after the move. + +Signed-off-by: Nathan Chancellor +Signed-off-by: Masahiro Yamada +Signed-off-by: Nathan Chancellor +Signed-off-by: Greg Kroah-Hartman +--- + arch/mips/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/mips/Makefile ++++ b/arch/mips/Makefile +@@ -319,7 +319,7 @@ KBUILD_CFLAGS += -fno-asynchronous-unwin + KBUILD_LDFLAGS += -m $(ld-emul) + + ifdef CONFIG_MIPS +-CHECKFLAGS += $(shell $(CC) $(KBUILD_CFLAGS) -dM -E -x c /dev/null | \ ++CHECKFLAGS += $(shell $(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) -dM -E -x c /dev/null | \ + egrep -vw '__GNUC_(MINOR_|PATCHLEVEL_)?_' | \ + sed -e "s/^\#define /-D'/" -e "s/ /'='/" -e "s/$$/'/" -e 's/\$$/&&/g') + endif diff --git a/queue-5.4/mips-move-wa-msoft-float-check-from-as-option-to-cc-option.patch b/queue-5.4/mips-move-wa-msoft-float-check-from-as-option-to-cc-option.patch new file mode 100644 index 0000000000..c4f45515bf --- /dev/null +++ b/queue-5.4/mips-move-wa-msoft-float-check-from-as-option-to-cc-option.patch @@ -0,0 +1,42 @@ +From bd32b4960e2bbcbb84df8fde0eb1a2efc84bf40b Mon Sep 17 00:00:00 2001 +From: Nathan Chancellor +Date: Wed, 14 Jun 2023 11:04:36 -0700 +Subject: MIPS: Move '-Wa,-msoft-float' check from as-option to cc-option + +From: Nathan Chancellor + +This patch is for linux-6.1.y and earlier, it has no direct mainline +equivalent. + +In order to backport commit d5c8d6e0fa61 ("kbuild: Update assembler +calls to use proper flags and language target") to resolve a separate +issue regarding PowerPC, the problem noticed and fixed by +commit 80a20d2f8288 ("MIPS: Always use -Wa,-msoft-float and eliminate +GAS_HAS_SET_HARDFLOAT") needs to be addressed. Unfortunately, 6.1 and +earlier do not contain commit e4412739472b ("Documentation: raise +minimum supported version of binutils to 2.25"), so it cannot be assumed +that all supported versions of GNU as have support for -msoft-float. + +In order to switch from KBUILD_CFLAGS to KBUILD_AFLAGS in as-option +without consequence, move the '-Wa,-msoft-float' check to cc-option, +including '$(cflags-y)' directly to avoid the issue mentioned in +commit 80a20d2f8288 ("MIPS: Always use -Wa,-msoft-float and eliminate +GAS_HAS_SET_HARDFLOAT"). + +Signed-off-by: Nathan Chancellor +Signed-off-by: Greg Kroah-Hartman +--- + arch/mips/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/mips/Makefile ++++ b/arch/mips/Makefile +@@ -107,7 +107,7 @@ endif + # (specifically newer than 2.24.51.20140728) we then also need to explicitly + # set ".set hardfloat" in all files which manipulate floating point registers. + # +-ifneq ($(call as-option,-Wa$(comma)-msoft-float,),) ++ifneq ($(call cc-option,$(cflags-y) -Wa$(comma)-msoft-float,),) + cflags-y += -DGAS_HAS_SET_HARDFLOAT -Wa,-msoft-float + endif + diff --git a/queue-5.4/posix-cpu-timers-fix-race-between-handle_posix_cpu_timers-and-posix_cpu_timer_del.patch b/queue-5.4/posix-cpu-timers-fix-race-between-handle_posix_cpu_timers-and-posix_cpu_timer_del.patch new file mode 100644 index 0000000000..baaaeedad8 --- /dev/null +++ b/queue-5.4/posix-cpu-timers-fix-race-between-handle_posix_cpu_timers-and-posix_cpu_timer_del.patch @@ -0,0 +1,55 @@ +From f90fff1e152dedf52b932240ebbd670d83330eca Mon Sep 17 00:00:00 2001 +From: Oleg Nesterov +Date: Fri, 13 Jun 2025 19:26:50 +0200 +Subject: posix-cpu-timers: fix race between handle_posix_cpu_timers() and posix_cpu_timer_del() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Oleg Nesterov + +commit f90fff1e152dedf52b932240ebbd670d83330eca upstream. + +If an exiting non-autoreaping task has already passed exit_notify() and +calls handle_posix_cpu_timers() from IRQ, it can be reaped by its parent +or debugger right after unlock_task_sighand(). + +If a concurrent posix_cpu_timer_del() runs at that moment, it won't be +able to detect timer->it.cpu.firing != 0: cpu_timer_task_rcu() and/or +lock_task_sighand() will fail. + +Add the tsk->exit_state check into run_posix_cpu_timers() to fix this. + +This fix is not needed if CONFIG_POSIX_CPU_TIMERS_TASK_WORK=y, because +exit_task_work() is called before exit_notify(). But the check still +makes sense, task_work_add(&tsk->posix_cputimers_work.work) will fail +anyway in this case. + +Cc: stable@vger.kernel.org +Reported-by: Benoît Sevens +Fixes: 0bdd2ed4138e ("sched: run_posix_cpu_timers: Don't check ->exit_state, use lock_task_sighand()") +Signed-off-by: Oleg Nesterov +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman +--- + kernel/time/posix-cpu-timers.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +--- a/kernel/time/posix-cpu-timers.c ++++ b/kernel/time/posix-cpu-timers.c +@@ -1321,6 +1321,15 @@ static int posix_cpu_nsleep(const clocki + int error; + + /* ++ * Ensure that release_task(tsk) can't happen while ++ * handle_posix_cpu_timers() is running. Otherwise, a concurrent ++ * posix_cpu_timer_del() may fail to lock_task_sighand(tsk) and ++ * miss timer->it.cpu.firing != 0. ++ */ ++ if (tsk->exit_state) ++ return; ++ ++ /* + * Diagnose required errors first. + */ + if (CPUCLOCK_PERTHREAD(which_clock) && diff --git a/queue-5.4/series b/queue-5.4/series index 995f128ffb..d617499254 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -84,5 +84,15 @@ net_sched-prio-fix-a-race-in-prio_tune.patch net_sched-red-fix-a-race-in-__red_change.patch net_sched-tbf-fix-a-race-in-tbf_change.patch net-mdio-c22-is-now-optional-eopnotsupp-if-not-provi.patch +posix-cpu-timers-fix-race-between-handle_posix_cpu_timers-and-posix_cpu_timer_del.patch +x86-boot-compressed-prefer-cc-option-for-cflags-additions.patch +mips-move-wa-msoft-float-check-from-as-option-to-cc-option.patch +kbuild-update-assembler-calls-to-use-proper-flags-and-language-target.patch +drm-amd-display-do-not-add-mhard-float-to-dml_ccflags-for-clang.patch +mips-include-kbuild_cppflags-in-checkflags-invocation.patch +kbuild-add-clang_flags-to-as-instr.patch +kbuild-add-clang_flags-to-kbuild_cppflags.patch +kbuild-add-kbuild_cppflags-to-as-option-invocation.patch +drm-amd-display-do-not-add-mhard-float-to-dcn2-1-0-_resource.o-for-clang.patch net-mdiobus-fix-potential-out-of-bounds-read-write-a.patch fs-filesystems-fix-potential-unsigned-integer-underf.patch diff --git a/queue-5.4/x86-boot-compressed-prefer-cc-option-for-cflags-additions.patch b/queue-5.4/x86-boot-compressed-prefer-cc-option-for-cflags-additions.patch new file mode 100644 index 0000000000..b14b0106d1 --- /dev/null +++ b/queue-5.4/x86-boot-compressed-prefer-cc-option-for-cflags-additions.patch @@ -0,0 +1,43 @@ +From 668a8b64118d2d263025e92ebab1233f2a9b9c1c Mon Sep 17 00:00:00 2001 +From: Nick Desaulniers +Date: Wed, 11 Jan 2023 20:04:58 -0700 +Subject: x86/boot/compressed: prefer cc-option for CFLAGS additions + +From: Nick Desaulniers + +commit 994f5f7816ff963f49269cfc97f63cb2e4edb84f upstream. + +as-option tests new options using KBUILD_CFLAGS, which causes problems +when using as-option to update KBUILD_AFLAGS because many compiler +options are not valid assembler options. + +This will be fixed in a follow up patch. Before doing so, move the +assembler test for -Wa,-mrelax-relocations=no from using as-option to +cc-option. + +Link: https://lore.kernel.org/llvm/CAK7LNATcHt7GcXZ=jMszyH=+M_LC9Qr6yeAGRCBbE6xriLxtUQ@mail.gmail.com/ +Suggested-by: Masahiro Yamada +Reviewed-by: Nathan Chancellor +Tested-by: Nathan Chancellor +Signed-off-by: Nick Desaulniers +Signed-off-by: Nathan Chancellor +Tested-by: Linux Kernel Functional Testing +Tested-by: Anders Roxell +Signed-off-by: Masahiro Yamada +Signed-off-by: Nathan Chancellor +Signed-off-by: Greg Kroah-Hartman +--- + arch/x86/boot/compressed/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/x86/boot/compressed/Makefile ++++ b/arch/x86/boot/compressed/Makefile +@@ -39,7 +39,7 @@ KBUILD_CFLAGS += $(call cc-disable-warni + KBUILD_CFLAGS += $(call cc-disable-warning, gnu) + KBUILD_CFLAGS += -Wno-pointer-sign + # Disable relocation relaxation in case the link is not PIE. +-KBUILD_CFLAGS += $(call as-option,-Wa$(comma)-mrelax-relocations=no) ++KBUILD_CFLAGS += $(call cc-option,-Wa$(comma)-mrelax-relocations=no) + + KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__ + GCOV_PROFILE := n