From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 6 May 2019 23:42:54 +0000 (-0700)
Subject: Merge tag 's390-5.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
X-Git-Tag: v5.2-rc1~186
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=14be4c61c205dcb0a72251c1e2790814181bd9ba;p=users%2Fhch%2Fblock.git

Merge tag 's390-5.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

Pull s390 updates from Martin Schwidefsky:

 - Support for kernel address space layout randomization

 - Add support for kernel image signature verification

 - Convert s390 to the generic get_user_pages_fast code

 - Convert s390 to the stack unwind API analog to x86

 - Add support for CPU directed interrupts for PCI devices

 - Provide support for MIO instructions to the PCI base layer, this will
   allow the use of direct PCI mappings in user space code

 - Add the basic KVM guest ultravisor interface for protected VMs

 - Add AT_HWCAP bits for several new hardware capabilities

 - Update the CPU measurement facility counter definitions to SVN 6

 - Arnds cleanup patches for his quest to get LLVM compiles working

 - A vfio-ccw update with bug fixes and support for halt and clear

 - Improvements for the hardware TRNG code

 - Another round of cleanup for the QDIO layer

 - Numerous cleanups and bug fixes

* tag 's390-5.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (98 commits)
  s390/vdso: drop unnecessary cc-ldoption
  s390: fix clang -Wpointer-sign warnigns in boot code
  s390: drop CONFIG_VIRT_TO_BUS
  s390: boot, purgatory: pass $(CLANG_FLAGS) where needed
  s390: only build for new CPUs with clang
  s390: simplify disabled_wait
  s390/ftrace: use HAVE_FUNCTION_GRAPH_RET_ADDR_PTR
  s390/unwind: introduce stack unwind API
  s390/opcodes: add missing instructions to the disassembler
  s390/bug: add entry size to the __bug_table section
  s390: use proper expoline sections for .dma code
  s390/nospec: rename assembler generated expoline thunks
  s390: add missing ENDPROC statements to assembler functions
  locking/lockdep: check for freed initmem in static_obj()
  s390/kernel: add support for kernel address space layout randomization (KASLR)
  s390/kernel: introduce .dma sections
  s390/sclp: do not use static sccbs
  s390/kprobes: use static buffer for insn_page
  s390/kernel: convert SYSCALL and PGM_CHECK handlers to .quad
  s390/kernel: build a relocatable kernel
  ...
---

14be4c61c205dcb0a72251c1e2790814181bd9ba
diff --cc arch/s390/kernel/stacktrace.c
index cc9ed9787068,89f9f63dca18..f6a620f854e1
--- a/arch/s390/kernel/stacktrace.c
+++ b/arch/s390/kernel/stacktrace.c
@@@ -41,29 -16,53 +16,47 @@@
  
  void save_stack_trace(struct stack_trace *trace)
  {
- 	unsigned long sp;
- 
- 	sp = current_stack_pointer();
- 	dump_trace(save_address, trace, NULL, sp);
+ 	struct unwind_state state;
+ 
+ 	unwind_for_each_frame(&state, current, NULL, 0) {
+ 		if (trace->nr_entries >= trace->max_entries)
+ 			break;
+ 		if (trace->skip > 0)
+ 			trace->skip--;
+ 		else
+ 			trace->entries[trace->nr_entries++] = state.ip;
+ 	}
 -	if (trace->nr_entries < trace->max_entries)
 -		trace->entries[trace->nr_entries++] = ULONG_MAX;
  }
  EXPORT_SYMBOL_GPL(save_stack_trace);
  
  void save_stack_trace_tsk(struct task_struct *tsk, struct stack_trace *trace)
  {
- 	unsigned long sp;
- 
- 	sp = tsk->thread.ksp;
- 	if (tsk == current)
- 		sp = current_stack_pointer();
- 	dump_trace(save_address_nosched, trace, tsk, sp);
+ 	struct unwind_state state;
+ 
+ 	unwind_for_each_frame(&state, tsk, NULL, 0) {
+ 		if (trace->nr_entries >= trace->max_entries)
+ 			break;
+ 		if (in_sched_functions(state.ip))
+ 			continue;
+ 		if (trace->skip > 0)
+ 			trace->skip--;
+ 		else
+ 			trace->entries[trace->nr_entries++] = state.ip;
+ 	}
 -	if (trace->nr_entries < trace->max_entries)
 -		trace->entries[trace->nr_entries++] = ULONG_MAX;
  }
  EXPORT_SYMBOL_GPL(save_stack_trace_tsk);
  
  void save_stack_trace_regs(struct pt_regs *regs, struct stack_trace *trace)
  {
- 	unsigned long sp;
- 
- 	sp = kernel_stack_pointer(regs);
- 	dump_trace(save_address, trace, NULL, sp);
+ 	struct unwind_state state;
+ 
+ 	unwind_for_each_frame(&state, current, regs, 0) {
+ 		if (trace->nr_entries >= trace->max_entries)
+ 			break;
+ 		if (trace->skip > 0)
+ 			trace->skip--;
+ 		else
+ 			trace->entries[trace->nr_entries++] = state.ip;
+ 	}
 -	if (trace->nr_entries < trace->max_entries)
 -		trace->entries[trace->nr_entries++] = ULONG_MAX;
  }
  EXPORT_SYMBOL_GPL(save_stack_trace_regs);