diff options
Diffstat (limited to 'arch/sparc64')
-rw-r--r-- | arch/sparc64/kernel/etrap.S | 7 | ||||
-rw-r--r-- | arch/sparc64/kernel/ptrace.c | 12 | ||||
-rw-r--r-- | arch/sparc64/kernel/rtrap.S | 1 | ||||
-rw-r--r-- | arch/sparc64/kernel/signal.c | 60 | ||||
-rw-r--r-- | arch/sparc64/kernel/signal32.c | 26 |
5 files changed, 51 insertions, 55 deletions
diff --git a/arch/sparc64/kernel/etrap.S b/arch/sparc64/kernel/etrap.S index b49d3b60bc0c..f25e1da3fd03 100644 --- a/arch/sparc64/kernel/etrap.S +++ b/arch/sparc64/kernel/etrap.S | |||
@@ -27,11 +27,12 @@ | |||
27 | 27 | ||
28 | .text | 28 | .text |
29 | .align 64 | 29 | .align 64 |
30 | .globl etrap, etrap_irq, etraptl1 | 30 | .globl etrap_syscall, etrap, etrap_irq, etraptl1 |
31 | etrap: rdpr %pil, %g2 | 31 | etrap: rdpr %pil, %g2 |
32 | etrap_irq: | 32 | etrap_irq: clr %g3 |
33 | TRAP_LOAD_THREAD_REG(%g6, %g1) | 33 | etrap_syscall: TRAP_LOAD_THREAD_REG(%g6, %g1) |
34 | rdpr %tstate, %g1 | 34 | rdpr %tstate, %g1 |
35 | or %g1, %g3, %g1 | ||
35 | sllx %g2, 20, %g3 | 36 | sllx %g2, 20, %g3 |
36 | andcc %g1, TSTATE_PRIV, %g0 | 37 | andcc %g1, TSTATE_PRIV, %g0 |
37 | or %g1, %g3, %g1 | 38 | or %g1, %g3, %g1 |
diff --git a/arch/sparc64/kernel/ptrace.c b/arch/sparc64/kernel/ptrace.c index b803fe9b2c8d..f6c9fc92921d 100644 --- a/arch/sparc64/kernel/ptrace.c +++ b/arch/sparc64/kernel/ptrace.c | |||
@@ -287,11 +287,11 @@ static int genregs64_set(struct task_struct *target, | |||
287 | 32 * sizeof(u64), | 287 | 32 * sizeof(u64), |
288 | 33 * sizeof(u64)); | 288 | 33 * sizeof(u64)); |
289 | if (!ret) { | 289 | if (!ret) { |
290 | /* Only the condition codes can be modified | 290 | /* Only the condition codes and the "in syscall" |
291 | * in the %tstate register. | 291 | * state can be modified in the %tstate register. |
292 | */ | 292 | */ |
293 | tstate &= (TSTATE_ICC | TSTATE_XCC); | 293 | tstate &= (TSTATE_ICC | TSTATE_XCC | TSTATE_SYSCALL); |
294 | regs->tstate &= ~(TSTATE_ICC | TSTATE_XCC); | 294 | regs->tstate &= ~(TSTATE_ICC | TSTATE_XCC | TSTATE_SYSCALL); |
295 | regs->tstate |= tstate; | 295 | regs->tstate |= tstate; |
296 | } | 296 | } |
297 | } | 297 | } |
@@ -657,8 +657,10 @@ static int genregs32_set(struct task_struct *target, | |||
657 | switch (pos) { | 657 | switch (pos) { |
658 | case 32: /* PSR */ | 658 | case 32: /* PSR */ |
659 | tstate = regs->tstate; | 659 | tstate = regs->tstate; |
660 | tstate &= ~(TSTATE_ICC | TSTATE_XCC); | 660 | tstate &= ~(TSTATE_ICC | TSTATE_XCC | TSTATE_SYSCALL); |
661 | tstate |= psr_to_tstate_icc(reg); | 661 | tstate |= psr_to_tstate_icc(reg); |
662 | if (reg & PSR_SYSCALL) | ||
663 | tstate |= TSTATE_SYSCALL; | ||
662 | regs->tstate = tstate; | 664 | regs->tstate = tstate; |
663 | break; | 665 | break; |
664 | case 33: /* PC */ | 666 | case 33: /* PC */ |
diff --git a/arch/sparc64/kernel/rtrap.S b/arch/sparc64/kernel/rtrap.S index ecf6753b204a..b9b785fd8b46 100644 --- a/arch/sparc64/kernel/rtrap.S +++ b/arch/sparc64/kernel/rtrap.S | |||
@@ -257,6 +257,7 @@ rt_continue: ldx [%sp + PTREGS_OFF + PT_V9_G1], %g1 | |||
257 | wr %o3, %g0, %y | 257 | wr %o3, %g0, %y |
258 | wrpr %l4, 0x0, %pil | 258 | wrpr %l4, 0x0, %pil |
259 | wrpr %g0, 0x1, %tl | 259 | wrpr %g0, 0x1, %tl |
260 | andn %l1, TSTATE_SYSCALL, %l1 | ||
260 | wrpr %l1, %g0, %tstate | 261 | wrpr %l1, %g0, %tstate |
261 | wrpr %l2, %g0, %tpc | 262 | wrpr %l2, %g0, %tpc |
262 | wrpr %o2, %g0, %tnpc | 263 | wrpr %o2, %g0, %tnpc |
diff --git a/arch/sparc64/kernel/signal.c b/arch/sparc64/kernel/signal.c index 07c0443ea3f5..2378482c2aab 100644 --- a/arch/sparc64/kernel/signal.c +++ b/arch/sparc64/kernel/signal.c | |||
@@ -333,7 +333,7 @@ void do_rt_sigreturn(struct pt_regs *regs) | |||
333 | regs->tnpc = tnpc; | 333 | regs->tnpc = tnpc; |
334 | 334 | ||
335 | /* Prevent syscall restart. */ | 335 | /* Prevent syscall restart. */ |
336 | pt_regs_clear_trap_type(regs); | 336 | pt_regs_clear_syscall(regs); |
337 | 337 | ||
338 | sigdelsetmask(&set, ~_BLOCKABLE); | 338 | sigdelsetmask(&set, ~_BLOCKABLE); |
339 | spin_lock_irq(¤t->sighand->siglock); | 339 | spin_lock_irq(¤t->sighand->siglock); |
@@ -499,7 +499,7 @@ static inline void handle_signal(unsigned long signr, struct k_sigaction *ka, | |||
499 | } | 499 | } |
500 | 500 | ||
501 | static inline void syscall_restart(unsigned long orig_i0, struct pt_regs *regs, | 501 | static inline void syscall_restart(unsigned long orig_i0, struct pt_regs *regs, |
502 | struct sigaction *sa) | 502 | struct sigaction *sa) |
503 | { | 503 | { |
504 | switch (regs->u_regs[UREG_I0]) { | 504 | switch (regs->u_regs[UREG_I0]) { |
505 | case ERESTART_RESTARTBLOCK: | 505 | case ERESTART_RESTARTBLOCK: |
@@ -525,19 +525,17 @@ static inline void syscall_restart(unsigned long orig_i0, struct pt_regs *regs, | |||
525 | */ | 525 | */ |
526 | static void do_signal(struct pt_regs *regs, unsigned long orig_i0) | 526 | static void do_signal(struct pt_regs *regs, unsigned long orig_i0) |
527 | { | 527 | { |
528 | struct signal_deliver_cookie cookie; | ||
529 | struct k_sigaction ka; | 528 | struct k_sigaction ka; |
529 | int restart_syscall; | ||
530 | sigset_t *oldset; | 530 | sigset_t *oldset; |
531 | siginfo_t info; | 531 | siginfo_t info; |
532 | int signr; | 532 | int signr; |
533 | 533 | ||
534 | if (pt_regs_is_syscall(regs) && | 534 | if (pt_regs_is_syscall(regs) && |
535 | (regs->tstate & (TSTATE_XCARRY | TSTATE_ICARRY))) { | 535 | (regs->tstate & (TSTATE_XCARRY | TSTATE_ICARRY))) { |
536 | pt_regs_clear_trap_type(regs); | 536 | restart_syscall = 1; |
537 | cookie.restart_syscall = 1; | ||
538 | } else | 537 | } else |
539 | cookie.restart_syscall = 0; | 538 | restart_syscall = 0; |
540 | cookie.orig_i0 = orig_i0; | ||
541 | 539 | ||
542 | if (test_thread_flag(TIF_RESTORE_SIGMASK)) | 540 | if (test_thread_flag(TIF_RESTORE_SIGMASK)) |
543 | oldset = ¤t->saved_sigmask; | 541 | oldset = ¤t->saved_sigmask; |
@@ -547,16 +545,25 @@ static void do_signal(struct pt_regs *regs, unsigned long orig_i0) | |||
547 | #ifdef CONFIG_COMPAT | 545 | #ifdef CONFIG_COMPAT |
548 | if (test_thread_flag(TIF_32BIT)) { | 546 | if (test_thread_flag(TIF_32BIT)) { |
549 | extern void do_signal32(sigset_t *, struct pt_regs *, | 547 | extern void do_signal32(sigset_t *, struct pt_regs *, |
550 | struct signal_deliver_cookie *); | 548 | int restart_syscall, |
551 | do_signal32(oldset, regs, &cookie); | 549 | unsigned long orig_i0); |
550 | do_signal32(oldset, regs, restart_syscall, orig_i0); | ||
552 | return; | 551 | return; |
553 | } | 552 | } |
554 | #endif | 553 | #endif |
555 | 554 | ||
556 | signr = get_signal_to_deliver(&info, &ka, regs, &cookie); | 555 | signr = get_signal_to_deliver(&info, &ka, regs, NULL); |
556 | |||
557 | /* If the debugger messes with the program counter, it clears | ||
558 | * the software "in syscall" bit, directing us to not perform | ||
559 | * a syscall restart. | ||
560 | */ | ||
561 | if (restart_syscall && !pt_regs_is_syscall(regs)) | ||
562 | restart_syscall = 0; | ||
563 | |||
557 | if (signr > 0) { | 564 | if (signr > 0) { |
558 | if (cookie.restart_syscall) | 565 | if (restart_syscall) |
559 | syscall_restart(cookie.orig_i0, regs, &ka.sa); | 566 | syscall_restart(orig_i0, regs, &ka.sa); |
560 | handle_signal(signr, &ka, &info, oldset, regs); | 567 | handle_signal(signr, &ka, &info, oldset, regs); |
561 | 568 | ||
562 | /* a signal was successfully delivered; the saved | 569 | /* a signal was successfully delivered; the saved |
@@ -568,16 +575,16 @@ static void do_signal(struct pt_regs *regs, unsigned long orig_i0) | |||
568 | clear_thread_flag(TIF_RESTORE_SIGMASK); | 575 | clear_thread_flag(TIF_RESTORE_SIGMASK); |
569 | return; | 576 | return; |
570 | } | 577 | } |
571 | if (cookie.restart_syscall && | 578 | if (restart_syscall && |
572 | (regs->u_regs[UREG_I0] == ERESTARTNOHAND || | 579 | (regs->u_regs[UREG_I0] == ERESTARTNOHAND || |
573 | regs->u_regs[UREG_I0] == ERESTARTSYS || | 580 | regs->u_regs[UREG_I0] == ERESTARTSYS || |
574 | regs->u_regs[UREG_I0] == ERESTARTNOINTR)) { | 581 | regs->u_regs[UREG_I0] == ERESTARTNOINTR)) { |
575 | /* replay the system call when we are done */ | 582 | /* replay the system call when we are done */ |
576 | regs->u_regs[UREG_I0] = cookie.orig_i0; | 583 | regs->u_regs[UREG_I0] = orig_i0; |
577 | regs->tpc -= 4; | 584 | regs->tpc -= 4; |
578 | regs->tnpc -= 4; | 585 | regs->tnpc -= 4; |
579 | } | 586 | } |
580 | if (cookie.restart_syscall && | 587 | if (restart_syscall && |
581 | regs->u_regs[UREG_I0] == ERESTART_RESTARTBLOCK) { | 588 | regs->u_regs[UREG_I0] == ERESTART_RESTARTBLOCK) { |
582 | regs->u_regs[UREG_G1] = __NR_restart_syscall; | 589 | regs->u_regs[UREG_G1] = __NR_restart_syscall; |
583 | regs->tpc -= 4; | 590 | regs->tpc -= 4; |
@@ -598,26 +605,3 @@ void do_notify_resume(struct pt_regs *regs, unsigned long orig_i0, unsigned long | |||
598 | if (thread_info_flags & (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK)) | 605 | if (thread_info_flags & (_TIF_SIGPENDING | _TIF_RESTORE_SIGMASK)) |
599 | do_signal(regs, orig_i0); | 606 | do_signal(regs, orig_i0); |
600 | } | 607 | } |
601 | |||
602 | void ptrace_signal_deliver(struct pt_regs *regs, void *cookie) | ||
603 | { | ||
604 | struct signal_deliver_cookie *cp = cookie; | ||
605 | |||
606 | if (cp->restart_syscall && | ||
607 | (regs->u_regs[UREG_I0] == ERESTARTNOHAND || | ||
608 | regs->u_regs[UREG_I0] == ERESTARTSYS || | ||
609 | regs->u_regs[UREG_I0] == ERESTARTNOINTR)) { | ||
610 | /* replay the system call when we are done */ | ||
611 | regs->u_regs[UREG_I0] = cp->orig_i0; | ||
612 | regs->tpc -= 4; | ||
613 | regs->tnpc -= 4; | ||
614 | cp->restart_syscall = 0; | ||
615 | } | ||
616 | if (cp->restart_syscall && | ||
617 | regs->u_regs[UREG_I0] == ERESTART_RESTARTBLOCK) { | ||
618 | regs->u_regs[UREG_G1] = __NR_restart_syscall; | ||
619 | regs->tpc -= 4; | ||
620 | regs->tnpc -= 4; | ||
621 | cp->restart_syscall = 0; | ||
622 | } | ||
623 | } | ||
diff --git a/arch/sparc64/kernel/signal32.c b/arch/sparc64/kernel/signal32.c index 0f6b7b156efd..3f19e9af3d1b 100644 --- a/arch/sparc64/kernel/signal32.c +++ b/arch/sparc64/kernel/signal32.c | |||
@@ -269,7 +269,7 @@ void do_sigreturn32(struct pt_regs *regs) | |||
269 | regs->tstate |= psr_to_tstate_icc(psr); | 269 | regs->tstate |= psr_to_tstate_icc(psr); |
270 | 270 | ||
271 | /* Prevent syscall restart. */ | 271 | /* Prevent syscall restart. */ |
272 | pt_regs_clear_trap_type(regs); | 272 | pt_regs_clear_syscall(regs); |
273 | 273 | ||
274 | err |= __get_user(fpu_save, &sf->fpu_save); | 274 | err |= __get_user(fpu_save, &sf->fpu_save); |
275 | if (fpu_save) | 275 | if (fpu_save) |
@@ -355,7 +355,7 @@ asmlinkage void do_rt_sigreturn32(struct pt_regs *regs) | |||
355 | regs->tstate |= psr_to_tstate_icc(psr); | 355 | regs->tstate |= psr_to_tstate_icc(psr); |
356 | 356 | ||
357 | /* Prevent syscall restart. */ | 357 | /* Prevent syscall restart. */ |
358 | pt_regs_clear_trap_type(regs); | 358 | pt_regs_clear_syscall(regs); |
359 | 359 | ||
360 | err |= __get_user(fpu_save, &sf->fpu_save); | 360 | err |= __get_user(fpu_save, &sf->fpu_save); |
361 | if (fpu_save) | 361 | if (fpu_save) |
@@ -768,16 +768,24 @@ static inline void syscall_restart32(unsigned long orig_i0, struct pt_regs *regs | |||
768 | * mistake. | 768 | * mistake. |
769 | */ | 769 | */ |
770 | void do_signal32(sigset_t *oldset, struct pt_regs * regs, | 770 | void do_signal32(sigset_t *oldset, struct pt_regs * regs, |
771 | struct signal_deliver_cookie *cookie) | 771 | int restart_syscall, unsigned long orig_i0) |
772 | { | 772 | { |
773 | struct k_sigaction ka; | 773 | struct k_sigaction ka; |
774 | siginfo_t info; | 774 | siginfo_t info; |
775 | int signr; | 775 | int signr; |
776 | 776 | ||
777 | signr = get_signal_to_deliver(&info, &ka, regs, cookie); | 777 | signr = get_signal_to_deliver(&info, &ka, regs, NULL); |
778 | |||
779 | /* If the debugger messes with the program counter, it clears | ||
780 | * the "in syscall" bit, directing us to not perform a syscall | ||
781 | * restart. | ||
782 | */ | ||
783 | if (restart_syscall && !pt_regs_is_syscall(regs)) | ||
784 | restart_syscall = 0; | ||
785 | |||
778 | if (signr > 0) { | 786 | if (signr > 0) { |
779 | if (cookie->restart_syscall) | 787 | if (restart_syscall) |
780 | syscall_restart32(cookie->orig_i0, regs, &ka.sa); | 788 | syscall_restart32(orig_i0, regs, &ka.sa); |
781 | handle_signal32(signr, &ka, &info, oldset, regs); | 789 | handle_signal32(signr, &ka, &info, oldset, regs); |
782 | 790 | ||
783 | /* a signal was successfully delivered; the saved | 791 | /* a signal was successfully delivered; the saved |
@@ -789,16 +797,16 @@ void do_signal32(sigset_t *oldset, struct pt_regs * regs, | |||
789 | clear_thread_flag(TIF_RESTORE_SIGMASK); | 797 | clear_thread_flag(TIF_RESTORE_SIGMASK); |
790 | return; | 798 | return; |
791 | } | 799 | } |
792 | if (cookie->restart_syscall && | 800 | if (restart_syscall && |
793 | (regs->u_regs[UREG_I0] == ERESTARTNOHAND || | 801 | (regs->u_regs[UREG_I0] == ERESTARTNOHAND || |
794 | regs->u_regs[UREG_I0] == ERESTARTSYS || | 802 | regs->u_regs[UREG_I0] == ERESTARTSYS || |
795 | regs->u_regs[UREG_I0] == ERESTARTNOINTR)) { | 803 | regs->u_regs[UREG_I0] == ERESTARTNOINTR)) { |
796 | /* replay the system call when we are done */ | 804 | /* replay the system call when we are done */ |
797 | regs->u_regs[UREG_I0] = cookie->orig_i0; | 805 | regs->u_regs[UREG_I0] = orig_i0; |
798 | regs->tpc -= 4; | 806 | regs->tpc -= 4; |
799 | regs->tnpc -= 4; | 807 | regs->tnpc -= 4; |
800 | } | 808 | } |
801 | if (cookie->restart_syscall && | 809 | if (restart_syscall && |
802 | regs->u_regs[UREG_I0] == ERESTART_RESTARTBLOCK) { | 810 | regs->u_regs[UREG_I0] == ERESTART_RESTARTBLOCK) { |
803 | regs->u_regs[UREG_G1] = __NR_restart_syscall; | 811 | regs->u_regs[UREG_G1] = __NR_restart_syscall; |
804 | regs->tpc -= 4; | 812 | regs->tpc -= 4; |