From 57a4317e7067a94a418c2e402547198e7f62045b Mon Sep 17 00:00:00 2001 From: "Herton R. Krzesinski" Date: Fri, 13 Nov 2020 12:56:26 -0500 Subject: [PATCH] kernel-5.9.0-39.el9 * Fri Nov 13 2020 Herton R. Krzesinski [5.9.0-39] - Apply patches from 5.9.8 upstream stable update ("Herton R. Krzesinski") - Drop commit f2ac57a4c49d - "x86/unwind/orc:...", applied now through 5.9.8 update ("Herton R. Krzesinski") Signed-off-by: Herton R. Krzesinski --- ...ix-inactive-tasks-with-stack-pointer.patch | 140 ------------------ kernel-aarch64-debug-fedora.config | 2 + kernel-aarch64-debug-rhel.config | 2 + kernel-aarch64-fedora.config | 2 + kernel-aarch64-rhel.config | 2 + kernel-armv7hl-debug-fedora.config | 2 + kernel-armv7hl-fedora.config | 2 + kernel-armv7hl-lpae-debug-fedora.config | 2 + kernel-armv7hl-lpae-fedora.config | 2 + kernel-i686-debug-fedora.config | 2 + kernel-i686-fedora.config | 2 + kernel-ppc64le-debug-fedora.config | 2 + kernel-ppc64le-debug-rhel.config | 2 + kernel-ppc64le-fedora.config | 2 + kernel-ppc64le-rhel.config | 2 + kernel-s390x-debug-fedora.config | 2 + kernel-s390x-debug-rhel.config | 2 + kernel-s390x-fedora.config | 2 + kernel-s390x-rhel.config | 2 + kernel-s390x-zfcpdump-rhel.config | 2 + kernel-x86_64-debug-fedora.config | 2 + kernel-x86_64-debug-rhel.config | 2 + kernel-x86_64-fedora.config | 2 + kernel-x86_64-rhel.config | 2 + kernel.spec | 17 ++- sources | 5 +- 26 files changed, 61 insertions(+), 147 deletions(-) delete mode 100644 0002-x86-unwind-orc-Fix-inactive-tasks-with-stack-pointer.patch diff --git a/0002-x86-unwind-orc-Fix-inactive-tasks-with-stack-pointer.patch b/0002-x86-unwind-orc-Fix-inactive-tasks-with-stack-pointer.patch deleted file mode 100644 index f0927a56e..000000000 --- a/0002-x86-unwind-orc-Fix-inactive-tasks-with-stack-pointer.patch +++ /dev/null @@ -1,140 +0,0 @@ -From f2ac57a4c49d40409c21c82d23b5706df9b438af Mon Sep 17 00:00:00 2001 -From: Jiri Slaby -Date: Wed, 14 Oct 2020 07:30:51 +0200 -Subject: [PATCH] x86/unwind/orc: Fix inactive tasks with stack pointer in %sp - on GCC 10 compiled kernels - -GCC 10 optimizes the scheduler code differently than its predecessors. - -When CONFIG_DEBUG_SECTION_MISMATCH=y, the Makefile forces GCC not -to inline some functions (-fno-inline-functions-called-once). Before GCC -10, "no-inlined" __schedule() starts with the usual prologue: - - push %bp - mov %sp, %bp - -So the ORC unwinder simply picks stack pointer from %bp and -unwinds from __schedule() just perfectly: - - $ cat /proc/1/stack - [<0>] ep_poll+0x3e9/0x450 - [<0>] do_epoll_wait+0xaa/0xc0 - [<0>] __x64_sys_epoll_wait+0x1a/0x20 - [<0>] do_syscall_64+0x33/0x40 - [<0>] entry_SYSCALL_64_after_hwframe+0x44/0xa9 - -But now, with GCC 10, there is no %bp prologue in __schedule(): - - $ cat /proc/1/stack - - -The ORC entry of the point in __schedule() is: - - sp:sp+88 bp:last_sp-48 type:call end:0 - -In this case, nobody subtracts sizeof "struct inactive_task_frame" in -__unwind_start(). The struct is put on the stack by __switch_to_asm() and -only then __switch_to_asm() stores %sp to task->thread.sp. But we start -unwinding from a point in __schedule() (stored in frame->ret_addr by -'call') and not in __switch_to_asm(). - -So for these example values in __unwind_start(): - - sp=ffff94b50001fdc8 bp=ffff8e1f41d29340 ip=__schedule+0x1f0 - -The stack is: - - ffff94b50001fdc8: ffff8e1f41578000 # struct inactive_task_frame - ffff94b50001fdd0: 0000000000000000 - ffff94b50001fdd8: ffff8e1f41d29340 - ffff94b50001fde0: ffff8e1f41611d40 # ... - ffff94b50001fde8: ffffffff93c41920 # bx - ffff94b50001fdf0: ffff8e1f41d29340 # bp - ffff94b50001fdf8: ffffffff9376cad0 # ret_addr (and end of the struct) - -0xffffffff9376cad0 is __schedule+0x1f0 (after the call to -__switch_to_asm). Now follow those 88 bytes from the ORC entry (sp+88). -The entry is correct, __schedule() really pushes 48 bytes (8*7) + 32 bytes -via subq to store some local values (like 4U below). So to unwind, look -at the offset 88-sizeof(long) = 0x50 from here: - - ffff94b50001fe00: ffff8e1f41578618 - ffff94b50001fe08: 00000cc000000255 - ffff94b50001fe10: 0000000500000004 - ffff94b50001fe18: 7793fab6956b2d00 # NOTE (see below) - ffff94b50001fe20: ffff8e1f41578000 - ffff94b50001fe28: ffff8e1f41578000 - ffff94b50001fe30: ffff8e1f41578000 - ffff94b50001fe38: ffff8e1f41578000 - ffff94b50001fe40: ffff94b50001fed8 - ffff94b50001fe48: ffff8e1f41577ff0 - ffff94b50001fe50: ffffffff9376cf12 - -Here ^^^^^^^^^^^^^^^^ is the correct ret addr from -__schedule(). It translates to schedule+0x42 (insn after a call to -__schedule()). - -BUT, unwind_next_frame() tries to take the address starting from -0xffff94b50001fdc8. That is exactly from thread.sp+88-sizeof(long) = -0xffff94b50001fdc8+88-8 = 0xffff94b50001fe18, which is garbage marked as -NOTE above. So this quits the unwinding as 7793fab6956b2d00 is obviously -not a kernel address. - -There was a fix to skip 'struct inactive_task_frame' in -unwind_get_return_address_ptr in the following commit: - - 187b96db5ca7 ("x86/unwind/orc: Fix unwind_get_return_address_ptr() for inactive tasks") - -But we need to skip the struct already in the unwinder proper. So -subtract the size (increase the stack pointer) of the structure in -__unwind_start() directly. This allows for removal of the code added by -commit 187b96db5ca7 completely, as the address is now at -'(unsigned long *)state->sp - 1', the same as in the generic case. - -[ mingo: Cleaned up the changelog a bit, for better readability. ] - -Fixes: ee9f8fce9964 ("x86/unwind: Add the ORC unwinder") -Bug: https://bugzilla.suse.com/show_bug.cgi?id=1176907 -Signed-off-by: Jiri Slaby -Signed-off-by: Ingo Molnar -Link: https://lore.kernel.org/r/20201014053051.24199-1-jslaby@suse.cz ---- - arch/x86/kernel/unwind_orc.c | 9 +-------- - 1 file changed, 1 insertion(+), 8 deletions(-) - -diff --git a/arch/x86/kernel/unwind_orc.c b/arch/x86/kernel/unwind_orc.c -index ec88bbe08a32..4a96aa3de7d8 100644 ---- a/arch/x86/kernel/unwind_orc.c -+++ b/arch/x86/kernel/unwind_orc.c -@@ -320,19 +320,12 @@ EXPORT_SYMBOL_GPL(unwind_get_return_address); - - unsigned long *unwind_get_return_address_ptr(struct unwind_state *state) - { -- struct task_struct *task = state->task; -- - if (unwind_done(state)) - return NULL; - - if (state->regs) - return &state->regs->ip; - -- if (task != current && state->sp == task->thread.sp) { -- struct inactive_task_frame *frame = (void *)task->thread.sp; -- return &frame->ret_addr; -- } -- - if (state->sp) - return (unsigned long *)state->sp - 1; - -@@ -662,7 +655,7 @@ void __unwind_start(struct unwind_state *state, struct task_struct *task, - } else { - struct inactive_task_frame *frame = (void *)task->thread.sp; - -- state->sp = task->thread.sp; -+ state->sp = task->thread.sp + sizeof(*frame); - state->bp = READ_ONCE_NOCHECK(frame->bp); - state->ip = READ_ONCE_NOCHECK(frame->ret_addr); - state->signal = (void *)state->ip == ret_from_fork; --- -2.27.0 - diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 22c03ba24..0ae7f51c7 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -5014,6 +5014,7 @@ CONFIG_POWER_SUPPLY=y # CONFIG_PPC_PROT_SAO_LPAR is not set # CONFIG_PPC_PTDUMP is not set # CONFIG_PPC_QUEUED_SPINLOCKS is not set +CONFIG_PPC_RTAS_FILTER=y CONFIG_PPDEV=m CONFIG_PPP_ASYNC=m CONFIG_PPP_BSDCOMP=m @@ -6869,6 +6870,7 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_BPF is not set # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_FPU is not set +# CONFIG_TEST_FREE_PAGES is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set # CONFIG_TEST_HMM is not set diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 311d92758..17c19e2be 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -4039,6 +4039,7 @@ CONFIG_POWER_SUPPLY_HWMON=y CONFIG_POWER_SUPPLY=y # CONFIG_PPC_PROT_SAO_LPAR is not set # CONFIG_PPC_QUEUED_SPINLOCKS is not set +CONFIG_PPC_RTAS_FILTER=y CONFIG_PPDEV=m CONFIG_PPP_ASYNC=m CONFIG_PPP_BSDCOMP=m @@ -5448,6 +5449,7 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_BPF is not set # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_FPU is not set +# CONFIG_TEST_FREE_PAGES is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set # CONFIG_TEST_HMM is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index d271b06e1..aaab0b7fa 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -4995,6 +4995,7 @@ CONFIG_POWER_SUPPLY=y # CONFIG_PPC_PROT_SAO_LPAR is not set # CONFIG_PPC_PTDUMP is not set # CONFIG_PPC_QUEUED_SPINLOCKS is not set +CONFIG_PPC_RTAS_FILTER=y CONFIG_PPDEV=m CONFIG_PPP_ASYNC=m CONFIG_PPP_BSDCOMP=m @@ -6848,6 +6849,7 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_BPF is not set # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_FPU is not set +# CONFIG_TEST_FREE_PAGES is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set # CONFIG_TEST_HMM is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 0b2a8aa8a..80f1e635b 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -4021,6 +4021,7 @@ CONFIG_POWER_SUPPLY_HWMON=y CONFIG_POWER_SUPPLY=y # CONFIG_PPC_PROT_SAO_LPAR is not set # CONFIG_PPC_QUEUED_SPINLOCKS is not set +CONFIG_PPC_RTAS_FILTER=y CONFIG_PPDEV=m CONFIG_PPP_ASYNC=m CONFIG_PPP_BSDCOMP=m @@ -5428,6 +5429,7 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_BPF is not set # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_FPU is not set +# CONFIG_TEST_FREE_PAGES is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set # CONFIG_TEST_HMM is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index 08339a406..1843d35cb 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -5121,6 +5121,7 @@ CONFIG_POWER_SUPPLY=y # CONFIG_PPC_PROT_SAO_LPAR is not set # CONFIG_PPC_PTDUMP is not set # CONFIG_PPC_QUEUED_SPINLOCKS is not set +CONFIG_PPC_RTAS_FILTER=y CONFIG_PPDEV=m CONFIG_PPP_ASYNC=m CONFIG_PPP_BSDCOMP=m @@ -7101,6 +7102,7 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_BPF is not set # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_FPU is not set +# CONFIG_TEST_FREE_PAGES is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set # CONFIG_TEST_HMM is not set diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 8b988cc29..33b6e6408 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -5103,6 +5103,7 @@ CONFIG_POWER_SUPPLY=y # CONFIG_PPC_PROT_SAO_LPAR is not set # CONFIG_PPC_PTDUMP is not set # CONFIG_PPC_QUEUED_SPINLOCKS is not set +CONFIG_PPC_RTAS_FILTER=y CONFIG_PPDEV=m CONFIG_PPP_ASYNC=m CONFIG_PPP_BSDCOMP=m @@ -7081,6 +7082,7 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_BPF is not set # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_FPU is not set +# CONFIG_TEST_FREE_PAGES is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set # CONFIG_TEST_HMM is not set diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 8ba1e9f14..691ad18ff 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -4990,6 +4990,7 @@ CONFIG_POWER_SUPPLY=y # CONFIG_PPC_PROT_SAO_LPAR is not set # CONFIG_PPC_PTDUMP is not set # CONFIG_PPC_QUEUED_SPINLOCKS is not set +CONFIG_PPC_RTAS_FILTER=y CONFIG_PPDEV=m CONFIG_PPP_ASYNC=m CONFIG_PPP_BSDCOMP=m @@ -6856,6 +6857,7 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_BPF is not set # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_FPU is not set +# CONFIG_TEST_FREE_PAGES is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set # CONFIG_TEST_HMM is not set diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 64e7f05b9..c2e62547e 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -4972,6 +4972,7 @@ CONFIG_POWER_SUPPLY=y # CONFIG_PPC_PROT_SAO_LPAR is not set # CONFIG_PPC_PTDUMP is not set # CONFIG_PPC_QUEUED_SPINLOCKS is not set +CONFIG_PPC_RTAS_FILTER=y CONFIG_PPDEV=m CONFIG_PPP_ASYNC=m CONFIG_PPP_BSDCOMP=m @@ -6836,6 +6837,7 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_BPF is not set # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_FPU is not set +# CONFIG_TEST_FREE_PAGES is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set # CONFIG_TEST_HMM is not set diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index 8ec5ff04e..6ead8ca6f 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -4582,6 +4582,7 @@ CONFIG_POWER_SUPPLY=y # CONFIG_PPC_PROT_SAO_LPAR is not set # CONFIG_PPC_PTDUMP is not set # CONFIG_PPC_QUEUED_SPINLOCKS is not set +CONFIG_PPC_RTAS_FILTER=y CONFIG_PPDEV=m CONFIG_PPP_ASYNC=m CONFIG_PPP_BSDCOMP=m @@ -6192,6 +6193,7 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_BPF is not set # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_FPU is not set +# CONFIG_TEST_FREE_PAGES is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set # CONFIG_TEST_HMM is not set diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index 4cda9c040..d691f49a2 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -4563,6 +4563,7 @@ CONFIG_POWER_SUPPLY=y # CONFIG_PPC_PROT_SAO_LPAR is not set # CONFIG_PPC_PTDUMP is not set # CONFIG_PPC_QUEUED_SPINLOCKS is not set +CONFIG_PPC_RTAS_FILTER=y CONFIG_PPDEV=m CONFIG_PPP_ASYNC=m CONFIG_PPP_BSDCOMP=m @@ -6171,6 +6172,7 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_BPF is not set # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_FPU is not set +# CONFIG_TEST_FREE_PAGES is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set # CONFIG_TEST_HMM is not set diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 09e15f6c7..551551feb 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -4257,6 +4257,7 @@ CONFIG_PPC_PSERIES=y # CONFIG_PPC_QUEUED_SPINLOCKS is not set CONFIG_PPC_RADIX_MMU_DEFAULT=y CONFIG_PPC_RADIX_MMU=y +CONFIG_PPC_RTAS_FILTER=y CONFIG_PPC_SMLPAR=y CONFIG_PPC_SPLPAR=y CONFIG_PPC_SUBPAGE_PROT=y @@ -5777,6 +5778,7 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_BPF is not set # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_FPU is not set +# CONFIG_TEST_FREE_PAGES is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set # CONFIG_TEST_HMM is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 72db95d35..2a04424a4 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -3887,6 +3887,7 @@ CONFIG_PPC_PSERIES=y # CONFIG_PPC_QUEUED_SPINLOCKS is not set CONFIG_PPC_RADIX_MMU_DEFAULT=y CONFIG_PPC_RADIX_MMU=y +CONFIG_PPC_RTAS_FILTER=y CONFIG_PPC_SMLPAR=y CONFIG_PPC_SPLPAR=y CONFIG_PPC_SUBPAGE_PROT=y @@ -5293,6 +5294,7 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_BPF is not set # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_FPU is not set +# CONFIG_TEST_FREE_PAGES is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set # CONFIG_TEST_HMM is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index e18f82ba6..bc2c48de5 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -4237,6 +4237,7 @@ CONFIG_PPC_PSERIES=y # CONFIG_PPC_QUEUED_SPINLOCKS is not set CONFIG_PPC_RADIX_MMU_DEFAULT=y CONFIG_PPC_RADIX_MMU=y +CONFIG_PPC_RTAS_FILTER=y CONFIG_PPC_SMLPAR=y CONFIG_PPC_SPLPAR=y CONFIG_PPC_SUBPAGE_PROT=y @@ -5755,6 +5756,7 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_BPF is not set # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_FPU is not set +# CONFIG_TEST_FREE_PAGES is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set # CONFIG_TEST_HMM is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 2cc2ae06d..9897e1468 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -3871,6 +3871,7 @@ CONFIG_PPC_PSERIES=y # CONFIG_PPC_QUEUED_SPINLOCKS is not set CONFIG_PPC_RADIX_MMU_DEFAULT=y CONFIG_PPC_RADIX_MMU=y +CONFIG_PPC_RTAS_FILTER=y CONFIG_PPC_SMLPAR=y CONFIG_PPC_SPLPAR=y CONFIG_PPC_SUBPAGE_PROT=y @@ -5275,6 +5276,7 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_BPF is not set # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_FPU is not set +# CONFIG_TEST_FREE_PAGES is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set # CONFIG_TEST_HMM is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index 6ca515b9f..fffec99c9 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -4195,6 +4195,7 @@ CONFIG_POWER_SUPPLY=y # CONFIG_PPC_PROT_SAO_LPAR is not set # CONFIG_PPC_PTDUMP is not set # CONFIG_PPC_QUEUED_SPINLOCKS is not set +CONFIG_PPC_RTAS_FILTER=y CONFIG_PPDEV=m CONFIG_PPP_ASYNC=m CONFIG_PPP_BSDCOMP=m @@ -5715,6 +5716,7 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_BPF is not set # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_FPU is not set +# CONFIG_TEST_FREE_PAGES is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set # CONFIG_TEST_HMM is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 520e0d796..cc5c77bf9 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -3828,6 +3828,7 @@ CONFIG_POWER_SUPPLY_HWMON=y CONFIG_POWER_SUPPLY=y # CONFIG_PPC_PROT_SAO_LPAR is not set # CONFIG_PPC_QUEUED_SPINLOCKS is not set +CONFIG_PPC_RTAS_FILTER=y CONFIG_PPDEV=m CONFIG_PPP_ASYNC=m CONFIG_PPP_BSDCOMP=m @@ -5230,6 +5231,7 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_BPF is not set # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_FPU is not set +# CONFIG_TEST_FREE_PAGES is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set # CONFIG_TEST_HMM is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 6ee8bd49d..a3d5eb7bd 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -4175,6 +4175,7 @@ CONFIG_POWER_SUPPLY=y # CONFIG_PPC_PROT_SAO_LPAR is not set # CONFIG_PPC_PTDUMP is not set # CONFIG_PPC_QUEUED_SPINLOCKS is not set +CONFIG_PPC_RTAS_FILTER=y CONFIG_PPDEV=m CONFIG_PPP_ASYNC=m CONFIG_PPP_BSDCOMP=m @@ -5693,6 +5694,7 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_BPF is not set # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_FPU is not set +# CONFIG_TEST_FREE_PAGES is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set # CONFIG_TEST_HMM is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 24878ef4c..80969a9a5 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -3812,6 +3812,7 @@ CONFIG_POWER_SUPPLY_HWMON=y CONFIG_POWER_SUPPLY=y # CONFIG_PPC_PROT_SAO_LPAR is not set # CONFIG_PPC_QUEUED_SPINLOCKS is not set +CONFIG_PPC_RTAS_FILTER=y CONFIG_PPDEV=m CONFIG_PPP_ASYNC=m CONFIG_PPP_BSDCOMP=m @@ -5212,6 +5213,7 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_BPF is not set # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_FPU is not set +# CONFIG_TEST_FREE_PAGES is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set # CONFIG_TEST_HMM is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index 459e48fc7..a69dfa793 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -3835,6 +3835,7 @@ CONFIG_POWER_SUPPLY_HWMON=y CONFIG_POWER_SUPPLY=y # CONFIG_PPC_PROT_SAO_LPAR is not set # CONFIG_PPC_QUEUED_SPINLOCKS is not set +CONFIG_PPC_RTAS_FILTER=y CONFIG_PPDEV=m CONFIG_PPP_ASYNC=m CONFIG_PPP_BSDCOMP=m @@ -5246,6 +5247,7 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_BPF is not set # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_FPU is not set +# CONFIG_TEST_FREE_PAGES is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set # CONFIG_TEST_HMM is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index e01778721..413e6fad8 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -4620,6 +4620,7 @@ CONFIG_POWER_SUPPLY=y # CONFIG_PPC_PROT_SAO_LPAR is not set # CONFIG_PPC_PTDUMP is not set # CONFIG_PPC_QUEUED_SPINLOCKS is not set +CONFIG_PPC_RTAS_FILTER=y CONFIG_PPDEV=m CONFIG_PPP_ASYNC=m CONFIG_PPP_BSDCOMP=m @@ -6245,6 +6246,7 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_BPF is not set # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_FPU is not set +# CONFIG_TEST_FREE_PAGES is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set # CONFIG_TEST_HMM is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index e41dc59c1..a1208cbea 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -4057,6 +4057,7 @@ CONFIG_POWER_SUPPLY_HWMON=y CONFIG_POWER_SUPPLY=y # CONFIG_PPC_PROT_SAO_LPAR is not set # CONFIG_PPC_QUEUED_SPINLOCKS is not set +CONFIG_PPC_RTAS_FILTER=y CONFIG_PPDEV=m CONFIG_PPP_ASYNC=m CONFIG_PPP_BSDCOMP=m @@ -5500,6 +5501,7 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_BPF is not set # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_FPU is not set +# CONFIG_TEST_FREE_PAGES is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set # CONFIG_TEST_HMM is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index ac3d16ab1..e4cce10b5 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -4601,6 +4601,7 @@ CONFIG_POWER_SUPPLY=y # CONFIG_PPC_PROT_SAO_LPAR is not set # CONFIG_PPC_PTDUMP is not set # CONFIG_PPC_QUEUED_SPINLOCKS is not set +CONFIG_PPC_RTAS_FILTER=y CONFIG_PPDEV=m CONFIG_PPP_ASYNC=m CONFIG_PPP_BSDCOMP=m @@ -6224,6 +6225,7 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_BPF is not set # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_FPU is not set +# CONFIG_TEST_FREE_PAGES is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set # CONFIG_TEST_HMM is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index f7c50fe23..701977a59 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -4039,6 +4039,7 @@ CONFIG_POWER_SUPPLY_HWMON=y CONFIG_POWER_SUPPLY=y # CONFIG_PPC_PROT_SAO_LPAR is not set # CONFIG_PPC_QUEUED_SPINLOCKS is not set +CONFIG_PPC_RTAS_FILTER=y CONFIG_PPDEV=m CONFIG_PPP_ASYNC=m CONFIG_PPP_BSDCOMP=m @@ -5480,6 +5481,7 @@ CONFIG_TERANETICS_PHY=m # CONFIG_TEST_BPF is not set # CONFIG_TEST_FIRMWARE is not set # CONFIG_TEST_FPU is not set +# CONFIG_TEST_FREE_PAGES is not set # CONFIG_TEST_HASH is not set # CONFIG_TEST_HEXDUMP is not set # CONFIG_TEST_HMM is not set diff --git a/kernel.spec b/kernel.spec index 73280b25a..10d6ce0da 100644 --- a/kernel.spec +++ b/kernel.spec @@ -31,7 +31,7 @@ Summary: The Linux kernel # For a stable, released kernel, released_kernel should be 1. %global released_kernel 0 -%global distro_build 38 +%global distro_build 39 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -70,13 +70,13 @@ Summary: The Linux kernel %endif %define rpmversion 5.9.0 -%define pkgrelease 38 +%define pkgrelease 39 # This is needed to do merge window version magic %define patchlevel 9 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 38%{?buildid}%{?dist} +%define specrelease 39%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -708,12 +708,14 @@ Source3003: Patchlist.changelog Source4000: README.rst +# For a stable release kernel +Source5000: patch-5.9.8.xz + ## Patches needed for building this package %if !%{nopatches} Patch1: patch-%{rpmversion}-redhat.patch -Patch2: 0002-x86-unwind-orc-Fix-inactive-tasks-with-stack-pointer.patch %endif # empty final patch to facilitate testing of kernel patches @@ -1213,11 +1215,11 @@ mv linux-5.9 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . +xzcat %{SOURCE5000} | patch -p1 -F1 -s %if !%{nopatches} ApplyOptionalPatch patch-%{rpmversion}-redhat.patch -ApplyPatch 0002-x86-unwind-orc-Fix-inactive-tasks-with-stack-pointer.patch %endif ApplyOptionalPatch linux-kernel-test.patch @@ -2645,6 +2647,11 @@ fi # # %changelog +* Fri Nov 13 2020 Herton R. Krzesinski [5.9.0-39] +- Apply patches from 5.9.8 upstream stable update ("Herton R. Krzesinski") +- Drop commit f2ac57a4c49d - "x86/unwind/orc:...", applied now through + 5.9.8 update ("Herton R. Krzesinski") + * Mon Nov 09 2020 Herton R. Krzesinski [5.9.0-38] - Apply upstream fix: commit f2ac57a4c49d - "x86/unwind/orc: Fix inactive tasks with stack pointer in %sp on GCC 10 compiled kernels" ("Herton R. Krzesinski") diff --git a/sources b/sources index c02d2d9ea..0a318ec5d 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ SHA512 (linux-5.9.tar.xz) = cafd463ca0c9b256479b7dd774f908cedef6d265c44f99de075558ab923808ddfacda1377ae000ce02730c6611527bddffbfc4421bbc4f44fd8e59d97cbc4363 -SHA512 (kernel-abi-whitelists-5.9.0-38.tar.bz2) = 03a9111423353a35e3cbe4473e1317f5dcc9b0834b9413b49ebe878f0cc94a42d6b78688132790ae6ba081cc50d6725f1a49b313b8f899943d30d7d095c64f40 -SHA512 (kernel-kabi-dw-5.9.0-38.tar.bz2) = 3cd53709d27d6d75b4e45b44933d39fbf7eafb1933c750cbaf48dfb3424f7e4ffeadcf136800f388040549bbe8e4b5a47608381ec85247c1474f1958859594d9 +SHA512 (kernel-kabi-dw-5.9.0-39.tar.bz2) = 3cd53709d27d6d75b4e45b44933d39fbf7eafb1933c750cbaf48dfb3424f7e4ffeadcf136800f388040549bbe8e4b5a47608381ec85247c1474f1958859594d9 +SHA512 (kernel-abi-whitelists-5.9.0-39.tar.bz2) = 03a9111423353a35e3cbe4473e1317f5dcc9b0834b9413b49ebe878f0cc94a42d6b78688132790ae6ba081cc50d6725f1a49b313b8f899943d30d7d095c64f40 +SHA512 (patch-5.9.8.xz) = 53dee96e9d3cf4f720c03687c8a4bea53423f76d16fa685a18e188c0a418d1d5ce3eb308c061138d8c0fd6af0062db0a622429f71d5698ac9092acf13a982f10