uml: move sig_handler_common_skas (75ada8ff) · Commits · 戴 / test

arch/um/include/os.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -292,9 +292,6 @@ extern int add_sigio_fd(int fd);
		extern int ignore_sigio_fd(int fd);
		extern void maybe_sigio_broken(int fd, int read);

		/* skas/trap */
		extern void sig_handler_common_skas(int sig, void *sc_ptr);

		/* sys-x86_64/prctl.c */
		extern int os_arch_prctl(int pid, int code, unsigned long *addr);

arch/um/os-Linux/signal.c

+62 −0

Original line number	Diff line number	Diff line
		@@ -9,12 +9,74 @@
		#include <errno.h>
		#include <signal.h>
		#include <strings.h>
		#include "as-layout.h"
		#include "kern_constants.h"
		#include "kern_util.h"
		#include "os.h"
		#include "sysdep/barrier.h"
		#include "sysdep/sigcontext.h"
		#include "task.h"
		#include "user.h"

		void (sig_info[NSIG])(int, struct uml_pt_regs ) = {
		[SIGTRAP] = relay_signal,
		[SIGFPE] = relay_signal,
		[SIGILL] = relay_signal,
		[SIGWINCH] = winch,
		[SIGBUS] = bus_handler,
		[SIGSEGV] = segv_handler,
		[SIGIO] = sigio_handler,
		[SIGVTALRM] = timer_handler };

		static struct uml_pt_regs ksig_regs[UM_NR_CPUS];

		void sig_handler_common_skas(int sig, void *sc_ptr)
		{
		struct sigcontext *sc = sc_ptr;
		struct uml_pt_regs *r;
		void (handler)(int, struct uml_pt_regs );
		int save_user, save_errno = errno;

		/*
		* This is done because to allow SIGSEGV to be delivered inside a SEGV
		* handler. This can happen in copy_user, and if SEGV is disabled,
		* the process will die.
		* XXX Figure out why this is better than SA_NODEFER
		*/
		if (sig == SIGSEGV) {
		change_sig(SIGSEGV, 1);
		/*
		* For segfaults, we want the data from the
		* sigcontext. In this case, we don't want to mangle
		* the process registers, so use a static set of
		* registers. For other signals, the process
		* registers are OK.
		*/
		r = &ksig_regs[cpu()];
		copy_sc(r, sc_ptr);
		} else
		r = TASK_REGS(get_current());

		save_user = r->is_user;
		r->is_user = 0;
		if ((sig == SIGFPE) \|\| (sig == SIGSEGV) \|\| (sig == SIGBUS) \|\|
		(sig == SIGILL) \|\| (sig == SIGTRAP))
		GET_FAULTINFO_FROM_SC(r->faultinfo, sc);

		change_sig(SIGUSR1, 1);

		handler = sig_info[sig];

		/* unblock SIGVTALRM, SIGIO if sig isn't IRQ signal */
		if ((sig != SIGIO) && (sig != SIGWINCH) && (sig != SIGVTALRM))
		unblock_signals();

		handler(sig, r);

		errno = save_errno;
		r->is_user = save_user;
		}

		/* Copied from linux/compiler-gcc.h since we can't include it directly */
		#define barrier() __asm__ __volatile__("": : :"memory")

arch/um/os-Linux/skas/Makefile

+3 −3

Original line number	Diff line number	Diff line
		#
		# Copyright (C) 2002 - 2004 Jeff Dike (jdike@addtoit.com)
		# Copyright (C) 2002 - 2007 Jeff Dike (jdike@{linux.intel,addtoit}.com)
		# Licensed under the GPL
		#

		obj-y := mem.o process.o trap.o
		obj-y := mem.o process.o

		USER_OBJS := mem.o process.o trap.o
		USER_OBJS := $(obj-y)

		include arch/um/scripts/Makefile.rules

arch/um/os-Linux/skas/trap.c

deleted100644 → 0

+0 −73

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
		* Licensed under the GPL
		*/

		#include <errno.h>
		#include <signal.h>
		#include "sysdep/ptrace.h"
		#include "kern_constants.h"
		#include "as-layout.h"
		#include "kern_util.h"
		#include "os.h"
		#include "sigcontext.h"
		#include "task.h"

		void (sig_info[NSIG])(int, struct uml_pt_regs ) = {
		[SIGTRAP] = relay_signal,
		[SIGFPE] = relay_signal,
		[SIGILL] = relay_signal,
		[SIGWINCH] = winch,
		[SIGBUS] = bus_handler,
		[SIGSEGV] = segv_handler,
		[SIGIO] = sigio_handler,
		[SIGVTALRM] = timer_handler };

		static struct uml_pt_regs ksig_regs[UM_NR_CPUS];

		void sig_handler_common_skas(int sig, void *sc_ptr)
		{
		struct sigcontext *sc = sc_ptr;
		struct uml_pt_regs *r;
		void (handler)(int, struct uml_pt_regs );
		int save_user, save_errno = errno;

		/*
		* This is done because to allow SIGSEGV to be delivered inside a SEGV
		* handler. This can happen in copy_user, and if SEGV is disabled,
		* the process will die.
		* XXX Figure out why this is better than SA_NODEFER
		*/
		if (sig == SIGSEGV) {
		change_sig(SIGSEGV, 1);
		/*
		* For segfaults, we want the data from the
		* sigcontext. In this case, we don't want to mangle
		* the process registers, so use a static set of
		* registers. For other signals, the process
		* registers are OK.
		*/
		r = &ksig_regs[cpu()];
		copy_sc(r, sc_ptr);
		}
		else r = TASK_REGS(get_current());

		save_user = r->is_user;
		r->is_user = 0;
		if ((sig == SIGFPE) \|\| (sig == SIGSEGV) \|\| (sig == SIGBUS) \|\|
		(sig == SIGILL) \|\| (sig == SIGTRAP))
		GET_FAULTINFO_FROM_SC(r->faultinfo, sc);

		change_sig(SIGUSR1, 1);

		handler = sig_info[sig];

		/* unblock SIGVTALRM, SIGIO if sig isn't IRQ signal */
		if ((sig != SIGIO) && (sig != SIGWINCH) && (sig != SIGVTALRM))
		unblock_signals();

		handler(sig, r);

		errno = save_errno;
		r->is_user = save_user;
		}

Admin message