History

Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (54 commits) [S390] Remove error checking from copy_oldmem_page() [S390] qdio: prevent dsci access without adapter interrupts [S390] irqstats: split IPI interrupt accounting [S390] add missing __tlb_flush_global() for !CONFIG_SMP [S390] sparse: fix sparse symbol shadow warning [S390] sparse: fix sparse NULL pointer warnings [S390] sparse: fix sparse warnings with __user pointers [S390] sparse: fix sparse warnings in math-emu [S390] sparse: fix sparse warnings about missing prototypes [S390] sparse: fix sparse ANSI-C warnings [S390] sparse: fix sparse static warnings [S390] sparse: fix access past end of array warnings [S390] dasd: prevent path verification before resume [S390] qdio: remove multicast polling [S390] qdio: reset outbound SBAL error states [S390] qdio: EQBS retry after CCQ 96 [S390] qdio: add timestamp for last queue scan time [S390] Introduce get_clock_fast() [S390] kvm: Handle diagnose 0x10 (release pages) [S390] take mmap_sem when walking guest page table ...

Linus Torvalds committed 15 years ago

Commit 32087d42 parents b1c907f 07ea815107 files · +2236 −796Browse files

Unified · Split

107 files
  1. Documentation/kernel-parameters.txt +3 −3
  2. arch/s390/Kconfig +10 −0
  3. arch/s390/boot/compressed/misc.c +1 −1
  4. arch/s390/defconfig +1 −1
  5. arch/s390/include/asm/ccwdev.h +3 −0
  6. arch/s390/include/asm/compat.h +6 −7
  7. arch/s390/include/asm/ipl.h +1 −0
  8. arch/s390/include/asm/irq.h +4 −2
  9. arch/s390/include/asm/kexec.h +6 −0
  10. arch/s390/include/asm/kvm_host.h +1 −0
  11. arch/s390/include/asm/lowcore.h +3 −7
  12. arch/s390/include/asm/page.h +1 −0
  13. arch/s390/include/asm/pgtable.h +2 −0
  14. arch/s390/include/asm/processor.h +30 −18
  15. arch/s390/include/asm/ptrace.h +13 −16
  16. arch/s390/include/asm/reset.h +1 −1
  17. arch/s390/include/asm/setup.h +13 −0
  18. arch/s390/include/asm/sfp-util.h +1 −1
  19. arch/s390/include/asm/smp.h +5 −0
  20. arch/s390/include/asm/spinlock.h +2 −0
  21. arch/s390/include/asm/syscall.h +4 −2
  22. arch/s390/include/asm/system.h +8 −2
  23. arch/s390/include/asm/thread_info.h +4 −3
  24. arch/s390/include/asm/timex.h +11 −0
  25. arch/s390/include/asm/tlbflush.h +1 −0
  26. arch/s390/kernel/Makefile +1 −0
  27. arch/s390/kernel/asm-offsets.c +1 −3
  28. arch/s390/kernel/base.S +6 −0
  29. arch/s390/kernel/compat_linux.c +8 −24
  30. arch/s390/kernel/compat_signal.c +28 −43
  31. arch/s390/kernel/compat_wrapper.S +1 −2
  32. arch/s390/kernel/crash_dump.c +426 −0
  33. arch/s390/kernel/early.c +1 −1
  34. arch/s390/kernel/entry.S +34 −50
  35. arch/s390/kernel/entry.h +11 −2
  36. arch/s390/kernel/entry64.S +36 −50
  37. arch/s390/kernel/head.S +22 −0
  38. arch/s390/kernel/head31.S +1 −1
  39. arch/s390/kernel/head64.S +1 −1
  40. arch/s390/kernel/head_kdump.S +119 −0
  41. arch/s390/kernel/ipl.c +18 −8
  42. arch/s390/kernel/irq.c +4 −2
  43. arch/s390/kernel/kprobes.c +1 −1
  44. arch/s390/kernel/machine_kexec.c +186 −6
  45. arch/s390/kernel/mem_detect.c +69 −0
  46. arch/s390/kernel/process.c +3 −1
  47. arch/s390/kernel/processor.c +1 −1
  48. arch/s390/kernel/ptrace.c +85 −39
  49. arch/s390/kernel/reipl.S +6 −0
  50. arch/s390/kernel/reipl64.S +6 −3
  51. arch/s390/kernel/setup.c +244 −31
  52. arch/s390/kernel/signal.c +70 −58
  53. arch/s390/kernel/smp.c +64 −9
  54. arch/s390/kernel/suspend.c +1 −0
  55. arch/s390/kernel/sysinfo.c +1 −1
  56. arch/s390/kernel/time.c +1 −0
  57. arch/s390/kernel/topology.c +2 −2
  58. arch/s390/kernel/traps.c +3 −2
  59. arch/s390/kernel/vtime.c +7 −4
  60. arch/s390/kvm/diag.c +31 −1
  61. arch/s390/kvm/kvm-s390.c +1 −0
  62. arch/s390/lib/delay.c +2 −1
  63. arch/s390/lib/uaccess_pt.c +4 −2
  64. arch/s390/mm/fault.c +3 −3
  65. arch/s390/mm/maccess.c +56 −0
  66. arch/s390/mm/mmap.c +1 −0
  67. arch/s390/mm/pageattr.c +1 −0
  68. arch/s390/mm/pgtable.c +77 −6
  69. arch/s390/mm/vmem.c +6 −0
  70. arch/s390/oprofile/hwsampler.c +4 −4
  71. drivers/s390/block/dasd.c +14 −5
  72. drivers/s390/block/dasd_eckd.c +41 −4
  73. drivers/s390/block/dasd_fba.c +1 −0
  74. drivers/s390/block/dasd_int.h +2 −0
  75. drivers/s390/char/con3215.c +1 −2
  76. drivers/s390/char/raw3270.c +1 −2
  77. drivers/s390/char/sclp_cmd.c +2 −2
  78. drivers/s390/char/sclp_quiesce.c +2 −1
  79. drivers/s390/char/tape_34xx.c +1 −0
  80. drivers/s390/char/tape_3590.c +1 −0
  81. drivers/s390/char/tape_core.c +0 −2
  82. drivers/s390/char/vmur.c +1 −2
  83. drivers/s390/char/zcore.c +3 −18
  84. drivers/s390/cio/ccwgroup.c +137 −196
  85. drivers/s390/cio/ccwreq.c +20 −3
  86. drivers/s390/cio/chsc_sch.c +4 −1
  87. drivers/s390/cio/cio.c +15 −4
  88. drivers/s390/cio/css.h +2 −0
  89. drivers/s390/cio/device.c +13 −0
  90. drivers/s390/cio/device.h +12 −1
  91. drivers/s390/cio/io_sch.h +2 −0
  92. drivers/s390/cio/qdio.h +6 −34
  93. drivers/s390/cio/qdio_debug.c +6 −4
  94. drivers/s390/cio/qdio_main.c +50 −52
  95. drivers/s390/cio/qdio_thinint.c +48 −4
  96. drivers/s390/kvm/kvm_virtio.c +4 −4
  97. drivers/s390/net/claw.c +1 −2
  98. drivers/s390/net/ctcm_main.c +1 −2
  99. drivers/s390/net/ctcm_sysfs.c +1 −1
  100. drivers/s390/net/lcs.c +2 −3
  101. drivers/s390/net/qeth_l3_main.c +1 −1
  102. include/linux/crash_dump.h +1 −0
  103. include/linux/elf.h +1 −0
  104. include/linux/kexec.h +10 −0
  105. kernel/crash_dump.c +11 −0
  106. kernel/kexec.c +29 −12
  107. kernel/sysctl.c +0 −8
Documentation/kernel-parameters.txt+3−3
@@ -741,10 +741,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted. · 740 unmodified lines
741741 See Documentation/block/cfq-iosched.txt and
742742 Documentation/block/deadline-iosched.txt for details.
743743
744− elfcorehdr= [IA-64,PPC,SH,X86]
744+ elfcorehdr=[size[KMG]@]offset[KMG] [IA64,PPC,SH,X86,S390]
745745 Specifies physical address of start of kernel core
746− image elf header. Generally kexec loader will
747− pass this option to capture kernel.
746+ image elf header and optionally the size. Generally
747+ kexec loader will pass this option to capture kernel.
748748 See Documentation/kdump/kdump.txt for details.
749749
750750 enable_mtrr_cleanup [X86]
arch/s390/Kconfig+10−0
@@ -569,6 +569,16 @@ config KEXEC · 568 unmodified lines
569569 current kernel, and to start another kernel. It is like a reboot
570570 but is independent of hardware/microcode support.
571571
572+config CRASH_DUMP
573+ bool "kernel crash dumps"
574+ depends on 64BIT
575+ help
576+ Generate crash dump after being started by kexec.
577+ Crash dump kernels are loaded in the main kernel with kexec-tools
578+ into a specially reserved region and then later executed after
579+ a crash by kdump/kexec.
580+ For more details see Documentation/kdump/kdump.txt
581+
572582 config ZFCPDUMP
573583 def_bool n
574584 prompt "zfcpdump support"
arch/s390/boot/compressed/misc.c+1−1
@@ -61,7 +61,7 @@ static unsigned long free_mem_end_ptr; · 60 unmodified lines
6161
6262 extern _sclp_print_early(const char *);
6363
64−int puts(const char *s)
64+static int puts(const char *s)
6565 {
6666 _sclp_print_early(s);
6767 return 0;
arch/s390/defconfig+1−1
@@ -68,7 +68,7 @@ CONFIG_NET_CLS_RSVP6=m · 67 unmodified lines
6868 CONFIG_NET_CLS_ACT=y
6969 CONFIG_NET_ACT_POLICE=y
7070 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
71−# CONFIG_FIRMWARE_IN_KERNEL is not set
71+CONFIG_DEVTMPFS=y
7272 CONFIG_BLK_DEV_LOOP=m
7373 CONFIG_BLK_DEV_NBD=m
7474 CONFIG_BLK_DEV_RAM=y
arch/s390/include/asm/ccwdev.h+3−0
@@ -11,6 +11,7 @@ · 10 unmodified lines
1111 #include <linux/device.h>
1212 #include <linux/mod_devicetable.h>
1313 #include <asm/fcx.h>
14+#include <asm/irq.h>
1415
1516 /* structs from asm/cio.h */
1617 struct irb;
@@ -127,6 +128,7 @@ enum uc_todo { · 110 unmodified lines
127128 * @restore: callback for restoring after hibernation
128129 * @uc_handler: callback for unit check handler
129130 * @driver: embedded device driver structure
131+ * @int_class: interruption class to use for accounting interrupts
130132 */
131133 struct ccw_driver {
132134 struct ccw_device_id *ids;
@@ -144,6 +146,7 @@ struct ccw_driver { · 11 unmodified lines
144146 int (*restore)(struct ccw_device *);
145147 enum uc_todo (*uc_handler) (struct ccw_device *, struct irb *);
146148 struct device_driver driver;
149+ enum interruption_class int_class;
147150 };
148151
149152 extern struct ccw_device *get_ccwdev_by_busid(struct ccw_driver *cdrv,
arch/s390/include/asm/compat.h+6−7
@@ -12,6 +12,7 @@ · 11 unmodified lines
1212 #define PSW32_MASK_IO 0x02000000UL
1313 #define PSW32_MASK_EXT 0x01000000UL
1414 #define PSW32_MASK_KEY 0x00F00000UL
15+#define PSW32_MASK_BASE 0x00080000UL /* Always one */
1516 #define PSW32_MASK_MCHECK 0x00040000UL
1617 #define PSW32_MASK_WAIT 0x00020000UL
1718 #define PSW32_MASK_PSTATE 0x00010000UL
@@ -19,21 +20,19 @@ · 1 unmodified line
1920 #define PSW32_MASK_CC 0x00003000UL
2021 #define PSW32_MASK_PM 0x00000f00UL
2122
22−#define PSW32_ADDR_AMODE31 0x80000000UL
23+#define PSW32_MASK_USER 0x00003F00UL
24+
25+#define PSW32_ADDR_AMODE 0x80000000UL
2326 #define PSW32_ADDR_INSN 0x7FFFFFFFUL
2427
25−#define PSW32_BASE_BITS 0x00080000UL
28+#define PSW32_DEFAULT_KEY (((u32) PAGE_DEFAULT_ACC) << 20)
2629
2730 #define PSW32_ASC_PRIMARY 0x00000000UL
2831 #define PSW32_ASC_ACCREG 0x00004000UL
2932 #define PSW32_ASC_SECONDARY 0x00008000UL
3033 #define PSW32_ASC_HOME 0x0000C000UL
3134
32−#define PSW32_MASK_MERGE(CURRENT,NEW) \
33− (((CURRENT) & ~(PSW32_MASK_CC|PSW32_MASK_PM)) | \
34− ((NEW) & (PSW32_MASK_CC|PSW32_MASK_PM)))
35−
36−extern long psw32_user_bits;
35+extern u32 psw32_user_bits;
3736
3837 #define COMPAT_USER_HZ 100
3938 #define COMPAT_UTS_MACHINE "s390\0\0\0\0"
arch/s390/include/asm/ipl.h+1−0
@@ -168,5 +168,6 @@ enum diag308_rc { · 167 unmodified lines
168168
169169 extern int diag308(unsigned long subcode, void *addr);
170170 extern void diag308_reset(void);
171+extern void store_status(void);
171172
172173 #endif /* _ASM_S390_IPL_H */
arch/s390/include/asm/irq.h+4−2
@@ -8,7 +8,8 @@ enum interruption_class { · 7 unmodified lines
88 EXTERNAL_INTERRUPT,
99 IO_INTERRUPT,
1010 EXTINT_CLK,
11− EXTINT_IPI,
11+ EXTINT_EXC,
12+ EXTINT_EMS,
1213 EXTINT_TMR,
1314 EXTINT_TLA,
1415 EXTINT_PFL,
@@ -17,8 +18,8 @@ enum interruption_class { · 2 unmodified lines
1718 EXTINT_SCP,
1819 EXTINT_IUC,
1920 EXTINT_CPM,
21+ IOINT_CIO,
2022 IOINT_QAI,
21− IOINT_QDI,
2223 IOINT_DAS,
2324 IOINT_C15,
2425 IOINT_C70,
@@ -28,6 +29,7 @@ enum interruption_class { · 3 unmodified lines
2829 IOINT_CLW,
2930 IOINT_CTC,
3031 IOINT_APB,
32+ IOINT_CSC,
3133 NMI_NMI,
3234 NR_IRQS,
3335 };
arch/s390/include/asm/kexec.h+6−0
@@ -30,9 +30,15 @@ · 29 unmodified lines
3030 /* Not more than 2GB */
3131 #define KEXEC_CONTROL_MEMORY_LIMIT (1UL<<31)
3232
33+/* Maximum address we can use for the crash control pages */
34+#define KEXEC_CRASH_CONTROL_MEMORY_LIMIT (-1UL)
35+
3336 /* Allocate one page for the pdp and the second for the code */
3437 #define KEXEC_CONTROL_PAGE_SIZE 4096
3538
39+/* Alignment of crashkernel memory */
40+#define KEXEC_CRASH_MEM_ALIGN HPAGE_SIZE
41+
3642 /* The native architecture */
3743 #define KEXEC_ARCH KEXEC_ARCH_S390
3844
arch/s390/include/asm/kvm_host.h+1−0
@@ -145,6 +145,7 @@ struct kvm_vcpu_stat { · 144 unmodified lines
145145 u32 instruction_sigp_arch;
146146 u32 instruction_sigp_prefix;
147147 u32 instruction_sigp_restart;
148+ u32 diagnose_10;
148149 u32 diagnose_44;
149150 };
150151
arch/s390/include/asm/lowcore.h+3−7
@@ -151,10 +151,8 @@ struct _lowcore { · 150 unmodified lines
151151 */
152152 __u32 ipib; /* 0x0e00 */
153153 __u32 ipib_checksum; /* 0x0e04 */
154−
155− /* 64 bit save area */
156− __u64 save_area_64; /* 0x0e08 */
157− __u8 pad_0x0e10[0x0f00-0x0e10]; /* 0x0e10 */
154+ __u32 vmcore_info; /* 0x0e08 */
155+ __u8 pad_0x0e0c[0x0f00-0x0e0c]; /* 0x0e0c */
158156
159157 /* Extended facility list */
160158 __u64 stfle_fac_list[32]; /* 0x0f00 */
@@ -290,9 +288,7 @@ struct _lowcore { · 129 unmodified lines
290288 */
291289 __u64 ipib; /* 0x0e00 */
292290 __u32 ipib_checksum; /* 0x0e08 */
293−
294− /* 64 bit save area */
295− __u64 save_area_64; /* 0x0e0c */
291+ __u64 vmcore_info; /* 0x0e0c */
296292 __u8 pad_0x0e14[0x0f00-0x0e14]; /* 0x0e14 */
297293
298294 /* Extended facility list */
arch/s390/include/asm/page.h+1−0
@@ -177,6 +177,7 @@ static inline int page_test_and_clear_young(unsigned long pfn) · 176 unmodified lines
177177 struct page;
178178 void arch_free_page(struct page *page, int order);
179179 void arch_alloc_page(struct page *page, int order);
180+void arch_set_page_states(int make_stable);
180181
181182 static inline int devmem_is_allowed(unsigned long pfn)
182183 {
arch/s390/include/asm/pgtable.h+2−0
@@ -696,7 +696,9 @@ void gmap_disable(struct gmap *gmap); · 695 unmodified lines
696696 int gmap_map_segment(struct gmap *gmap, unsigned long from,
697697 unsigned long to, unsigned long length);
698698 int gmap_unmap_segment(struct gmap *gmap, unsigned long to, unsigned long len);
699+unsigned long __gmap_fault(unsigned long address, struct gmap *);
699700 unsigned long gmap_fault(unsigned long address, struct gmap *);
701+void gmap_discard(unsigned long from, unsigned long to, struct gmap *);
700702
701703 /*
702704 * Certain architectures need to do special things when PTEs
arch/s390/include/asm/processor.h+30−18
@@ -33,6 +33,8 @@ static inline void get_cpu_id(struct cpuid *ptr) · 32 unmodified lines
3333
3434 extern void s390_adjust_jiffies(void);
3535 extern int get_cpu_capability(unsigned int *);
36+extern const struct seq_operations cpuinfo_op;
37+extern int sysctl_ieee_emulation_warnings;
3638
3739 /*
3840 * User space process size: 2GB for 31 bit, 4TB or 8PT for 64 bit.
@@ -118,17 +120,17 @@ struct stack_frame { · 79 unmodified lines
118120 /*
119121 * Do necessary setup to start up a new thread.
120122 */
121−#define start_thread(regs, new_psw, new_stackp) do { \
122− regs->psw.mask = psw_user_bits; \
123− regs->psw.addr = new_psw | PSW_ADDR_AMODE; \
124− regs->gprs[15] = new_stackp; \
123+#define start_thread(regs, new_psw, new_stackp) do { \
124+ regs->psw.mask = psw_user_bits | PSW_MASK_EA | PSW_MASK_BA; \
125+ regs->psw.addr = new_psw | PSW_ADDR_AMODE; \
126+ regs->gprs[15] = new_stackp; \
125127 } while (0)
126128
127−#define start_thread31(regs, new_psw, new_stackp) do { \
128− regs->psw.mask = psw_user32_bits; \
129− regs->psw.addr = new_psw | PSW_ADDR_AMODE; \
130− regs->gprs[15] = new_stackp; \
131− crst_table_downgrade(current->mm, 1UL << 31); \
129+#define start_thread31(regs, new_psw, new_stackp) do { \
130+ regs->psw.mask = psw_user_bits | PSW_MASK_BA; \
131+ regs->psw.addr = new_psw | PSW_ADDR_AMODE; \
132+ regs->gprs[15] = new_stackp; \
133+ crst_table_downgrade(current->mm, 1UL << 31); \
132134 } while (0)
133135
134136 /* Forward declaration, a strange C thing */
@@ -187,7 +189,6 @@ static inline void __load_psw(psw_t psw) · 52 unmodified lines
187189 * Set PSW mask to specified value, while leaving the
188190 * PSW addr pointing to the next instruction.
189191 */
190−
191192 static inline void __load_psw_mask (unsigned long mask)
192193 {
193194 unsigned long addr;
@@ -212,26 +213,37 @@ static inline void __load_psw_mask (unsigned long mask) · 18 unmodified lines
212213 : "=&d" (addr), "=Q" (psw) : "Q" (psw) : "memory", "cc");
213214 #endif /* __s390x__ */
214215 }
215−
216+
216217 /*
217− * Function to stop a processor until an interruption occurred
218+ * Rewind PSW instruction address by specified number of bytes.
218219 */
219−static inline void enabled_wait(void)
220+static inline unsigned long __rewind_psw(psw_t psw, unsigned long ilc)
220221 {
221− __load_psw_mask(PSW_BASE_BITS | PSW_MASK_IO | PSW_MASK_EXT |
222− PSW_MASK_MCHECK | PSW_MASK_WAIT | PSW_DEFAULT_KEY);
223−}
222+#ifndef __s390x__
223+ if (psw.addr & PSW_ADDR_AMODE)
224+ /* 31 bit mode */
225+ return (psw.addr - ilc) | PSW_ADDR_AMODE;
226+ /* 24 bit mode */
227+ return (psw.addr - ilc) & ((1UL << 24) - 1);
228+#else
229+ unsigned long mask;
224230
231+ mask = (psw.mask & PSW_MASK_EA) ? -1UL :
232+ (psw.mask & PSW_MASK_BA) ? (1UL << 31) - 1 :
233+ (1UL << 24) - 1;
234+ return (psw.addr - ilc) & mask;
235+#endif
236+}
237+
225238 /*
226239 * Function to drop a processor into disabled wait state
227240 */
228−
229241 static inline void ATTRIB_NORET disabled_wait(unsigned long code)
230242 {
231243 unsigned long ctl_buf;
232244 psw_t dw_psw;
233245
234− dw_psw.mask = PSW_BASE_BITS | PSW_MASK_WAIT;
246+ dw_psw.mask = PSW_MASK_BASE | PSW_MASK_WAIT | PSW_MASK_BA | PSW_MASK_EA;
235247 dw_psw.addr = code;
236248 /*
237249 * Store status and then load disabled wait psw,
arch/s390/include/asm/ptrace.h+13−16
@@ -230,17 +230,21 @@ typedef struct · 229 unmodified lines
230230 #define PSW_MASK_IO 0x02000000UL
231231 #define PSW_MASK_EXT 0x01000000UL
232232 #define PSW_MASK_KEY 0x00F00000UL
233+#define PSW_MASK_BASE 0x00080000UL /* always one */
233234 #define PSW_MASK_MCHECK 0x00040000UL
234235 #define PSW_MASK_WAIT 0x00020000UL
235236 #define PSW_MASK_PSTATE 0x00010000UL
236237 #define PSW_MASK_ASC 0x0000C000UL
237238 #define PSW_MASK_CC 0x00003000UL
238239 #define PSW_MASK_PM 0x00000F00UL
240+#define PSW_MASK_EA 0x00000000UL
241+#define PSW_MASK_BA 0x00000000UL
242+
243+#define PSW_MASK_USER 0x00003F00UL
239244
240245 #define PSW_ADDR_AMODE 0x80000000UL
241246 #define PSW_ADDR_INSN 0x7FFFFFFFUL
242247
243−#define PSW_BASE_BITS 0x00080000UL
244248 #define PSW_DEFAULT_KEY (((unsigned long) PAGE_DEFAULT_ACC) << 20)
245249
246250 #define PSW_ASC_PRIMARY 0x00000000UL
@@ -254,6 +258,7 @@ typedef struct · 7 unmodified lines
254258 #define PSW_MASK_DAT 0x0400000000000000UL
255259 #define PSW_MASK_IO 0x0200000000000000UL
256260 #define PSW_MASK_EXT 0x0100000000000000UL
261+#define PSW_MASK_BASE 0x0000000000000000UL
257262 #define PSW_MASK_KEY 0x00F0000000000000UL
258263 #define PSW_MASK_MCHECK 0x0004000000000000UL
259264 #define PSW_MASK_WAIT 0x0002000000000000UL
@@ -261,12 +266,14 @@ typedef struct · 1 unmodified line
261266 #define PSW_MASK_ASC 0x0000C00000000000UL
262267 #define PSW_MASK_CC 0x0000300000000000UL
263268 #define PSW_MASK_PM 0x00000F0000000000UL
269+#define PSW_MASK_EA 0x0000000100000000UL
270+#define PSW_MASK_BA 0x0000000080000000UL
271+
272+#define PSW_MASK_USER 0x00003F0180000000UL
264273
265274 #define PSW_ADDR_AMODE 0x0000000000000000UL
266275 #define PSW_ADDR_INSN 0xFFFFFFFFFFFFFFFFUL
267276
268−#define PSW_BASE_BITS 0x0000000180000000UL
269−#define PSW_BASE32_BITS 0x0000000080000000UL
270277 #define PSW_DEFAULT_KEY (((unsigned long) PAGE_DEFAULT_ACC) << 52)
271278
272279 #define PSW_ASC_PRIMARY 0x0000000000000000UL
@@ -279,18 +286,7 @@ typedef struct · 6 unmodified lines
279286 #ifdef __KERNEL__
280287 extern long psw_kernel_bits;
281288 extern long psw_user_bits;
282−#ifdef CONFIG_64BIT
283−extern long psw_user32_bits;
284289 #endif
285−#endif
286−
287−/* This macro merges a NEW PSW mask specified by the user into
288− the currently active PSW mask CURRENT, modifying only those
289− bits in CURRENT that the user may be allowed to change: this
290− is the condition code and the program mask bits. */
291−#define PSW_MASK_MERGE(CURRENT,NEW) \
292− (((CURRENT) & ~(PSW_MASK_CC|PSW_MASK_PM)) | \
293− ((NEW) & (PSW_MASK_CC|PSW_MASK_PM)))
294290
295291 /*
296292 * The s390_regs structure is used to define the elf_gregset_t.
@@ -328,8 +324,7 @@ struct pt_regs · 31 unmodified lines
328324 psw_t psw;
329325 unsigned long gprs[NUM_GPRS];
330326 unsigned long orig_gpr2;
331− unsigned short ilc;
332− unsigned short svcnr;
327+ unsigned int svc_code;
333328 };
334329
335330 /*
@@ -487,6 +482,8 @@ typedef struct · 151 unmodified lines
487482 #define PTRACE_POKETEXT_AREA 0x5004
488483 #define PTRACE_POKEDATA_AREA 0x5005
489484 #define PTRACE_GET_LAST_BREAK 0x5006
485+#define PTRACE_PEEK_SYSTEM_CALL 0x5007
486+#define PTRACE_POKE_SYSTEM_CALL 0x5008
490487
491488 /*
492489 * PT_PROT definition is loosely based on hppa bsd definition in
arch/s390/include/asm/reset.h+1−1
@@ -17,5 +17,5 @@ struct reset_call { · 16 unmodified lines
1717
1818 extern void register_reset_call(struct reset_call *reset);
1919 extern void unregister_reset_call(struct reset_call *reset);
20−extern void s390_reset_system(void);
20+extern void s390_reset_system(void (*func)(void *), void *data);
2121 #endif /* _ASM_S390_RESET_H */
arch/s390/include/asm/setup.h+13−0
@@ -26,15 +26,21 @@ · 25 unmodified lines
2626 #define IPL_DEVICE (*(unsigned long *) (0x10404))
2727 #define INITRD_START (*(unsigned long *) (0x1040C))
2828 #define INITRD_SIZE (*(unsigned long *) (0x10414))
29+#define OLDMEM_BASE (*(unsigned long *) (0x1041C))
30+#define OLDMEM_SIZE (*(unsigned long *) (0x10424))
2931 #else /* __s390x__ */
3032 #define IPL_DEVICE (*(unsigned long *) (0x10400))
3133 #define INITRD_START (*(unsigned long *) (0x10408))
3234 #define INITRD_SIZE (*(unsigned long *) (0x10410))
35+#define OLDMEM_BASE (*(unsigned long *) (0x10418))
36+#define OLDMEM_SIZE (*(unsigned long *) (0x10420))
3337 #endif /* __s390x__ */
3438 #define COMMAND_LINE ((char *) (0x10480))
3539
3640 #define CHUNK_READ_WRITE 0
3741 #define CHUNK_READ_ONLY 1
42+#define CHUNK_OLDMEM 4
43+#define CHUNK_CRASHK 5
3844
3945 struct mem_chunk {
4046 unsigned long addr;
@@ -48,6 +54,8 @@ extern int memory_end_set; · 7 unmodified lines
4854 extern unsigned long memory_end;
4955
5056 void detect_memory_layout(struct mem_chunk chunk[]);
57+void create_mem_hole(struct mem_chunk memory_chunk[], unsigned long addr,
58+ unsigned long size, int type);
5159
5260 #define PRIMARY_SPACE_MODE 0
5361 #define ACCESS_REGISTER_MODE 1
@@ -106,6 +114,7 @@ extern unsigned int user_mode; · 52 unmodified lines
106114 #endif /* __s390x__ */
107115
108116 #define ZFCPDUMP_HSA_SIZE (32UL<<20)
117+#define ZFCPDUMP_HSA_SIZE_MAX (64UL<<20)
109118
110119 /*
111120 * Console mode. Override with conmode=
@@ -134,10 +143,14 @@ extern char kernel_nss_name[]; · 22 unmodified lines
134143 #define IPL_DEVICE 0x10404
135144 #define INITRD_START 0x1040C
136145 #define INITRD_SIZE 0x10414
146+#define OLDMEM_BASE 0x1041C
147+#define OLDMEM_SIZE 0x10424
137148 #else /* __s390x__ */
138149 #define IPL_DEVICE 0x10400
139150 #define INITRD_START 0x10408
140151 #define INITRD_SIZE 0x10410
152+#define OLDMEM_BASE 0x10418
153+#define OLDMEM_SIZE 0x10420
141154 #endif /* __s390x__ */
142155 #define COMMAND_LINE 0x10480
143156
arch/s390/include/asm/sfp-util.h+1−1
@@ -72,6 +72,6 @@ extern unsigned long __udiv_qrnnd (unsigned int *, unsigned int, · 71 unmodified lines
7272
7373 #define UDIV_NEEDS_NORMALIZATION 0
7474
75−#define abort() return 0
75+#define abort() BUG()
7676
7777 #define __BYTE_ORDER __BIG_ENDIAN
arch/s390/include/asm/smp.h+5−0
@@ -33,6 +33,7 @@ extern struct save_area *zfcpdump_save_areas[NR_CPUS + 1]; · 32 unmodified lines
3333 extern void smp_switch_to_ipl_cpu(void (*func)(void *), void *);
3434 extern void smp_switch_to_cpu(void (*)(void *), void *, unsigned long sp,
3535 int from, int to);
36+extern void smp_restart_with_online_cpu(void);
3637 extern void smp_restart_cpu(void);
3738
3839 /*
@@ -64,6 +65,10 @@ static inline void smp_switch_to_ipl_cpu(void (*func)(void *), void *data) · 25 unmodified lines
6465 func(data);
6566 }
6667
68+static inline void smp_restart_with_online_cpu(void)
69+{
70+}
71+
6772 #define smp_vcpu_scheduled (1)
6873
6974 #endif /* CONFIG_SMP */
arch/s390/include/asm/spinlock.h+2−0
@@ -13,6 +13,8 @@ · 12 unmodified lines
1313
1414 #include <linux/smp.h>
1515
16+extern int spin_retry;
17+
1618 static inline int
1719 _raw_compare_and_swap(volatile unsigned int *lock,
1820 unsigned int old, unsigned int new)
arch/s390/include/asm/syscall.h+4−2
@@ -13,6 +13,7 @@ · 12 unmodified lines
1313 #define _ASM_SYSCALL_H 1
1414
1515 #include <linux/sched.h>
16+#include <linux/err.h>
1617 #include <asm/ptrace.h>
1718
1819 /*
@@ -25,7 +26,8 @@ extern const unsigned int sys_call_table[]; · 6 unmodified lines
2526 static inline long syscall_get_nr(struct task_struct *task,
2627 struct pt_regs *regs)
2728 {
28− return regs->svcnr ? regs->svcnr : -1;
29+ return test_tsk_thread_flag(task, TIF_SYSCALL) ?
30+ (regs->svc_code & 0xffff) : -1;
2931 }
3032
3133 static inline void syscall_rollback(struct task_struct *task,
@@ -37,7 +39,7 @@ static inline void syscall_rollback(struct task_struct *task, · 5 unmodified lines
3739 static inline long syscall_get_error(struct task_struct *task,
3840 struct pt_regs *regs)
3941 {
40− return (regs->gprs[2] >= -4096UL) ? -regs->gprs[2] : 0;
42+ return IS_ERR_VALUE(regs->gprs[2]) ? regs->gprs[2] : 0;
4143 }
4244
4345 static inline long syscall_get_return_value(struct task_struct *task,
arch/s390/include/asm/system.h+8−2
@@ -20,6 +20,8 @@ · 19 unmodified lines
2020
2121 struct task_struct;
2222
23+extern int sysctl_userprocess_debug;
24+
2325 extern struct task_struct *__switch_to(void *, void *);
2426 extern void update_per_regs(struct task_struct *task);
2527
@@ -114,6 +116,8 @@ extern void pfault_fini(void); · 88 unmodified lines
114116 extern void cmma_init(void);
115117 extern int memcpy_real(void *, void *, size_t);
116118 extern void copy_to_absolute_zero(void *dest, void *src, size_t count);
119+extern int copy_to_user_real(void __user *dest, void *src, size_t count);
120+extern int copy_from_user_real(void *dest, void __user *src, size_t count);
117121
118122 #define finish_arch_switch(prev) do { \
119123 set_fs(current->thread.mm_segment); \
@@ -210,8 +214,10 @@ __set_psw_mask(unsigned long mask) · 90 unmodified lines
210214 __load_psw_mask(mask | (arch_local_save_flags() & ~(-1UL >> 8)));
211215 }
212216
213−#define local_mcck_enable() __set_psw_mask(psw_kernel_bits)
214−#define local_mcck_disable() __set_psw_mask(psw_kernel_bits & ~PSW_MASK_MCHECK)
217+#define local_mcck_enable() \
218+ __set_psw_mask(psw_kernel_bits | PSW_MASK_DAT | PSW_MASK_MCHECK)
219+#define local_mcck_disable() \
220+ __set_psw_mask(psw_kernel_bits | PSW_MASK_DAT)
215221
216222 #ifdef CONFIG_SMP
217223
arch/s390/include/asm/thread_info.h+4−3
@@ -48,6 +48,7 @@ struct thread_info { · 47 unmodified lines
4848 unsigned int cpu; /* current CPU */
4949 int preempt_count; /* 0 => preemptable, <0 => BUG */
5050 struct restart_block restart_block;
51+ unsigned int system_call;
5152 __u64 user_timer;
5253 __u64 system_timer;
5354 unsigned long last_break; /* last breaking-event-address. */
@@ -84,10 +85,10 @@ static inline struct thread_info *current_thread_info(void) · 30 unmodified lines
8485 /*
8586 * thread information flags bit numbers
8687 */
88+#define TIF_SYSCALL 0 /* inside a system call */
8789 #define TIF_NOTIFY_RESUME 1 /* callback before returning to user */
8890 #define TIF_SIGPENDING 2 /* signal pending */
8991 #define TIF_NEED_RESCHED 3 /* rescheduling necessary */
90−#define TIF_RESTART_SVC 4 /* restart svc with new svc number */
9192 #define TIF_PER_TRAP 6 /* deliver sigtrap on return to user */
9293 #define TIF_MCCK_PENDING 7 /* machine check handling is pending */
9394 #define TIF_SYSCALL_TRACE 8 /* syscall trace active */
@@ -103,11 +104,11 @@ static inline struct thread_info *current_thread_info(void) · 9 unmodified lines
103104 #define TIF_SINGLE_STEP 20 /* This task is single stepped */
104105 #define TIF_FREEZE 21 /* thread is freezing for suspend */
105106
107+#define _TIF_SYSCALL (1<<TIF_SYSCALL)
106108 #define _TIF_NOTIFY_RESUME (1<<TIF_NOTIFY_RESUME)
107109 #define _TIF_RESTORE_SIGMASK (1<<TIF_RESTORE_SIGMASK)
108110 #define _TIF_SIGPENDING (1<<TIF_SIGPENDING)
109111 #define _TIF_NEED_RESCHED (1<<TIF_NEED_RESCHED)
110−#define _TIF_RESTART_SVC (1<<TIF_RESTART_SVC)
111112 #define _TIF_PER_TRAP (1<<TIF_PER_TRAP)
112113 #define _TIF_MCCK_PENDING (1<<TIF_MCCK_PENDING)
113114 #define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
@@ -117,7 +118,7 @@ static inline struct thread_info *current_thread_info(void) · 3 unmodified lines
117118 #define _TIF_SIE (1<<TIF_SIE)
118119 #define _TIF_POLLING_NRFLAG (1<<TIF_POLLING_NRFLAG)
119120 #define _TIF_31BIT (1<<TIF_31BIT)
120−#define _TIF_SINGLE_STEP (1<<TIF_FREEZE)
121+#define _TIF_SINGLE_STEP (1<<TIF_SINGLE_STEP)
121122 #define _TIF_FREEZE (1<<TIF_FREEZE)
122123
123124 #ifdef CONFIG_64BIT
arch/s390/include/asm/timex.h+11−0
@@ -86,6 +86,17 @@ static inline void get_clock_ext(char *clk) · 85 unmodified lines
8686 asm volatile("stcke %0" : "=Q" (*clk) : : "cc");
8787 }
8888
89+static inline unsigned long long get_clock_fast(void)
90+{
91+ unsigned long long clk;
92+
93+ if (test_facility(25))
94+ asm volatile(".insn s,0xb27c0000,%0" : "=Q" (clk) : : "cc");
95+ else
96+ clk = get_clock();
97+ return clk;
98+}
99+
89100 static inline unsigned long long get_clock_xt(void)
90101 {
91102 unsigned char clk[16];
arch/s390/include/asm/tlbflush.h+1−0
@@ -59,6 +59,7 @@ static inline void __tlb_flush_full(struct mm_struct *mm) · 58 unmodified lines
5959 }
6060 #else
6161 #define __tlb_flush_full(mm) __tlb_flush_local()
62+#define __tlb_flush_global() __tlb_flush_local()
6263 #endif
6364
6465 /*
arch/s390/kernel/Makefile+1−0
@@ -48,6 +48,7 @@ obj-$(CONFIG_FUNCTION_TRACER) += $(if $(CONFIG_64BIT),mcount64.o,mcount.o) · 47 unmodified lines
4848 obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o
4949 obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o
5050 obj-$(CONFIG_FTRACE_SYSCALLS) += ftrace.o
51+obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
5152
5253 # Kexec part
5354 S390_KEXEC_OBJS := machine_kexec.o crash.o
arch/s390/kernel/asm-offsets.c+1−3
@@ -45,8 +45,7 @@ int main(void) · 44 unmodified lines
4545 DEFINE(__PT_PSW, offsetof(struct pt_regs, psw));
4646 DEFINE(__PT_GPRS, offsetof(struct pt_regs, gprs));
4747 DEFINE(__PT_ORIG_GPR2, offsetof(struct pt_regs, orig_gpr2));
48− DEFINE(__PT_ILC, offsetof(struct pt_regs, ilc));
49− DEFINE(__PT_SVCNR, offsetof(struct pt_regs, svcnr));
48+ DEFINE(__PT_SVC_CODE, offsetof(struct pt_regs, svc_code));
5049 DEFINE(__PT_SIZE, sizeof(struct pt_regs));
5150 BLANK();
5251 DEFINE(__SF_BACKCHAIN, offsetof(struct stack_frame, back_chain));
@@ -141,7 +140,6 @@ int main(void) · 88 unmodified lines
141140 DEFINE(__LC_FPREGS_SAVE_AREA, offsetof(struct _lowcore, floating_pt_save_area));
142141 DEFINE(__LC_GPREGS_SAVE_AREA, offsetof(struct _lowcore, gpregs_save_area));
143142 DEFINE(__LC_CREGS_SAVE_AREA, offsetof(struct _lowcore, cregs_save_area));
144− DEFINE(__LC_SAVE_AREA_64, offsetof(struct _lowcore, save_area_64));
145143 #ifdef CONFIG_32BIT
146144 DEFINE(SAVE_AREA_BASE, offsetof(struct _lowcore, extended_save_area_addr));
147145 #else /* CONFIG_32BIT */
arch/s390/kernel/base.S+6−0
@@ -86,6 +86,8 @@ s390_base_pgm_handler_fn: · 85 unmodified lines
8686 ENTRY(diag308_reset)
8787 larl %r4,.Lctlregs # Save control registers
8888 stctg %c0,%c15,0(%r4)
89+ larl %r4,.Lfpctl # Floating point control register
90+ stfpc 0(%r4)
8991 larl %r4,.Lrestart_psw # Setup restart PSW at absolute 0
9092 lghi %r3,0
9193 lg %r4,0(%r4) # Save PSW
@@ -99,6 +101,8 @@ ENTRY(diag308_reset) · 7 unmodified lines
99101 sam64 # Switch to 64 bit addressing mode
100102 larl %r4,.Lctlregs # Restore control registers
101103 lctlg %c0,%c15,0(%r4)
104+ larl %r4,.Lfpctl # Restore floating point ctl register
105+ lfpc 0(%r4)
102106 br %r14
103107 .align 16
104108 .Lrestart_psw:
@@ -110,6 +114,8 @@ ENTRY(diag308_reset) · 5 unmodified lines
110114 .rept 16
111115 .quad 0
112116 .endr
117+.Lfpctl:
118+ .long 0
113119 .previous
114120
115121 #else /* CONFIG_64BIT */
arch/s390/kernel/compat_linux.c+8−24
@@ -60,12 +60,9 @@ · 59 unmodified lines
6060
6161 #include "compat_linux.h"
6262
63−long psw_user32_bits = (PSW_BASE32_BITS | PSW_MASK_DAT | PSW_ASC_HOME |
64− PSW_MASK_IO | PSW_MASK_EXT | PSW_MASK_MCHECK |
65− PSW_MASK_PSTATE | PSW_DEFAULT_KEY);
66−long psw32_user_bits = (PSW32_BASE_BITS | PSW32_MASK_DAT | PSW32_ASC_HOME |
67− PSW32_MASK_IO | PSW32_MASK_EXT | PSW32_MASK_MCHECK |
68− PSW32_MASK_PSTATE);
63+u32 psw32_user_bits = PSW32_MASK_DAT | PSW32_MASK_IO | PSW32_MASK_EXT |
64+ PSW32_DEFAULT_KEY | PSW32_MASK_BASE | PSW32_MASK_MCHECK |
65+ PSW32_MASK_PSTATE | PSW32_ASC_HOME;
6966
7067 /* For this source file, we want overflow handling. */
7168
@@ -365,12 +362,7 @@ asmlinkage long sys32_rt_sigprocmask(int how, compat_sigset_t __user *set, · 293 unmodified lines
365362 if (set) {
366363 if (copy_from_user (&s32, set, sizeof(compat_sigset_t)))
367364 return -EFAULT;
368− switch (_NSIG_WORDS) {
369− case 4: s.sig[3] = s32.sig[6] | (((long)s32.sig[7]) << 32);
370− case 3: s.sig[2] = s32.sig[4] | (((long)s32.sig[5]) << 32);
371− case 2: s.sig[1] = s32.sig[2] | (((long)s32.sig[3]) << 32);
372− case 1: s.sig[0] = s32.sig[0] | (((long)s32.sig[1]) << 32);
373− }
365+ s.sig[0] = s32.sig[0] | (((long)s32.sig[1]) << 32);
374366 }
375367 set_fs (KERNEL_DS);
376368 ret = sys_rt_sigprocmask(how,
@@ -380,12 +372,8 @@ asmlinkage long sys32_rt_sigprocmask(int how, compat_sigset_t __user *set, · 3 unmodified lines
380372 set_fs (old_fs);
381373 if (ret) return ret;
382374 if (oset) {
383− switch (_NSIG_WORDS) {
384− case 4: s32.sig[7] = (s.sig[3] >> 32); s32.sig[6] = s.sig[3];
385− case 3: s32.sig[5] = (s.sig[2] >> 32); s32.sig[4] = s.sig[2];
386− case 2: s32.sig[3] = (s.sig[1] >> 32); s32.sig[2] = s.sig[1];
387− case 1: s32.sig[1] = (s.sig[0] >> 32); s32.sig[0] = s.sig[0];
388− }
375+ s32.sig[1] = (s.sig[0] >> 32);
376+ s32.sig[0] = s.sig[0];
389377 if (copy_to_user (oset, &s32, sizeof(compat_sigset_t)))
390378 return -EFAULT;
391379 }
@@ -404,12 +392,8 @@ asmlinkage long sys32_rt_sigpending(compat_sigset_t __user *set, · 12 unmodified lines
404392 ret = sys_rt_sigpending((sigset_t __force __user *) &s, sigsetsize);
405393 set_fs (old_fs);
406394 if (!ret) {
407− switch (_NSIG_WORDS) {
408− case 4: s32.sig[7] = (s.sig[3] >> 32); s32.sig[6] = s.sig[3];
409− case 3: s32.sig[5] = (s.sig[2] >> 32); s32.sig[4] = s.sig[2];
410− case 2: s32.sig[3] = (s.sig[1] >> 32); s32.sig[2] = s.sig[1];
411− case 1: s32.sig[1] = (s.sig[0] >> 32); s32.sig[0] = s.sig[0];
412− }
395+ s32.sig[1] = (s.sig[0] >> 32);
396+ s32.sig[0] = s.sig[0];
413397 if (copy_to_user (set, &s32, sizeof(compat_sigset_t)))
414398 return -EFAULT;
415399 }
arch/s390/kernel/compat_signal.c+28−43
@@ -141,7 +141,8 @@ int copy_siginfo_from_user32(siginfo_t *to, compat_siginfo_t __user *from) · 140 unmodified lines
141141 break;
142142 case __SI_FAULT >> 16:
143143 err |= __get_user(tmp, &from->si_addr);
144− to->si_addr = (void __user *)(u64) (tmp & PSW32_ADDR_INSN);
144+ to->si_addr = (void __force __user *)
145+ (u64) (tmp & PSW32_ADDR_INSN);
145146 break;
146147 case __SI_POLL >> 16:
147148 err |= __get_user(to->si_band, &from->si_band);
@@ -213,16 +214,8 @@ sys32_rt_sigaction(int sig, const struct sigaction32 __user *act, · 65 unmodified lines
213214 ret = get_user(sa_handler, &act->sa_handler);
214215 ret |= __copy_from_user(&set32, &act->sa_mask,
215216 sizeof(compat_sigset_t));
216− switch (_NSIG_WORDS) {
217− case 4: new_ka.sa.sa_mask.sig[3] = set32.sig[6]
218− | (((long)set32.sig[7]) << 32);
219− case 3: new_ka.sa.sa_mask.sig[2] = set32.sig[4]
220− | (((long)set32.sig[5]) << 32);
221− case 2: new_ka.sa.sa_mask.sig[1] = set32.sig[2]
222− | (((long)set32.sig[3]) << 32);
223− case 1: new_ka.sa.sa_mask.sig[0] = set32.sig[0]
224− | (((long)set32.sig[1]) << 32);
225− }
217+ new_ka.sa.sa_mask.sig[0] =
218+ set32.sig[0] | (((long)set32.sig[1]) << 32);
226219 ret |= __get_user(new_ka.sa.sa_flags, &act->sa_flags);
227220
228221 if (ret)
@@ -233,20 +226,8 @@ sys32_rt_sigaction(int sig, const struct sigaction32 __user *act, · 4 unmodified lines
233226 ret = do_sigaction(sig, act ? &new_ka : NULL, oact ? &old_ka : NULL);
234227
235228 if (!ret && oact) {
236− switch (_NSIG_WORDS) {
237− case 4:
238− set32.sig[7] = (old_ka.sa.sa_mask.sig[3] >> 32);
239− set32.sig[6] = old_ka.sa.sa_mask.sig[3];
240− case 3:
241− set32.sig[5] = (old_ka.sa.sa_mask.sig[2] >> 32);
242− set32.sig[4] = old_ka.sa.sa_mask.sig[2];
243− case 2:
244− set32.sig[3] = (old_ka.sa.sa_mask.sig[1] >> 32);
245− set32.sig[2] = old_ka.sa.sa_mask.sig[1];
246− case 1:
247− set32.sig[1] = (old_ka.sa.sa_mask.sig[0] >> 32);
248− set32.sig[0] = old_ka.sa.sa_mask.sig[0];
249− }
229+ set32.sig[1] = (old_ka.sa.sa_mask.sig[0] >> 32);
230+ set32.sig[0] = old_ka.sa.sa_mask.sig[0];
250231 ret = put_user((unsigned long)old_ka.sa.sa_handler, &oact->sa_handler);
251232 ret |= __copy_to_user(&oact->sa_mask, &set32,
252233 sizeof(compat_sigset_t));
@@ -300,9 +281,10 @@ static int save_sigregs32(struct pt_regs *regs, _sigregs32 __user *sregs) · 47 unmodified lines
300281 _s390_regs_common32 regs32;
301282 int err, i;
302283
303− regs32.psw.mask = PSW32_MASK_MERGE(psw32_user_bits,
304− (__u32)(regs->psw.mask >> 32));
305− regs32.psw.addr = PSW32_ADDR_AMODE31 | (__u32) regs->psw.addr;
284+ regs32.psw.mask = psw32_user_bits |
285+ ((__u32)(regs->psw.mask >> 32) & PSW32_MASK_USER);
286+ regs32.psw.addr = (__u32) regs->psw.addr |
287+ (__u32)(regs->psw.mask & PSW_MASK_BA);
306288 for (i = 0; i < NUM_GPRS; i++)
307289 regs32.gprs[i] = (__u32) regs->gprs[i];
308290 save_access_regs(current->thread.acrs);
@@ -327,8 +309,9 @@ static int restore_sigregs32(struct pt_regs *regs,_sigregs32 __user *sregs) · 18 unmodified lines
327309 err = __copy_from_user(&regs32, &sregs->regs, sizeof(regs32));
328310 if (err)
329311 return err;
330− regs->psw.mask = PSW_MASK_MERGE(regs->psw.mask,
331− (__u64)regs32.psw.mask << 32);
312+ regs->psw.mask = (regs->psw.mask & ~PSW_MASK_USER) |
313+ (__u64)(regs32.psw.mask & PSW32_MASK_USER) << 32 |
314+ (__u64)(regs32.psw.addr & PSW32_ADDR_AMODE);
332315 regs->psw.addr = (__u64)(regs32.psw.addr & PSW32_ADDR_INSN);
333316 for (i = 0; i < NUM_GPRS; i++)
334317 regs->gprs[i] = (__u64) regs32.gprs[i];
@@ -342,7 +325,7 @@ static int restore_sigregs32(struct pt_regs *regs,_sigregs32 __user *sregs) · 7 unmodified lines
342325 return err;
343326
344327 restore_fp_regs(&current->thread.fp_regs);
345− regs->svcnr = 0; /* disable syscall checks */
328+ clear_thread_flag(TIF_SYSCALL); /* No longer in a system call */
346329 return 0;
347330 }
348331
@@ -496,11 +479,11 @@ static int setup_frame32(int sig, struct k_sigaction *ka, · 147 unmodified lines
496479 /* Set up to return from userspace. If provided, use a stub
497480 already in userspace. */
498481 if (ka->sa.sa_flags & SA_RESTORER) {
499− regs->gprs[14] = (__u64) ka->sa.sa_restorer;
482+ regs->gprs[14] = (__u64) ka->sa.sa_restorer | PSW32_ADDR_AMODE;
500483 } else {
501− regs->gprs[14] = (__u64) frame->retcode;
484+ regs->gprs[14] = (__u64) frame->retcode | PSW32_ADDR_AMODE;
502485 if (__put_user(S390_SYSCALL_OPCODE | __NR_sigreturn,
503− (u16 __user *)(frame->retcode)))
486+ (u16 __force __user *)(frame->retcode)))
504487 goto give_sigsegv;
505488 }
506489
@@ -509,11 +492,12 @@ static int setup_frame32(int sig, struct k_sigaction *ka, · 2 unmodified lines
509492 goto give_sigsegv;
510493
511494 /* Set up registers for signal handler */
512− regs->gprs[15] = (__u64) frame;
513− regs->psw.addr = (__u64) ka->sa.sa_handler;
495+ regs->gprs[15] = (__force __u64) frame;
496+ regs->psw.mask |= PSW_MASK_BA; /* force amode 31 */
497+ regs->psw.addr = (__force __u64) ka->sa.sa_handler;
514498
515499 regs->gprs[2] = map_signal(sig);
516− regs->gprs[3] = (__u64) &frame->sc;
500+ regs->gprs[3] = (__force __u64) &frame->sc;
517501
518502 /* We forgot to include these in the sigcontext.
519503 To avoid breaking binary compatibility, they are passed as args. */
@@ -521,7 +505,7 @@ static int setup_frame32(int sig, struct k_sigaction *ka, · 1 unmodified line
521505 regs->gprs[5] = current->thread.prot_addr;
522506
523507 /* Place signal number on stack to allow backtrace from handler. */
524− if (__put_user(regs->gprs[2], (int __user *) &frame->signo))
508+ if (__put_user(regs->gprs[2], (int __force __user *) &frame->signo))
525509 goto give_sigsegv;
526510 return 0;
527511
@@ -564,20 +548,21 @@ static int setup_rt_frame32(int sig, struct k_sigaction *ka, siginfo_t *info, · 36 unmodified lines
564548 } else {
565549 regs->gprs[14] = (__u64) frame->retcode;
566550 err |= __put_user(S390_SYSCALL_OPCODE | __NR_rt_sigreturn,
567− (u16 __user *)(frame->retcode));
551+ (u16 __force __user *)(frame->retcode));
568552 }
569553
570554 /* Set up backchain. */
571− if (__put_user(regs->gprs[15], (unsigned int __user *) frame))
555+ if (__put_user(regs->gprs[15], (unsigned int __force __user *) frame))
572556 goto give_sigsegv;
573557
574558 /* Set up registers for signal handler */
575− regs->gprs[15] = (__u64) frame;
559+ regs->gprs[15] = (__force __u64) frame;
560+ regs->psw.mask |= PSW_MASK_BA; /* force amode 31 */
576561 regs->psw.addr = (__u64) ka->sa.sa_handler;
577562
578563 regs->gprs[2] = map_signal(sig);
579− regs->gprs[3] = (__u64) &frame->info;
580− regs->gprs[4] = (__u64) &frame->uc;
564+ regs->gprs[3] = (__force __u64) &frame->info;
565+ regs->gprs[4] = (__force __u64) &frame->uc;
581566 return 0;
582567
583568 give_sigsegv:
arch/s390/kernel/compat_wrapper.S+1−2
@@ -1623,8 +1623,7 @@ ENTRY(sys_syncfs_wrapper) · 1622 unmodified lines
16231623 lgfr %r2,%r2 # int
16241624 jg sys_syncfs
16251625
1626− .globl sys_setns_wrapper
1627−sys_setns_wrapper:
1626+ENTRY(sys_setns_wrapper)
16281627 lgfr %r2,%r2 # int
16291628 lgfr %r3,%r3 # int
16301629 jg sys_setns
arch/s390/kernel/crash_dump.c+426−0
@@ -0,0 +1,426 @@
1+/*
2+ * S390 kdump implementation
3+ *
4+ * Copyright IBM Corp. 2011
5+ * Author(s): Michael Holzheu <holzheu@linux.vnet.ibm.com>
6+ */
7+
8+#include <linux/crash_dump.h>
9+#include <asm/lowcore.h>
10+#include <linux/kernel.h>
11+#include <linux/module.h>
12+#include <linux/gfp.h>
13+#include <linux/slab.h>
14+#include <linux/crash_dump.h>
15+#include <linux/bootmem.h>
16+#include <linux/elf.h>
17+#include <asm/ipl.h>
18+
19+#define PTR_ADD(x, y) (((char *) (x)) + ((unsigned long) (y)))
20+#define PTR_SUB(x, y) (((char *) (x)) - ((unsigned long) (y)))
21+#define PTR_DIFF(x, y) ((unsigned long)(((char *) (x)) - ((unsigned long) (y))))
22+
23+/*
24+ * Copy one page from "oldmem"
25+ *
26+ * For the kdump reserved memory this functions performs a swap operation:
27+ * - [OLDMEM_BASE - OLDMEM_BASE + OLDMEM_SIZE] is mapped to [0 - OLDMEM_SIZE].
28+ * - [0 - OLDMEM_SIZE] is mapped to [OLDMEM_BASE - OLDMEM_BASE + OLDMEM_SIZE]
29+ */
30+ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
31+ size_t csize, unsigned long offset, int userbuf)
32+{
33+ unsigned long src;
34+
35+ if (!csize)
36+ return 0;
37+
38+ src = (pfn << PAGE_SHIFT) + offset;
39+ if (src < OLDMEM_SIZE)
40+ src += OLDMEM_BASE;
41+ else if (src > OLDMEM_BASE &&
42+ src < OLDMEM_BASE + OLDMEM_SIZE)
43+ src -= OLDMEM_BASE;
44+ if (userbuf)
45+ copy_to_user_real((void __force __user *) buf, (void *) src,
46+ csize);
47+ else
48+ memcpy_real(buf, (void *) src, csize);
49+ return csize;
50+}
51+
52+/*
53+ * Copy memory from old kernel
54+ */
55+static int copy_from_oldmem(void *dest, void *src, size_t count)
56+{
57+ unsigned long copied = 0;
58+ int rc;
59+
60+ if ((unsigned long) src < OLDMEM_SIZE) {
61+ copied = min(count, OLDMEM_SIZE - (unsigned long) src);
62+ rc = memcpy_real(dest, src + OLDMEM_BASE, copied);
63+ if (rc)
64+ return rc;
65+ }
66+ return memcpy_real(dest + copied, src + copied, count - copied);
67+}
68+
69+/*
70+ * Alloc memory and panic in case of ENOMEM
71+ */
72+static void *kzalloc_panic(int len)
73+{
74+ void *rc;
75+
76+ rc = kzalloc(len, GFP_KERNEL);
77+ if (!rc)
78+ panic("s390 kdump kzalloc (%d) failed", len);
79+ return rc;
80+}
81+
82+/*
83+ * Get memory layout and create hole for oldmem
84+ */
85+static struct mem_chunk *get_memory_layout(void)
86+{
87+ struct mem_chunk *chunk_array;
88+
89+ chunk_array = kzalloc_panic(MEMORY_CHUNKS * sizeof(struct mem_chunk));
90+ detect_memory_layout(chunk_array);
91+ create_mem_hole(chunk_array, OLDMEM_BASE, OLDMEM_SIZE, CHUNK_CRASHK);
92+ return chunk_array;
93+}
94+
95+/*
96+ * Initialize ELF note
97+ */
98+static void *nt_init(void *buf, Elf64_Word type, void *desc, int d_len,
99+ const char *name)
100+{
101+ Elf64_Nhdr *note;
102+ u64 len;
103+
104+ note = (Elf64_Nhdr *)buf;
105+ note->n_namesz = strlen(name) + 1;
106+ note->n_descsz = d_len;
107+ note->n_type = type;
108+ len = sizeof(Elf64_Nhdr);
109+
110+ memcpy(buf + len, name, note->n_namesz);
111+ len = roundup(len + note->n_namesz, 4);
112+
113+ memcpy(buf + len, desc, note->n_descsz);
114+ len = roundup(len + note->n_descsz, 4);
115+
116+ return PTR_ADD(buf, len);
117+}
118+
119+/*
120+ * Initialize prstatus note
121+ */
122+static void *nt_prstatus(void *ptr, struct save_area *sa)
123+{
124+ struct elf_prstatus nt_prstatus;
125+ static int cpu_nr = 1;
126+
127+ memset(&nt_prstatus, 0, sizeof(nt_prstatus));
128+ memcpy(&nt_prstatus.pr_reg.gprs, sa->gp_regs, sizeof(sa->gp_regs));
129+ memcpy(&nt_prstatus.pr_reg.psw, sa->psw, sizeof(sa->psw));
130+ memcpy(&nt_prstatus.pr_reg.acrs, sa->acc_regs, sizeof(sa->acc_regs));
131+ nt_prstatus.pr_pid = cpu_nr;
132+ cpu_nr++;
133+
134+ return nt_init(ptr, NT_PRSTATUS, &nt_prstatus, sizeof(nt_prstatus),
135+ "CORE");
136+}
137+
138+/*
139+ * Initialize fpregset (floating point) note
140+ */
141+static void *nt_fpregset(void *ptr, struct save_area *sa)
142+{
143+ elf_fpregset_t nt_fpregset;
144+
145+ memset(&nt_fpregset, 0, sizeof(nt_fpregset));
146+ memcpy(&nt_fpregset.fpc, &sa->fp_ctrl_reg, sizeof(sa->fp_ctrl_reg));
147+ memcpy(&nt_fpregset.fprs, &sa->fp_regs, sizeof(sa->fp_regs));
148+
149+ return nt_init(ptr, NT_PRFPREG, &nt_fpregset, sizeof(nt_fpregset),
150+ "CORE");
151+}
152+
153+/*
154+ * Initialize timer note
155+ */
156+static void *nt_s390_timer(void *ptr, struct save_area *sa)
157+{
158+ return nt_init(ptr, NT_S390_TIMER, &sa->timer, sizeof(sa->timer),
159+ KEXEC_CORE_NOTE_NAME);
160+}
161+
162+/*
163+ * Initialize TOD clock comparator note
164+ */
165+static void *nt_s390_tod_cmp(void *ptr, struct save_area *sa)
166+{
167+ return nt_init(ptr, NT_S390_TODCMP, &sa->clk_cmp,
168+ sizeof(sa->clk_cmp), KEXEC_CORE_NOTE_NAME);
169+}
170+
171+/*
172+ * Initialize TOD programmable register note
173+ */
174+static void *nt_s390_tod_preg(void *ptr, struct save_area *sa)
175+{
176+ return nt_init(ptr, NT_S390_TODPREG, &sa->tod_reg,
177+ sizeof(sa->tod_reg), KEXEC_CORE_NOTE_NAME);
178+}
179+
180+/*
181+ * Initialize control register note
182+ */
183+static void *nt_s390_ctrs(void *ptr, struct save_area *sa)
184+{
185+ return nt_init(ptr, NT_S390_CTRS, &sa->ctrl_regs,
186+ sizeof(sa->ctrl_regs), KEXEC_CORE_NOTE_NAME);
187+}
188+
189+/*
190+ * Initialize prefix register note
191+ */
192+static void *nt_s390_prefix(void *ptr, struct save_area *sa)
193+{
194+ return nt_init(ptr, NT_S390_PREFIX, &sa->pref_reg,
195+ sizeof(sa->pref_reg), KEXEC_CORE_NOTE_NAME);
196+}
197+
198+/*
199+ * Fill ELF notes for one CPU with save area registers
200+ */
201+void *fill_cpu_elf_notes(void *ptr, struct save_area *sa)
202+{
203+ ptr = nt_prstatus(ptr, sa);
204+ ptr = nt_fpregset(ptr, sa);
205+ ptr = nt_s390_timer(ptr, sa);
206+ ptr = nt_s390_tod_cmp(ptr, sa);
207+ ptr = nt_s390_tod_preg(ptr, sa);
208+ ptr = nt_s390_ctrs(ptr, sa);
209+ ptr = nt_s390_prefix(ptr, sa);
210+ return ptr;
211+}
212+
213+/*
214+ * Initialize prpsinfo note (new kernel)
215+ */
216+static void *nt_prpsinfo(void *ptr)
217+{
218+ struct elf_prpsinfo prpsinfo;
219+
220+ memset(&prpsinfo, 0, sizeof(prpsinfo));
221+ prpsinfo.pr_sname = 'R';
222+ strcpy(prpsinfo.pr_fname, "vmlinux");
223+ return nt_init(ptr, NT_PRPSINFO, &prpsinfo, sizeof(prpsinfo),
224+ KEXEC_CORE_NOTE_NAME);
225+}
226+
227+/*
228+ * Initialize vmcoreinfo note (new kernel)
229+ */
230+static void *nt_vmcoreinfo(void *ptr)
231+{
232+ char nt_name[11], *vmcoreinfo;
233+ Elf64_Nhdr note;
234+ void *addr;
235+
236+ if (copy_from_oldmem(&addr, &S390_lowcore.vmcore_info, sizeof(addr)))
237+ return ptr;
238+ memset(nt_name, 0, sizeof(nt_name));
239+ if (copy_from_oldmem(&note, addr, sizeof(note)))
240+ return ptr;
241+ if (copy_from_oldmem(nt_name, addr + sizeof(note), sizeof(nt_name) - 1))
242+ return ptr;
243+ if (strcmp(nt_name, "VMCOREINFO") != 0)
244+ return ptr;
245+ vmcoreinfo = kzalloc_panic(note.n_descsz + 1);
246+ if (copy_from_oldmem(vmcoreinfo, addr + 24, note.n_descsz))
247+ return ptr;
248+ vmcoreinfo[note.n_descsz + 1] = 0;
249+ return nt_init(ptr, 0, vmcoreinfo, note.n_descsz, "VMCOREINFO");
250+}
251+
252+/*
253+ * Initialize ELF header (new kernel)
254+ */
255+static void *ehdr_init(Elf64_Ehdr *ehdr, int mem_chunk_cnt)
256+{
257+ memset(ehdr, 0, sizeof(*ehdr));
258+ memcpy(ehdr->e_ident, ELFMAG, SELFMAG);
259+ ehdr->e_ident[EI_CLASS] = ELFCLASS64;
260+ ehdr->e_ident[EI_DATA] = ELFDATA2MSB;
261+ ehdr->e_ident[EI_VERSION] = EV_CURRENT;
262+ memset(ehdr->e_ident + EI_PAD, 0, EI_NIDENT - EI_PAD);
263+ ehdr->e_type = ET_CORE;
264+ ehdr->e_machine = EM_S390;
265+ ehdr->e_version = EV_CURRENT;
266+ ehdr->e_phoff = sizeof(Elf64_Ehdr);
267+ ehdr->e_ehsize = sizeof(Elf64_Ehdr);
268+ ehdr->e_phentsize = sizeof(Elf64_Phdr);
269+ ehdr->e_phnum = mem_chunk_cnt + 1;
270+ return ehdr + 1;
271+}
272+
273+/*
274+ * Return CPU count for ELF header (new kernel)
275+ */
276+static int get_cpu_cnt(void)
277+{
278+ int i, cpus = 0;
279+
280+ for (i = 0; zfcpdump_save_areas[i]; i++) {
281+ if (zfcpdump_save_areas[i]->pref_reg == 0)
282+ continue;
283+ cpus++;
284+ }
285+ return cpus;
286+}
287+
288+/*
289+ * Return memory chunk count for ELF header (new kernel)
290+ */
291+static int get_mem_chunk_cnt(void)
292+{
293+ struct mem_chunk *chunk_array, *mem_chunk;
294+ int i, cnt = 0;
295+
296+ chunk_array = get_memory_layout();
297+ for (i = 0; i < MEMORY_CHUNKS; i++) {
298+ mem_chunk = &chunk_array[i];
299+ if (chunk_array[i].type != CHUNK_READ_WRITE &&
300+ chunk_array[i].type != CHUNK_READ_ONLY)
301+ continue;
302+ if (mem_chunk->size == 0)
303+ continue;
304+ cnt++;
305+ }
306+ kfree(chunk_array);
307+ return cnt;
308+}
309+
310+/*
311+ * Relocate pointer in order to allow vmcore code access the data
312+ */
313+static inline unsigned long relocate(unsigned long addr)
314+{
315+ return OLDMEM_BASE + addr;
316+}
317+
318+/*
319+ * Initialize ELF loads (new kernel)
320+ */
321+static int loads_init(Elf64_Phdr *phdr, u64 loads_offset)
322+{
323+ struct mem_chunk *chunk_array, *mem_chunk;
324+ int i;
325+
326+ chunk_array = get_memory_layout();
327+ for (i = 0; i < MEMORY_CHUNKS; i++) {
328+ mem_chunk = &chunk_array[i];
329+ if (mem_chunk->size == 0)
330+ break;
331+ if (chunk_array[i].type != CHUNK_READ_WRITE &&
332+ chunk_array[i].type != CHUNK_READ_ONLY)
333+ continue;
334+ else
335+ phdr->p_filesz = mem_chunk->size;
336+ phdr->p_type = PT_LOAD;
337+ phdr->p_offset = mem_chunk->addr;
338+ phdr->p_vaddr = mem_chunk->addr;
339+ phdr->p_paddr = mem_chunk->addr;
340+ phdr->p_memsz = mem_chunk->size;
341+ phdr->p_flags = PF_R | PF_W | PF_X;
342+ phdr->p_align = PAGE_SIZE;
343+ phdr++;
344+ }
345+ kfree(chunk_array);
346+ return i;
347+}
348+
349+/*
350+ * Initialize notes (new kernel)
351+ */
352+static void *notes_init(Elf64_Phdr *phdr, void *ptr, u64 notes_offset)
353+{
354+ struct save_area *sa;
355+ void *ptr_start = ptr;
356+ int i;
357+
358+ ptr = nt_prpsinfo(ptr);
359+
360+ for (i = 0; zfcpdump_save_areas[i]; i++) {
361+ sa = zfcpdump_save_areas[i];
362+ if (sa->pref_reg == 0)
363+ continue;
364+ ptr = fill_cpu_elf_notes(ptr, sa);
365+ }
366+ ptr = nt_vmcoreinfo(ptr);
367+ memset(phdr, 0, sizeof(*phdr));
368+ phdr->p_type = PT_NOTE;
369+ phdr->p_offset = relocate(notes_offset);
370+ phdr->p_filesz = (unsigned long) PTR_SUB(ptr, ptr_start);
371+ phdr->p_memsz = phdr->p_filesz;
372+ return ptr;
373+}
374+
375+/*
376+ * Create ELF core header (new kernel)
377+ */
378+static void s390_elf_corehdr_create(char **elfcorebuf, size_t *elfcorebuf_sz)
379+{
380+ Elf64_Phdr *phdr_notes, *phdr_loads;
381+ int mem_chunk_cnt;
382+ void *ptr, *hdr;
383+ u32 alloc_size;
384+ u64 hdr_off;
385+
386+ mem_chunk_cnt = get_mem_chunk_cnt();
387+
388+ alloc_size = 0x1000 + get_cpu_cnt() * 0x300 +
389+ mem_chunk_cnt * sizeof(Elf64_Phdr);
390+ hdr = kzalloc_panic(alloc_size);
391+ /* Init elf header */
392+ ptr = ehdr_init(hdr, mem_chunk_cnt);
393+ /* Init program headers */
394+ phdr_notes = ptr;
395+ ptr = PTR_ADD(ptr, sizeof(Elf64_Phdr));
396+ phdr_loads = ptr;
397+ ptr = PTR_ADD(ptr, sizeof(Elf64_Phdr) * mem_chunk_cnt);
398+ /* Init notes */
399+ hdr_off = PTR_DIFF(ptr, hdr);
400+ ptr = notes_init(phdr_notes, ptr, ((unsigned long) hdr) + hdr_off);
401+ /* Init loads */
402+ hdr_off = PTR_DIFF(ptr, hdr);
403+ loads_init(phdr_loads, ((unsigned long) hdr) + hdr_off);
404+ *elfcorebuf_sz = hdr_off;
405+ *elfcorebuf = (void *) relocate((unsigned long) hdr);
406+ BUG_ON(*elfcorebuf_sz > alloc_size);
407+}
408+
409+/*
410+ * Create kdump ELF core header in new kernel, if it has not been passed via
411+ * the "elfcorehdr" kernel parameter
412+ */
413+static int setup_kdump_elfcorehdr(void)
414+{
415+ size_t elfcorebuf_sz;
416+ char *elfcorebuf;
417+
418+ if (!OLDMEM_BASE || is_kdump_kernel())
419+ return -EINVAL;
420+ s390_elf_corehdr_create(&elfcorebuf, &elfcorebuf_sz);
421+ elfcorehdr_addr = (unsigned long long) elfcorebuf;
422+ elfcorehdr_size = elfcorebuf_sz;
423+ return 0;
424+}
425+
426+subsys_initcall(setup_kdump_elfcorehdr);
arch/s390/kernel/early.c+1−1
@@ -252,7 +252,7 @@ static noinline __init void setup_lowcore_early(void) · 251 unmodified lines
252252 {
253253 psw_t psw;
254254
255− psw.mask = PSW_BASE_BITS | PSW_DEFAULT_KEY;
255+ psw.mask = PSW_MASK_BASE | PSW_DEFAULT_KEY | PSW_MASK_EA | PSW_MASK_BA;
256256 psw.addr = PSW_ADDR_AMODE | (unsigned long) s390_base_ext_handler;
257257 S390_lowcore.external_new_psw = psw;
258258 psw.addr = PSW_ADDR_AMODE | (unsigned long) s390_base_pgm_handler;
arch/s390/kernel/entry.S+34−50
@@ -43,16 +43,15 @@ SP_R13 = STACK_FRAME_OVERHEAD + __PT_GPRS + 52 · 42 unmodified lines
4343 SP_R14 = STACK_FRAME_OVERHEAD + __PT_GPRS + 56
4444 SP_R15 = STACK_FRAME_OVERHEAD + __PT_GPRS + 60
4545 SP_ORIG_R2 = STACK_FRAME_OVERHEAD + __PT_ORIG_GPR2
46−SP_ILC = STACK_FRAME_OVERHEAD + __PT_ILC
47−SP_SVCNR = STACK_FRAME_OVERHEAD + __PT_SVCNR
46+SP_SVC_CODE = STACK_FRAME_OVERHEAD + __PT_SVC_CODE
4847 SP_SIZE = STACK_FRAME_OVERHEAD + __PT_SIZE
4948
5049 _TIF_WORK_SVC = (_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_NEED_RESCHED | \
51− _TIF_MCCK_PENDING | _TIF_RESTART_SVC | _TIF_PER_TRAP )
50+ _TIF_MCCK_PENDING | _TIF_PER_TRAP )
5251 _TIF_WORK_INT = (_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_NEED_RESCHED | \
5352 _TIF_MCCK_PENDING)
54−_TIF_SYSCALL = (_TIF_SYSCALL_TRACE>>8 | _TIF_SYSCALL_AUDIT>>8 | \
55− _TIF_SECCOMP>>8 | _TIF_SYSCALL_TRACEPOINT>>8)
53+_TIF_TRACE = (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SECCOMP | \
54+ _TIF_SYSCALL_TRACEPOINT)
5655
5756 STACK_SHIFT = PAGE_SHIFT + THREAD_ORDER
5857 STACK_SIZE = 1 << STACK_SHIFT
@@ -228,9 +227,10 @@ ENTRY(system_call) · 169 unmodified lines
228227 sysc_saveall:
229228 SAVE_ALL_SVC __LC_SVC_OLD_PSW,__LC_SAVE_AREA
230229 CREATE_STACK_FRAME __LC_SAVE_AREA
231− mvc SP_PSW(8,%r15),__LC_SVC_OLD_PSW
232− mvc SP_ILC(4,%r15),__LC_SVC_ILC
233230 l %r12,__LC_THREAD_INFO # load pointer to thread_info struct
231+ mvc SP_PSW(8,%r15),__LC_SVC_OLD_PSW
232+ mvc SP_SVC_CODE(4,%r15),__LC_SVC_ILC
233+ oi __TI_flags+3(%r12),_TIF_SYSCALL
234234 sysc_vtime:
235235 UPDATE_VTIME __LC_EXIT_TIMER,__LC_SYNC_ENTER_TIMER,__LC_USER_TIMER
236236 sysc_stime:
@@ -239,17 +239,17 @@ sysc_update: · 2 unmodified lines
239239 mvc __LC_LAST_UPDATE_TIMER(8),__LC_SYNC_ENTER_TIMER
240240 sysc_do_svc:
241241 xr %r7,%r7
242− icm %r7,3,SP_SVCNR(%r15) # load svc number and test for svc 0
242+ icm %r7,3,SP_SVC_CODE+2(%r15)# load svc number and test for svc 0
243243 bnz BASED(sysc_nr_ok) # svc number > 0
244244 # svc 0: system call number in %r1
245245 cl %r1,BASED(.Lnr_syscalls)
246246 bnl BASED(sysc_nr_ok)
247− sth %r1,SP_SVCNR(%r15)
247+ sth %r1,SP_SVC_CODE+2(%r15)
248248 lr %r7,%r1 # copy svc number to %r7
249249 sysc_nr_ok:
250250 sll %r7,2 # svc number *4
251251 l %r10,BASED(.Lsysc_table)
252− tm __TI_flags+2(%r12),_TIF_SYSCALL
252+ tm __TI_flags+2(%r12),_TIF_TRACE >> 8
253253 mvc SP_ARGS(4,%r15),SP_R7(%r15)
254254 l %r8,0(%r7,%r10) # get system call addr.
255255 bnz BASED(sysc_tracesys)
@@ -259,23 +259,19 @@ sysc_nr_ok: · 3 unmodified lines
259259 sysc_return:
260260 LOCKDEP_SYS_EXIT
261261 sysc_tif:
262+ tm SP_PSW+1(%r15),0x01 # returning to user ?
263+ bno BASED(sysc_restore)
262264 tm __TI_flags+3(%r12),_TIF_WORK_SVC
263265 bnz BASED(sysc_work) # there is work to do (signals etc.)
266+ ni __TI_flags+3(%r12),255-_TIF_SYSCALL
264267 sysc_restore:
265268 RESTORE_ALL __LC_RETURN_PSW,1
266269 sysc_done:
267270
268−#
269−# There is work to do, but first we need to check if we return to userspace.
270−#
271−sysc_work:
272− tm SP_PSW+1(%r15),0x01 # returning to user ?
273− bno BASED(sysc_restore)
274−
275271 #
276272 # One of the work bits is on. Find out which one.
277273 #
278−sysc_work_tif:
274+sysc_work:
279275 tm __TI_flags+3(%r12),_TIF_MCCK_PENDING
280276 bo BASED(sysc_mcck_pending)
281277 tm __TI_flags+3(%r12),_TIF_NEED_RESCHED
@@ -284,8 +280,6 @@ sysc_work_tif: · 2 unmodified lines
284280 bo BASED(sysc_sigpending)
285281 tm __TI_flags+3(%r12),_TIF_NOTIFY_RESUME
286282 bo BASED(sysc_notify_resume)
287− tm __TI_flags+3(%r12),_TIF_RESTART_SVC
288− bo BASED(sysc_restart)
289283 tm __TI_flags+3(%r12),_TIF_PER_TRAP
290284 bo BASED(sysc_singlestep)
291285 b BASED(sysc_return) # beware of critical section cleanup
@@ -314,11 +308,14 @@ sysc_sigpending: · 22 unmodified lines
314308 la %r2,SP_PTREGS(%r15) # load pt_regs
315309 l %r1,BASED(.Ldo_signal)
316310 basr %r14,%r1 # call do_signal
317− tm __TI_flags+3(%r12),_TIF_RESTART_SVC
318− bo BASED(sysc_restart)
319− tm __TI_flags+3(%r12),_TIF_PER_TRAP
320− bo BASED(sysc_singlestep)
321− b BASED(sysc_return)
311+ tm __TI_flags+3(%r12),_TIF_SYSCALL
312+ bno BASED(sysc_return)
313+ lm %r2,%r6,SP_R2(%r15) # load svc arguments
314+ xr %r7,%r7 # svc 0 returns -ENOSYS
315+ clc SP_SVC_CODE+2(2,%r15),BASED(.Lnr_syscalls+2)
316+ bnl BASED(sysc_nr_ok) # invalid svc number -> do svc 0
317+ icm %r7,3,SP_SVC_CODE+2(%r15)# load new svc number
318+ b BASED(sysc_nr_ok) # restart svc
322319
323320 #
324321 # _TIF_NOTIFY_RESUME is set, call do_notify_resume
@@ -329,24 +326,11 @@ sysc_notify_resume: · 4 unmodified lines
329326 la %r14,BASED(sysc_return)
330327 br %r1 # call do_notify_resume
331328
332−
333−#
334−# _TIF_RESTART_SVC is set, set up registers and restart svc
335−#
336−sysc_restart:
337− ni __TI_flags+3(%r12),255-_TIF_RESTART_SVC # clear TIF_RESTART_SVC
338− l %r7,SP_R2(%r15) # load new svc number
339− mvc SP_R2(4,%r15),SP_ORIG_R2(%r15) # restore first argument
340− lm %r2,%r6,SP_R2(%r15) # load svc arguments
341− sth %r7,SP_SVCNR(%r15)
342− b BASED(sysc_nr_ok) # restart svc
343−
344329 #
345330 # _TIF_PER_TRAP is set, call do_per_trap
346331 #
347332 sysc_singlestep:
348− ni __TI_flags+3(%r12),255-_TIF_PER_TRAP # clear TIF_PER_TRAP
349− xc SP_SVCNR(2,%r15),SP_SVCNR(%r15) # clear svc number
333+ ni __TI_flags+3(%r12),255-(_TIF_SYSCALL | _TIF_PER_TRAP)
350334 la %r2,SP_PTREGS(%r15) # address of register-save area
351335 l %r1,BASED(.Lhandle_per) # load adr. of per handler
352336 la %r14,BASED(sysc_return) # load adr. of system return
@@ -361,7 +345,7 @@ sysc_tracesys: · 8 unmodified lines
361345 la %r2,SP_PTREGS(%r15) # load pt_regs
362346 la %r3,0
363347 xr %r0,%r0
364− icm %r0,3,SP_SVCNR(%r15)
348+ icm %r0,3,SP_SVC_CODE(%r15)
365349 st %r0,SP_R2(%r15)
366350 basr %r14,%r1
367351 cl %r2,BASED(.Lnr_syscalls)
@@ -376,7 +360,7 @@ sysc_tracego: · 8 unmodified lines
376360 basr %r14,%r8 # call sys_xxx
377361 st %r2,SP_R2(%r15) # store return value
378362 sysc_tracenogo:
379− tm __TI_flags+2(%r12),_TIF_SYSCALL
363+ tm __TI_flags+2(%r12),_TIF_TRACE >> 8
380364 bz BASED(sysc_return)
381365 l %r1,BASED(.Ltrace_exit)
382366 la %r2,SP_PTREGS(%r15) # load pt_regs
@@ -454,7 +438,6 @@ ENTRY(pgm_check_handler) · 71 unmodified lines
454438 bnz BASED(pgm_per) # got per exception -> special case
455439 SAVE_ALL_PGM __LC_PGM_OLD_PSW,__LC_SAVE_AREA
456440 CREATE_STACK_FRAME __LC_SAVE_AREA
457− xc SP_ILC(4,%r15),SP_ILC(%r15)
458441 mvc SP_PSW(8,%r15),__LC_PGM_OLD_PSW
459442 l %r12,__LC_THREAD_INFO # load pointer to thread_info struct
460443 tm SP_PSW+1(%r15),0x01 # interrupting from user ?
@@ -530,9 +513,10 @@ pgm_exit2: · 69 unmodified lines
530513 pgm_svcper:
531514 SAVE_ALL_PGM __LC_SVC_OLD_PSW,__LC_SAVE_AREA
532515 CREATE_STACK_FRAME __LC_SAVE_AREA
533− mvc SP_PSW(8,%r15),__LC_SVC_OLD_PSW
534− mvc SP_ILC(4,%r15),__LC_SVC_ILC
535516 l %r12,__LC_THREAD_INFO # load pointer to thread_info struct
517+ mvc SP_PSW(8,%r15),__LC_SVC_OLD_PSW
518+ mvc SP_SVC_CODE(4,%r15),__LC_SVC_ILC
519+ oi __TI_flags+3(%r12),(_TIF_SYSCALL | _TIF_PER_TRAP)
536520 UPDATE_VTIME __LC_EXIT_TIMER,__LC_SYNC_ENTER_TIMER,__LC_USER_TIMER
537521 UPDATE_VTIME __LC_LAST_UPDATE_TIMER,__LC_EXIT_TIMER,__LC_SYSTEM_TIMER
538522 mvc __LC_LAST_UPDATE_TIMER(8),__LC_SYNC_ENTER_TIMER
@@ -540,7 +524,6 @@ pgm_svcper: · 1 unmodified line
540524 mvc __THREAD_per_cause(2,%r8),__LC_PER_CAUSE
541525 mvc __THREAD_per_address(4,%r8),__LC_PER_ADDRESS
542526 mvc __THREAD_per_paid(1,%r8),__LC_PER_PAID
543− oi __TI_flags+3(%r12),_TIF_PER_TRAP # set TIF_PER_TRAP
544527 stosm __SF_EMPTY(%r15),0x03 # reenable interrupts
545528 lm %r2,%r6,SP_R2(%r15) # load svc arguments
546529 b BASED(sysc_do_svc)
@@ -550,7 +533,6 @@ pgm_svcper: · 3 unmodified lines
550533 #
551534 kernel_per:
552535 REENABLE_IRQS
553− xc SP_SVCNR(2,%r15),SP_SVCNR(%r15)
554536 la %r2,SP_PTREGS(%r15) # address of register-save area
555537 l %r1,BASED(.Lhandle_per) # load adr. of per handler
556538 basr %r14,%r1 # branch to do_single_step
@@ -853,13 +835,13 @@ restart_go: · 296 unmodified lines
853835 # PSW restart interrupt handler
854836 #
855837 ENTRY(psw_restart_int_handler)
856− st %r15,__LC_SAVE_AREA_64(%r0) # save r15
838+ st %r15,__LC_SAVE_AREA+48(%r0) # save r15
857839 basr %r15,0
858840 0: l %r15,.Lrestart_stack-0b(%r15) # load restart stack
859841 l %r15,0(%r15)
860842 ahi %r15,-SP_SIZE # make room for pt_regs
861843 stm %r0,%r14,SP_R0(%r15) # store gprs %r0-%r14 to stack
862− mvc SP_R15(4,%r15),__LC_SAVE_AREA_64(%r0)# store saved %r15 to stack
844+ mvc SP_R15(4,%r15),__LC_SAVE_AREA+48(%r0)# store saved %r15 to stack
863845 mvc SP_PSW(8,%r15),__LC_RST_OLD_PSW(%r0) # store restart old psw
864846 xc __SF_BACKCHAIN(4,%r15),__SF_BACKCHAIN(%r15) # set backchain to 0
865847 basr %r14,0
@@ -965,9 +947,11 @@ cleanup_system_call: · 99 unmodified lines
965947 s %r15,BASED(.Lc_spsize) # make room for registers & psw
966948 st %r15,12(%r12)
967949 CREATE_STACK_FRAME __LC_SAVE_AREA
968− mvc SP_PSW(8,%r15),__LC_SVC_OLD_PSW
969− mvc SP_ILC(4,%r15),__LC_SVC_ILC
970950 mvc 0(4,%r12),__LC_THREAD_INFO
951+ l %r12,__LC_THREAD_INFO
952+ mvc SP_PSW(8,%r15),__LC_SVC_OLD_PSW
953+ mvc SP_SVC_CODE(4,%r15),__LC_SVC_ILC
954+ oi __TI_flags+3(%r12),_TIF_SYSCALL
971955 cleanup_vtime:
972956 clc __LC_RETURN_PSW+4(4),BASED(cleanup_system_call_insn+12)
973957 bhe BASED(cleanup_stime)
arch/s390/kernel/entry.h+11−2
@@ -5,24 +5,33 @@ · 4 unmodified lines
55 #include <linux/signal.h>
66 #include <asm/ptrace.h>
77
8+
9+extern void (*pgm_check_table[128])(struct pt_regs *, long, unsigned long);
10+extern void *restart_stack;
11+
12+asmlinkage long do_syscall_trace_enter(struct pt_regs *regs);
13+asmlinkage void do_syscall_trace_exit(struct pt_regs *regs);
14+
815 void do_protection_exception(struct pt_regs *, long, unsigned long);
916 void do_dat_exception(struct pt_regs *, long, unsigned long);
1017 void do_asce_exception(struct pt_regs *, long, unsigned long);
1118
12−extern int sysctl_userprocess_debug;
13−
1419 void do_per_trap(struct pt_regs *regs);
1520 void syscall_trace(struct pt_regs *regs, int entryexit);
1621 void kernel_stack_overflow(struct pt_regs * regs);
1722 void do_signal(struct pt_regs *regs);
1823 int handle_signal32(unsigned long sig, struct k_sigaction *ka,
1924 siginfo_t *info, sigset_t *oldset, struct pt_regs *regs);
25+void do_notify_resume(struct pt_regs *regs);
2026
2127 void do_extint(struct pt_regs *regs, unsigned int, unsigned int, unsigned long);
28+void do_restart(void);
2229 int __cpuinit start_secondary(void *cpuvoid);
2330 void __init startup_init(void);
2431 void die(const char * str, struct pt_regs * regs, long err);
2532
33+void __init time_init(void);
34+
2635 struct s390_mmap_arg_struct;
2736 struct fadvise64_64_args;
2837 struct old_sigaction;
arch/s390/kernel/entry64.S+36−50
@@ -43,19 +43,18 @@ SP_R13 = STACK_FRAME_OVERHEAD + __PT_GPRS + 104 · 42 unmodified lines
4343 SP_R14 = STACK_FRAME_OVERHEAD + __PT_GPRS + 112
4444 SP_R15 = STACK_FRAME_OVERHEAD + __PT_GPRS + 120
4545 SP_ORIG_R2 = STACK_FRAME_OVERHEAD + __PT_ORIG_GPR2
46−SP_ILC = STACK_FRAME_OVERHEAD + __PT_ILC
47−SP_SVCNR = STACK_FRAME_OVERHEAD + __PT_SVCNR
46+SP_SVC_CODE = STACK_FRAME_OVERHEAD + __PT_SVC_CODE
4847 SP_SIZE = STACK_FRAME_OVERHEAD + __PT_SIZE
4948
5049 STACK_SHIFT = PAGE_SHIFT + THREAD_ORDER
5150 STACK_SIZE = 1 << STACK_SHIFT
5251
5352 _TIF_WORK_SVC = (_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_NEED_RESCHED | \
54− _TIF_MCCK_PENDING | _TIF_RESTART_SVC | _TIF_PER_TRAP )
53+ _TIF_MCCK_PENDING | _TIF_PER_TRAP )
5554 _TIF_WORK_INT = (_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_NEED_RESCHED | \
5655 _TIF_MCCK_PENDING)
57−_TIF_SYSCALL = (_TIF_SYSCALL_TRACE>>8 | _TIF_SYSCALL_AUDIT>>8 | \
58− _TIF_SECCOMP>>8 | _TIF_SYSCALL_TRACEPOINT>>8)
56+_TIF_TRACE = (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | _TIF_SECCOMP | \
57+ _TIF_SYSCALL_TRACEPOINT)
5958 _TIF_EXIT_SIE = (_TIF_SIGPENDING | _TIF_NEED_RESCHED | _TIF_MCCK_PENDING)
6059
6160 #define BASED(name) name-system_call(%r13)
@@ -249,9 +248,10 @@ ENTRY(system_call) · 187 unmodified lines
249248 sysc_saveall:
250249 SAVE_ALL_SVC __LC_SVC_OLD_PSW,__LC_SAVE_AREA
251250 CREATE_STACK_FRAME __LC_SAVE_AREA
252− mvc SP_PSW(16,%r15),__LC_SVC_OLD_PSW
253− mvc SP_ILC(4,%r15),__LC_SVC_ILC
254251 lg %r12,__LC_THREAD_INFO # load pointer to thread_info struct
252+ mvc SP_PSW(16,%r15),__LC_SVC_OLD_PSW
253+ mvc SP_SVC_CODE(4,%r15),__LC_SVC_ILC
254+ oi __TI_flags+7(%r12),_TIF_SYSCALL
255255 sysc_vtime:
256256 UPDATE_VTIME __LC_EXIT_TIMER,__LC_SYNC_ENTER_TIMER,__LC_USER_TIMER
257257 sysc_stime:
@@ -260,14 +260,14 @@ sysc_update: · 2 unmodified lines
260260 mvc __LC_LAST_UPDATE_TIMER(8),__LC_SYNC_ENTER_TIMER
261261 LAST_BREAK
262262 sysc_do_svc:
263− llgh %r7,SP_SVCNR(%r15)
263+ llgh %r7,SP_SVC_CODE+2(%r15)
264264 slag %r7,%r7,2 # shift and test for svc 0
265265 jnz sysc_nr_ok
266266 # svc 0: system call number in %r1
267267 llgfr %r1,%r1 # clear high word in r1
268268 cghi %r1,NR_syscalls
269269 jnl sysc_nr_ok
270− sth %r1,SP_SVCNR(%r15)
270+ sth %r1,SP_SVC_CODE+2(%r15)
271271 slag %r7,%r1,2 # shift and test for svc 0
272272 sysc_nr_ok:
273273 larl %r10,sys_call_table
@@ -277,7 +277,7 @@ sysc_nr_ok: · 3 unmodified lines
277277 larl %r10,sys_call_table_emu # use 31 bit emulation system calls
278278 sysc_noemu:
279279 #endif
280− tm __TI_flags+6(%r12),_TIF_SYSCALL
280+ tm __TI_flags+6(%r12),_TIF_TRACE >> 8
281281 mvc SP_ARGS(8,%r15),SP_R7(%r15)
282282 lgf %r8,0(%r7,%r10) # load address of system call routine
283283 jnz sysc_tracesys
@@ -287,23 +287,19 @@ sysc_noemu: · 3 unmodified lines
287287 sysc_return:
288288 LOCKDEP_SYS_EXIT
289289 sysc_tif:
290+ tm SP_PSW+1(%r15),0x01 # returning to user ?
291+ jno sysc_restore
290292 tm __TI_flags+7(%r12),_TIF_WORK_SVC
291293 jnz sysc_work # there is work to do (signals etc.)
294+ ni __TI_flags+7(%r12),255-_TIF_SYSCALL
292295 sysc_restore:
293296 RESTORE_ALL __LC_RETURN_PSW,1
294297 sysc_done:
295298
296−#
297−# There is work to do, but first we need to check if we return to userspace.
298−#
299−sysc_work:
300− tm SP_PSW+1(%r15),0x01 # returning to user ?
301− jno sysc_restore
302−
303299 #
304300 # One of the work bits is on. Find out which one.
305301 #
306−sysc_work_tif:
302+sysc_work:
307303 tm __TI_flags+7(%r12),_TIF_MCCK_PENDING
308304 jo sysc_mcck_pending
309305 tm __TI_flags+7(%r12),_TIF_NEED_RESCHED
@@ -312,8 +308,6 @@ sysc_work_tif: · 2 unmodified lines
312308 jo sysc_sigpending
313309 tm __TI_flags+7(%r12),_TIF_NOTIFY_RESUME
314310 jo sysc_notify_resume
315− tm __TI_flags+7(%r12),_TIF_RESTART_SVC
316− jo sysc_restart
317311 tm __TI_flags+7(%r12),_TIF_PER_TRAP
318312 jo sysc_singlestep
319313 j sysc_return # beware of critical section cleanup
@@ -339,11 +333,15 @@ sysc_sigpending: · 19 unmodified lines
339333 ni __TI_flags+7(%r12),255-_TIF_PER_TRAP # clear TIF_PER_TRAP
340334 la %r2,SP_PTREGS(%r15) # load pt_regs
341335 brasl %r14,do_signal # call do_signal
342− tm __TI_flags+7(%r12),_TIF_RESTART_SVC
343− jo sysc_restart
344− tm __TI_flags+7(%r12),_TIF_PER_TRAP
345− jo sysc_singlestep
346− j sysc_return
336+ tm __TI_flags+7(%r12),_TIF_SYSCALL
337+ jno sysc_return
338+ lmg %r2,%r6,SP_R2(%r15) # load svc arguments
339+ lghi %r7,0 # svc 0 returns -ENOSYS
340+ lh %r1,SP_SVC_CODE+2(%r15) # load new svc number
341+ cghi %r1,NR_syscalls
342+ jnl sysc_nr_ok # invalid svc number -> do svc 0
343+ slag %r7,%r1,2
344+ j sysc_nr_ok # restart svc
347345
348346 #
349347 # _TIF_NOTIFY_RESUME is set, call do_notify_resume
@@ -353,24 +351,11 @@ sysc_notify_resume: · 3 unmodified lines
353351 larl %r14,sysc_return
354352 jg do_notify_resume # call do_notify_resume
355353
356−#
357−# _TIF_RESTART_SVC is set, set up registers and restart svc
358−#
359−sysc_restart:
360− ni __TI_flags+7(%r12),255-_TIF_RESTART_SVC # clear TIF_RESTART_SVC
361− lg %r7,SP_R2(%r15) # load new svc number
362− mvc SP_R2(8,%r15),SP_ORIG_R2(%r15) # restore first argument
363− lmg %r2,%r6,SP_R2(%r15) # load svc arguments
364− sth %r7,SP_SVCNR(%r15)
365− slag %r7,%r7,2
366− j sysc_nr_ok # restart svc
367−
368354 #
369355 # _TIF_PER_TRAP is set, call do_per_trap
370356 #
371357 sysc_singlestep:
372− ni __TI_flags+7(%r12),255-_TIF_PER_TRAP # clear TIF_PER_TRAP
373− xc SP_SVCNR(2,%r15),SP_SVCNR(%r15) # clear svc number
358+ ni __TI_flags+7(%r12),255-(_TIF_SYSCALL | _TIF_PER_TRAP)
374359 la %r2,SP_PTREGS(%r15) # address of register-save area
375360 larl %r14,sysc_return # load adr. of system return
376361 jg do_per_trap
@@ -382,7 +367,7 @@ sysc_singlestep: · 5 unmodified lines
382367 sysc_tracesys:
383368 la %r2,SP_PTREGS(%r15) # load pt_regs
384369 la %r3,0
385− llgh %r0,SP_SVCNR(%r15)
370+ llgh %r0,SP_SVC_CODE+2(%r15)
386371 stg %r0,SP_R2(%r15)
387372 brasl %r14,do_syscall_trace_enter
388373 lghi %r0,NR_syscalls
@@ -397,7 +382,7 @@ sysc_tracego: · 8 unmodified lines
397382 basr %r14,%r8 # call sys_xxx
398383 stg %r2,SP_R2(%r15) # store return value
399384 sysc_tracenogo:
400− tm __TI_flags+6(%r12),_TIF_SYSCALL
385+ tm __TI_flags+6(%r12),_TIF_TRACE >> 8
401386 jz sysc_return
402387 la %r2,SP_PTREGS(%r15) # load pt_regs
403388 larl %r14,sysc_return # return point is sysc_return
@@ -470,7 +455,6 @@ ENTRY(pgm_check_handler) · 66 unmodified lines
470455 jnz pgm_per # got per exception -> special case
471456 SAVE_ALL_PGM __LC_PGM_OLD_PSW,__LC_SAVE_AREA
472457 CREATE_STACK_FRAME __LC_SAVE_AREA
473− xc SP_ILC(4,%r15),SP_ILC(%r15)
474458 mvc SP_PSW(16,%r15),__LC_PGM_OLD_PSW
475459 lg %r12,__LC_THREAD_INFO # load pointer to thread_info struct
476460 HANDLE_SIE_INTERCEPT
@@ -550,9 +534,10 @@ pgm_exit2: · 73 unmodified lines
550534 pgm_svcper:
551535 SAVE_ALL_PGM __LC_SVC_OLD_PSW,__LC_SAVE_AREA
552536 CREATE_STACK_FRAME __LC_SAVE_AREA
553− mvc SP_PSW(16,%r15),__LC_SVC_OLD_PSW
554− mvc SP_ILC(4,%r15),__LC_SVC_ILC
555537 lg %r12,__LC_THREAD_INFO # load pointer to thread_info struct
538+ mvc SP_PSW(16,%r15),__LC_SVC_OLD_PSW
539+ mvc SP_SVC_CODE(4,%r15),__LC_SVC_ILC
540+ oi __TI_flags+7(%r12),(_TIF_SYSCALL | _TIF_PER_TRAP)
556541 UPDATE_VTIME __LC_EXIT_TIMER,__LC_SYNC_ENTER_TIMER,__LC_USER_TIMER
557542 UPDATE_VTIME __LC_LAST_UPDATE_TIMER,__LC_EXIT_TIMER,__LC_SYSTEM_TIMER
558543 mvc __LC_LAST_UPDATE_TIMER(8),__LC_SYNC_ENTER_TIMER
@@ -561,7 +546,6 @@ pgm_svcper: · 2 unmodified lines
561546 mvc __THREAD_per_cause(2,%r8),__LC_PER_CAUSE
562547 mvc __THREAD_per_address(8,%r8),__LC_PER_ADDRESS
563548 mvc __THREAD_per_paid(1,%r8),__LC_PER_PAID
564− oi __TI_flags+7(%r12),_TIF_PER_TRAP # set TIF_PER_TRAP
565549 stosm __SF_EMPTY(%r15),0x03 # reenable interrupts
566550 lmg %r2,%r6,SP_R2(%r15) # load svc arguments
567551 j sysc_do_svc
@@ -571,7 +555,6 @@ pgm_svcper: · 3 unmodified lines
571555 #
572556 kernel_per:
573557 REENABLE_IRQS
574− xc SP_SVCNR(2,%r15),SP_SVCNR(%r15) # clear svc number
575558 la %r2,SP_PTREGS(%r15) # address of register-save area
576559 brasl %r14,do_per_trap
577560 j pgm_exit
@@ -869,12 +852,12 @@ restart_go: · 291 unmodified lines
869852 # PSW restart interrupt handler
870853 #
871854 ENTRY(psw_restart_int_handler)
872− stg %r15,__LC_SAVE_AREA_64(%r0) # save r15
855+ stg %r15,__LC_SAVE_AREA+120(%r0) # save r15
873856 larl %r15,restart_stack # load restart stack
874857 lg %r15,0(%r15)
875858 aghi %r15,-SP_SIZE # make room for pt_regs
876859 stmg %r0,%r14,SP_R0(%r15) # store gprs %r0-%r14 to stack
877− mvc SP_R15(8,%r15),__LC_SAVE_AREA_64(%r0)# store saved %r15 to stack
860+ mvc SP_R15(8,%r15),__LC_SAVE_AREA+120(%r0)# store saved %r15 to stack
878861 mvc SP_PSW(16,%r15),__LC_RST_OLD_PSW(%r0)# store restart old psw
879862 xc __SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15) # set backchain to 0
880863 brasl %r14,do_restart
@@ -972,9 +955,11 @@ cleanup_system_call: · 91 unmodified lines
972955 stg %r15,32(%r12)
973956 stg %r11,0(%r12)
974957 CREATE_STACK_FRAME __LC_SAVE_AREA
975− mvc SP_PSW(16,%r15),__LC_SVC_OLD_PSW
976− mvc SP_ILC(4,%r15),__LC_SVC_ILC
977958 mvc 8(8,%r12),__LC_THREAD_INFO
959+ lg %r12,__LC_THREAD_INFO
960+ mvc SP_PSW(16,%r15),__LC_SVC_OLD_PSW
961+ mvc SP_SVC_CODE(4,%r15),__LC_SVC_ILC
962+ oi __TI_flags+7(%r12),_TIF_SYSCALL
978963 cleanup_vtime:
979964 clc __LC_RETURN_PSW+8(8),BASED(cleanup_system_call_insn+24)
980965 jhe cleanup_stime
@@ -1096,6 +1081,7 @@ sie_exit: · 115 unmodified lines
10961081 lghi %r2,0
10971082 br %r14
10981083 sie_fault:
1084+ lctlg %c1,%c1,__LC_USER_ASCE # load primary asce
10991085 lg %r14,__LC_THREAD_INFO # pointer thread_info struct
11001086 ni __TI_flags+6(%r14),255-(_TIF_SIE>>8)
11011087 lg %r14,__SF_EMPTY+8(%r15) # load guest register save area
arch/s390/kernel/head.S+22−0
@@ -449,10 +449,28 @@ ENTRY(start) · 448 unmodified lines
449449 #
450450 .org 0x10000
451451 ENTRY(startup)
452+ j .Lep_startup_normal
453+ .org 0x10008
454+#
455+# This is a list of s390 kernel entry points. At address 0x1000f the number of
456+# valid entry points is stored.
457+#
458+# IMPORTANT: Do not change this table, it is s390 kernel ABI!
459+#
460+ .ascii "S390EP"
461+ .byte 0x00,0x01
462+#
463+# kdump startup-code at 0x10010, running in 64 bit absolute addressing mode
464+#
465+ .org 0x10010
466+ENTRY(startup_kdump)
467+ j .Lep_startup_kdump
468+.Lep_startup_normal:
452469 basr %r13,0 # get base
453470 .LPG0:
454471 xc 0x200(256),0x200 # partially clear lowcore
455472 xc 0x300(256),0x300
473+ xc 0xe00(256),0xe00
456474 stck __LC_LAST_UPDATE_CLOCK
457475 spt 5f-.LPG0(%r13)
458476 mvc __LC_LAST_UPDATE_TIMER(8),5f-.LPG0(%r13)
@@ -534,6 +552,8 @@ ENTRY(startup) · 75 unmodified lines
534552 .align 8
535553 5: .long 0x7fffffff,0xffffffff
536554
555+#include "head_kdump.S"
556+
537557 #
538558 # params at 10400 (setup.h)
539559 #
@@ -541,6 +561,8 @@ ENTRY(startup) · 1 unmodified line
541561 .long 0,0 # IPL_DEVICE
542562 .long 0,0 # INITRD_START
543563 .long 0,0 # INITRD_SIZE
564+ .long 0,0 # OLDMEM_BASE
565+ .long 0,0 # OLDMEM_SIZE
544566
545567 .org COMMAND_LINE
546568 .byte "root=/dev/ram0 ro"
arch/s390/kernel/head31.S+1−1
@@ -92,7 +92,7 @@ ENTRY(_stext) · 91 unmodified lines
9292 .LPG3:
9393 # check control registers
9494 stctl %c0,%c15,0(%r15)
95− oi 2(%r15),0x40 # enable sigp emergency signal
95+ oi 2(%r15),0x60 # enable sigp emergency & external call
9696 oi 0(%r15),0x10 # switch on low address protection
9797 lctl %c0,%c15,0(%r15)
9898
arch/s390/kernel/head64.S+1−1
@@ -90,7 +90,7 @@ ENTRY(_stext) · 89 unmodified lines
9090 .LPG3:
9191 # check control registers
9292 stctg %c0,%c15,0(%r15)
93− oi 6(%r15),0x40 # enable sigp emergency signal
93+ oi 6(%r15),0x60 # enable sigp emergency & external call
9494 oi 4(%r15),0x10 # switch on low address proctection
9595 lctlg %c0,%c15,0(%r15)
9696
arch/s390/kernel/head_kdump.S+119−0
@@ -0,0 +1,119 @@
1+/*
2+ * S390 kdump lowlevel functions (new kernel)
3+ *
4+ * Copyright IBM Corp. 2011
5+ * Author(s): Michael Holzheu <holzheu@linux.vnet.ibm.com>
6+ */
7+
8+#define DATAMOVER_ADDR 0x4000
9+#define COPY_PAGE_ADDR 0x6000
10+
11+#ifdef CONFIG_CRASH_DUMP
12+
13+#
14+# kdump entry (new kernel - not yet relocated)
15+#
16+# Note: This code has to be position independent
17+#
18+
19+.align 2
20+.Lep_startup_kdump:
21+ lhi %r1,2 # mode 2 = esame (dump)
22+ sigp %r1,%r0,0x12 # Switch to esame mode
23+ sam64 # Switch to 64 bit addressing
24+ basr %r13,0
25+.Lbase:
26+ larl %r2,.Lbase_addr # Check, if we have been
27+ lg %r2,0(%r2) # already relocated:
28+ clgr %r2,%r13 #
29+ jne .Lrelocate # No : Start data mover
30+ lghi %r2,0 # Yes: Start kdump kernel
31+ brasl %r14,startup_kdump_relocated
32+
33+.Lrelocate:
34+ larl %r4,startup
35+ lg %r2,0x418(%r4) # Get kdump base
36+ lg %r3,0x420(%r4) # Get kdump size
37+
38+ larl %r10,.Lcopy_start # Source of data mover
39+ lghi %r8,DATAMOVER_ADDR # Target of data mover
40+ mvc 0(256,%r8),0(%r10) # Copy data mover code
41+
42+ agr %r8,%r2 # Copy data mover to
43+ mvc 0(256,%r8),0(%r10) # reserved mem
44+
45+ lghi %r14,DATAMOVER_ADDR # Jump to copied data mover
46+ basr %r14,%r14
47+.Lbase_addr:
48+ .quad .Lbase
49+
50+#
51+# kdump data mover code (runs at address DATAMOVER_ADDR)
52+#
53+# r2: kdump base address
54+# r3: kdump size
55+#
56+.Lcopy_start:
57+ basr %r13,0 # Base
58+0:
59+ lgr %r11,%r2 # Save kdump base address
60+ lgr %r12,%r2
61+ agr %r12,%r3 # Compute kdump end address
62+
63+ lghi %r5,0
64+ lghi %r10,COPY_PAGE_ADDR # Load copy page address
65+1:
66+ mvc 0(256,%r10),0(%r5) # Copy old kernel to tmp
67+ mvc 0(256,%r5),0(%r11) # Copy new kernel to old
68+ mvc 0(256,%r11),0(%r10) # Copy tmp to new
69+ aghi %r11,256
70+ aghi %r5,256
71+ clgr %r11,%r12
72+ jl 1b
73+
74+ lg %r14,.Lstartup_kdump-0b(%r13)
75+ basr %r14,%r14 # Start relocated kernel
76+.Lstartup_kdump:
77+ .long 0x00000000,0x00000000 + startup_kdump_relocated
78+.Lcopy_end:
79+
80+#
81+# Startup of kdump (relocated new kernel)
82+#
83+.align 2
84+startup_kdump_relocated:
85+ basr %r13,0
86+0:
87+ mvc 0(8,%r0),.Lrestart_psw-0b(%r13) # Setup restart PSW
88+ mvc 464(16,%r0),.Lpgm_psw-0b(%r13) # Setup pgm check PSW
89+ lhi %r1,1 # Start new kernel
90+ diag %r1,%r1,0x308 # with diag 308
91+
92+.Lno_diag308: # No diag 308
93+ sam31 # Switch to 31 bit addr mode
94+ sr %r1,%r1 # Erase register r1
95+ sr %r2,%r2 # Erase register r2
96+ sigp %r1,%r2,0x12 # Switch to 31 bit arch mode
97+ lpsw 0 # Start new kernel...
98+.align 8
99+.Lrestart_psw:
100+ .long 0x00080000,0x80000000 + startup
101+.Lpgm_psw:
102+ .quad 0x0000000180000000,0x0000000000000000 + .Lno_diag308
103+#else
104+.align 2
105+.Lep_startup_kdump:
106+#ifdef CONFIG_64BIT
107+ larl %r13,startup_kdump_crash
108+ lpswe 0(%r13)
109+.align 8
110+startup_kdump_crash:
111+ .quad 0x0002000080000000,0x0000000000000000 + startup_kdump_crash
112+#else
113+ basr %r13,0
114+0: lpsw startup_kdump_crash-0b(%r13)
115+.align 8
116+startup_kdump_crash:
117+ .long 0x000a0000,0x00000000 + startup_kdump_crash
118+#endif /* CONFIG_64BIT */
119+#endif /* CONFIG_CRASH_DUMP */
arch/s390/kernel/ipl.c+18−8
@@ -16,6 +16,7 @@ · 15 unmodified lines
1616 #include <linux/ctype.h>
1717 #include <linux/fs.h>
1818 #include <linux/gfp.h>
19+#include <linux/crash_dump.h>
1920 #include <asm/ipl.h>
2021 #include <asm/smp.h>
2122 #include <asm/setup.h>
@@ -26,6 +27,7 @@ · 4 unmodified lines
2627 #include <asm/sclp.h>
2728 #include <asm/sigp.h>
2829 #include <asm/checksum.h>
30+#include "entry.h"
2931
3032 #define IPL_PARM_BLOCK_VERSION 0
3133
@@ -275,8 +277,8 @@ static ssize_t ipl_type_show(struct kobject *kobj, struct kobj_attribute *attr, · 243 unmodified lines
275277 static struct kobj_attribute sys_ipl_type_attr = __ATTR_RO(ipl_type);
276278
277279 /* VM IPL PARM routines */
278−size_t reipl_get_ascii_vmparm(char *dest, size_t size,
279− const struct ipl_parameter_block *ipb)
280+static size_t reipl_get_ascii_vmparm(char *dest, size_t size,
281+ const struct ipl_parameter_block *ipb)
280282 {
281283 int i;
282284 size_t len;
@@ -338,8 +340,8 @@ static size_t scpdata_length(const char* buf, size_t count) · 55 unmodified lines
338340 return count;
339341 }
340342
341−size_t reipl_append_ascii_scpdata(char *dest, size_t size,
342− const struct ipl_parameter_block *ipb)
343+static size_t reipl_append_ascii_scpdata(char *dest, size_t size,
344+ const struct ipl_parameter_block *ipb)
343345 {
344346 size_t count;
345347 size_t i;
@@ -1738,7 +1740,11 @@ static struct kobj_attribute on_restart_attr = · 1392 unmodified lines
17381740
17391741 void do_restart(void)
17401742 {
1743+ smp_restart_with_online_cpu();
17411744 smp_send_stop();
1745+#ifdef CONFIG_CRASH_DUMP
1746+ crash_kexec(NULL);
1747+#endif
17421748 on_restart_trigger.action->fn(&on_restart_trigger);
17431749 stop_run(&on_restart_trigger);
17441750 }
@@ -2009,7 +2015,7 @@ static void do_reset_calls(void) · 264 unmodified lines
20092015
20102016 u32 dump_prefix_page;
20112017
2012−void s390_reset_system(void)
2018+void s390_reset_system(void (*func)(void *), void *data)
20132019 {
20142020 struct _lowcore *lc;
20152021
@@ -2028,15 +2034,19 @@ void s390_reset_system(void) · 12 unmodified lines
20282034 __ctl_clear_bit(0,28);
20292035
20302036 /* Set new machine check handler */
2031− S390_lowcore.mcck_new_psw.mask = psw_kernel_bits & ~PSW_MASK_MCHECK;
2037+ S390_lowcore.mcck_new_psw.mask = psw_kernel_bits | PSW_MASK_DAT;
20322038 S390_lowcore.mcck_new_psw.addr =
20332039 PSW_ADDR_AMODE | (unsigned long) s390_base_mcck_handler;
20342040
20352041 /* Set new program check handler */
2036− S390_lowcore.program_new_psw.mask = psw_kernel_bits & ~PSW_MASK_MCHECK;
2042+ S390_lowcore.program_new_psw.mask = psw_kernel_bits | PSW_MASK_DAT;
20372043 S390_lowcore.program_new_psw.addr =
20382044 PSW_ADDR_AMODE | (unsigned long) s390_base_pgm_handler;
20392045
2046+ /* Store status at absolute zero */
2047+ store_status();
2048+
20402049 do_reset_calls();
2050+ if (func)
2051+ func(data);
20412052 }
2042−
arch/s390/kernel/irq.c+4−2
@@ -33,7 +33,8 @@ static const struct irq_class intrclass_names[] = { · 32 unmodified lines
3333 {.name = "EXT" },
3434 {.name = "I/O" },
3535 {.name = "CLK", .desc = "[EXT] Clock Comparator" },
36− {.name = "IPI", .desc = "[EXT] Signal Processor" },
36+ {.name = "EXC", .desc = "[EXT] External Call" },
37+ {.name = "EMS", .desc = "[EXT] Emergency Signal" },
3738 {.name = "TMR", .desc = "[EXT] CPU Timer" },
3839 {.name = "TAL", .desc = "[EXT] Timing Alert" },
3940 {.name = "PFL", .desc = "[EXT] Pseudo Page Fault" },
@@ -42,8 +43,8 @@ static const struct irq_class intrclass_names[] = { · 2 unmodified lines
4243 {.name = "SCP", .desc = "[EXT] Service Call" },
4344 {.name = "IUC", .desc = "[EXT] IUCV" },
4445 {.name = "CPM", .desc = "[EXT] CPU Measurement" },
46+ {.name = "CIO", .desc = "[I/O] Common I/O Layer Interrupt" },
4547 {.name = "QAI", .desc = "[I/O] QDIO Adapter Interrupt" },
46− {.name = "QDI", .desc = "[I/O] QDIO Interrupt" },
4748 {.name = "DAS", .desc = "[I/O] DASD" },
4849 {.name = "C15", .desc = "[I/O] 3215" },
4950 {.name = "C70", .desc = "[I/O] 3270" },
@@ -53,6 +54,7 @@ static const struct irq_class intrclass_names[] = { · 3 unmodified lines
5354 {.name = "CLW", .desc = "[I/O] CLAW" },
5455 {.name = "CTC", .desc = "[I/O] CTC" },
5556 {.name = "APB", .desc = "[I/O] AP Bus" },
57+ {.name = "CSC", .desc = "[I/O] CHSC Subchannel" },
5658 {.name = "NMI", .desc = "[NMI] Machine Check" },
5759 };
5860
arch/s390/kernel/kprobes.c+1−1
@@ -635,7 +635,7 @@ void __kprobes jprobe_return(void) · 634 unmodified lines
635635 asm volatile(".word 0x0002");
636636 }
637637
638−void __kprobes jprobe_return_end(void)
638+static void __used __kprobes jprobe_return_end(void)
639639 {
640640 asm volatile("bcr 0,0");
641641 }
arch/s390/kernel/machine_kexec.c+186−6
@@ -1,10 +1,11 @@
11 /*
22 * arch/s390/kernel/machine_kexec.c
33 *
4− * Copyright IBM Corp. 2005,2006
4+ * Copyright IBM Corp. 2005,2011
55 *
66 * Author(s): Rolf Adelsberger,
77 * Heiko Carstens <heiko.carstens@de.ibm.com>
8+ * Michael Holzheu <holzheu@linux.vnet.ibm.com>
89 */
910
1011 #include <linux/device.h>
@@ -21,12 +22,162 @@ · 10 unmodified lines
2122 #include <asm/smp.h>
2223 #include <asm/reset.h>
2324 #include <asm/ipl.h>
25+#include <asm/diag.h>
26+#include <asm/asm-offsets.h>
2427
2528 typedef void (*relocate_kernel_t)(kimage_entry_t *, unsigned long);
2629
2730 extern const unsigned char relocate_kernel[];
2831 extern const unsigned long long relocate_kernel_len;
2932
33+#ifdef CONFIG_CRASH_DUMP
34+
35+void *fill_cpu_elf_notes(void *ptr, struct save_area *sa);
36+
37+/*
38+ * Create ELF notes for one CPU
39+ */
40+static void add_elf_notes(int cpu)
41+{
42+ struct save_area *sa = (void *) 4608 + store_prefix();
43+ void *ptr;
44+
45+ memcpy((void *) (4608UL + sa->pref_reg), sa, sizeof(*sa));
46+ ptr = (u64 *) per_cpu_ptr(crash_notes, cpu);
47+ ptr = fill_cpu_elf_notes(ptr, sa);
48+ memset(ptr, 0, sizeof(struct elf_note));
49+}
50+
51+/*
52+ * Store status of next available physical CPU
53+ */
54+static int store_status_next(int start_cpu, int this_cpu)
55+{
56+ struct save_area *sa = (void *) 4608 + store_prefix();
57+ int cpu, rc;
58+
59+ for (cpu = start_cpu; cpu < 65536; cpu++) {
60+ if (cpu == this_cpu)
61+ continue;
62+ do {
63+ rc = raw_sigp(cpu, sigp_stop_and_store_status);
64+ } while (rc == sigp_busy);
65+ if (rc != sigp_order_code_accepted)
66+ continue;
67+ if (sa->pref_reg)
68+ return cpu;
69+ }
70+ return -1;
71+}
72+
73+/*
74+ * Initialize CPU ELF notes
75+ */
76+void setup_regs(void)
77+{
78+ unsigned long sa = S390_lowcore.prefixreg_save_area + SAVE_AREA_BASE;
79+ int cpu, this_cpu, phys_cpu = 0, first = 1;
80+
81+ this_cpu = stap();
82+
83+ if (!S390_lowcore.prefixreg_save_area)
84+ first = 0;
85+ for_each_online_cpu(cpu) {
86+ if (first) {
87+ add_elf_notes(cpu);
88+ first = 0;
89+ continue;
90+ }
91+ phys_cpu = store_status_next(phys_cpu, this_cpu);
92+ if (phys_cpu == -1)
93+ break;
94+ add_elf_notes(cpu);
95+ phys_cpu++;
96+ }
97+ /* Copy dump CPU store status info to absolute zero */
98+ memcpy((void *) SAVE_AREA_BASE, (void *) sa, sizeof(struct save_area));
99+}
100+
101+#endif
102+
103+/*
104+ * Start kdump: We expect here that a store status has been done on our CPU
105+ */
106+static void __do_machine_kdump(void *image)
107+{
108+#ifdef CONFIG_CRASH_DUMP
109+ int (*start_kdump)(int) = (void *)((struct kimage *) image)->start;
110+
111+ __load_psw_mask(PSW_MASK_BASE | PSW_DEFAULT_KEY | PSW_MASK_EA | PSW_MASK_BA);
112+ setup_regs();
113+ start_kdump(1);
114+#endif
115+}
116+
117+/*
118+ * Check if kdump checksums are valid: We call purgatory with parameter "0"
119+ */
120+static int kdump_csum_valid(struct kimage *image)
121+{
122+#ifdef CONFIG_CRASH_DUMP
123+ int (*start_kdump)(int) = (void *)image->start;
124+ int rc;
125+
126+ __arch_local_irq_stnsm(0xfb); /* disable DAT */
127+ rc = start_kdump(0);
128+ __arch_local_irq_stosm(0x04); /* enable DAT */
129+ return rc ? 0 : -EINVAL;
130+#else
131+ return -EINVAL;
132+#endif
133+}
134+
135+/*
136+ * Map or unmap crashkernel memory
137+ */
138+static void crash_map_pages(int enable)
139+{
140+ unsigned long size = resource_size(&crashk_res);
141+
142+ BUG_ON(crashk_res.start % KEXEC_CRASH_MEM_ALIGN ||
143+ size % KEXEC_CRASH_MEM_ALIGN);
144+ if (enable)
145+ vmem_add_mapping(crashk_res.start, size);
146+ else
147+ vmem_remove_mapping(crashk_res.start, size);
148+}
149+
150+/*
151+ * Map crashkernel memory
152+ */
153+void crash_map_reserved_pages(void)
154+{
155+ crash_map_pages(1);
156+}
157+
158+/*
159+ * Unmap crashkernel memory
160+ */
161+void crash_unmap_reserved_pages(void)
162+{
163+ crash_map_pages(0);
164+}
165+
166+/*
167+ * Give back memory to hypervisor before new kdump is loaded
168+ */
169+static int machine_kexec_prepare_kdump(void)
170+{
171+#ifdef CONFIG_CRASH_DUMP
172+ if (MACHINE_IS_VM)
173+ diag10_range(PFN_DOWN(crashk_res.start),
174+ PFN_DOWN(crashk_res.end - crashk_res.start + 1));
175+ return 0;
176+#else
177+ return -EINVAL;
178+#endif
179+}
180+
30181 int machine_kexec_prepare(struct kimage *image)
31182 {
32183 void *reboot_code_buffer;
@@ -35,6 +186,9 @@ int machine_kexec_prepare(struct kimage *image) · 2 unmodified lines
35186 if (ipl_flags & IPL_NSS_VALID)
36187 return -ENOSYS;
37188
189+ if (image->type == KEXEC_TYPE_CRASH)
190+ return machine_kexec_prepare_kdump();
191+
38192 /* We don't support anything but the default image type for now. */
39193 if (image->type != KEXEC_TYPE_DEFAULT)
40194 return -EINVAL;
@@ -51,27 +205,53 @@ void machine_kexec_cleanup(struct kimage *image) · 10 unmodified lines
51205 {
52206 }
53207
208+void arch_crash_save_vmcoreinfo(void)
209+{
210+ VMCOREINFO_SYMBOL(lowcore_ptr);
211+ VMCOREINFO_LENGTH(lowcore_ptr, NR_CPUS);
212+}
213+
54214 void machine_shutdown(void)
55215 {
56216 }
57217
58−static void __machine_kexec(void *data)
218+/*
219+ * Do normal kexec
220+ */
221+static void __do_machine_kexec(void *data)
59222 {
60223 relocate_kernel_t data_mover;
61224 struct kimage *image = data;
62225
63− pfault_fini();
64− s390_reset_system();
65−
66226 data_mover = (relocate_kernel_t) page_to_phys(image->control_code_page);
67227
68228 /* Call the moving routine */
69229 (*data_mover)(&image->head, image->start);
70− for (;;);
71230 }
72231
232+/*
233+ * Reset system and call either kdump or normal kexec
234+ */
235+static void __machine_kexec(void *data)
236+{
237+ struct kimage *image = data;
238+
239+ pfault_fini();
240+ if (image->type == KEXEC_TYPE_CRASH)
241+ s390_reset_system(__do_machine_kdump, data);
242+ else
243+ s390_reset_system(__do_machine_kexec, data);
244+ disabled_wait((unsigned long) __builtin_return_address(0));
245+}
246+
247+/*
248+ * Do either kdump or normal kexec. In case of kdump we first ask
249+ * purgatory, if kdump checksums are valid.
250+ */
73251 void machine_kexec(struct kimage *image)
74252 {
253+ if (image->type == KEXEC_TYPE_CRASH && !kdump_csum_valid(image))
254+ return;
75255 tracer_disable();
76256 smp_send_stop();
77257 smp_switch_to_ipl_cpu(__machine_kexec, image);
arch/s390/kernel/mem_detect.c+69−0
@@ -62,3 +62,72 @@ void detect_memory_layout(struct mem_chunk chunk[]) · 61 unmodified lines
6262 arch_local_irq_restore(flags);
6363 }
6464 EXPORT_SYMBOL(detect_memory_layout);
65+
66+/*
67+ * Create memory hole with given address, size, and type
68+ */
69+void create_mem_hole(struct mem_chunk chunks[], unsigned long addr,
70+ unsigned long size, int type)
71+{
72+ unsigned long start, end, new_size;
73+ int i;
74+
75+ for (i = 0; i < MEMORY_CHUNKS; i++) {
76+ if (chunks[i].size == 0)
77+ continue;
78+ if (addr + size < chunks[i].addr)
79+ continue;
80+ if (addr >= chunks[i].addr + chunks[i].size)
81+ continue;
82+ start = max(addr, chunks[i].addr);
83+ end = min(addr + size, chunks[i].addr + chunks[i].size);
84+ new_size = end - start;
85+ if (new_size == 0)
86+ continue;
87+ if (start == chunks[i].addr &&
88+ end == chunks[i].addr + chunks[i].size) {
89+ /* Remove chunk */
90+ chunks[i].type = type;
91+ } else if (start == chunks[i].addr) {
92+ /* Make chunk smaller at start */
93+ if (i >= MEMORY_CHUNKS - 1)
94+ panic("Unable to create memory hole");
95+ memmove(&chunks[i + 1], &chunks[i],
96+ sizeof(struct mem_chunk) *
97+ (MEMORY_CHUNKS - (i + 1)));
98+ chunks[i + 1].addr = chunks[i].addr + new_size;
99+ chunks[i + 1].size = chunks[i].size - new_size;
100+ chunks[i].size = new_size;
101+ chunks[i].type = type;
102+ i += 1;
103+ } else if (end == chunks[i].addr + chunks[i].size) {
104+ /* Make chunk smaller at end */
105+ if (i >= MEMORY_CHUNKS - 1)
106+ panic("Unable to create memory hole");
107+ memmove(&chunks[i + 1], &chunks[i],
108+ sizeof(struct mem_chunk) *
109+ (MEMORY_CHUNKS - (i + 1)));
110+ chunks[i + 1].addr = start;
111+ chunks[i + 1].size = new_size;
112+ chunks[i + 1].type = type;
113+ chunks[i].size -= new_size;
114+ i += 1;
115+ } else {
116+ /* Create memory hole */
117+ if (i >= MEMORY_CHUNKS - 2)
118+ panic("Unable to create memory hole");
119+ memmove(&chunks[i + 2], &chunks[i],
120+ sizeof(struct mem_chunk) *
121+ (MEMORY_CHUNKS - (i + 2)));
122+ chunks[i + 1].addr = addr;
123+ chunks[i + 1].size = size;
124+ chunks[i + 1].type = type;
125+ chunks[i + 2].addr = addr + size;
126+ chunks[i + 2].size =
127+ chunks[i].addr + chunks[i].size - (addr + size);
128+ chunks[i + 2].type = chunks[i].type;
129+ chunks[i].size = addr - chunks[i].addr;
130+ i += 2;
131+ }
132+ }
133+}
arch/s390/kernel/process.c+3−1
@@ -12,6 +12,7 @@ · 11 unmodified lines
1212 #include <linux/sched.h>
1313 #include <linux/kernel.h>
1414 #include <linux/mm.h>
15+#include <linux/elfcore.h>
1516 #include <linux/smp.h>
1617 #include <linux/slab.h>
1718 #include <linux/interrupt.h>
@@ -117,7 +118,8 @@ int kernel_thread(int (*fn)(void *), void * arg, unsigned long flags) · 99 unmodified lines
117118 struct pt_regs regs;
118119
119120 memset(&regs, 0, sizeof(regs));
120− regs.psw.mask = psw_kernel_bits | PSW_MASK_IO | PSW_MASK_EXT;
121+ regs.psw.mask = psw_kernel_bits |
122+ PSW_MASK_DAT | PSW_MASK_IO | PSW_MASK_EXT | PSW_MASK_MCHECK;
121123 regs.psw.addr = (unsigned long) kernel_thread_starter | PSW_ADDR_AMODE;
122124 regs.gprs[9] = (unsigned long) fn;
123125 regs.gprs[10] = (unsigned long) arg;
arch/s390/kernel/processor.c+1−1
@@ -74,7 +74,7 @@ static int show_cpuinfo(struct seq_file *m, void *v) · 73 unmodified lines
7474
7575 static void *c_start(struct seq_file *m, loff_t *pos)
7676 {
77− return *pos < NR_CPUS ? (void *)((unsigned long) *pos + 1) : NULL;
77+ return *pos < nr_cpu_ids ? (void *)((unsigned long) *pos + 1) : NULL;
7878 }
7979
8080 static void *c_next(struct seq_file *m, void *v, loff_t *pos)
arch/s390/kernel/ptrace.c+85−39
@@ -42,34 +42,37 @@ enum s390_regset { · 41 unmodified lines
4242 REGSET_GENERAL,
4343 REGSET_FP,
4444 REGSET_LAST_BREAK,
45+ REGSET_SYSTEM_CALL,
4546 REGSET_GENERAL_EXTENDED,
4647 };
4748
4849 void update_per_regs(struct task_struct *task)
4950 {
50− static const struct per_regs per_single_step = {
51− .control = PER_EVENT_IFETCH,
52− .start = 0,
53− .end = PSW_ADDR_INSN,
54− };
5551 struct pt_regs *regs = task_pt_regs(task);
5652 struct thread_struct *thread = &task->thread;
57− const struct per_regs *new;
58− struct per_regs old;
59−
60− /* TIF_SINGLE_STEP overrides the user specified PER registers. */
61− new = test_tsk_thread_flag(task, TIF_SINGLE_STEP) ?
62− &per_single_step : &thread->per_user;
53+ struct per_regs old, new;
54+
55+ /* Copy user specified PER registers */
56+ new.control = thread->per_user.control;
57+ new.start = thread->per_user.start;
58+ new.end = thread->per_user.end;
59+
60+ /* merge TIF_SINGLE_STEP into user specified PER registers. */
61+ if (test_tsk_thread_flag(task, TIF_SINGLE_STEP)) {
62+ new.control |= PER_EVENT_IFETCH;
63+ new.start = 0;
64+ new.end = PSW_ADDR_INSN;
65+ }
6366
6467 /* Take care of the PER enablement bit in the PSW. */
65− if (!(new->control & PER_EVENT_MASK)) {
68+ if (!(new.control & PER_EVENT_MASK)) {
6669 regs->psw.mask &= ~PSW_MASK_PER;
6770 return;
6871 }
6972 regs->psw.mask |= PSW_MASK_PER;
7073 __ctl_store(old, 9, 11);
71− if (memcmp(new, &old, sizeof(struct per_regs)) != 0)
72− __ctl_load(*new, 9, 11);
74+ if (memcmp(&new, &old, sizeof(struct per_regs)) != 0)
75+ __ctl_load(new, 9, 11);
7376 }
7477
7578 void user_enable_single_step(struct task_struct *task)
@@ -166,8 +169,8 @@ static unsigned long __peek_user(struct task_struct *child, addr_t addr) · 90 unmodified lines
166169 */
167170 tmp = *(addr_t *)((addr_t) &task_pt_regs(child)->psw + addr);
168171 if (addr == (addr_t) &dummy->regs.psw.mask)
169− /* Remove per bit from user psw. */
170− tmp &= ~PSW_MASK_PER;
172+ /* Return a clean psw mask. */
173+ tmp = psw_user_bits | (tmp & PSW_MASK_USER);
171174
172175 } else if (addr < (addr_t) &dummy->regs.orig_gpr2) {
173176 /*
@@ -289,18 +292,17 @@ static int __poke_user(struct task_struct *child, addr_t addr, addr_t data) · 115 unmodified lines
289292 * psw and gprs are stored on the stack
290293 */
291294 if (addr == (addr_t) &dummy->regs.psw.mask &&
292−#ifdef CONFIG_COMPAT
293− data != PSW_MASK_MERGE(psw_user32_bits, data) &&
294−#endif
295− data != PSW_MASK_MERGE(psw_user_bits, data))
295+ ((data & ~PSW_MASK_USER) != psw_user_bits ||
296+ ((data & PSW_MASK_EA) && !(data & PSW_MASK_BA))))
296297 /* Invalid psw mask. */
297298 return -EINVAL;
298−#ifndef CONFIG_64BIT
299299 if (addr == (addr_t) &dummy->regs.psw.addr)
300− /* I'd like to reject addresses without the
301− high order bit but older gdb's rely on it */
302− data |= PSW_ADDR_AMODE;
303−#endif
300+ /*
301+ * The debugger changed the instruction address,
302+ * reset system call restart, see signal.c:do_signal
303+ */
304+ task_thread_info(child)->system_call = 0;
305+
304306 *(addr_t *)((addr_t) &task_pt_regs(child)->psw + addr) = data;
305307
306308 } else if (addr < (addr_t) (&dummy->regs.orig_gpr2)) {
@@ -495,21 +497,21 @@ static u32 __peek_user_compat(struct task_struct *child, addr_t addr) · 188 unmodified lines
495497 __u32 tmp;
496498
497499 if (addr < (addr_t) &dummy32->regs.acrs) {
500+ struct pt_regs *regs = task_pt_regs(child);
498501 /*
499502 * psw and gprs are stored on the stack
500503 */
501504 if (addr == (addr_t) &dummy32->regs.psw.mask) {
502505 /* Fake a 31 bit psw mask. */
503− tmp = (__u32)(task_pt_regs(child)->psw.mask >> 32);
504− tmp = PSW32_MASK_MERGE(psw32_user_bits, tmp);
506+ tmp = (__u32)(regs->psw.mask >> 32);
507+ tmp = psw32_user_bits | (tmp & PSW32_MASK_USER);
505508 } else if (addr == (addr_t) &dummy32->regs.psw.addr) {
506509 /* Fake a 31 bit psw address. */
507− tmp = (__u32) task_pt_regs(child)->psw.addr |
508− PSW32_ADDR_AMODE31;
510+ tmp = (__u32) regs->psw.addr |
511+ (__u32)(regs->psw.mask & PSW_MASK_BA);
509512 } else {
510513 /* gpr 0-15 */
511− tmp = *(__u32 *)((addr_t) &task_pt_regs(child)->psw +
512− addr*2 + 4);
514+ tmp = *(__u32 *)((addr_t) &regs->psw + addr*2 + 4);
513515 }
514516 } else if (addr < (addr_t) (&dummy32->regs.orig_gpr2)) {
515517 /*
@@ -594,24 +596,32 @@ static int __poke_user_compat(struct task_struct *child, · 78 unmodified lines
594596 addr_t offset;
595597
596598 if (addr < (addr_t) &dummy32->regs.acrs) {
599+ struct pt_regs *regs = task_pt_regs(child);
597600 /*
598601 * psw, gprs, acrs and orig_gpr2 are stored on the stack
599602 */
600603 if (addr == (addr_t) &dummy32->regs.psw.mask) {
601604 /* Build a 64 bit psw mask from 31 bit mask. */
602− if (tmp != PSW32_MASK_MERGE(psw32_user_bits, tmp))
605+ if ((tmp & ~PSW32_MASK_USER) != psw32_user_bits)
603606 /* Invalid psw mask. */
604607 return -EINVAL;
605− task_pt_regs(child)->psw.mask =
606− PSW_MASK_MERGE(psw_user32_bits, (__u64) tmp << 32);
608+ regs->psw.mask = (regs->psw.mask & ~PSW_MASK_USER) |
609+ (regs->psw.mask & PSW_MASK_BA) |
610+ (__u64)(tmp & PSW32_MASK_USER) << 32;
607611 } else if (addr == (addr_t) &dummy32->regs.psw.addr) {
608612 /* Build a 64 bit psw address from 31 bit address. */
609− task_pt_regs(child)->psw.addr =
610− (__u64) tmp & PSW32_ADDR_INSN;
613+ regs->psw.addr = (__u64) tmp & PSW32_ADDR_INSN;
614+ /* Transfer 31 bit amode bit to psw mask. */
615+ regs->psw.mask = (regs->psw.mask & ~PSW_MASK_BA) |
616+ (__u64)(tmp & PSW32_ADDR_AMODE);
617+ /*
618+ * The debugger changed the instruction address,
619+ * reset system call restart, see signal.c:do_signal
620+ */
621+ task_thread_info(child)->system_call = 0;
611622 } else {
612623 /* gpr 0-15 */
613− *(__u32*)((addr_t) &task_pt_regs(child)->psw
614− + addr*2 + 4) = tmp;
624+ *(__u32*)((addr_t) &regs->psw + addr*2 + 4) = tmp;
615625 }
616626 } else if (addr < (addr_t) (&dummy32->regs.orig_gpr2)) {
617627 /*
@@ -735,7 +745,7 @@ asmlinkage long do_syscall_trace_enter(struct pt_regs *regs) · 117 unmodified lines
735745 * debugger stored an invalid system call number. Skip
736746 * the system call and the system call restart handling.
737747 */
738− regs->svcnr = 0;
748+ clear_thread_flag(TIF_SYSCALL);
739749 ret = -1;
740750 }
741751
@@ -897,6 +907,26 @@ static int s390_last_break_get(struct task_struct *target, · 155 unmodified lines
897907
898908 #endif
899909
910+static int s390_system_call_get(struct task_struct *target,
911+ const struct user_regset *regset,
912+ unsigned int pos, unsigned int count,
913+ void *kbuf, void __user *ubuf)
914+{
915+ unsigned int *data = &task_thread_info(target)->system_call;
916+ return user_regset_copyout(&pos, &count, &kbuf, &ubuf,
917+ data, 0, sizeof(unsigned int));
918+}
919+
920+static int s390_system_call_set(struct task_struct *target,
921+ const struct user_regset *regset,
922+ unsigned int pos, unsigned int count,
923+ const void *kbuf, const void __user *ubuf)
924+{
925+ unsigned int *data = &task_thread_info(target)->system_call;
926+ return user_regset_copyin(&pos, &count, &kbuf, &ubuf,
927+ data, 0, sizeof(unsigned int));
928+}
929+
900930 static const struct user_regset s390_regsets[] = {
901931 [REGSET_GENERAL] = {
902932 .core_note_type = NT_PRSTATUS,
@@ -923,6 +953,14 @@ static const struct user_regset s390_regsets[] = { · 20 unmodified lines
923953 .get = s390_last_break_get,
924954 },
925955 #endif
956+ [REGSET_SYSTEM_CALL] = {
957+ .core_note_type = NT_S390_SYSTEM_CALL,
958+ .n = 1,
959+ .size = sizeof(unsigned int),
960+ .align = sizeof(unsigned int),
961+ .get = s390_system_call_get,
962+ .set = s390_system_call_set,
963+ },
926964 };
927965
928966 static const struct user_regset_view user_s390_view = {
@@ -1102,6 +1140,14 @@ static const struct user_regset s390_compat_regsets[] = { · 173 unmodified lines
11021140 .align = sizeof(long),
11031141 .get = s390_compat_last_break_get,
11041142 },
1143+ [REGSET_SYSTEM_CALL] = {
1144+ .core_note_type = NT_S390_SYSTEM_CALL,
1145+ .n = 1,
1146+ .size = sizeof(compat_uint_t),
1147+ .align = sizeof(compat_uint_t),
1148+ .get = s390_system_call_get,
1149+ .set = s390_system_call_set,
1150+ },
11051151 [REGSET_GENERAL_EXTENDED] = {
11061152 .core_note_type = NT_S390_HIGH_GPRS,
11071153 .n = sizeof(s390_compat_regs_high) / sizeof(compat_long_t),
arch/s390/kernel/reipl.S+6−0
@@ -9,6 +9,12 @@ · 8 unmodified lines
99 #include <linux/linkage.h>
1010 #include <asm/asm-offsets.h>
1111
12+#
13+# store_status: Empty implementation until kdump is supported on 31 bit
14+#
15+ENTRY(store_status)
16+ br %r14
17+
1218 #
1319 # do_reipl_asm
1420 # Parameter: r2 = schid of reipl device
arch/s390/kernel/reipl64.S+6−3
@@ -17,11 +17,11 @@ · 16 unmodified lines
1717 #
1818 ENTRY(store_status)
1919 /* Save register one and load save area base */
20− stg %r1,__LC_SAVE_AREA_64(%r0)
20+ stg %r1,__LC_SAVE_AREA+120(%r0)
2121 lghi %r1,SAVE_AREA_BASE
2222 /* General purpose registers */
2323 stmg %r0,%r15,__LC_GPREGS_SAVE_AREA-SAVE_AREA_BASE(%r1)
24− lg %r2,__LC_SAVE_AREA_64(%r0)
24+ lg %r2,__LC_SAVE_AREA+120(%r0)
2525 stg %r2,__LC_GPREGS_SAVE_AREA-SAVE_AREA_BASE+8(%r1)
2626 /* Control registers */
2727 stctg %c0,%c15,__LC_CREGS_SAVE_AREA-SAVE_AREA_BASE(%r1)
@@ -62,8 +62,11 @@ ENTRY(store_status) · 34 unmodified lines
6262 larl %r2,store_status
6363 stg %r2,__LC_PSW_SAVE_AREA-SAVE_AREA_BASE + 8(%r1)
6464 br %r14
65−.align 8
65+
66+ .section .bss
67+ .align 8
6668 .Lclkcmp: .quad 0x0000000000000000
69+ .previous
6770
6871 #
6972 # do_reipl_asm
arch/s390/kernel/setup.c+244−31
@@ -42,6 +42,9 @@ · 41 unmodified lines
4242 #include <linux/reboot.h>
4343 #include <linux/topology.h>
4444 #include <linux/ftrace.h>
45+#include <linux/kexec.h>
46+#include <linux/crash_dump.h>
47+#include <linux/memory.h>
4548
4649 #include <asm/ipl.h>
4750 #include <asm/uaccess.h>
@@ -57,12 +60,13 @@ · 9 unmodified lines
5760 #include <asm/ebcdic.h>
5861 #include <asm/compat.h>
5962 #include <asm/kvm_virtio.h>
63+#include <asm/diag.h>
6064
61−long psw_kernel_bits = (PSW_BASE_BITS | PSW_MASK_DAT | PSW_ASC_PRIMARY |
62− PSW_MASK_MCHECK | PSW_DEFAULT_KEY);
63−long psw_user_bits = (PSW_BASE_BITS | PSW_MASK_DAT | PSW_ASC_HOME |
64− PSW_MASK_IO | PSW_MASK_EXT | PSW_MASK_MCHECK |
65− PSW_MASK_PSTATE | PSW_DEFAULT_KEY);
65+long psw_kernel_bits = PSW_DEFAULT_KEY | PSW_MASK_BASE | PSW_ASC_PRIMARY |
66+ PSW_MASK_EA | PSW_MASK_BA;
67+long psw_user_bits = PSW_MASK_DAT | PSW_MASK_IO | PSW_MASK_EXT |
68+ PSW_DEFAULT_KEY | PSW_MASK_BASE | PSW_MASK_MCHECK |
69+ PSW_MASK_PSTATE | PSW_ASC_HOME;
6670
6771 /*
6872 * User copy operations.
@@ -274,22 +278,14 @@ early_param("mem", early_parse_mem); · 205 unmodified lines
274278 unsigned int user_mode = HOME_SPACE_MODE;
275279 EXPORT_SYMBOL_GPL(user_mode);
276280
277−static int set_amode_and_uaccess(unsigned long user_amode,
278− unsigned long user32_amode)
281+static int set_amode_primary(void)
279282 {
280− psw_user_bits = PSW_BASE_BITS | PSW_MASK_DAT | user_amode |
281− PSW_MASK_IO | PSW_MASK_EXT | PSW_MASK_MCHECK |
282− PSW_MASK_PSTATE | PSW_DEFAULT_KEY;
283+ psw_kernel_bits = (psw_kernel_bits & ~PSW_MASK_ASC) | PSW_ASC_HOME;
284+ psw_user_bits = (psw_user_bits & ~PSW_MASK_ASC) | PSW_ASC_PRIMARY;
283285 #ifdef CONFIG_COMPAT
284− psw_user32_bits = PSW_BASE32_BITS | PSW_MASK_DAT | user_amode |
285− PSW_MASK_IO | PSW_MASK_EXT | PSW_MASK_MCHECK |
286− PSW_MASK_PSTATE | PSW_DEFAULT_KEY;
287− psw32_user_bits = PSW32_BASE_BITS | PSW32_MASK_DAT | user32_amode |
288− PSW32_MASK_IO | PSW32_MASK_EXT | PSW32_MASK_MCHECK |
289− PSW32_MASK_PSTATE;
286+ psw32_user_bits =
287+ (psw32_user_bits & ~PSW32_MASK_ASC) | PSW32_ASC_PRIMARY;
290288 #endif
291− psw_kernel_bits = PSW_BASE_BITS | PSW_MASK_DAT | PSW_ASC_HOME |
292− PSW_MASK_MCHECK | PSW_DEFAULT_KEY;
293289
294290 if (MACHINE_HAS_MVCOS) {
295291 memcpy(&uaccess, &uaccess_mvcos_switch, sizeof(uaccess));
@@ -325,7 +321,7 @@ early_param("user_mode", early_parse_user_mode); · 29 unmodified lines
325321 static void setup_addressing_mode(void)
326322 {
327323 if (user_mode == PRIMARY_SPACE_MODE) {
328− if (set_amode_and_uaccess(PSW_ASC_PRIMARY, PSW32_ASC_PRIMARY))
324+ if (set_amode_primary())
329325 pr_info("Address spaces switched, "
330326 "mvcos available\n");
331327 else
@@ -344,24 +340,25 @@ setup_lowcore(void) · 12 unmodified lines
344340 */
345341 BUILD_BUG_ON(sizeof(struct _lowcore) != LC_PAGES * 4096);
346342 lc = __alloc_bootmem_low(LC_PAGES * PAGE_SIZE, LC_PAGES * PAGE_SIZE, 0);
347− lc->restart_psw.mask = PSW_BASE_BITS | PSW_DEFAULT_KEY;
343+ lc->restart_psw.mask = psw_kernel_bits;
348344 lc->restart_psw.addr =
349345 PSW_ADDR_AMODE | (unsigned long) psw_restart_int_handler;
350− if (user_mode != HOME_SPACE_MODE)
351− lc->restart_psw.mask |= PSW_ASC_HOME;
352− lc->external_new_psw.mask = psw_kernel_bits;
346+ lc->external_new_psw.mask = psw_kernel_bits |
347+ PSW_MASK_DAT | PSW_MASK_MCHECK;
353348 lc->external_new_psw.addr =
354349 PSW_ADDR_AMODE | (unsigned long) ext_int_handler;
355− lc->svc_new_psw.mask = psw_kernel_bits | PSW_MASK_IO | PSW_MASK_EXT;
350+ lc->svc_new_psw.mask = psw_kernel_bits |
351+ PSW_MASK_DAT | PSW_MASK_IO | PSW_MASK_EXT | PSW_MASK_MCHECK;
356352 lc->svc_new_psw.addr = PSW_ADDR_AMODE | (unsigned long) system_call;
357− lc->program_new_psw.mask = psw_kernel_bits;
353+ lc->program_new_psw.mask = psw_kernel_bits |
354+ PSW_MASK_DAT | PSW_MASK_MCHECK;
358355 lc->program_new_psw.addr =
359− PSW_ADDR_AMODE | (unsigned long)pgm_check_handler;
360− lc->mcck_new_psw.mask =
361− psw_kernel_bits & ~PSW_MASK_MCHECK & ~PSW_MASK_DAT;
356+ PSW_ADDR_AMODE | (unsigned long) pgm_check_handler;
357+ lc->mcck_new_psw.mask = psw_kernel_bits;
362358 lc->mcck_new_psw.addr =
363359 PSW_ADDR_AMODE | (unsigned long) mcck_int_handler;
364− lc->io_new_psw.mask = psw_kernel_bits;
360+ lc->io_new_psw.mask = psw_kernel_bits |
361+ PSW_MASK_DAT | PSW_MASK_MCHECK;
365362 lc->io_new_psw.addr = PSW_ADDR_AMODE | (unsigned long) io_int_handler;
366363 lc->clock_comparator = -1ULL;
367364 lc->kernel_stack = ((unsigned long) &init_thread_union) + THREAD_SIZE;
@@ -435,10 +432,14 @@ static void __init setup_resources(void) · 67 unmodified lines
435432 for (i = 0; i < MEMORY_CHUNKS; i++) {
436433 if (!memory_chunk[i].size)
437434 continue;
435+ if (memory_chunk[i].type == CHUNK_OLDMEM ||
436+ memory_chunk[i].type == CHUNK_CRASHK)
437+ continue;
438438 res = alloc_bootmem_low(sizeof(*res));
439439 res->flags = IORESOURCE_BUSY | IORESOURCE_MEM;
440440 switch (memory_chunk[i].type) {
441441 case CHUNK_READ_WRITE:
442+ case CHUNK_CRASHK:
442443 res->name = "System RAM";
443444 break;
444445 case CHUNK_READ_ONLY:
@@ -479,6 +480,7 @@ static void __init setup_memory_end(void) · 34 unmodified lines
479480 unsigned long max_mem;
480481 int i;
481482
483+
482484 #ifdef CONFIG_ZFCPDUMP
483485 if (ipl_info.type == IPL_TYPE_FCP_DUMP) {
484486 memory_end = ZFCPDUMP_HSA_SIZE;
@@ -545,11 +547,201 @@ static void __init setup_restart_psw(void) · 60 unmodified lines
545547 * Setup restart PSW for absolute zero lowcore. This is necesary
546548 * if PSW restart is done on an offline CPU that has lowcore zero
547549 */
548− psw.mask = PSW_BASE_BITS | PSW_DEFAULT_KEY;
550+ psw.mask = PSW_DEFAULT_KEY | PSW_MASK_BASE | PSW_MASK_EA | PSW_MASK_BA;
549551 psw.addr = PSW_ADDR_AMODE | (unsigned long) psw_restart_int_handler;
550552 copy_to_absolute_zero(&S390_lowcore.restart_psw, &psw, sizeof(psw));
551553 }
552554
555+static void __init setup_vmcoreinfo(void)
556+{
557+#ifdef CONFIG_KEXEC
558+ unsigned long ptr = paddr_vmcoreinfo_note();
559+
560+ copy_to_absolute_zero(&S390_lowcore.vmcore_info, &ptr, sizeof(ptr));
561+#endif
562+}
563+
564+#ifdef CONFIG_CRASH_DUMP
565+
566+/*
567+ * Find suitable location for crashkernel memory
568+ */
569+static unsigned long __init find_crash_base(unsigned long crash_size,
570+ char **msg)
571+{
572+ unsigned long crash_base;
573+ struct mem_chunk *chunk;
574+ int i;
575+
576+ if (memory_chunk[0].size < crash_size) {
577+ *msg = "first memory chunk must be at least crashkernel size";
578+ return 0;
579+ }
580+ if (is_kdump_kernel() && (crash_size == OLDMEM_SIZE))
581+ return OLDMEM_BASE;
582+
583+ for (i = MEMORY_CHUNKS - 1; i >= 0; i--) {
584+ chunk = &memory_chunk[i];
585+ if (chunk->size == 0)
586+ continue;
587+ if (chunk->type != CHUNK_READ_WRITE)
588+ continue;
589+ if (chunk->size < crash_size)
590+ continue;
591+ crash_base = (chunk->addr + chunk->size) - crash_size;
592+ if (crash_base < crash_size)
593+ continue;
594+ if (crash_base < ZFCPDUMP_HSA_SIZE_MAX)
595+ continue;
596+ if (crash_base < (unsigned long) INITRD_START + INITRD_SIZE)
597+ continue;
598+ return crash_base;
599+ }
600+ *msg = "no suitable area found";
601+ return 0;
602+}
603+
604+/*
605+ * Check if crash_base and crash_size is valid
606+ */
607+static int __init verify_crash_base(unsigned long crash_base,
608+ unsigned long crash_size,
609+ char **msg)
610+{
611+ struct mem_chunk *chunk;
612+ int i;
613+
614+ /*
615+ * Because we do the swap to zero, we must have at least 'crash_size'
616+ * bytes free space before crash_base
617+ */
618+ if (crash_size > crash_base) {
619+ *msg = "crashkernel offset must be greater than size";
620+ return -EINVAL;
621+ }
622+
623+ /* First memory chunk must be at least crash_size */
624+ if (memory_chunk[0].size < crash_size) {
625+ *msg = "first memory chunk must be at least crashkernel size";
626+ return -EINVAL;
627+ }
628+ /* Check if we fit into the respective memory chunk */
629+ for (i = 0; i < MEMORY_CHUNKS; i++) {
630+ chunk = &memory_chunk[i];
631+ if (chunk->size == 0)
632+ continue;
633+ if (crash_base < chunk->addr)
634+ continue;
635+ if (crash_base >= chunk->addr + chunk->size)
636+ continue;
637+ /* we have found the memory chunk */
638+ if (crash_base + crash_size > chunk->addr + chunk->size) {
639+ *msg = "selected memory chunk is too small for "
640+ "crashkernel memory";
641+ return -EINVAL;
642+ }
643+ return 0;
644+ }
645+ *msg = "invalid memory range specified";
646+ return -EINVAL;
647+}
648+
649+/*
650+ * Reserve kdump memory by creating a memory hole in the mem_chunk array
651+ */
652+static void __init reserve_kdump_bootmem(unsigned long addr, unsigned long size,
653+ int type)
654+{
655+
656+ create_mem_hole(memory_chunk, addr, size, type);
657+}
658+
659+/*
660+ * When kdump is enabled, we have to ensure that no memory from
661+ * the area [0 - crashkernel memory size] and
662+ * [crashk_res.start - crashk_res.end] is set offline.
663+ */
664+static int kdump_mem_notifier(struct notifier_block *nb,
665+ unsigned long action, void *data)
666+{
667+ struct memory_notify *arg = data;
668+
669+ if (arg->start_pfn < PFN_DOWN(resource_size(&crashk_res)))
670+ return NOTIFY_BAD;
671+ if (arg->start_pfn > PFN_DOWN(crashk_res.end))
672+ return NOTIFY_OK;
673+ if (arg->start_pfn + arg->nr_pages - 1 < PFN_DOWN(crashk_res.start))
674+ return NOTIFY_OK;
675+ return NOTIFY_BAD;
676+}
677+
678+static struct notifier_block kdump_mem_nb = {
679+ .notifier_call = kdump_mem_notifier,
680+};
681+
682+#endif
683+
684+/*
685+ * Make sure that oldmem, where the dump is stored, is protected
686+ */
687+static void reserve_oldmem(void)
688+{
689+#ifdef CONFIG_CRASH_DUMP
690+ if (!OLDMEM_BASE)
691+ return;
692+
693+ reserve_kdump_bootmem(OLDMEM_BASE, OLDMEM_SIZE, CHUNK_OLDMEM);
694+ reserve_kdump_bootmem(OLDMEM_SIZE, memory_end - OLDMEM_SIZE,
695+ CHUNK_OLDMEM);
696+ if (OLDMEM_BASE + OLDMEM_SIZE == real_memory_size)
697+ saved_max_pfn = PFN_DOWN(OLDMEM_BASE) - 1;
698+ else
699+ saved_max_pfn = PFN_DOWN(real_memory_size) - 1;
700+#endif
701+}
702+
703+/*
704+ * Reserve memory for kdump kernel to be loaded with kexec
705+ */
706+static void __init reserve_crashkernel(void)
707+{
708+#ifdef CONFIG_CRASH_DUMP
709+ unsigned long long crash_base, crash_size;
710+ char *msg;
711+ int rc;
712+
713+ rc = parse_crashkernel(boot_command_line, memory_end, &crash_size,
714+ &crash_base);
715+ if (rc || crash_size == 0)
716+ return;
717+ crash_base = ALIGN(crash_base, KEXEC_CRASH_MEM_ALIGN);
718+ crash_size = ALIGN(crash_size, KEXEC_CRASH_MEM_ALIGN);
719+ if (register_memory_notifier(&kdump_mem_nb))
720+ return;
721+ if (!crash_base)
722+ crash_base = find_crash_base(crash_size, &msg);
723+ if (!crash_base) {
724+ pr_info("crashkernel reservation failed: %s\n", msg);
725+ unregister_memory_notifier(&kdump_mem_nb);
726+ return;
727+ }
728+ if (verify_crash_base(crash_base, crash_size, &msg)) {
729+ pr_info("crashkernel reservation failed: %s\n", msg);
730+ unregister_memory_notifier(&kdump_mem_nb);
731+ return;
732+ }
733+ if (!OLDMEM_BASE && MACHINE_IS_VM)
734+ diag10_range(PFN_DOWN(crash_base), PFN_DOWN(crash_size));
735+ crashk_res.start = crash_base;
736+ crashk_res.end = crash_base + crash_size - 1;
737+ insert_resource(&iomem_resource, &crashk_res);
738+ reserve_kdump_bootmem(crash_base, crash_size, CHUNK_CRASHK);
739+ pr_info("Reserving %lluMB of memory at %lluMB "
740+ "for crashkernel (System RAM: %luMB)\n",
741+ crash_size >> 20, crash_base >> 20, memory_end >> 20);
742+#endif
743+}
744+
553745 static void __init
554746 setup_memory(void)
555747 {
@@ -580,6 +772,14 @@ setup_memory(void) · 24 unmodified lines
580772 if (PFN_PHYS(start_pfn) + bmap_size > INITRD_START) {
581773 start = PFN_PHYS(start_pfn) + bmap_size + PAGE_SIZE;
582774
775+#ifdef CONFIG_CRASH_DUMP
776+ if (OLDMEM_BASE) {
777+ /* Move initrd behind kdump oldmem */
778+ if (start + INITRD_SIZE > OLDMEM_BASE &&
779+ start < OLDMEM_BASE + OLDMEM_SIZE)
780+ start = OLDMEM_BASE + OLDMEM_SIZE;
781+ }
782+#endif
583783 if (start + INITRD_SIZE > memory_end) {
584784 pr_err("initrd extends beyond end of "
585785 "memory (0x%08lx > 0x%08lx) "
@@ -610,7 +810,8 @@ setup_memory(void) · 24 unmodified lines
610810 for (i = 0; i < MEMORY_CHUNKS && memory_chunk[i].size > 0; i++) {
611811 unsigned long start_chunk, end_chunk, pfn;
612812
613− if (memory_chunk[i].type != CHUNK_READ_WRITE)
813+ if (memory_chunk[i].type != CHUNK_READ_WRITE &&
814+ memory_chunk[i].type != CHUNK_CRASHK)
614815 continue;
615816 start_chunk = PFN_DOWN(memory_chunk[i].addr);
616817 end_chunk = start_chunk + PFN_DOWN(memory_chunk[i].size);
@@ -644,6 +845,15 @@ setup_memory(void) · 27 unmodified lines
644845 reserve_bootmem(start_pfn << PAGE_SHIFT, bootmap_size,
645846 BOOTMEM_DEFAULT);
646847
848+#ifdef CONFIG_CRASH_DUMP
849+ if (crashk_res.start)
850+ reserve_bootmem(crashk_res.start,
851+ crashk_res.end - crashk_res.start + 1,
852+ BOOTMEM_DEFAULT);
853+ if (is_kdump_kernel())
854+ reserve_bootmem(elfcorehdr_addr - OLDMEM_BASE,
855+ PAGE_ALIGN(elfcorehdr_size), BOOTMEM_DEFAULT);
856+#endif
647857 #ifdef CONFIG_BLK_DEV_INITRD
648858 if (INITRD_START && INITRD_SIZE) {
649859 if (INITRD_START + INITRD_SIZE <= memory_end) {
@@ -812,8 +1022,11 @@ setup_arch(char **cmdline_p) · 162 unmodified lines
8121022 setup_ipl();
8131023 setup_memory_end();
8141024 setup_addressing_mode();
1025+ reserve_oldmem();
1026+ reserve_crashkernel();
8151027 setup_memory();
8161028 setup_resources();
1029+ setup_vmcoreinfo();
8171030 setup_restart_psw();
8181031 setup_lowcore();
8191032
arch/s390/kernel/signal.c+70−58
@@ -30,6 +30,7 @@ · 29 unmodified lines
3030 #include <asm/ucontext.h>
3131 #include <asm/uaccess.h>
3232 #include <asm/lowcore.h>
33+#include <asm/compat.h>
3334 #include "entry.h"
3435
3536 #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
@@ -116,7 +117,8 @@ static int save_sigregs(struct pt_regs *regs, _sigregs __user *sregs) · 80 unmodified lines
116117
117118 /* Copy a 'clean' PSW mask to the user to avoid leaking
118119 information about whether PER is currently on. */
119− user_sregs.regs.psw.mask = PSW_MASK_MERGE(psw_user_bits, regs->psw.mask);
120+ user_sregs.regs.psw.mask = psw_user_bits |
121+ (regs->psw.mask & PSW_MASK_USER);
120122 user_sregs.regs.psw.addr = regs->psw.addr;
121123 memcpy(&user_sregs.regs.gprs, &regs->gprs, sizeof(sregs->regs.gprs));
122124 memcpy(&user_sregs.regs.acrs, current->thread.acrs,
@@ -143,9 +145,13 @@ static int restore_sigregs(struct pt_regs *regs, _sigregs __user *sregs) · 20 unmodified lines
143145 err = __copy_from_user(&user_sregs, sregs, sizeof(_sigregs));
144146 if (err)
145147 return err;
146− regs->psw.mask = PSW_MASK_MERGE(regs->psw.mask,
147− user_sregs.regs.psw.mask);
148− regs->psw.addr = PSW_ADDR_AMODE | user_sregs.regs.psw.addr;
148+ /* Use regs->psw.mask instead of psw_user_bits to preserve PER bit. */
149+ regs->psw.mask = (regs->psw.mask & ~PSW_MASK_USER) |
150+ (user_sregs.regs.psw.mask & PSW_MASK_USER);
151+ /* Check for invalid amode */
152+ if (regs->psw.mask & PSW_MASK_EA)
153+ regs->psw.mask |= PSW_MASK_BA;
154+ regs->psw.addr = user_sregs.regs.psw.addr;
149155 memcpy(&regs->gprs, &user_sregs.regs.gprs, sizeof(sregs->regs.gprs));
150156 memcpy(&current->thread.acrs, &user_sregs.regs.acrs,
151157 sizeof(sregs->regs.acrs));
@@ -156,7 +162,7 @@ static int restore_sigregs(struct pt_regs *regs, _sigregs __user *sregs) · 4 unmodified lines
156162 current->thread.fp_regs.fpc &= FPC_VALID_MASK;
157163
158164 restore_fp_regs(&current->thread.fp_regs);
159− regs->svcnr = 0; /* disable syscall checks */
165+ clear_thread_flag(TIF_SYSCALL); /* No longer in a system call */
160166 return 0;
161167 }
162168
@@ -288,6 +294,7 @@ static int setup_frame(int sig, struct k_sigaction *ka, · 125 unmodified lines
288294
289295 /* Set up registers for signal handler */
290296 regs->gprs[15] = (unsigned long) frame;
297+ regs->psw.mask |= PSW_MASK_EA | PSW_MASK_BA; /* 64 bit amode */
291298 regs->psw.addr = (unsigned long) ka->sa.sa_handler | PSW_ADDR_AMODE;
292299
293300 regs->gprs[2] = map_signal(sig);
@@ -356,6 +363,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, · 62 unmodified lines
356363
357364 /* Set up registers for signal handler */
358365 regs->gprs[15] = (unsigned long) frame;
366+ regs->psw.mask |= PSW_MASK_EA | PSW_MASK_BA; /* 64 bit amode */
359367 regs->psw.addr = (unsigned long) ka->sa.sa_handler | PSW_ADDR_AMODE;
360368
361369 regs->gprs[2] = map_signal(sig);
@@ -401,7 +409,6 @@ static int handle_signal(unsigned long sig, struct k_sigaction *ka, · 39 unmodified lines
401409 */
402410 void do_signal(struct pt_regs *regs)
403411 {
404− unsigned long retval = 0, continue_addr = 0, restart_addr = 0;
405412 siginfo_t info;
406413 int signr;
407414 struct k_sigaction ka;
@@ -421,54 +428,45 @@ void do_signal(struct pt_regs *regs) · 13 unmodified lines
421428 else
422429 oldset = &current->blocked;
423430
424− /* Are we from a system call? */
425− if (regs->svcnr) {
426− continue_addr = regs->psw.addr;
427− restart_addr = continue_addr - regs->ilc;
428− retval = regs->gprs[2];
429−
430− /* Prepare for system call restart. We do this here so that a
431− debugger will see the already changed PSW. */
432− switch (retval) {
433− case -ERESTARTNOHAND:
434− case -ERESTARTSYS:
435− case -ERESTARTNOINTR:
436− regs->gprs[2] = regs->orig_gpr2;
437− regs->psw.addr = restart_addr;
438− break;
439− case -ERESTART_RESTARTBLOCK:
440− regs->gprs[2] = -EINTR;
441− }
442− regs->svcnr = 0; /* Don't deal with this again. */
443− }
444−
445− /* Get signal to deliver. When running under ptrace, at this point
446− the debugger may change all our registers ... */
431+ /*
432+ * Get signal to deliver. When running under ptrace, at this point
433+ * the debugger may change all our registers, including the system
434+ * call information.
435+ */
436+ current_thread_info()->system_call =
437+ test_thread_flag(TIF_SYSCALL) ? regs->svc_code : 0;
447438 signr = get_signal_to_deliver(&info, &ka, regs, NULL);
448439
449− /* Depending on the signal settings we may need to revert the
450− decision to restart the system call. */
451− if (signr > 0 && regs->psw.addr == restart_addr) {
452− if (retval == -ERESTARTNOHAND
453− || (retval == -ERESTARTSYS
454− && !(current->sighand->action[signr-1].sa.sa_flags
455− & SA_RESTART))) {
456− regs->gprs[2] = -EINTR;
457− regs->psw.addr = continue_addr;
458− }
459− }
460−
461440 if (signr > 0) {
462441 /* Whee! Actually deliver the signal. */
463− int ret;
464−#ifdef CONFIG_COMPAT
465− if (is_compat_task()) {
466− ret = handle_signal32(signr, &ka, &info, oldset, regs);
467− }
468− else
469−#endif
470− ret = handle_signal(signr, &ka, &info, oldset, regs);
471− if (!ret) {
442+ if (current_thread_info()->system_call) {
443+ regs->svc_code = current_thread_info()->system_call;
444+ /* Check for system call restarting. */
445+ switch (regs->gprs[2]) {
446+ case -ERESTART_RESTARTBLOCK:
447+ case -ERESTARTNOHAND:
448+ regs->gprs[2] = -EINTR;
449+ break;
450+ case -ERESTARTSYS:
451+ if (!(ka.sa.sa_flags & SA_RESTART)) {
452+ regs->gprs[2] = -EINTR;
453+ break;
454+ }
455+ /* fallthrough */
456+ case -ERESTARTNOINTR:
457+ regs->gprs[2] = regs->orig_gpr2;
458+ regs->psw.addr =
459+ __rewind_psw(regs->psw,
460+ regs->svc_code >> 16);
461+ break;
462+ }
463+ /* No longer in a system call */
464+ clear_thread_flag(TIF_SYSCALL);
465+ }
466+
467+ if ((is_compat_task() ?
468+ handle_signal32(signr, &ka, &info, oldset, regs) :
469+ handle_signal(signr, &ka, &info, oldset, regs)) == 0) {
472470 /*
473471 * A signal was successfully delivered; the saved
474472 * sigmask will have been stored in the signal frame,
@@ -482,11 +480,32 @@ void do_signal(struct pt_regs *regs) · 7 unmodified lines
482480 * Let tracing know that we've done the handler setup.
483481 */
484482 tracehook_signal_handler(signr, &info, &ka, regs,
485− test_thread_flag(TIF_SINGLE_STEP));
483+ test_thread_flag(TIF_SINGLE_STEP));
486484 }
487485 return;
488486 }
489487
488+ /* No handlers present - check for system call restart */
489+ if (current_thread_info()->system_call) {
490+ regs->svc_code = current_thread_info()->system_call;
491+ switch (regs->gprs[2]) {
492+ case -ERESTART_RESTARTBLOCK:
493+ /* Restart with sys_restart_syscall */
494+ regs->svc_code = __NR_restart_syscall;
495+ /* fallthrough */
496+ case -ERESTARTNOHAND:
497+ case -ERESTARTSYS:
498+ case -ERESTARTNOINTR:
499+ /* Restart system call with magic TIF bit. */
500+ regs->gprs[2] = regs->orig_gpr2;
501+ set_thread_flag(TIF_SYSCALL);
502+ break;
503+ default:
504+ clear_thread_flag(TIF_SYSCALL);
505+ break;
506+ }
507+ }
508+
490509 /*
491510 * If there's no signal to deliver, we just put the saved sigmask back.
492511 */
@@ -494,13 +513,6 @@ void do_signal(struct pt_regs *regs) · 1 unmodified line
494513 clear_thread_flag(TIF_RESTORE_SIGMASK);
495514 sigprocmask(SIG_SETMASK, &current->saved_sigmask, NULL);
496515 }
497−
498− /* Restart a different system call. */
499− if (retval == -ERESTART_RESTARTBLOCK
500− && regs->psw.addr == continue_addr) {
501− regs->gprs[2] = __NR_restart_syscall;
502− set_thread_flag(TIF_RESTART_SVC);
503− }
504516 }
505517
506518 void do_notify_resume(struct pt_regs *regs)
arch/s390/kernel/smp.c+64−9
@@ -38,6 +38,7 @@ · 37 unmodified lines
3838 #include <linux/timex.h>
3939 #include <linux/bootmem.h>
4040 #include <linux/slab.h>
41+#include <linux/crash_dump.h>
4142 #include <asm/asm-offsets.h>
4243 #include <asm/ipl.h>
4344 #include <asm/setup.h>
@@ -97,6 +98,29 @@ static inline int cpu_stopped(int cpu) · 53 unmodified lines
9798 return raw_cpu_stopped(cpu_logical_map(cpu));
9899 }
99100
101+/*
102+ * Ensure that PSW restart is done on an online CPU
103+ */
104+void smp_restart_with_online_cpu(void)
105+{
106+ int cpu;
107+
108+ for_each_online_cpu(cpu) {
109+ if (stap() == __cpu_logical_map[cpu]) {
110+ /* We are online: Enable DAT again and return */
111+ __load_psw_mask(psw_kernel_bits | PSW_MASK_DAT);
112+ return;
113+ }
114+ }
115+ /* We are not online: Do PSW restart on an online CPU */
116+ while (sigp(cpu, sigp_restart) == sigp_busy)
117+ cpu_relax();
118+ /* And stop ourself */
119+ while (raw_sigp(stap(), sigp_stop) == sigp_busy)
120+ cpu_relax();
121+ for (;;);
122+}
123+
100124 void smp_switch_to_ipl_cpu(void (*func)(void *), void *data)
101125 {
102126 struct _lowcore *lc, *current_lc;
@@ -106,14 +130,16 @@ void smp_switch_to_ipl_cpu(void (*func)(void *), void *data) · 3 unmodified lines
106130
107131 if (smp_processor_id() == 0)
108132 func(data);
109− __load_psw_mask(PSW_BASE_BITS | PSW_DEFAULT_KEY);
133+ __load_psw_mask(PSW_DEFAULT_KEY | PSW_MASK_BASE |
134+ PSW_MASK_EA | PSW_MASK_BA);
110135 /* Disable lowcore protection */
111136 __ctl_clear_bit(0, 28);
112137 current_lc = lowcore_ptr[smp_processor_id()];
113138 lc = lowcore_ptr[0];
114139 if (!lc)
115140 lc = current_lc;
116− lc->restart_psw.mask = PSW_BASE_BITS | PSW_DEFAULT_KEY;
141+ lc->restart_psw.mask =
142+ PSW_DEFAULT_KEY | PSW_MASK_BASE | PSW_MASK_EA | PSW_MASK_BA;
117143 lc->restart_psw.addr = PSW_ADDR_AMODE | (unsigned long) smp_restart_cpu;
118144 if (!cpu_online(0))
119145 smp_switch_to_cpu(func, data, 0, stap(), __cpu_logical_map[0]);
@@ -135,7 +161,7 @@ void smp_send_stop(void) · 15 unmodified lines
135161 int cpu, rc;
136162
137163 /* Disable all interrupts/machine checks */
138− __load_psw_mask(psw_kernel_bits & ~PSW_MASK_MCHECK);
164+ __load_psw_mask(psw_kernel_bits | PSW_MASK_DAT);
139165 trace_hardirqs_off();
140166
141167 /* stop all processors */
@@ -161,7 +187,10 @@ static void do_ext_call_interrupt(unsigned int ext_int_code, · 19 unmodified lines
161187 {
162188 unsigned long bits;
163189
164− kstat_cpu(smp_processor_id()).irqs[EXTINT_IPI]++;
190+ if (ext_int_code == 0x1202)
191+ kstat_cpu(smp_processor_id()).irqs[EXTINT_EXC]++;
192+ else
193+ kstat_cpu(smp_processor_id()).irqs[EXTINT_EMS]++;
165194 /*
166195 * handle bit signal external calls
167196 */
@@ -183,12 +212,19 @@ static void do_ext_call_interrupt(unsigned int ext_int_code, · 15 unmodified lines
183212 */
184213 static void smp_ext_bitcall(int cpu, int sig)
185214 {
215+ int order;
216+
186217 /*
187218 * Set signaling bit in lowcore of target cpu and kick it
188219 */
189220 set_bit(sig, (unsigned long *) &lowcore_ptr[cpu]->ext_call_fast);
190− while (sigp(cpu, sigp_emergency_signal) == sigp_busy)
221+ while (1) {
222+ order = smp_vcpu_scheduled(cpu) ?
223+ sigp_external_call : sigp_emergency_signal;
224+ if (sigp(cpu, order) != sigp_busy)
225+ break;
191226 udelay(10);
227+ }
192228 }
193229
194230 void arch_send_call_function_ipi_mask(const struct cpumask *mask)
@@ -281,11 +317,13 @@ void smp_ctl_clear_bit(int cr, int bit) · 86 unmodified lines
281317 }
282318 EXPORT_SYMBOL(smp_ctl_clear_bit);
283319
284−#ifdef CONFIG_ZFCPDUMP
320+#if defined(CONFIG_ZFCPDUMP) || defined(CONFIG_CRASH_DUMP)
285321
286322 static void __init smp_get_save_area(unsigned int cpu, unsigned int phy_cpu)
287323 {
288− if (ipl_info.type != IPL_TYPE_FCP_DUMP)
324+ if (ipl_info.type != IPL_TYPE_FCP_DUMP && !OLDMEM_BASE)
325+ return;
326+ if (is_kdump_kernel())
289327 return;
290328 if (cpu >= NR_CPUS) {
291329 pr_warning("CPU %i exceeds the maximum %i and is excluded from "
@@ -403,6 +441,18 @@ static void __init smp_detect_cpus(void) · 111 unmodified lines
403441 info = kmalloc(sizeof(*info), GFP_KERNEL);
404442 if (!info)
405443 panic("smp_detect_cpus failed to allocate memory\n");
444+#ifdef CONFIG_CRASH_DUMP
445+ if (OLDMEM_BASE && !is_kdump_kernel()) {
446+ struct save_area *save_area;
447+
448+ save_area = kmalloc(sizeof(*save_area), GFP_KERNEL);
449+ if (!save_area)
450+ panic("could not allocate memory for save area\n");
451+ copy_oldmem_page(1, (void *) save_area, sizeof(*save_area),
452+ 0x200, 0);
453+ zfcpdump_save_areas[0] = save_area;
454+ }
455+#endif
406456 /* Use sigp detection algorithm if sclp doesn't work. */
407457 if (sclp_get_cpu_info(info)) {
408458 smp_use_sigp_detection = 1;
@@ -463,7 +513,8 @@ int __cpuinit start_secondary(void *cpuvoid) · 54 unmodified lines
463513 set_cpu_online(smp_processor_id(), true);
464514 ipi_call_unlock();
465515 __ctl_clear_bit(0, 28); /* Disable lowcore protection */
466− S390_lowcore.restart_psw.mask = PSW_BASE_BITS | PSW_DEFAULT_KEY;
516+ S390_lowcore.restart_psw.mask =
517+ PSW_DEFAULT_KEY | PSW_MASK_BASE | PSW_MASK_EA | PSW_MASK_BA;
467518 S390_lowcore.restart_psw.addr =
468519 PSW_ADDR_AMODE | (unsigned long) psw_restart_int_handler;
469520 __ctl_set_bit(0, 28); /* Enable lowcore protection */
@@ -511,7 +562,8 @@ static int __cpuinit smp_alloc_lowcore(int cpu) · 41 unmodified lines
511562 memset((char *)lowcore + 512, 0, sizeof(*lowcore) - 512);
512563 lowcore->async_stack = async_stack + ASYNC_SIZE;
513564 lowcore->panic_stack = panic_stack + PAGE_SIZE;
514− lowcore->restart_psw.mask = PSW_BASE_BITS | PSW_DEFAULT_KEY;
565+ lowcore->restart_psw.mask =
566+ PSW_DEFAULT_KEY | PSW_MASK_BASE | PSW_MASK_EA | PSW_MASK_BA;
515567 lowcore->restart_psw.addr =
516568 PSW_ADDR_AMODE | (unsigned long) restart_int_handler;
517569 if (user_mode != HOME_SPACE_MODE)
@@ -712,6 +764,9 @@ void __init smp_prepare_cpus(unsigned int max_cpus) · 194 unmodified lines
712764 /* request the 0x1201 emergency signal external interrupt */
713765 if (register_external_interrupt(0x1201, do_ext_call_interrupt) != 0)
714766 panic("Couldn't request external interrupt 0x1201");
767+ /* request the 0x1202 external call external interrupt */
768+ if (register_external_interrupt(0x1202, do_ext_call_interrupt) != 0)
769+ panic("Couldn't request external interrupt 0x1202");
715770
716771 /* Reallocate current lowcore, but keep its contents. */
717772 lowcore = (void *) __get_free_pages(GFP_KERNEL | GFP_DMA, LC_ORDER);
arch/s390/kernel/suspend.c+1−0
@@ -7,6 +7,7 @@ · 6 unmodified lines
77 */
88
99 #include <linux/pfn.h>
10+#include <linux/suspend.h>
1011 #include <linux/mm.h>
1112 #include <asm/system.h>
1213
arch/s390/kernel/sysinfo.c+1−1
@@ -442,7 +442,7 @@ void s390_adjust_jiffies(void) · 441 unmodified lines
442442 */
443443 FP_UNPACK_SP(SA, &fmil);
444444 if ((info->capability >> 23) == 0)
445− FP_FROM_INT_S(SB, info->capability, 32, int);
445+ FP_FROM_INT_S(SB, (long) info->capability, 64, long);
446446 else
447447 FP_UNPACK_SP(SB, &info->capability);
448448 FP_DIV_S(SR, SA, SB);
arch/s390/kernel/time.c+1−0
@@ -48,6 +48,7 @@ · 47 unmodified lines
4848 #include <asm/timer.h>
4949 #include <asm/etr.h>
5050 #include <asm/cio.h>
51+#include "entry.h"
5152
5253 /* change this if you have some constant time drift */
5354 #define USECS_PER_JIFFY ((unsigned long) 1000000/HZ)
arch/s390/kernel/topology.c+2−2
@@ -299,8 +299,8 @@ out: · 298 unmodified lines
299299 }
300300 __initcall(init_topology_update);
301301
302−static void alloc_masks(struct sysinfo_15_1_x *info, struct mask_info *mask,
303− int offset)
302+static void __init alloc_masks(struct sysinfo_15_1_x *info,
303+ struct mask_info *mask, int offset)
304304 {
305305 int i, nr_masks;
306306
arch/s390/kernel/traps.c+3−2
@@ -200,7 +200,7 @@ void show_registers(struct pt_regs *regs) · 199 unmodified lines
200200 mask_bits(regs, PSW_MASK_PSTATE), mask_bits(regs, PSW_MASK_ASC),
201201 mask_bits(regs, PSW_MASK_CC), mask_bits(regs, PSW_MASK_PM));
202202 #ifdef CONFIG_64BIT
203− printk(" EA:%x", mask_bits(regs, PSW_BASE_BITS));
203+ printk(" EA:%x", mask_bits(regs, PSW_MASK_EA | PSW_MASK_BA));
204204 #endif
205205 printk("\n%s GPRS: " FOURLONG, mode,
206206 regs->gprs[0], regs->gprs[1], regs->gprs[2], regs->gprs[3]);
@@ -334,7 +334,8 @@ void __kprobes do_per_trap(struct pt_regs *regs) · 127 unmodified lines
334334 info.si_signo = SIGTRAP;
335335 info.si_errno = 0;
336336 info.si_code = TRAP_HWBKPT;
337− info.si_addr = (void *) current->thread.per_event.address;
337+ info.si_addr =
338+ (void __force __user *) current->thread.per_event.address;
338339 force_sig_info(SIGTRAP, &info, current);
339340 }
340341
arch/s390/kernel/vtime.c+7−4
@@ -170,7 +170,8 @@ void __kprobes vtime_stop_cpu(void) · 169 unmodified lines
170170 psw_t psw;
171171
172172 /* Wait for external, I/O or machine check interrupt. */
173− psw.mask = psw_kernel_bits | PSW_MASK_WAIT | PSW_MASK_IO | PSW_MASK_EXT;
173+ psw.mask = psw_kernel_bits | PSW_MASK_WAIT |
174+ PSW_MASK_DAT | PSW_MASK_IO | PSW_MASK_EXT | PSW_MASK_MCHECK;
174175
175176 idle->nohz_delay = 0;
176177
@@ -183,7 +184,8 @@ void __kprobes vtime_stop_cpu(void) · 6 unmodified lines
183184 * set_cpu_timer(VTIMER_MAX_SLICE);
184185 * idle->idle_enter = get_clock();
185186 * __load_psw_mask(psw_kernel_bits | PSW_MASK_WAIT |
186− * PSW_MASK_IO | PSW_MASK_EXT);
187+ * PSW_MASK_DAT | PSW_MASK_IO |
188+ * PSW_MASK_EXT | PSW_MASK_MCHECK);
187189 * The difference is that the inline assembly makes sure that
188190 * the last three instruction are stpt, stck and lpsw in that
189191 * order. This is done to increase the precision.
@@ -216,7 +218,8 @@ void __kprobes vtime_stop_cpu(void) · 26 unmodified lines
216218 * vq->idle = get_cpu_timer();
217219 * idle->idle_enter = get_clock();
218220 * __load_psw_mask(psw_kernel_bits | PSW_MASK_WAIT |
219− * PSW_MASK_IO | PSW_MASK_EXT);
221+ * PSW_MASK_DAT | PSW_MASK_IO |
222+ * PSW_MASK_EXT | PSW_MASK_MCHECK);
220223 * The difference is that the inline assembly makes sure that
221224 * the last three instruction are stpt, stck and lpsw in that
222225 * order. This is done to increase the precision.
@@ -458,7 +461,7 @@ void add_virt_timer_periodic(void *new) · 235 unmodified lines
458461 }
459462 EXPORT_SYMBOL(add_virt_timer_periodic);
460463
461−int __mod_vtimer(struct vtimer_list *timer, __u64 expires, int periodic)
464+static int __mod_vtimer(struct vtimer_list *timer, __u64 expires, int periodic)
462465 {
463466 struct vtimer_queue *vq;
464467 unsigned long flags;
arch/s390/kvm/diag.c+31−1
@@ -1,7 +1,7 @@
11 /*
22 * diag.c - handling diagnose instructions
33 *
4− * Copyright IBM Corp. 2008
4+ * Copyright IBM Corp. 2008,2011
55 *
66 * This program is free software; you can redistribute it and/or modify
77 * it under the terms of the GNU General Public License (version 2 only)
@@ -15,6 +15,34 @@ · 7 unmodified lines
1515 #include <linux/kvm_host.h>
1616 #include "kvm-s390.h"
1717
18+static int diag_release_pages(struct kvm_vcpu *vcpu)
19+{
20+ unsigned long start, end;
21+ unsigned long prefix = vcpu->arch.sie_block->prefix;
22+
23+ start = vcpu->arch.guest_gprs[(vcpu->arch.sie_block->ipa & 0xf0) >> 4];
24+ end = vcpu->arch.guest_gprs[vcpu->arch.sie_block->ipa & 0xf] + 4096;
25+
26+ if (start & ~PAGE_MASK || end & ~PAGE_MASK || start > end
27+ || start < 2 * PAGE_SIZE)
28+ return kvm_s390_inject_program_int(vcpu, PGM_SPECIFICATION);
29+
30+ VCPU_EVENT(vcpu, 5, "diag release pages %lX %lX", start, end);
31+ vcpu->stat.diagnose_10++;
32+
33+ /* we checked for start > end above */
34+ if (end < prefix || start >= prefix + 2 * PAGE_SIZE) {
35+ gmap_discard(start, end, vcpu->arch.gmap);
36+ } else {
37+ if (start < prefix)
38+ gmap_discard(start, prefix, vcpu->arch.gmap);
39+ if (end >= prefix)
40+ gmap_discard(prefix + 2 * PAGE_SIZE,
41+ end, vcpu->arch.gmap);
42+ }
43+ return 0;
44+}
45+
1846 static int __diag_time_slice_end(struct kvm_vcpu *vcpu)
1947 {
2048 VCPU_EVENT(vcpu, 5, "%s", "diag time slice end");
@@ -57,6 +85,8 @@ int kvm_s390_handle_diag(struct kvm_vcpu *vcpu) · 36 unmodified lines
5785 int code = (vcpu->arch.sie_block->ipb & 0xfff0000) >> 16;
5886
5987 switch (code) {
88+ case 0x10:
89+ return diag_release_pages(vcpu);
6090 case 0x44:
6191 return __diag_time_slice_end(vcpu);
6292 case 0x308:
arch/s390/kvm/kvm-s390.c+1−0
@@ -71,6 +71,7 @@ struct kvm_stats_debugfs_item debugfs_entries[] = { · 70 unmodified lines
7171 { "instruction_sigp_set_arch", VCPU_STAT(instruction_sigp_arch) },
7272 { "instruction_sigp_set_prefix", VCPU_STAT(instruction_sigp_prefix) },
7373 { "instruction_sigp_restart", VCPU_STAT(instruction_sigp_restart) },
74+ { "diagnose_10", VCPU_STAT(diagnose_10) },
7475 { "diagnose_44", VCPU_STAT(diagnose_44) },
7576 { NULL }
7677 };
arch/s390/lib/delay.c+2−1
@@ -32,7 +32,8 @@ static void __udelay_disabled(unsigned long long usecs) · 31 unmodified lines
3232 u64 clock_saved;
3333 u64 end;
3434
35− mask = psw_kernel_bits | PSW_MASK_WAIT | PSW_MASK_EXT;
35+ mask = psw_kernel_bits | PSW_MASK_DAT | PSW_MASK_WAIT |
36+ PSW_MASK_EXT | PSW_MASK_MCHECK;
3637 end = get_clock() + (usecs << 12);
3738 clock_saved = local_tick_disable();
3839 __ctl_store(cr0_saved, 0, 0);
arch/s390/lib/uaccess_pt.c+4−2
@@ -342,7 +342,8 @@ int futex_atomic_op_pt(int op, u32 __user *uaddr, int oparg, int *old) · 341 unmodified lines
342342 if (segment_eq(get_fs(), KERNEL_DS))
343343 return __futex_atomic_op_pt(op, uaddr, oparg, old);
344344 spin_lock(&current->mm->page_table_lock);
345− uaddr = (int __user *) __dat_user_addr((unsigned long) uaddr);
345+ uaddr = (u32 __force __user *)
346+ __dat_user_addr((__force unsigned long) uaddr);
346347 if (!uaddr) {
347348 spin_unlock(&current->mm->page_table_lock);
348349 return -EFAULT;
@@ -378,7 +379,8 @@ int futex_atomic_cmpxchg_pt(u32 *uval, u32 __user *uaddr, · 29 unmodified lines
378379 if (segment_eq(get_fs(), KERNEL_DS))
379380 return __futex_atomic_cmpxchg_pt(uval, uaddr, oldval, newval);
380381 spin_lock(&current->mm->page_table_lock);
381− uaddr = (int __user *) __dat_user_addr((unsigned long) uaddr);
382+ uaddr = (u32 __force __user *)
383+ __dat_user_addr((__force unsigned long) uaddr);
382384 if (!uaddr) {
383385 spin_unlock(&current->mm->page_table_lock);
384386 return -EFAULT;
arch/s390/mm/fault.c+3−3
@@ -307,7 +307,7 @@ static inline int do_exception(struct pt_regs *regs, int access, · 306 unmodified lines
307307
308308 #ifdef CONFIG_PGSTE
309309 if (test_tsk_thread_flag(current, TIF_SIE) && S390_lowcore.gmap) {
310− address = gmap_fault(address,
310+ address = __gmap_fault(address,
311311 (struct gmap *) S390_lowcore.gmap);
312312 if (address == -EFAULT) {
313313 fault = VM_FAULT_BADMAP;
@@ -393,7 +393,7 @@ void __kprobes do_protection_exception(struct pt_regs *regs, long pgm_int_code, · 79 unmodified lines
393393 int fault;
394394
395395 /* Protection exception is suppressing, decrement psw address. */
396− regs->psw.addr -= (pgm_int_code >> 16);
396+ regs->psw.addr = __rewind_psw(regs->psw, pgm_int_code >> 16);
397397 /*
398398 * Check for low-address protection. This needs to be treated
399399 * as a special case because the translation exception code
@@ -454,7 +454,7 @@ int __handle_fault(unsigned long uaddr, unsigned long pgm_int_code, int write) · 54 unmodified lines
454454 struct pt_regs regs;
455455 int access, fault;
456456
457− regs.psw.mask = psw_kernel_bits;
457+ regs.psw.mask = psw_kernel_bits | PSW_MASK_DAT | PSW_MASK_MCHECK;
458458 if (!irqs_disabled())
459459 regs.psw.mask |= PSW_MASK_IO | PSW_MASK_EXT;
460460 regs.psw.addr = (unsigned long) __builtin_return_address(0);
arch/s390/mm/maccess.c+56−0
@@ -11,6 +11,7 @@ · 10 unmodified lines
1111 #include <linux/kernel.h>
1212 #include <linux/types.h>
1313 #include <linux/errno.h>
14+#include <linux/gfp.h>
1415 #include <asm/system.h>
1516
1617 /*
@@ -60,6 +61,9 @@ long probe_kernel_write(void *dst, const void *src, size_t size) · 43 unmodified lines
6061 return copied < 0 ? -EFAULT : 0;
6162 }
6263
64+/*
65+ * Copy memory in real mode (kernel to kernel)
66+ */
6367 int memcpy_real(void *dest, void *src, size_t count)
6468 {
6569 register unsigned long _dest asm("2") = (unsigned long) dest;
@@ -101,3 +105,55 @@ void copy_to_absolute_zero(void *dest, void *src, size_t count) · 35 unmodified lines
101105 __ctl_load(cr0, 0, 0);
102106 preempt_enable();
103107 }
108+
109+/*
110+ * Copy memory from kernel (real) to user (virtual)
111+ */
112+int copy_to_user_real(void __user *dest, void *src, size_t count)
113+{
114+ int offs = 0, size, rc;
115+ char *buf;
116+
117+ buf = (char *) __get_free_page(GFP_KERNEL);
118+ if (!buf)
119+ return -ENOMEM;
120+ rc = -EFAULT;
121+ while (offs < count) {
122+ size = min(PAGE_SIZE, count - offs);
123+ if (memcpy_real(buf, src + offs, size))
124+ goto out;
125+ if (copy_to_user(dest + offs, buf, size))
126+ goto out;
127+ offs += size;
128+ }
129+ rc = 0;
130+out:
131+ free_page((unsigned long) buf);
132+ return rc;
133+}
134+
135+/*
136+ * Copy memory from user (virtual) to kernel (real)
137+ */
138+int copy_from_user_real(void *dest, void __user *src, size_t count)
139+{
140+ int offs = 0, size, rc;
141+ char *buf;
142+
143+ buf = (char *) __get_free_page(GFP_KERNEL);
144+ if (!buf)
145+ return -ENOMEM;
146+ rc = -EFAULT;
147+ while (offs < count) {
148+ size = min(PAGE_SIZE, count - offs);
149+ if (copy_from_user(buf, src + offs, size))
150+ goto out;
151+ if (memcpy_real(dest + offs, buf, size))
152+ goto out;
153+ offs += size;
154+ }
155+ rc = 0;
156+out:
157+ free_page((unsigned long) buf);
158+ return rc;
159+}
arch/s390/mm/mmap.c+1−0
@@ -26,6 +26,7 @@ · 25 unmodified lines
2626
2727 #include <linux/personality.h>
2828 #include <linux/mm.h>
29+#include <linux/mman.h>
2930 #include <linux/module.h>
3031 #include <linux/random.h>
3132 #include <asm/pgalloc.h>
arch/s390/mm/pageattr.c+1−0
@@ -5,6 +5,7 @@ · 4 unmodified lines
55 #include <linux/module.h>
66 #include <linux/mm.h>
77 #include <linux/hugetlb.h>
8+#include <asm/cacheflush.h>
89 #include <asm/pgtable.h>
910
1011 static void change_page_attr(unsigned long addr, int numpages,
arch/s390/mm/pgtable.c+77−6
@@ -1,5 +1,5 @@
11 /*
2− * Copyright IBM Corp. 2007,2009
2+ * Copyright IBM Corp. 2007,2011
33 * Author(s): Martin Schwidefsky <schwidefsky@de.ibm.com>
44 */
55
@@ -222,6 +222,7 @@ void gmap_free(struct gmap *gmap) · 216 unmodified lines
222222
223223 /* Free all segment & region tables. */
224224 down_read(&gmap->mm->mmap_sem);
225+ spin_lock(&gmap->mm->page_table_lock);
225226 list_for_each_entry_safe(page, next, &gmap->crst_list, lru) {
226227 table = (unsigned long *) page_to_phys(page);
227228 if ((*table & _REGION_ENTRY_TYPE_MASK) == 0)
@@ -230,6 +231,7 @@ void gmap_free(struct gmap *gmap) · 2 unmodified lines
230231 gmap_unlink_segment(gmap, table);
231232 __free_pages(page, ALLOC_ORDER);
232233 }
234+ spin_unlock(&gmap->mm->page_table_lock);
233235 up_read(&gmap->mm->mmap_sem);
234236 list_del(&gmap->list);
235237 kfree(gmap);
@@ -256,6 +258,9 @@ void gmap_disable(struct gmap *gmap) · 20 unmodified lines
256258 }
257259 EXPORT_SYMBOL_GPL(gmap_disable);
258260
261+/*
262+ * gmap_alloc_table is assumed to be called with mmap_sem held
263+ */
259264 static int gmap_alloc_table(struct gmap *gmap,
260265 unsigned long *table, unsigned long init)
261266 {
@@ -267,14 +272,12 @@ static int gmap_alloc_table(struct gmap *gmap, · 5 unmodified lines
267272 return -ENOMEM;
268273 new = (unsigned long *) page_to_phys(page);
269274 crst_table_init(new, init);
270− down_read(&gmap->mm->mmap_sem);
271275 if (*table & _REGION_ENTRY_INV) {
272276 list_add(&page->lru, &gmap->crst_list);
273277 *table = (unsigned long) new | _REGION_ENTRY_LENGTH |
274278 (*table & _REGION_ENTRY_TYPE_MASK);
275279 } else
276280 __free_pages(page, ALLOC_ORDER);
277− up_read(&gmap->mm->mmap_sem);
278281 return 0;
279282 }
280283
@@ -299,6 +302,7 @@ int gmap_unmap_segment(struct gmap *gmap, unsigned long to, unsigned long len) · 18 unmodified lines
299302
300303 flush = 0;
301304 down_read(&gmap->mm->mmap_sem);
305+ spin_lock(&gmap->mm->page_table_lock);
302306 for (off = 0; off < len; off += PMD_SIZE) {
303307 /* Walk the guest addr space page table */
304308 table = gmap->table + (((to + off) >> 53) & 0x7ff);
@@ -320,6 +324,7 @@ int gmap_unmap_segment(struct gmap *gmap, unsigned long to, unsigned long len) · 15 unmodified lines
320324 *table = _SEGMENT_ENTRY_INV;
321325 }
322326 out:
327+ spin_unlock(&gmap->mm->page_table_lock);
323328 up_read(&gmap->mm->mmap_sem);
324329 if (flush)
325330 gmap_flush_tlb(gmap);
@@ -350,6 +355,7 @@ int gmap_map_segment(struct gmap *gmap, unsigned long from, · 24 unmodified lines
350355
351356 flush = 0;
352357 down_read(&gmap->mm->mmap_sem);
358+ spin_lock(&gmap->mm->page_table_lock);
353359 for (off = 0; off < len; off += PMD_SIZE) {
354360 /* Walk the gmap address space page table */
355361 table = gmap->table + (((to + off) >> 53) & 0x7ff);
@@ -373,19 +379,24 @@ int gmap_map_segment(struct gmap *gmap, unsigned long from, · 17 unmodified lines
373379 flush |= gmap_unlink_segment(gmap, table);
374380 *table = _SEGMENT_ENTRY_INV | _SEGMENT_ENTRY_RO | (from + off);
375381 }
382+ spin_unlock(&gmap->mm->page_table_lock);
376383 up_read(&gmap->mm->mmap_sem);
377384 if (flush)
378385 gmap_flush_tlb(gmap);
379386 return 0;
380387
381388 out_unmap:
389+ spin_unlock(&gmap->mm->page_table_lock);
382390 up_read(&gmap->mm->mmap_sem);
383391 gmap_unmap_segment(gmap, to, len);
384392 return -ENOMEM;
385393 }
386394 EXPORT_SYMBOL_GPL(gmap_map_segment);
387395
388−unsigned long gmap_fault(unsigned long address, struct gmap *gmap)
396+/*
397+ * this function is assumed to be called with mmap_sem held
398+ */
399+unsigned long __gmap_fault(unsigned long address, struct gmap *gmap)
389400 {
390401 unsigned long *table, vmaddr, segment;
391402 struct mm_struct *mm;
@@ -445,16 +456,75 @@ unsigned long gmap_fault(unsigned long address, struct gmap *gmap) · 53 unmodified lines
445456 page = pmd_page(*pmd);
446457 mp = (struct gmap_pgtable *) page->index;
447458 rmap->entry = table;
459+ spin_lock(&mm->page_table_lock);
448460 list_add(&rmap->list, &mp->mapper);
461+ spin_unlock(&mm->page_table_lock);
449462 /* Set gmap segment table entry to page table. */
450463 *table = pmd_val(*pmd) & PAGE_MASK;
451464 return vmaddr | (address & ~PMD_MASK);
452465 }
453466 return -EFAULT;
467+}
454468
469+unsigned long gmap_fault(unsigned long address, struct gmap *gmap)
470+{
471+ unsigned long rc;
472+
473+ down_read(&gmap->mm->mmap_sem);
474+ rc = __gmap_fault(address, gmap);
475+ up_read(&gmap->mm->mmap_sem);
476+
477+ return rc;
455478 }
456479 EXPORT_SYMBOL_GPL(gmap_fault);
457480
481+void gmap_discard(unsigned long from, unsigned long to, struct gmap *gmap)
482+{
483+
484+ unsigned long *table, address, size;
485+ struct vm_area_struct *vma;
486+ struct gmap_pgtable *mp;
487+ struct page *page;
488+
489+ down_read(&gmap->mm->mmap_sem);
490+ address = from;
491+ while (address < to) {
492+ /* Walk the gmap address space page table */
493+ table = gmap->table + ((address >> 53) & 0x7ff);
494+ if (unlikely(*table & _REGION_ENTRY_INV)) {
495+ address = (address + PMD_SIZE) & PMD_MASK;
496+ continue;
497+ }
498+ table = (unsigned long *)(*table & _REGION_ENTRY_ORIGIN);
499+ table = table + ((address >> 42) & 0x7ff);
500+ if (unlikely(*table & _REGION_ENTRY_INV)) {
501+ address = (address + PMD_SIZE) & PMD_MASK;
502+ continue;
503+ }
504+ table = (unsigned long *)(*table & _REGION_ENTRY_ORIGIN);
505+ table = table + ((address >> 31) & 0x7ff);
506+ if (unlikely(*table & _REGION_ENTRY_INV)) {
507+ address = (address + PMD_SIZE) & PMD_MASK;
508+ continue;
509+ }
510+ table = (unsigned long *)(*table & _REGION_ENTRY_ORIGIN);
511+ table = table + ((address >> 20) & 0x7ff);
512+ if (unlikely(*table & _SEGMENT_ENTRY_INV)) {
513+ address = (address + PMD_SIZE) & PMD_MASK;
514+ continue;
515+ }
516+ page = pfn_to_page(*table >> PAGE_SHIFT);
517+ mp = (struct gmap_pgtable *) page->index;
518+ vma = find_vma(gmap->mm, mp->vmaddr);
519+ size = min(to - address, PMD_SIZE - (address & ~PMD_MASK));
520+ zap_page_range(vma, mp->vmaddr | (address & ~PMD_MASK),
521+ size, NULL);
522+ address = (address + PMD_SIZE) & PMD_MASK;
523+ }
524+ up_read(&gmap->mm->mmap_sem);
525+}
526+EXPORT_SYMBOL_GPL(gmap_discard);
527+
458528 void gmap_unmap_notifier(struct mm_struct *mm, unsigned long *table)
459529 {
460530 struct gmap_rmap *rmap, *next;
@@ -662,8 +732,9 @@ void page_table_free_rcu(struct mmu_gather *tlb, unsigned long *table) · 201 unmodified lines
662732
663733 void __tlb_remove_table(void *_table)
664734 {
665− void *table = (void *)((unsigned long) _table & PAGE_MASK);
666− unsigned type = (unsigned long) _table & ~PAGE_MASK;
735+ const unsigned long mask = (FRAG_MASK << 4) | FRAG_MASK;
736+ void *table = (void *)((unsigned long) _table & ~mask);
737+ unsigned type = (unsigned long) _table & mask;
667738
668739 if (type)
669740 __page_table_free_rcu(table, type);
arch/s390/mm/vmem.c+6−0
@@ -335,6 +335,9 @@ void __init vmem_map_init(void) · 334 unmodified lines
335335 ro_start = ((unsigned long)&_stext) & PAGE_MASK;
336336 ro_end = PFN_ALIGN((unsigned long)&_eshared);
337337 for (i = 0; i < MEMORY_CHUNKS && memory_chunk[i].size > 0; i++) {
338+ if (memory_chunk[i].type == CHUNK_CRASHK ||
339+ memory_chunk[i].type == CHUNK_OLDMEM)
340+ continue;
338341 start = memory_chunk[i].addr;
339342 end = memory_chunk[i].addr + memory_chunk[i].size;
340343 if (start >= ro_end || end <= ro_start)
@@ -368,6 +371,9 @@ static int __init vmem_convert_memory_chunk(void) · 27 unmodified lines
368371 for (i = 0; i < MEMORY_CHUNKS; i++) {
369372 if (!memory_chunk[i].size)
370373 continue;
374+ if (memory_chunk[i].type == CHUNK_CRASHK ||
375+ memory_chunk[i].type == CHUNK_OLDMEM)
376+ continue;
371377 seg = kzalloc(sizeof(*seg), GFP_KERNEL);
372378 if (!seg)
373379 panic("Out of memory...\n");
arch/s390/oprofile/hwsampler.c+4−4
@@ -994,7 +994,7 @@ allocate_error: · 993 unmodified lines
994994 *
995995 * Returns 0 on success, !0 on failure.
996996 */
997−int hwsampler_deallocate()
997+int hwsampler_deallocate(void)
998998 {
999999 int rc;
10001000
@@ -1035,7 +1035,7 @@ unsigned long hwsampler_get_sample_overflow_count(unsigned int cpu) · 34 unmodified lines
10351035 return cb->sample_overflow;
10361036 }
10371037
1038−int hwsampler_setup()
1038+int hwsampler_setup(void)
10391039 {
10401040 int rc;
10411041 int cpu;
@@ -1102,7 +1102,7 @@ setup_exit: · 60 unmodified lines
11021102 return rc;
11031103 }
11041104
1105−int hwsampler_shutdown()
1105+int hwsampler_shutdown(void)
11061106 {
11071107 int rc;
11081108
@@ -1203,7 +1203,7 @@ start_all_exit: · 94 unmodified lines
12031203 *
12041204 * Returns 0 on success, !0 on failure.
12051205 */
1206−int hwsampler_stop_all()
1206+int hwsampler_stop_all(void)
12071207 {
12081208 int tmp_rc, rc, cpu;
12091209 struct hws_cpu_buffer *cb;
drivers/s390/block/dasd.c+14−5
@@ -11,7 +11,6 @@ · 10 unmodified lines
1111 #define KMSG_COMPONENT "dasd"
1212 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
1313
14−#include <linux/kernel_stat.h>
1514 #include <linux/kmod.h>
1615 #include <linux/init.h>
1716 #include <linux/interrupt.h>
@@ -1594,7 +1593,6 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm, · 1576 unmodified lines
15941593 unsigned long long now;
15951594 int expires;
15961595
1597− kstat_cpu(smp_processor_id()).irqs[IOINT_DAS]++;
15981596 if (IS_ERR(irb)) {
15991597 switch (PTR_ERR(irb)) {
16001598 case -EIO:
@@ -2061,13 +2059,14 @@ void dasd_add_request_tail(struct dasd_ccw_req *cqr) · 460 unmodified lines
20612059 /*
20622060 * Wakeup helper for the 'sleep_on' functions.
20632061 */
2064−static void dasd_wakeup_cb(struct dasd_ccw_req *cqr, void *data)
2062+void dasd_wakeup_cb(struct dasd_ccw_req *cqr, void *data)
20652063 {
20662064 spin_lock_irq(get_ccwdev_lock(cqr->startdev->cdev));
20672065 cqr->callback_data = DASD_SLEEPON_END_TAG;
20682066 spin_unlock_irq(get_ccwdev_lock(cqr->startdev->cdev));
20692067 wake_up(&generic_waitq);
20702068 }
2069+EXPORT_SYMBOL_GPL(dasd_wakeup_cb);
20712070
20722071 static inline int _wait_for_wakeup(struct dasd_ccw_req *cqr)
20732072 {
@@ -2167,7 +2166,9 @@ static int _dasd_sleep_on(struct dasd_ccw_req *maincqr, int interruptible) · 93 unmodified lines
21672166 } else
21682167 wait_event(generic_waitq, !(device->stopped));
21692168
2170− cqr->callback = dasd_wakeup_cb;
2169+ if (!cqr->callback)
2170+ cqr->callback = dasd_wakeup_cb;
2171+
21712172 cqr->callback_data = DASD_SLEEPON_START_TAG;
21722173 dasd_add_request_tail(cqr);
21732174 if (interruptible) {
@@ -2263,7 +2264,11 @@ int dasd_sleep_on_immediatly(struct dasd_ccw_req *cqr) · 89 unmodified lines
22632264 cqr->callback = dasd_wakeup_cb;
22642265 cqr->callback_data = DASD_SLEEPON_START_TAG;
22652266 cqr->status = DASD_CQR_QUEUED;
2266− list_add(&cqr->devlist, &device->ccw_queue);
2267+ /*
2268+ * add new request as second
2269+ * first the terminated cqr needs to be finished
2270+ */
2271+ list_add(&cqr->devlist, device->ccw_queue.next);
22672272
22682273 /* let the bh start the request to keep them in order */
22692274 dasd_schedule_device_bh(device);
@@ -3284,6 +3289,9 @@ int dasd_generic_pm_freeze(struct ccw_device *cdev) · 1014 unmodified lines
32843289 if (IS_ERR(device))
32853290 return PTR_ERR(device);
32863291
3292+ /* mark device as suspended */
3293+ set_bit(DASD_FLAG_SUSPENDED, &device->flags);
3294+
32873295 if (device->discipline->freeze)
32883296 rc = device->discipline->freeze(device);
32893297
@@ -3358,6 +3366,7 @@ int dasd_generic_restore_device(struct ccw_device *cdev) · 68 unmodified lines
33583366 if (device->block)
33593367 dasd_schedule_block_bh(device->block);
33603368
3369+ clear_bit(DASD_FLAG_SUSPENDED, &device->flags);
33613370 dasd_put_device(device);
33623371 return 0;
33633372 }
drivers/s390/block/dasd_eckd.c+41−4
@@ -844,6 +844,30 @@ static void dasd_eckd_fill_rcd_cqr(struct dasd_device *device, · 843 unmodified lines
844844 set_bit(DASD_CQR_VERIFY_PATH, &cqr->flags);
845845 }
846846
847+/*
848+ * Wakeup helper for read_conf
849+ * if the cqr is not done and needs some error recovery
850+ * the buffer has to be re-initialized with the EBCDIC "V1.0"
851+ * to show support for virtual device SNEQ
852+ */
853+static void read_conf_cb(struct dasd_ccw_req *cqr, void *data)
854+{
855+ struct ccw1 *ccw;
856+ __u8 *rcd_buffer;
857+
858+ if (cqr->status != DASD_CQR_DONE) {
859+ ccw = cqr->cpaddr;
860+ rcd_buffer = (__u8 *)((addr_t) ccw->cda);
861+ memset(rcd_buffer, 0, sizeof(*rcd_buffer));
862+
863+ rcd_buffer[0] = 0xE5;
864+ rcd_buffer[1] = 0xF1;
865+ rcd_buffer[2] = 0x4B;
866+ rcd_buffer[3] = 0xF0;
867+ }
868+ dasd_wakeup_cb(cqr, data);
869+}
870+
847871 static int dasd_eckd_read_conf_immediately(struct dasd_device *device,
848872 struct dasd_ccw_req *cqr,
849873 __u8 *rcd_buffer,
@@ -863,6 +887,7 @@ static int dasd_eckd_read_conf_immediately(struct dasd_device *device, · 13 unmodified lines
863887 clear_bit(DASD_CQR_FLAGS_USE_ERP, &cqr->flags);
864888 set_bit(DASD_CQR_ALLOW_SLOCK, &cqr->flags);
865889 cqr->retries = 5;
890+ cqr->callback = read_conf_cb;
866891 rc = dasd_sleep_on_immediatly(cqr);
867892 return rc;
868893 }
@@ -900,6 +925,7 @@ static int dasd_eckd_read_conf_lpm(struct dasd_device *device, · 31 unmodified lines
900925 goto out_error;
901926 }
902927 dasd_eckd_fill_rcd_cqr(device, cqr, rcd_buf, lpm);
928+ cqr->callback = read_conf_cb;
903929 ret = dasd_sleep_on(cqr);
904930 /*
905931 * on success we update the user input parms
@@ -1075,6 +1101,12 @@ static void do_path_verification_work(struct work_struct *work) · 169 unmodified lines
10751101 data = container_of(work, struct path_verification_work_data, worker);
10761102 device = data->device;
10771103
1104+ /* delay path verification until device was resumed */
1105+ if (test_bit(DASD_FLAG_SUSPENDED, &device->flags)) {
1106+ schedule_work(work);
1107+ return;
1108+ }
1109+
10781110 opm = 0;
10791111 npm = 0;
10801112 ppm = 0;
@@ -2021,9 +2053,13 @@ static void dasd_eckd_check_for_device_change(struct dasd_device *device, · 940 unmodified lines
20212053 /* first of all check for state change pending interrupt */
20222054 mask = DEV_STAT_ATTENTION | DEV_STAT_DEV_END | DEV_STAT_UNIT_EXCEP;
20232055 if ((scsw_dstat(&irb->scsw) & mask) == mask) {
2024− /* for alias only and not in offline processing*/
2056+ /*
2057+ * for alias only, not in offline processing
2058+ * and only if not suspended
2059+ */
20252060 if (!device->block && private->lcu &&
2026− !test_bit(DASD_FLAG_OFFLINE, &device->flags)) {
2061+ !test_bit(DASD_FLAG_OFFLINE, &device->flags) &&
2062+ !test_bit(DASD_FLAG_SUSPENDED, &device->flags)) {
20272063 /*
20282064 * the state change could be caused by an alias
20292065 * reassignment remove device from alias handling
@@ -2350,7 +2386,7 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_cmd_track( · 320 unmodified lines
23502386 new_track = 1;
23512387 end_idaw = 0;
23522388 len_to_track_end = 0;
2353− idaw_dst = 0;
2389+ idaw_dst = NULL;
23542390 idaw_len = 0;
23552391 rq_for_each_segment(bv, req, iter) {
23562392 dst = page_address(bv->bv_page) + bv->bv_offset;
@@ -2412,7 +2448,7 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_cmd_track( · 55 unmodified lines
24122448 if (end_idaw) {
24132449 idaws = idal_create_words(idaws, idaw_dst,
24142450 idaw_len);
2415− idaw_dst = 0;
2451+ idaw_dst = NULL;
24162452 idaw_len = 0;
24172453 end_idaw = 0;
24182454 }
@@ -3998,6 +4034,7 @@ static struct ccw_driver dasd_eckd_driver = { · 1579 unmodified lines
39984034 .thaw = dasd_generic_restore_device,
39994035 .restore = dasd_generic_restore_device,
40004036 .uc_handler = dasd_generic_uc_handler,
4037+ .int_class = IOINT_DAS,
40014038 };
40024039
40034040 /*
drivers/s390/block/dasd_fba.c+1−0
@@ -79,6 +79,7 @@ static struct ccw_driver dasd_fba_driver = { · 78 unmodified lines
7979 .freeze = dasd_generic_pm_freeze,
8080 .thaw = dasd_generic_restore_device,
8181 .restore = dasd_generic_restore_device,
82+ .int_class = IOINT_DAS,
8283 };
8384
8485 static void
drivers/s390/block/dasd_int.h+2−0
@@ -516,6 +516,7 @@ struct dasd_block { · 515 unmodified lines
516516 */
517517 #define DASD_FLAG_IS_RESERVED 7 /* The device is reserved */
518518 #define DASD_FLAG_LOCK_STOLEN 8 /* The device lock was stolen */
519+#define DASD_FLAG_SUSPENDED 9 /* The device was suspended */
519520
520521
521522 void dasd_put_device_wake(struct dasd_device *);
@@ -643,6 +644,7 @@ struct dasd_ccw_req * · 121 unmodified lines
643644 dasd_smalloc_request(int , int, int, struct dasd_device *);
644645 void dasd_kfree_request(struct dasd_ccw_req *, struct dasd_device *);
645646 void dasd_sfree_request(struct dasd_ccw_req *, struct dasd_device *);
647+void dasd_wakeup_cb(struct dasd_ccw_req *, void *);
646648
647649 static inline int
648650 dasd_kmalloc_set_cda(struct ccw1 *ccw, void *cda, struct dasd_device *device)
drivers/s390/char/con3215.c+1−2
@@ -9,7 +9,6 @@ · 8 unmodified lines
99 * Dan Morrison, IBM Corporation <dmorriso@cse.buffalo.edu>
1010 */
1111
12−#include <linux/kernel_stat.h>
1312 #include <linux/module.h>
1413 #include <linux/types.h>
1514 #include <linux/kdev_t.h>
@@ -362,7 +361,6 @@ static void raw3215_irq(struct ccw_device *cdev, unsigned long intparm, · 346 unmodified lines
362361 int cstat, dstat;
363362 int count;
364363
365− kstat_cpu(smp_processor_id()).irqs[IOINT_C15]++;
366364 raw = dev_get_drvdata(&cdev->dev);
367365 req = (struct raw3215_req *) intparm;
368366 cstat = irb->scsw.cmd.cstat;
@@ -776,6 +774,7 @@ static struct ccw_driver raw3215_ccw_driver = { · 407 unmodified lines
776774 .freeze = &raw3215_pm_stop,
777775 .thaw = &raw3215_pm_start,
778776 .restore = &raw3215_pm_start,
777+ .int_class = IOINT_C15,
779778 };
780779
781780 #ifdef CONFIG_TN3215_CONSOLE
drivers/s390/char/raw3270.c+1−2
@@ -7,7 +7,6 @@ · 6 unmodified lines
77 * Copyright IBM Corp. 2003, 2009
88 */
99
10−#include <linux/kernel_stat.h>
1110 #include <linux/module.h>
1211 #include <linux/err.h>
1312 #include <linux/init.h>
@@ -330,7 +329,6 @@ raw3270_irq (struct ccw_device *cdev, unsigned long intparm, struct irb *irb) · 316 unmodified lines
330329 struct raw3270_request *rq;
331330 int rc;
332331
333− kstat_cpu(smp_processor_id()).irqs[IOINT_C70]++;
334332 rp = dev_get_drvdata(&cdev->dev);
335333 if (!rp)
336334 return;
@@ -1398,6 +1396,7 @@ static struct ccw_driver raw3270_ccw_driver = { · 1061 unmodified lines
13981396 .freeze = &raw3270_pm_stop,
13991397 .thaw = &raw3270_pm_start,
14001398 .restore = &raw3270_pm_start,
1399+ .int_class = IOINT_C70,
14011400 };
14021401
14031402 static int
drivers/s390/char/sclp_cmd.c+2−2
@@ -61,8 +61,8 @@ static int __init sclp_cmd_sync_early(sclp_cmdw_t cmd, void *sccb) · 60 unmodified lines
6161 rc = sclp_service_call(cmd, sccb);
6262 if (rc)
6363 goto out;
64− __load_psw_mask(PSW_BASE_BITS | PSW_MASK_EXT |
65− PSW_MASK_WAIT | PSW_DEFAULT_KEY);
64+ __load_psw_mask(PSW_DEFAULT_KEY | PSW_MASK_BASE | PSW_MASK_EA |
65+ PSW_MASK_BA | PSW_MASK_EXT | PSW_MASK_WAIT);
6666 local_irq_disable();
6767 out:
6868 /* Contents of the sccb might have changed. */
drivers/s390/char/sclp_quiesce.c+2−1
@@ -30,7 +30,8 @@ static void do_machine_quiesce(void) · 29 unmodified lines
3030 psw_t quiesce_psw;
3131
3232 smp_send_stop();
33− quiesce_psw.mask = PSW_BASE_BITS | PSW_MASK_WAIT;
33+ quiesce_psw.mask =
34+ PSW_MASK_BASE | PSW_MASK_EA | PSW_MASK_BA | PSW_MASK_WAIT;
3435 quiesce_psw.addr = 0xfff;
3536 __load_psw(quiesce_psw);
3637 }
drivers/s390/char/tape_34xx.c+1−0
@@ -1330,6 +1330,7 @@ static struct ccw_driver tape_34xx_driver = { · 1329 unmodified lines
13301330 .set_online = tape_34xx_online,
13311331 .set_offline = tape_generic_offline,
13321332 .freeze = tape_generic_pm_suspend,
1333+ .int_class = IOINT_TAP,
13331334 };
13341335
13351336 static int
drivers/s390/char/tape_3590.c+1−0
@@ -1762,6 +1762,7 @@ static struct ccw_driver tape_3590_driver = { · 1761 unmodified lines
17621762 .set_offline = tape_generic_offline,
17631763 .set_online = tape_3590_online,
17641764 .freeze = tape_generic_pm_suspend,
1765+ .int_class = IOINT_TAP,
17651766 };
17661767
17671768 /*
drivers/s390/char/tape_core.c+0−2
@@ -14,7 +14,6 @@ · 13 unmodified lines
1414 #define KMSG_COMPONENT "tape"
1515 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
1616
17−#include <linux/kernel_stat.h>
1817 #include <linux/module.h>
1918 #include <linux/init.h> // for kernel parameters
2019 #include <linux/kmod.h> // for requesting modules
@@ -1115,7 +1114,6 @@ __tape_do_irq (struct ccw_device *cdev, unsigned long intparm, struct irb *irb) · 1094 unmodified lines
11151114 struct tape_request *request;
11161115 int rc;
11171116
1118− kstat_cpu(smp_processor_id()).irqs[IOINT_TAP]++;
11191117 device = dev_get_drvdata(&cdev->dev);
11201118 if (device == NULL) {
11211119 return;
drivers/s390/char/vmur.c+1−2
@@ -11,7 +11,6 @@ · 10 unmodified lines
1111 #define KMSG_COMPONENT "vmur"
1212 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
1313
14−#include <linux/kernel_stat.h>
1514 #include <linux/cdev.h>
1615 #include <linux/slab.h>
1716
@@ -74,6 +73,7 @@ static struct ccw_driver ur_driver = { · 56 unmodified lines
7473 .set_online = ur_set_online,
7574 .set_offline = ur_set_offline,
7675 .freeze = ur_pm_suspend,
76+ .int_class = IOINT_VMR,
7777 };
7878
7979 static DEFINE_MUTEX(vmur_mutex);
@@ -305,7 +305,6 @@ static void ur_int_handler(struct ccw_device *cdev, unsigned long intparm, · 225 unmodified lines
305305 {
306306 struct urdev *urd;
307307
308− kstat_cpu(smp_processor_id()).irqs[IOINT_VMR]++;
309308 TRACE("ur_int_handler: intparm=0x%lx cstat=%02x dstat=%02x res=%u\n",
310309 intparm, irb->scsw.cmd.cstat, irb->scsw.cmd.dstat,
311310 irb->scsw.cmd.count);
drivers/s390/char/zcore.c+3−18
@@ -16,6 +16,7 @@ · 15 unmodified lines
1616 #include <linux/slab.h>
1717 #include <linux/miscdevice.h>
1818 #include <linux/debugfs.h>
19+#include <linux/module.h>
1920 #include <asm/asm-offsets.h>
2021 #include <asm/ipl.h>
2122 #include <asm/sclp.h>
@@ -142,22 +143,6 @@ static int memcpy_hsa_kernel(void *dest, unsigned long src, size_t count) · 120 unmodified lines
142143 return memcpy_hsa(dest, src, count, TO_KERNEL);
143144 }
144145
145−static int memcpy_real_user(void __user *dest, unsigned long src, size_t count)
146−{
147− static char buf[4096];
148− int offs = 0, size;
149−
150− while (offs < count) {
151− size = min(sizeof(buf), count - offs);
152− if (memcpy_real(buf, (void *) src + offs, size))
153− return -EFAULT;
154− if (copy_to_user(dest + offs, buf, size))
155− return -EFAULT;
156− offs += size;
157− }
158− return 0;
159−}
160−
161146 static int __init init_cpu_info(enum arch_id arch)
162147 {
163148 struct save_area *sa;
@@ -346,8 +331,8 @@ static ssize_t zcore_read(struct file *file, char __user *buf, size_t count, · 182 unmodified lines
346331
347332 /* Copy from real mem */
348333 size = count - mem_offs - hdr_count;
349− rc = memcpy_real_user(buf + hdr_count + mem_offs, mem_start + mem_offs,
350− size);
334+ rc = copy_to_user_real(buf + hdr_count + mem_offs,
335+ (void *) mem_start + mem_offs, size);
351336 if (rc)
352337 goto fail;
353338
drivers/s390/cio/ccwgroup.c+137−196
@@ -29,31 +29,20 @@ · 28 unmodified lines
2929
3030 /* a device matches a driver if all its slave devices match the same
3131 * entry of the driver */
32−static int
33−ccwgroup_bus_match (struct device * dev, struct device_driver * drv)
32+static int ccwgroup_bus_match(struct device *dev, struct device_driver * drv)
3433 {
35− struct ccwgroup_device *gdev;
36− struct ccwgroup_driver *gdrv;
37−
38− gdev = to_ccwgroupdev(dev);
39− gdrv = to_ccwgroupdrv(drv);
34+ struct ccwgroup_device *gdev = to_ccwgroupdev(dev);
35+ struct ccwgroup_driver *gdrv = to_ccwgroupdrv(drv);
4036
4137 if (gdev->creator_id == gdrv->driver_id)
4238 return 1;
4339
4440 return 0;
4541 }
46−static int
47−ccwgroup_uevent (struct device *dev, struct kobj_uevent_env *env)
48−{
49− /* TODO */
50− return 0;
51−}
5242
5343 static struct bus_type ccwgroup_bus_type;
5444
55−static void
56−__ccwgroup_remove_symlinks(struct ccwgroup_device *gdev)
45+static void __ccwgroup_remove_symlinks(struct ccwgroup_device *gdev)
5746 {
5847 int i;
5948 char str[8];
@@ -63,7 +52,6 @@ __ccwgroup_remove_symlinks(struct ccwgroup_device *gdev) · 3 unmodified lines
6352 sysfs_remove_link(&gdev->dev.kobj, str);
6453 sysfs_remove_link(&gdev->cdev[i]->dev.kobj, "group_device");
6554 }
66−
6755 }
6856
6957 /*
@@ -87,6 +75,87 @@ static void __ccwgroup_remove_cdev_refs(struct ccwgroup_device *gdev) · 17 unmodified lines
8775 }
8876 }
8977
78+static int ccwgroup_set_online(struct ccwgroup_device *gdev)
79+{
80+ struct ccwgroup_driver *gdrv = to_ccwgroupdrv(gdev->dev.driver);
81+ int ret = 0;
82+
83+ if (atomic_cmpxchg(&gdev->onoff, 0, 1) != 0)
84+ return -EAGAIN;
85+ if (gdev->state == CCWGROUP_ONLINE)
86+ goto out;
87+ if (gdrv->set_online)
88+ ret = gdrv->set_online(gdev);
89+ if (ret)
90+ goto out;
91+
92+ gdev->state = CCWGROUP_ONLINE;
93+out:
94+ atomic_set(&gdev->onoff, 0);
95+ return ret;
96+}
97+
98+static int ccwgroup_set_offline(struct ccwgroup_device *gdev)
99+{
100+ struct ccwgroup_driver *gdrv = to_ccwgroupdrv(gdev->dev.driver);
101+ int ret = 0;
102+
103+ if (atomic_cmpxchg(&gdev->onoff, 0, 1) != 0)
104+ return -EAGAIN;
105+ if (gdev->state == CCWGROUP_OFFLINE)
106+ goto out;
107+ if (gdrv->set_offline)
108+ ret = gdrv->set_offline(gdev);
109+ if (ret)
110+ goto out;
111+
112+ gdev->state = CCWGROUP_OFFLINE;
113+out:
114+ atomic_set(&gdev->onoff, 0);
115+ return ret;
116+}
117+
118+static ssize_t ccwgroup_online_store(struct device *dev,
119+ struct device_attribute *attr,
120+ const char *buf, size_t count)
121+{
122+ struct ccwgroup_device *gdev = to_ccwgroupdev(dev);
123+ struct ccwgroup_driver *gdrv = to_ccwgroupdrv(dev->driver);
124+ unsigned long value;
125+ int ret;
126+
127+ if (!dev->driver)
128+ return -EINVAL;
129+ if (!try_module_get(gdrv->driver.owner))
130+ return -EINVAL;
131+
132+ ret = strict_strtoul(buf, 0, &value);
133+ if (ret)
134+ goto out;
135+
136+ if (value == 1)
137+ ret = ccwgroup_set_online(gdev);
138+ else if (value == 0)
139+ ret = ccwgroup_set_offline(gdev);
140+ else
141+ ret = -EINVAL;
142+out:
143+ module_put(gdrv->driver.owner);
144+ return (ret == 0) ? count : ret;
145+}
146+
147+static ssize_t ccwgroup_online_show(struct device *dev,
148+ struct device_attribute *attr,
149+ char *buf)
150+{
151+ struct ccwgroup_device *gdev = to_ccwgroupdev(dev);
152+ int online;
153+
154+ online = (gdev->state == CCWGROUP_ONLINE) ? 1 : 0;
155+
156+ return scnprintf(buf, PAGE_SIZE, "%d\n", online);
157+}
158+
90159 /*
91160 * Provide an 'ungroup' attribute so the user can remove group devices no
92161 * longer needed or accidentially created. Saves memory :)
@@ -104,14 +173,13 @@ static void ccwgroup_ungroup_callback(struct device *dev) · 11 unmodified lines
104173 mutex_unlock(&gdev->reg_mutex);
105174 }
106175
107−static ssize_t
108−ccwgroup_ungroup_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
176+static ssize_t ccwgroup_ungroup_store(struct device *dev,
177+ struct device_attribute *attr,
178+ const char *buf, size_t count)
109179 {
110− struct ccwgroup_device *gdev;
180+ struct ccwgroup_device *gdev = to_ccwgroupdev(dev);
111181 int rc;
112182
113− gdev = to_ccwgroupdev(dev);
114−
115183 /* Prevent concurrent online/offline processing and ungrouping. */
116184 if (atomic_cmpxchg(&gdev->onoff, 0, 1) != 0)
117185 return -EAGAIN;
@@ -132,24 +200,35 @@ out: · 14 unmodified lines
132200 }
133201 return count;
134202 }
135−
136203 static DEVICE_ATTR(ungroup, 0200, NULL, ccwgroup_ungroup_store);
204+static DEVICE_ATTR(online, 0644, ccwgroup_online_show, ccwgroup_online_store);
137205
138−static void
139−ccwgroup_release (struct device *dev)
206+static struct attribute *ccwgroup_attrs[] = {
207+ &dev_attr_online.attr,
208+ &dev_attr_ungroup.attr,
209+ NULL,
210+};
211+static struct attribute_group ccwgroup_attr_group = {
212+ .attrs = ccwgroup_attrs,
213+};
214+static const struct attribute_group *ccwgroup_attr_groups[] = {
215+ &ccwgroup_attr_group,
216+ NULL,
217+};
218+
219+static void ccwgroup_release(struct device *dev)
140220 {
141221 kfree(to_ccwgroupdev(dev));
142222 }
143223
144−static int
145−__ccwgroup_create_symlinks(struct ccwgroup_device *gdev)
224+static int __ccwgroup_create_symlinks(struct ccwgroup_device *gdev)
146225 {
147226 char str[8];
148227 int i, rc;
149228
150229 for (i = 0; i < gdev->count; i++) {
151− rc = sysfs_create_link(&gdev->cdev[i]->dev.kobj, &gdev->dev.kobj,
152− "group_device");
230+ rc = sysfs_create_link(&gdev->cdev[i]->dev.kobj,
231+ &gdev->dev.kobj, "group_device");
153232 if (rc) {
154233 for (--i; i >= 0; i--)
155234 sysfs_remove_link(&gdev->cdev[i]->dev.kobj,
@@ -159,8 +238,8 @@ __ccwgroup_create_symlinks(struct ccwgroup_device *gdev) · 3 unmodified lines
159238 }
160239 for (i = 0; i < gdev->count; i++) {
161240 sprintf(str, "cdev%d", i);
162− rc = sysfs_create_link(&gdev->dev.kobj, &gdev->cdev[i]->dev.kobj,
163− str);
241+ rc = sysfs_create_link(&gdev->dev.kobj,
242+ &gdev->cdev[i]->dev.kobj, str);
164243 if (rc) {
165244 for (--i; i >= 0; i--) {
166245 sprintf(str, "cdev%d", i);
@@ -293,26 +372,17 @@ int ccwgroup_create_from_string(struct device *root, unsigned int creator_id, · 126 unmodified lines
293372 }
294373
295374 dev_set_name(&gdev->dev, "%s", dev_name(&gdev->cdev[0]->dev));
296−
375+ gdev->dev.groups = ccwgroup_attr_groups;
297376 rc = device_add(&gdev->dev);
298377 if (rc)
299378 goto error;
300− get_device(&gdev->dev);
301− rc = device_create_file(&gdev->dev, &dev_attr_ungroup);
302−
379+ rc = __ccwgroup_create_symlinks(gdev);
303380 if (rc) {
304− device_unregister(&gdev->dev);
381+ device_del(&gdev->dev);
305382 goto error;
306383 }
307−
308− rc = __ccwgroup_create_symlinks(gdev);
309− if (!rc) {
310− mutex_unlock(&gdev->reg_mutex);
311− put_device(&gdev->dev);
312− return 0;
313− }
314− device_remove_file(&gdev->dev, &dev_attr_ungroup);
315− device_unregister(&gdev->dev);
384+ mutex_unlock(&gdev->reg_mutex);
385+ return 0;
316386 error:
317387 for (i = 0; i < num_devices; i++)
318388 if (gdev->cdev[i]) {
@@ -330,7 +400,15 @@ error: · 11 unmodified lines
330400 EXPORT_SYMBOL(ccwgroup_create_from_string);
331401
332402 static int ccwgroup_notifier(struct notifier_block *nb, unsigned long action,
333− void *data);
403+ void *data)
404+{
405+ struct device *dev = data;
406+
407+ if (action == BUS_NOTIFY_UNBIND_DRIVER)
408+ device_schedule_callback(dev, ccwgroup_ungroup_callback);
409+
410+ return NOTIFY_OK;
411+}
334412
335413 static struct notifier_block ccwgroup_nb = {
336414 .notifier_call = ccwgroup_notifier
@@ -362,138 +440,21 @@ module_exit(cleanup_ccwgroup); · 25 unmodified lines
362440
363441 /************************** driver stuff ******************************/
364442
365−static int
366−ccwgroup_set_online(struct ccwgroup_device *gdev)
443+static int ccwgroup_probe(struct device *dev)
367444 {
368− struct ccwgroup_driver *gdrv;
369− int ret;
370−
371− if (atomic_cmpxchg(&gdev->onoff, 0, 1) != 0)
372− return -EAGAIN;
373− if (gdev->state == CCWGROUP_ONLINE) {
374− ret = 0;
375− goto out;
376− }
377− if (!gdev->dev.driver) {
378− ret = -EINVAL;
379− goto out;
380− }
381− gdrv = to_ccwgroupdrv (gdev->dev.driver);
382− if ((ret = gdrv->set_online ? gdrv->set_online(gdev) : 0))
383− goto out;
384−
385− gdev->state = CCWGROUP_ONLINE;
386− out:
387− atomic_set(&gdev->onoff, 0);
388− return ret;
389−}
390−
391−static int
392−ccwgroup_set_offline(struct ccwgroup_device *gdev)
393−{
394− struct ccwgroup_driver *gdrv;
395− int ret;
396−
397− if (atomic_cmpxchg(&gdev->onoff, 0, 1) != 0)
398− return -EAGAIN;
399− if (gdev->state == CCWGROUP_OFFLINE) {
400− ret = 0;
401− goto out;
402− }
403− if (!gdev->dev.driver) {
404− ret = -EINVAL;
405− goto out;
406− }
407− gdrv = to_ccwgroupdrv (gdev->dev.driver);
408− if ((ret = gdrv->set_offline ? gdrv->set_offline(gdev) : 0))
409− goto out;
410−
411− gdev->state = CCWGROUP_OFFLINE;
412− out:
413− atomic_set(&gdev->onoff, 0);
414− return ret;
415−}
416−
417−static ssize_t
418−ccwgroup_online_store (struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
419−{
420− struct ccwgroup_device *gdev;
421− struct ccwgroup_driver *gdrv;
422− unsigned long value;
423− int ret;
424−
425− if (!dev->driver)
426− return -ENODEV;
427−
428− gdev = to_ccwgroupdev(dev);
429− gdrv = to_ccwgroupdrv(dev->driver);
430−
431− if (!try_module_get(gdrv->driver.owner))
432− return -EINVAL;
433−
434− ret = strict_strtoul(buf, 0, &value);
435− if (ret)
436− goto out;
437−
438− if (value == 1)
439− ret = ccwgroup_set_online(gdev);
440− else if (value == 0)
441− ret = ccwgroup_set_offline(gdev);
442− else
443− ret = -EINVAL;
444−out:
445− module_put(gdrv->driver.owner);
446− return (ret == 0) ? count : ret;
447−}
448−
449−static ssize_t
450−ccwgroup_online_show (struct device *dev, struct device_attribute *attr, char *buf)
451−{
452− int online;
453−
454− online = (to_ccwgroupdev(dev)->state == CCWGROUP_ONLINE);
455−
456− return sprintf(buf, online ? "1\n" : "0\n");
457−}
458−
459−static DEVICE_ATTR(online, 0644, ccwgroup_online_show, ccwgroup_online_store);
460−
461−static int
462−ccwgroup_probe (struct device *dev)
463−{
464− struct ccwgroup_device *gdev;
465− struct ccwgroup_driver *gdrv;
466−
467− int ret;
468−
469− gdev = to_ccwgroupdev(dev);
470− gdrv = to_ccwgroupdrv(dev->driver);
471−
472− if ((ret = device_create_file(dev, &dev_attr_online)))
473− return ret;
474−
475− ret = gdrv->probe ? gdrv->probe(gdev) : -ENODEV;
476− if (ret)
477− device_remove_file(dev, &dev_attr_online);
445+ struct ccwgroup_device *gdev = to_ccwgroupdev(dev);
446+ struct ccwgroup_driver *gdrv = to_ccwgroupdrv(dev->driver);
478447
479− return ret;
448+ return gdrv->probe ? gdrv->probe(gdev) : -ENODEV;
480449 }
481450
482−static int
483−ccwgroup_remove (struct device *dev)
451+static int ccwgroup_remove(struct device *dev)
484452 {
485− struct ccwgroup_device *gdev;
486− struct ccwgroup_driver *gdrv;
487−
488− device_remove_file(dev, &dev_attr_online);
489− device_remove_file(dev, &dev_attr_ungroup);
453+ struct ccwgroup_device *gdev = to_ccwgroupdev(dev);
454+ struct ccwgroup_driver *gdrv = to_ccwgroupdrv(dev->driver);
490455
491456 if (!dev->driver)
492457 return 0;
493−
494− gdev = to_ccwgroupdev(dev);
495− gdrv = to_ccwgroupdrv(dev->driver);
496−
497458 if (gdrv->remove)
498459 gdrv->remove(gdev);
499460
@@ -502,15 +463,11 @@ ccwgroup_remove (struct device *dev) · 2 unmodified lines
502463
503464 static void ccwgroup_shutdown(struct device *dev)
504465 {
505− struct ccwgroup_device *gdev;
506− struct ccwgroup_driver *gdrv;
466+ struct ccwgroup_device *gdev = to_ccwgroupdev(dev);
467+ struct ccwgroup_driver *gdrv = to_ccwgroupdrv(dev->driver);
507468
508469 if (!dev->driver)
509470 return;
510−
511− gdev = to_ccwgroupdev(dev);
512− gdrv = to_ccwgroupdrv(dev->driver);
513−
514471 if (gdrv->shutdown)
515472 gdrv->shutdown(gdev);
516473 }
@@ -586,26 +543,12 @@ static const struct dev_pm_ops ccwgroup_pm_ops = { · 69 unmodified lines
586543 static struct bus_type ccwgroup_bus_type = {
587544 .name = "ccwgroup",
588545 .match = ccwgroup_bus_match,
589− .uevent = ccwgroup_uevent,
590546 .probe = ccwgroup_probe,
591547 .remove = ccwgroup_remove,
592548 .shutdown = ccwgroup_shutdown,
593549 .pm = &ccwgroup_pm_ops,
594550 };
595551
596−
597−static int ccwgroup_notifier(struct notifier_block *nb, unsigned long action,
598− void *data)
599−{
600− struct device *dev = data;
601−
602− if (action == BUS_NOTIFY_UNBIND_DRIVER)
603− device_schedule_callback(dev, ccwgroup_ungroup_callback);
604−
605− return NOTIFY_OK;
606−}
607−
608−
609552 /**
610553 * ccwgroup_driver_register() - register a ccw group driver
611554 * @cdriver: driver to be registered
@@ -619,9 +562,9 @@ int ccwgroup_driver_register(struct ccwgroup_driver *cdriver) · 7 unmodified lines
619562
620563 return driver_register(&cdriver->driver);
621564 }
565+EXPORT_SYMBOL(ccwgroup_driver_register);
622566
623−static int
624−__ccwgroup_match_all(struct device *dev, void *data)
567+static int __ccwgroup_match_all(struct device *dev, void *data)
625568 {
626569 return 1;
627570 }
@@ -652,6 +595,7 @@ void ccwgroup_driver_unregister(struct ccwgroup_driver *cdriver) · 24 unmodified lines
652595 put_driver(&cdriver->driver);
653596 driver_unregister(&cdriver->driver);
654597 }
598+EXPORT_SYMBOL(ccwgroup_driver_unregister);
655599
656600 /**
657601 * ccwgroup_probe_ccwdev() - probe function for slave devices
@@ -666,6 +610,7 @@ int ccwgroup_probe_ccwdev(struct ccw_device *cdev) · 8 unmodified lines
666610 {
667611 return 0;
668612 }
613+EXPORT_SYMBOL(ccwgroup_probe_ccwdev);
669614
670615 /**
671616 * ccwgroup_remove_ccwdev() - remove function for slave devices
@@ -702,9 +647,5 @@ void ccwgroup_remove_ccwdev(struct ccw_device *cdev) · 30 unmodified lines
702647 /* Release ccwgroup device reference for local processing. */
703648 put_device(&gdev->dev);
704649 }
705−
706−MODULE_LICENSE("GPL");
707−EXPORT_SYMBOL(ccwgroup_driver_register);
708−EXPORT_SYMBOL(ccwgroup_driver_unregister);
709−EXPORT_SYMBOL(ccwgroup_probe_ccwdev);
710650 EXPORT_SYMBOL(ccwgroup_remove_ccwdev);
651+MODULE_LICENSE("GPL");
drivers/s390/cio/ccwreq.c+20−3
@@ -1,10 +1,13 @@
11 /*
22 * Handling of internal CCW device requests.
33 *
4− * Copyright IBM Corp. 2009
4+ * Copyright IBM Corp. 2009, 2011
55 * Author(s): Peter Oberparleiter <peter.oberparleiter@de.ibm.com>
66 */
77
8+#define KMSG_COMPONENT "cio"
9+#define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
10+
811 #include <linux/types.h>
912 #include <linux/err.h>
1013 #include <asm/ccwdev.h>
@@ -323,7 +326,21 @@ void ccw_request_timeout(struct ccw_device *cdev) · 312 unmodified lines
323326 {
324327 struct subchannel *sch = to_subchannel(cdev->dev.parent);
325328 struct ccw_request *req = &cdev->private->req;
326− int rc;
329+ int rc = -ENODEV, chp;
330+
331+ if (cio_update_schib(sch))
332+ goto err;
333+
334+ for (chp = 0; chp < 8; chp++) {
335+ if ((0x80 >> chp) & sch->schib.pmcw.lpum)
336+ pr_warning("%s: No interrupt was received within %lus "
337+ "(CS=%02x, DS=%02x, CHPID=%x.%02x)\n",
338+ dev_name(&cdev->dev), req->timeout / HZ,
339+ scsw_cstat(&sch->schib.scsw),
340+ scsw_dstat(&sch->schib.scsw),
341+ sch->schid.cssid,
342+ sch->schib.pmcw.chpid[chp]);
343+ }
327344
328345 if (!ccwreq_next_path(cdev)) {
329346 /* set the final return code for this request */
@@ -342,7 +359,7 @@ err: · 12 unmodified lines
342359 * ccw_request_notoper - notoper handler for I/O request procedure
343360 * @cdev: ccw device
344361 *
345− * Handle timeout during I/O request procedure.
362+ * Handle notoper during I/O request procedure.
346363 */
347364 void ccw_request_notoper(struct ccw_device *cdev)
348365 {
drivers/s390/cio/chsc_sch.c+4−1
@@ -1,7 +1,7 @@
11 /*
22 * Driver for s390 chsc subchannels
33 *
4− * Copyright IBM Corp. 2008, 2009
4+ * Copyright IBM Corp. 2008, 2011
55 *
66 * Author(s): Cornelia Huck <cornelia.huck@de.ibm.com>
77 *
@@ -12,6 +12,7 @@ · 4 unmodified lines
1212 #include <linux/module.h>
1313 #include <linux/uaccess.h>
1414 #include <linux/miscdevice.h>
15+#include <linux/kernel_stat.h>
1516
1617 #include <asm/compat.h>
1718 #include <asm/cio.h>
@@ -56,6 +57,8 @@ static void chsc_subchannel_irq(struct subchannel *sch) · 38 unmodified lines
5657
5758 CHSC_LOG(4, "irb");
5859 CHSC_LOG_HEX(4, irb, sizeof(*irb));
60+ kstat_cpu(smp_processor_id()).irqs[IOINT_CSC]++;
61+
5962 /* Copy irb to provided request and set done. */
6063 if (!request) {
6164 CHSC_MSG(0, "Interrupt on sch 0.%x.%04x with no request\n",
drivers/s390/cio/cio.c+15−4
@@ -622,6 +622,7 @@ void __irq_entry do_IRQ(struct pt_regs *regs) · 621 unmodified lines
622622 sch = (struct subchannel *)(unsigned long)tpi_info->intparm;
623623 if (!sch) {
624624 /* Clear pending interrupt condition. */
625+ kstat_cpu(smp_processor_id()).irqs[IOINT_CIO]++;
625626 tsch(tpi_info->schid, irb);
626627 continue;
627628 }
@@ -634,7 +635,10 @@ void __irq_entry do_IRQ(struct pt_regs *regs) · 6 unmodified lines
634635 /* Call interrupt handler if there is one. */
635636 if (sch->driver && sch->driver->irq)
636637 sch->driver->irq(sch);
637− }
638+ else
639+ kstat_cpu(smp_processor_id()).irqs[IOINT_CIO]++;
640+ } else
641+ kstat_cpu(smp_processor_id()).irqs[IOINT_CIO]++;
638642 spin_unlock(sch->lock);
639643 /*
640644 * Are more interrupts pending?
@@ -667,18 +671,23 @@ static int cio_tpi(void) · 26 unmodified lines
667671 tpi_info = (struct tpi_info *)&S390_lowcore.subchannel_id;
668672 if (tpi(NULL) != 1)
669673 return 0;
674+ kstat_cpu(smp_processor_id()).irqs[IO_INTERRUPT]++;
670675 if (tpi_info->adapter_IO) {
671676 do_adapter_IO(tpi_info->isc);
672677 return 1;
673678 }
674679 irb = (struct irb *)&S390_lowcore.irb;
675680 /* Store interrupt response block to lowcore. */
676− if (tsch(tpi_info->schid, irb) != 0)
681+ if (tsch(tpi_info->schid, irb) != 0) {
677682 /* Not status pending or not operational. */
683+ kstat_cpu(smp_processor_id()).irqs[IOINT_CIO]++;
678684 return 1;
685+ }
679686 sch = (struct subchannel *)(unsigned long)tpi_info->intparm;
680− if (!sch)
687+ if (!sch) {
688+ kstat_cpu(smp_processor_id()).irqs[IOINT_CIO]++;
681689 return 1;
690+ }
682691 irq_context = in_interrupt();
683692 if (!irq_context)
684693 local_bh_disable();
@@ -687,6 +696,8 @@ static int cio_tpi(void) · 2 unmodified lines
687696 memcpy(&sch->schib.scsw, &irb->scsw, sizeof(union scsw));
688697 if (sch->driver && sch->driver->irq)
689698 sch->driver->irq(sch);
699+ else
700+ kstat_cpu(smp_processor_id()).irqs[IOINT_CIO]++;
690701 spin_unlock(sch->lock);
691702 irq_exit();
692703 if (!irq_context)
@@ -1058,7 +1069,7 @@ void reipl_ccw_dev(struct ccw_dev_id *devid) · 365 unmodified lines
10581069 {
10591070 struct subchannel_id schid;
10601071
1061− s390_reset_system();
1072+ s390_reset_system(NULL, NULL);
10621073 if (reipl_find_schid(devid, &schid) != 0)
10631074 panic("IPL Device not found\n");
10641075 do_reipl_asm(*((__u32*)&schid));
drivers/s390/cio/css.h+2−0
@@ -133,6 +133,8 @@ struct channel_subsystem { · 132 unmodified lines
133133
134134 extern struct channel_subsystem *channel_subsystems[];
135135
136+void channel_subsystem_reinit(void);
137+
136138 /* Helper functions to build lists for the slow path. */
137139 void css_schedule_eval(struct subchannel_id schid);
138140 void css_schedule_eval_all(void);
drivers/s390/cio/device.c+13−0
@@ -21,6 +21,7 @@ · 20 unmodified lines
2121 #include <linux/device.h>
2222 #include <linux/workqueue.h>
2323 #include <linux/timer.h>
24+#include <linux/kernel_stat.h>
2425
2526 #include <asm/ccwdev.h>
2627 #include <asm/cio.h>
@@ -747,6 +748,7 @@ static int io_subchannel_initialize_dev(struct subchannel *sch, · 720 unmodified lines
747748 struct ccw_device *cdev)
748749 {
749750 cdev->private->cdev = cdev;
751+ cdev->private->int_class = IOINT_CIO;
750752 atomic_set(&cdev->private->onoff, 0);
751753 cdev->dev.parent = &sch->dev;
752754 cdev->dev.release = ccw_device_release;
@@ -1010,6 +1012,8 @@ static void io_subchannel_irq(struct subchannel *sch) · 257 unmodified lines
10101012 CIO_TRACE_EVENT(6, dev_name(&sch->dev));
10111013 if (cdev)
10121014 dev_fsm_event(cdev, DEV_EVENT_INTERRUPT);
1015+ else
1016+ kstat_cpu(smp_processor_id()).irqs[IOINT_CIO]++;
10131017 }
10141018
10151019 void io_subchannel_init_config(struct subchannel *sch)
@@ -1621,6 +1625,7 @@ ccw_device_probe_console(void) · 605 unmodified lines
16211625 memset(&console_private, 0, sizeof(struct ccw_device_private));
16221626 console_cdev.private = &console_private;
16231627 console_private.cdev = &console_cdev;
1628+ console_private.int_class = IOINT_CIO;
16241629 ret = ccw_device_console_enable(&console_cdev, sch);
16251630 if (ret) {
16261631 cio_release_console();
@@ -1702,11 +1707,18 @@ ccw_device_probe (struct device *dev) · 75 unmodified lines
17021707 int ret;
17031708
17041709 cdev->drv = cdrv; /* to let the driver call _set_online */
1710+ /* Note: we interpret class 0 in this context as an uninitialized
1711+ * field since it translates to a non-I/O interrupt class. */
1712+ if (cdrv->int_class != 0)
1713+ cdev->private->int_class = cdrv->int_class;
1714+ else
1715+ cdev->private->int_class = IOINT_CIO;
17051716
17061717 ret = cdrv->probe ? cdrv->probe(cdev) : -ENODEV;
17071718
17081719 if (ret) {
17091720 cdev->drv = NULL;
1721+ cdev->private->int_class = IOINT_CIO;
17101722 return ret;
17111723 }
17121724
@@ -1740,6 +1752,7 @@ ccw_device_remove (struct device *dev) · 27 unmodified lines
17401752 }
17411753 ccw_device_set_timeout(cdev, 0);
17421754 cdev->drv = NULL;
1755+ cdev->private->int_class = IOINT_CIO;
17431756 return 0;
17441757 }
17451758
drivers/s390/cio/device.h+12−1
@@ -5,6 +5,7 @@ · 4 unmodified lines
55 #include <linux/atomic.h>
66 #include <linux/wait.h>
77 #include <linux/notifier.h>
8+#include <linux/kernel_stat.h>
89 #include "io_sch.h"
910
1011 /*
@@ -56,7 +57,17 @@ extern fsm_func_t *dev_jumptable[NR_DEV_STATES][NR_DEV_EVENTS]; · 45 unmodified lines
5657 static inline void
5758 dev_fsm_event(struct ccw_device *cdev, enum dev_event dev_event)
5859 {
59− dev_jumptable[cdev->private->state][dev_event](cdev, dev_event);
60+ int state = cdev->private->state;
61+
62+ if (dev_event == DEV_EVENT_INTERRUPT) {
63+ if (state == DEV_STATE_ONLINE)
64+ kstat_cpu(smp_processor_id()).
65+ irqs[cdev->private->int_class]++;
66+ else if (state != DEV_STATE_CMFCHANGE &&
67+ state != DEV_STATE_CMFUPDATE)
68+ kstat_cpu(smp_processor_id()).irqs[IOINT_CIO]++;
69+ }
70+ dev_jumptable[state][dev_event](cdev, dev_event);
6071 }
6172
6273 /*
drivers/s390/cio/io_sch.h+2−0
@@ -4,6 +4,7 @@ · 3 unmodified lines
44 #include <linux/types.h>
55 #include <asm/schid.h>
66 #include <asm/ccwdev.h>
7+#include <asm/irq.h>
78 #include "css.h"
89 #include "orb.h"
910
@@ -157,6 +158,7 @@ struct ccw_device_private { · 147 unmodified lines
157158 struct list_head cmb_list; /* list of measured devices */
158159 u64 cmb_start_time; /* clock value of cmb reset */
159160 void *cmb_wait; /* deferred cmb enable/disable */
161+ enum interruption_class int_class;
160162 };
161163
162164 static inline int rsch(struct subchannel_id schid)
drivers/s390/cio/qdio.h+6−34
@@ -18,14 +18,6 @@ · 17 unmodified lines
1818 #define QDIO_BUSY_BIT_RETRIES 1000 /* = 10s retry time */
1919 #define QDIO_INPUT_THRESHOLD (500 << 12) /* 500 microseconds */
2020
21−/*
22− * if an asynchronous HiperSockets queue runs full, the 10 seconds timer wait
23− * till next initiative to give transmitted skbs back to the stack is too long.
24− * Therefore polling is started in case of multicast queue is filled more
25− * than 50 percent.
26− */
27−#define QDIO_IQDIO_POLL_LVL 65 /* HS multicast queue */
28−
2921 enum qdio_irq_states {
3022 QDIO_IRQ_STATE_INACTIVE,
3123 QDIO_IRQ_STATE_ESTABLISHED,
@@ -290,6 +282,9 @@ struct qdio_q { · 258 unmodified lines
290282 /* error condition during a data transfer */
291283 unsigned int qdio_error;
292284
285+ /* last scan of the queue */
286+ u64 timestamp;
287+
293288 struct tasklet_struct tasklet;
294289 struct qdio_queue_perf_stat q_stats;
295290
@@ -423,31 +418,7 @@ static inline int multicast_outbound(struct qdio_q *q) · 127 unmodified lines
423418 #define queue_irqs_disabled(q) \
424419 (test_bit(QDIO_QUEUE_IRQS_DISABLED, &q->u.in.queue_irq_state) != 0)
425420
426−#define TIQDIO_SHARED_IND 63
427−
428−/* device state change indicators */
429−struct indicator_t {
430− u32 ind; /* u32 because of compare-and-swap performance */
431− atomic_t count; /* use count, 0 or 1 for non-shared indicators */
432−};
433−
434−extern struct indicator_t *q_indicators;
435−
436−static inline int has_multiple_inq_on_dsci(struct qdio_irq *irq)
437−{
438− return irq->nr_input_qs > 1;
439−}
440−
441−static inline int references_shared_dsci(struct qdio_irq *irq)
442−{
443− return irq->dsci == &q_indicators[TIQDIO_SHARED_IND].ind;
444−}
445−
446−static inline int shared_ind(struct qdio_q *q)
447−{
448− struct qdio_irq *i = q->irq_ptr;
449− return references_shared_dsci(i) || has_multiple_inq_on_dsci(i);
450−}
421+extern u64 last_ai_time;
451422
452423 /* prototypes for thin interrupt */
453424 void qdio_setup_thinint(struct qdio_irq *irq_ptr);
@@ -460,7 +431,8 @@ int tiqdio_allocate_memory(void); · 6 unmodified lines
460431 void tiqdio_free_memory(void);
461432 int tiqdio_register_thinints(void);
462433 void tiqdio_unregister_thinints(void);
463−
434+void clear_nonshared_ind(struct qdio_irq *);
435+int test_nonshared_ind(struct qdio_irq *);
464436
465437 /* prototypes for setup */
466438 void qdio_inbound_processing(unsigned long data);
drivers/s390/cio/qdio_debug.c+6−4
@@ -54,15 +54,17 @@ static int qstat_show(struct seq_file *m, void *v) · 53 unmodified lines
5454 if (!q)
5555 return 0;
5656
57− seq_printf(m, "DSCI: %d nr_used: %d\n",
58− *(u32 *)q->irq_ptr->dsci, atomic_read(&q->nr_buf_used));
59− seq_printf(m, "ftc: %d last_move: %d\n",
57+ seq_printf(m, "Timestamp: %Lx Last AI: %Lx\n",
58+ q->timestamp, last_ai_time);
59+ seq_printf(m, "nr_used: %d ftc: %d last_move: %d\n",
60+ atomic_read(&q->nr_buf_used),
6061 q->first_to_check, q->last_move);
6162 if (q->is_input_q) {
6263 seq_printf(m, "polling: %d ack start: %d ack count: %d\n",
6364 q->u.in.polling, q->u.in.ack_start,
6465 q->u.in.ack_count);
65− seq_printf(m, "IRQs disabled: %u\n",
66+ seq_printf(m, "DSCI: %d IRQs disabled: %u\n",
67+ *(u32 *)q->irq_ptr->dsci,
6668 test_bit(QDIO_QUEUE_IRQS_DISABLED,
6769 &q->u.in.queue_irq_state));
6870 }
drivers/s390/cio/qdio_main.c+50−52
@@ -15,7 +15,6 @@ · 14 unmodified lines
1515 #include <linux/delay.h>
1616 #include <linux/gfp.h>
1717 #include <linux/io.h>
18−#include <linux/kernel_stat.h>
1918 #include <linux/atomic.h>
2019 #include <asm/debug.h>
2120 #include <asm/qdio.h>
@@ -105,9 +104,12 @@ static inline int qdio_check_ccq(struct qdio_q *q, unsigned int ccq) · 83 unmodified lines
105104 /* all done or next buffer state different */
106105 if (ccq == 0 || ccq == 32)
107106 return 0;
108− /* not all buffers processed */
109− if (ccq == 96 || ccq == 97)
107+ /* no buffer processed */
108+ if (ccq == 97)
110109 return 1;
110+ /* not all buffers processed */
111+ if (ccq == 96)
112+ return 2;
111113 /* notify devices immediately */
112114 DBF_ERROR("%4x ccq:%3d", SCH_NO(q), ccq);
113115 return -EIO;
@@ -127,10 +129,8 @@ static inline int qdio_check_ccq(struct qdio_q *q, unsigned int ccq) · 13 unmodified lines
127129 static int qdio_do_eqbs(struct qdio_q *q, unsigned char *state,
128130 int start, int count, int auto_ack)
129131 {
132+ int rc, tmp_count = count, tmp_start = start, nr = q->nr, retried = 0;
130133 unsigned int ccq = 0;
131− int tmp_count = count, tmp_start = start;
132− int nr = q->nr;
133− int rc;
134134
135135 BUG_ON(!q->irq_ptr->sch_token);
136136 qperf_inc(q, eqbs);
@@ -141,30 +141,34 @@ again: · 4 unmodified lines
141141 ccq = do_eqbs(q->irq_ptr->sch_token, state, nr, &tmp_start, &tmp_count,
142142 auto_ack);
143143 rc = qdio_check_ccq(q, ccq);
144−
145− /* At least one buffer was processed, return and extract the remaining
146− * buffers later.
147− */
148− if ((ccq == 96) && (count != tmp_count)) {
149− qperf_inc(q, eqbs_partial);
150− return (count - tmp_count);
151− }
144+ if (!rc)
145+ return count - tmp_count;
152146
153147 if (rc == 1) {
154148 DBF_DEV_EVENT(DBF_WARN, q->irq_ptr, "EQBS again:%2d", ccq);
155149 goto again;
156150 }
157151
158− if (rc < 0) {
159− DBF_ERROR("%4x EQBS ERROR", SCH_NO(q));
160− DBF_ERROR("%3d%3d%2d", count, tmp_count, nr);
161− q->handler(q->irq_ptr->cdev,
162− QDIO_ERROR_ACTIVATE_CHECK_CONDITION,
163− q->nr, q->first_to_kick, count,
164− q->irq_ptr->int_parm);
165− return 0;
152+ if (rc == 2) {
153+ BUG_ON(tmp_count == count);
154+ qperf_inc(q, eqbs_partial);
155+ DBF_DEV_EVENT(DBF_WARN, q->irq_ptr, "EQBS part:%02x",
156+ tmp_count);
157+ /*
158+ * Retry once, if that fails bail out and process the
159+ * extracted buffers before trying again.
160+ */
161+ if (!retried++)
162+ goto again;
163+ else
164+ return count - tmp_count;
166165 }
167− return count - tmp_count;
166+
167+ DBF_ERROR("%4x EQBS ERROR", SCH_NO(q));
168+ DBF_ERROR("%3d%3d%2d", count, tmp_count, nr);
169+ q->handler(q->irq_ptr->cdev, QDIO_ERROR_ACTIVATE_CHECK_CONDITION,
170+ 0, -1, -1, q->irq_ptr->int_parm);
171+ return 0;
168172 }
169173
170174 /**
@@ -197,22 +201,22 @@ static int qdio_do_sqbs(struct qdio_q *q, unsigned char state, int start, · 26 unmodified lines
197201 again:
198202 ccq = do_sqbs(q->irq_ptr->sch_token, state, nr, &tmp_start, &tmp_count);
199203 rc = qdio_check_ccq(q, ccq);
200− if (rc == 1) {
204+ if (!rc) {
205+ WARN_ON(tmp_count);
206+ return count - tmp_count;
207+ }
208+
209+ if (rc == 1 || rc == 2) {
201210 DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "SQBS again:%2d", ccq);
202211 qperf_inc(q, sqbs_partial);
203212 goto again;
204213 }
205− if (rc < 0) {
206− DBF_ERROR("%4x SQBS ERROR", SCH_NO(q));
207− DBF_ERROR("%3d%3d%2d", count, tmp_count, nr);
208− q->handler(q->irq_ptr->cdev,
209− QDIO_ERROR_ACTIVATE_CHECK_CONDITION,
210− q->nr, q->first_to_kick, count,
211− q->irq_ptr->int_parm);
212− return 0;
213− }
214− WARN_ON(tmp_count);
215− return count - tmp_count;
214+
215+ DBF_ERROR("%4x SQBS ERROR", SCH_NO(q));
216+ DBF_ERROR("%3d%3d%2d", count, tmp_count, nr);
217+ q->handler(q->irq_ptr->cdev, QDIO_ERROR_ACTIVATE_CHECK_CONDITION,
218+ 0, -1, -1, q->irq_ptr->int_parm);
219+ return 0;
216220 }
217221
218222 /* returns number of examined buffers and their common state in *state */
@@ -277,7 +281,7 @@ static inline int set_buf_state(struct qdio_q *q, int bufnr, · 58 unmodified lines
277281 }
278282
279283 /* set slsb states to initial state */
280−void qdio_init_buf_states(struct qdio_irq *irq_ptr)
284+static void qdio_init_buf_states(struct qdio_irq *irq_ptr)
281285 {
282286 struct qdio_q *q;
283287 int i;
@@ -446,7 +450,7 @@ static void process_buffer_error(struct qdio_q *q, int count) · 162 unmodified lines
446450 qperf_inc(q, target_full);
447451 DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "OUTFULL FTC:%02x",
448452 q->first_to_check);
449− return;
453+ goto set;
450454 }
451455
452456 DBF_ERROR("%4x BUF ERROR", SCH_NO(q));
@@ -456,6 +460,7 @@ static void process_buffer_error(struct qdio_q *q, int count) · 3 unmodified lines
456460 q->sbal[q->first_to_check]->element[14].sflags,
457461 q->sbal[q->first_to_check]->element[15].sflags);
458462
463+set:
459464 /*
460465 * Interrupts may be avoided as long as the error is present
461466 * so change the buffer state immediately to avoid starvation.
@@ -513,6 +518,8 @@ static int get_inbound_buffer_frontier(struct qdio_q *q) · 51 unmodified lines
513518 int count, stop;
514519 unsigned char state = 0;
515520
521+ q->timestamp = get_clock_fast();
522+
516523 /*
517524 * Don't check 128 buffers, as otherwise qdio_inbound_q_moved
518525 * would return 0.
@@ -782,6 +789,8 @@ static int get_outbound_buffer_frontier(struct qdio_q *q) · 263 unmodified lines
782789 int count, stop;
783790 unsigned char state = 0;
784791
792+ q->timestamp = get_clock_fast();
793+
785794 if (need_siga_sync(q))
786795 if (((queue_type(q) != QDIO_IQDIO_QFMT) &&
787796 !pci_out_supported(q)) ||
@@ -912,21 +921,13 @@ static void __qdio_outbound_processing(struct qdio_q *q) · 124 unmodified lines
912921 if (!pci_out_supported(q) && !qdio_outbound_q_done(q))
913922 goto sched;
914923
915− /* bail out for HiperSockets unicast queues */
916− if (queue_type(q) == QDIO_IQDIO_QFMT && !multicast_outbound(q))
917− return;
918−
919− if ((queue_type(q) == QDIO_IQDIO_QFMT) &&
920− (atomic_read(&q->nr_buf_used)) > QDIO_IQDIO_POLL_LVL)
921− goto sched;
922−
923924 if (q->u.out.pci_out_enabled)
924925 return;
925926
926927 /*
927928 * Now we know that queue type is either qeth without pci enabled
928− * or HiperSockets multicast. Make sure buffer switch from PRIMED to
929− * EMPTY is noticed and outbound_handler is called after some time.
929+ * or HiperSockets. Make sure buffer switch from PRIMED to EMPTY
930+ * is noticed and outbound_handler is called after some time.
930931 */
931932 if (qdio_outbound_q_done(q))
932933 del_timer(&q->u.out.timer);
@@ -1128,7 +1129,6 @@ void qdio_int_handler(struct ccw_device *cdev, unsigned long intparm, · 195 unmodified lines
11281129 return;
11291130 }
11301131
1131− kstat_cpu(smp_processor_id()).irqs[IOINT_QDI]++;
11321132 if (irq_ptr->perf_stat_enabled)
11331133 irq_ptr->perf_stat.qdio_int++;
11341134
@@ -1719,9 +1719,7 @@ int qdio_start_irq(struct ccw_device *cdev, int nr) · 584 unmodified lines
17191719
17201720 WARN_ON(queue_irqs_enabled(q));
17211721
1722− if (!shared_ind(q))
1723− xchg(q->irq_ptr->dsci, 0);
1724−
1722+ clear_nonshared_ind(irq_ptr);
17251723 qdio_stop_polling(q);
17261724 clear_bit(QDIO_QUEUE_IRQS_DISABLED, &q->u.in.queue_irq_state);
17271725
@@ -1729,7 +1727,7 @@ int qdio_start_irq(struct ccw_device *cdev, int nr) · 1 unmodified line
17291727 * We need to check again to not lose initiative after
17301728 * resetting the ACK state.
17311729 */
1732− if (!shared_ind(q) && *q->irq_ptr->dsci)
1730+ if (test_nonshared_ind(irq_ptr))
17331731 goto rescan;
17341732 if (!qdio_inbound_q_done(q))
17351733 goto rescan;
drivers/s390/cio/qdio_thinint.c+48−4
@@ -26,17 +26,24 @@ · 25 unmodified lines
2626 */
2727 #define TIQDIO_NR_NONSHARED_IND 63
2828 #define TIQDIO_NR_INDICATORS (TIQDIO_NR_NONSHARED_IND + 1)
29+#define TIQDIO_SHARED_IND 63
30+
31+/* device state change indicators */
32+struct indicator_t {
33+ u32 ind; /* u32 because of compare-and-swap performance */
34+ atomic_t count; /* use count, 0 or 1 for non-shared indicators */
35+};
2936
3037 /* list of thin interrupt input queues */
3138 static LIST_HEAD(tiq_list);
32−DEFINE_MUTEX(tiq_list_lock);
39+static DEFINE_MUTEX(tiq_list_lock);
3340
3441 /* adapter local summary indicator */
3542 static u8 *tiqdio_alsi;
3643
37−struct indicator_t *q_indicators;
44+static struct indicator_t *q_indicators;
3845
39−static u64 last_ai_time;
46+u64 last_ai_time;
4047
4148 /* returns addr for the device state change indicator */
4249 static u32 *get_indicator(void)
@@ -90,6 +97,43 @@ void tiqdio_remove_input_queues(struct qdio_irq *irq_ptr) · 47 unmodified lines
9097 synchronize_rcu();
9198 }
9299
100+static inline int has_multiple_inq_on_dsci(struct qdio_irq *irq_ptr)
101+{
102+ return irq_ptr->nr_input_qs > 1;
103+}
104+
105+static inline int references_shared_dsci(struct qdio_irq *irq_ptr)
106+{
107+ return irq_ptr->dsci == &q_indicators[TIQDIO_SHARED_IND].ind;
108+}
109+
110+static inline int shared_ind(struct qdio_irq *irq_ptr)
111+{
112+ return references_shared_dsci(irq_ptr) ||
113+ has_multiple_inq_on_dsci(irq_ptr);
114+}
115+
116+void clear_nonshared_ind(struct qdio_irq *irq_ptr)
117+{
118+ if (!is_thinint_irq(irq_ptr))
119+ return;
120+ if (shared_ind(irq_ptr))
121+ return;
122+ xchg(irq_ptr->dsci, 0);
123+}
124+
125+int test_nonshared_ind(struct qdio_irq *irq_ptr)
126+{
127+ if (!is_thinint_irq(irq_ptr))
128+ return 0;
129+ if (shared_ind(irq_ptr))
130+ return 0;
131+ if (*irq_ptr->dsci)
132+ return 1;
133+ else
134+ return 0;
135+}
136+
93137 static inline u32 clear_shared_ind(void)
94138 {
95139 if (!atomic_read(&q_indicators[TIQDIO_SHARED_IND].count))
@@ -119,7 +163,7 @@ static inline void tiqdio_call_inq_handlers(struct qdio_irq *irq) · 23 unmodified lines
119163 q->u.in.queue_start_poll(q->irq_ptr->cdev, q->nr,
120164 q->irq_ptr->int_parm);
121165 } else {
122− if (!shared_ind(q))
166+ if (!shared_ind(q->irq_ptr))
123167 xchg(q->irq_ptr->dsci, 0);
124168
125169 /*
drivers/s390/kvm/kvm_virtio.c+4−4
@@ -33,7 +33,7 @@ · 32 unmodified lines
3333 * The pointer to our (page) of device descriptions.
3434 */
3535 static void *kvm_devices;
36−struct work_struct hotplug_work;
36+static struct work_struct hotplug_work;
3737
3838 struct kvm_device {
3939 struct virtio_device vdev;
@@ -334,10 +334,10 @@ static void scan_devices(void) · 294 unmodified lines
334334 */
335335 static int match_desc(struct device *dev, void *data)
336336 {
337− if ((ulong)to_kvmdev(dev_to_virtio(dev))->desc == (ulong)data)
338− return 1;
337+ struct virtio_device *vdev = dev_to_virtio(dev);
338+ struct kvm_device *kdev = to_kvmdev(vdev);
339339
340− return 0;
340+ return kdev->desc == data;
341341 }
342342
343343 /*
drivers/s390/net/claw.c+1−2
@@ -63,7 +63,6 @@ · 62 unmodified lines
6363
6464 #define KMSG_COMPONENT "claw"
6565
66−#include <linux/kernel_stat.h>
6766 #include <asm/ccwdev.h>
6867 #include <asm/ccwgroup.h>
6968 #include <asm/debug.h>
@@ -291,6 +290,7 @@ static struct ccw_driver claw_ccw_driver = { · 221 unmodified lines
291290 .ids = claw_ids,
292291 .probe = ccwgroup_probe_ccwdev,
293292 .remove = ccwgroup_remove_ccwdev,
293+ .int_class = IOINT_CLW,
294294 };
295295
296296 static ssize_t
@@ -645,7 +645,6 @@ claw_irq_handler(struct ccw_device *cdev, · 348 unmodified lines
645645 struct claw_env *p_env;
646646 struct chbk *p_ch_r=NULL;
647647
648− kstat_cpu(smp_processor_id()).irqs[IOINT_CLW]++;
649648 CLAW_DBF_TEXT(4, trace, "clawirq");
650649 /* Bypass all 'unsolicited interrupts' */
651650 privptr = dev_get_drvdata(&cdev->dev);
drivers/s390/net/ctcm_main.c+1−2
@@ -24,7 +24,6 @@ · 23 unmodified lines
2424 #define KMSG_COMPONENT "ctcm"
2525 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
2626
27−#include <linux/kernel_stat.h>
2827 #include <linux/module.h>
2928 #include <linux/init.h>
3029 #include <linux/kernel.h>
@@ -1203,7 +1202,6 @@ static void ctcm_irq_handler(struct ccw_device *cdev, · 1172 unmodified lines
12031202 int cstat;
12041203 int dstat;
12051204
1206− kstat_cpu(smp_processor_id()).irqs[IOINT_CTC]++;
12071205 CTCM_DBF_TEXT_(TRACE, CTC_DBF_DEBUG,
12081206 "Enter %s(%s)", CTCM_FUNTAIL, dev_name(&cdev->dev));
12091207
@@ -1769,6 +1767,7 @@ static struct ccw_driver ctcm_ccw_driver = { · 559 unmodified lines
17691767 .ids = ctcm_ids,
17701768 .probe = ccwgroup_probe_ccwdev,
17711769 .remove = ccwgroup_remove_ccwdev,
1770+ .int_class = IOINT_CTC,
17721771 };
17731772
17741773 static struct ccwgroup_driver ctcm_group_driver = {
drivers/s390/net/ctcm_sysfs.c+1−1
@@ -159,7 +159,7 @@ static ssize_t ctcm_proto_store(struct device *dev, · 158 unmodified lines
159159 return count;
160160 }
161161
162−const char *ctcm_type[] = {
162+static const char *ctcm_type[] = {
163163 "not a channel",
164164 "CTC/A",
165165 "FICON channel",
drivers/s390/net/lcs.c+2−3
@@ -26,7 +26,6 @@ · 25 unmodified lines
2626 #define KMSG_COMPONENT "lcs"
2727 #define pr_fmt(fmt) KMSG_COMPONENT ": " fmt
2828
29−#include <linux/kernel_stat.h>
3029 #include <linux/module.h>
3130 #include <linux/if.h>
3231 #include <linux/netdevice.h>
@@ -1399,7 +1398,6 @@ lcs_irq(struct ccw_device *cdev, unsigned long intparm, struct irb *irb) · 1366 unmodified lines
13991398 int rc, index;
14001399 int cstat, dstat;
14011400
1402− kstat_cpu(smp_processor_id()).irqs[IOINT_LCS]++;
14031401 if (lcs_check_irb_error(cdev, irb))
14041402 return;
14051403
@@ -1972,7 +1970,7 @@ lcs_portno_store (struct device *dev, struct device_attribute *attr, const char · 566 unmodified lines
19721970
19731971 static DEVICE_ATTR(portno, 0644, lcs_portno_show, lcs_portno_store);
19741972
1975−const char *lcs_type[] = {
1973+static const char *lcs_type[] = {
19761974 "not a channel",
19771975 "2216 parallel",
19781976 "2216 channel",
@@ -2399,6 +2397,7 @@ static struct ccw_driver lcs_ccw_driver = { · 420 unmodified lines
23992397 .ids = lcs_ids,
24002398 .probe = ccwgroup_probe_ccwdev,
24012399 .remove = ccwgroup_remove_ccwdev,
2400+ .int_class = IOINT_LCS,
24022401 };
24032402
24042403 /**
drivers/s390/net/qeth_l3_main.c+1−1
@@ -1415,7 +1415,7 @@ static int qeth_l3_send_checksum_command(struct qeth_card *card) · 1414 unmodified lines
14151415 return 0;
14161416 }
14171417
1418−int qeth_l3_set_rx_csum(struct qeth_card *card, int on)
1418+static int qeth_l3_set_rx_csum(struct qeth_card *card, int on)
14191419 {
14201420 int rc = 0;
14211421
include/linux/crash_dump.h+1−0
@@ -10,6 +10,7 @@ · 9 unmodified lines
1010 #define ELFCORE_ADDR_ERR (-2ULL)
1111
1212 extern unsigned long long elfcorehdr_addr;
13+extern unsigned long long elfcorehdr_size;
1314
1415 extern ssize_t copy_oldmem_page(unsigned long, char *, size_t,
1516 unsigned long, int);
include/linux/elf.h+1−0
@@ -395,6 +395,7 @@ typedef struct elf64_shdr { · 394 unmodified lines
395395 #define NT_S390_CTRS 0x304 /* s390 control registers */
396396 #define NT_S390_PREFIX 0x305 /* s390 prefix register */
397397 #define NT_S390_LAST_BREAK 0x306 /* s390 breaking event address */
398+#define NT_S390_SYSTEM_CALL 0x307 /* s390 system call restart data */
398399 #define NT_ARM_VFP 0x400 /* ARM VFP/NEON registers */
399400
400401
include/linux/kexec.h+10−0
@@ -33,6 +33,14 @@ · 32 unmodified lines
3333 #error KEXEC_ARCH not defined
3434 #endif
3535
36+#ifndef KEXEC_CRASH_CONTROL_MEMORY_LIMIT
37+#define KEXEC_CRASH_CONTROL_MEMORY_LIMIT KEXEC_CONTROL_MEMORY_LIMIT
38+#endif
39+
40+#ifndef KEXEC_CRASH_MEM_ALIGN
41+#define KEXEC_CRASH_MEM_ALIGN PAGE_SIZE
42+#endif
43+
3644 #define KEXEC_NOTE_HEAD_BYTES ALIGN(sizeof(struct elf_note), 4)
3745 #define KEXEC_CORE_NOTE_NAME "CORE"
3846 #define KEXEC_CORE_NOTE_NAME_BYTES ALIGN(sizeof(KEXEC_CORE_NOTE_NAME), 4)
@@ -129,6 +137,8 @@ extern void crash_kexec(struct pt_regs *); · 90 unmodified lines
129137 int kexec_should_crash(struct task_struct *);
130138 void crash_save_cpu(struct pt_regs *regs, int cpu);
131139 void crash_save_vmcoreinfo(void);
140+void crash_map_reserved_pages(void);
141+void crash_unmap_reserved_pages(void);
132142 void arch_crash_save_vmcoreinfo(void);
133143 void vmcoreinfo_append_str(const char *fmt, ...)
134144 __attribute__ ((format (printf, 1, 2)));
kernel/crash_dump.c+11−0
@@ -19,9 +19,16 @@ unsigned long saved_max_pfn; · 18 unmodified lines
1919 */
2020 unsigned long long elfcorehdr_addr = ELFCORE_ADDR_MAX;
2121
22+/*
23+ * stores the size of elf header of crash image
24+ */
25+unsigned long long elfcorehdr_size;
26+
2227 /*
2328 * elfcorehdr= specifies the location of elf core header stored by the crashed
2429 * kernel. This option will be passed by kexec loader to the capture kernel.
30+ *
31+ * Syntax: elfcorehdr=[size[KMG]@]offset[KMG]
2532 */
2633 static int __init setup_elfcorehdr(char *arg)
2734 {
@@ -29,6 +36,10 @@ static int __init setup_elfcorehdr(char *arg) · 1 unmodified line
2936 if (!arg)
3037 return -EINVAL;
3138 elfcorehdr_addr = memparse(arg, &end);
39+ if (*end == '@') {
40+ elfcorehdr_size = elfcorehdr_addr;
41+ elfcorehdr_addr = memparse(end + 1, &end);
42+ }
3243 return end > arg ? 0 : -EINVAL;
3344 }
3445 early_param("elfcorehdr", setup_elfcorehdr);
kernel/kexec.c+29−12
@@ -498,7 +498,7 @@ static struct page *kimage_alloc_crash_control_pages(struct kimage *image, · 497 unmodified lines
498498 while (hole_end <= crashk_res.end) {
499499 unsigned long i;
500500
501− if (hole_end > KEXEC_CONTROL_MEMORY_LIMIT)
501+ if (hole_end > KEXEC_CRASH_CONTROL_MEMORY_LIMIT)
502502 break;
503503 if (hole_end > crashk_res.end)
504504 break;
@@ -999,6 +999,7 @@ SYSCALL_DEFINE4(kexec_load, unsigned long, entry, unsigned long, nr_segments, · 494 unmodified lines
999999 kimage_free(xchg(&kexec_crash_image, NULL));
10001000 result = kimage_crash_alloc(&image, entry,
10011001 nr_segments, segments);
1002+ crash_map_reserved_pages();
10021003 }
10031004 if (result)
10041005 goto out;
@@ -1015,6 +1016,8 @@ SYSCALL_DEFINE4(kexec_load, unsigned long, entry, unsigned long, nr_segments, · 10 unmodified lines
10151016 goto out;
10161017 }
10171018 kimage_terminate(image);
1019+ if (flags & KEXEC_ON_CRASH)
1020+ crash_unmap_reserved_pages();
10181021 }
10191022 /* Install the new kernel, and Uninstall the old */
10201023 image = xchg(dest_image, image);
@@ -1026,6 +1029,18 @@ out: · 5 unmodified lines
10261029 return result;
10271030 }
10281031
1032+/*
1033+ * Add and remove page tables for crashkernel memory
1034+ *
1035+ * Provide an empty default implementation here -- architecture
1036+ * code may override this
1037+ */
1038+void __weak crash_map_reserved_pages(void)
1039+{}
1040+
1041+void __weak crash_unmap_reserved_pages(void)
1042+{}
1043+
10291044 #ifdef CONFIG_COMPAT
10301045 asmlinkage long compat_sys_kexec_load(unsigned long entry,
10311046 unsigned long nr_segments,
@@ -1134,14 +1149,16 @@ int crash_shrink_memory(unsigned long new_size) · 102 unmodified lines
11341149 goto unlock;
11351150 }
11361151
1137− start = roundup(start, PAGE_SIZE);
1138− end = roundup(start + new_size, PAGE_SIZE);
1152+ start = roundup(start, KEXEC_CRASH_MEM_ALIGN);
1153+ end = roundup(start + new_size, KEXEC_CRASH_MEM_ALIGN);
11391154
1155+ crash_map_reserved_pages();
11401156 crash_free_reserved_phys_range(end, crashk_res.end);
11411157
11421158 if ((start == end) && (crashk_res.parent != NULL))
11431159 release_resource(&crashk_res);
11441160 crashk_res.end = end - 1;
1161+ crash_unmap_reserved_pages();
11451162
11461163 unlock:
11471164 mutex_unlock(&kexec_mutex);
@@ -1380,24 +1397,23 @@ int __init parse_crashkernel(char *cmdline, · 232 unmodified lines
13801397 }
13811398
13821399
1383−
1384−void crash_save_vmcoreinfo(void)
1400+static void update_vmcoreinfo_note(void)
13851401 {
1386− u32 *buf;
1402+ u32 *buf = vmcoreinfo_note;
13871403
13881404 if (!vmcoreinfo_size)
13891405 return;
1390−
1391− vmcoreinfo_append_str("CRASHTIME=%ld", get_seconds());
1392−
1393− buf = (u32 *)vmcoreinfo_note;
1394−
13951406 buf = append_elf_note(buf, VMCOREINFO_NOTE_NAME, 0, vmcoreinfo_data,
13961407 vmcoreinfo_size);
1397−
13981408 final_note(buf);
13991409 }
14001410
1411+void crash_save_vmcoreinfo(void)
1412+{
1413+ vmcoreinfo_append_str("CRASHTIME=%ld", get_seconds());
1414+ update_vmcoreinfo_note();
1415+}
1416+
14011417 void vmcoreinfo_append_str(const char *fmt, ...)
14021418 {
14031419 va_list args;
@@ -1483,6 +1499,7 @@ static int __init crash_save_vmcoreinfo_init(void) · 79 unmodified lines
14831499 VMCOREINFO_NUMBER(PG_swapcache);
14841500
14851501 arch_crash_save_vmcoreinfo();
1502+ update_vmcoreinfo_note();
14861503
14871504 return 0;
14881505 }
kernel/sysctl.c+0−8
@@ -151,14 +151,6 @@ extern int pwrsw_enabled; · 150 unmodified lines
151151 extern int unaligned_enabled;
152152 #endif
153153
154−#ifdef CONFIG_S390
155−#ifdef CONFIG_MATHEMU
156−extern int sysctl_ieee_emulation_warnings;
157−#endif
158−extern int sysctl_userprocess_debug;
159−extern int spin_retry;
160−#endif
161−
162154 #ifdef CONFIG_IA64
163155 extern int no_unaligned_warning;
164156 extern int unaligned_dump_stack;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t