Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
bf306055
Commit
bf306055
authored
May 14, 2002
by
Anton Blanchard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ppc64: remove old code for stacking signals, its not used any more
parent
c0a8b2ab
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
207 additions
and
306 deletions
+207
-306
arch/ppc64/kernel/signal.c
arch/ppc64/kernel/signal.c
+38
-82
arch/ppc64/kernel/signal32.c
arch/ppc64/kernel/signal32.c
+169
-224
No files found.
arch/ppc64/kernel/signal.c
View file @
bf306055
...
@@ -246,7 +246,6 @@ int sys_rt_sigreturn(unsigned long r3, unsigned long r4, unsigned long r5,
...
@@ -246,7 +246,6 @@ int sys_rt_sigreturn(unsigned long r3, unsigned long r4, unsigned long r5,
struct
rt_sigframe
*
rt_sf
;
struct
rt_sigframe
*
rt_sf
;
struct
sigcontext_struct
sigctx
;
struct
sigcontext_struct
sigctx
;
struct
sigregs
*
sr
;
struct
sigregs
*
sr
;
int
ret
;
elf_gregset_t
saved_regs
;
/* an array of ELF_NGREG unsigned longs */
elf_gregset_t
saved_regs
;
/* an array of ELF_NGREG unsigned longs */
sigset_t
set
;
sigset_t
set
;
stack_t
st
;
stack_t
st
;
...
@@ -263,9 +262,7 @@ int sys_rt_sigreturn(unsigned long r3, unsigned long r4, unsigned long r5,
...
@@ -263,9 +262,7 @@ int sys_rt_sigreturn(unsigned long r3, unsigned long r4, unsigned long r5,
recalc_sigpending
();
recalc_sigpending
();
spin_unlock_irq
(
&
current
->
sigmask_lock
);
spin_unlock_irq
(
&
current
->
sigmask_lock
);
rt_sf
++
;
/* Look at next rt_sigframe */
/* restore registers -
if
(
rt_sf
==
(
struct
rt_sigframe
*
)(
sigctx
.
regs
))
{
/* Last stacked signal - restore registers -
* sigctx is initialized to point to the
* sigctx is initialized to point to the
* preamble frame (where registers are stored)
* preamble frame (where registers are stored)
* see handle_signal()
* see handle_signal()
...
@@ -287,28 +284,7 @@ int sys_rt_sigreturn(unsigned long r3, unsigned long r4, unsigned long r5,
...
@@ -287,28 +284,7 @@ int sys_rt_sigreturn(unsigned long r3, unsigned long r4, unsigned long r5,
the current task structure. */
the current task structure. */
sys_sigaltstack
(
&
st
,
NULL
);
sys_sigaltstack
(
&
st
,
NULL
);
ret
=
regs
->
result
;
return
regs
->
result
;
}
else
{
/* More signals to go */
/* Set up registers for next signal handler */
regs
->
gpr
[
1
]
=
(
unsigned
long
)
rt_sf
-
__SIGNAL_FRAMESIZE
;
if
(
copy_from_user
(
&
sigctx
,
&
rt_sf
->
uc
.
uc_mcontext
,
sizeof
(
sigctx
)))
goto
badframe
;
sr
=
(
struct
sigregs
*
)
sigctx
.
regs
;
regs
->
gpr
[
3
]
=
ret
=
sigctx
.
signal
;
/* Get the siginfo */
get_user
(
regs
->
gpr
[
4
],
(
unsigned
long
*
)
&
rt_sf
->
pinfo
);
/* Get the ucontext */
get_user
(
regs
->
gpr
[
5
],
(
unsigned
long
*
)
&
rt_sf
->
puc
);
regs
->
gpr
[
6
]
=
(
unsigned
long
)
rt_sf
;
regs
->
link
=
(
unsigned
long
)
&
sr
->
tramp
;
regs
->
nip
=
sigctx
.
handler
;
if
(
get_user
(
prevsp
,
&
sr
->
gp_regs
[
PT_R1
])
||
put_user
(
prevsp
,
(
unsigned
long
*
)
regs
->
gpr
[
1
]))
goto
badframe
;
}
return
ret
;
badframe:
badframe:
do_exit
(
SIGSEGV
);
do_exit
(
SIGSEGV
);
...
@@ -388,7 +364,6 @@ long sys_sigreturn(unsigned long r3, unsigned long r4, unsigned long r5,
...
@@ -388,7 +364,6 @@ long sys_sigreturn(unsigned long r3, unsigned long r4, unsigned long r5,
{
{
struct
sigcontext_struct
*
sc
,
sigctx
;
struct
sigcontext_struct
*
sc
,
sigctx
;
struct
sigregs
*
sr
;
struct
sigregs
*
sr
;
long
ret
;
elf_gregset_t
saved_regs
;
/* an array of ELF_NGREG unsigned longs */
elf_gregset_t
saved_regs
;
/* an array of ELF_NGREG unsigned longs */
sigset_t
set
;
sigset_t
set
;
unsigned
long
prevsp
;
unsigned
long
prevsp
;
...
@@ -407,9 +382,7 @@ long sys_sigreturn(unsigned long r3, unsigned long r4, unsigned long r5,
...
@@ -407,9 +382,7 @@ long sys_sigreturn(unsigned long r3, unsigned long r4, unsigned long r5,
recalc_sigpending
();
recalc_sigpending
();
spin_unlock_irq
(
&
current
->
sigmask_lock
);
spin_unlock_irq
(
&
current
->
sigmask_lock
);
sc
++
;
/* Look at next sigcontext */
/* restore registers */
if
(
sc
==
(
struct
sigcontext_struct
*
)(
sigctx
.
regs
))
{
/* Last stacked signal - restore registers */
sr
=
(
struct
sigregs
*
)
sigctx
.
regs
;
sr
=
(
struct
sigregs
*
)
sigctx
.
regs
;
if
(
regs
->
msr
&
MSR_FP
)
if
(
regs
->
msr
&
MSR_FP
)
giveup_fpu
(
current
);
giveup_fpu
(
current
);
...
@@ -425,24 +398,7 @@ long sys_sigreturn(unsigned long r3, unsigned long r4, unsigned long r5,
...
@@ -425,24 +398,7 @@ long sys_sigreturn(unsigned long r3, unsigned long r4, unsigned long r5,
sizeof
(
sr
->
fp_regs
)))
sizeof
(
sr
->
fp_regs
)))
goto
badframe
;
goto
badframe
;
ret
=
regs
->
result
;
return
regs
->
result
;
}
else
{
/* More signals to go */
regs
->
gpr
[
1
]
=
(
unsigned
long
)
sc
-
__SIGNAL_FRAMESIZE
;
if
(
copy_from_user
(
&
sigctx
,
sc
,
sizeof
(
sigctx
)))
goto
badframe
;
sr
=
(
struct
sigregs
*
)
sigctx
.
regs
;
regs
->
gpr
[
3
]
=
ret
=
sigctx
.
signal
;
regs
->
gpr
[
4
]
=
(
unsigned
long
)
sc
;
regs
->
link
=
(
unsigned
long
)
&
sr
->
tramp
;
regs
->
nip
=
sigctx
.
handler
;
if
(
get_user
(
prevsp
,
&
sr
->
gp_regs
[
PT_R1
])
||
put_user
(
prevsp
,
(
unsigned
long
*
)
regs
->
gpr
[
1
]))
goto
badframe
;
}
return
ret
;
badframe:
badframe:
do_exit
(
SIGSEGV
);
do_exit
(
SIGSEGV
);
...
@@ -552,7 +508,7 @@ handle_signal(unsigned long sig, struct k_sigaction *ka,
...
@@ -552,7 +508,7 @@ handle_signal(unsigned long sig, struct k_sigaction *ka,
||
__put_user
(
sig
,
&
rt_sf
->
uc
.
uc_mcontext
.
signal
))
||
__put_user
(
sig
,
&
rt_sf
->
uc
.
uc_mcontext
.
signal
))
goto
badframe
;
goto
badframe
;
}
else
{
}
else
{
/* Put a
nother
sigcontext on the stack */
/* Put a sigcontext on the stack */
*
newspp
-=
sizeof
(
*
sc
);
*
newspp
-=
sizeof
(
*
sc
);
sc
=
(
struct
sigcontext_struct
*
)
*
newspp
;
sc
=
(
struct
sigcontext_struct
*
)
*
newspp
;
if
(
verify_area
(
VERIFY_WRITE
,
sc
,
sizeof
(
*
sc
)))
if
(
verify_area
(
VERIFY_WRITE
,
sc
,
sizeof
(
*
sc
)))
...
...
arch/ppc64/kernel/signal32.c
View file @
bf306055
...
@@ -254,11 +254,6 @@ long sys32_sigreturn(unsigned long r3, unsigned long r4, unsigned long r5,
...
@@ -254,11 +254,6 @@ long sys32_sigreturn(unsigned long r3, unsigned long r4, unsigned long r5,
recalc_sigpending
();
recalc_sigpending
();
spin_unlock_irq
(
&
current
->
sigmask_lock
);
spin_unlock_irq
(
&
current
->
sigmask_lock
);
sc
++
;
/* Look at next sigcontext */
/* If the next sigcontext is actually the sigregs (frame) */
/* - then no more sigcontexts on the user stack */
if
(
sc
==
(
struct
sigcontext32_struct
*
)(
u64
)
sigctx
.
regs
)
{
/* Last stacked signal - restore registers */
/* Last stacked signal - restore registers */
sr
=
(
struct
sigregs32
*
)(
u64
)
sigctx
.
regs
;
sr
=
(
struct
sigregs32
*
)(
u64
)
sigctx
.
regs
;
if
(
regs
->
msr
&
MSR_FP
)
if
(
regs
->
msr
&
MSR_FP
)
...
@@ -349,21 +344,6 @@ long sys32_sigreturn(unsigned long r3, unsigned long r4, unsigned long r5,
...
@@ -349,21 +344,6 @@ long sys32_sigreturn(unsigned long r3, unsigned long r4, unsigned long r5,
goto
badframe
;
goto
badframe
;
ret
=
regs
->
result
;
ret
=
regs
->
result
;
}
else
{
/* More signals to go */
regs
->
gpr
[
1
]
=
(
unsigned
long
)
sc
-
__SIGNAL_FRAMESIZE32
;
if
(
copy_from_user
(
&
sigctx
,
sc
,
sizeof
(
sigctx
)))
goto
badframe
;
sr
=
(
struct
sigregs32
*
)(
u64
)
sigctx
.
regs
;
regs
->
gpr
[
3
]
=
ret
=
sigctx
.
signal
;
regs
->
gpr
[
4
]
=
(
unsigned
long
)
sc
;
regs
->
link
=
(
unsigned
long
)
&
sr
->
tramp
;
regs
->
nip
=
sigctx
.
handler
;
if
(
get_user
(
prevsp
,
&
sr
->
gp_regs
[
PT_R1
])
||
put_user
(
prevsp
,
(
unsigned
int
*
)
regs
->
gpr
[
1
]))
goto
badframe
;
}
return
ret
;
return
ret
;
badframe:
badframe:
...
@@ -561,10 +541,6 @@ long sys32_rt_sigreturn(unsigned long r3, unsigned long r4, unsigned long r5,
...
@@ -561,10 +541,6 @@ long sys32_rt_sigreturn(unsigned long r3, unsigned long r4, unsigned long r5,
/* Set to point to the next rt_sigframe - this is used to determine whether this
/* Set to point to the next rt_sigframe - this is used to determine whether this
* is the last signal to process
* is the last signal to process
*/
*/
rt_stack_frame
++
;
if
(
rt_stack_frame
==
(
struct
rt_sigframe_32
*
)(
u64
)(
sigctx
.
regs
))
{
signalregs
=
(
struct
sigregs32
*
)
(
u64
)
sigctx
.
regs
;
signalregs
=
(
struct
sigregs32
*
)
(
u64
)
sigctx
.
regs
;
/* If currently owning the floating point - give them up */
/* If currently owning the floating point - give them up */
if
(
regs
->
msr
&
MSR_FP
)
if
(
regs
->
msr
&
MSR_FP
)
...
@@ -649,37 +625,6 @@ long sys32_rt_sigreturn(unsigned long r3, unsigned long r4, unsigned long r5,
...
@@ -649,37 +625,6 @@ long sys32_rt_sigreturn(unsigned long r3, unsigned long r4, unsigned long r5,
regs
->
dsisr
=
0
;
regs
->
dsisr
=
0
;
regs
->
result
=
(
u64
)(
saved_regs
[
PT_RESULT
])
&
0xFFFFFFFF
;
regs
->
result
=
(
u64
)(
saved_regs
[
PT_RESULT
])
&
0xFFFFFFFF
;
ret
=
regs
->
result
;
ret
=
regs
->
result
;
}
else
/* more signals to go */
{
udbg_printf
(
"hey should not occur
\n
"
);
regs
->
gpr
[
1
]
=
(
u64
)
rt_stack_frame
-
__SIGNAL_FRAMESIZE32
;
if
(
copy_from_user
(
&
sigctx
,
&
rt_stack_frame
->
uc
.
uc_mcontext
,
sizeof
(
sigctx
)))
{
goto
badframe
;
}
signalregs
=
(
struct
sigregs32
*
)
(
u64
)
sigctx
.
regs
;
/* first parm to signal handler is the signal number */
regs
->
gpr
[
3
]
=
ret
=
sigctx
.
signal
;
/* second parm is a pointer to sig info */
get_user
(
regs
->
gpr
[
4
],
&
rt_stack_frame
->
pinfo
);
/* third parm is a pointer to the ucontext */
get_user
(
regs
->
gpr
[
5
],
&
rt_stack_frame
->
puc
);
/* fourth parm is the stack frame */
regs
->
gpr
[
6
]
=
(
u64
)
rt_stack_frame
;
/* Set up link register to return to sigreturn when the */
/* signal handler completes */
regs
->
link
=
(
u64
)
&
signalregs
->
tramp
;
/* Set next instruction to the start fo the signal handler */
regs
->
nip
=
sigctx
.
handler
;
/* Set the reg1 to look like a call to the signal handler */
if
(
get_user
(
previous_stack
,
&
signalregs
->
gp_regs
[
PT_R1
])
||
put_user
(
previous_stack
,
(
unsigned
long
*
)
regs
->
gpr
[
1
]))
{
goto
badframe
;
}
}
return
ret
;
return
ret
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment