2.5.39 s390 (19/26): ptrace cleanup.
Subsystems (4)
PATCH 1/1 2.5.39 s390 (19/26): ptrace cleanup.
Rewrite s390 ptrace code in a more readable and less buggy way. As a part of this, all psw related definitions are moved into ptrace.h from a number of different locations.
arch/s390/kernel/process.c +6 -5
@@ -75,9 +75,10 @@/* * Wait for external, I/O or machine check interrupt and -* switch of machine check bit after the wait has ended. +* switch off machine check bit after the wait has ended. */ - wait_psw.mask = _WAIT_PSW_MASK; + wait_psw.mask =PSW_KERNEL_BITS |PSW_MASK_MCHECK |PSW_MASK_WAIT | +PSW_MASK_IO |PSW_MASK_EXT ; asmvolatile (" basr %0,0\n" "0: la %0,1f-0b(%0)\n"
@@ -114,7 +115,7 @@show_registers (regs);/* Show stack backtrace if pt_regs is from kernel mode */ -if (!(regs->psw.mask &PSW_PROBLEM_STATE )) +if (!(regs->psw.mask &PSW_MASK_PSTATE ))show_trace ((unsigned long *) regs->gprs[15 ]); }
@@ -135,8 +136,8 @@struct pt_regs regs;memset (®s,0 ,sizeof (regs)); - regs.psw.mask = _SVC_PSW_MASK; - regs.psw.addr = (__u32 ) kernel_thread_starter | _ADDR_31; + regs.psw.mask =PSW_KERNEL_BITS ; + regs.psw.addr = (__u32 ) kernel_thread_starter |PSW_ADDR_AMODE31 ; regs.gprs[7 ] =STACK_FRAME_OVERHEAD ; regs.gprs[8 ] = __LC_KERNEL_STACK; regs.gprs[9 ] = (unsigned long ) fn;
arch/s390/kernel/ptrace.c +249 -255
596 lines not on this page · raw message
arch/s390/kernel/setup.c +20 -21
54 lines not on this page · raw message
arch/s390/kernel/signal.c +15 -15
@@ -167,8 +167,8 @@int err; err =__copy_from_user (regs, &sregs->regs,sizeof (_s390_regs_common)); - regs->psw.mask = _USER_PSW_MASK | (regs->psw.mask &PSW_MASK_DEBUGCHANGE ); - regs->psw.addr |= _ADDR_31; + regs->psw.mask =PSW_USER_BITS | (regs->psw.mask &PSW_MASK_CC ); + regs->psw.addr |=PSW_ADDR_AMODE31 ;if (err)return err;
@@ -298,9 +298,9 @@/* Set up to return from userspace. If provided, use a stub already in userspace. */ if (ka->sa.sa_flags &SA_RESTORER ) { - regs->gprs[14 ] =FIX_PSW (ka->sa.sa_restorer); + regs->gprs[14 ] = (__u32 ) ka->sa.sa_restorer |PSW_ADDR_AMODE31 ; }else { - regs->gprs[14 ] =FIX_PSW (frame->retcode); + regs->gprs[14 ] = (__u32 ) frame->retcode |PSW_ADDR_AMODE31 ;if (__put_user (S390_SYSCALL_OPCODE | __NR_sigreturn, (u16 *)(frame->retcode))) goto give_sigsegv;
@@ -311,12 +311,12 @@ goto give_sigsegv;/* Set up registers for signal handler */ - regs->gprs[15 ] = (addr_t )frame; - regs->psw.addr =FIX_PSW (ka->sa.sa_handler); - regs->psw.mask = _USER_PSW_MASK; + regs->gprs[15 ] = (__u32 ) frame; + regs->psw.addr = (__u32 ) ka->sa.sa_handler |PSW_ADDR_AMODE31 ; + regs->psw.mask =PSW_USER_BITS ; regs->gprs[2 ] =map_signal (sig); - regs->gprs[3 ] = (addr_t)&frame->sc; + regs->gprs[3 ] = (__u32) &frame->sc;/* We forgot to include these in the sigcontext. To avoid breaking binary compatibility, they are passed as args. */
@@ -356,9 +356,9 @@/* Set up to return from userspace. If provided, use a stub already in userspace. */ if (ka->sa.sa_flags &SA_RESTORER ) { - regs->gprs[14 ] =FIX_PSW (ka->sa.sa_restorer); + regs->gprs[14 ] = (__u32 ) ka->sa.sa_restorer |PSW_ADDR_AMODE31 ; }else { - regs->gprs[14 ] =FIX_PSW (frame->retcode); + regs->gprs[14 ] = (__u32 ) frame->retcode |PSW_ADDR_AMODE31 ; err |=__put_user (S390_SYSCALL_OPCODE | __NR_rt_sigreturn, (u16 *)(frame->retcode)); }
@@ -368,13 +368,13 @@ goto give_sigsegv;/* Set up registers for signal handler */ - regs->gprs[15 ] = (addr_t )frame; - regs->psw.addr =FIX_PSW (ka->sa.sa_handler); - regs->psw.mask = _USER_PSW_MASK; + regs->gprs[15 ] = (__u32 ) frame; + regs->psw.addr = (__u32 ) ka->sa.sa_handler |PSW_ADDR_AMODE31 ; + regs->psw.mask =PSW_USER_BITS ; regs->gprs[2 ] =map_signal (sig); - regs->gprs[3 ] = (addr_t)&frame->info; - regs->gprs[4 ] = (addr_t)&frame->uc; + regs->gprs[3 ] = (__u32) &frame->info; + regs->gprs[4 ] = (__u32) &frame->uc;return ; give_sigsegv:
arch/s390/kernel/traps.c +20 -22
140 lines not on this page · raw message
arch/s390/mm/extable.c +2 -2
@@ -48,7 +48,7 @@ addr &=0x7fffffff ;/* remove amode bit from address */ /* There is only the kernel to search. */ ret =search_one_table (__start___ex_table, __stop___ex_table-1 , addr); -if (ret) ret =FIX_PSW (ret); +if (ret) ret = ret |PSW_ADDR_AMODE31 ;return ret;#else unsigned long flags;
@@ -63,7 +63,7 @@ ret =search_one_table (mp->ex_table_start, mp->ex_table_end -1 , addr);if (ret) { - ret =FIX_PSW (ret); + ret = ret |PSW_ADDR_AMODE31 ;break ; } }
arch/s390/mm/fault.c +6 -6
@@ -167,7 +167,7 @@/* Low-address protection hit in kernel mode means NULL pointer write access in kernel mode. */ -if (!(regs->psw.mask &PSW_PROBLEM_STATE )) { +if (!(regs->psw.mask &PSW_MASK_PSTATE )) { address =0 ; user_address =0 ; goto no_context;
@@ -259,7 +259,7 @@up_read (&mm->mmap_sem);/* User mode accesses just cause a SIGSEGV */ -if (regs->psw.mask &PSW_PROBLEM_STATE ) { +if (regs->psw.mask &PSW_MASK_PSTATE ) { tsk->thread.prot_addr = address; tsk->thread.trap_no = error_code;force_sigsegv (regs, error_code, si_code, address);
@@ -299,7 +299,7 @@ goto survive; }printk ("VM: killing process %s\n" , tsk->comm); -if (regs->psw.mask &PSW_PROBLEM_STATE ) +if (regs->psw.mask &PSW_MASK_PSTATE )do_exit (SIGKILL ); goto no_context;
@@ -315,7 +315,7 @@force_sig (SIGBUS , tsk);/* Kernel mode? Handle exceptions or die */ -if (!(regs->psw.mask &PSW_PROBLEM_STATE )) +if (!(regs->psw.mask &PSW_MASK_PSTATE )) goto no_context; }
@@ -394,7 +394,7 @@spin_unlock (&pseudo_wait_spinlock); }else {/* Pseudo page faults in kernel mode is a bad idea */ -if (!(regs->psw.mask &PSW_PROBLEM_STATE )) { +if (!(regs->psw.mask &PSW_MASK_PSTATE )) {/* * VM presents pseudo page faults if the interrupted * state was not disabled for interrupts. So we can
@@ -529,7 +529,7 @@* We got all needed information from the lowcore and can * now safely switch on interrupts. */ -if (regs->psw.mask &PSW_PROBLEM_STATE ) +if (regs->psw.mask &PSW_MASK_PSTATE )local_irq_enable ();if (subcode &0x0080 ) {
arch/s390x/kernel/linux32.h +26 -4
@@ -8,8 +8,6 @@#include <linux/nfsd/nfsd.h> #include <linux/nfsd/export.h> -#ifdef CONFIG_S390_SUPPORT -/* Macro that masks the high order bit of an 32 bit pointer and converts it*/ /* to a 64 bit pointer */ #define A (__x) ((unsigned long)((__x) & 0x7FFFFFFFUL))
@@ -194,6 +192,32 @@__u32 addr; } _psw_t32 __attribute__ ((aligned(8))); +#define PSW32_MASK_PER 0x40000000UL +#define PSW32_MASK_DAT 0x04000000UL +#define PSW32_MASK_IO 0x02000000UL +#define PSW32_MASK_EXT 0x01000000UL +#define PSW32_MASK_KEY 0x00F00000UL +#define PSW32_MASK_MCHECK 0x00040000UL +#define PSW32_MASK_WAIT 0x00020000UL +#define PSW32_MASK_PSTATE 0x00010000UL +#define PSW32_MASK_ASC 0x0000C000UL +#define PSW32_MASK_CC 0x00003000UL +#define PSW32_MASK_PM 0x00000f00UL + +#define PSW32_ADDR_AMODE31 0x80000000UL +#define PSW32_ADDR_INSN 0x7FFFFFFFUL + +#define PSW32_BASE_BITS 0x00080000UL + +#define PSW32_ASC_PRIMARY 0x00000000UL +#define PSW32_ASC_ACCREG 0x00004000UL +#define PSW32_ASC_SECONDARY 0x00008000UL +#define PSW32_ASC_HOME 0x0000C000UL + +#define PSW32_USER_BITS (PSW32_BASE_BITS | PSW32_MASK_DAT | PSW32_ASC_HOME | \ + PSW32_MASK_IO | PSW32_MASK_EXT | PSW32_MASK_MCHECK | \ + PSW32_MASK_PSTATE) + typedef struct { _psw_t32 psw;
@@ -241,6 +265,4 @@ sigset_t32 uc_sigmask; /* mask last for extensibility */ }; -#endif /* !CONFIG_S390_SUPPORT */ -#endif /* _ASM_S390X_S390_H */
arch/s390x/kernel/process.c +5 -4
@@ -75,9 +75,10 @@/* * Wait for external, I/O or machine check interrupt and -* switch of machine check bit after the wait has ended. +* switch off machine check bit after the wait has ended. */ - wait_psw.mask = _WAIT_PSW_MASK; + wait_psw.mask =PSW_KERNEL_BITS |PSW_MASK_MCHECK |PSW_MASK_WAIT | +PSW_MASK_IO |PSW_MASK_EXT ; asmvolatile (" larl %0,0f\n" " stg %0,8(%1)\n"
@@ -111,7 +112,7 @@show_registers (regs);/* Show stack backtrace if pt_regs is from kernel mode */ -if (!(regs->psw.mask &PSW_PROBLEM_STATE )) +if (!(regs->psw.mask &PSW_MASK_PSTATE ))show_trace ((unsigned long *) regs->gprs[15 ]); }
@@ -132,7 +133,7 @@struct pt_regs regs;memset (®s,0 ,sizeof (regs)); - regs.psw.mask = _SVC_PSW_MASK; + regs.psw.mask =PSW_KERNEL_BITS ; regs.psw.addr = (__u64 ) kernel_thread_starter; regs.gprs[7 ] =STACK_FRAME_OVERHEAD ; regs.gprs[8 ] = __LC_KERNEL_STACK;
arch/s390x/kernel/ptrace.c +463 -463
1,028 lines not on this page · raw message
arch/s390x/kernel/ptrace32.h +86 -0
86 lines not on this page · raw message
arch/s390x/kernel/setup.c +24 -21
58 lines not on this page · raw message
arch/s390x/kernel/signal.c +14 -14
@@ -162,7 +162,7 @@int err; err =__copy_from_user (regs, &sregs->regs,sizeof (_s390_regs_common)); - regs->psw.mask = _USER_PSW_MASK | (regs->psw.mask &PSW_MASK_DEBUGCHANGE ); + regs->psw.mask =PSW_USER_BITS | (regs->psw.mask &PSW_MASK_CC );if (err)return err;
@@ -292,9 +292,9 @@/* Set up to return from userspace. If provided, use a stub already in userspace. */ if (ka->sa.sa_flags &SA_RESTORER ) { - regs->gprs[14 ] =FIX_PSW (ka->sa.sa_restorer); + regs->gprs[14 ] = (__u64 ) ka->sa.sa_restorer; }else { - regs->gprs[14 ] =FIX_PSW (frame->retcode); + regs->gprs[14 ] = (__u64 ) frame->retcode;if (__put_user (S390_SYSCALL_OPCODE | __NR_sigreturn, (u16 *)(frame->retcode))) goto give_sigsegv;
@@ -305,12 +305,12 @@ goto give_sigsegv;/* Set up registers for signal handler */ - regs->gprs[15 ] = (addr_t )frame; - regs->psw.addr =FIX_PSW (ka->sa.sa_handler); - regs->psw.mask = _USER_PSW_MASK; + regs->gprs[15 ] = (__u64 ) frame; + regs->psw.addr = (__u64 ) ka->sa.sa_handler; + regs->psw.mask =PSW_USER_BITS ; regs->gprs[2 ] =map_signal (sig); - regs->gprs[3 ] = (addr_t)&frame->sc; + regs->gprs[3 ] = (__u64) &frame->sc;/* We forgot to include these in the sigcontext. To avoid breaking binary compatibility, they are passed as args. */
@@ -350,9 +350,9 @@/* Set up to return from userspace. If provided, use a stub already in userspace. */ if (ka->sa.sa_flags &SA_RESTORER ) { - regs->gprs[14 ] =FIX_PSW (ka->sa.sa_restorer); + regs->gprs[14 ] = (__u64 ) ka->sa.sa_restorer; }else { - regs->gprs[14 ] =FIX_PSW (frame->retcode); + regs->gprs[14 ] = (__u64 ) frame->retcode; err |=__put_user (S390_SYSCALL_OPCODE | __NR_rt_sigreturn, (u16 *)(frame->retcode)); }
@@ -362,13 +362,13 @@ goto give_sigsegv;/* Set up registers for signal handler */ - regs->gprs[15 ] = (addr_t )frame; - regs->psw.addr =FIX_PSW (ka->sa.sa_handler); - regs->psw.mask = _USER_PSW_MASK; + regs->gprs[15 ] = (__u64 ) frame; + regs->psw.addr = (__u64 ) ka->sa.sa_handler; + regs->psw.mask =PSW_USER_BITS ; regs->gprs[2 ] =map_signal (sig); - regs->gprs[3 ] = (addr_t)&frame->info; - regs->gprs[4 ] = (addr_t)&frame->uc; + regs->gprs[3 ] = (__u64) &frame->info; + regs->gprs[4 ] = (__u64) &frame->uc;return ; give_sigsegv:
arch/s390x/kernel/signal32.c +20 -25
96 lines not on this page · raw message
arch/s390x/kernel/traps.c +17 -19
@@ -118,22 +118,22 @@ stack = (unsigned long *)&stack;printk ("Call Trace: " ); - low_addr = ((unsigned long ) stack) &PSW_ADDR_MASK ; + low_addr = (unsigned long ) stack; high_addr = (low_addr & (-THREAD_SIZE )) +THREAD_SIZE ;/* Skip the first frame (biased stack) */ - backchain = *((unsigned long *) low_addr) &PSW_ADDR_MASK ; + backchain = *(unsigned long *) low_addr;/* Print up to 8 lines */ for (i =0 ; i <8 ; i++) {if (backchain < low_addr || backchain >= high_addr)break ; - ret_addr = *((unsigned long *) (backchain+112 )) &PSW_ADDR_MASK ; + ret_addr = *(unsigned long *) (backchain+112 );if (!kernel_text_address (ret_addr))break ;if (i && ((i %3 ) ==0 ))printk ("\n " );printk ("[<%016lx>] " , ret_addr); low_addr = backchain; - backchain = *((unsigned long *) backchain) &PSW_ADDR_MASK ; + backchain = *(unsigned long *) backchain; }printk ("\n" ); }
@@ -186,7 +186,7 @@char *mode;int i; - mode = (regs->psw.mask &PSW_PROBLEM_STATE ) ?"User" :"Krnl" ; + mode = (regs->psw.mask &PSW_MASK_PSTATE ) ?"User" :"Krnl" ;printk ("%s PSW : %016lx %016lx\n" , mode, (unsigned long ) regs->psw.mask, (unsigned long ) regs->psw.addr);
@@ -212,7 +212,7 @@* time of the fault. */ old_fs =get_fs (); -if (regs->psw.mask &PSW_PROBLEM_STATE ) +if (regs->psw.mask &PSW_MASK_PSTATE )set_fs (USER_DS );else set_fs (KERNEL_DS );
@@ -289,10 +289,10 @@* We got all needed information from the lowcore and can * now safely switch on interrupts. */ -if (regs->psw.mask &PSW_PROBLEM_STATE ) +if (regs->psw.mask &PSW_MASK_PSTATE )local_irq_enable (); -if (regs->psw.mask &PSW_PROBLEM_STATE ) { +if (regs->psw.mask &PSW_MASK_PSTATE ) {struct task_struct *tsk = current; tsk->thread.trap_no = interruption_code &0xffff ;if (info)
@@ -323,12 +323,12 @@static inline void *get_check_address (struct pt_regs *regs) { -return (void *)ADDR_BITS_REMOVE (regs->psw.addr-S390_lowcore.pgm_ilc); +return (void *)(regs->psw.addr - S390_lowcore.pgm_ilc); }int do_debugger_trap (struct pt_regs *regs,int signal) { -if (regs->psw.mask&PSW_PROBLEM_STATE ) +if (regs->psw.mask&PSW_MASK_PSTATE ) {if (current->ptrace &PT_PTRACED )force_sig (signal,current);
@@ -426,14 +426,14 @@* We got all needed information from the lowcore and can * now safely switch on interrupts. */ -if (regs->psw.mask &PSW_PROBLEM_STATE ) +if (regs->psw.mask &PSW_MASK_PSTATE )local_irq_enable ();/* WARNING don't change this check back to */ -/* int problem_state=(regs->psw.mask & PSW_PROBLEM_STATE); */ +/* int problem_state=(regs->psw.mask & PSW_MASK_PSTATE); */ /* & then doing if(problem_state) an int is too small for this */ /* check on 64 bit. */ -if (regs->psw.mask &PSW_PROBLEM_STATE ) +if (regs->psw.mask &PSW_MASK_PSTATE )get_user (*((__u16 *) opcode), location);else *((__u16 *)opcode)=*((__u16 *)location);
@@ -459,7 +459,7 @@* We got all needed information from the lowcore and can * now safely switch on interrupts. */ -if (regs->psw.mask &PSW_PROBLEM_STATE ) +if (regs->psw.mask &PSW_MASK_PSTATE )local_irq_enable (); __asm__ volatile ("stfpc %0\n\t"
@@ -527,21 +527,19 @@void handle_per_exception (struct pt_regs *regs) { -if (regs->psw.mask&PSW_PROBLEM_STATE ) - { +if (regs->psw.mask&PSW_MASK_PSTATE ) {per_struct *per_info=¤t->thread.per_info; per_info->lowcore.words.perc_atmid=S390_lowcore.per_perc_atmid; per_info->lowcore.words.address=S390_lowcore.per_address; per_info->lowcore.words.access_id=S390_lowcore.per_access_id; } -if (do_debugger_trap (regs,SIGTRAP )) - { +if (do_debugger_trap (regs,SIGTRAP )) {/* I've seen this possibly a task structure being reused ? */ printk ("Spurious per exception detected\n" );printk ("switching off per tracing for this task.\n" );show_regs (regs);/* Hopefully switching off per tracing will help us survive */ - regs->psw.mask &= ~PSW_PER_MASK ; + regs->psw.mask &= ~PSW_MASK_PER ; } }
arch/s390x/mm/fault.c +5 -5
@@ -167,7 +167,7 @@/* Low-address protection hit in kernel mode means NULL pointer write access in kernel mode. */ -if (!(regs->psw.mask &PSW_PROBLEM_STATE )) { +if (!(regs->psw.mask &PSW_MASK_PSTATE )) { address =0 ; user_address =0 ; goto no_context;
@@ -259,7 +259,7 @@up_read (&mm->mmap_sem);/* User mode accesses just cause a SIGSEGV */ -if (regs->psw.mask &PSW_PROBLEM_STATE ) { +if (regs->psw.mask &PSW_MASK_PSTATE ) { tsk->thread.prot_addr = address; tsk->thread.trap_no = error_code;force_sigsegv (regs, error_code, si_code, address);
@@ -299,7 +299,7 @@ goto survive; }printk ("VM: killing process %s\n" , tsk->comm); -if (regs->psw.mask &PSW_PROBLEM_STATE ) +if (regs->psw.mask &PSW_MASK_PSTATE )do_exit (SIGKILL ); goto no_context;
@@ -315,7 +315,7 @@force_sig (SIGBUS , tsk);/* Kernel mode? Handle exceptions or die */ -if (!(regs->psw.mask &PSW_PROBLEM_STATE )) +if (!(regs->psw.mask &PSW_MASK_PSTATE )) goto no_context; }
@@ -441,7 +441,7 @@* We got all needed information from the lowcore and can * now safely switch on interrupts. */ -if (regs->psw.mask &PSW_PROBLEM_STATE ) +if (regs->psw.mask &PSW_MASK_PSTATE )local_irq_enable ();if (subcode &0x0080 ) {
drivers/s390/cio/cio.c +3 -54
87 lines not on this page · raw message
include/asm-s390/lowcore.h +1 -30
@@ -52,41 +52,12 @@#define __LC_PFAULT_INTPARM 0x080 -/* interrupt handler start with all io, external and mcck interrupt disabled */ - -#define _RESTART_PSW_MASK 0x00080000 -#define _EXT_PSW_MASK 0x04080000 -#define _PGM_PSW_MASK 0x04080000 -#define _SVC_PSW_MASK 0x04080000 -#define _MCCK_PSW_MASK 0x04080000 -#define _IO_PSW_MASK 0x04080000 -#define _USER_PSW_MASK 0x070DC000/* DAT, IO, EXT, Home-space */ -#define _WAIT_PSW_MASK 0x070E0000/* DAT, IO, EXT, Wait, Home-space */ -#define _DW_PSW_MASK 0x000A0000/* disabled wait PSW mask */ - -#define _PRIMARY_MASK 0x0000/* MASK for SACF */ -#define _SECONDARY_MASK 0x0100/* MASK for SACF */ -#define _ACCESS_MASK 0x0200/* MASK for SACF */ -#define _HOME_MASK 0x0300/* MASK for SACF */ - -#define _PSW_PRIM_SPACE_MODE 0x00000000 -#define _PSW_SEC_SPACE_MODE 0x00008000 -#define _PSW_ACC_REG_MODE 0x00004000 -#define _PSW_HOME_SPACE_MODE 0x0000C000 - -#define _PSW_WAIT_MASK_BIT 0x00020000/* Wait bit */ -#define _PSW_IO_MASK_BIT 0x02000000/* IO bit */ -#define _PSW_IO_WAIT 0x02020000/* IO & Wait bit */ - -/* we run in 31 Bit mode */ -#define _ADDR_31 0x80000000 -#ifndef __ASSEMBLY__#include <linux/config.h> -#include <asm/processor.h> #include <linux/types.h> #include <asm/atomic.h> +#include <asm/processor.h> #include <asm/sigp.h> void restart_int_handler (void );
include/asm-s390/processor.h +5 -17
@@ -101,8 +101,8 @@/* need to define ... */ #define start_thread (regs, new_psw, new_stackp) do { \ - regs->psw.mask = _USER_PSW_MASK; \ - regs->psw.addr = new_psw | 0x80000000; \ + regs->psw.mask = PSW_USER_BITS; \ + regs->psw.addr = new_psw | PSW_ADDR_AMODE31; \ regs->gprs[15] = new_stackp ; \ } while (0)
@@ -137,19 +137,6 @@#define cpu_relax () barrier()/* -* Set of msr bits that gdb can change on behalf of a process. -*/ -/* Only let our hackers near the condition codes */ -#define PSW_MASK_DEBUGCHANGE 0x00003000UL -/* Don't let em near the addressing mode either */ -#define PSW_ADDR_DEBUGCHANGE 0x7FFFFFFFUL -#define PSW_ADDR_MASK 0x7FFFFFFFUL -/* Program event recording mask */ -#define PSW_PER_MASK 0x40000000UL -#define USER_STD_MASK 0x00000080UL -#define PSW_PROBLEM_STATE 0x00010000UL - -/* * Set PSW mask to specified value, while leaving the * PSW addr pointing to the next instruction. */
@@ -178,7 +165,8 @@unsigned long reg;psw_t wait_psw; - wait_psw.mask =0x070e0000 ; + wait_psw.mask =PSW_BASE_BITS |PSW_MASK_IO |PSW_MASK_EXT | +PSW_MASK_MCHECK |PSW_MASK_WAIT ; asmvolatile (" basr %0,0\n" "0: la %0,1f-0b(%0)\n"
@@ -200,7 +188,7 @@psw_t *dw_psw = (psw_t *)(((unsigned long ) &psw_buffer+sizeof (psw_t)-1 ) & -sizeof (psw_t)); - dw_psw->mask =0x000a0000 ; + dw_psw->mask =PSW_BASE_BITS |PSW_MASK_WAIT ; dw_psw->addr = code;/* * Store status and then load disabled wait psw,
include/asm-s390/ptrace.h +28 -7
@@ -114,7 +114,6 @@#include <linux/config.h> #include <linux/stddef.h> #include <linux/types.h> -#include <asm/setup.h> /* this typedef defines how a Program Status Word looks like */
@@ -124,10 +123,32 @@__u32 addr; } __attribute__ ((aligned(8))) psw_t; -#ifdef __KERNEL__ -#define FIX_PSW (addr) ((unsigned long)(addr)|0x80000000UL) -#define ADDR_BITS_REMOVE (addr) ((addr)&0x7fffffff) -#endif +#define PSW_MASK_PER 0x40000000UL +#define PSW_MASK_DAT 0x04000000UL +#define PSW_MASK_IO 0x02000000UL +#define PSW_MASK_EXT 0x01000000UL +#define PSW_MASK_KEY 0x00F00000UL +#define PSW_MASK_MCHECK 0x00040000UL +#define PSW_MASK_WAIT 0x00020000UL +#define PSW_MASK_PSTATE 0x00010000UL +#define PSW_MASK_ASC 0x0000C000UL +#define PSW_MASK_CC 0x00003000UL +#define PSW_MASK_PM 0x00000F00UL + +#define PSW_ADDR_AMODE31 0x80000000UL +#define PSW_ADDR_INSN 0x7FFFFFFFUL + +#define PSW_BASE_BITS 0x00080000UL + +#define PSW_ASC_PRIMARY 0x00000000UL +#define PSW_ASC_ACCREG 0x00004000UL +#define PSW_ASC_SECONDARY 0x00008000UL +#define PSW_ASC_HOME 0x0000C000UL + +#define PSW_KERNEL_BITS (PSW_BASE_BITS | PSW_MASK_DAT | PSW_ASC_PRIMARY) +#define PSW_USER_BITS (PSW_BASE_BITS | PSW_MASK_DAT | PSW_ASC_HOME | \ + PSW_MASK_IO | PSW_MASK_EXT | PSW_MASK_MCHECK | \ + PSW_MASK_PSTATE) typedef union {
@@ -328,8 +349,8 @@ };#ifdef __KERNEL__ -#define user_mode (regs) (((regs)->psw.mask & PSW_PROBLEM_STATE) != 0) -#define instruction_pointer (regs) ((regs)->psw.addr) +#define user_mode (regs) (((regs)->psw.mask & PSW_MASK_PSTATE) != 0) +#define instruction_pointer (regs) ((regs)->psw.addr & PSW_MASK_INSN)extern void show_regs (struct pt_regs * regs);#endif
include/asm-s390x/lowcore.h +0 -26
@@ -56,32 +56,6 @@#define __LC_PFAULT_INTPARM 0x11B8 -/* interrupt handler start with all io, external and mcck interrupt disabled */ - -#define _RESTART_PSW_MASK 0x0000000180000000 -#define _EXT_PSW_MASK 0x0400000180000000 -#define _PGM_PSW_MASK 0x0400000180000000 -#define _SVC_PSW_MASK 0x0400000180000000 -#define _MCCK_PSW_MASK 0x0400000180000000 -#define _IO_PSW_MASK 0x0400000180000000 -#define _USER_PSW_MASK 0x0705C00180000000 -#define _WAIT_PSW_MASK 0x0706000180000000 -#define _DW_PSW_MASK 0x0002000180000000 - -#define _PRIMARY_MASK 0x0000/* MASK for SACF */ -#define _SECONDARY_MASK 0x0100/* MASK for SACF */ -#define _ACCESS_MASK 0x0200/* MASK for SACF */ -#define _HOME_MASK 0x0300/* MASK for SACF */ - -#define _PSW_PRIM_SPACE_MODE 0x0000000000000000 -#define _PSW_SEC_SPACE_MODE 0x0000800000000000 -#define _PSW_ACC_REG_MODE 0x0000400000000000 -#define _PSW_HOME_SPACE_MODE 0x0000C00000000000 - -#define _PSW_WAIT_MASK_BIT 0x0002000000000000 -#define _PSW_IO_MASK_BIT 0x0200000000000000 -#define _PSW_IO_WAIT 0x0202000000000000 -#ifndef __ASSEMBLY__#include <linux/config.h>
include/asm-s390x/processor.h +5 -17
@@ -111,13 +111,13 @@/* need to define ... */ #define start_thread (regs, new_psw, new_stackp) do { \ - regs->psw.mask = _USER_PSW_MASK; \ + regs->psw.mask = PSW_USER_BITS; \ regs->psw.addr = new_psw; \ regs->gprs[15] = new_stackp; \ } while (0)#define start_thread31 (regs, new_psw, new_stackp) do { \ - regs->psw.mask = _USER_PSW_MASK & ~(1L << 32); \ + regs->psw.mask = PSW_USER32_BITS; \ regs->psw.addr = new_psw; \ regs->gprs[15] = new_stackp; \ } while (0)
@@ -154,19 +154,6 @@#define cpu_relax () barrier()/* -* Set of msr bits that gdb can change on behalf of a process. -*/ -/* Only let our hackers near the condition codes */ -#define PSW_MASK_DEBUGCHANGE 0x0000300000000000UL -/* Don't let em near the addressing mode either */ -#define PSW_ADDR_DEBUGCHANGE 0xFFFFFFFFFFFFFFFFUL -#define PSW_ADDR_MASK 0xFFFFFFFFFFFFFFFFUL -/* Program event recording mask */ -#define PSW_PER_MASK 0x4000000000000000UL -#define USER_STD_MASK 0x0000000000000080UL -#define PSW_PROBLEM_STATE 0x0001000000000000UL - -/* * Set PSW mask to specified value, while leaving the * PSW addr pointing to the next instruction. */
@@ -194,7 +181,8 @@unsigned long reg;psw_t wait_psw; - wait_psw.mask =0x0706000180000000 ; + wait_psw.mask =PSW_BASE_BITS |PSW_MASK_IO |PSW_MASK_EXT | +PSW_MASK_MCHECK |PSW_MASK_WAIT ; asmvolatile (" larl %0,0f\n" " stg %0,8(%1)\n"
@@ -214,7 +202,7 @@psw_t *dw_psw = (psw_t *)(((unsigned long ) &psw_buffer+sizeof (psw_t)-1 ) & -sizeof (psw_t)); - dw_psw->mask =0x0002000180000000 ; + dw_psw->mask =PSW_BASE_BITS |PSW_MASK_WAIT ; dw_psw->addr = code;/* * Store status and then load disabled wait psw,
include/asm-s390x/ptrace.h +28 -5
@@ -104,10 +104,33 @@__u64 addr; } __attribute__ ((aligned(8))) psw_t; -#ifdef __KERNEL__ -#define FIX_PSW (addr) ((unsigned long)(addr)) -#define ADDR_BITS_REMOVE (addr) ((addr)) -#endif +#define PSW_MASK_PER 0x4000000000000000UL +#define PSW_MASK_DAT 0x0400000000000000UL +#define PSW_MASK_IO 0x0200000000000000UL +#define PSW_MASK_EXT 0x0100000000000000UL +#define PSW_MASK_KEY 0x00F0000000000000UL +#define PSW_MASK_MCHECK 0x0004000000000000UL +#define PSW_MASK_WAIT 0x0002000000000000UL +#define PSW_MASK_PSTATE 0x0001000000000000UL +#define PSW_MASK_ASC 0x0000C00000000000UL +#define PSW_MASK_CC 0x0000300000000000UL +#define PSW_MASK_PM 0x00000F0000000000UL + +#define PSW_BASE_BITS 0x0000000180000000UL +#define PSW_BASE32_BITS 0x0000000080000000UL + +#define PSW_ASC_PRIMARY 0x0000000000000000UL +#define PSW_ASC_ACCREG 0x0000400000000000UL +#define PSW_ASC_SECONDARY 0x0000800000000000UL +#define PSW_ASC_HOME 0x0000C00000000000UL + +#define PSW_KERNEL_BITS (PSW_BASE_BITS | PSW_MASK_DAT | PSW_ASC_PRIMARY) +#define PSW_USER_BITS (PSW_BASE_BITS | PSW_MASK_DAT | PSW_ASC_HOME | \ + PSW_MASK_IO | PSW_MASK_EXT | PSW_MASK_MCHECK | \ + PSW_MASK_PSTATE) +#define PSW_USER32_BITS (PSW_BASE32_BITS | PSW_MASK_DAT | PSW_ASC_HOME | \ + PSW_MASK_IO | PSW_MASK_EXT | PSW_MASK_MCHECK | \ + PSW_MASK_PSTATE) typedef union {
@@ -309,7 +332,7 @@ };#ifdef __KERNEL__ -#define user_mode (regs) (((regs)->psw.mask & PSW_PROBLEM_STATE) != 0) +#define user_mode (regs) (((regs)->psw.mask & PSW_MASK_PSTATE) != 0)#define instruction_pointer (regs) ((regs)->psw.addr)extern void show_regs (struct pt_regs * regs);#endif