diff options
author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-31 14:20:41 -0400 |
---|---|---|
committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-07-31 14:20:41 -0400 |
commit | 44dd06aa0e46c46f02498824aa5f8db0d457e75a (patch) | |
tree | a1b0629a65b88cd86391a10c17a7e60e13a2abc8 | |
parent | e2644f8b4a7ba72e90b9950f75bc0f68e9775eb7 (diff) | |
download | longterm-queue-4.12-44dd06aa0e46c46f02498824aa5f8db0d457e75a.tar.gz |
unwind: drop assoc. patches and objtool changes n/a for 4.12
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
-rw-r--r-- | queue/objtool-Don-t-report-end-of-section-error-after-an-e.patch | 47 | ||||
-rw-r--r-- | queue/objtool-Print-top-level-commands-on-incorrect-usage.patch | 62 | ||||
-rw-r--r-- | queue/series | 4 | ||||
-rw-r--r-- | queue/x86-head-Add-unwind-hint-annotations.patch | 122 | ||||
-rw-r--r-- | queue/x86-xen-Add-unwind-hint-annotations.patch | 59 |
5 files changed, 0 insertions, 294 deletions
diff --git a/queue/objtool-Don-t-report-end-of-section-error-after-an-e.patch b/queue/objtool-Don-t-report-end-of-section-error-after-an-e.patch deleted file mode 100644 index 8a868d0..0000000 --- a/queue/objtool-Don-t-report-end-of-section-error-after-an-e.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 00d96180dc38ef872ac471c2d3e14b067cbd895d Mon Sep 17 00:00:00 2001 -From: Josh Poimboeuf <jpoimboe@redhat.com> -Date: Mon, 18 Sep 2017 21:43:30 -0500 -Subject: [PATCH] objtool: Don't report end of section error after an empty - unwind hint - -commit 00d96180dc38ef872ac471c2d3e14b067cbd895d upstream. - -If asm code specifies an UNWIND_HINT_EMPTY hint, don't warn if the -section ends unexpectedly. This can happen with the xen-head.S code -because the hypercall_page is "text" but it's all zeros. - -Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com> -Cc: Andy Lutomirski <luto@kernel.org> -Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com> -Cc: Jiri Slaby <jslaby@suse.cz> -Cc: Juergen Gross <jgross@suse.com> -Cc: Linus Torvalds <torvalds@linux-foundation.org> -Cc: Peter Zijlstra <peterz@infradead.org> -Cc: Thomas Gleixner <tglx@linutronix.de> -Link: http://lkml.kernel.org/r/ddafe199dd8797e40e3c2777373347eba1d65572.1505764066.git.jpoimboe@redhat.com -Signed-off-by: Ingo Molnar <mingo@kernel.org> - -diff --git a/tools/objtool/check.c b/tools/objtool/check.c -index a0c518ecf085..83f370fa00c2 100644 ---- a/tools/objtool/check.c -+++ b/tools/objtool/check.c -@@ -1752,11 +1752,14 @@ static int validate_branch(struct objtool_file *file, struct instruction *first, - if (insn->dead_end) - return 0; - -- insn = next_insn; -- if (!insn) { -+ if (!next_insn) { -+ if (state.cfa.base == CFI_UNDEFINED) -+ return 0; - WARN("%s: unexpected end of section", sec->name); - return 1; - } -+ -+ insn = next_insn; - } - - return 0; --- -2.15.0 - diff --git a/queue/objtool-Print-top-level-commands-on-incorrect-usage.patch b/queue/objtool-Print-top-level-commands-on-incorrect-usage.patch deleted file mode 100644 index 4ce56e4..0000000 --- a/queue/objtool-Print-top-level-commands-on-incorrect-usage.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 6a93bb7e4a7d6670677d5b0eb980936eb9cc5d2e Mon Sep 17 00:00:00 2001 -From: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com> -Date: Sat, 14 Oct 2017 20:17:54 +0530 -Subject: [PATCH] objtool: Print top level commands on incorrect usage - -commit 6a93bb7e4a7d6670677d5b0eb980936eb9cc5d2e upstream. - -Print top-level objtool commands, along with the error on incorrect -command line usage. Objtool command line parser exit's with code 129, -for incorrect usage. Convert the cmd_usage() exit code also, to maintain -consistency across objtool. - -After the patch: - - $ ./objtool -j - - Unknown option: -j - - usage: objtool COMMAND [ARGS] - - Commands: - check Perform stack metadata validation on an object file - orc Generate in-place ORC unwind tables for an object file - - $ echo $? - 129 - -Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com> -Acked-by: Josh Poimboeuf <jpoimboe@redhat.com> -Cc: Linus Torvalds <torvalds@linux-foundation.org> -Cc: Peter Zijlstra <peterz@infradead.org> -Cc: Thomas Gleixner <tglx@linutronix.de> -Link: http://lkml.kernel.org/r/1507992474-16142-1-git-send-email-kamalesh@linux.vnet.ibm.com -Signed-off-by: Ingo Molnar <mingo@kernel.org> - -diff --git a/tools/objtool/objtool.c b/tools/objtool/objtool.c -index 31e0f9143840..07f329919828 100644 ---- a/tools/objtool/objtool.c -+++ b/tools/objtool/objtool.c -@@ -70,7 +70,7 @@ static void cmd_usage(void) - - printf("\n"); - -- exit(1); -+ exit(129); - } - - static void handle_options(int *argc, const char ***argv) -@@ -86,9 +86,7 @@ static void handle_options(int *argc, const char ***argv) - break; - } else { - fprintf(stderr, "Unknown option: %s\n", cmd); -- fprintf(stderr, "\n Usage: %s\n", -- objtool_usage_string); -- exit(1); -+ cmd_usage(); - } - - (*argv)++; --- -2.15.0 - diff --git a/queue/series b/queue/series index e321905..d6fd360 100644 --- a/queue/series +++ b/queue/series @@ -1,12 +1,8 @@ -objtool-Don-t-report-end-of-section-error-after-an-e.patch -x86-xen-Add-unwind-hint-annotations.patch -x86-head-Add-unwind-hint-annotations.patch ACPI-APEI-adjust-a-local-variable-type-in-ghes_iorem.patch x86-unwinder-Make-CONFIG_UNWINDER_ORC-y-the-default-.patch x86-unwind-Rename-unwinder-config-options-to-CONFIG_.patch x86-unwind-Make-CONFIG_UNWINDER_ORC-y-the-default-in.patch x86-platform-UV-Convert-timers-to-use-timer_setup.patch -objtool-Print-top-level-commands-on-incorrect-usage.patch ACPI-APEI-remove-the-unused-dead-code-for-SEA-NMI-no.patch ACPI-APEI-Replace-ioremap_page_range-with-fixmap.patch bpf-fix-build-issues-on-um-due-to-mising-bpf_perf_ev.patch diff --git a/queue/x86-head-Add-unwind-hint-annotations.patch b/queue/x86-head-Add-unwind-hint-annotations.patch deleted file mode 100644 index 255d65d..0000000 --- a/queue/x86-head-Add-unwind-hint-annotations.patch +++ /dev/null @@ -1,122 +0,0 @@ -From 2704fbb672d0d9a19414907fda7949283dcef6a1 Mon Sep 17 00:00:00 2001 -From: Josh Poimboeuf <jpoimboe@redhat.com> -Date: Mon, 18 Sep 2017 21:43:37 -0500 -Subject: [PATCH] x86/head: Add unwind hint annotations - -commit 2704fbb672d0d9a19414907fda7949283dcef6a1 upstream. - -Jiri Slaby reported an ORC issue when unwinding from an idle task. The -stack was: - - ffffffff811083c2 do_idle+0x142/0x1e0 - ffffffff8110861d cpu_startup_entry+0x5d/0x60 - ffffffff82715f58 start_kernel+0x3ff/0x407 - ffffffff827153e8 x86_64_start_kernel+0x14e/0x15d - ffffffff810001bf secondary_startup_64+0x9f/0xa0 - -The ORC unwinder errored out at secondary_startup_64 because the head -code isn't annotated yet so there wasn't a corresponding ORC entry. - -Fix that and any other head-related unwinding issues by adding unwind -hints to the head code. - -Reported-by: Jiri Slaby <jslaby@suse.cz> -Tested-by: Jiri Slaby <jslaby@suse.cz> -Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com> -Cc: Andy Lutomirski <luto@kernel.org> -Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com> -Cc: Juergen Gross <jgross@suse.com> -Cc: Linus Torvalds <torvalds@linux-foundation.org> -Cc: Peter Zijlstra <peterz@infradead.org> -Cc: Thomas Gleixner <tglx@linutronix.de> -Link: http://lkml.kernel.org/r/78ef000a2f68f545d6eef44ee912edceaad82ccf.1505764066.git.jpoimboe@redhat.com -Signed-off-by: Ingo Molnar <mingo@kernel.org> - -diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile -index fd0a7895b63f..d8e2b700d1db 100644 ---- a/arch/x86/kernel/Makefile -+++ b/arch/x86/kernel/Makefile -@@ -26,7 +26,6 @@ KASAN_SANITIZE_dumpstack.o := n - KASAN_SANITIZE_dumpstack_$(BITS).o := n - KASAN_SANITIZE_stacktrace.o := n - --OBJECT_FILES_NON_STANDARD_head_$(BITS).o := y - OBJECT_FILES_NON_STANDARD_relocate_kernel_$(BITS).o := y - OBJECT_FILES_NON_STANDARD_ftrace_$(BITS).o := y - OBJECT_FILES_NON_STANDARD_test_nx.o := y -diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S -index edacd579d504..42e32c2e51bb 100644 ---- a/arch/x86/kernel/head_64.S -+++ b/arch/x86/kernel/head_64.S -@@ -49,6 +49,7 @@ L3_START_KERNEL = pud_index(__START_KERNEL_map) - .code64 - .globl startup_64 - startup_64: -+ UNWIND_HINT_EMPTY - /* - * At this point the CPU runs in 64bit mode CS.L = 1 CS.D = 0, - * and someone has loaded an identity mapped page table -@@ -88,6 +89,7 @@ startup_64: - addq $(early_top_pgt - __START_KERNEL_map), %rax - jmp 1f - ENTRY(secondary_startup_64) -+ UNWIND_HINT_EMPTY - /* - * At this point the CPU runs in 64bit mode CS.L = 1 CS.D = 0, - * and someone has loaded a mapped page table. -@@ -132,6 +134,7 @@ ENTRY(secondary_startup_64) - movq $1f, %rax - jmp *%rax - 1: -+ UNWIND_HINT_EMPTY - - /* Check if nx is implemented */ - movl $0x80000001, %eax -@@ -246,6 +249,7 @@ END(secondary_startup_64) - */ - ENTRY(start_cpu0) - movq initial_stack(%rip), %rsp -+ UNWIND_HINT_EMPTY - jmp .Ljump_to_C_code - ENDPROC(start_cpu0) - #endif -@@ -270,13 +274,18 @@ ENTRY(early_idt_handler_array) - i = 0 - .rept NUM_EXCEPTION_VECTORS - .ifeq (EXCEPTION_ERRCODE_MASK >> i) & 1 -- pushq $0 # Dummy error code, to make stack frame uniform -+ UNWIND_HINT_IRET_REGS -+ pushq $0 # Dummy error code, to make stack frame uniform -+ .else -+ UNWIND_HINT_IRET_REGS offset=8 - .endif - pushq $i # 72(%rsp) Vector number - jmp early_idt_handler_common -+ UNWIND_HINT_IRET_REGS - i = i + 1 - .fill early_idt_handler_array + i*EARLY_IDT_HANDLER_SIZE - ., 1, 0xcc - .endr -+ UNWIND_HINT_IRET_REGS offset=16 - END(early_idt_handler_array) - - early_idt_handler_common: -@@ -305,6 +314,7 @@ early_idt_handler_common: - pushq %r13 /* pt_regs->r13 */ - pushq %r14 /* pt_regs->r14 */ - pushq %r15 /* pt_regs->r15 */ -+ UNWIND_HINT_REGS - - cmpq $14,%rsi /* Page fault? */ - jnz 10f -@@ -427,7 +437,7 @@ ENTRY(phys_base) - EXPORT_SYMBOL(phys_base) - - #include "../../x86/xen/xen-head.S" -- -+ - __PAGE_ALIGNED_BSS - NEXT_PAGE(empty_zero_page) - .skip PAGE_SIZE --- -2.15.0 - diff --git a/queue/x86-xen-Add-unwind-hint-annotations.patch b/queue/x86-xen-Add-unwind-hint-annotations.patch deleted file mode 100644 index a8292fc..0000000 --- a/queue/x86-xen-Add-unwind-hint-annotations.patch +++ /dev/null @@ -1,59 +0,0 @@ -From abbe1cac6214d81d2f4e149aba64a8760703144e Mon Sep 17 00:00:00 2001 -From: Josh Poimboeuf <jpoimboe@redhat.com> -Date: Mon, 18 Sep 2017 21:43:36 -0500 -Subject: [PATCH] x86/xen: Add unwind hint annotations - -commit abbe1cac6214d81d2f4e149aba64a8760703144e upstream. - -Add unwind hint annotations to the xen head code so the ORC unwinder can -read head_64.o. - -hypercall_page needs empty annotations at 32-byte intervals to match the -'xen_hypercall_*' ELF functions at those locations. - -Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com> -Cc: Andy Lutomirski <luto@kernel.org> -Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com> -Cc: Jiri Slaby <jslaby@suse.cz> -Cc: Juergen Gross <jgross@suse.com> -Cc: Linus Torvalds <torvalds@linux-foundation.org> -Cc: Peter Zijlstra <peterz@infradead.org> -Cc: Thomas Gleixner <tglx@linutronix.de> -Link: http://lkml.kernel.org/r/70ed2eb516fe9266be766d953f93c2571bca88cc.1505764066.git.jpoimboe@redhat.com -Signed-off-by: Ingo Molnar <mingo@kernel.org> - -diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S -index 9753225289e8..124941d09b2b 100644 ---- a/arch/x86/xen/xen-head.S -+++ b/arch/x86/xen/xen-head.S -@@ -9,6 +9,7 @@ - #include <asm/boot.h> - #include <asm/asm.h> - #include <asm/page_types.h> -+#include <asm/unwind_hints.h> - - #include <xen/interface/elfnote.h> - #include <xen/interface/features.h> -@@ -19,6 +20,7 @@ - #ifdef CONFIG_XEN_PV - __INIT - ENTRY(startup_xen) -+ UNWIND_HINT_EMPTY - cld - - /* Clear .bss */ -@@ -40,7 +42,10 @@ END(startup_xen) - .pushsection .text - .balign PAGE_SIZE - ENTRY(hypercall_page) -- .skip PAGE_SIZE -+ .rept (PAGE_SIZE / 32) -+ UNWIND_HINT_EMPTY -+ .skip 32 -+ .endr - - #define HYPERCALL(n) \ - .equ xen_hypercall_##n, hypercall_page + __HYPERVISOR_##n * 32; \ --- -2.15.0 - |