s390 patches for the 5.6 merge window
Subsystems (3)
Vasily Gorbik
maintainerHello Linus,
please pull s390 fixes and features for 5.6.
Thank you,
Vasily
The following changes since commit d1eef1c619749b2a57e514a3fa67d9a516ffa919:
Linux 5.5-rc2 (2019-12-15 15:16:08 -0800)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git tags/s390-5.6-1
for you to fetch changes up to 17248ea0367465f4aaef728f6af661ed38e38cf1:
s390: fix __EMIT_BUG() macro (2020-01-22 13:05:35 +0100)
----------------------------------------------------------------
s390 updates for the 5.6 merge window
- Add clang 10 build support.
- Fix BUG() implementation to contain precise bug address, which is relevant for kprobes.
- Make ftraced function appear in a stacktrace.
- Minor perf improvements and refactoring.
- Possible deadlock and recovery fixes in pci code.
----------------------------------------------------------------
Niklas Schnelle (2):
s390/pci: Recover handle in clp_set_pci_fn() s390/pci: Fix possible deadlock in recover_store()
Sven Schnelle (1):
s390: fix __EMIT_BUG() macro
Thomas Richter (3):
s390/cpum_sf: Convert debug trace to common layout s390/cpum_sf: Use kzalloc and minor changes s390/cpum_sf: Use DIV_ROUND_UP
Vasily Gorbik (3):
s390/jump_label: use "i" constraint for clang
s390: adjust -mpacked-stack support check for clang 10 s390/ftrace: generate traced function stack frame
arch/s390/Makefile | 2 +- arch/s390/boot/head.S | 2 +- arch/s390/include/asm/bug.h | 16 ++++----- arch/s390/include/asm/jump_label.h | 4 ++- arch/s390/include/asm/pci.h | 2 +- arch/s390/kernel/entry.h | 1 + arch/s390/kernel/mcount.S | 15 ++++++++- arch/s390/kernel/perf_cpum_sf.c | 67 ++++++++++++++++++++------------------ arch/s390/kernel/pgm_check.S | 2 +- arch/s390/kernel/traps.c | 41 ++++++++++++++++++++--- arch/s390/pci/pci.c | 2 +- arch/s390/pci/pci_clp.c | 48 ++++++++++++++++----------- arch/s390/pci/pci_sysfs.c | 63 +++++++++++++++++++++++------------ 13 files changed, 172 insertions(+), 93 deletions(-)
arch/s390/Makefile +1 -1
@@ -69,7 +69,7 @@ cflags-y += -Wa,-I$(srctree)/arch/$(ARCH)/include # cflags-$(CONFIG_FRAME_POINTER) += -fno-optimize-sibling-calls -ifeq ($(call cc-option-yn,-mpacked-stack),y) +ifeq ($(call cc-option-yn,-mpacked-stack -mbackchain -msoft-float),y) cflags-$(CONFIG_PACK_STACK) += -mpacked-stack -D__PACK_STACK aflags-$(CONFIG_PACK_STACK) += -D__PACK_STACK endif
arch/s390/boot/head.S +1 -1
@@ -329,7 +329,7 @@ ENTRY(startup_kdump) .quad .Lduct # cr5: primary-aste origin .quad 0 # cr6: I/O interrupts .quad 0 # cr7: secondary space segment table - .quad 0 # cr8: access registers translation + .quad 0x0000000000008000 # cr8: access registers translation .quad 0 # cr9: tracing off .quad 0 # cr10: tracing off .quad 0 # cr11: tracing off
arch/s390/include/asm/bug.h +7 -9
@@ -10,15 +10,14 @@#define __EMIT_BUG (x) do { \ asm_inline volatile( \ - "0: j 0b+2\n" \ - "1:\n" \ + "0: mc 0,0\n" \ ".section .rodata.str,\"aMS\",@progbits,1\n" \ - "2: .asciz \""__FILE__"\"\n" \ + "1: .asciz \""__FILE__"\"\n" \ ".previous\n" \ ".section __bug_table,\"awM\",@progbits,%2\n" \ - "3: .long 1b-3b,2b-3b\n" \ + "2: .long 0b-2b,1b-2b\n" \ " .short %0,%1\n" \ - " .org 3b+%2\n" \ + " .org 2b+%2\n" \ ".previous\n" \ : : "i" (__LINE__), \ "i" (x), \
@@ -29,12 +28,11 @@#define __EMIT_BUG (x) do { \ asm_inline volatile( \ - "0: j 0b+2\n" \ - "1:\n" \ + "0: mc 0,0\n" \ ".section __bug_table,\"awM\",@progbits,%1\n" \ - "2: .long 1b-2b\n" \ + "1: .long 0b-1b\n" \ " .short %0\n" \ - " .org 2b+%1\n" \ + " .org 1b+%1\n" \ ".previous\n" \ : : "i" (x), \ "i" (sizeof(struct bug_entry))); \
arch/s390/include/asm/jump_label.h +3 -1
@@ -10,7 +10,9 @@#define JUMP_LABEL_NOP_SIZE 6#define JUMP_LABEL_NOP_OFFSET 2 -#if __GNUC__ <9 +#ifdef CONFIG_CC_IS_CLANG +#define JUMP_LABEL_STATIC_KEY_CONSTRAINT "i" +#elif __GNUC__ <9 #define JUMP_LABEL_STATIC_KEY_CONSTRAINT "X"#else #define JUMP_LABEL_STATIC_KEY_CONSTRAINT "jdd"
arch/s390/include/asm/pci.h +1 -1
@@ -180,7 +180,7 @@ void zpci_remove_reserved_devices(void);/* CLP */ int clp_scan_pci_devices (void );int clp_rescan_pci_devices (void ); -int clp_rescan_pci_devices_simple (void ); +int clp_rescan_pci_devices_simple (u32 *fid);int clp_add_pci_device (u32 ,u32 ,int );int clp_enable_fh (struct zpci_dev *,u8 );int clp_disable_fh (struct zpci_dev *);
arch/s390/kernel/entry.h +1 -0
@@ -45,6 +45,7 @@ void specification_exception(struct pt_regs *regs);void transaction_exception (struct pt_regs *regs);void translation_exception (struct pt_regs *regs);void vector_exception (struct pt_regs *regs); +void monitor_event_exception (struct pt_regs *regs);void do_per_trap (struct pt_regs *regs);void do_report_trap (struct pt_regs *regs,int si_signo,int si_code,char *str);
arch/s390/kernel/mcount.S +14 -1
@@ -26,6 +26,12 @@ ENDPROC(ftrace_stub) #define STACK_PTREGS (STACK_FRAME_OVERHEAD) #define STACK_PTREGS_GPRS (STACK_PTREGS + __PT_GPRS) #define STACK_PTREGS_PSW (STACK_PTREGS + __PT_PSW) +#ifdef __PACK_STACK +/* allocate just enough for r14, r15 and backchain */ +#define TRACED_FUNC_FRAME_SIZE 24 +#else +#define TRACED_FUNC_FRAME_SIZE STACK_FRAME_OVERHEAD +#endif ENTRY(_mcount) BR_EX %r14
@@ -39,9 +45,16 @@ ENTRY(ftrace_caller) #if !(defined(CC_USING_HOTPATCH) || defined(CC_USING_NOP_MCOUNT)) aghi %r0,MCOUNT_RETURN_FIXUP #endif - aghi %r15,-STACK_FRAME_SIZE + # allocate stack frame for ftrace_caller to contain traced function + aghi %r15,-TRACED_FUNC_FRAME_SIZE stg %r1,__SF_BACKCHAIN(%r15) + stg %r0,(__SF_GPRS+8*8)(%r15) + stg %r15,(__SF_GPRS+9*8)(%r15) + # allocate pt_regs and stack frame for ftrace_trace_function + aghi %r15,-STACK_FRAME_SIZE stg %r1,(STACK_PTREGS_GPRS+15*8)(%r15) + aghi %r1,-TRACED_FUNC_FRAME_SIZE + stg %r1,__SF_BACKCHAIN(%r15) stg %r0,(STACK_PTREGS_PSW+8)(%r15) stmg %r2,%r14,(STACK_PTREGS_GPRS+2*8)(%r15) #ifdef CONFIG_HAVE_MARCH_Z196_FEATURES
arch/s390/kernel/perf_cpum_sf.c +35 -32
176 lines not on this page · raw message
arch/s390/kernel/pgm_check.S +1 -1
@@ -81,7 +81,7 @@ PGM_CHECK_DEFAULT /* 3c */ PGM_CHECK_DEFAULT /* 3d */ PGM_CHECK_DEFAULT /* 3e */ PGM_CHECK_DEFAULT /* 3f */ -PGM_CHECK_DEFAULT /* 40 */ +PGM_CHECK(monitor_event_exception) /* 40 */ PGM_CHECK_DEFAULT /* 41 */ PGM_CHECK_DEFAULT /* 42 */ PGM_CHECK_DEFAULT /* 43 */
arch/s390/kernel/traps.c +36 -5
61 lines not on this page · raw message
arch/s390/pci/pci.c +1 -1
@@ -939,5 +939,5 @@ subsys_initcall_sync(pci_base_init);void zpci_rescan (void ) {if (zpci_is_enabled ()) -clp_rescan_pci_devices_simple (); +clp_rescan_pci_devices_simple (NULL ); }
arch/s390/pci/pci_clp.c +29 -19
113 lines not on this page · raw message
arch/s390/pci/pci_sysfs.c +42 -21
79 lines not on this page · raw message
The pull request you sent on Tue, 28 Jan 2020 17:54:09 +0100:
The pull request you sent on Tue, 28 Jan 2020 17:54:09 +0100:
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.gittags/s390-5.6-1
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/740eaf7d4dd255789987a543b0203ca239b37087
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/prtracker