From: Greg Kroah-Hartman Date: Tue, 15 Oct 2024 11:15:03 +0000 (+0200) Subject: drop some s390 patches that broke the build X-Git-Tag: v5.10.227~9 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a5212149f95249fad2954f4136d9c999f1b09b10;p=thirdparty%2Fkernel%2Fstable-queue.git drop some s390 patches that broke the build --- diff --git a/queue-5.10/s390-boot-compile-all-files-with-the-same-march-flag.patch b/queue-5.10/s390-boot-compile-all-files-with-the-same-march-flag.patch deleted file mode 100644 index f60f6d8abfe..00000000000 --- a/queue-5.10/s390-boot-compile-all-files-with-the-same-march-flag.patch +++ /dev/null @@ -1,66 +0,0 @@ -From cb741cf17d51a5f6b38478a2138400467a026cd8 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 4 Sep 2024 11:39:27 +0200 -Subject: s390/boot: Compile all files with the same march flag - -From: Heiko Carstens - -[ Upstream commit fccb175bc89a0d37e3ff513bb6bf1f73b3a48950 ] - -Only a couple of files of the decompressor are compiled with the -minimum architecture level. This is problematic for potential function -calls between compile units, especially if a target function is within -a compile until compiled for a higher architecture level, since that -may lead to an unexpected operation exception. - -Therefore compile all files of the decompressor for the same (minimum) -architecture level. - -Reviewed-by: Sven Schnelle -Signed-off-by: Heiko Carstens -Signed-off-by: Sasha Levin ---- - arch/s390/boot/Makefile | 19 +++++-------------- - 1 file changed, 5 insertions(+), 14 deletions(-) - -diff --git a/arch/s390/boot/Makefile b/arch/s390/boot/Makefile -index 41a64b8dce252..6294ddc2ff891 100644 ---- a/arch/s390/boot/Makefile -+++ b/arch/s390/boot/Makefile -@@ -8,11 +8,8 @@ GCOV_PROFILE := n - UBSAN_SANITIZE := n - KASAN_SANITIZE := n - --KBUILD_AFLAGS := $(KBUILD_AFLAGS_DECOMPRESSOR) --KBUILD_CFLAGS := $(KBUILD_CFLAGS_DECOMPRESSOR) -- - # --# Use minimum architecture for als.c to be able to print an error -+# Use minimum architecture level so it is possible to print an error - # message if the kernel is started on a machine which is too old - # - ifndef CONFIG_CC_IS_CLANG -@@ -21,16 +18,10 @@ else - CC_FLAGS_MARCH_MINIMUM := -march=z10 - endif - --ifneq ($(CC_FLAGS_MARCH),$(CC_FLAGS_MARCH_MINIMUM)) --AFLAGS_REMOVE_head.o += $(CC_FLAGS_MARCH) --AFLAGS_head.o += $(CC_FLAGS_MARCH_MINIMUM) --AFLAGS_REMOVE_mem.o += $(CC_FLAGS_MARCH) --AFLAGS_mem.o += $(CC_FLAGS_MARCH_MINIMUM) --CFLAGS_REMOVE_als.o += $(CC_FLAGS_MARCH) --CFLAGS_als.o += $(CC_FLAGS_MARCH_MINIMUM) --CFLAGS_REMOVE_sclp_early_core.o += $(CC_FLAGS_MARCH) --CFLAGS_sclp_early_core.o += $(CC_FLAGS_MARCH_MINIMUM) --endif -+KBUILD_AFLAGS := $(filter-out $(CC_FLAGS_MARCH),$(KBUILD_AFLAGS_DECOMPRESSOR)) -+KBUILD_CFLAGS := $(filter-out $(CC_FLAGS_MARCH),$(KBUILD_CFLAGS_DECOMPRESSOR)) -+KBUILD_AFLAGS += $(CC_FLAGS_MARCH_MINIMUM) -+KBUILD_CFLAGS += $(CC_FLAGS_MARCH_MINIMUM) - - CFLAGS_sclp_early_core.o += -I$(srctree)/drivers/s390/char - --- -2.43.0 - diff --git a/queue-5.10/series b/queue-5.10/series index 9e1b25875dd..f3efbe90386 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -452,7 +452,6 @@ tracing-kprobes-return-eaddrnotavail-when-func-match.patch tracing-kprobes-fix-symbol-counting-logic-by-looking.patch input-synaptics-rmi4-fix-uaf-of-irq-domain-on-driver.patch bpf-check-percpu-map-value-size-first.patch -s390-boot-compile-all-files-with-the-same-march-flag.patch s390-facility-disable-compile-time-optimization-for-.patch s390-mm-add-cond_resched-to-cmm_alloc-free_pages.patch ext4-nested-locking-for-xattr-inode.patch diff --git a/queue-5.15/s390-boot-compile-all-files-with-the-same-march-flag.patch b/queue-5.15/s390-boot-compile-all-files-with-the-same-march-flag.patch deleted file mode 100644 index 7ceab245062..00000000000 --- a/queue-5.15/s390-boot-compile-all-files-with-the-same-march-flag.patch +++ /dev/null @@ -1,66 +0,0 @@ -From d18675f60edfeeb1fc5156dd6cdd7c11d26567ca Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 4 Sep 2024 11:39:27 +0200 -Subject: s390/boot: Compile all files with the same march flag - -From: Heiko Carstens - -[ Upstream commit fccb175bc89a0d37e3ff513bb6bf1f73b3a48950 ] - -Only a couple of files of the decompressor are compiled with the -minimum architecture level. This is problematic for potential function -calls between compile units, especially if a target function is within -a compile until compiled for a higher architecture level, since that -may lead to an unexpected operation exception. - -Therefore compile all files of the decompressor for the same (minimum) -architecture level. - -Reviewed-by: Sven Schnelle -Signed-off-by: Heiko Carstens -Signed-off-by: Sasha Levin ---- - arch/s390/boot/Makefile | 19 +++++-------------- - 1 file changed, 5 insertions(+), 14 deletions(-) - -diff --git a/arch/s390/boot/Makefile b/arch/s390/boot/Makefile -index 0ba6468991316..cbfa9c150bd32 100644 ---- a/arch/s390/boot/Makefile -+++ b/arch/s390/boot/Makefile -@@ -9,11 +9,8 @@ UBSAN_SANITIZE := n - KASAN_SANITIZE := n - KCSAN_SANITIZE := n - --KBUILD_AFLAGS := $(KBUILD_AFLAGS_DECOMPRESSOR) --KBUILD_CFLAGS := $(KBUILD_CFLAGS_DECOMPRESSOR) -- - # --# Use minimum architecture for als.c to be able to print an error -+# Use minimum architecture level so it is possible to print an error - # message if the kernel is started on a machine which is too old - # - ifndef CONFIG_CC_IS_CLANG -@@ -22,16 +19,10 @@ else - CC_FLAGS_MARCH_MINIMUM := -march=z10 - endif - --ifneq ($(CC_FLAGS_MARCH),$(CC_FLAGS_MARCH_MINIMUM)) --AFLAGS_REMOVE_head.o += $(CC_FLAGS_MARCH) --AFLAGS_head.o += $(CC_FLAGS_MARCH_MINIMUM) --AFLAGS_REMOVE_mem.o += $(CC_FLAGS_MARCH) --AFLAGS_mem.o += $(CC_FLAGS_MARCH_MINIMUM) --CFLAGS_REMOVE_als.o += $(CC_FLAGS_MARCH) --CFLAGS_als.o += $(CC_FLAGS_MARCH_MINIMUM) --CFLAGS_REMOVE_sclp_early_core.o += $(CC_FLAGS_MARCH) --CFLAGS_sclp_early_core.o += $(CC_FLAGS_MARCH_MINIMUM) --endif -+KBUILD_AFLAGS := $(filter-out $(CC_FLAGS_MARCH),$(KBUILD_AFLAGS_DECOMPRESSOR)) -+KBUILD_CFLAGS := $(filter-out $(CC_FLAGS_MARCH),$(KBUILD_CFLAGS_DECOMPRESSOR)) -+KBUILD_AFLAGS += $(CC_FLAGS_MARCH_MINIMUM) -+KBUILD_CFLAGS += $(CC_FLAGS_MARCH_MINIMUM) - - CFLAGS_sclp_early_core.o += -I$(srctree)/drivers/s390/char - --- -2.43.0 - diff --git a/queue-5.15/series b/queue-5.15/series index 1e113e8d1b5..87e150d4994 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -599,7 +599,6 @@ fs-ntfs3-refactor-enum_rstbl-to-suppress-static-chec.patch virtio_console-fix-misc-probe-bugs.patch input-synaptics-rmi4-fix-uaf-of-irq-domain-on-driver.patch bpf-check-percpu-map-value-size-first.patch -s390-boot-compile-all-files-with-the-same-march-flag.patch s390-facility-disable-compile-time-optimization-for-.patch s390-mm-add-cond_resched-to-cmm_alloc-free_pages.patch bpf-x64-fix-a-jit-convergence-issue.patch diff --git a/queue-5.4/s390-boot-compile-all-files-with-the-same-march-flag.patch b/queue-5.4/s390-boot-compile-all-files-with-the-same-march-flag.patch deleted file mode 100644 index 30fe762e142..00000000000 --- a/queue-5.4/s390-boot-compile-all-files-with-the-same-march-flag.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 4b0f0acc2dac743bf828a1095fa8239f15946482 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 4 Sep 2024 11:39:27 +0200 -Subject: s390/boot: Compile all files with the same march flag - -From: Heiko Carstens - -[ Upstream commit fccb175bc89a0d37e3ff513bb6bf1f73b3a48950 ] - -Only a couple of files of the decompressor are compiled with the -minimum architecture level. This is problematic for potential function -calls between compile units, especially if a target function is within -a compile until compiled for a higher architecture level, since that -may lead to an unexpected operation exception. - -Therefore compile all files of the decompressor for the same (minimum) -architecture level. - -Reviewed-by: Sven Schnelle -Signed-off-by: Heiko Carstens -Signed-off-by: Sasha Levin ---- - arch/s390/boot/Makefile | 19 +++++-------------- - 1 file changed, 5 insertions(+), 14 deletions(-) - -diff --git a/arch/s390/boot/Makefile b/arch/s390/boot/Makefile -index 0ff9261c915e3..cba2705c62353 100644 ---- a/arch/s390/boot/Makefile -+++ b/arch/s390/boot/Makefile -@@ -8,11 +8,8 @@ GCOV_PROFILE := n - UBSAN_SANITIZE := n - KASAN_SANITIZE := n - --KBUILD_AFLAGS := $(KBUILD_AFLAGS_DECOMPRESSOR) --KBUILD_CFLAGS := $(KBUILD_CFLAGS_DECOMPRESSOR) -- - # --# Use minimum architecture for als.c to be able to print an error -+# Use minimum architecture level so it is possible to print an error - # message if the kernel is started on a machine which is too old - # - ifndef CONFIG_CC_IS_CLANG -@@ -21,16 +18,10 @@ else - CC_FLAGS_MARCH_MINIMUM := -march=z10 - endif - --ifneq ($(CC_FLAGS_MARCH),$(CC_FLAGS_MARCH_MINIMUM)) --AFLAGS_REMOVE_head.o += $(CC_FLAGS_MARCH) --AFLAGS_head.o += $(CC_FLAGS_MARCH_MINIMUM) --AFLAGS_REMOVE_mem.o += $(CC_FLAGS_MARCH) --AFLAGS_mem.o += $(CC_FLAGS_MARCH_MINIMUM) --CFLAGS_REMOVE_als.o += $(CC_FLAGS_MARCH) --CFLAGS_als.o += $(CC_FLAGS_MARCH_MINIMUM) --CFLAGS_REMOVE_sclp_early_core.o += $(CC_FLAGS_MARCH) --CFLAGS_sclp_early_core.o += $(CC_FLAGS_MARCH_MINIMUM) --endif -+KBUILD_AFLAGS := $(filter-out $(CC_FLAGS_MARCH),$(KBUILD_AFLAGS_DECOMPRESSOR)) -+KBUILD_CFLAGS := $(filter-out $(CC_FLAGS_MARCH),$(KBUILD_CFLAGS_DECOMPRESSOR)) -+KBUILD_AFLAGS += $(CC_FLAGS_MARCH_MINIMUM) -+KBUILD_CFLAGS += $(CC_FLAGS_MARCH_MINIMUM) - - CFLAGS_sclp_early_core.o += -I$(srctree)/drivers/s390/char - --- -2.43.0 - diff --git a/queue-5.4/series b/queue-5.4/series index 7e97169e21c..ffed111a588 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -306,7 +306,6 @@ tracing-have-saved_cmdlines-arrays-all-in-one-alloca.patch virtio_console-fix-misc-probe-bugs.patch input-synaptics-rmi4-fix-uaf-of-irq-domain-on-driver.patch bpf-check-percpu-map-value-size-first.patch -s390-boot-compile-all-files-with-the-same-march-flag.patch s390-facility-disable-compile-time-optimization-for-.patch s390-mm-add-cond_resched-to-cmm_alloc-free_pages.patch ext4-nested-locking-for-xattr-inode.patch diff --git a/queue-6.1/s390-boot-compile-all-files-with-the-same-march-flag.patch b/queue-6.1/s390-boot-compile-all-files-with-the-same-march-flag.patch deleted file mode 100644 index 33854f1fef6..00000000000 --- a/queue-6.1/s390-boot-compile-all-files-with-the-same-march-flag.patch +++ /dev/null @@ -1,66 +0,0 @@ -From dccf60f50cbed78db8f8fdf30f57fa4041d7ca7f Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 4 Sep 2024 11:39:27 +0200 -Subject: s390/boot: Compile all files with the same march flag - -From: Heiko Carstens - -[ Upstream commit fccb175bc89a0d37e3ff513bb6bf1f73b3a48950 ] - -Only a couple of files of the decompressor are compiled with the -minimum architecture level. This is problematic for potential function -calls between compile units, especially if a target function is within -a compile until compiled for a higher architecture level, since that -may lead to an unexpected operation exception. - -Therefore compile all files of the decompressor for the same (minimum) -architecture level. - -Reviewed-by: Sven Schnelle -Signed-off-by: Heiko Carstens -Signed-off-by: Sasha Levin ---- - arch/s390/boot/Makefile | 19 +++++-------------- - 1 file changed, 5 insertions(+), 14 deletions(-) - -diff --git a/arch/s390/boot/Makefile b/arch/s390/boot/Makefile -index d52c3e2e16bc5..a010491585e88 100644 ---- a/arch/s390/boot/Makefile -+++ b/arch/s390/boot/Makefile -@@ -9,11 +9,8 @@ UBSAN_SANITIZE := n - KASAN_SANITIZE := n - KCSAN_SANITIZE := n - --KBUILD_AFLAGS := $(KBUILD_AFLAGS_DECOMPRESSOR) --KBUILD_CFLAGS := $(KBUILD_CFLAGS_DECOMPRESSOR) -- - # --# Use minimum architecture for als.c to be able to print an error -+# Use minimum architecture level so it is possible to print an error - # message if the kernel is started on a machine which is too old - # - ifndef CONFIG_CC_IS_CLANG -@@ -22,16 +19,10 @@ else - CC_FLAGS_MARCH_MINIMUM := -march=z10 - endif - --ifneq ($(CC_FLAGS_MARCH),$(CC_FLAGS_MARCH_MINIMUM)) --AFLAGS_REMOVE_head.o += $(CC_FLAGS_MARCH) --AFLAGS_head.o += $(CC_FLAGS_MARCH_MINIMUM) --AFLAGS_REMOVE_mem.o += $(CC_FLAGS_MARCH) --AFLAGS_mem.o += $(CC_FLAGS_MARCH_MINIMUM) --CFLAGS_REMOVE_als.o += $(CC_FLAGS_MARCH) --CFLAGS_als.o += $(CC_FLAGS_MARCH_MINIMUM) --CFLAGS_REMOVE_sclp_early_core.o += $(CC_FLAGS_MARCH) --CFLAGS_sclp_early_core.o += $(CC_FLAGS_MARCH_MINIMUM) --endif -+KBUILD_AFLAGS := $(filter-out $(CC_FLAGS_MARCH),$(KBUILD_AFLAGS_DECOMPRESSOR)) -+KBUILD_CFLAGS := $(filter-out $(CC_FLAGS_MARCH),$(KBUILD_CFLAGS_DECOMPRESSOR)) -+KBUILD_AFLAGS += $(CC_FLAGS_MARCH_MINIMUM) -+KBUILD_CFLAGS += $(CC_FLAGS_MARCH_MINIMUM) - - CFLAGS_sclp_early_core.o += -I$(srctree)/drivers/s390/char - --- -2.43.0 - diff --git a/queue-6.1/s390-traps-handle-early-warnings-gracefully.patch b/queue-6.1/s390-traps-handle-early-warnings-gracefully.patch deleted file mode 100644 index 2ccab3a1c47..00000000000 --- a/queue-6.1/s390-traps-handle-early-warnings-gracefully.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 73ea89aa88b5f93e3e0a1270f2e52b4c801d5b45 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 31 Jul 2024 15:26:01 +0200 -Subject: s390/traps: Handle early warnings gracefully - -From: Heiko Carstens - -[ Upstream commit 3c4d0ae0671827f4b536cc2d26f8b9c54584ccc5 ] - -Add missing warning handling to the early program check handler. This -way a warning is printed to the console as soon as the early console -is setup, and the kernel continues to boot. - -Before this change a disabled wait psw was loaded instead and the -machine was silently stopped without giving an idea about what -happened. - -Reviewed-by: Sven Schnelle -Signed-off-by: Heiko Carstens -Signed-off-by: Vasily Gorbik -Signed-off-by: Sasha Levin ---- - arch/s390/kernel/early.c | 17 +++++++++++++++-- - 1 file changed, 15 insertions(+), 2 deletions(-) - -diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c -index b3cb256ec6692..1dcdce60b89c7 100644 ---- a/arch/s390/kernel/early.c -+++ b/arch/s390/kernel/early.c -@@ -151,8 +151,21 @@ static __init void setup_topology(void) - - void __do_early_pgm_check(struct pt_regs *regs) - { -- if (!fixup_exception(regs)) -- disabled_wait(); -+ struct lowcore *lc = get_lowcore(); -+ unsigned long ip; -+ -+ regs->int_code = lc->pgm_int_code; -+ regs->int_parm_long = lc->trans_exc_code; -+ ip = __rewind_psw(regs->psw, regs->int_code >> 16); -+ -+ /* Monitor Event? Might be a warning */ -+ if ((regs->int_code & PGM_INT_CODE_MASK) == 0x40) { -+ if (report_bug(ip, regs) == BUG_TRAP_TYPE_WARN) -+ return; -+ } -+ if (fixup_exception(regs)) -+ return; -+ disabled_wait(); - } - - static noinline __init void setup_lowcore_early(void) --- -2.43.0 - diff --git a/queue-6.1/series b/queue-6.1/series index 820af86e3d4..e6c7a8411a4 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -684,14 +684,12 @@ fs-ntfs3-refactor-enum_rstbl-to-suppress-static-chec.patch virtio_console-fix-misc-probe-bugs.patch input-synaptics-rmi4-fix-uaf-of-irq-domain-on-driver.patch bpf-check-percpu-map-value-size-first.patch -s390-boot-compile-all-files-with-the-same-march-flag.patch s390-facility-disable-compile-time-optimization-for-.patch s390-mm-add-cond_resched-to-cmm_alloc-free_pages.patch bpf-x64-fix-a-jit-convergence-issue.patch ext4-don-t-set-sb_rdonly-after-filesystem-errors.patch ext4-nested-locking-for-xattr-inode.patch s390-cpum_sf-remove-warn_on_once-statements.patch -s390-traps-handle-early-warnings-gracefully.patch ktest.pl-avoid-false-positives-with-grub2-skip-regex.patch rdma-mad-improve-handling-of-timed-out-wrs-of-mad-ag.patch pci-add-function-0-dma-alias-quirk-for-glenfly-arise.patch diff --git a/queue-6.11/s390-boot-compile-all-files-with-the-same-march-flag.patch b/queue-6.11/s390-boot-compile-all-files-with-the-same-march-flag.patch deleted file mode 100644 index 62d207f9bbf..00000000000 --- a/queue-6.11/s390-boot-compile-all-files-with-the-same-march-flag.patch +++ /dev/null @@ -1,66 +0,0 @@ -From d4aaa112a50ff5c137f0d72fd5c1cd0c7ee182b8 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 4 Sep 2024 11:39:27 +0200 -Subject: s390/boot: Compile all files with the same march flag - -From: Heiko Carstens - -[ Upstream commit fccb175bc89a0d37e3ff513bb6bf1f73b3a48950 ] - -Only a couple of files of the decompressor are compiled with the -minimum architecture level. This is problematic for potential function -calls between compile units, especially if a target function is within -a compile until compiled for a higher architecture level, since that -may lead to an unexpected operation exception. - -Therefore compile all files of the decompressor for the same (minimum) -architecture level. - -Reviewed-by: Sven Schnelle -Signed-off-by: Heiko Carstens -Signed-off-by: Sasha Levin ---- - arch/s390/boot/Makefile | 19 +++++-------------- - 1 file changed, 5 insertions(+), 14 deletions(-) - -diff --git a/arch/s390/boot/Makefile b/arch/s390/boot/Makefile -index 4f476884d3404..f1b2989cc7cca 100644 ---- a/arch/s390/boot/Makefile -+++ b/arch/s390/boot/Makefile -@@ -11,11 +11,8 @@ KASAN_SANITIZE := n - KCSAN_SANITIZE := n - KMSAN_SANITIZE := n - --KBUILD_AFLAGS := $(KBUILD_AFLAGS_DECOMPRESSOR) --KBUILD_CFLAGS := $(KBUILD_CFLAGS_DECOMPRESSOR) -- - # --# Use minimum architecture for als.c to be able to print an error -+# Use minimum architecture level so it is possible to print an error - # message if the kernel is started on a machine which is too old - # - ifndef CONFIG_CC_IS_CLANG -@@ -24,16 +21,10 @@ else - CC_FLAGS_MARCH_MINIMUM := -march=z10 - endif - --ifneq ($(CC_FLAGS_MARCH),$(CC_FLAGS_MARCH_MINIMUM)) --AFLAGS_REMOVE_head.o += $(CC_FLAGS_MARCH) --AFLAGS_head.o += $(CC_FLAGS_MARCH_MINIMUM) --AFLAGS_REMOVE_mem.o += $(CC_FLAGS_MARCH) --AFLAGS_mem.o += $(CC_FLAGS_MARCH_MINIMUM) --CFLAGS_REMOVE_als.o += $(CC_FLAGS_MARCH) --CFLAGS_als.o += $(CC_FLAGS_MARCH_MINIMUM) --CFLAGS_REMOVE_sclp_early_core.o += $(CC_FLAGS_MARCH) --CFLAGS_sclp_early_core.o += $(CC_FLAGS_MARCH_MINIMUM) --endif -+KBUILD_AFLAGS := $(filter-out $(CC_FLAGS_MARCH),$(KBUILD_AFLAGS_DECOMPRESSOR)) -+KBUILD_CFLAGS := $(filter-out $(CC_FLAGS_MARCH),$(KBUILD_CFLAGS_DECOMPRESSOR)) -+KBUILD_AFLAGS += $(CC_FLAGS_MARCH_MINIMUM) -+KBUILD_CFLAGS += $(CC_FLAGS_MARCH_MINIMUM) - - CFLAGS_sclp_early_core.o += -I$(srctree)/drivers/s390/char - --- -2.43.0 - diff --git a/queue-6.11/series b/queue-6.11/series index 654722f558c..c31067bb5ac 100644 --- a/queue-6.11/series +++ b/queue-6.11/series @@ -16,7 +16,6 @@ zram-don-t-free-statically-defined-names.patch bpf-call-the-missed-btf_record_free-when-map-creatio.patch selftests-bpf-fix-arg_ptr_to_long-half-uninitialized.patch bpf-check-percpu-map-value-size-first.patch -s390-boot-compile-all-files-with-the-same-march-flag.patch s390-facility-disable-compile-time-optimization-for-.patch s390-mm-add-cond_resched-to-cmm_alloc-free_pages.patch bpf-x64-fix-a-jit-convergence-issue.patch diff --git a/queue-6.6/s390-boot-compile-all-files-with-the-same-march-flag.patch b/queue-6.6/s390-boot-compile-all-files-with-the-same-march-flag.patch deleted file mode 100644 index 87a5bccf92d..00000000000 --- a/queue-6.6/s390-boot-compile-all-files-with-the-same-march-flag.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 38535e2cd536ecc91b56b24c6745b0242722e320 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 4 Sep 2024 11:39:27 +0200 -Subject: s390/boot: Compile all files with the same march flag - -From: Heiko Carstens - -[ Upstream commit fccb175bc89a0d37e3ff513bb6bf1f73b3a48950 ] - -Only a couple of files of the decompressor are compiled with the -minimum architecture level. This is problematic for potential function -calls between compile units, especially if a target function is within -a compile until compiled for a higher architecture level, since that -may lead to an unexpected operation exception. - -Therefore compile all files of the decompressor for the same (minimum) -architecture level. - -Reviewed-by: Sven Schnelle -Signed-off-by: Heiko Carstens -Signed-off-by: Sasha Levin ---- - arch/s390/boot/Makefile | 19 +++++-------------- - 1 file changed, 5 insertions(+), 14 deletions(-) - -diff --git a/arch/s390/boot/Makefile b/arch/s390/boot/Makefile -index c7c81e5f92189..e4def3a6c6cca 100644 ---- a/arch/s390/boot/Makefile -+++ b/arch/s390/boot/Makefile -@@ -9,11 +9,8 @@ UBSAN_SANITIZE := n - KASAN_SANITIZE := n - KCSAN_SANITIZE := n - --KBUILD_AFLAGS := $(KBUILD_AFLAGS_DECOMPRESSOR) --KBUILD_CFLAGS := $(KBUILD_CFLAGS_DECOMPRESSOR) -- - # --# Use minimum architecture for als.c to be able to print an error -+# Use minimum architecture level so it is possible to print an error - # message if the kernel is started on a machine which is too old - # - ifndef CONFIG_CC_IS_CLANG -@@ -22,16 +19,10 @@ else - CC_FLAGS_MARCH_MINIMUM := -march=z10 - endif - --ifneq ($(CC_FLAGS_MARCH),$(CC_FLAGS_MARCH_MINIMUM)) --AFLAGS_REMOVE_head.o += $(CC_FLAGS_MARCH) --AFLAGS_head.o += $(CC_FLAGS_MARCH_MINIMUM) --AFLAGS_REMOVE_mem.o += $(CC_FLAGS_MARCH) --AFLAGS_mem.o += $(CC_FLAGS_MARCH_MINIMUM) --CFLAGS_REMOVE_als.o += $(CC_FLAGS_MARCH) --CFLAGS_als.o += $(CC_FLAGS_MARCH_MINIMUM) --CFLAGS_REMOVE_sclp_early_core.o += $(CC_FLAGS_MARCH) --CFLAGS_sclp_early_core.o += $(CC_FLAGS_MARCH_MINIMUM) --endif -+KBUILD_AFLAGS := $(filter-out $(CC_FLAGS_MARCH),$(KBUILD_AFLAGS_DECOMPRESSOR)) -+KBUILD_CFLAGS := $(filter-out $(CC_FLAGS_MARCH),$(KBUILD_CFLAGS_DECOMPRESSOR)) -+KBUILD_AFLAGS += $(CC_FLAGS_MARCH_MINIMUM) -+KBUILD_CFLAGS += $(CC_FLAGS_MARCH_MINIMUM) - - CFLAGS_sclp_early_core.o += -I$(srctree)/drivers/s390/char - --- -2.43.0 - diff --git a/queue-6.6/s390-traps-handle-early-warnings-gracefully.patch b/queue-6.6/s390-traps-handle-early-warnings-gracefully.patch deleted file mode 100644 index 20294c4b3be..00000000000 --- a/queue-6.6/s390-traps-handle-early-warnings-gracefully.patch +++ /dev/null @@ -1,56 +0,0 @@ -From b5cf89c5606cc26c6c4448a88b0e2a28c3254704 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 31 Jul 2024 15:26:01 +0200 -Subject: s390/traps: Handle early warnings gracefully - -From: Heiko Carstens - -[ Upstream commit 3c4d0ae0671827f4b536cc2d26f8b9c54584ccc5 ] - -Add missing warning handling to the early program check handler. This -way a warning is printed to the console as soon as the early console -is setup, and the kernel continues to boot. - -Before this change a disabled wait psw was loaded instead and the -machine was silently stopped without giving an idea about what -happened. - -Reviewed-by: Sven Schnelle -Signed-off-by: Heiko Carstens -Signed-off-by: Vasily Gorbik -Signed-off-by: Sasha Levin ---- - arch/s390/kernel/early.c | 17 +++++++++++++++-- - 1 file changed, 15 insertions(+), 2 deletions(-) - -diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c -index 3a54733e4fc65..eb6307c066c8a 100644 ---- a/arch/s390/kernel/early.c -+++ b/arch/s390/kernel/early.c -@@ -174,8 +174,21 @@ static __init void setup_topology(void) - - void __do_early_pgm_check(struct pt_regs *regs) - { -- if (!fixup_exception(regs)) -- disabled_wait(); -+ struct lowcore *lc = get_lowcore(); -+ unsigned long ip; -+ -+ regs->int_code = lc->pgm_int_code; -+ regs->int_parm_long = lc->trans_exc_code; -+ ip = __rewind_psw(regs->psw, regs->int_code >> 16); -+ -+ /* Monitor Event? Might be a warning */ -+ if ((regs->int_code & PGM_INT_CODE_MASK) == 0x40) { -+ if (report_bug(ip, regs) == BUG_TRAP_TYPE_WARN) -+ return; -+ } -+ if (fixup_exception(regs)) -+ return; -+ disabled_wait(); - } - - static noinline __init void setup_lowcore_early(void) --- -2.43.0 - diff --git a/queue-6.6/series b/queue-6.6/series index 50cf29dd349..5211a38e1cd 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -55,14 +55,12 @@ zram-don-t-free-statically-defined-names.patch input-synaptics-rmi4-fix-uaf-of-irq-domain-on-driver.patch selftests-bpf-fix-arg_ptr_to_long-half-uninitialized.patch bpf-check-percpu-map-value-size-first.patch -s390-boot-compile-all-files-with-the-same-march-flag.patch s390-facility-disable-compile-time-optimization-for-.patch s390-mm-add-cond_resched-to-cmm_alloc-free_pages.patch bpf-x64-fix-a-jit-convergence-issue.patch ext4-don-t-set-sb_rdonly-after-filesystem-errors.patch ext4-nested-locking-for-xattr-inode.patch s390-cpum_sf-remove-warn_on_once-statements.patch -s390-traps-handle-early-warnings-gracefully.patch bpf-prevent-tail-call-between-progs-attached-to-diff.patch ktest.pl-avoid-false-positives-with-grub2-skip-regex.patch rdma-mad-improve-handling-of-timed-out-wrs-of-mad-ag.patch