diff options
author | Justin M. Forbes <jforbes@fedoraproject.org> | 2021-06-11 15:46:33 -0500 |
---|---|---|
committer | Justin M. Forbes <jforbes@fedoraproject.org> | 2021-06-11 15:46:33 -0500 |
commit | 480eb4ac91098bf9c9aec9c2c7854f43e121aca8 (patch) | |
tree | fd82bf7e5ebd253240faa6b6bccbf2d578f654b6 /patch-5.13.0-redhat.patch | |
parent | e5c1ab6d64e0de0321ee1c62f32f89480e3b8d2d (diff) | |
download | kernel-480eb4ac91098bf9c9aec9c2c7854f43e121aca8.tar.gz kernel-480eb4ac91098bf9c9aec9c2c7854f43e121aca8.tar.xz kernel-480eb4ac91098bf9c9aec9c2c7854f43e121aca8.zip |
kernel-5.13.0-0.rc5.20210611git929d931f2b40.42
* Fri Jun 11 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.13.0-0.rc5.20210611git929d931f2b40.42]
- Revert "powerpc: Switch to relative jump labels" (Don Zickus)
- spec: Enable sefltests rpm build (Jiri Olsa)
- spec: Allow bpf selftest/samples to fail (Jiri Olsa)
- kvm: Add kvm_stat.service file and kvm_stat logrotate config to the tools (Jiri Benc)
- kernel.spec: Add missing source files to kernel-selftests-internal (Jiri Benc)
- kernel.spec: selftests: add net/forwarding to TARGETS list (Jiri Benc)
- kernel.spec: selftests: add build requirement on libmnl-devel (Jiri Benc)
- kernel.spec: add action.o to kernel-selftests-internal (Jiri Benc)
- kernel.spec: avoid building bpftool repeatedly (Jiri Benc)
- kernel.spec: selftests require python3 (Jiri Benc)
- kernel.spec: skip selftests that failed to build (Jiri Benc)
- kernel.spec: fix installation of bpf selftests (Jiri Benc)
- redhat: fix samples and selftests make options (Jiri Benc)
- kernel.spec: enable mptcp selftests for kernel-selftests-internal (Jiri Benc)
- kernel.spec: Do not export shared objects from libexecdir to RPM Provides (Jiri Benc)
- kernel.spec: add missing dependency for the which package (Jiri Benc)
- kernel.spec: add netfilter selftests to kernel-selftests-internal (Jiri Benc)
- kernel.spec: move slabinfo and page_owner_sort debuginfo to tools-debuginfo (Jiri Benc)
- kernel.spec: package and ship VM tools (Jiri Benc)
- configs: enable CONFIG_PAGE_OWNER (Jiri Benc)
- kernel.spec: add coreutils (Jiri Benc)
- kernel.spec: add netdevsim driver selftests to kernel-selftests-internal (Jiri Benc)
- redhat/Makefile: Clean out the --without flags from the baseonly rule (Jiri Benc)
- kernel.spec: Stop building unnecessary rpms for baseonly builds (Jiri Benc)
- kernel.spec: disable more kabi switches for gcov build (Jiri Benc)
- kernel.spec: Rename kabi-dw base (Jiri Benc)
- kernel.spec: Fix error messages during build of zfcpdump kernel (Jiri Benc)
- kernel.spec: perf: remove bpf examples (Jiri Benc)
- kernel.spec: selftests should not depend on modules-internal (Jiri Benc)
- kernel.spec: build samples (Jiri Benc)
- kernel.spec: tools: sync missing options with RHEL 8 (Jiri Benc)
- configs/ark/s390: set CONFIG_MARCH_Z14 and CONFIG_TUNE_Z15 (Philipp Rudo) [1876435]
- configs/common/s390: Clean up CONFIG_{MARCH,TUNE}_Z* (Philipp Rudo)
- configs/process_configs.sh: make use of dummy-tools (Philipp Rudo)
- configs/common: disable CONFIG_INIT_STACK_ALL_{PATTERN,ZERO} (Philipp Rudo)
- configs/common/aarch64: disable CONFIG_RELR (Philipp Rudo)
Resolves: rhbz#1876435
Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
Diffstat (limited to 'patch-5.13.0-redhat.patch')
-rw-r--r-- | patch-5.13.0-redhat.patch | 84 |
1 files changed, 83 insertions, 1 deletions
diff --git a/patch-5.13.0-redhat.patch b/patch-5.13.0-redhat.patch index 82356366b..e98727316 100644 --- a/patch-5.13.0-redhat.patch +++ b/patch-5.13.0-redhat.patch @@ -6,6 +6,9 @@ arch/arm/Kconfig | 4 +- arch/arm64/Kconfig | 3 +- arch/arm64/kernel/acpi.c | 4 + + arch/powerpc/Kconfig | 1 - + arch/powerpc/include/asm/jump_label.h | 21 +- + arch/powerpc/kernel/jump_label.c | 4 +- arch/s390/include/asm/ipl.h | 1 + arch/s390/kernel/ipl.c | 5 + arch/s390/kernel/setup.c | 4 + @@ -70,7 +73,7 @@ security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 6 + - 72 files changed, 1215 insertions(+), 189 deletions(-) + 75 files changed, 1232 insertions(+), 198 deletions(-) diff --git a/Documentation/admin-guide/kdump/kdump.rst b/Documentation/admin-guide/kdump/kdump.rst index 75a9dd98e76e..3ff3291551f9 100644 @@ -238,6 +241,85 @@ index cada0b816c8a..77b30bf451aa 100644 static bool param_acpi_force __initdata; static int __init parse_acpi(char *arg) +diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig +index 088dd2afcfe4..59e0d55ee01d 100644 +--- a/arch/powerpc/Kconfig ++++ b/arch/powerpc/Kconfig +@@ -189,7 +189,6 @@ config PPC + select HAVE_ARCH_HUGE_VMALLOC if HAVE_ARCH_HUGE_VMAP + select HAVE_ARCH_HUGE_VMAP if PPC_BOOK3S_64 && PPC_RADIX_MMU + select HAVE_ARCH_JUMP_LABEL +- select HAVE_ARCH_JUMP_LABEL_RELATIVE + select HAVE_ARCH_KASAN if PPC32 && PPC_PAGE_SHIFT <= 14 + select HAVE_ARCH_KASAN_VMALLOC if PPC32 && PPC_PAGE_SHIFT <= 14 + select HAVE_ARCH_KFENCE if PPC32 +diff --git a/arch/powerpc/include/asm/jump_label.h b/arch/powerpc/include/asm/jump_label.h +index 2d5c6bec2b4f..09297ec9fa52 100644 +--- a/arch/powerpc/include/asm/jump_label.h ++++ b/arch/powerpc/include/asm/jump_label.h +@@ -20,8 +20,7 @@ static __always_inline bool arch_static_branch(struct static_key *key, bool bran + asm_volatile_goto("1:\n\t" + "nop # arch_static_branch\n\t" + ".pushsection __jump_table, \"aw\"\n\t" +- ".long 1b - ., %l[l_yes] - .\n\t" +- JUMP_ENTRY_TYPE "%c0 - .\n\t" ++ JUMP_ENTRY_TYPE "1b, %l[l_yes], %c0\n\t" + ".popsection \n\t" + : : "i" (&((char *)key)[branch]) : : l_yes); + +@@ -35,8 +34,7 @@ static __always_inline bool arch_static_branch_jump(struct static_key *key, bool + asm_volatile_goto("1:\n\t" + "b %l[l_yes] # arch_static_branch_jump\n\t" + ".pushsection __jump_table, \"aw\"\n\t" +- ".long 1b - ., %l[l_yes] - .\n\t" +- JUMP_ENTRY_TYPE "%c0 - .\n\t" ++ JUMP_ENTRY_TYPE "1b, %l[l_yes], %c0\n\t" + ".popsection \n\t" + : : "i" (&((char *)key)[branch]) : : l_yes); + +@@ -45,12 +43,23 @@ static __always_inline bool arch_static_branch_jump(struct static_key *key, bool + return true; + } + ++#ifdef CONFIG_PPC64 ++typedef u64 jump_label_t; ++#else ++typedef u32 jump_label_t; ++#endif ++ ++struct jump_entry { ++ jump_label_t code; ++ jump_label_t target; ++ jump_label_t key; ++}; ++ + #else + #define ARCH_STATIC_BRANCH(LABEL, KEY) \ + 1098: nop; \ + .pushsection __jump_table, "aw"; \ +- .long 1098b - ., LABEL - .; \ +- FTR_ENTRY_LONG KEY; \ ++ FTR_ENTRY_LONG 1098b, LABEL, KEY; \ + .popsection + #endif + +diff --git a/arch/powerpc/kernel/jump_label.c b/arch/powerpc/kernel/jump_label.c +index ce87dc5ea23c..144858027fa3 100644 +--- a/arch/powerpc/kernel/jump_label.c ++++ b/arch/powerpc/kernel/jump_label.c +@@ -11,10 +11,10 @@ + void arch_jump_label_transform(struct jump_entry *entry, + enum jump_label_type type) + { +- struct ppc_inst *addr = (struct ppc_inst *)jump_entry_code(entry); ++ struct ppc_inst *addr = (struct ppc_inst *)(unsigned long)entry->code; + + if (type == JUMP_LABEL_JMP) +- patch_branch(addr, jump_entry_target(entry), 0); ++ patch_branch(addr, entry->target, 0); + else + patch_instruction(addr, ppc_inst(PPC_INST_NOP)); + } diff --git a/arch/s390/include/asm/ipl.h b/arch/s390/include/asm/ipl.h index a9e2c7295b35..6ff11f3a2d47 100644 --- a/arch/s390/include/asm/ipl.h |