Skip to content

Commit b3707c7

Browse files
richardweinbergerrichardweinberger
committed
tile: Use get_signal() signal_setup_done()
Use the more generic functions get_signal() signal_setup_done() for signal delivery. Signed-off-by: Richard Weinberger <richard@nod.at> Acked-by: Chris Metcalf <cmetcalf@tilera.com>
1 parent b46e848 commit b3707c7

File tree

3 files changed

+40
-46
lines changed

3 files changed

+40
-46
lines changed

‎arch/tile/include/asm/compat.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,8 +267,7 @@ static inline int is_compat_task(void)
267267
return current_thread_info()->status & TS_COMPAT;
268268
}
269269

270-
extern int compat_setup_rt_frame(int sig, struct k_sigaction *ka,
271-
siginfo_t *info, sigset_t *set,
270+
extern int compat_setup_rt_frame(struct ksignal *ksig, sigset_t *set,
272271
struct pt_regs *regs);
273272

274273
/* Compat syscalls. */

‎arch/tile/kernel/compat_signal.c

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -190,18 +190,18 @@ static inline void __user *compat_get_sigframe(struct k_sigaction *ka,
190190
return (void __user *) sp;
191191
}
192192

193-
int compat_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
194-
sigset_t *set, struct pt_regs *regs)
193+
int compat_setup_rt_frame(struct ksignal *ksig, sigset_t *set,
194+
struct pt_regs *regs)
195195
{
196196
unsigned long restorer;
197197
struct compat_rt_sigframe __user *frame;
198-
int err = 0;
198+
int err = 0, sig = ksig->sig;
199199
int usig;
200200

201-
frame = compat_get_sigframe(ka, regs, sizeof(*frame));
201+
frame = compat_get_sigframe(&ksig->ka, regs, sizeof(*frame));
202202

203203
if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
204-
goto give_sigsegv;
204+
goto err;
205205

206206
usig = current_thread_info()->exec_domain
207207
&& current_thread_info()->exec_domain->signal_invmap
@@ -210,12 +210,12 @@ int compat_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
210210
: sig;
211211

212212
/* Always write at least the signal number for the stack backtracer. */
213-
if (ka->sa.sa_flags & SA_SIGINFO) {
213+
if (ksig->ka.sa.sa_flags & SA_SIGINFO) {
214214
/* At sigreturn time, restore the callee-save registers too. */
215-
err |= copy_siginfo_to_user32(&frame->info, info);
215+
err |= copy_siginfo_to_user32(&frame->info, &ksig->info);
216216
regs->flags |= PT_FLAGS_RESTORE_REGS;
217217
} else {
218-
err |= __put_user(info->si_signo, &frame->info.si_signo);
218+
err |= __put_user(ksig->info.si_signo, &frame->info.si_signo);
219219
}
220220

221221
/* Create the ucontext. */
@@ -226,11 +226,11 @@ int compat_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
226226
err |= setup_sigcontext(&frame->uc.uc_mcontext, regs);
227227
err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
228228
if (err)
229-
goto give_sigsegv;
229+
goto err;
230230

231231
restorer = VDSO_SYM(&__vdso_rt_sigreturn);
232-
if (ka->sa.sa_flags & SA_RESTORER)
233-
restorer = ptr_to_compat_reg(ka->sa.sa_restorer);
232+
if (ksig->ka.sa.sa_flags & SA_RESTORER)
233+
restorer = ptr_to_compat_reg(ksig->ka.sa.sa_restorer);
234234

235235
/*
236236
* Set up registers for signal handler.
@@ -239,7 +239,7 @@ int compat_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
239239
* We always pass siginfo and mcontext, regardless of SA_SIGINFO,
240240
* since some things rely on this (e.g. glibc's debug/segfault.c).
241241
*/
242-
regs->pc = ptr_to_compat_reg(ka->sa.sa_handler);
242+
regs->pc = ptr_to_compat_reg(ksig->ka.sa.sa_handler);
243243
regs->ex1 = PL_ICS_EX1(USER_PL, 1); /* set crit sec in handler */
244244
regs->sp = ptr_to_compat_reg(frame);
245245
regs->lr = restorer;
@@ -249,7 +249,8 @@ int compat_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
249249
regs->flags |= PT_FLAGS_CALLER_SAVES;
250250
return 0;
251251

252-
give_sigsegv:
253-
signal_fault("bad setup frame", regs, frame, sig);
252+
err:
253+
trace_unhandled_signal("bad sigreturn frame", regs,
254+
(unsigned long)frame, SIGSEGV);
254255
return -EFAULT;
255256
}

‎arch/tile/kernel/signal.c

Lines changed: 24 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -153,18 +153,18 @@ static inline void __user *get_sigframe(struct k_sigaction *ka,
153153
return (void __user *) sp;
154154
}
155155

156-
static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
157-
sigset_t *set, struct pt_regs *regs)
156+
static int setup_rt_frame(struct ksignal *ksig, sigset_t *set,
157+
struct pt_regs *regs)
158158
{
159159
unsigned long restorer;
160160
struct rt_sigframe __user *frame;
161-
int err = 0;
161+
int err = 0, sig = ksig->sig;
162162
int usig;
163163

164-
frame = get_sigframe(ka, regs, sizeof(*frame));
164+
frame = get_sigframe(&ksig->ka, regs, sizeof(*frame));
165165

166166
if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame)))
167-
goto give_sigsegv;
167+
goto err;
168168

169169
usig = current_thread_info()->exec_domain
170170
&& current_thread_info()->exec_domain->signal_invmap
@@ -173,12 +173,12 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
173173
: sig;
174174

175175
/* Always write at least the signal number for the stack backtracer. */
176-
if (ka->sa.sa_flags & SA_SIGINFO) {
176+
if (ksig->ka.sa.sa_flags & SA_SIGINFO) {
177177
/* At sigreturn time, restore the callee-save registers too. */
178-
err |= copy_siginfo_to_user(&frame->info, info);
178+
err |= copy_siginfo_to_user(&frame->info, &ksig->info);
179179
regs->flags |= PT_FLAGS_RESTORE_REGS;
180180
} else {
181-
err |= __put_user(info->si_signo, &frame->info.si_signo);
181+
err |= __put_user(ksig->info.si_signo, &frame->info.si_signo);
182182
}
183183

184184
/* Create the ucontext. */
@@ -189,11 +189,11 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
189189
err |= setup_sigcontext(&frame->uc.uc_mcontext, regs);
190190
err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set));
191191
if (err)
192-
goto give_sigsegv;
192+
goto err;
193193

194194
restorer = VDSO_SYM(&__vdso_rt_sigreturn);
195-
if (ka->sa.sa_flags & SA_RESTORER)
196-
restorer = (unsigned long) ka->sa.sa_restorer;
195+
if (ksig->ka.sa.sa_flags & SA_RESTORER)
196+
restorer = (unsigned long) ksig->ka.sa.sa_restorer;
197197

198198
/*
199199
* Set up registers for signal handler.
@@ -202,7 +202,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
202202
* We always pass siginfo and mcontext, regardless of SA_SIGINFO,
203203
* since some things rely on this (e.g. glibc's debug/segfault.c).
204204
*/
205-
regs->pc = (unsigned long) ka->sa.sa_handler;
205+
regs->pc = (unsigned long) ksig->ka.sa.sa_handler;
206206
regs->ex1 = PL_ICS_EX1(USER_PL, 1); /* set crit sec in handler */
207207
regs->sp = (unsigned long) frame;
208208
regs->lr = restorer;
@@ -212,18 +212,17 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
212212
regs->flags |= PT_FLAGS_CALLER_SAVES;
213213
return 0;
214214

215-
give_sigsegv:
216-
signal_fault("bad setup frame", regs, frame, sig);
215+
err:
216+
trace_unhandled_signal("bad sigreturn frame", regs,
217+
(unsigned long)frame, SIGSEGV);
217218
return -EFAULT;
218219
}
219220

220221
/*
221222
* OK, we're invoking a handler
222223
*/
223224

224-
static void handle_signal(unsigned long sig, siginfo_t *info,
225-
struct k_sigaction *ka,
226-
struct pt_regs *regs)
225+
static void handle_signal(struct ksignal *ksig, struct pt_regs *regs)
227226
{
228227
sigset_t *oldset = sigmask_to_save();
229228
int ret;
@@ -238,7 +237,7 @@ static void handle_signal(unsigned long sig, siginfo_t *info,
238237
break;
239238

240239
case -ERESTARTSYS:
241-
if (!(ka->sa.sa_flags & SA_RESTART)) {
240+
if (!(ksig->ka.sa.sa_flags & SA_RESTART)) {
242241
regs->regs[0] = -EINTR;
243242
break;
244243
}
@@ -254,14 +253,12 @@ static void handle_signal(unsigned long sig, siginfo_t *info,
254253
/* Set up the stack frame */
255254
#ifdef CONFIG_COMPAT
256255
if (is_compat_task())
257-
ret = compat_setup_rt_frame(sig, ka, info, oldset, regs);
256+
ret = compat_setup_rt_frame(ksig, oldset, regs);
258257
else
259258
#endif
260-
ret = setup_rt_frame(sig, ka, info, oldset, regs);
261-
if (ret)
262-
return;
263-
signal_delivered(sig, info, ka, regs,
264-
test_thread_flag(TIF_SINGLESTEP));
259+
ret = setup_rt_frame(ksig, oldset, regs);
260+
261+
signal_setup_done(ret, ksig, test_thread_flag(TIF_SINGLESTEP));
265262
}
266263

267264
/*
@@ -271,9 +268,7 @@ static void handle_signal(unsigned long sig, siginfo_t *info,
271268
*/
272269
void do_signal(struct pt_regs *regs)
273270
{
274-
siginfo_t info;
275-
int signr;
276-
struct k_sigaction ka;
271+
struct ksignal ksig;
277272

278273
/*
279274
* i386 will check if we're coming from kernel mode and bail out
@@ -282,10 +277,9 @@ void do_signal(struct pt_regs *regs)
282277
* helpful, we can reinstate the check on "!user_mode(regs)".
283278
*/
284279

285-
signr = get_signal_to_deliver(&info, &ka, regs, NULL);
286-
if (signr > 0) {
280+
if (get_signal(&ksig)) {
287281
/* Whee! Actually deliver the signal. */
288-
handle_signal(signr, &info, &ka, regs);
282+
handle_signal(&ksig, regs);
289283
goto done;
290284
}
291285

0 commit comments

Comments
 (0)