Skip to content

L
linux
Commit 6cc944b6 authored by Jeff Dike's avatar Jeff Dike
Browse files
Options

Merge http://jdike.stearns.org:5000/doc-2.5 

into uml.karaya.com:/home/jdike/linux/2.5/uml-2.5
parents 31f3e9c0 e6bcc52f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 7844 additions and 2739 deletions
arch/um/Kconfig
View file @ 6cc944b6
...@@ -30,6 +30,13 @@ config RWSEM_GENERIC_SPINLOCK ...@@ -30,6 +30,13 @@ config RWSEM_GENERIC_SPINLOCK
bool bool
default y default y
config MODE_TT
bool
default y
config MODE_SKAS
bool
default y
menu "Code maturity level options" menu "Code maturity level options"
...@@ -187,6 +194,7 @@ source "net/Kconfig" ...@@ -187,6 +194,7 @@ source "net/Kconfig"
source "fs/Kconfig" source "fs/Kconfig"
source "lib/Kconfig"
menu "SCSI support" menu "SCSI support"
......
arch/um/Kconfig_net
View file @ 6cc944b6
...@@ -5,30 +5,177 @@ menu "Network Devices" ...@@ -5,30 +5,177 @@ menu "Network Devices"
# UML virtual driver # UML virtual driver
config UML_NET config UML_NET
bool "Virtual network device" bool "Virtual network device"
help
While the User-Mode port cannot directly talk to any physical
hardware devices, this choice and the following transport options
provide one or more virtual network devices through which the UML
kernels can talk to each other, the host, and with the host's help,
machines on the outside world.
For more information, including explanations of the networking and
sample configurations, see
<http://user-mode-linux.sourceforge.net/networking.html>.
If you'd like to be able to enable networking in the User-Mode
linux environment, say Y; otherwise say N. Note that you must
enable at least one of the following transport options to actually
make use of UML networking.
config UML_NET_ETHERTAP config UML_NET_ETHERTAP
bool "Ethertap transport" bool "Ethertap transport"
depends on UML_NET depends on UML_NET
help
The Ethertap User-Mode Linux network transport allows a single
running UML to exchange packets with its host over one of the
host's Ethertap devices, such as /dev/tap0. Additional running
UMLs can use additional Ethertap devices, one per running UML.
While the UML believes it's on a (multi-device, broadcast) virtual
Ethernet network, it's in fact communicating over a point-to-point
link with the host.
To use this, your host kernel must have support for Ethertap
devices. Also, if your host kernel is 2.4.x, it must have
CONFIG_NETLINK_DEV configured as Y or M.
For more information, see
<http://user-mode-linux.sourceforge.net/networking.html> That site
has examples of the UML command line to use to enable Ethertap
networking.
If you'd like to set up an IP network with the host and/or the
outside world, say Y to this, the Daemon Transport and/or the
Slip Transport. You'll need at least one of them, but may choose
more than one without conflict. If you don't need UML networking,
say N.
config UML_NET_TUNTAP config UML_NET_TUNTAP
bool "TUN/TAP transport" bool "TUN/TAP transport"
depends on UML_NET depends on UML_NET
help
The UML TUN/TAP network transport allows a UML instance to exchange
packets with the host over a TUN/TAP device. This option will only
work with a 2.4 host, unless you've applied the TUN/TAP patch to
your 2.2 host kernel.
To use this transport, your host kernel must have support for TUN/TAP
devices, either built-in or as a module.
config UML_NET_SLIP config UML_NET_SLIP
bool "SLIP transport" bool "SLIP transport"
depends on UML_NET depends on UML_NET
help
The slip User-Mode Linux network transport allows a running UML to
network with its host over a point-to-point link. Unlike Ethertap,
which can carry any Ethernet frame (and hence even non-IP packets),
the slip transport can only carry IP packets.
To use this, your host must support slip devices.
For more information, see
<http://user-mode-linux.sourceforge.net/networking.html>. That site
has examples of the UML command line to use to enable slip
networking, and details of a few quirks with it.
The Ethertap Transport is preferred over slip because of its
limitations. If you prefer slip, however, say Y here. Otherwise
choose the Multicast transport (to network multiple UMLs on
multiple hosts), Ethertap (to network with the host and the
outside world), and/or the Daemon transport (to network multiple
UMLs on a single host). You may choose more than one without
conflict. If you don't need UML networking, say N.
config UML_NET_DAEMON config UML_NET_DAEMON
bool "Daemon transport" bool "Daemon transport"
depends on UML_NET depends on UML_NET
help
This User-Mode Linux network transport allows one or more running
UMLs on a single host to communicate with each other, but not to
the host.
To use this form of networking, you'll need to run the UML
networking daemon on the host.
For more information, see
<http://user-mode-linux.sourceforge.net/networking.html> That site
has examples of the UML command line to use to enable Daemon
networking.
If you'd like to set up a network with other UMLs on a single host,
say Y. If you need a network between UMLs on multiple physical
hosts, choose the Multicast Transport. To set up a network with
the host and/or other IP machines, say Y to the Ethertap or Slip
transports. You'll need at least one of them, but may choose
more than one without conflict. If you don't need UML networking,
say N.
config UML_NET_MCAST config UML_NET_MCAST
bool "Multicast transport" bool "Multicast transport"
depends on UML_NET depends on UML_NET
help
This Multicast User-Mode Linux network transport allows multiple
UMLs (even ones running on different host machines!) to talk to
each other over a virtual ethernet network. However, it requires
at least one UML with one of the other transports to act as a
bridge if any of them need to be able to talk to their hosts or any
other IP machines.
To use this, your host kernel(s) must support IP Multicasting.
For more information, see
<http://user-mode-linux.sourceforge.net/networking.html> That site
has examples of the UML command line to use to enable Multicast
networking, and notes about the security of this approach.
If you need UMLs on multiple physical hosts to communicate as if
they shared an Ethernet network, say Y. If you need to communicate
with other IP machines, make sure you select one of the other
transports (possibly in addition to Multicast; they're not
exclusive). If you don't need to network UMLs say N to each of
the transports.
config UML_NET_PCAP config UML_NET_PCAP
bool "pcap transport" bool "pcap transport"
depends on UML_NET depends on UML_NET
help
The pcap transport makes a pcap packet stream on the host look
like an ethernet device inside UML. This is useful for making
UML act as a network monitor for the host. You must have libcap
installed in order to build the pcap transport into UML.
For more information, see
<http://user-mode-linux.sourceforge.net/networking.html> That site
has examples of the UML command line to use to enable this option.
If you intend to use UML as a network monitor for the host, say
Y here. Otherwise, say N.
config UML_NET_SLIRP
bool "SLiRP transport"
depends on UML_NET
help
The SLiRP User-Mode Linux network transport allows a running UML
to network by invoking a program that can handle SLIP encapsulated
packets. This is commonly (but not limited to) the application
known as SLiRP, a program that can re-socket IP packets back onto
the host on which it is run. Only IP packets are supported,
unlike other network transports that can handle all Ethernet
frames. In general, slirp allows the UML the same IP connectivity
to the outside world that the host user is permitted, and unlike
other transports, SLiRP works without the need of root level
privleges, setuid binaries, or SLIP devices on the host. This
also means not every type of connection is possible, but most
situations can be accomodated with carefully crafted slirp
commands that can be passed along as part of the network device's
setup string. The effect of this transport on the UML is similar
that of a host behind a firewall that masquerades all network
connections passing through it (but is less secure).
To use this you should first have slirp compiled somewhere
accessible on the host, and have read its documentation. If you
don't need UML networking, say N.
Startup example: "eth0=slirp,FE:FD:01:02:03:04,/usr/local/bin/slirp"
# Below are hardware-independent drivers mirrored from # Below are hardware-independent drivers mirrored from
# drivers/net/Config.in. It would be nice if Linux # drivers/net/Config.in. It would be nice if Linux
......
arch/um/Makefile
View file @ 6cc944b6
#
# Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
# Licensed under the GPL
#
ARCH_DIR = arch/um ARCH_DIR = arch/um
OS := $(shell uname -s) OS := $(shell uname -s)
...@@ -11,37 +16,31 @@ include/linux/version.h: arch/$(ARCH)/Makefile ...@@ -11,37 +16,31 @@ include/linux/version.h: arch/$(ARCH)/Makefile
# EXTRAVERSION... # EXTRAVERSION...
MODLIB := $(INSTALL_MOD_PATH)/lib/modules/$(KERNELRELEASE) MODLIB := $(INSTALL_MOD_PATH)/lib/modules/$(KERNELRELEASE)
MAKEBOOT = $(MAKE) -C $(ARCH_DIR)/boot
ifeq ($(CONFIG_DEBUGSYM),y) ifeq ($(CONFIG_DEBUGSYM),y)
DEBUG = -g
CFLAGS := $(subst -fomit-frame-pointer,,$(CFLAGS)) CFLAGS := $(subst -fomit-frame-pointer,,$(CFLAGS))
endif endif
ifeq ($(CONFIG_GCOV),y) CFLAGS-$(CONFIG_DEBUGSYM) += -g
CFLAGS += -fprofile-arcs -ftest-coverage CFLAGS-$(CONFIG_GCOV) += -fprofile-arcs -ftest-coverage
endif CFLAGS-$(CONFIG_GPROF) += $(PROFILE)
LINK-$(CONFIG_GPROF) += $(PROFILE) -Wl,--wrap,__monstartup
ifeq ($(CONFIG_GPROF), y)
PROFILE += -pg -DPROFILING
LINK_PROFILE = $(PROFILE) -Wl,--wrap,__monstartup
endif
core-y += $(ARCH_DIR)/kernel/ \ core-y += $(ARCH_DIR)/kernel/ \
$(ARCH_DIR)/drivers/ \ $(ARCH_DIR)/drivers/ \
$(ARCH_DIR)/sys-$(SUBARCH)/ $(ARCH_DIR)/sys-$(SUBARCH)/
core-$(CONFIG_PT_PROXY) += $(ARCH_DIR)/ptproxy/ ARCH_INCLUDE = -I$(ARCH_DIR)/include
MODE_INCLUDE = -I$(ARCH_DIR)/kernel/tt/include \
ARCH_INCLUDE = $(TOPDIR)/$(ARCH_DIR)/include -I$(ARCH_DIR)/kernel/skas/include
# -Derrno=kernel_errno - This turns all kernel references to errno into # -Derrno=kernel_errno - This turns all kernel references to errno into
# kernel_errno to separate them from the libc errno. This allows -fno-common # kernel_errno to separate them from the libc errno. This allows -fno-common
# in CFLAGS. Otherwise, it would cause ld to complain about the two different # in CFLAGS. Otherwise, it would cause ld to complain about the two different
# errnos. # errnos.
CFLAGS += $(DEBUG) $(PROFILE) -D__arch_um__ -DSUBARCH=\"$(SUBARCH)\" \ CFLAGS += $(CFLAGS-y) -D__arch_um__ -DSUBARCH=\"$(SUBARCH)\" \
-D_LARGEFILE64_SOURCE -I$(ARCH_INCLUDE) -Derrno=kernel_errno -D_LARGEFILE64_SOURCE $(ARCH_INCLUDE) -Derrno=kernel_errno \
$(MODE_INCLUDE)
LINK_WRAPS = -Wl,--wrap,malloc -Wl,--wrap,free -Wl,--wrap,calloc LINK_WRAPS = -Wl,--wrap,malloc -Wl,--wrap,free -Wl,--wrap,calloc
...@@ -51,10 +50,16 @@ SYMLINK_HEADERS = include/asm-um/archparam.h include/asm-um/system.h \ ...@@ -51,10 +50,16 @@ SYMLINK_HEADERS = include/asm-um/archparam.h include/asm-um/system.h \
include/asm-um/sigcontext.h include/asm-um/processor.h \ include/asm-um/sigcontext.h include/asm-um/processor.h \
include/asm-um/ptrace.h include/asm-um/arch-signal.h include/asm-um/ptrace.h include/asm-um/arch-signal.h
ARCH_SYMLINKS = include/asm-um/arch arch/um/include/sysdep arch/um/os \ ARCH_SYMLINKS = include/asm-um/arch $(ARCH_DIR)/include/sysdep $(ARCH_DIR)/os \
$(SYMLINK_HEADERS) $(SYMLINK_HEADERS) $(ARCH_DIR)/include/uml-config.h
ifeq ($(CONFIG_MODE_SKAS), y)
GEN_HEADERS = $(ARCH_DIR)/kernel/skas/include/skas_ptregs.h
GEN_HEADERS = $(ARCH_DIR)/include/task.h $(SYS_HEADERS) : $(ARCH_DIR)/kernel/skas/include/skas_ptregs.h
endif
GEN_HEADERS += $(ARCH_DIR)/include/task.h $(ARCH_DIR)/include/kern_constants.h
include $(ARCH_DIR)/Makefile-$(SUBARCH) include $(ARCH_DIR)/Makefile-$(SUBARCH)
include $(ARCH_DIR)/Makefile-os-$(OS) include $(ARCH_DIR)/Makefile-os-$(OS)
...@@ -62,9 +67,9 @@ include $(ARCH_DIR)/Makefile-os-$(OS) ...@@ -62,9 +67,9 @@ include $(ARCH_DIR)/Makefile-os-$(OS)
$(ARCH_DIR)/vmlinux.lds.S : $(ARCH_DIR)/vmlinux.lds.S :
touch $@ touch $@
prepare: $(ARCH_SYMLINKS) $(GEN_HEADERS) prepare: $(ARCH_SYMLINKS) $(SYS_HEADERS) $(GEN_HEADERS)
LDFLAGS_vmlinux = -r $(ARCH_DIR)/main.o LDFLAGS_vmlinux = -r
vmlinux: $(ARCH_DIR)/main.o vmlinux: $(ARCH_DIR)/main.o
...@@ -74,18 +79,21 @@ $(ARCH_DIR)/uml.lds.s : $(ARCH_DIR)/uml.lds.S scripts FORCE ...@@ -74,18 +79,21 @@ $(ARCH_DIR)/uml.lds.s : $(ARCH_DIR)/uml.lds.S scripts FORCE
AFLAGS_uml.lds.o = -U$(SUBARCH) -DSTART=$$(($(TOP_ADDR) - $(SIZE))) \ AFLAGS_uml.lds.o = -U$(SUBARCH) -DSTART=$$(($(TOP_ADDR) - $(SIZE))) \
-DELF_ARCH=$(ELF_ARCH) -DELF_FORMAT=\"$(ELF_FORMAT)\" -P -C -Uum -DELF_ARCH=$(ELF_ARCH) -DELF_FORMAT=\"$(ELF_FORMAT)\" -P -C -Uum
linux: arch/um/uml.lds.s vmlinux linux: $(ARCH_DIR)/uml.lds.s vmlinux
$(CC) -Wl,-T,arch/um/uml.lds.s -o $@ $(LINK_PROFILE) \ $(CC) -Wl,-T,$(ARCH_DIR)/uml.lds.s -static $(LINK-y) $(LINK_WRAPS) \
$(LINK_WRAPS) -static vmlinux -L/usr/lib -lutil -o linux $(ARCH_DIR)/main.o vmlinux -L/usr/lib -lutil
USER_CFLAGS := $(patsubst -I%,,$(CFLAGS)) USER_CFLAGS := $(patsubst -I%,,$(CFLAGS))
USER_CFLAGS := $(patsubst -Derrno=kernel_errno,,$(USER_CFLAGS)) USER_CFLAGS := $(patsubst -Derrno=kernel_errno,,$(USER_CFLAGS))
USER_CFLAGS := $(patsubst -D__KERNEL__,,$(USER_CFLAGS)) -I$(ARCH_INCLUDE) USER_CFLAGS := $(patsubst -D__KERNEL__,,$(USER_CFLAGS)) $(ARCH_INCLUDE) \
$(MODE_INCLUDE)
# To get a definition of F_SETSIG # To get a definition of F_SETSIG
USER_CFLAGS += -D_GNU_SOURCE USER_CFLAGS += -D_GNU_SOURCE
CLEAN_FILES += linux x.i gmon.out $(ARCH_DIR)/link.ld $(GEN_HEADERS)
$(ARCH_DIR)/main.o: $(ARCH_DIR)/main.c $(ARCH_DIR)/main.o: $(ARCH_DIR)/main.c
$(CC) $(USER_CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $< $(CC) $(USER_CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
...@@ -106,11 +114,9 @@ archclean: sysclean ...@@ -106,11 +114,9 @@ archclean: sysclean
find . \( -name '*.bb' -o -name '*.bbg' -o -name '*.da' \ find . \( -name '*.bb' -o -name '*.bbg' -o -name '*.da' \
-o -name '*.gcov' \) -type f -print | xargs rm -f -o -name '*.gcov' \) -type f -print | xargs rm -f
rm -f linux x.i gmon.out $(ARCH_DIR)/link.ld $(GEN_HEADERS) rm -f linux x.i gmon.out $(ARCH_DIR)/link.ld $(GEN_HEADERS)
@$(MAKEBOOT) clean
archdep: archdep:
for d in $(ARCH_SUBDIRS); do $(MAKE) -C $$d fastdep; done for d in $(ARCH_SUBDIRS); do $(MAKE) -C $$d fastdep; done
@$(MAKEBOOT) dep
$(SYMLINK_HEADERS): $(SYMLINK_HEADERS):
cd $(TOPDIR)/$(dir $@) ; \ cd $(TOPDIR)/$(dir $@) ; \
...@@ -119,18 +125,28 @@ $(SYMLINK_HEADERS): ...@@ -119,18 +125,28 @@ $(SYMLINK_HEADERS):
include/asm-um/arch: include/asm-um/arch:
cd $(TOPDIR)/include/asm-um && ln -sf ../asm-$(SUBARCH) arch cd $(TOPDIR)/include/asm-um && ln -sf ../asm-$(SUBARCH) arch
arch/um/include/sysdep: $(ARCH_DIR)/include/sysdep:
cd $(TOPDIR)/arch/um/include && ln -sf sysdep-$(SUBARCH) sysdep cd $(ARCH_DIR)/include && ln -sf sysdep-$(SUBARCH) sysdep
arch/um/os: $(ARCH_DIR)/os:
cd $(ARCH_DIR) && ln -sf os-$(OS) os cd $(ARCH_DIR) && ln -sf os-$(OS) os
$(ARCH_DIR)/include/uml-config.h :
ln -sf $(TOPDIR)/include/linux/autoconf.h $@
$(ARCH_DIR)/include/task.h : $(ARCH_DIR)/util/mk_task $(ARCH_DIR)/include/task.h : $(ARCH_DIR)/util/mk_task
$< > $@ $< > $@
$(ARCH_DIR)/util/mk_task : $(ARCH_DIR)/util FORCE ; $(ARCH_DIR)/include/kern_constants.h : $(ARCH_DIR)/util/mk_constants
$< > $@
$(ARCH_DIR)/util/mk_task : $(ARCH_DIR)/kernel/skas/include/skas_ptregs.h \
$(ARCH_DIR)/util FORCE ;
$(ARCH_DIR)/util: FORCE $(ARCH_DIR)/util: FORCE
@$(call descend,$@,) @$(call descend,$@,)
$(ARCH_DIR)/kernel/skas/include/skas_ptregs.h :
$(MAKE) -C $(ARCH_DIR)/kernel/skas include/skas_ptregs.h
export SUBARCH USER_CFLAGS OS export SUBARCH USER_CFLAGS OS
arch/um/Makefile-i386
View file @ 6cc944b6
...@@ -21,13 +21,13 @@ prepare: $(SYS_HEADERS) ...@@ -21,13 +21,13 @@ prepare: $(SYS_HEADERS)
$(SYS_DIR)/sc.h: $(SYS_UTIL_DIR)/mk_sc $(SYS_DIR)/sc.h: $(SYS_UTIL_DIR)/mk_sc
$< > $@ $< > $@
$(SYS_DIR)/thread.h: $(SYS_UTIL_DIR)/mk_thread $(SYS_DIR)/thread.h: $(SYS_UTIL_DIR)/mk_thread
$< > $@ $< > $@
$(SYS_UTIL_DIR)/mk_sc: FORCE ; $(SYS_UTIL_DIR)/mk_sc: FORCE ;
@$(call descend,$(SYS_UTIL_DIR),$@) @$(call descend,$(SYS_UTIL_DIR),$@)
$(SYS_UTIL_DIR)/mk_thread: $(ARCH_SYMLINKS) FORCE ; $(SYS_UTIL_DIR)/mk_thread: $(ARCH_SYMLINKS) $(GEN_HEADERS) FORCE ;
@$(call descend,$(SYS_UTIL_DIR),$@) @$(call descend,$(SYS_UTIL_DIR),$@)
$(SYS_UTIL_DIR): include/asm FORCE $(SYS_UTIL_DIR): include/asm FORCE
......
arch/um/drivers/Makefile
View file @ 6cc944b6
...@@ -5,23 +5,14 @@ ...@@ -5,23 +5,14 @@
CHAN_OBJS := chan_kern.o chan_user.o line.o CHAN_OBJS := chan_kern.o chan_user.o line.o
# This nonsense is due to kbuild. In the 2.4 build, I stick -lpcap in # pcap is broken in 2.5 because kbuild doesn't allow pcap.a to be linked
# pcap-objs, and that is just included in the link command. The 2.5 kbuild # in to pcap.o
# filters out everything from pcap-objs which are not in the built-in.o
# dependencies, which are $(obj-y). So, -lpcap must be in $(obj-y), too.
# However, make magically expands -lfoo prerequisites into /usr/lib/libfoo.a
# file names. This causes the kbuild filtering to filter the -lpcap from
# pcap-objs, causing the link to fail.
# So, what this does is figure out by hand (crudely) what file -lpcap really
# is and just use it.
PCAP = $(shell for f in echo {/lib,/usr/lib}/libpcap.a; do \
[ -f $$f ] && echo $$f ; done | head -1)
slip-objs := slip_kern.o slip_user.o slip-objs := slip_kern.o slip_user.o
slirp-objs := slirp_kern.o slirp_user.o
daemon-objs := daemon_kern.o daemon_user.o daemon-objs := daemon_kern.o daemon_user.o
mcast-objs := mcast_kern.o mcast_user.o mcast-objs := mcast_kern.o mcast_user.o
pcap-objs := pcap_kern.o pcap_user.o $(PCAP) #pcap-objs := pcap_kern.o pcap_user.o $(PCAP)
net-objs := net_kern.o net_user.o net-objs := net_kern.o net_user.o
mconsole-objs := mconsole_kern.o mconsole_user.o mconsole-objs := mconsole_kern.o mconsole_user.o
hostaudio-objs := hostaudio_kern.o hostaudio_user.o hostaudio-objs := hostaudio_kern.o hostaudio_user.o
...@@ -34,9 +25,10 @@ export-objs := mconsole_kern.o ...@@ -34,9 +25,10 @@ export-objs := mconsole_kern.o
obj-y = obj-y =
obj-$(CONFIG_SSL) += ssl.o obj-$(CONFIG_SSL) += ssl.o
obj-$(CONFIG_UML_NET_SLIP) += slip.o obj-$(CONFIG_UML_NET_SLIP) += slip.o
obj-$(CONFIG_UML_NET_SLIRP) += slirp.o
obj-$(CONFIG_UML_NET_DAEMON) += daemon.o obj-$(CONFIG_UML_NET_DAEMON) += daemon.o
obj-$(CONFIG_UML_NET_MCAST) += mcast.o obj-$(CONFIG_UML_NET_MCAST) += mcast.o
obj-$(CONFIG_UML_NET_PCAP) += pcap.o $(PCAP) #obj-$(CONFIG_UML_NET_PCAP) += pcap.o $(PCAP)
obj-$(CONFIG_UML_NET) += net.o obj-$(CONFIG_UML_NET) += net.o
obj-$(CONFIG_MCONSOLE) += mconsole.o obj-$(CONFIG_MCONSOLE) += mconsole.o
obj-$(CONFIG_MMAPPER) += mmapper_kern.o obj-$(CONFIG_MMAPPER) += mmapper_kern.o
...@@ -50,8 +42,6 @@ obj-$(CONFIG_TTY_CHAN) += tty.o ...@@ -50,8 +42,6 @@ obj-$(CONFIG_TTY_CHAN) += tty.o
obj-$(CONFIG_XTERM_CHAN) += xterm.o xterm_kern.o obj-$(CONFIG_XTERM_CHAN) += xterm.o xterm_kern.o
obj-$(CONFIG_UML_WATCHDOG) += harddog.o obj-$(CONFIG_UML_WATCHDOG) += harddog.o
CFLAGS_pcap_user.o = -I/usr/include/pcap
obj-y += stdio_console.o $(CHAN_OBJS) obj-y += stdio_console.o $(CHAN_OBJS)
USER_SINGLE_OBJS = $(foreach f,$(patsubst %.o,%,$(obj-y) $(obj-m)),$($(f)-objs)) USER_SINGLE_OBJS = $(foreach f,$(patsubst %.o,%,$(obj-y) $(obj-m)),$($(f)-objs))
...@@ -61,7 +51,7 @@ USER_OBJS := $(filter %_user.o,$(obj-y) $(obj-m) $(USER_SINGLE_OBJS)) fd.o \ ...@@ -61,7 +51,7 @@ USER_OBJS := $(filter %_user.o,$(obj-y) $(obj-m) $(USER_SINGLE_OBJS)) fd.o \
USER_OBJS := $(foreach file,$(USER_OBJS),arch/um/drivers/$(file)) USER_OBJS := $(foreach file,$(USER_OBJS),arch/um/drivers/$(file))
$(USER_OBJS) : %.o: %.c $(USER_OBJS) : %.o: %.c
$(CC) $(CFLAGS_$@) $(USER_CFLAGS) -c -o $@ $< $(CC) $(CFLAGS_$(notdir $@)) $(USER_CFLAGS) -c -o $@ $<
clean: clean:
......
arch/um/drivers/chan_kern.c
View file @ 6cc944b6
...@@ -24,7 +24,8 @@ static void *not_configged_init(char *str, int device, struct chan_opts *opts) ...@@ -24,7 +24,8 @@ static void *not_configged_init(char *str, int device, struct chan_opts *opts)
return(NULL); return(NULL);
} }
static int not_configged_open(int input, int output, int primary, void *data) static int not_configged_open(int input, int output, int primary, void *data,
char **dev_out)
{ {
printk(KERN_ERR "Using a channel type which is configured out of " printk(KERN_ERR "Using a channel type which is configured out of "
"UML\n"); "UML\n");
...@@ -112,7 +113,8 @@ static int open_one_chan(struct chan *chan, int input, int output, int primary) ...@@ -112,7 +113,8 @@ static int open_one_chan(struct chan *chan, int input, int output, int primary)
if(chan->opened) return(0); if(chan->opened) return(0);
if(chan->ops->open == NULL) fd = 0; if(chan->ops->open == NULL) fd = 0;
else fd = (*chan->ops->open)(input, output, primary, chan->data); else fd = (*chan->ops->open)(input, output, primary, chan->data,
&chan->dev);
if(fd < 0) return(fd); if(fd < 0) return(fd);
chan->fd = fd; chan->fd = fd;
...@@ -258,6 +260,66 @@ void free_chan(struct list_head *chans) ...@@ -258,6 +260,66 @@ void free_chan(struct list_head *chans)
} }
} }
static int one_chan_config_string(struct chan *chan, char *str, int size,
char **error_out)
{
int n = 0;
CONFIG_CHUNK(str, size, n, chan->ops->type, 0);
if(chan->dev == NULL){
CONFIG_CHUNK(str, size, n, "", 1);
return(n);
}
CONFIG_CHUNK(str, size, n, ":", 0);
CONFIG_CHUNK(str, size, n, chan->dev, 0);
return(n);
}
static int chan_pair_config_string(struct chan *in, struct chan *out,
char *str, int size, char **error_out)
{
int n;
n = one_chan_config_string(in, str, size, error_out);
str += n;
size -= n;
if(in == out){
CONFIG_CHUNK(str, size, n, "", 1);
return(n);
}
CONFIG_CHUNK(str, size, n, ",", 1);
n = one_chan_config_string(out, str, size, error_out);
str += n;
size -= n;
CONFIG_CHUNK(str, size, n, "", 1);
return(n);
}
int chan_config_string(struct list_head *chans, char *str, int size,
char **error_out)
{
struct list_head *ele;
struct chan *chan, *in = NULL, *out = NULL;
list_for_each(ele, chans){
chan = list_entry(ele, struct chan, list);
if(!chan->primary)
continue;
if(chan->input)
in = chan;
if(chan->output)
out = chan;
}
return(chan_pair_config_string(in, out, str, size, error_out));
}
struct chan_type { struct chan_type {
char *key; char *key;
struct chan_ops *ops; struct chan_ops *ops;
......
arch/um/drivers/chan_user.c
View file @ 6cc944b6
...@@ -19,6 +19,8 @@ ...@@ -19,6 +19,8 @@
#include "user.h" #include "user.h"
#include "helper.h" #include "helper.h"
#include "os.h" #include "os.h"
#include "choose-mode.h"
#include "mode.h"
void generic_close(int fd, void *unused) void generic_close(int fd, void *unused)
{ {
...@@ -144,32 +146,6 @@ static int winch_thread(void *arg) ...@@ -144,32 +146,6 @@ static int winch_thread(void *arg)
} }
} }
static int tracer_winch[2];
static void tracer_winch_handler(int sig)
{
char c = 1;
if(write(tracer_winch[1], &c, sizeof(c)) != sizeof(c))
printk("tracer_winch_handler - write failed, errno = %d\n",
errno);
}
/* Called only by the tracing thread during initialization */
void setup_tracer_winch(void)
{
int err;
err = os_pipe(tracer_winch, 1, 1);
if(err){
printk("setup_tracer_winch : os_pipe failed, errno = %d\n",
-err);
return;
}
signal(SIGWINCH, tracer_winch_handler);
}
static int winch_tramp(int fd, void *device_data, int *fd_out) static int winch_tramp(int fd, void *device_data, int *fd_out)
{ {
struct winch_data data; struct winch_data data;
...@@ -212,9 +188,8 @@ void register_winch(int fd, void *device_data) ...@@ -212,9 +188,8 @@ void register_winch(int fd, void *device_data)
if(!isatty(fd)) return; if(!isatty(fd)) return;
pid = tcgetpgrp(fd); pid = tcgetpgrp(fd);
if(pid == tracing_pid) if(!CHOOSE_MODE(is_tracer_winch(pid, fd, device_data), 0) &&
register_winch_irq(tracer_winch[0], fd, -1, device_data); (pid == -1)){
else if(pid == -1){
thread = winch_tramp(fd, device_data, &thread_fd); thread = winch_tramp(fd, device_data, &thread_fd);
if(fd != -1){ if(fd != -1){
register_winch_irq(thread_fd, fd, thread, device_data); register_winch_irq(thread_fd, fd, thread, device_data);
......
arch/um/drivers/fd.c
View file @ 6cc944b6
...@@ -15,6 +15,7 @@ struct fd_chan { ...@@ -15,6 +15,7 @@ struct fd_chan {
int fd; int fd;
int raw; int raw;
struct termios tt; struct termios tt;
char str[sizeof("1234567890\0")];
}; };
void *fd_init(char *str, int device, struct chan_opts *opts) void *fd_init(char *str, int device, struct chan_opts *opts)
...@@ -30,7 +31,7 @@ void *fd_init(char *str, int device, struct chan_opts *opts) ...@@ -30,7 +31,7 @@ void *fd_init(char *str, int device, struct chan_opts *opts)
} }
str++; str++;
n = strtoul(str, &end, 0); n = strtoul(str, &end, 0);
if(*end != '\0'){ if((*end != '\0') || (end == str)){
printk("fd_init : couldn't parse file descriptor '%s'\n", str); printk("fd_init : couldn't parse file descriptor '%s'\n", str);
return(NULL); return(NULL);
} }
...@@ -40,7 +41,7 @@ void *fd_init(char *str, int device, struct chan_opts *opts) ...@@ -40,7 +41,7 @@ void *fd_init(char *str, int device, struct chan_opts *opts)
return(data); return(data);
} }
int fd_open(int input, int output, int primary, void *d) int fd_open(int input, int output, int primary, void *d, char **dev_out)
{ {
struct fd_chan *data = d; struct fd_chan *data = d;
...@@ -48,6 +49,8 @@ int fd_open(int input, int output, int primary, void *d) ...@@ -48,6 +49,8 @@ int fd_open(int input, int output, int primary, void *d)
tcgetattr(data->fd, &data->tt); tcgetattr(data->fd, &data->tt);
raw(data->fd, 0); raw(data->fd, 0);
} }
sprintf(data->str, "%d", data->fd);
*dev_out = data->str;
return(data->fd); return(data->fd);
} }
...@@ -69,6 +72,7 @@ int fd_console_write(int fd, const char *buf, int n, void *d) ...@@ -69,6 +72,7 @@ int fd_console_write(int fd, const char *buf, int n, void *d)
} }
struct chan_ops fd_ops = { struct chan_ops fd_ops = {
type: "fd",
init: fd_init, init: fd_init,
open: fd_open, open: fd_open,
close: fd_close, close: fd_close,
......
arch/um/drivers/line.c
View file @ 6cc944b6
...@@ -8,11 +8,13 @@ ...@@ -8,11 +8,13 @@
#include "linux/list.h" #include "linux/list.h"
#include "linux/devfs_fs_kernel.h" #include "linux/devfs_fs_kernel.h"
#include "asm/irq.h" #include "asm/irq.h"
#include "asm/uaccess.h"
#include "chan_kern.h" #include "chan_kern.h"
#include "irq_user.h" #include "irq_user.h"
#include "line.h" #include "line.h"
#include "kern.h" #include "kern.h"
#include "user_util.h" #include "user_util.h"
#include "kern_util.h"
#include "os.h" #include "os.h"
#define LINE_BUFSIZE 4096 #define LINE_BUFSIZE 4096
...@@ -87,15 +89,26 @@ static int flush_buffer(struct line *line) ...@@ -87,15 +89,26 @@ static int flush_buffer(struct line *line)
return(line->head == line->tail); return(line->head == line->tail);
} }
int line_write(struct line *lines, struct tty_struct *tty, const char *buf, int line_write(struct line *lines, struct tty_struct *tty, int from_user,
int len) const char *buf, int len)
{ {
struct line *line; struct line *line;
char *new;
unsigned long flags; unsigned long flags;
int n, err, i; int n, err, i;
if(tty->stopped) return 0; if(tty->stopped) return 0;
if(from_user){
new = kmalloc(len, GFP_KERNEL);
if(new == NULL)
return(0);
n = copy_from_user(new, buf, len);
if(n == len)
return(-EFAULT);
buf = new;
}
i = minor(tty->device) - tty->driver.minor_start; i = minor(tty->device) - tty->driver.minor_start;
line = &lines[i]; line = &lines[i];
...@@ -281,7 +294,7 @@ void close_lines(struct line *lines, int nlines) ...@@ -281,7 +294,7 @@ void close_lines(struct line *lines, int nlines)
close_chan(&lines[i].chan_list); close_chan(&lines[i].chan_list);
} }
void line_setup(struct line *lines, int num, char *init) int line_setup(struct line *lines, int num, char *init, int all_allowed)
{ {
int i, n; int i, n;
char *end; char *end;
...@@ -292,12 +305,36 @@ void line_setup(struct line *lines, int num, char *init) ...@@ -292,12 +305,36 @@ void line_setup(struct line *lines, int num, char *init)
if(*end != '='){ if(*end != '='){
printk(KERN_ERR "line_setup failed to parse \"%s\"\n", printk(KERN_ERR "line_setup failed to parse \"%s\"\n",
init); init);
return; return(1);
} }
init = end; init = end;
} }
init++; init++;
if(n == -1){ if((n >= 0) && (n >= num)){
printk("line_setup - %d out of range ((0 ... %d) allowed)\n",
n, num);
return(1);
}
else if(n >= 0){
if(lines[n].count > 0){
printk("line_setup - device %d is open\n", n);
return(1);
}
if(lines[n].init_pri <= INIT_ONE){
lines[n].init_pri = INIT_ONE;
if(!strcmp(init, "none")) lines[n].valid = 0;
else {
lines[n].init_str = init;
lines[n].valid = 1;
}
}
}
else if(!all_allowed){
printk("line_setup - can't configure all devices from "
"mconsole\n");
return(1);
}
else {
for(i = 0; i < num; i++){ for(i = 0; i < num; i++){
if(lines[i].init_pri <= INIT_ALL){ if(lines[i].init_pri <= INIT_ALL){
lines[i].init_pri = INIT_ALL; lines[i].init_pri = INIT_ALL;
...@@ -309,14 +346,57 @@ void line_setup(struct line *lines, int num, char *init) ...@@ -309,14 +346,57 @@ void line_setup(struct line *lines, int num, char *init)
} }
} }
} }
else if(lines[n].init_pri <= INIT_ONE){ return(0);
lines[n].init_pri = INIT_ONE; }
if(!strcmp(init, "none")) lines[n].valid = 0;
else { int line_config(struct line *lines, int num, char *str)
lines[n].init_str = init; {
lines[n].valid = 1; char *new = uml_strdup(str);
}
if(new == NULL){
printk("line_config - uml_strdup failed\n");
return(-ENOMEM);
} }
return(line_setup(lines, num, new, 0));
}
int line_get_config(char *name, struct line *lines, int num, char *str,
int size, char **error_out)
{
struct line *line;
char *end;
int dev, n = 0;
dev = simple_strtoul(name, &end, 0);
if((*end != '\0') || (end == name)){
*error_out = "line_setup failed to parse device number";
return(0);
}
if((dev < 0) || (dev >= num)){
*error_out = "device number of of range";
return(0);
}
line = &lines[dev];
down(&line->sem);
if(!line->valid)
CONFIG_CHUNK(str, size, n, "none", 1);
else if(line->count == 0)
CONFIG_CHUNK(str, size, n, line->init_str, 1);
else n = chan_config_string(&line->chan_list, str, size, error_out);
up(&line->sem);
return(n);
}
int line_remove(struct line *lines, int num, char *str)
{
char config[sizeof("conxxxx=none\0")];
sprintf(config, "%s=none", str);
return(line_setup(lines, num, config, 0));
} }
void line_register_devfs(struct lines *set, struct line_driver *line_driver, void line_register_devfs(struct lines *set, struct line_driver *line_driver,
...@@ -366,6 +446,8 @@ void line_register_devfs(struct lines *set, struct line_driver *line_driver, ...@@ -366,6 +446,8 @@ void line_register_devfs(struct lines *set, struct line_driver *line_driver,
if(!lines[i].valid) if(!lines[i].valid)
tty_unregister_devfs(driver, driver->minor_start + i); tty_unregister_devfs(driver, driver->minor_start + i);
} }
mconsole_register_dev(&line_driver->mc);
} }
void lines_init(struct line *lines, int nlines) void lines_init(struct line *lines, int nlines)
...@@ -451,7 +533,7 @@ static void winch_cleanup(void) ...@@ -451,7 +533,7 @@ static void winch_cleanup(void)
list_for_each(ele, &winch_handlers){ list_for_each(ele, &winch_handlers){
winch = list_entry(ele, struct winch, list); winch = list_entry(ele, struct winch, list);
close(winch->fd); close(winch->fd);
if(winch->pid != -1) os_kill_process(winch->pid); if(winch->pid != -1) os_kill_process(winch->pid, 0);
} }
} }
......
arch/um/drivers/mcast_kern.c
View file @ 6cc944b6
...@@ -92,7 +92,7 @@ int mcast_setup(char *str, char **mac_out, void *data) ...@@ -92,7 +92,7 @@ int mcast_setup(char *str, char **mac_out, void *data)
if(port_str != NULL){ if(port_str != NULL){
n = simple_strtoul(port_str, &last, 10); n = simple_strtoul(port_str, &last, 10);
if(*last != '\0'){ if((*last != '\0') || (last == port_str)){
printk(KERN_ERR "mcast_setup - Bad port : '%s'\n", printk(KERN_ERR "mcast_setup - Bad port : '%s'\n",
port_str); port_str);
return(0); return(0);
...@@ -102,7 +102,7 @@ int mcast_setup(char *str, char **mac_out, void *data) ...@@ -102,7 +102,7 @@ int mcast_setup(char *str, char **mac_out, void *data)
if(ttl_str != NULL){ if(ttl_str != NULL){
init->ttl = simple_strtoul(ttl_str, &last, 10); init->ttl = simple_strtoul(ttl_str, &last, 10);
if(*last != '\0'){ if((*last != '\0') || (last == ttl_str)){
printk(KERN_ERR "mcast_setup - Bad ttl : '%s'\n", printk(KERN_ERR "mcast_setup - Bad ttl : '%s'\n",
ttl_str); ttl_str);
return(0); return(0);
......
arch/um/drivers/mconsole_kern.c
View file @ 6cc944b6
...@@ -108,6 +108,7 @@ void mconsole_version(struct mc_request *req) ...@@ -108,6 +108,7 @@ void mconsole_version(struct mc_request *req)
reboot - Reboot UML reboot - Reboot UML
config <dev>=<config> - Add a new device to UML; config <dev>=<config> - Add a new device to UML;
same syntax as command line same syntax as command line
config <dev> - Query the configuration of a device
remove <dev> - Remove a device from UML remove <dev> - Remove a device from UML
sysrq <letter> - Performs the SysRq action controlled by the letter sysrq <letter> - Performs the SysRq action controlled by the letter
cad - invoke the Ctl-Alt-Del handler cad - invoke the Ctl-Alt-Del handler
...@@ -181,10 +182,56 @@ static struct mc_device *mconsole_find_dev(char *name) ...@@ -181,10 +182,56 @@ static struct mc_device *mconsole_find_dev(char *name)
return(NULL); return(NULL);
} }
#define CONFIG_BUF_SIZE 64
static void mconsole_get_config(int (*get_config)(char *, char *, int,
char **),
struct mc_request *req, char *name)
{
char default_buf[CONFIG_BUF_SIZE], *error, *buf;
int n, size;
if(get_config == NULL){
mconsole_reply(req, "No get_config routine defined", 1, 0);
return;
}
error = NULL;
size = sizeof(default_buf)/sizeof(default_buf[0]);
buf = default_buf;
while(1){
n = (*get_config)(name, buf, size, &error);
if(error != NULL){
mconsole_reply(req, error, 1, 0);
goto out;
}
if(n <= size){
mconsole_reply(req, buf, 0, 0);
goto out;
}
if(buf != default_buf)
kfree(buf);
size = n;
buf = kmalloc(size, GFP_KERNEL);
if(buf == NULL){
mconsole_reply(req, "Failed to allocate buffer", 1, 0);
return;
}
}
out:
if(buf != default_buf)
kfree(buf);
}
void mconsole_config(struct mc_request *req) void mconsole_config(struct mc_request *req)
{ {
struct mc_device *dev; struct mc_device *dev;
char *ptr = req->request.data; char *ptr = req->request.data, *name;
int err; int err;
ptr += strlen("config"); ptr += strlen("config");
...@@ -194,8 +241,17 @@ void mconsole_config(struct mc_request *req) ...@@ -194,8 +241,17 @@ void mconsole_config(struct mc_request *req)
mconsole_reply(req, "Bad configuration option", 1, 0); mconsole_reply(req, "Bad configuration option", 1, 0);
return; return;
} }
err = (*dev->config)(&ptr[strlen(dev->name)]);
mconsole_reply(req, "", err, 0); name = &ptr[strlen(dev->name)];
ptr = name;
while((*ptr != '=') && (*ptr != '\0'))
ptr++;
if(*ptr == '='){
err = (*dev->config)(name);
mconsole_reply(req, "", err, 0);
}
else mconsole_get_config(dev->get_config, req, name);
} }
void mconsole_remove(struct mc_request *req) void mconsole_remove(struct mc_request *req)
......
arch/um/drivers/net_kern.c
View file @ 6cc944b6
...@@ -39,7 +39,6 @@ static int uml_net_rx(struct net_device *dev) ...@@ -39,7 +39,6 @@ static int uml_net_rx(struct net_device *dev)
/* If we can't allocate memory, try again next round. */ /* If we can't allocate memory, try again next round. */
if ((skb = dev_alloc_skb(dev->mtu)) == NULL) { if ((skb = dev_alloc_skb(dev->mtu)) == NULL) {
lp->stats.rx_dropped++; lp->stats.rx_dropped++;
reactivate_fd(lp->fd, UM_ETH_IRQ);
return 0; return 0;
} }
...@@ -48,7 +47,6 @@ static int uml_net_rx(struct net_device *dev) ...@@ -48,7 +47,6 @@ static int uml_net_rx(struct net_device *dev)
skb->mac.raw = skb->data; skb->mac.raw = skb->data;
pkt_len = (*lp->read)(lp->fd, &skb, lp); pkt_len = (*lp->read)(lp->fd, &skb, lp);
reactivate_fd(lp->fd, UM_ETH_IRQ);
if (pkt_len > 0) { if (pkt_len > 0) {
skb_trim(skb, pkt_len); skb_trim(skb, pkt_len);
skb->protocol = (*lp->protocol)(skb); skb->protocol = (*lp->protocol)(skb);
...@@ -69,18 +67,22 @@ void uml_net_interrupt(int irq, void *dev_id, struct pt_regs *regs) ...@@ -69,18 +67,22 @@ void uml_net_interrupt(int irq, void *dev_id, struct pt_regs *regs)
struct uml_net_private *lp = dev->priv; struct uml_net_private *lp = dev->priv;
int err; int err;
if (netif_running(dev)) { if(!netif_running(dev))
spin_lock(&lp->lock); return;
while((err = uml_net_rx(dev)) > 0) ;
if(err < 0) { spin_lock(&lp->lock);
printk(KERN_ERR while((err = uml_net_rx(dev)) > 0) ;
"Device '%s' read returned %d, shutting it " if(err < 0) {
"down\n", dev->name, err); printk(KERN_ERR
dev->flags &= ~IFF_UP; "Device '%s' read returned %d, shutting it down\n",
dev_close(dev); dev->name, err);
} dev_close(dev);
spin_unlock(&lp->lock); goto out;
} }
reactivate_fd(lp->fd, UM_ETH_IRQ);
out:
spin_unlock(&lp->lock);
} }
static int uml_net_open(struct net_device *dev) static int uml_net_open(struct net_device *dev)
...@@ -250,6 +252,37 @@ void uml_net_user_timer_expire(unsigned long _conn) ...@@ -250,6 +252,37 @@ void uml_net_user_timer_expire(unsigned long _conn)
#endif #endif
} }
/*
* default do nothing hard header packet routines for struct net_device init.
* real ethernet transports will overwrite with real routines.
*/
static int uml_net_hard_header(struct sk_buff *skb, struct net_device *dev,
unsigned short type, void *daddr, void *saddr, unsigned len)
{
return(0); /* no change */
}
static int uml_net_rebuild_header(struct sk_buff *skb)
{
return(0); /* ignore */
}
static int uml_net_header_cache(struct neighbour *neigh, struct hh_cache *hh)
{
return(-1); /* fail */
}
static void uml_net_header_cache_update(struct hh_cache *hh,
struct net_device *dev, unsigned char * haddr)
{
/* ignore */
}
static int uml_net_header_parse(struct sk_buff *skb, unsigned char *haddr)
{
return(0); /* nothing */
}
static spinlock_t devices_lock = SPIN_LOCK_UNLOCKED; static spinlock_t devices_lock = SPIN_LOCK_UNLOCKED;
static struct list_head devices = LIST_HEAD_INIT(devices); static struct list_head devices = LIST_HEAD_INIT(devices);
...@@ -261,21 +294,25 @@ static int eth_configure(int n, void *init, char *mac, ...@@ -261,21 +294,25 @@ static int eth_configure(int n, void *init, char *mac,
struct uml_net_private *lp; struct uml_net_private *lp;
int save, err, size; int save, err, size;
size = transport->private_size + sizeof(struct uml_net_private) +
sizeof(((struct uml_net_private *) 0)->user);
device = kmalloc(sizeof(*device), GFP_KERNEL); device = kmalloc(sizeof(*device), GFP_KERNEL);
if(device == NULL){ if(device == NULL){
printk(KERN_ERR "eth_configure failed to allocate uml_net\n"); printk(KERN_ERR "eth_configure failed to allocate uml_net\n");
return(1); return(1);
} }
*device = ((struct uml_net) { .list = LIST_HEAD_INIT(device->list),
.dev = NULL,
.index = n,
.mac = { [ 0 ... 5 ] = 0 },
.have_mac = 0 });
spin_lock(&devices_lock); spin_lock(&devices_lock);
list_add(&device->list, &devices); list_add(&device->list, &devices);
spin_unlock(&devices_lock); spin_unlock(&devices_lock);
device->index = n;
size = transport->private_size + sizeof(struct uml_net_private) +
sizeof(((struct uml_net_private *) 0)->user);
if(setup_etheraddr(mac, device->mac)) if(setup_etheraddr(mac, device->mac))
device->have_mac = 1; device->have_mac = 1;
...@@ -290,10 +327,18 @@ static int eth_configure(int n, void *init, char *mac, ...@@ -290,10 +327,18 @@ static int eth_configure(int n, void *init, char *mac,
printk(KERN_ERR "eth_configure: failed to allocate device\n"); printk(KERN_ERR "eth_configure: failed to allocate device\n");
return(1); return(1);
} }
memset(dev, 0, sizeof(*dev) + size);
snprintf(dev->name, sizeof(dev->name), "eth%d", n); snprintf(dev->name, sizeof(dev->name), "eth%d", n);
dev->priv = (void *) &dev[1]; dev->priv = (void *) &dev[1];
device->dev = dev; device->dev = dev;
dev->hard_header = uml_net_hard_header;
dev->rebuild_header = uml_net_rebuild_header;
dev->hard_header_cache = uml_net_header_cache;
dev->header_cache_update= uml_net_header_cache_update;
dev->hard_header_parse = uml_net_header_parse;
(*transport->kern->init)(dev, init); (*transport->kern->init)(dev, init);
dev->mtu = transport->user->max_packet; dev->mtu = transport->user->max_packet;
...@@ -308,32 +353,6 @@ static int eth_configure(int n, void *init, char *mac, ...@@ -308,32 +353,6 @@ static int eth_configure(int n, void *init, char *mac,
dev->do_ioctl = uml_net_ioctl; dev->do_ioctl = uml_net_ioctl;
dev->watchdog_timeo = (HZ >> 1); dev->watchdog_timeo = (HZ >> 1);
dev->irq = UM_ETH_IRQ; dev->irq = UM_ETH_IRQ;
dev->init = NULL;
dev->master = NULL;
dev->neigh_setup = NULL;
dev->owner = NULL;
dev->state = 0;
dev->next_sched = 0;
dev->get_wireless_stats = 0;
dev->wireless_handlers = 0;
dev->gflags = 0;
dev->mc_list = NULL;
dev->mc_count = 0;
dev->promiscuity = 0;
dev->atalk_ptr = NULL;
dev->ip_ptr = NULL;
dev->dn_ptr = NULL;
dev->ip6_ptr = NULL;
dev->ec_ptr = NULL;
atomic_set(&dev->refcnt, 0);
dev->features = 0;
dev->uninit = NULL;
dev->destructor = NULL;
dev->set_config = NULL;
dev->accept_fastpath = 0;
dev->br_port = 0;
dev->mem_start = 0;
dev->mem_end = 0;
rtnl_lock(); rtnl_lock();
err = register_netdevice(dev); err = register_netdevice(dev);
...@@ -372,6 +391,7 @@ static int eth_configure(int n, void *init, char *mac, ...@@ -372,6 +391,7 @@ static int eth_configure(int n, void *init, char *mac,
if(transport->user->init) if(transport->user->init)
(*transport->user->init)(&lp->user, dev); (*transport->user->init)(&lp->user, dev);
if(device->have_mac) if(device->have_mac)
set_ether_mac(dev, device->mac); set_ether_mac(dev, device->mac);
return(0); return(0);
...@@ -486,7 +506,6 @@ void register_transport(struct transport *new) ...@@ -486,7 +506,6 @@ void register_transport(struct transport *new)
kfree(init); kfree(init);
} }
list_del(&eth->list); list_del(&eth->list);
return;
} }
} }
...@@ -580,7 +599,7 @@ static int net_remove(char *str) ...@@ -580,7 +599,7 @@ static int net_remove(char *str)
int n; int n;
n = simple_strtoul(str, &end, 0); n = simple_strtoul(str, &end, 0);
if(*end != '\0') if((*end != '\0') || (end == str))
return(-1); return(-1);
device = find_device(n); device = find_device(n);
......
arch/um/drivers/null.c
View file @ 6cc944b6
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
* Licensed under the GPL * Licensed under the GPL
*/ */
#include <stdlib.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>
#include "chan_user.h" #include "chan_user.h"
...@@ -15,8 +16,9 @@ void *null_init(char *str, int device, struct chan_opts *opts) ...@@ -15,8 +16,9 @@ void *null_init(char *str, int device, struct chan_opts *opts)
return(&null_chan); return(&null_chan);
} }
int null_open(int input, int output, int primary, void *d) int null_open(int input, int output, int primary, void *d, char **dev_out)
{ {
*dev_out = NULL;
return(os_open_file(DEV_NULL, of_rdwr(OPENFLAGS()), 0)); return(os_open_file(DEV_NULL, of_rdwr(OPENFLAGS()), 0));
} }
...@@ -30,6 +32,7 @@ void null_free(void *data) ...@@ -30,6 +32,7 @@ void null_free(void *data)
} }
struct chan_ops null_ops = { struct chan_ops null_ops = {
type: "null",
init: null_init, init: null_init,
open: null_open, open: null_open,
close: generic_close, close: generic_close,
......
arch/um/drivers/port_kern.c
View file @ 6cc944b6
...@@ -106,7 +106,7 @@ static int port_accept(struct port_list *port) ...@@ -106,7 +106,7 @@ static int port_accept(struct port_list *port)
kfree(conn); kfree(conn);
out_close: out_close:
os_close_file(fd); os_close_file(fd);
if(pid != -1) os_kill_process(pid); if(pid != -1) os_kill_process(pid, 0);
out: out:
return(ret); return(ret);
} }
...@@ -191,9 +191,9 @@ void *port_data(int port_num) ...@@ -191,9 +191,9 @@ void *port_data(int port_num)
goto out; goto out;
} }
*dev = ((struct port_dev) { port : port, *dev = ((struct port_dev) { port : port,
fd : -1, fd : -1,
helper_pid : -1 }); helper_pid : -1 });
goto out; goto out;
out_free: out_free:
...@@ -210,9 +210,9 @@ void port_remove_dev(void *d) ...@@ -210,9 +210,9 @@ void port_remove_dev(void *d)
struct port_dev *dev = d; struct port_dev *dev = d;
if(dev->helper_pid != -1) if(dev->helper_pid != -1)
os_kill_process(dev->helper_pid); os_kill_process(dev->helper_pid, 0);
if(dev->telnetd_pid != -1) if(dev->telnetd_pid != -1)
os_kill_process(dev->telnetd_pid); os_kill_process(dev->telnetd_pid, 0);
dev->helper_pid = -1; dev->helper_pid = -1;
} }
...@@ -275,8 +275,8 @@ void port_kern_free(void *d) ...@@ -275,8 +275,8 @@ void port_kern_free(void *d)
{ {
struct port_dev *dev = d; struct port_dev *dev = d;
if(dev->helper_pid != -1) os_kill_process(dev->telnetd_pid); if(dev->helper_pid != -1) os_kill_process(dev->telnetd_pid, 0);
if(dev->telnetd_pid != -1) os_kill_process(dev->telnetd_pid); if(dev->telnetd_pid != -1) os_kill_process(dev->telnetd_pid, 0);
kfree(dev); kfree(dev);
} }
......
arch/um/drivers/port_user.c
View file @ 6cc944b6
...@@ -3,11 +3,12 @@ ...@@ -3,11 +3,12 @@
* Licensed under the GPL * Licensed under the GPL
*/ */
#include <stdio.h>
#include <stddef.h> #include <stddef.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h>
#include <errno.h> #include <errno.h>
#include <unistd.h> #include <unistd.h>
#include <string.h>
#include <termios.h> #include <termios.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/un.h> #include <sys/un.h>
...@@ -24,6 +25,7 @@ struct port_chan { ...@@ -24,6 +25,7 @@ struct port_chan {
int raw; int raw;
struct termios tt; struct termios tt;
void *kernel_data; void *kernel_data;
char dev[sizeof("32768\0")];
}; };
void *port_init(char *str, int device, struct chan_opts *opts) void *port_init(char *str, int device, struct chan_opts *opts)
...@@ -40,7 +42,7 @@ void *port_init(char *str, int device, struct chan_opts *opts) ...@@ -40,7 +42,7 @@ void *port_init(char *str, int device, struct chan_opts *opts)
} }
str++; str++;
port = strtoul(str, &end, 0); port = strtoul(str, &end, 0);
if(*end != '\0'){ if((*end != '\0') || (end == str)){
printk("port_init : couldn't parse port '%s'\n", str); printk("port_init : couldn't parse port '%s'\n", str);
return(NULL); return(NULL);
} }
...@@ -50,11 +52,12 @@ void *port_init(char *str, int device, struct chan_opts *opts) ...@@ -50,11 +52,12 @@ void *port_init(char *str, int device, struct chan_opts *opts)
if((data = um_kmalloc(sizeof(*data))) == NULL) return(NULL); if((data = um_kmalloc(sizeof(*data))) == NULL) return(NULL);
*data = ((struct port_chan) { raw : opts->raw, *data = ((struct port_chan) { raw : opts->raw,
kernel_data : kern_data }); kernel_data : kern_data });
sprintf(data->dev, "%d", port);
return(data); return(data);
} }
int port_open(int input, int output, int primary, void *d) int port_open(int input, int output, int primary, void *d, char **dev_out)
{ {
struct port_chan *data = d; struct port_chan *data = d;
int fd; int fd;
...@@ -64,6 +67,7 @@ int port_open(int input, int output, int primary, void *d) ...@@ -64,6 +67,7 @@ int port_open(int input, int output, int primary, void *d)
tcgetattr(fd, &data->tt); tcgetattr(fd, &data->tt);
raw(fd, 0); raw(fd, 0);
} }
*dev_out = data->dev;
return(fd); return(fd);
} }
...@@ -91,6 +95,7 @@ void port_free(void *d) ...@@ -91,6 +95,7 @@ void port_free(void *d)
} }
struct chan_ops port_ops = { struct chan_ops port_ops = {
type: "port",
init: port_init, init: port_init,
open: port_open, open: port_open,
close: port_close, close: port_close,
...@@ -129,42 +134,6 @@ int port_listen_fd(int port) ...@@ -129,42 +134,6 @@ int port_listen_fd(int port)
return(err); return(err);
} }
int port_rcv_fd(int fd)
{
int new, n;
char buf[CMSG_SPACE(sizeof(new))];
struct msghdr msg;
struct cmsghdr *cmsg;
msg.msg_name = NULL;
msg.msg_namelen = 0;
msg.msg_iov = NULL;
msg.msg_iovlen = 0;
msg.msg_control = buf;
msg.msg_controllen = sizeof(buf);
msg.msg_flags = 0;
n = recvmsg(fd, &msg, 0);
if(n < 0){
printk("rcv_fd : recvmsg failed - errno = %d\n", errno);
return(-1);
}
cmsg = CMSG_FIRSTHDR(&msg);
if(cmsg == NULL){
printk("rcv_fd didn't receive anything, error = %d\n", errno);
return(-1);
}
if((cmsg->cmsg_level != SOL_SOCKET) ||
(cmsg->cmsg_type != SCM_RIGHTS)){
printk("rcv_fd didn't receive a descriptor\n");
return(-1);
}
new = ((int *) CMSG_DATA(cmsg))[0];
return(new);
}
struct port_pre_exec_data { struct port_pre_exec_data {
int sock_fd; int sock_fd;
int pipe_fd; int pipe_fd;
......
arch/um/drivers/pty.c
View file @ 6cc944b6
...@@ -19,6 +19,7 @@ struct pty_chan { ...@@ -19,6 +19,7 @@ struct pty_chan {
int dev; int dev;
int raw; int raw;
struct termios tt; struct termios tt;
char dev_name[sizeof("/dev/pts/0123456\0")];
}; };
void *pty_chan_init(char *str, int device, struct chan_opts *opts) void *pty_chan_init(char *str, int device, struct chan_opts *opts)
...@@ -32,9 +33,10 @@ void *pty_chan_init(char *str, int device, struct chan_opts *opts) ...@@ -32,9 +33,10 @@ void *pty_chan_init(char *str, int device, struct chan_opts *opts)
return(data); return(data);
} }
int pts_open(int input, int output, int primary, void *d) int pts_open(int input, int output, int primary, void *d, char **dev_out)
{ {
struct pty_chan *data = d; struct pty_chan *data = d;
char *dev;
int fd; int fd;
if((fd = get_pty()) < 0){ if((fd = get_pty()) < 0){
...@@ -45,7 +47,11 @@ int pts_open(int input, int output, int primary, void *d) ...@@ -45,7 +47,11 @@ int pts_open(int input, int output, int primary, void *d)
tcgetattr(fd, &data->tt); tcgetattr(fd, &data->tt);
raw(fd, 0); raw(fd, 0);
} }
if(data->announce) (*data->announce)(ptsname(fd), data->dev);
dev = ptsname(fd);
sprintf(data->dev_name, "%s", dev);
*dev_out = data->dev_name;
if(data->announce) (*data->announce)(dev, data->dev);
return(fd); return(fd);
} }
...@@ -94,7 +100,7 @@ static void grantpt_cb(void *arg) ...@@ -94,7 +100,7 @@ static void grantpt_cb(void *arg)
info->err = errno; info->err = errno;
} }
int pty_open(int input, int output, int primary, void *d) int pty_open(int input, int output, int primary, void *d, char **dev_out)
{ {
struct pty_chan *data = d; struct pty_chan *data = d;
int fd; int fd;
...@@ -105,11 +111,14 @@ int pty_open(int input, int output, int primary, void *d) ...@@ -105,11 +111,14 @@ int pty_open(int input, int output, int primary, void *d)
if(fd < 0) return(-errno); if(fd < 0) return(-errno);
info.fd = fd; info.fd = fd;
tracing_cb(grantpt_cb, &info); initial_thread_cb(grantpt_cb, &info);
unlockpt(fd); unlockpt(fd);
if(data->raw) raw(fd, 0); if(data->raw) raw(fd, 0);
if(data->announce) (*data->announce)(dev, data->dev); if(data->announce) (*data->announce)(dev, data->dev);
sprintf(data->dev_name, "%s", dev);
*dev_out = data->dev_name;
return(fd); return(fd);
} }
...@@ -121,6 +130,7 @@ int pty_console_write(int fd, const char *buf, int n, void *d) ...@@ -121,6 +130,7 @@ int pty_console_write(int fd, const char *buf, int n, void *d)
} }
struct chan_ops pty_ops = { struct chan_ops pty_ops = {
type: "pty",
init: pty_chan_init, init: pty_chan_init,
open: pty_open, open: pty_open,
close: generic_close, close: generic_close,
...@@ -133,6 +143,7 @@ struct chan_ops pty_ops = { ...@@ -133,6 +143,7 @@ struct chan_ops pty_ops = {
}; };
struct chan_ops pts_ops = { struct chan_ops pts_ops = {
type: "pts",
init: pty_chan_init, init: pty_chan_init,
open: pts_open, open: pts_open,
close: generic_close, close: generic_close,
......
arch/um/drivers/slip.h
View file @ 6cc944b6
...@@ -2,6 +2,9 @@ ...@@ -2,6 +2,9 @@
#define __UM_SLIP_H #define __UM_SLIP_H
#define BUF_SIZE 1500 #define BUF_SIZE 1500
/* two bytes each for a (pathological) max packet of escaped chars + *
* terminating END char + initial END char */
#define ENC_BUF_SIZE (2 * BUF_SIZE + 2)
struct slip_data { struct slip_data {
void *dev; void *dev;
...@@ -9,10 +12,9 @@ struct slip_data { ...@@ -9,10 +12,9 @@ struct slip_data {
char *addr; char *addr;
char *gate_addr; char *gate_addr;
int slave; int slave;
/* two bytes each for a (pathological) max packet of escaped chars + char ibuf[ENC_BUF_SIZE];
* terminating END char + inital END char char obuf[ENC_BUF_SIZE];
*/ int more; /* more data: do not read fd until ibuf has been drained */
char buf[2 * BUF_SIZE + 2];
int pos; int pos;
int esc; int esc;
}; };
......
arch/um/drivers/slip_kern.c
View file @ 6cc944b6
#include "linux/config.h"
#include "linux/kernel.h" #include "linux/kernel.h"
#include "linux/stddef.h" #include "linux/stddef.h"
#include "linux/init.h" #include "linux/init.h"
...@@ -24,21 +25,19 @@ void slip_init(struct net_device *dev, void *data) ...@@ -24,21 +25,19 @@ void slip_init(struct net_device *dev, void *data)
{ name : { '\0' }, { name : { '\0' },
addr: NULL, addr: NULL,
gate_addr : init->gate_addr, gate_addr : init->gate_addr,
slave : 0, slave : -1,
buf : { '\0' }, ibuf : { '\0' },
obuf : { '\0' },
pos : 0, pos : 0,
esc : 0, esc : 0,
dev : dev }); dev : dev });
strncpy(dev->name, "umn", IFNAMSIZ);
dev->init = NULL; dev->init = NULL;
dev->hard_header_len = 0; dev->hard_header_len = 0;
dev->addr_len = 4; dev->addr_len = 4;
dev->type = ARPHRD_ETHER; dev->type = ARPHRD_ETHER;
dev->tx_queue_len = 256; dev->tx_queue_len = 256;
dev->flags = IFF_NOARP; dev->flags = IFF_NOARP;
if(register_netdev(dev))
printk(KERN_ERR "Couldn't initialize umn\n");
printk("SLIP backend - SLIP IP = %s\n", spri->gate_addr); printk("SLIP backend - SLIP IP = %s\n", spri->gate_addr);
} }
......
arch/um/drivers/slip_proto.h 0 → 100644
View file @ 6cc944b6
/*
* Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
* Licensed under the GPL
*/
#ifndef __UM_SLIP_PROTO_H__
#define __UM_SLIP_PROTO_H__
/* SLIP protocol characters. */
#define SLIP_END 0300 /* indicates end of frame */
#define SLIP_ESC 0333 /* indicates byte stuffing */
#define SLIP_ESC_END 0334 /* ESC ESC_END means END 'data' */
#define SLIP_ESC_ESC 0335 /* ESC ESC_ESC means ESC 'data' */
static inline int slip_unesc(unsigned char c,char *buf,int *pos, int *esc)
{
int ret;
switch(c){
case SLIP_END:
*esc = 0;
ret=*pos;
*pos=0;
return(ret);
case SLIP_ESC:
*esc = 1;
return(0);
case SLIP_ESC_ESC:
if(*esc){
*esc = 0;
c = SLIP_ESC;
}
break;
case SLIP_ESC_END:
if(*esc){
*esc = 0;
c = SLIP_END;
}
break;
}
buf[(*pos)++] = c;
return(0);
}
static inline int slip_esc(unsigned char *s, unsigned char *d, int len)
{
unsigned char *ptr = d;
unsigned char c;
/*
* Send an initial END character to flush out any
* data that may have accumulated in the receiver
* due to line noise.
*/
*ptr++ = SLIP_END;
/*
* For each byte in the packet, send the appropriate
* character sequence, according to the SLIP protocol.
*/
while (len-- > 0) {
switch(c = *s++) {
case SLIP_END:
*ptr++ = SLIP_ESC;
*ptr++ = SLIP_ESC_END;
break;
case SLIP_ESC:
*ptr++ = SLIP_ESC;
*ptr++ = SLIP_ESC_ESC;
break;
default:
*ptr++ = c;
break;
}
}
*ptr++ = SLIP_END;
return (ptr - d);
}
#endif
/*
* Overrides for Emacs so that we follow Linus's tabbing style.
* Emacs will notice this stuff at the end of the file and automatically
* adjust the settings for this buffer only. This must remain at the end
* of the file.
* ---------------------------------------------------------------------------
* Local variables:
* c-file-style: "linux"
* End:
*/
arch/um/drivers/slip_user.c
View file @ 6cc944b6
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include "user.h" #include "user.h"
#include "net_user.h" #include "net_user.h"
#include "slip.h" #include "slip.h"
#include "slip_proto.h"
#include "helper.h" #include "helper.h"
#include "os.h" #include "os.h"
...@@ -66,7 +67,7 @@ static void slip_pre_exec(void *arg) ...@@ -66,7 +67,7 @@ static void slip_pre_exec(void *arg)
if(data->stdin != -1) dup2(data->stdin, 0); if(data->stdin != -1) dup2(data->stdin, 0);
dup2(data->stdout, 1); dup2(data->stdout, 1);
close(data->close_me); if(data->close_me != -1) close(data->close_me);
} }
static int slip_tramp(char **argv, int fd) static int slip_tramp(char **argv, int fd)
...@@ -156,7 +157,7 @@ static int slip_open(void *data) ...@@ -156,7 +157,7 @@ static int slip_open(void *data)
} }
sencap = 0; sencap = 0;
if(ioctl(sfd, SIOCSIFENCAP, &sencap) < 0){ if(ioctl(sfd, SIOCSIFENCAP, &sencap) < 0){
printk("Failed to sett slip encapsulation - " printk("Failed to set slip encapsulation - "
"errno = %d\n", errno); "errno = %d\n", errno);
return(-errno); return(-errno);
} }
...@@ -186,103 +187,48 @@ static void slip_close(int fd, void *data) ...@@ -186,103 +187,48 @@ static void slip_close(int fd, void *data)
pri->slave = -1; pri->slave = -1;
} }
/* SLIP protocol characters. */
#define END 0300 /* indicates end of frame */
#define ESC 0333 /* indicates byte stuffing */
#define ESC_END 0334 /* ESC ESC_END means END 'data' */
#define ESC_ESC 0335 /* ESC ESC_ESC means ESC 'data' */
static int slip_unesc(struct slip_data *sl, unsigned char c)
{
int ret;
switch(c){
case END:
sl->esc = 0;
ret = sl->pos;
sl->pos = 0;
return(ret);
case ESC:
sl->esc = 1;
return(0);
case ESC_ESC:
if(sl->esc){
sl->esc = 0;
c = ESC;
}
break;
case ESC_END:
if(sl->esc){
sl->esc = 0;
c = END;
}
break;
}
sl->buf[sl->pos++] = c;
return(0);
}
int slip_user_read(int fd, void *buf, int len, struct slip_data *pri) int slip_user_read(int fd, void *buf, int len, struct slip_data *pri)
{ {
int i, n, size, start; int i, n, size, start;
n = net_read(fd, &pri->buf[pri->pos], sizeof(pri->buf) - pri->pos); if(pri->more>0) {
i = 0;
while(i < pri->more) {
size = slip_unesc(pri->ibuf[i++],
pri->ibuf, &pri->pos, &pri->esc);
if(size){
memcpy(buf, pri->ibuf, size);
memmove(pri->ibuf, &pri->ibuf[i], pri->more-i);
pri->more=pri->more-i;
return(size);
}
}
pri->more=0;
}
n = net_read(fd, &pri->ibuf[pri->pos], sizeof(pri->ibuf) - pri->pos);
if(n <= 0) return(n); if(n <= 0) return(n);
start = pri->pos; start = pri->pos;
for(i = 0; i < n; i++){ for(i = 0; i < n; i++){
size = slip_unesc(pri, pri->buf[start + i]); size = slip_unesc(pri->ibuf[start + i],
pri->ibuf, &pri->pos, &pri->esc);
if(size){ if(size){
memcpy(buf, pri->buf, size); memcpy(buf, pri->ibuf, size);
memmove(pri->ibuf, &pri->ibuf[start+i+1], n-(i+1));
pri->more=n-(i+1);
return(size); return(size);
} }
} }
return(0); return(0);
} }
static int slip_esc(unsigned char *s, unsigned char *d, int len)
{
unsigned char *ptr = d;
unsigned char c;
/*
* Send an initial END character to flush out any
* data that may have accumulated in the receiver
* due to line noise.
*/
*ptr++ = END;
/*
* For each byte in the packet, send the appropriate
* character sequence, according to the SLIP protocol.
*/
while (len-- > 0) {
switch(c = *s++) {
case END:
*ptr++ = ESC;
*ptr++ = ESC_END;
break;
case ESC:
*ptr++ = ESC;
*ptr++ = ESC_ESC;
break;
default:
*ptr++ = c;
break;
}
}
*ptr++ = END;
return (ptr - d);
}
int slip_user_write(int fd, void *buf, int len, struct slip_data *pri) int slip_user_write(int fd, void *buf, int len, struct slip_data *pri)
{ {
int actual, n; int actual, n;
actual = slip_esc(buf, pri->buf, len); actual = slip_esc(buf, pri->obuf, len);
n = net_write(fd, pri->buf, actual); n = net_write(fd, pri->obuf, actual);
if(n < 0) return(n); if(n < 0) return(n);
else return(len); else return(len);
} }
......
arch/um/drivers/slirp.h 0 → 100644
View file @ 6cc944b6
#ifndef __UM_SLIRP_H
#define __UM_SLIRP_H
#define BUF_SIZE 1500
/* two bytes each for a (pathological) max packet of escaped chars + *
* terminating END char + initial END char */
#define ENC_BUF_SIZE (2 * BUF_SIZE + 2)
#define SLIRP_MAX_ARGS 100
/*
* XXX this next definition is here because I don't understand why this
* initializer doesn't work in slirp_kern.c:
*
* argv : { init->argv[ 0 ... SLIRP_MAX_ARGS-1 ] },
*
* or why I can't typecast like this:
*
* argv : (char* [SLIRP_MAX_ARGS])(init->argv),
*/
struct arg_list_dummy_wrapper { char *argv[SLIRP_MAX_ARGS]; };
struct slirp_data {
void *dev;
struct arg_list_dummy_wrapper argw;
int pid;
int slave;
char ibuf[ENC_BUF_SIZE];
char obuf[ENC_BUF_SIZE];
int more; /* more data: do not read fd until ibuf has been drained */
int pos;
int esc;
};
extern struct net_user_info slirp_user_info;
extern int set_umn_addr(int fd, char *addr, char *ptp_addr);
extern int slirp_user_read(int fd, void *buf, int len, struct slirp_data *pri);
extern int slirp_user_write(int fd, void *buf, int len, struct slirp_data *pri);
#endif
/*
* Overrides for Emacs so that we follow Linus's tabbing style.
* Emacs will notice this stuff at the end of the file and automatically
* adjust the settings for this buffer only. This must remain at the end
* of the file.
* ---------------------------------------------------------------------------
* Local variables:
* c-file-style: "linux"
* End:
*/
arch/um/drivers/slirp_kern.c 0 → 100644
View file @ 6cc944b6
#include "linux/kernel.h"
#include "linux/stddef.h"
#include "linux/init.h"
#include "linux/netdevice.h"
#include "linux/if_arp.h"
#include "net_kern.h"
#include "net_user.h"
#include "kern.h"
#include "slirp.h"
struct slirp_init {
struct arg_list_dummy_wrapper argw; /* XXX should be simpler... */
};
void slirp_init(struct net_device *dev, void *data)
{
struct uml_net_private *private;
struct slirp_data *spri;
struct slirp_init *init = data;
int i;
private = dev->priv;
spri = (struct slirp_data *) private->user;
*spri = ((struct slirp_data)
{ argw : init->argw,
pid : -1,
slave : -1,
ibuf : { '\0' },
obuf : { '\0' },
pos : 0,
esc : 0,
dev : dev });
dev->init = NULL;
dev->hard_header_len = 0;
dev->addr_len = 4;
dev->type = ARPHRD_ETHER;
dev->tx_queue_len = 256;
dev->flags = IFF_NOARP;
printk("SLIRP backend - command line:");
for(i=0;spri->argw.argv[i]!=NULL;i++) {
printk(" '%s'",spri->argw.argv[i]);
}
printk("\n");
}
static unsigned short slirp_protocol(struct sk_buff *skbuff)
{
return(htons(ETH_P_IP));
}
static int slirp_read(int fd, struct sk_buff **skb,
struct uml_net_private *lp)
{
return(slirp_user_read(fd, (*skb)->mac.raw, (*skb)->dev->mtu,
(struct slirp_data *) &lp->user));
}
static int slirp_write(int fd, struct sk_buff **skb,
struct uml_net_private *lp)
{
return(slirp_user_write(fd, (*skb)->data, (*skb)->len,
(struct slirp_data *) &lp->user));
}
struct net_kern_info slirp_kern_info = {
init: slirp_init,
protocol: slirp_protocol,
read: slirp_read,
write: slirp_write,
};
static int slirp_setup(char *str, char **mac_out, void *data)
{
struct slirp_init *init = data;
int i=0;
*init = ((struct slirp_init)
{ argw : { { "slirp", NULL } } });
str = split_if_spec(str, mac_out, NULL);
if(str == NULL) { /* no command line given after MAC addr */
return(1);
}
do {
if(i>=SLIRP_MAX_ARGS-1) {
printk("slirp_setup: truncating slirp arguments\n");
break;
}
init->argw.argv[i++] = str;
while(*str && *str!=',') {
if(*str=='_') *str=' ';
str++;
}
if(*str!=',')
break;
*str++='\0';
} while(1);
init->argw.argv[i]=NULL;
return(1);
}
static struct transport slirp_transport = {
list : LIST_HEAD_INIT(slirp_transport.list),
name : "slirp",
setup : slirp_setup,
user : &slirp_user_info,
kern : &slirp_kern_info,
private_size : sizeof(struct slirp_data),
setup_size : sizeof(struct slirp_init),
};
static int register_slirp(void)
{
register_transport(&slirp_transport);
return(1);
}
__initcall(register_slirp);
/*
* Overrides for Emacs so that we follow Linus's tabbing style.
* Emacs will notice this stuff at the end of the file and automatically
* adjust the settings for this buffer only. This must remain at the end
* of the file.
* ---------------------------------------------------------------------------
* Local variables:
* c-file-style: "linux"
* End:
*/
arch/um/drivers/slirp_user.c 0 → 100644
View file @ 6cc944b6
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <stddef.h>
#include <sched.h>
#include <string.h>
#include <sys/fcntl.h>
#include <sys/errno.h>
#include <sys/wait.h>
#include <sys/signal.h>
#include "user_util.h"
#include "kern_util.h"
#include "user.h"
#include "net_user.h"
#include "slirp.h"
#include "slip_proto.h"
#include "helper.h"
#include "os.h"
void slirp_user_init(void *data, void *dev)
{
struct slirp_data *pri = data;
pri->dev = dev;
}
struct slirp_pre_exec_data {
int stdin;
int stdout;
};
static void slirp_pre_exec(void *arg)
{
struct slirp_pre_exec_data *data = arg;
if(data->stdin != -1) dup2(data->stdin, 0);
if(data->stdout != -1) dup2(data->stdout, 1);
}
static int slirp_tramp(char **argv, int fd)
{
struct slirp_pre_exec_data pe_data;
int pid;
pe_data.stdin = fd;
pe_data.stdout = fd;
pid = run_helper(slirp_pre_exec, &pe_data, argv, NULL);
return(pid);
}
static int slirp_datachan(int *mfd, int *sfd)
{
int fds[2], err;
err = os_pipe(fds, 1, 1);
if(err){
printk("slirp_datachan: Failed to open pipe, errno = %d\n",
-err);
return(err);
}
*mfd = fds[0];
*sfd = fds[1];
return(0);
}
static int slirp_open(void *data)
{
struct slirp_data *pri = data;
int sfd, mfd, pid, err;
err = slirp_datachan(&mfd, &sfd);
if(err)
return(err);
pid = slirp_tramp(pri->argw.argv, sfd);
if(pid < 0){
printk("slirp_tramp failed - errno = %d\n", pid);
os_close_file(sfd);
os_close_file(mfd);
return(pid);
}
pri->slave = sfd;
pri->pos = 0;
pri->esc = 0;
pri->pid = pid;
return(mfd);
}
static void slirp_close(int fd, void *data)
{
struct slirp_data *pri = data;
int status,err;
close(fd);
close(pri->slave);
pri->slave = -1;
if(pri->pid<1) {
printk("slirp_close: no child process to shut down\n");
return;
}
#if 0
if(kill(pri->pid, SIGHUP)<0) {
printk("slirp_close: sending hangup to %d failed (%d)\n",
pri->pid, errno);
}
#endif
err = waitpid(pri->pid, &status, WNOHANG);
if(err<0) {
printk("slirp_close: waitpid returned %d\n", errno);
return;
}
if(err==0) {
printk("slirp_close: process %d has not exited\n");
return;
}
pri->pid = -1;
}
int slirp_user_read(int fd, void *buf, int len, struct slirp_data *pri)
{
int i, n, size, start;
if(pri->more>0) {
i = 0;
while(i < pri->more) {
size = slip_unesc(pri->ibuf[i++],
pri->ibuf,&pri->pos,&pri->esc);
if(size){
memcpy(buf, pri->ibuf, size);
memmove(pri->ibuf, &pri->ibuf[i], pri->more-i);
pri->more=pri->more-i;
return(size);
}
}
pri->more=0;
}
n = net_read(fd, &pri->ibuf[pri->pos], sizeof(pri->ibuf) - pri->pos);
if(n <= 0) return(n);
start = pri->pos;
for(i = 0; i < n; i++){
size = slip_unesc(pri->ibuf[start + i],
pri->ibuf,&pri->pos,&pri->esc);
if(size){
memcpy(buf, pri->ibuf, size);
memmove(pri->ibuf, &pri->ibuf[start+i+1], n-(i+1));
pri->more=n-(i+1);
return(size);
}
}
return(0);
}
int slirp_user_write(int fd, void *buf, int len, struct slirp_data *pri)
{
int actual, n;
actual = slip_esc(buf, pri->obuf, len);
n = net_write(fd, pri->obuf, actual);
if(n < 0) return(n);
else return(len);
}
static int slirp_set_mtu(int mtu, void *data)
{
return(mtu);
}
struct net_user_info slirp_user_info = {
init: slirp_user_init,
open: slirp_open,
close: slirp_close,
remove: NULL,
set_mtu: slirp_set_mtu,
add_address: NULL,
delete_address: NULL,
max_packet: BUF_SIZE
};
/*
* Overrides for Emacs so that we follow Linus's tabbing style.
* Emacs will notice this stuff at the end of the file and automatically
* adjust the settings for this buffer only. This must remain at the end
* of the file.
* ---------------------------------------------------------------------------
* Local variables:
* c-file-style: "linux"
* End:
*/
arch/um/drivers/ssl.c
View file @ 6cc944b6
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include "kern.h" #include "kern.h"
#include "init.h" #include "init.h"
#include "irq_user.h" #include "irq_user.h"
#include "mconsole_kern.h"
#include "2_5compat.h" #include "2_5compat.h"
static int ssl_version = 1; static int ssl_version = 1;
...@@ -47,6 +48,10 @@ static struct chan_opts opts = { ...@@ -47,6 +48,10 @@ static struct chan_opts opts = {
in_kernel : 1, in_kernel : 1,
}; };
static int ssl_config(char *str);
static int ssl_get_config(char *dev, char *str, int size, char **error_out);
static int ssl_remove(char *str);
static struct line_driver driver = { static struct line_driver driver = {
name : "UML serial line", name : "UML serial line",
devfs_name : "tts/%d", devfs_name : "tts/%d",
...@@ -60,6 +65,12 @@ static struct line_driver driver = { ...@@ -60,6 +65,12 @@ static struct line_driver driver = {
write_irq_name : "ssl-write", write_irq_name : "ssl-write",
symlink_from : "serial", symlink_from : "serial",
symlink_to : "tts", symlink_to : "tts",
mc : {
name : "ssl",
config : ssl_config,
get_config : ssl_get_config,
remove : ssl_remove,
},
}; };
/* The array is initialized by line_init, which is an initcall. The /* The array is initialized by line_init, which is an initcall. The
...@@ -70,6 +81,25 @@ static struct line serial_lines[NR_PORTS] = ...@@ -70,6 +81,25 @@ static struct line serial_lines[NR_PORTS] =
static struct lines lines = LINES_INIT(NR_PORTS); static struct lines lines = LINES_INIT(NR_PORTS);
static int ssl_config(char *str)
{
return(line_config(serial_lines,
sizeof(serial_lines)/sizeof(serial_lines[0]), str));
}
static int ssl_get_config(char *dev, char *str, int size, char **error_out)
{
return(line_get_config(dev, serial_lines,
sizeof(serial_lines)/sizeof(serial_lines[0]),
str, size, error_out));
}
static int ssl_remove(char *str)
{
return(line_remove(serial_lines,
sizeof(serial_lines)/sizeof(serial_lines[0]), str));
}
int ssl_open(struct tty_struct *tty, struct file *filp) int ssl_open(struct tty_struct *tty, struct file *filp)
{ {
return(line_open(serial_lines, tty, &opts)); return(line_open(serial_lines, tty, &opts));
...@@ -83,12 +113,12 @@ static void ssl_close(struct tty_struct *tty, struct file * filp) ...@@ -83,12 +113,12 @@ static void ssl_close(struct tty_struct *tty, struct file * filp)
static int ssl_write(struct tty_struct * tty, int from_user, static int ssl_write(struct tty_struct * tty, int from_user,
const unsigned char *buf, int count) const unsigned char *buf, int count)
{ {
return(line_write(serial_lines, tty, buf, count)); return(line_write(serial_lines, tty, from_user, buf, count));
} }
static void ssl_put_char(struct tty_struct *tty, unsigned char ch) static void ssl_put_char(struct tty_struct *tty, unsigned char ch)
{ {
line_write(serial_lines, tty, &ch, sizeof(ch)); line_write(serial_lines, tty, 0, &ch, sizeof(ch));
} }
static void ssl_flush_chars(struct tty_struct *tty) static void ssl_flush_chars(struct tty_struct *tty)
...@@ -207,7 +237,7 @@ __initcall(ssl_init); ...@@ -207,7 +237,7 @@ __initcall(ssl_init);
static int ssl_chan_setup(char *str) static int ssl_chan_setup(char *str)
{ {
line_setup(serial_lines, sizeof(serial_lines)/sizeof(serial_lines[0]), line_setup(serial_lines, sizeof(serial_lines)/sizeof(serial_lines[0]),
str); str, 1);
return(1); return(1);
} }
......
arch/um/drivers/stdio_console.c
View file @ 6cc944b6
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include "user_util.h" #include "user_util.h"
#include "kern_util.h" #include "kern_util.h"
#include "irq_user.h" #include "irq_user.h"
#include "mconsole_kern.h"
#include "init.h" #include "init.h"
#include "2_5compat.h" #include "2_5compat.h"
...@@ -41,6 +42,7 @@ static struct tty_driver console_driver; ...@@ -41,6 +42,7 @@ static struct tty_driver console_driver;
static int console_refcount = 0; static int console_refcount = 0;
static struct chan_ops init_console_ops = { static struct chan_ops init_console_ops = {
type: "you shouldn't see this",
init : NULL, init : NULL,
open : NULL, open : NULL,
close : NULL, close : NULL,
...@@ -78,6 +80,10 @@ static struct chan_opts opts = { ...@@ -78,6 +80,10 @@ static struct chan_opts opts = {
in_kernel : 1, in_kernel : 1,
}; };
static int con_config(char *str);
static int con_get_config(char *dev, char *str, int size, char **error_out);
static int con_remove(char *str);
static struct line_driver driver = { static struct line_driver driver = {
name : "UML console", name : "UML console",
devfs_name : "vc/%d", devfs_name : "vc/%d",
...@@ -91,6 +97,12 @@ static struct line_driver driver = { ...@@ -91,6 +97,12 @@ static struct line_driver driver = {
write_irq_name : "console-write", write_irq_name : "console-write",
symlink_from : "ttys", symlink_from : "ttys",
symlink_to : "vc", symlink_to : "vc",
mc : {
name : "con",
config : con_config,
get_config : con_get_config,
remove : con_remove,
},
}; };
static struct lines console_lines = LINES_INIT(MAX_TTYS); static struct lines console_lines = LINES_INIT(MAX_TTYS);
...@@ -102,6 +114,22 @@ struct line vts[MAX_TTYS] = { LINE_INIT(CONFIG_CON_ZERO_CHAN, &driver), ...@@ -102,6 +114,22 @@ struct line vts[MAX_TTYS] = { LINE_INIT(CONFIG_CON_ZERO_CHAN, &driver),
[ 1 ... MAX_TTYS - 1 ] = [ 1 ... MAX_TTYS - 1 ] =
LINE_INIT(CONFIG_CON_CHAN, &driver) }; LINE_INIT(CONFIG_CON_CHAN, &driver) };
static int con_config(char *str)
{
return(line_config(vts, sizeof(vts)/sizeof(vts[0]), str));
}
static int con_get_config(char *dev, char *str, int size, char **error_out)
{
return(line_get_config(dev, vts, sizeof(vts)/sizeof(vts[0]), str,
size, error_out));
}
static int con_remove(char *str)
{
return(line_remove(vts, sizeof(vts)/sizeof(vts[0]), str));
}
static int open_console(struct tty_struct *tty) static int open_console(struct tty_struct *tty)
{ {
return(line_open(vts, tty, &opts)); return(line_open(vts, tty, &opts));
...@@ -120,7 +148,7 @@ static void con_close(struct tty_struct *tty, struct file *filp) ...@@ -120,7 +148,7 @@ static void con_close(struct tty_struct *tty, struct file *filp)
static int con_write(struct tty_struct *tty, int from_user, static int con_write(struct tty_struct *tty, int from_user,
const unsigned char *buf, int count) const unsigned char *buf, int count)
{ {
return(line_write(vts, tty, buf, count)); return(line_write(vts, tty, from_user, buf, count));
} }
static void set_termios(struct tty_struct *tty, struct termios * old) static void set_termios(struct tty_struct *tty, struct termios * old)
...@@ -195,7 +223,7 @@ void stdio_console_init(void) ...@@ -195,7 +223,7 @@ void stdio_console_init(void)
static int console_chan_setup(char *str) static int console_chan_setup(char *str)
{ {
line_setup(vts, sizeof(vts)/sizeof(vts[0]), str); line_setup(vts, sizeof(vts)/sizeof(vts[0]), str, 1);
return(1); return(1);
} }
......
arch/um/drivers/tty.c
View file @ 6cc944b6
...@@ -30,14 +30,15 @@ void *tty_chan_init(char *str, int device, struct chan_opts *opts) ...@@ -30,14 +30,15 @@ void *tty_chan_init(char *str, int device, struct chan_opts *opts)
} }
str++; str++;
if((data = um_kmalloc(sizeof(*data))) == NULL) return(NULL); if((data = um_kmalloc(sizeof(*data))) == NULL)
return(NULL);
*data = ((struct tty_chan) { dev : str, *data = ((struct tty_chan) { dev : str,
raw : opts->raw }); raw : opts->raw });
return(data); return(data);
} }
int tty_open(int input, int output, int primary, void *d) int tty_open(int input, int output, int primary, void *d, char **dev_out)
{ {
struct tty_chan *data = d; struct tty_chan *data = d;
int fd; int fd;
...@@ -48,6 +49,8 @@ int tty_open(int input, int output, int primary, void *d) ...@@ -48,6 +49,8 @@ int tty_open(int input, int output, int primary, void *d)
tcgetattr(fd, &data->tt); tcgetattr(fd, &data->tt);
raw(fd, 0); raw(fd, 0);
} }
*dev_out = data->dev;
return(fd); return(fd);
} }
...@@ -59,6 +62,7 @@ int tty_console_write(int fd, const char *buf, int n, void *d) ...@@ -59,6 +62,7 @@ int tty_console_write(int fd, const char *buf, int n, void *d)
} }
struct chan_ops tty_ops = { struct chan_ops tty_ops = {
type: "tty",
init: tty_chan_init, init: tty_chan_init,
open: tty_open, open: tty_open,
close: generic_close, close: generic_close,
......
arch/um/drivers/ubd_kern.c
View file @ 6cc944b6
...@@ -218,7 +218,7 @@ static int ubd_setup_common(char *str, int *index_out) ...@@ -218,7 +218,7 @@ static int ubd_setup_common(char *str, int *index_out)
return(0); return(0);
} }
major = simple_strtoul(str, &end, 0); major = simple_strtoul(str, &end, 0);
if(*end != '\0'){ if((*end != '\0') || (end == str)){
printk(KERN_ERR printk(KERN_ERR
"ubd_setup : didn't parse major number\n"); "ubd_setup : didn't parse major number\n");
return(1); return(1);
...@@ -520,7 +520,10 @@ static int ubd_add(int n) ...@@ -520,7 +520,10 @@ static int ubd_add(int n)
struct ubd *dev = &ubd_dev[n]; struct ubd *dev = &ubd_dev[n];
int err; int err;
if (!dev->file || dev->is_dir) if(dev->is_dir)
return(-EISDIR);
if (!dev->file)
return(-ENODEV); return(-ENODEV);
if (ubd_open_dev(dev)) if (ubd_open_dev(dev))
...@@ -574,6 +577,44 @@ static int ubd_config(char *str) ...@@ -574,6 +577,44 @@ static int ubd_config(char *str)
return(err); return(err);
} }
static int ubd_get_config(char *dev, char *str, int size, char **error_out)
{
struct ubd *ubd;
char *end;
int major, n = 0;
major = simple_strtoul(dev, &end, 0);
if((*end != '\0') || (end == dev)){
*error_out = "ubd_get_config : didn't parse major number";
return(-1);
}
if((major >= MAX_DEV) || (major < 0)){
*error_out = "ubd_get_config : major number out of range";
return(-1);
}
ubd = &ubd_dev[major];
spin_lock(&ubd_lock);
if(ubd->file == NULL){
CONFIG_CHUNK(str, size, n, "", 1);
goto out;
}
CONFIG_CHUNK(str, size, n, ubd->file, 0);
if(ubd->cow.file != NULL){
CONFIG_CHUNK(str, size, n, ",", 0);
CONFIG_CHUNK(str, size, n, ubd->cow.file, 1);
}
else CONFIG_CHUNK(str, size, n, "", 1);
out:
spin_unlock(&ubd_lock);
return(n);
}
static int ubd_remove(char *str) static int ubd_remove(char *str)
{ {
struct ubd *dev; struct ubd *dev;
...@@ -583,7 +624,7 @@ static int ubd_remove(char *str) ...@@ -583,7 +624,7 @@ static int ubd_remove(char *str)
return(err); /* it should be a number 0-7/a-h */ return(err); /* it should be a number 0-7/a-h */
n = *str - '0'; n = *str - '0';
if(n > MAX_DEV) if(n >= MAX_DEV)
return(err); return(err);
dev = &ubd_dev[n]; dev = &ubd_dev[n];
...@@ -620,6 +661,7 @@ static int ubd_remove(char *str) ...@@ -620,6 +661,7 @@ static int ubd_remove(char *str)
static struct mc_device ubd_mc = { static struct mc_device ubd_mc = {
.name = "ubd", .name = "ubd",
.config = ubd_config, .config = ubd_config,
.get_config = ubd_get_config,
.remove = ubd_remove, .remove = ubd_remove,
}; };
......
arch/um/drivers/ubd_user.c
View file @ 6cc944b6
...@@ -473,6 +473,8 @@ void do_io(struct io_thread_req *req) ...@@ -473,6 +473,8 @@ void do_io(struct io_thread_req *req)
&req->sector_mask) == bit)) &req->sector_mask) == bit))
end++; end++;
if(end != nsectors)
printk("end != nsectors\n");
off = req->offset + req->offsets[bit] + off = req->offset + req->offsets[bit] +
start * req->sectorsize; start * req->sectorsize;
len = (end - start) * req->sectorsize; len = (end - start) * req->sectorsize;
......
arch/um/drivers/xterm.c
View file @ 6cc944b6
...@@ -83,7 +83,7 @@ __uml_setup("xterm=", xterm_setup, ...@@ -83,7 +83,7 @@ __uml_setup("xterm=", xterm_setup,
" are 'xterm=gnome-terminal,-t,-x'.\n\n" " are 'xterm=gnome-terminal,-t,-x'.\n\n"
); );
int xterm_open(int input, int output, int primary, void *d) int xterm_open(int input, int output, int primary, void *d, char **dev_out)
{ {
struct xterm_chan *data = d; struct xterm_chan *data = d;
unsigned long stack; unsigned long stack;
...@@ -93,6 +93,9 @@ int xterm_open(int input, int output, int primary, void *d) ...@@ -93,6 +93,9 @@ int xterm_open(int input, int output, int primary, void *d)
"/usr/lib/uml/port-helper", "-uml-socket", "/usr/lib/uml/port-helper", "-uml-socket",
file, NULL }; file, NULL };
if(access(argv[4], X_OK))
argv[4] = "port-helper";
fd = mkstemp(file); fd = mkstemp(file);
if(fd < 0){ if(fd < 0){
printk("xterm_open : mkstemp failed, errno = %d\n", errno); printk("xterm_open : mkstemp failed, errno = %d\n", errno);
...@@ -141,6 +144,7 @@ int xterm_open(int input, int output, int primary, void *d) ...@@ -141,6 +144,7 @@ int xterm_open(int input, int output, int primary, void *d)
if(data->raw) raw(new, 0); if(data->raw) raw(new, 0);
data->pid = pid; data->pid = pid;
*dev_out = NULL;
return(new); return(new);
} }
...@@ -168,6 +172,7 @@ int xterm_console_write(int fd, const char *buf, int n, void *d) ...@@ -168,6 +172,7 @@ int xterm_console_write(int fd, const char *buf, int n, void *d)
} }
struct chan_ops xterm_ops = { struct chan_ops xterm_ops = {
type: "xterm",
init: xterm_init, init: xterm_init,
open: xterm_open, open: xterm_open,
close: xterm_close, close: xterm_close,
......
arch/um/drivers/xterm_kern.c
View file @ 6cc944b6
...@@ -22,11 +22,13 @@ struct xterm_wait { ...@@ -22,11 +22,13 @@ struct xterm_wait {
static void xterm_interrupt(int irq, void *data, struct pt_regs *regs) static void xterm_interrupt(int irq, void *data, struct pt_regs *regs)
{ {
struct xterm_wait *xterm = data; struct xterm_wait *xterm = data;
int fd;
xterm->new_fd = os_rcv_fd(xterm->fd, &xterm->pid); fd = os_rcv_fd(xterm->fd, &xterm->pid);
if(xterm->new_fd == -EAGAIN) if(fd == -EAGAIN)
return; return;
xterm->new_fd = fd;
up(&xterm->sem); up(&xterm->sem);
} }
......
arch/um/include/chan_kern.h
View file @ 6cc944b6
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
struct chan { struct chan {
struct list_head list; struct list_head list;
char *dev;
unsigned int primary:1; unsigned int primary:1;
unsigned int input:1; unsigned int input:1;
unsigned int output:1; unsigned int output:1;
...@@ -38,6 +39,8 @@ extern int chan_window_size(struct list_head *chans, ...@@ -38,6 +39,8 @@ extern int chan_window_size(struct list_head *chans,
unsigned short *rows_out, unsigned short *rows_out,
unsigned short *cols_out); unsigned short *cols_out);
extern int chan_out_fd(struct list_head *chans); extern int chan_out_fd(struct list_head *chans);
extern int chan_config_string(struct list_head *chans, char *str, int size,
char **error_out);
#endif #endif
......
arch/um/include/chan_user.h
View file @ 6cc944b6
...@@ -19,8 +19,9 @@ struct chan_opts { ...@@ -19,8 +19,9 @@ struct chan_opts {
enum chan_init_pri { INIT_STATIC, INIT_ALL, INIT_ONE }; enum chan_init_pri { INIT_STATIC, INIT_ALL, INIT_ONE };
struct chan_ops { struct chan_ops {
char *type;
void *(*init)(char *, int, struct chan_opts *); void *(*init)(char *, int, struct chan_opts *);
int (*open)(int, int, int, void *); int (*open)(int, int, int, void *, char **);
void (*close)(int, void *); void (*close)(int, void *);
int (*read)(int, char *, void *); int (*read)(int, char *, void *);
int (*write)(int, const char *, int, void *); int (*write)(int, const char *, int, void *);
...@@ -43,7 +44,6 @@ extern void generic_free(void *data); ...@@ -43,7 +44,6 @@ extern void generic_free(void *data);
extern void register_winch(int fd, void *device_data); extern void register_winch(int fd, void *device_data);
extern void register_winch_irq(int fd, int tty_fd, int pid, void *line); extern void register_winch_irq(int fd, int tty_fd, int pid, void *line);
extern void setup_tracer_winch(void);
#define __channel_help(fn, prefix) \ #define __channel_help(fn, prefix) \
__uml_help(fn, prefix "[0-9]*=<channel description>\n" \ __uml_help(fn, prefix "[0-9]*=<channel description>\n" \
......
arch/um/include/choose-mode.h 0 → 100644
View file @ 6cc944b6
/*
* Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
* Licensed under the GPL
*/
#ifndef __CHOOSE_MODE_H__
#define __CHOOSE_MODE_H__
#include "uml-config.h"
#if defined(CONFIG_MODE_TT) && defined(CONFIG_MODE_SKAS)
#define CHOOSE_MODE(tt, skas) (mode_tt ? (tt) : (skas))
#elif defined(CONFIG_MODE_SKAS)
#define CHOOSE_MODE(tt, skas) (skas)
#elif defined(CONFIG_MODE_TT)
#define CHOOSE_MODE(tt, skas) (tt)
#endif
#define CHOOSE_MODE_PROC(tt, skas, args...) \
CHOOSE_MODE(tt(args), skas(args))
#endif
/*
* Overrides for Emacs so that we follow Linus's tabbing style.
* Emacs will notice this stuff at the end of the file and automatically
* adjust the settings for this buffer only. This must remain at the end
* of the file.
* ---------------------------------------------------------------------------
* Local variables:
* c-file-style: "linux"
* End:
*/
arch/um/include/frame.h
View file @ 6cc944b6
...@@ -8,34 +8,34 @@ ...@@ -8,34 +8,34 @@
#include "sysdep/frame.h" #include "sysdep/frame.h"
struct sc_frame { struct frame_common {
void *data; void *data;
int len; int len;
int sig_index; int sig_index;
int sc_index;
int sr_index; int sr_index;
int sr_relative; int sr_relative;
int sp_index; int sp_index;
};
struct sc_frame {
struct frame_common common;
int sc_index;
struct arch_frame_data arch; struct arch_frame_data arch;
}; };
extern struct sc_frame signal_frame_sc; extern struct sc_frame signal_frame_sc;
extern struct sc_frame signal_frame_sc_sr;
struct si_frame { struct si_frame {
void *data; struct frame_common common;
int len;
int sig_index;
int sip_index; int sip_index;
int si_index; int si_index;
int sr_index;
int sr_relative;
int sp_index;
}; };
extern struct si_frame signal_frame_si; extern struct si_frame signal_frame_si;
extern void capture_signal_stack(void); extern void capture_signal_stack(void);
extern void set_sc_ip_sp(void *sc_ptr, unsigned long ip, unsigned long sp);
#endif #endif
......
arch/um/include/kern.h
View file @ 6cc944b6
...@@ -25,7 +25,6 @@ extern void *sbrk(int increment); ...@@ -25,7 +25,6 @@ extern void *sbrk(int increment);
extern void *malloc(int size); extern void *malloc(int size);
extern void perror(char *err); extern void perror(char *err);
extern int kill(int pid, int sig); extern int kill(int pid, int sig);
extern int getpid(void);
extern int getuid(void); extern int getuid(void);
extern int pause(void); extern int pause(void);
extern int write(int, const void *, int); extern int write(int, const void *, int);
...@@ -34,6 +33,7 @@ extern int close(int); ...@@ -34,6 +33,7 @@ extern int close(int);
extern int read(unsigned int, char *, int); extern int read(unsigned int, char *, int);
extern int pipe(int *); extern int pipe(int *);
extern int sched_yield(void); extern int sched_yield(void);
extern int ptrace(int op, int pid, long addr, long data);
#endif #endif
/* /*
......
arch/um/include/kern_util.h
View file @ 6cc944b6
...@@ -15,23 +15,26 @@ extern char *gdb_init; ...@@ -15,23 +15,26 @@ extern char *gdb_init;
extern int kmalloc_ok; extern int kmalloc_ok;
extern int timer_irq_inited; extern int timer_irq_inited;
extern int jail; extern int jail;
extern int nsyscalls;
extern struct task_struct *idle_threads[NR_CPUS]; extern struct task_struct *idle_threads[NR_CPUS];
#define ROUND_DOWN(addr) ((void *)(((unsigned long) addr) & PAGE_MASK)) #define UML_ROUND_DOWN(addr) ((void *)(((unsigned long) addr) & PAGE_MASK))
#define ROUND_UP(addr) ROUND_DOWN(((unsigned long) addr) + PAGE_SIZE - 1) #define UML_ROUND_UP(addr) \
UML_ROUND_DOWN(((unsigned long) addr) + PAGE_SIZE - 1)
extern int kernel_fork(unsigned long flags, int (*fn)(void *), void * arg); extern int kernel_fork(unsigned long flags, int (*fn)(void *), void * arg);
extern unsigned long stack_sp(unsigned long page); extern unsigned long stack_sp(unsigned long page);
extern int kernel_thread_proc(void *data); extern int kernel_thread_proc(void *data);
extern void syscall_segv(int sig); extern void syscall_segv(int sig);
extern int current_pid(void); extern int current_pid(void);
extern void set_init_pid(int pid);
extern unsigned long alloc_stack(int order, int atomic); extern unsigned long alloc_stack(int order, int atomic);
extern int do_signal(int error); extern int do_signal(int error);
extern int is_stack_fault(unsigned long sp); extern int is_stack_fault(unsigned long sp);
extern unsigned long segv(unsigned long address, unsigned long ip, extern unsigned long segv(unsigned long address, unsigned long ip,
int is_write, int is_user, void *sc_ptr); int is_write, int is_user, void *sc);
extern int set_user_mode(void *task); extern int handle_page_fault(unsigned long address, unsigned long ip,
int is_write, int is_user, int *code_out);
extern void syscall_ready(void); extern void syscall_ready(void);
extern void set_tracing(void *t, int tracing); extern void set_tracing(void *t, int tracing);
extern int is_tracing(void *task); extern int is_tracing(void *task);
...@@ -40,7 +43,6 @@ extern void kern_finish_exec(void *task, int new_pid, unsigned long stack); ...@@ -40,7 +43,6 @@ extern void kern_finish_exec(void *task, int new_pid, unsigned long stack);
extern int page_size(void); extern int page_size(void);
extern int page_mask(void); extern int page_mask(void);
extern int need_finish_fork(void); extern int need_finish_fork(void);
extern int do_proc_op(void *t, int proc_id);
extern void free_stack(unsigned long stack, int order); extern void free_stack(unsigned long stack, int order);
extern void add_input_request(int op, void (*proc)(int), void *arg); extern void add_input_request(int op, void (*proc)(int), void *arg);
extern int sys_execve(char *file, char **argv, char **env); extern int sys_execve(char *file, char **argv, char **env);
...@@ -57,7 +59,6 @@ extern int next_trap_index(int max); ...@@ -57,7 +59,6 @@ extern int next_trap_index(int max);
extern void default_idle(void); extern void default_idle(void);
extern void finish_fork(void); extern void finish_fork(void);
extern void paging_init(void); extern void paging_init(void);
extern unsigned long um_virt_to_phys(void *t, unsigned long addr);
extern void init_flush_vm(void); extern void init_flush_vm(void);
extern void *syscall_sp(void *t); extern void *syscall_sp(void *t);
extern void syscall_trace(void); extern void syscall_trace(void);
...@@ -68,35 +69,28 @@ extern int external_pid(void *t); ...@@ -68,35 +69,28 @@ extern int external_pid(void *t);
extern int pid_to_processor_id(int pid); extern int pid_to_processor_id(int pid);
extern void boot_timer_handler(int sig); extern void boot_timer_handler(int sig);
extern void interrupt_end(void); extern void interrupt_end(void);
extern void tracing_reboot(void); extern void initial_thread_cb(void (*proc)(void *), void *arg);
extern void tracing_halt(void);
extern void tracing_cb(void (*proc)(void *), void *arg);
extern int debugger_signal(int status, int pid); extern int debugger_signal(int status, int pid);
extern void debugger_parent_signal(int status, int pid); extern void debugger_parent_signal(int status, int pid);
extern void child_signal(int pid, int status); extern void child_signal(int pid, int status);
extern int init_ptrace_proxy(int idle_pid, int startup, int stop); extern int init_ptrace_proxy(int idle_pid, int startup, int stop);
extern int init_parent_proxy(int pid); extern int init_parent_proxy(int pid);
extern int singlestepping(void *t);
extern void check_stack_overflow(void *ptr); extern void check_stack_overflow(void *ptr);
extern void relay_signal(int sig, struct uml_pt_regs *regs); extern void relay_signal(int sig, struct uml_pt_regs *regs);
extern int singlestepping(void *t);
extern void clear_singlestep(void *t);
extern void not_implemented(void); extern void not_implemented(void);
extern int user_context(unsigned long sp); extern int user_context(unsigned long sp);
extern void timer_irq(struct uml_pt_regs *regs); extern void timer_irq(struct uml_pt_regs *regs);
extern void unprotect_stack(unsigned long stack); extern void unprotect_stack(unsigned long stack);
extern void do_uml_exitcalls(void); extern void do_uml_exitcalls(void);
extern int attach_debugger(int idle_pid, int pid, int stop); extern int attach_debugger(int idle_pid, int pid, int stop);
extern void *round_up(unsigned long addr);
extern void *round_down(unsigned long addr);
extern void bad_segv(unsigned long address, unsigned long ip, int is_write); extern void bad_segv(unsigned long address, unsigned long ip, int is_write);
extern int config_gdb(char *str); extern int config_gdb(char *str);
extern int remove_gdb(void); extern int remove_gdb(void);
extern char *uml_strdup(char *string); extern char *uml_strdup(char *string);
extern void unprotect_kernel_mem(void); extern void unprotect_kernel_mem(void);
extern void protect_kernel_mem(void); extern void protect_kernel_mem(void);
extern unsigned long get_kmem_end(void);
extern void set_kmem_end(unsigned long); extern void set_kmem_end(unsigned long);
extern void set_task_sizes(int arg);
extern void uml_cleanup(void); extern void uml_cleanup(void);
extern int pid_to_processor_id(int pid); extern int pid_to_processor_id(int pid);
extern void set_current(void *t); extern void set_current(void *t);
...@@ -107,7 +101,6 @@ extern void *get_init_task(void); ...@@ -107,7 +101,6 @@ extern void *get_init_task(void);
extern int clear_user_proc(void *buf, int size); extern int clear_user_proc(void *buf, int size);
extern int copy_to_user_proc(void *to, void *from, int size); extern int copy_to_user_proc(void *to, void *from, int size);
extern int copy_from_user_proc(void *to, void *from, int size); extern int copy_from_user_proc(void *to, void *from, int size);
extern void set_thread_sc(void *sc);
extern void bus_handler(int sig, struct uml_pt_regs *regs); extern void bus_handler(int sig, struct uml_pt_regs *regs);
extern long execute_syscall(void *r); extern long execute_syscall(void *r);
extern int smp_sigio_handler(void); extern int smp_sigio_handler(void);
...@@ -116,7 +109,6 @@ extern struct task_struct *get_task(int pid, int require); ...@@ -116,7 +109,6 @@ extern struct task_struct *get_task(int pid, int require);
extern void machine_halt(void); extern void machine_halt(void);
extern int is_syscall(unsigned long addr); extern int is_syscall(unsigned long addr);
extern void arch_switch(void); extern void arch_switch(void);
extern int is_valid_pid(int pid);
extern void free_irq(unsigned int, void *); extern void free_irq(unsigned int, void *);
extern int um_in_interrupt(void); extern int um_in_interrupt(void);
extern int cpu(void); extern int cpu(void);
......
arch/um/include/line.h
View file @ 6cc944b6
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include "linux/tty.h" #include "linux/tty.h"
#include "asm/semaphore.h" #include "asm/semaphore.h"
#include "chan_user.h" #include "chan_user.h"
#include "mconsole_kern.h"
struct line_driver { struct line_driver {
char *name; char *name;
...@@ -25,6 +26,7 @@ struct line_driver { ...@@ -25,6 +26,7 @@ struct line_driver {
char *write_irq_name; char *write_irq_name;
char *symlink_from; char *symlink_from;
char *symlink_to; char *symlink_to;
struct mc_device mc;
}; };
struct line { struct line {
...@@ -70,8 +72,9 @@ extern void line_write_interrupt(int irq, void *data, struct pt_regs *unused); ...@@ -70,8 +72,9 @@ extern void line_write_interrupt(int irq, void *data, struct pt_regs *unused);
extern void line_close(struct line *lines, struct tty_struct *tty); extern void line_close(struct line *lines, struct tty_struct *tty);
extern int line_open(struct line *lines, struct tty_struct *tty, extern int line_open(struct line *lines, struct tty_struct *tty,
struct chan_opts *opts); struct chan_opts *opts);
extern void line_setup(struct line *lines, int num, char *init); extern int line_setup(struct line *lines, int num, char *init,
extern int line_write(struct line *line, struct tty_struct *tty, int all_allowed);
extern int line_write(struct line *line, struct tty_struct *tty, int from_user,
const char *buf, int len); const char *buf, int len);
extern int line_write_room(struct tty_struct *tty); extern int line_write_room(struct tty_struct *tty);
extern char *add_xterm_umid(char *base); extern char *add_xterm_umid(char *base);
...@@ -84,6 +87,10 @@ extern void line_register_devfs(struct lines *set, ...@@ -84,6 +87,10 @@ extern void line_register_devfs(struct lines *set,
int nlines); int nlines);
extern void lines_init(struct line *lines, int nlines); extern void lines_init(struct line *lines, int nlines);
extern void close_lines(struct line *lines, int nlines); extern void close_lines(struct line *lines, int nlines);
extern int line_config(struct line *lines, int num, char *str);
extern int line_remove(struct line *lines, int num, char *str);
extern int line_get_config(char *dev, struct line *lines, int num, char *str,
int size, char **error_out);
#endif #endif
......
arch/um/include/mconsole_kern.h
View file @ 6cc944b6
/* /*
* Copyright (C) 2001 Jeff Dike (jdike@karaya.com) * Copyright (C) 2001, 2002 Jeff Dike (jdike@karaya.com)
* Licensed under the GPL * Licensed under the GPL
*/ */
...@@ -19,9 +19,23 @@ struct mc_device { ...@@ -19,9 +19,23 @@ struct mc_device {
struct list_head list; struct list_head list;
char *name; char *name;
int (*config)(char *); int (*config)(char *);
int (*get_config)(char *, char *, int, char **);
int (*remove)(char *); int (*remove)(char *);
}; };
#define CONFIG_CHUNK(str, size, current, chunk, end) \
do { \
current += strlen(chunk); \
if(current >= size) \
str = NULL; \
if(str != NULL){ \
strcpy(str, chunk); \
str += strlen(chunk); \
} \
if(end) \
current++; \
} while(0)
#ifdef CONFIG_MCONSOLE #ifdef CONFIG_MCONSOLE
extern void mconsole_register_dev(struct mc_device *new); extern void mconsole_register_dev(struct mc_device *new);
......
arch/um/include/mem.h
View file @ 6cc944b6
...@@ -13,6 +13,7 @@ struct vm_reserved { ...@@ -13,6 +13,7 @@ struct vm_reserved {
}; };
extern void set_usable_vm(unsigned long start, unsigned long end); extern void set_usable_vm(unsigned long start, unsigned long end);
extern void set_kmem_end(unsigned long new);
#endif #endif
......
arch/um/include/mem_user.h
View file @ 6cc944b6
...@@ -54,11 +54,6 @@ extern int create_mem_file(unsigned long len); ...@@ -54,11 +54,6 @@ extern int create_mem_file(unsigned long len);
extern void setup_range(int fd, char *driver, unsigned long start, extern void setup_range(int fd, char *driver, unsigned long start,
unsigned long pfn, unsigned long total, int need_vm, unsigned long pfn, unsigned long total, int need_vm,
struct mem_region *region, void *reserved); struct mem_region *region, void *reserved);
extern void map(unsigned long virt, unsigned long p, unsigned long len,
int r, int w, int x);
extern int unmap(void *addr, int len);
extern int protect(unsigned long addr, unsigned long len, int r, int w,
int x, int must_succeed);
extern void setup_memory(void *entry); extern void setup_memory(void *entry);
extern unsigned long find_iomem(char *driver, unsigned long *len_out); extern unsigned long find_iomem(char *driver, unsigned long *len_out);
extern int init_maps(struct mem_region *region); extern int init_maps(struct mem_region *region);
...@@ -68,10 +63,15 @@ extern unsigned long get_vm(unsigned long len); ...@@ -68,10 +63,15 @@ extern unsigned long get_vm(unsigned long len);
extern void setup_physmem(unsigned long start, unsigned long usable, extern void setup_physmem(unsigned long start, unsigned long usable,
unsigned long len); unsigned long len);
extern int setup_region(struct mem_region *region, void *entry); extern int setup_region(struct mem_region *region, void *entry);
extern void add_iomem(char *name, int fd, int size); extern void add_iomem(char *name, int fd, unsigned long size);
extern struct mem_region *phys_region(unsigned long phys); extern struct mem_region *phys_region(unsigned long phys);
extern unsigned long phys_offset(unsigned long phys); extern unsigned long phys_offset(unsigned long phys);
extern void unmap_physmem(void); extern void unmap_physmem(void);
extern int map_memory(unsigned long virt, unsigned long phys,
unsigned long len, int r, int w, int x);
extern int protect_memory(unsigned long addr, unsigned long len,
int r, int w, int x, int must_succeed);
extern unsigned long get_kmem_end(void);
#endif #endif
......
arch/um/include/mode.h 0 → 100644
View file @ 6cc944b6
/*
* Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
* Licensed under the GPL
*/
#ifndef __MODE_H__
#define __MODE_H__
#include "uml-config.h"
#ifdef CONFIG_MODE_TT
#include "../kernel/tt/include/mode.h"
#endif
#ifdef CONFIG_MODE_SKAS
#include "../kernel/skas/include/mode.h"
#endif
#endif
/*
* Overrides for Emacs so that we follow Linus's tabbing style.
* Emacs will notice this stuff at the end of the file and automatically
* adjust the settings for this buffer only. This must remain at the end
* of the file.
* ---------------------------------------------------------------------------
* Local variables:
* c-file-style: "linux"
* End:
*/
arch/um/include/mode_kern.h 0 → 100644
View file @ 6cc944b6
/*
* Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
* Licensed under the GPL
*/
#ifndef __MODE_KERN_H__
#define __MODE_KERN_H__
#include "linux/config.h"
#ifdef CONFIG_MODE_TT
#include "../kernel/tt/include/mode_kern.h"
#endif
#ifdef CONFIG_MODE_SKAS
#include "../kernel/skas/include/mode_kern.h"
#endif
#endif
/*
* Overrides for Emacs so that we follow Linus's tabbing style.
* Emacs will notice this stuff at the end of the file and automatically
* adjust the settings for this buffer only. This must remain at the end
* of the file.
* ---------------------------------------------------------------------------
* Local variables:
* c-file-style: "linux"
* End:
*/
arch/um/include/net_kern.h
View file @ 6cc944b6
/*
* Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
* Licensed under the GPL
*/
#ifndef __UM_NET_KERN_H #ifndef __UM_NET_KERN_H
#define __UM_NET_KERN_H #define __UM_NET_KERN_H
......
arch/um/include/net_user.h
View file @ 6cc944b6
/*
* Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
* Licensed under the GPL
*/
#ifndef __UM_NET_USER_H__ #ifndef __UM_NET_USER_H__
#define __UM_NET_USER_H__ #define __UM_NET_USER_H__
......
arch/um/include/os.h
View file @ 6cc944b6
...@@ -103,10 +103,16 @@ extern int os_write_file(int fd, char *buf, int count); ...@@ -103,10 +103,16 @@ extern int os_write_file(int fd, char *buf, int count);
extern unsigned long os_process_pc(int pid); extern unsigned long os_process_pc(int pid);
extern int os_process_parent(int pid); extern int os_process_parent(int pid);
extern void os_stop_process(int pid); extern void os_stop_process(int pid);
extern void os_kill_process(int pid); extern void os_kill_process(int pid, int reap_child);
extern void os_usr1_process(int pid); extern void os_usr1_process(int pid);
extern int os_getpid(void); extern int os_getpid(void);
extern int os_map_memory(void *virt, int fd, unsigned long off,
unsigned long len, int r, int w, int x);
extern int os_protect_memory(void *addr, unsigned long len,
int r, int w, int x);
extern int os_unmap_memory(void *addr, int len);
#endif #endif
/* /*
......
arch/um/include/sigcontext.h
View file @ 6cc944b6
...@@ -9,8 +9,6 @@ ...@@ -9,8 +9,6 @@
#include "sysdep/sigcontext.h" #include "sysdep/sigcontext.h"
extern int sc_size(void *data); extern int sc_size(void *data);
extern int copy_sc_to_user(void *to_ptr, void *from_ptr, void *data);
extern int copy_sc_from_user(void *to_ptr, void *from_ptr, void *data);
extern void sc_to_sc(void *to_ptr, void *from_ptr); extern void sc_to_sc(void *to_ptr, void *from_ptr);
#endif #endif
......
arch/um/include/syscall_user.h
View file @ 6cc944b6
/* /*
* Copyright (C) 2000, 2001 Jeff Dike (jdike@karaya.com) * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
* Licensed under the GPL * Licensed under the GPL
*/ */
#ifndef __SYSCALL_USER_H__ #ifndef __SYSCALL_USER_H
#define __SYSCALL_USER_H__ #define __SYSCALL_USER_H
#include <asm/sigcontext.h> extern int record_syscall_start(int syscall);
extern void record_syscall_end(int index, int result);
extern void syscall_handler(int sig, struct uml_pt_regs *regs);
extern void exit_kernel(int pid, void *task);
extern int do_syscall(void *task, int pid);
#endif #endif
......
arch/um/include/sysdep-i386/checksum.h 0 → 100644
View file @ 6cc944b6
/*
* Licensed under the GPL
*/
#ifndef __UM_SYSDEP_CHECKSUM_H
#define __UM_SYSDEP_CHECKSUM_H
#include "linux/string.h"
/*
* computes the checksum of a memory block at buff, length len,
* and adds in "sum" (32-bit)
*
* returns a 32-bit number suitable for feeding into itself
* or csum_tcpudp_magic
*
* this function must be called with even lengths, except
* for the last fragment, which may be odd
*
* it's best to have buff aligned on a 32-bit boundary
*/
unsigned int csum_partial(const unsigned char * buff, int len,
unsigned int sum);
/*
* the same as csum_partial, but copies from src while it
* checksums, and handles user-space pointer exceptions correctly, when needed.
*
* here even more important to align src and dst on a 32-bit (or even
* better 64-bit) boundary
*/
unsigned int csum_partial_copy_to(const char *src, char *dst, int len,
int sum, int *err_ptr);
unsigned int csum_partial_copy_from(const char *src, char *dst, int len,
int sum, int *err_ptr);
/*
* Note: when you get a NULL pointer exception here this means someone
* passed in an incorrect kernel address to one of these functions.
*
* If you use these functions directly please don't forget the
* verify_area().
*/
static __inline__
unsigned int csum_partial_copy_nocheck(const char *src, char *dst,
int len, int sum)
{
memcpy(dst, src, len);
return(csum_partial(dst, len, sum));
}
static __inline__
unsigned int csum_partial_copy_from_user(const char *src, char *dst,
int len, int sum, int *err_ptr)
{
return csum_partial_copy_from(src, dst, len, sum, err_ptr);
}
/*
* These are the old (and unsafe) way of doing checksums, a warning message
* will be printed if they are used and an exeption occurs.
*
* these functions should go away after some time.
*/
#define csum_partial_copy_fromuser csum_partial_copy_from_user
unsigned int csum_partial_copy( const char *src, char *dst, int len, int sum);
/*
* This is a version of ip_compute_csum() optimized for IP headers,
* which always checksum on 4 octet boundaries.
*
* By Jorge Cwik <jorge@laser.satlink.net>, adapted for linux by
* Arnt Gulbrandsen.
*/
static inline unsigned short ip_fast_csum(unsigned char * iph,
unsigned int ihl)
{
unsigned int sum;
__asm__ __volatile__(
"movl (%1), %0 ;\n"
"subl $4, %2 ;\n"
"jbe 2f ;\n"
"addl 4(%1), %0 ;\n"
"adcl 8(%1), %0 ;\n"
"adcl 12(%1), %0 ;\n"
"1: adcl 16(%1), %0 ;\n"
"lea 4(%1), %1 ;\n"
"decl %2 ;\n"
"jne 1b ;\n"
"adcl $0, %0 ;\n"
"movl %0, %2 ;\n"
"shrl $16, %0 ;\n"
"addw %w2, %w0 ;\n"
"adcl $0, %0 ;\n"
"notl %0 ;\n"
"2: ;\n"
/* Since the input registers which are loaded with iph and ipl
are modified, we must also specify them as outputs, or gcc
will assume they contain their original values. */
: "=r" (sum), "=r" (iph), "=r" (ihl)
: "1" (iph), "2" (ihl));
return(sum);
}
/*
* Fold a partial checksum
*/
static inline unsigned int csum_fold(unsigned int sum)
{
__asm__(
"addl %1, %0 ;\n"
"adcl $0xffff, %0 ;\n"
: "=r" (sum)
: "r" (sum << 16), "0" (sum & 0xffff0000)
);
return (~sum) >> 16;
}
static inline unsigned long csum_tcpudp_nofold(unsigned long saddr,
unsigned long daddr,
unsigned short len,
unsigned short proto,
unsigned int sum)
{
__asm__(
"addl %1, %0 ;\n"
"adcl %2, %0 ;\n"
"adcl %3, %0 ;\n"
"adcl $0, %0 ;\n"
: "=r" (sum)
: "g" (daddr), "g"(saddr), "g"((ntohs(len)<<16)+proto*256), "0"(sum));
return sum;
}
/*
* computes the checksum of the TCP/UDP pseudo-header
* returns a 16-bit checksum, already complemented
*/
static inline unsigned short int csum_tcpudp_magic(unsigned long saddr,
unsigned long daddr,
unsigned short len,
unsigned short proto,
unsigned int sum)
{
return csum_fold(csum_tcpudp_nofold(saddr,daddr,len,proto,sum));
}
/*
* this routine is used for miscellaneous IP-like checksums, mainly
* in icmp.c
*/
static inline unsigned short ip_compute_csum(unsigned char * buff, int len)
{
return csum_fold (csum_partial(buff, len, 0));
}
#define _HAVE_ARCH_IPV6_CSUM
static __inline__ unsigned short int csum_ipv6_magic(struct in6_addr *saddr,
struct in6_addr *daddr,
__u32 len,
unsigned short proto,
unsigned int sum)
{
__asm__(
"addl 0(%1), %0 ;\n"
"adcl 4(%1), %0 ;\n"
"adcl 8(%1), %0 ;\n"
"adcl 12(%1), %0 ;\n"
"adcl 0(%2), %0 ;\n"
"adcl 4(%2), %0 ;\n"
"adcl 8(%2), %0 ;\n"
"adcl 12(%2), %0 ;\n"
"adcl %3, %0 ;\n"
"adcl %4, %0 ;\n"
"adcl $0, %0 ;\n"
: "=&r" (sum)
: "r" (saddr), "r" (daddr),
"r"(htonl(len)), "r"(htonl(proto)), "0"(sum));
return csum_fold(sum);
}
/*
* Copy and checksum to user
*/
#define HAVE_CSUM_COPY_USER
static __inline__ unsigned int csum_and_copy_to_user(const char *src,
char *dst, int len,
int sum, int *err_ptr)
{
if (access_ok(VERIFY_WRITE, dst, len))
return(csum_partial_copy_to(src, dst, len, sum, err_ptr));
if (len)
*err_ptr = -EFAULT;
return -1; /* invalid checksum */
}
#endif
/*
* Overrides for Emacs so that we follow Linus's tabbing style.
* Emacs will notice this stuff at the end of the file and automatically
* adjust the settings for this buffer only. This must remain at the end
* of the file.
* ---------------------------------------------------------------------------
* Local variables:
* c-file-style: "linux"
* End:
*/
arch/um/include/sysdep-i386/frame_kern.h
View file @ 6cc944b6
...@@ -20,7 +20,8 @@ static inline void *sp_to_rt_sc(unsigned long sp) ...@@ -20,7 +20,8 @@ static inline void *sp_to_rt_sc(unsigned long sp)
{ {
unsigned long sc; unsigned long sc;
sc = sp - signal_frame_si.sp_index + signal_frame_si.len - 4; sc = sp - signal_frame_si.common.sp_index +
signal_frame_si.common.len - 4;
return((void *) sc); return((void *) sc);
} }
...@@ -28,7 +29,8 @@ static inline void *sp_to_mask(unsigned long sp) ...@@ -28,7 +29,8 @@ static inline void *sp_to_mask(unsigned long sp)
{ {
unsigned long mask; unsigned long mask;
mask = sp - signal_frame_sc.sp_index + signal_frame_sc.len - 8; mask = sp - signal_frame_sc.common.sp_index +
signal_frame_sc.common.len - 8;
return((void *) mask); return((void *) mask);
} }
...@@ -38,7 +40,8 @@ static inline void *sp_to_rt_mask(unsigned long sp) ...@@ -38,7 +40,8 @@ static inline void *sp_to_rt_mask(unsigned long sp)
{ {
unsigned long mask; unsigned long mask;
mask = sp - signal_frame_si.sp_index + signal_frame_si.len + mask = sp - signal_frame_si.common.sp_index +
signal_frame_si.common.len +
sc_size(&signal_frame_sc.arch) - 4; sc_size(&signal_frame_sc.arch) - 4;
return((void *) mask); return((void *) mask);
} }
......
arch/um/include/sysdep-i386/ptrace.h
View file @ 6cc944b6
/* /*
* Copyright (C) 2000 Jeff Dike (jdike@karaya.com) * Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com)
* Licensed under the GPL * Licensed under the GPL
*/ */
#ifndef __SYSDEP_I386_PTRACE_H #ifndef __SYSDEP_I386_PTRACE_H
#define __SYSDEP_I386_PTRACE_H #define __SYSDEP_I386_PTRACE_H
#include "sysdep/sc.h" #include "uml-config.h"
#include "ptrace-tt.h"
#include "ptrace-skas.h"
#include "choose-mode.h"
struct uml_pt_regs { struct uml_pt_regs {
unsigned long args[6]; unsigned long args[6];
long syscall; long syscall;
int is_user; int is_user;
void *sc; union {
#ifdef CONFIG_MODE_TT
void *tt;
#endif
#ifdef CONFIG_MODE_SKAS
struct {
unsigned long regs[HOST_FRAME_SIZE];
unsigned long fp[HOST_FP_SIZE];
unsigned long xfp[HOST_XFP_SIZE];
unsigned long fault_addr;
unsigned long fault_type;
unsigned long trap_type;
} skas;
#endif
} mode;
}; };
#define EMPTY_UML_PT_REGS { \ #define EMPTY_UML_PT_REGS { \
syscall : -1, \ syscall : -1, \
args : { [0 ... 5] = 0 }, \ args : { [0 ... 5] = 0 }, \
is_user : 0, \ is_user : 0 }
sc : NULL }
extern int mode_tt;
#define UPT_IP(regs) SC_IP((regs)->sc)
#define UPT_SP(regs) SC_SP((regs)->sc) #define UPT_IP(r) \
#define UPT_EFLAGS(regs) SC_EFLAGS((regs)->sc) CHOOSE_MODE(SC_IP((r)->mode.tt), REGS_IP((r)->mode.skas.regs))
#define UPT_EAX(regs) SC_EAX((regs)->sc) #define UPT_SP(r) \
#define UPT_EBX(regs) SC_EBX((regs)->sc) CHOOSE_MODE(SC_SP((r)->mode.tt), REGS_SP((r)->mode.skas.regs))
#define UPT_ECX(regs) SC_ECX((regs)->sc) #define UPT_EFLAGS(r) \
#define UPT_EDX(regs) SC_EDX((regs)->sc) CHOOSE_MODE(SC_EFLAGS((r)->mode.tt), REGS_EFLAGS((r)->mode.skas.regs))
#define UPT_ESI(regs) SC_ESI((regs)->sc) #define UPT_EAX(r) \
#define UPT_EDI(regs) SC_EDI((regs)->sc) CHOOSE_MODE(SC_EAX((r)->mode.tt), REGS_EAX((r)->mode.skas.regs))
#define UPT_EBP(regs) SC_EBP((regs)->sc) #define UPT_EBX(r) \
#define UPT_ORIG_EAX(regs) ((regs)->syscall) CHOOSE_MODE(SC_EBX((r)->mode.tt), REGS_EBX((r)->mode.skas.regs))
#define UPT_CS(regs) SC_CS((regs)->sc) #define UPT_ECX(r) \
#define UPT_SS(regs) SC_SS((regs)->sc) CHOOSE_MODE(SC_ECX((r)->mode.tt), REGS_ECX((r)->mode.skas.regs))
#define UPT_DS(regs) SC_DS((regs)->sc) #define UPT_EDX(r) \
#define UPT_ES(regs) SC_ES((regs)->sc) CHOOSE_MODE(SC_EDX((r)->mode.tt), REGS_EDX((r)->mode.skas.regs))
#define UPT_FS(regs) SC_FS((regs)->sc) #define UPT_ESI(r) \
#define UPT_GS(regs) SC_GS((regs)->sc) CHOOSE_MODE(SC_ESI((r)->mode.tt), REGS_ESI((r)->mode.skas.regs))
#define UPT_SC(regs) ((regs)->sc) #define UPT_EDI(r) \
CHOOSE_MODE(SC_EDI((r)->mode.tt), REGS_EDI((r)->mode.skas.regs))
#define UPT_EBP(r) \
CHOOSE_MODE(SC_EBP((r)->mode.tt), REGS_EBP((r)->mode.skas.regs))
#define UPT_ORIG_EAX(r) ((r)->syscall)
#define UPT_CS(r) \
CHOOSE_MODE(SC_CS((r)->mode.tt), REGS_CS((r)->mode.skas.regs))
#define UPT_SS(r) \
CHOOSE_MODE(SC_SS((r)->mode.tt), REGS_SS((r)->mode.skas.regs))
#define UPT_DS(r) \
CHOOSE_MODE(SC_DS((r)->mode.tt), REGS_DS((r)->mode.skas.regs))
#define UPT_ES(r) \
CHOOSE_MODE(SC_ES((r)->mode.tt), REGS_ES((r)->mode.skas.regs))
#define UPT_FS(r) \
CHOOSE_MODE(SC_FS((r)->mode.tt), REGS_FS((r)->mode.skas.regs))
#define UPT_GS(r) \
CHOOSE_MODE(SC_GS((r)->mode.tt), REGS_GS((r)->mode.skas.regs))
#define UPT_SC(r) ((r)->mode.tt)
#define UPT_REG(regs, reg) \ #define UPT_REG(regs, reg) \
({ unsigned long val; \ ({ unsigned long val; \
...@@ -94,12 +128,29 @@ struct uml_pt_regs { ...@@ -94,12 +128,29 @@ struct uml_pt_regs {
} \ } \
} while (0) } while (0)
#define UPT_SET_SYSCALL_RETURN(regs, res) \ #define UPT_SET_SYSCALL_RETURN(r, res) \
SC_SET_SYSCALL_RETURN((regs)->sc, (res)) CHOOSE_MODE(SC_SET_SYSCALL_RETURN((r)->mode.tt, (res)), \
#define UPT_RESTART_SYSCALL(regs) SC_RESTART_SYSCALL((regs)->sc) REGS_SET_SYSCALL_RETURN((r)->mode.skas.regs, (res)))
#define UPT_ORIG_SYSCALL(regs) UPT_EAX(regs)
#define UPT_SYSCALL_NR(regs) ((regs)->syscall) #define UPT_RESTART_SYSCALL(r) \
#define UPT_SYSCALL_RET(regs) UPT_EAX(regs) CHOOSE_MODE(SC_RESTART_SYSCALL((r)->mode.tt), \
REGS_RESTART_SYSCALL((r)->mode.skas.regs))
#define UPT_ORIG_SYSCALL(r) UPT_EAX(r)
#define UPT_SYSCALL_NR(r) ((r)->syscall)
#define UPT_SYSCALL_RET(r) UPT_EAX(r)
#define UPT_SEGV_IS_FIXABLE(r) \
CHOOSE_MODE(SC_SEGV_IS_FIXABLE(r->mode.tt), \
REGS_SEGV_IS_FIXABLE(&r->mode.skas))
#define UPT_FAULT_ADDR(r) \
CHOOSE_MODE(SC_FAULT_ADDR(r->mode.tt), \
REGS_FAULT_ADDR(&r->mode.skas))
#define UPT_FAULT_WRITE(r) \
CHOOSE_MODE(SC_FAULT_WRITE(r->mode.tt), \
REGS_FAULT_WRITE(&r->mode.skas))
#endif #endif
......
arch/um/include/sysdep-i386/sigcontext.h
View file @ 6cc944b6
...@@ -6,13 +6,22 @@ ...@@ -6,13 +6,22 @@
#ifndef __SYS_SIGCONTEXT_I386_H #ifndef __SYS_SIGCONTEXT_I386_H
#define __SYS_SIGCONTEXT_I386_H #define __SYS_SIGCONTEXT_I386_H
#include "sc.h"
#define IP_RESTART_SYSCALL(ip) ((ip) -= 2) #define IP_RESTART_SYSCALL(ip) ((ip) -= 2)
#define SC_RESTART_SYSCALL(sc) IP_RESTART_SYSCALL(SC_IP(sc)) #define SC_RESTART_SYSCALL(sc) IP_RESTART_SYSCALL(SC_IP(sc))
#define SC_SET_SYSCALL_RETURN(sc, result) do SC_EAX(sc) = (result) ; while(0) #define SC_SET_SYSCALL_RETURN(sc, result) SC_EAX(sc) = (result)
#define SC_FAULT_ADDR(sc) SC_CR2(sc) #define SC_FAULT_ADDR(sc) SC_CR2(sc)
#define SC_FAULT_WRITE(sc) (SC_ERR(sc) & 2) #define SC_FAULT_TYPE(sc) SC_ERR(sc)
#define FAULT_WRITE(err) (err & 2)
#define TO_SC_ERR(is_write) ((is_write) ? 2 : 0)
#define SC_FAULT_WRITE(sc) (FAULT_WRITE(SC_ERR(sc)))
#define SC_TRAP_TYPE(sc) SC_TRAPNO(sc)
/* ptrace expects that, at the start of a system call, %eax contains /* ptrace expects that, at the start of a system call, %eax contains
* -ENOSYS, so this makes it so. * -ENOSYS, so this makes it so.
...@@ -20,10 +29,12 @@ ...@@ -20,10 +29,12 @@
#define SC_START_SYSCALL(sc) do SC_EAX(sc) = -ENOSYS; while(0) #define SC_START_SYSCALL(sc) do SC_EAX(sc) = -ENOSYS; while(0)
/* These are General Protection and Page Fault */ /* These are General Protection and Page Fault */
#define SEGV_IS_FIXABLE(sc) ((SC_TRAPNO(sc) == 13) || (SC_TRAPNO(sc) == 14)) #define SEGV_IS_FIXABLE(trap) ((trap == 13) || (trap == 14))
/* XXX struct sigcontext needs declaring by now */ #define SC_SEGV_IS_FIXABLE(sc) (SEGV_IS_FIXABLE(SC_TRAPNO(sc)))
#ifdef CONFIG_MODE_TT
/* XXX struct sigcontext needs declaring by now */
static inline void sc_to_regs(struct uml_pt_regs *regs, struct sigcontext *sc, static inline void sc_to_regs(struct uml_pt_regs *regs, struct sigcontext *sc,
unsigned long syscall) unsigned long syscall)
{ {
...@@ -35,6 +46,20 @@ static inline void sc_to_regs(struct uml_pt_regs *regs, struct sigcontext *sc, ...@@ -35,6 +46,20 @@ static inline void sc_to_regs(struct uml_pt_regs *regs, struct sigcontext *sc,
regs->args[4] = SC_EDI(sc); regs->args[4] = SC_EDI(sc);
regs->args[5] = SC_EBP(sc); regs->args[5] = SC_EBP(sc);
} }
#endif
#ifdef CONFIG_MODE_SKAS
static inline void host_to_regs(struct uml_pt_regs *regs)
{
regs->syscall = UPT_ORIG_EAX(regs);
regs->args[0] = UPT_EBX(regs);
regs->args[1] = UPT_ECX(regs);
regs->args[2] = UPT_EDX(regs);
regs->args[3] = UPT_ESI(regs);
regs->args[4] = UPT_EDI(regs);
regs->args[5] = UPT_EBP(regs);
}
#endif
extern unsigned long *sc_sigmask(void *sc_ptr); extern unsigned long *sc_sigmask(void *sc_ptr);
extern int sc_get_fpregs(unsigned long buf, void *sc_ptr); extern int sc_get_fpregs(unsigned long buf, void *sc_ptr);
......
arch/um/include/time_user.h
View file @ 6cc944b6
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
extern void timer(void); extern void timer(void);
extern void switch_timers(int to_real); extern void switch_timers(int to_real);
extern void user_time_init(void); extern void set_interval(int timer_type);
extern void idle_sleep(int secs); extern void idle_sleep(int secs);
extern void enable_timer(void); extern void enable_timer(void);
extern void time_lock(void); extern void time_lock(void);
......
arch/um/include/um_mmu.h 0 → 100644
View file @ 6cc944b6
/*
* Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
* Licensed under the GPL
*/
#ifndef __ARCH_UM_MMU_H
#define __ARCH_UM_MMU_H
#include "linux/config.h"
#include "choose-mode.h"
#ifdef CONFIG_MODE_TT
#include "../kernel/tt/include/mmu.h"
#endif
#ifdef CONFIG_MODE_SKAS
#include "../kernel/skas/include/mmu.h"
#endif
typedef union {
#ifdef CONFIG_MODE_TT
struct mmu_context_tt tt;
#endif
#ifdef CONFIG_MODE_SKAS
struct mmu_context_skas skas;
#endif
} mm_context_t;
#endif
/*
* Overrides for Emacs so that we follow Linus's tabbing style.
* Emacs will notice this stuff at the end of the file and automatically
* adjust the settings for this buffer only. This must remain at the end
* of the file.
* ---------------------------------------------------------------------------
* Local variables:
* c-file-style: "linux"
* End:
*/
arch/um/include/um_uaccess.h 0 → 100644
View file @ 6cc944b6
/*
* Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
* Licensed under the GPL
*/
#ifndef __ARCH_UM_UACCESS_H
#define __ARCH_UM_UACCESS_H
#include "linux/config.h"
#include "choose-mode.h"
#ifdef CONFIG_MODE_TT
#include "../kernel/tt/include/uaccess.h"
#endif
#ifdef CONFIG_MODE_SKAS
#include "../kernel/skas/include/uaccess.h"
#endif
#define access_ok(type, addr, size) \
CHOOSE_MODE_PROC(access_ok_tt, access_ok_skas, type, addr, size)
static inline int verify_area(int type, const void * addr, unsigned long size)
{
return(CHOOSE_MODE_PROC(verify_area_tt, verify_area_skas, type, addr,
size));
}
static inline int copy_from_user(void *to, const void *from, int n)
{
return(CHOOSE_MODE_PROC(copy_from_user_tt, copy_from_user_skas, to,
from, n));
}
static inline int copy_to_user(void *to, const void *from, int n)
{
return(CHOOSE_MODE_PROC(copy_to_user_tt, copy_to_user_skas, to,
from, n));
}
static inline int strncpy_from_user(char *dst, const char *src, int count)
{
return(CHOOSE_MODE_PROC(strncpy_from_user_tt, strncpy_from_user_skas,
dst, src, count));
}
static inline int __clear_user(void *mem, int len)
{
return(CHOOSE_MODE_PROC(__clear_user_tt, __clear_user_skas, mem, len));
}
static inline int clear_user(void *mem, int len)
{
return(CHOOSE_MODE_PROC(clear_user_tt, clear_user_skas, mem, len));
}
static inline int strnlen_user(const void *str, int len)
{
return(CHOOSE_MODE_PROC(strnlen_user_tt, strnlen_user_skas, str, len));
}
#endif
/*
* Overrides for Emacs so that we follow Linus's tabbing style.
* Emacs will notice this stuff at the end of the file and automatically
* adjust the settings for this buffer only. This must remain at the end
* of the file.
* ---------------------------------------------------------------------------
* Local variables:
* c-file-style: "linux"
* End:
*/
arch/um/include/user_util.h
View file @ 6cc944b6
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
#include "sysdep/ptrace.h" #include "sysdep/ptrace.h"
extern int mode_tt;
extern int grantpt(int __fd); extern int grantpt(int __fd);
extern int unlockpt(int __fd); extern int unlockpt(int __fd);
extern char *ptsname(int __fd); extern char *ptsname(int __fd);
...@@ -21,6 +23,13 @@ struct cpu_task { ...@@ -21,6 +23,13 @@ struct cpu_task {
extern struct cpu_task cpu_tasks[]; extern struct cpu_task cpu_tasks[];
struct signal_info {
void (*handler)(int, struct uml_pt_regs *);
int is_irq;
};
extern struct signal_info sig_info[];
extern unsigned long low_physmem; extern unsigned long low_physmem;
extern unsigned long high_physmem; extern unsigned long high_physmem;
extern unsigned long uml_physmem; extern unsigned long uml_physmem;
...@@ -29,16 +38,11 @@ extern unsigned long end_vm; ...@@ -29,16 +38,11 @@ extern unsigned long end_vm;
extern unsigned long start_vm; extern unsigned long start_vm;
extern unsigned long highmem; extern unsigned long highmem;
extern int tracing_pid;
extern int honeypot;
extern char host_info[]; extern char host_info[];
extern char saved_command_line[]; extern char saved_command_line[];
extern char command_line[]; extern char command_line[];
extern int gdb_pid;
extern char *tempdir; extern char *tempdir;
extern unsigned long _stext, _etext, _sdata, _edata, __bss_start, _end; extern unsigned long _stext, _etext, _sdata, _edata, __bss_start, _end;
...@@ -51,12 +55,10 @@ extern int pty_close_sigio; ...@@ -51,12 +55,10 @@ extern int pty_close_sigio;
extern void stop(void); extern void stop(void);
extern void stack_protections(unsigned long address); extern void stack_protections(unsigned long address);
extern void task_protections(unsigned long address); extern void task_protections(unsigned long address);
extern int signals(int (*init_proc)(void *), void *sp);
extern int wait_for_stop(int pid, int sig, int cont_type, void *relay); extern int wait_for_stop(int pid, int sig, int cont_type, void *relay);
extern void *add_signal_handler(int sig, void (*handler)(int)); extern void *add_signal_handler(int sig, void (*handler)(int));
extern int start_fork_tramp(void *arg, unsigned long temp_stack, extern int start_fork_tramp(void *arg, unsigned long temp_stack,
int clone_flags, int (*tramp)(void *)); int clone_flags, int (*tramp)(void *));
extern void trace_myself(void);
extern int clone_and_wait(int (*fn)(void *), void *arg, void *sp, int flags); extern int clone_and_wait(int (*fn)(void *), void *arg, void *sp, int flags);
extern int linux_main(int argc, char **argv); extern int linux_main(int argc, char **argv);
extern void remap_data(void *segment_start, void *segment_end, int w); extern void remap_data(void *segment_start, void *segment_end, int w);
...@@ -69,13 +71,12 @@ extern int switcheroo(int fd, int prot, void *from, void *to, int size); ...@@ -69,13 +71,12 @@ extern int switcheroo(int fd, int prot, void *from, void *to, int size);
extern void setup_machinename(char *machine_out); extern void setup_machinename(char *machine_out);
extern void setup_hostinfo(void); extern void setup_hostinfo(void);
extern void add_arg(char *cmd_line, char *arg); extern void add_arg(char *cmd_line, char *arg);
extern void init_new_thread(void *sig_stack, void (*usr1_handler)(int)); extern void init_new_thread_stack(void *sig_stack, void (*usr1_handler)(int));
extern void attach_process(int pid); extern void init_new_thread_signals(int altstack);
extern int fork_tramp(void *sig_stack);
extern void do_exec(int old_pid, int new_pid); extern void do_exec(int old_pid, int new_pid);
extern void tracer_panic(char *msg, ...); extern void tracer_panic(char *msg, ...);
extern char *get_umid(int only_if_set); extern char *get_umid(int only_if_set);
extern void do_longjmp(void *p); extern void do_longjmp(void *p, int val);
extern void suspend_new_thread(int fd); extern void suspend_new_thread(int fd);
extern int detach(int pid, int sig); extern int detach(int pid, int sig);
extern int attach(int pid); extern int attach(int pid);
...@@ -89,7 +90,8 @@ extern void arch_check_bugs(void); ...@@ -89,7 +90,8 @@ extern void arch_check_bugs(void);
extern int arch_handle_signal(int sig, struct uml_pt_regs *regs); extern int arch_handle_signal(int sig, struct uml_pt_regs *regs);
extern int arch_fixup(unsigned long address, void *sc_ptr); extern int arch_fixup(unsigned long address, void *sc_ptr);
extern void forward_pending_sigio(int target); extern void forward_pending_sigio(int target);
extern int can_do_skas(void);
#endif #endif
/* /*
......
arch/um/kernel/Makefile
View file @ 6cc944b6
#
# Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
# Licensed under the GPL
#
EXTRA_TARGETS := unmap_fin.o EXTRA_TARGETS := unmap_fin.o
obj-y = config.o exec_kern.o exec_user.o exitcode.o frame_kern.o frame.o \ obj-y = checksum.o config.o exec_kern.o exitcode.o frame_kern.o frame.o \
helper.o init_task.o irq.o irq_user.o ksyms.o mem.o mem_user.o \ helper.o init_task.o irq.o irq_user.o ksyms.o mem.o mem_user.o \
process.o process_kern.o ptrace.o reboot.o resource.o sigio_user.o \ process.o process_kern.o ptrace.o reboot.o resource.o sigio_user.o \
sigio_kern.o signal_kern.o signal_user.o smp.o syscall_kern.o \ sigio_kern.o signal_kern.o signal_user.o smp.o syscall_kern.o \
syscall_user.o sysrq.o sys_call_table.o tempfile.o time.o \ syscall_user.o sysrq.o sys_call_table.o tempfile.o time.o \
time_kern.o tlb.o trap_kern.o trap_user.o uaccess_user.o um_arch.o \ time_kern.o tlb.o trap_kern.o trap_user.o um_arch.o \
umid.o user_util.o umid.o user_util.o
obj-$(CONFIG_BLK_DEV_INITRD) += initrd_kern.o initrd_user.o obj-$(CONFIG_BLK_DEV_INITRD) += initrd_kern.o initrd_user.o
obj-$(CONFIG_GPROF) += gprof_syms.o
obj-$(CONFIG_GCOV) += gmon_syms.o
obj-$(CONFIG_TTY_LOG) += tty_log.o
# user_syms.o not included here because kbuild has its own ideas about obj-$(CONFIG_MODE_TT) += tt/
# building anything in export-objs obj-$(CONFIG_MODE_SKAS) += skas/
USER_OBJS := $(filter %_user.o,$(obj-y)) config.o helper.o process.o \ user-objs-$(CONFIG_TTY_LOG) += tty_log.o
tempfile.o time.o tty_log.o umid.o user_util.o user_syms.o
USER_OBJS := $(foreach file,$(USER_OBJS),arch/um/kernel/$(file))
export-objs := ksyms.o process_kern.o signal_kern.o gprof_syms.o gmon_syms.o # user_syms.o not included here because Rules.make has its own ideas about
# building anything in export-objs
USER_OBJS := $(filter %_user.o,$(obj-y)) $(user-objs-y) config.o helper.o \
process.o tempfile.o time.o tty_log.o umid.o user_util.o user_syms.o
USER_OBJS := $(foreach file,$(USER_OBJS),$(obj)/$(file))
UNMAP_CFLAGS := $(patsubst -pg -DPROFILING,,$(USER_CFLAGS)) UNMAP_CFLAGS := $(patsubst -pg -DPROFILING,,$(USER_CFLAGS))
UNMAP_CFLAGS := $(patsubst -fprofile-arcs -ftest-coverage,,$(UNMAP_CFLAGS)) UNMAP_CFLAGS := $(patsubst -fprofile-arcs -ftest-coverage,,$(UNMAP_CFLAGS))
ifeq ($(CONFIG_MODULES), y) DMODULES-$(CONFIG_MODULES) = -D__CONFIG_MODULES__
DMODULES = -D__CONFIG_MODULES__ DMODVERSIONS-$(CONFIG_MODVERSIONS) = -D__CONFIG_MODVERSIONS__
endif
ifeq ($(CONFIG_MODVERSIONS), y) export-objs-$(CONFIG_GPROF) += gprof_syms.o
DMODVERSIONS = -D__CONFIG_MODVERSIONS__ export-objs-$(CONFIG_GCOV) += gmon_syms.o
endif
obj-$(CONFIG_GPROF) += gprof_syms.o export-objs := ksyms.o process_kern.o signal_kern.o $(export-objs-y)
obj-$(CONFIG_GCOV) += gmon_syms.o
obj-$(CONFIG_TTY_LOG) += tty_log.o
CFLAGS_user_syms.o = -D__AUTOCONF_INCLUDED__ $(DMODULES) $(DMODVERSIONS) \ CFLAGS_user_syms.o = -D__AUTOCONF_INCLUDED__ $(DMODULES-y) $(DMODVERSIONS-y) \
-I/usr/include -I../include -I/usr/include -I../include
CFLAGS_frame.o := $(patsubst -fomit-frame-pointer,,$(USER_CFLAGS)) CFLAGS_frame.o := $(patsubst -fomit-frame-pointer,,$(USER_CFLAGS))
...@@ -42,27 +49,28 @@ CFLAGS_frame.o := $(patsubst -fomit-frame-pointer,,$(USER_CFLAGS)) ...@@ -42,27 +49,28 @@ CFLAGS_frame.o := $(patsubst -fomit-frame-pointer,,$(USER_CFLAGS))
$(USER_OBJS) : %.o: %.c $(USER_OBJS) : %.o: %.c
$(CC) $(CFLAGS_$@) $(USER_CFLAGS) -c -o $@ $< $(CC) $(CFLAGS_$@) $(USER_CFLAGS) -c -o $@ $<
arch/um/kernel/unmap.o: arch/um/kernel/unmap.c $(obj)/unmap.o: $(src)/unmap.c
$(CC) $(UNMAP_CFLAGS) -c -o $@ $< $(CC) $(UNMAP_CFLAGS) -c -o $@ $<
arch/um/kernel/unmap_fin.o : arch/um/kernel/unmap.o $(obj)/unmap_fin.o : $(src)/unmap.o
ld -r -o $@ $< -lc -L/usr/lib ld -r -o $@ $< -lc -L/usr/lib
# This has to be separate because it needs be compiled with frame pointers # This has to be separate because it needs be compiled with frame pointers
# regardless of how the rest of the kernel is built. # regardless of how the rest of the kernel is built.
arch/um/kernel/frame.o: arch/um/kernel/frame.c $(obj)/frame.o: $(src)/frame.c
$(CC) $(CFLAGS_$(notdir $@)) -c -o $@ $< $(CC) $(CFLAGS_$(notdir $@)) -c -o $@ $<
QUOTE = 'my $$config=`cat $(TOPDIR)/.config`; $$config =~ s/"/\\"/g ; while(<STDIN>) { $$_ =~ s/CONFIG/$$config/; print $$_ }' QUOTE = 'my $$config=`cat $(TOPDIR)/.config`; $$config =~ s/"/\\"/g ; while(<STDIN>) { $$_ =~ s/CONFIG/$$config/; print $$_ }'
arch/um/kernel/config.c : arch/um/kernel/config.c.in $(TOPDIR)/.config $(obj)/config.c : $(src)/config.c.in $(TOPDIR)/.config
$(PERL) -e $(QUOTE) < arch/um/kernel/config.c.in > $@ $(PERL) -e $(QUOTE) < $(src)/config.c.in > $@
arch/um/kernel/config.o : arch/um/kernel/config.c $(obj)/config.o : $(obj)/config.c
clean: clean:
rm -f config.c rm -f config.c
for dir in $(subdir-y) ; do $(MAKE) -C $$dir clean; done
modules: modules:
......
arch/um/kernel/checksum.c 0 → 100644
View file @ 6cc944b6
#include "asm/uaccess.h"
#include "linux/errno.h"
extern unsigned int arch_csum_partial(const char *buff, int len, int sum);
extern unsigned int csum_partial(char *buff, int len, int sum)
{
return(arch_csum_partial(buff, len, sum));
}
unsigned int csum_partial_copy_to(const char *src, char *dst, int len,
int sum, int *err_ptr)
{
if(copy_to_user(dst, src, len)){
*err_ptr = -EFAULT;
return(-1);
}
return(arch_csum_partial(src, len, sum));
}
unsigned int csum_partial_copy_from(const char *src, char *dst, int len,
int sum, int *err_ptr)
{
if(copy_from_user(dst, src, len)){
*err_ptr = -EFAULT;
return(-1);
}
return(arch_csum_partial(dst, len, sum));
}
/*
* Overrides for Emacs so that we follow Linus's tabbing style.
* Emacs will notice this stuff at the end of the file and automatically
* adjust the settings for this buffer only. This must remain at the end
* of the file.
* ---------------------------------------------------------------------------
* Local variables:
* c-file-style: "linux"
* End:
*/
arch/um/kernel/exec_kern.c
View file @ 6cc944b6
...@@ -18,65 +18,17 @@ ...@@ -18,65 +18,17 @@
#include "2_5compat.h" #include "2_5compat.h"
#include "os.h" #include "os.h"
#include "time_user.h" #include "time_user.h"
#include "choose-mode.h"
/* See comment above fork_tramp for why sigstop is defined and used like #include "mode_kern.h"
* this
*/
static int sigstop = SIGSTOP;
static int exec_tramp(void *sig_stack)
{
int sig = sigstop;
init_new_thread(sig_stack, NULL);
kill(os_getpid(), sig);
return(0);
}
void flush_thread(void) void flush_thread(void)
{ {
unsigned long stack; CHOOSE_MODE(flush_thread_tt(), flush_thread_skas());
int new_pid;
stack = alloc_stack(0, 0);
if(stack == 0){
printk(KERN_ERR
"flush_thread : failed to allocate temporary stack\n");
do_exit(SIGKILL);
}
new_pid = start_fork_tramp((void *) current->thread.kernel_stack,
stack, 0, exec_tramp);
if(new_pid < 0){
printk(KERN_ERR
"flush_thread : new thread failed, errno = %d\n",
-new_pid);
do_exit(SIGKILL);
}
if(current->thread_info->cpu == 0)
forward_interrupts(new_pid);
current->thread.request.op = OP_EXEC;
current->thread.request.u.exec.pid = new_pid;
unprotect_stack((unsigned long) current->thread_info);
os_usr1_process(os_getpid());
enable_timer();
free_page(stack);
protect(uml_reserved, high_physmem - uml_reserved, 1, 1, 0, 1);
task_protections((unsigned long) current->thread_info);
force_flush_all();
unblock_signals();
} }
void start_thread(struct pt_regs *regs, unsigned long eip, unsigned long esp) void start_thread(struct pt_regs *regs, unsigned long eip, unsigned long esp)
{ {
set_fs(USER_DS); CHOOSE_MODE_PROC(start_thread_tt, start_thread_skas, regs, eip, esp);
flush_tlb_mm(current->mm);
PT_REGS_IP(regs) = eip;
PT_REGS_SP(regs) = esp;
PT_FIX_EXEC_STACK(esp);
} }
static int execve1(char *file, char **argv, char **env) static int execve1(char *file, char **argv, char **env)
...@@ -93,8 +45,12 @@ static int execve1(char *file, char **argv, char **env) ...@@ -93,8 +45,12 @@ static int execve1(char *file, char **argv, char **env)
int um_execve(char *file, char **argv, char **env) int um_execve(char *file, char **argv, char **env)
{ {
if(execve1(file, argv, env) == 0) do_longjmp(current->thread.jmp); int err;
return(-1);
err = execve1(file, argv, env);
if(!err)
do_longjmp(current->thread.exec_buf, 1);
return(err);
} }
int sys_execve(char *file, char **argv, char **env) int sys_execve(char *file, char **argv, char **env)
......
arch/um/kernel/exitcode.c
View file @ 6cc944b6
...@@ -42,7 +42,7 @@ static int write_proc_exitcode(struct file *file, const char *buffer, ...@@ -42,7 +42,7 @@ static int write_proc_exitcode(struct file *file, const char *buffer,
return(count); return(count);
} }
int make_proc_exitcode(void) static int make_proc_exitcode(void)
{ {
struct proc_dir_entry *ent; struct proc_dir_entry *ent;
......
arch/um/kernel/frame.c
View file @ 6cc944b6
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include <sched.h> #include <sched.h>
#include <errno.h> #include <errno.h>
#include <sys/ptrace.h> #include <sys/ptrace.h>
#include <sys/syscall.h>
#include <sys/mman.h> #include <sys/mman.h>
#include <asm/page.h> #include <asm/page.h>
#include <asm/ptrace.h> #include <asm/ptrace.h>
...@@ -84,8 +85,8 @@ static int capture_stack(int (*child)(void *arg), void *arg, void *sp, ...@@ -84,8 +85,8 @@ static int capture_stack(int (*child)(void *arg), void *arg, void *sp,
printf("capture_stack : waitpid failed - errno = %d\n", errno); printf("capture_stack : waitpid failed - errno = %d\n", errno);
exit(1); exit(1);
} }
if(!WIFEXITED(status) || (WEXITSTATUS(status) != 0)){ if(!WIFSIGNALED(status) || (WTERMSIG(status) != 9)){
printf("capture_stack : Expected exit status 0, " printf("capture_stack : Expected exit signal 9, "
"got status = 0x%x\n", status); "got status = 0x%x\n", status);
exit(1); exit(1);
} }
...@@ -103,28 +104,61 @@ static int capture_stack(int (*child)(void *arg), void *arg, void *sp, ...@@ -103,28 +104,61 @@ static int capture_stack(int (*child)(void *arg), void *arg, void *sp,
return(len); return(len);
} }
static void child_common(void *sp, int size, sighandler_t handler, int flags) struct common_raw {
void *stack;
int size;
unsigned long sig;
unsigned long sr;
unsigned long sp;
};
#define SA_RESTORER (0x04000000)
typedef unsigned long old_sigset_t;
struct old_sigaction {
__sighandler_t handler;
old_sigset_t sa_mask;
unsigned long sa_flags;
void (*sa_restorer)(void);
};
static void child_common(struct common_raw *common, sighandler_t handler,
int restorer, int flags)
{ {
stack_t ss; stack_t ss = ((stack_t) { .ss_sp = common->stack,
struct sigaction sa; .ss_flags = 0,
.ss_size = common->size });
int err;
if(ptrace(PTRACE_TRACEME, 0, 0, 0) < 0){ if(ptrace(PTRACE_TRACEME, 0, 0, 0) < 0){
printf("PTRACE_TRACEME failed, errno = %d\n", errno); printf("PTRACE_TRACEME failed, errno = %d\n", errno);
} }
ss.ss_sp = sp;
ss.ss_flags = 0;
ss.ss_size = size;
if(sigaltstack(&ss, NULL) < 0){ if(sigaltstack(&ss, NULL) < 0){
printf("sigaltstack failed - errno = %d\n", errno); printf("sigaltstack failed - errno = %d\n", errno);
_exit(1); kill(getpid(), SIGKILL);
} }
sa.sa_handler = handler; if(restorer){
sigemptyset(&sa.sa_mask); struct sigaction sa;
sa.sa_flags = SA_ONSTACK | flags;
if(sigaction(SIGUSR1, &sa, NULL) < 0){ sa.sa_handler = handler;
sigemptyset(&sa.sa_mask);
sa.sa_flags = SA_ONSTACK | flags;
err = sigaction(SIGUSR1, &sa, NULL);
}
else {
struct old_sigaction sa;
sa.handler = handler;
sa.sa_mask = 0;
sa.sa_flags = (SA_ONSTACK | flags) & ~SA_RESTORER;
err = syscall(__NR_sigaction, SIGUSR1, &sa, NULL);
}
if(err < 0){
printf("sigaction failed - errno = %d\n", errno); printf("sigaction failed - errno = %d\n", errno);
_exit(1); kill(getpid(), SIGKILL);
} }
os_stop_process(os_getpid()); os_stop_process(os_getpid());
...@@ -133,13 +167,12 @@ static void child_common(void *sp, int size, sighandler_t handler, int flags) ...@@ -133,13 +167,12 @@ static void child_common(void *sp, int size, sighandler_t handler, int flags)
/* Changed only during early boot */ /* Changed only during early boot */
struct sc_frame signal_frame_sc; struct sc_frame signal_frame_sc;
struct sc_frame signal_frame_sc_sr;
struct sc_frame_raw { struct sc_frame_raw {
void *stack; struct common_raw common;
int size;
unsigned long sig;
unsigned long sc; unsigned long sc;
unsigned long sr; int restorer;
unsigned long sp;
struct arch_frame_data_raw arch; struct arch_frame_data_raw arch;
}; };
...@@ -148,20 +181,20 @@ static struct sc_frame_raw *raw_sc = NULL; ...@@ -148,20 +181,20 @@ static struct sc_frame_raw *raw_sc = NULL;
static void sc_handler(int sig, struct sigcontext sc) static void sc_handler(int sig, struct sigcontext sc)
{ {
raw_sc->sig = (unsigned long) &sig; raw_sc->common.sig = (unsigned long) &sig;
raw_sc->common.sr = frame_restorer();
raw_sc->common.sp = frame_sp();
raw_sc->sc = (unsigned long) &sc; raw_sc->sc = (unsigned long) &sc;
raw_sc->sr = frame_restorer();
raw_sc->sp = frame_sp();
setup_arch_frame_raw(&raw_sc->arch, &sc); setup_arch_frame_raw(&raw_sc->arch, &sc);
os_stop_process(os_getpid()); os_stop_process(os_getpid());
_exit(0); kill(getpid(), SIGKILL);
} }
static int sc_child(void *arg) static int sc_child(void *arg)
{ {
raw_sc = arg; raw_sc = arg;
child_common(raw_sc->stack, raw_sc->size, (sighandler_t) sc_handler, child_common(&raw_sc->common, (sighandler_t) sc_handler,
0); raw_sc->restorer, 0);
return(-1); return(-1);
} }
...@@ -169,13 +202,9 @@ static int sc_child(void *arg) ...@@ -169,13 +202,9 @@ static int sc_child(void *arg)
struct si_frame signal_frame_si; struct si_frame signal_frame_si;
struct si_frame_raw { struct si_frame_raw {
void *stack; struct common_raw common;
int size;
unsigned long sig;
unsigned long sip; unsigned long sip;
unsigned long si; unsigned long si;
unsigned long sr;
unsigned long sp;
}; };
/* Changed only during early boot */ /* Changed only during early boot */
...@@ -183,23 +212,59 @@ static struct si_frame_raw *raw_si = NULL; ...@@ -183,23 +212,59 @@ static struct si_frame_raw *raw_si = NULL;
static void si_handler(int sig, siginfo_t *si) static void si_handler(int sig, siginfo_t *si)
{ {
raw_si->sig = (unsigned long) &sig; raw_si->common.sig = (unsigned long) &sig;
raw_si->common.sr = frame_restorer();
raw_si->common.sp = frame_sp();
raw_si->sip = (unsigned long) &si; raw_si->sip = (unsigned long) &si;
raw_si->si = (unsigned long) si; raw_si->si = (unsigned long) si;
raw_si->sr = frame_restorer();
raw_si->sp = frame_sp();
os_stop_process(os_getpid()); os_stop_process(os_getpid());
_exit(0); kill(getpid(), SIGKILL);
} }
static int si_child(void *arg) static int si_child(void *arg)
{ {
raw_si = arg; raw_si = arg;
child_common(raw_si->stack, raw_si->size, (sighandler_t) si_handler, child_common(&raw_si->common, (sighandler_t) si_handler, 1,
SA_SIGINFO); SA_SIGINFO);
return(-1); return(-1);
} }
static int relative_sr(unsigned long sr, int sr_index, void *stack,
void *framep)
{
unsigned long *srp = (unsigned long *) sr;
unsigned long frame = (unsigned long) framep;
if((*srp & PAGE_MASK) == (unsigned long) stack){
*srp -= sr;
*((unsigned long *) (frame + sr_index)) = *srp;
return(1);
}
else return(0);
}
static unsigned long capture_stack_common(int (*proc)(void *), void *arg,
struct common_raw *common_in,
void *top, void *sigstack,
int stack_len,
struct frame_common *common_out)
{
unsigned long sig_top = (unsigned long) sigstack + stack_len, base;
common_in->stack = (void *) sigstack;
common_in->size = stack_len;
common_out->len = capture_stack(proc, arg, top, sig_top,
&common_out->data);
base = sig_top - common_out->len;
common_out->sig_index = common_in->sig - base;
common_out->sp_index = common_in->sp - base;
common_out->sr_index = common_in->sr - base;
common_out->sr_relative = relative_sr(common_in->sr,
common_out->sr_index, sigstack,
common_out->data);
return(base);
}
void capture_signal_stack(void) void capture_signal_stack(void)
{ {
struct sc_frame_raw raw_sc; struct sc_frame_raw raw_sc;
...@@ -220,54 +285,29 @@ void capture_signal_stack(void) ...@@ -220,54 +285,29 @@ void capture_signal_stack(void)
top = (unsigned long) stack + PAGE_SIZE - sizeof(void *); top = (unsigned long) stack + PAGE_SIZE - sizeof(void *);
sig_top = (unsigned long) sigstack + PAGE_SIZE; sig_top = (unsigned long) sigstack + PAGE_SIZE;
raw_sc.stack = sigstack; /* Get the sigcontext, no sigrestorer layout */
raw_sc.size = PAGE_SIZE; raw_sc.restorer = 0;
signal_frame_sc.len = capture_stack(sc_child, &raw_sc, (void *) top, base = capture_stack_common(sc_child, &raw_sc, &raw_sc.common,
sig_top, &signal_frame_sc.data); (void *) top, sigstack, PAGE_SIZE,
&signal_frame_sc.common);
/* These are the offsets within signal_frame_sc.data (counting from
* the bottom) of sig, sc, SA_RESTORER, and the initial sp.
*/
base = sig_top - signal_frame_sc.len;
signal_frame_sc.sig_index = raw_sc.sig - base;
signal_frame_sc.sc_index = raw_sc.sc - base; signal_frame_sc.sc_index = raw_sc.sc - base;
signal_frame_sc.sr_index = raw_sc.sr - base;
if((*((unsigned long *) raw_sc.sr) & PAGE_MASK) ==
(unsigned long) sigstack){
unsigned long *sr = (unsigned long *) raw_sc.sr;
unsigned long frame = (unsigned long) signal_frame_sc.data;
signal_frame_sc.sr_relative = 1;
*sr -= raw_sc.sr;
*((unsigned long *) (frame + signal_frame_sc.sr_index)) = *sr;
}
else signal_frame_sc.sr_relative = 0;
signal_frame_sc.sp_index = raw_sc.sp - base;
setup_arch_frame(&raw_sc.arch, &signal_frame_sc.arch); setup_arch_frame(&raw_sc.arch, &signal_frame_sc.arch);
/* Repeat for the siginfo variant */ /* Ditto for the sigcontext, sigrestorer layout */
raw_sc.restorer = 1;
base = capture_stack_common(sc_child, &raw_sc, &raw_sc.common,
(void *) top, sigstack, PAGE_SIZE,
&signal_frame_sc_sr.common);
signal_frame_sc_sr.sc_index = raw_sc.sc - base;
/* And the siginfo layout */
raw_si.stack = sigstack; base = capture_stack_common(si_child, &raw_si, &raw_si.common,
raw_si.size = PAGE_SIZE; (void *) top, sigstack, PAGE_SIZE,
signal_frame_si.len = capture_stack(si_child, &raw_si, (void *) top, &signal_frame_si.common);
sig_top, &signal_frame_si.data);
base = sig_top - signal_frame_si.len;
signal_frame_si.sig_index = raw_si.sig - base;
signal_frame_si.sip_index = raw_si.sip - base; signal_frame_si.sip_index = raw_si.sip - base;
signal_frame_si.si_index = raw_si.si - base; signal_frame_si.si_index = raw_si.si - base;
signal_frame_si.sr_index = raw_si.sr - base;
if((*((unsigned long *) raw_si.sr) & PAGE_MASK) ==
(unsigned long) sigstack){
unsigned long *sr = (unsigned long *) raw_si.sr;
unsigned long frame = (unsigned long) signal_frame_si.data;
signal_frame_sc.sr_relative = 1;
*sr -= raw_si.sr;
*((unsigned long *) (frame + signal_frame_si.sr_index)) = *sr;
}
else signal_frame_si.sr_relative = 0;
signal_frame_si.sp_index = raw_si.sp - base;
if((munmap(stack, PAGE_SIZE) < 0) || if((munmap(stack, PAGE_SIZE) < 0) ||
(munmap(sigstack, PAGE_SIZE) < 0)){ (munmap(sigstack, PAGE_SIZE) < 0)){
...@@ -277,14 +317,6 @@ void capture_signal_stack(void) ...@@ -277,14 +317,6 @@ void capture_signal_stack(void)
} }
} }
void set_sc_ip_sp(void *sc_ptr, unsigned long ip, unsigned long sp)
{
struct sigcontext *sc = sc_ptr;
SC_IP(sc) = ip;
SC_SP(sc) = sp;
}
/* /*
* Overrides for Emacs so that we follow Linus's tabbing style. * Overrides for Emacs so that we follow Linus's tabbing style.
* Emacs will notice this stuff at the end of the file and automatically * Emacs will notice this stuff at the end of the file and automatically
......
arch/um/kernel/frame_kern.c
View file @ 6cc944b6
...@@ -9,20 +9,31 @@ ...@@ -9,20 +9,31 @@
#include "frame_kern.h" #include "frame_kern.h"
#include "sigcontext.h" #include "sigcontext.h"
#include "sysdep/ptrace.h" #include "sysdep/ptrace.h"
#include "choose-mode.h"
#include "mode.h"
static int copy_restorer(void (*restorer)(void), unsigned long start, static int copy_restorer(void (*restorer)(void), unsigned long start,
unsigned long sr_index, int sr_relative) unsigned long sr_index, int sr_relative)
{ {
if(restorer != 0){ unsigned long sr;
if(copy_to_user((void *) (start + sr_index), &restorer,
sizeof(restorer))) if(sr_relative){
return(1); sr = (unsigned long) restorer;
} sr += start + sr_index;
else if(sr_relative){ restorer = (void (*)(void)) sr;
unsigned long *sr = (unsigned long *) (start + sr_index);
*sr += (unsigned long) sr;
} }
return(0);
return(copy_to_user((void *) (start + sr_index), &restorer,
sizeof(restorer)));
}
static int copy_sc_to_user(void *to, struct pt_regs *from)
{
return(CHOOSE_MODE(copy_sc_to_user_tt(to, from->regs.mode.tt,
&signal_frame_sc_sr.arch),
copy_sc_to_user_skas(to, &from->regs,
current->thread.cr2,
current->thread.err)));
} }
int setup_signal_stack_si(unsigned long stack_top, int sig, int setup_signal_stack_si(unsigned long stack_top, int sig,
...@@ -34,27 +45,30 @@ int setup_signal_stack_si(unsigned long stack_top, int sig, ...@@ -34,27 +45,30 @@ int setup_signal_stack_si(unsigned long stack_top, int sig,
void *sip; void *sip;
int sig_size = _NSIG_WORDS * sizeof(unsigned long); int sig_size = _NSIG_WORDS * sizeof(unsigned long);
start = stack_top - signal_frame_si.len - start = stack_top - signal_frame_si.common.len -
sc_size(&signal_frame_sc.arch) - sig_size; sc_size(&signal_frame_sc.arch) - sig_size;
sip = (void *) (start + signal_frame_si.si_index); sip = (void *) (start + signal_frame_si.si_index);
sc = start + signal_frame_si.len; sc = start + signal_frame_si.common.len;
sigs = sc + sc_size(&signal_frame_sc.arch); sigs = sc + sc_size(&signal_frame_sc.arch);
if(copy_sc_to_user((void *) sc, regs->regs.sc,
&signal_frame_sc.arch) || if(restorer == NULL)
copy_to_user((void *) start, signal_frame_si.data, panic("setup_signal_stack_si - no restorer");
signal_frame_si.len) ||
copy_to_user((void *) (start + signal_frame_si.sig_index), &sig, if(copy_sc_to_user((void *) sc, regs) ||
sizeof(sig)) || copy_to_user((void *) start, signal_frame_si.common.data,
signal_frame_si.common.len) ||
copy_to_user((void *) (start + signal_frame_si.common.sig_index),
&sig, sizeof(sig)) ||
copy_siginfo_to_user(sip, info) || copy_siginfo_to_user(sip, info) ||
copy_to_user((void *) (start + signal_frame_si.sip_index), &sip, copy_to_user((void *) (start + signal_frame_si.sip_index), &sip,
sizeof(sip)) || sizeof(sip)) ||
copy_to_user((void *) sigs, mask, sig_size) || copy_to_user((void *) sigs, mask, sig_size) ||
copy_restorer(restorer, start, signal_frame_si.sr_index, copy_restorer(restorer, start, signal_frame_si.common.sr_index,
signal_frame_si.sr_relative)) signal_frame_si.common.sr_relative))
return(1); return(1);
PT_REGS_IP(regs) = handler; PT_REGS_IP(regs) = handler;
PT_REGS_SP(regs) = start + signal_frame_sc.sp_index; PT_REGS_SP(regs) = start + signal_frame_sc.common.sp_index;
return(0); return(0);
} }
...@@ -62,26 +76,35 @@ int setup_signal_stack_sc(unsigned long stack_top, int sig, ...@@ -62,26 +76,35 @@ int setup_signal_stack_sc(unsigned long stack_top, int sig,
unsigned long handler, void (*restorer)(void), unsigned long handler, void (*restorer)(void),
struct pt_regs *regs, sigset_t *mask) struct pt_regs *regs, sigset_t *mask)
{ {
struct frame_common *frame = &signal_frame_sc_sr.common;
void *user_sc;
int sig_size = (_NSIG_WORDS - 1) * sizeof(unsigned long); int sig_size = (_NSIG_WORDS - 1) * sizeof(unsigned long);
unsigned long sigs, start = stack_top - signal_frame_sc.len - sig_size; unsigned long sigs, sr;
void *user_sc = (void *) (start + signal_frame_sc.sc_index); unsigned long start = stack_top - frame->len - sig_size;
user_sc = (void *) (start + signal_frame_sc_sr.sc_index);
if(restorer == NULL){
frame = &signal_frame_sc.common;
user_sc = (void *) (start + signal_frame_sc.sc_index);
sr = (unsigned long) frame->data;
sr += frame->sr_index;
sr = *((unsigned long *) sr);
restorer = ((void (*)(void)) sr);
}
sigs = start + signal_frame_sc.len; sigs = start + frame->len;
if(copy_to_user((void *) start, signal_frame_sc.data, if(copy_to_user((void *) start, frame->data, frame->len) ||
signal_frame_sc.len) || copy_to_user((void *) (start + frame->sig_index), &sig,
copy_to_user((void *) (start + signal_frame_sc.sig_index), &sig,
sizeof(sig)) || sizeof(sig)) ||
copy_sc_to_user(user_sc, regs->regs.sc, &signal_frame_sc.arch) || copy_sc_to_user(user_sc, regs) ||
copy_to_user(sc_sigmask(user_sc), mask, sizeof(mask->sig[0])) || copy_to_user(sc_sigmask(user_sc), mask, sizeof(mask->sig[0])) ||
copy_to_user((void *) sigs, &mask->sig[1], sig_size) || copy_to_user((void *) sigs, &mask->sig[1], sig_size) ||
copy_restorer(restorer, start, signal_frame_sc.sr_index, copy_restorer(restorer, start, frame->sr_index, frame->sr_relative))
signal_frame_sc.sr_relative))
return(1); return(1);
PT_REGS_IP(regs) = handler; PT_REGS_IP(regs) = handler;
PT_REGS_SP(regs) = start + signal_frame_sc.sp_index; PT_REGS_SP(regs) = start + frame->sp_index;
set_sc_ip_sp(regs->regs.sc, handler, start + signal_frame_sc.sp_index);
return(0); return(0);
} }
......
arch/um/kernel/helper.c
View file @ 6cc944b6
...@@ -43,9 +43,12 @@ static int helper_child(void *arg) ...@@ -43,9 +43,12 @@ static int helper_child(void *arg)
execvp(argv[0], argv); execvp(argv[0], argv);
printk("execvp of '%s' failed - errno = %d\n", argv[0], errno); printk("execvp of '%s' failed - errno = %d\n", argv[0], errno);
write(data->fd, &errno, sizeof(errno)); write(data->fd, &errno, sizeof(errno));
_exit(1); os_kill_process(os_getpid(), 0);
return(0);
} }
/* XXX The alloc_stack here breaks if this is called in the tracing thread */
int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv, int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv,
unsigned long *stack_out) unsigned long *stack_out)
{ {
...@@ -86,7 +89,10 @@ int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv, ...@@ -86,7 +89,10 @@ int run_helper(void (*pre_exec)(void *), void *pre_data, char **argv,
errno); errno);
return(-errno); return(-errno);
} }
else if(n != 0) pid = -err; else if(n != 0){
waitpid(pid, NULL, 0);
pid = -err;
}
if(stack_out == NULL) free_stack(stack, 0); if(stack_out == NULL) free_stack(stack, 0);
else *stack_out = stack; else *stack_out = stack;
......
arch/um/kernel/init_task.c
View file @ 6cc944b6
...@@ -47,7 +47,7 @@ struct task_struct *alloc_task_struct(void){ ...@@ -47,7 +47,7 @@ struct task_struct *alloc_task_struct(void){
void unprotect_stack(unsigned long stack) void unprotect_stack(unsigned long stack)
{ {
protect(stack, 4 * PAGE_SIZE, 1, 1, 0, 1); protect_memory(stack, 4 * PAGE_SIZE, 1, 1, 0, 1);
} }
void free_task_struct(struct task_struct *task) void free_task_struct(struct task_struct *task)
......
arch/um/kernel/irq_user.c
View file @ 6cc944b6
...@@ -188,7 +188,8 @@ int activate_fd(int irq, int fd, int type, void *dev_id) ...@@ -188,7 +188,8 @@ int activate_fd(int irq, int fd, int type, void *dev_id)
pollfds_size++; pollfds_size++;
} }
if(type == IRQ_WRITE) events = 0; if(type == IRQ_WRITE)
fd = -1;
pollfds[pollfds_num] = ((struct pollfd) { fd : fd, pollfds[pollfds_num] = ((struct pollfd) { fd : fd,
events : events, events : events,
...@@ -337,6 +338,7 @@ void reactivate_fd(int fd, int irqnum) ...@@ -337,6 +338,7 @@ void reactivate_fd(int fd, int irqnum)
irq_unlock(flags); irq_unlock(flags);
return; return;
} }
pollfds[i].fd = irq->fd; pollfds[i].fd = irq->fd;
irq_unlock(flags); irq_unlock(flags);
......
arch/um/kernel/ksyms.c
View file @ 6cc944b6
/*
* Copyright (C) 2001, 2002 Jeff Dike (jdike@karaya.com)
* Licensed under the GPL
*/
#include "linux/config.h" #include "linux/config.h"
#include "linux/module.h" #include "linux/module.h"
#include "linux/string.h" #include "linux/string.h"
...@@ -19,17 +24,13 @@ ...@@ -19,17 +24,13 @@
EXPORT_SYMBOL(stop); EXPORT_SYMBOL(stop);
EXPORT_SYMBOL(uml_physmem); EXPORT_SYMBOL(uml_physmem);
EXPORT_SYMBOL(set_signals); EXPORT_SYMBOL(set_signals);
EXPORT_SYMBOL(get_signals);
EXPORT_SYMBOL(kernel_thread); EXPORT_SYMBOL(kernel_thread);
EXPORT_SYMBOL(__const_udelay); EXPORT_SYMBOL(__const_udelay);
EXPORT_SYMBOL(__udelay);
EXPORT_SYMBOL(sys_waitpid); EXPORT_SYMBOL(sys_waitpid);
EXPORT_SYMBOL(task_size); EXPORT_SYMBOL(task_size);
EXPORT_SYMBOL(__do_copy_from_user);
EXPORT_SYMBOL(__do_copy_to_user);
EXPORT_SYMBOL(__do_strncpy_from_user);
EXPORT_SYMBOL(__do_strnlen_user);
EXPORT_SYMBOL(flush_tlb_range); EXPORT_SYMBOL(flush_tlb_range);
EXPORT_SYMBOL(__do_clear_user);
EXPORT_SYMBOL(honeypot);
EXPORT_SYMBOL(host_task_size); EXPORT_SYMBOL(host_task_size);
EXPORT_SYMBOL(arch_validate); EXPORT_SYMBOL(arch_validate);
...@@ -37,10 +38,10 @@ EXPORT_SYMBOL(region_pa); ...@@ -37,10 +38,10 @@ EXPORT_SYMBOL(region_pa);
EXPORT_SYMBOL(region_va); EXPORT_SYMBOL(region_va);
EXPORT_SYMBOL(phys_mem_map); EXPORT_SYMBOL(phys_mem_map);
EXPORT_SYMBOL(page_mem_map); EXPORT_SYMBOL(page_mem_map);
EXPORT_SYMBOL(get_signals);
EXPORT_SYMBOL(page_to_phys); EXPORT_SYMBOL(page_to_phys);
EXPORT_SYMBOL(phys_to_page); EXPORT_SYMBOL(phys_to_page);
EXPORT_SYMBOL(high_physmem); EXPORT_SYMBOL(high_physmem);
EXPORT_SYMBOL(empty_zero_page);
EXPORT_SYMBOL(os_open_file); EXPORT_SYMBOL(os_open_file);
EXPORT_SYMBOL(os_read_file); EXPORT_SYMBOL(os_read_file);
...@@ -53,7 +54,6 @@ EXPORT_SYMBOL(helper_wait); ...@@ -53,7 +54,6 @@ EXPORT_SYMBOL(helper_wait);
EXPORT_SYMBOL(os_shutdown_socket); EXPORT_SYMBOL(os_shutdown_socket);
EXPORT_SYMBOL(os_connect_socket); EXPORT_SYMBOL(os_connect_socket);
EXPORT_SYMBOL(run_helper); EXPORT_SYMBOL(run_helper);
EXPORT_SYMBOL(tracing_pid);
EXPORT_SYMBOL(start_thread); EXPORT_SYMBOL(start_thread);
EXPORT_SYMBOL(dump_thread); EXPORT_SYMBOL(dump_thread);
...@@ -75,6 +75,7 @@ EXPORT_SYMBOL_NOVERS(__write_lock_failed); ...@@ -75,6 +75,7 @@ EXPORT_SYMBOL_NOVERS(__write_lock_failed);
extern void FASTCALL( __read_lock_failed(rwlock_t *rw)); extern void FASTCALL( __read_lock_failed(rwlock_t *rw));
EXPORT_SYMBOL_NOVERS(__read_lock_failed); EXPORT_SYMBOL_NOVERS(__read_lock_failed);
EXPORT_SYMBOL(smp_num_cpus);
#endif #endif
#ifdef CONFIG_HIGHMEM #ifdef CONFIG_HIGHMEM
......
arch/um/kernel/mem.c
View file @ 6cc944b6
...@@ -25,6 +25,8 @@ ...@@ -25,6 +25,8 @@
#include "mem.h" #include "mem.h"
#include "kern.h" #include "kern.h"
#include "init.h" #include "init.h"
#include "os.h"
#include "mode_kern.h"
/* Changed during early boot */ /* Changed during early boot */
pgd_t swapper_pg_dir[1024]; pgd_t swapper_pg_dir[1024];
...@@ -56,12 +58,12 @@ static unsigned long brk_end; ...@@ -56,12 +58,12 @@ static unsigned long brk_end;
static void map_cb(void *unused) static void map_cb(void *unused)
{ {
map(brk_end, __pa(brk_end), uml_reserved - brk_end, 1, 1, 0); map_memory(brk_end, __pa(brk_end), uml_reserved - brk_end, 1, 1, 0);
} }
void unmap_physmem(void) void unmap_physmem(void)
{ {
unmap((void *) brk_end, uml_reserved - brk_end); os_unmap_memory((void *) brk_end, uml_reserved - brk_end);
} }
extern char __binary_start; extern char __binary_start;
...@@ -81,17 +83,17 @@ void mem_init(void) ...@@ -81,17 +83,17 @@ void mem_init(void)
/* Map in the area just after the brk now that kmalloc is about /* Map in the area just after the brk now that kmalloc is about
* to be turned on. * to be turned on.
*/ */
brk_end = (unsigned long) ROUND_UP(sbrk(0)); brk_end = (unsigned long) UML_ROUND_UP(sbrk(0));
map_cb(NULL); map_cb(NULL);
tracing_cb(map_cb, NULL); initial_thread_cb(map_cb, NULL);
free_bootmem(__pa(brk_end), uml_reserved - brk_end); free_bootmem(__pa(brk_end), uml_reserved - brk_end);
uml_reserved = brk_end; uml_reserved = brk_end;
/* Fill in any hole at the start of the binary */ /* Fill in any hole at the start of the binary */
start = (unsigned long) &__binary_start; start = (unsigned long) &__binary_start;
if(uml_physmem != start){ if(uml_physmem != start){
map(uml_physmem, __pa(uml_physmem), start - uml_physmem, map_memory(uml_physmem, __pa(uml_physmem), start - uml_physmem,
1, 1, 0); 1, 1, 0);
} }
/* this will put all low memory onto the freelists */ /* this will put all low memory onto the freelists */
...@@ -106,6 +108,21 @@ void mem_init(void) ...@@ -106,6 +108,21 @@ void mem_init(void)
kmalloc_ok = 1; kmalloc_ok = 1;
} }
/* Changed during early boot */
static unsigned long kmem_top = 0;
unsigned long get_kmem_end(void)
{
if(kmem_top == 0)
kmem_top = CHOOSE_MODE(kmem_end_tt, kmem_end_skas);
return(kmem_top);
}
void set_kmem_end(unsigned long new)
{
kmem_top = new;
}
#if CONFIG_HIGHMEM #if CONFIG_HIGHMEM
/* Changed during early boot */ /* Changed during early boot */
pte_t *kmap_pte; pte_t *kmap_pte;
...@@ -379,20 +396,6 @@ void show_mem(void) ...@@ -379,20 +396,6 @@ void show_mem(void)
printk("%d pages swap cached\n", cached); printk("%d pages swap cached\n", cached);
} }
/* Changed during early boot */
static unsigned long kmem_top = 0;
unsigned long get_kmem_end(void)
{
if(kmem_top == 0) kmem_top = host_task_size - ABOVE_KMEM;
return(kmem_top);
}
void set_kmem_end(unsigned long new)
{
kmem_top = new;
}
static int __init uml_mem_setup(char *line, int *add) static int __init uml_mem_setup(char *line, int *add)
{ {
char *retptr; char *retptr;
...@@ -411,28 +414,8 @@ __uml_setup("mem=", uml_mem_setup, ...@@ -411,28 +414,8 @@ __uml_setup("mem=", uml_mem_setup,
struct page *arch_validate(struct page *page, int mask, int order) struct page *arch_validate(struct page *page, int mask, int order)
{ {
unsigned long addr, zero = 0; return(CHOOSE_MODE_PROC(arch_validate_tt, arch_validate_skas, page,
int i; mask, order));
again:
if(page == NULL) return(page);
if(PageHighMem(page)) return(page);
addr = (unsigned long) page_address(page);
for(i = 0; i < (1 << order); i++){
current->thread.fault_addr = (void *) addr;
if(__do_copy_to_user((void *) addr, &zero,
sizeof(zero),
&current->thread.fault_addr,
&current->thread.fault_catcher)){
if(!(mask & __GFP_WAIT)) return(NULL);
else break;
}
addr += PAGE_SIZE;
}
if(i == (1 << order)) return(page);
page = alloc_pages(mask, order);
goto again;
} }
DECLARE_MUTEX(vm_reserved_sem); DECLARE_MUTEX(vm_reserved_sem);
...@@ -513,7 +496,7 @@ unsigned long get_vm(unsigned long len) ...@@ -513,7 +496,7 @@ unsigned long get_vm(unsigned long len)
return(0); return(0);
found: found:
up(&vm_reserved_sem); up(&vm_reserved_sem);
start = (unsigned long) ROUND_UP(this->end) + PAGE_SIZE; start = (unsigned long) UML_ROUND_UP(this->end) + PAGE_SIZE;
err = reserve_vm(start, start + len, NULL); err = reserve_vm(start, start + len, NULL);
if(err) return(0); if(err) return(0);
return(start); return(start);
...@@ -562,7 +545,7 @@ struct iomem iomem_regions[NREGIONS] = { [ 0 ... NREGIONS - 1 ] = ...@@ -562,7 +545,7 @@ struct iomem iomem_regions[NREGIONS] = { [ 0 ... NREGIONS - 1 ] =
int num_iomem_regions = 0; int num_iomem_regions = 0;
void add_iomem(char *name, int fd, int size) void add_iomem(char *name, int fd, unsigned long size)
{ {
if(num_iomem_regions == sizeof(iomem_regions)/sizeof(iomem_regions[0])) if(num_iomem_regions == sizeof(iomem_regions)/sizeof(iomem_regions[0]))
return; return;
......
arch/um/kernel/mem_user.c
View file @ 6cc944b6
...@@ -181,44 +181,22 @@ void log(char *fmt, ...) ...@@ -181,44 +181,22 @@ void log(char *fmt, ...)
} }
#endif #endif
void map(unsigned long virt, unsigned long phys, unsigned long len, int map_memory(unsigned long virt, unsigned long phys, unsigned long len,
int r, int w, int x) int r, int w, int x)
{ {
struct mem_region *region; struct mem_region *region = phys_region(phys);
void *loc;
int prot;
prot = (r ? PROT_READ : 0) | (w ? PROT_WRITE : 0) |
(x ? PROT_EXEC : 0);
region = phys_region(phys);
loc = mmap((void *) virt, len, prot, MAP_SHARED | MAP_FIXED,
region->fd, phys_offset(phys));
if(loc != (void *) virt){
panic("Error mapping a page - errno = %d", errno);
}
}
int unmap(void *addr, int len)
{
int err;
err = munmap(addr, len); return(os_map_memory((void *) virt, region->fd, phys_offset(phys), len,
if(err < 0) return(-errno); r, w, x));
else return(err);
} }
int protect(unsigned long addr, unsigned long len, int r, int w, int x, int protect_memory(unsigned long addr, unsigned long len, int r, int w, int x,
int must_succeed) int must_succeed)
{ {
int prot; if(os_protect_memory((void *) addr, len, r, w, x) < 0){
if(must_succeed)
prot = (r ? PROT_READ : 0) | (w ? PROT_WRITE : 0) | panic("protect failed, errno = %d", errno);
(x ? PROT_EXEC : 0); else return(-errno);
if(mprotect((void *) addr, len, prot) == -1){
if(must_succeed)
panic("protect failed, errno = %d", errno);
else return(-errno);
} }
return(0); return(0);
} }
......
arch/um/kernel/process.c
View file @ 6cc944b6
...@@ -21,9 +21,6 @@ ...@@ -21,9 +21,6 @@
#include <asm/sigcontext.h> #include <asm/sigcontext.h>
#include <asm/unistd.h> #include <asm/unistd.h>
#include <asm/page.h> #include <asm/page.h>
#ifdef PROFILING
#include <sys/gmon.h>
#endif
#include "user_util.h" #include "user_util.h"
#include "kern_util.h" #include "kern_util.h"
#include "user.h" #include "user.h"
...@@ -33,13 +30,19 @@ ...@@ -33,13 +30,19 @@
#include "sysdep/ptrace.h" #include "sysdep/ptrace.h"
#include "sysdep/sigcontext.h" #include "sysdep/sigcontext.h"
#include "irq_user.h" #include "irq_user.h"
#include "syscall_user.h"
#include "ptrace_user.h" #include "ptrace_user.h"
#include "time_user.h" #include "time_user.h"
#include "init.h" #include "init.h"
#include "os.h" #include "os.h"
#include "uml-config.h"
#include "choose-mode.h"
#include "mode.h"
#ifdef CONFIG_MODE_SKAS
#include "skas_ptrace.h"
#include "skas.h"
#endif
void init_new_thread(void *sig_stack, void (*usr1_handler)(int)) void init_new_thread_stack(void *sig_stack, void (*usr1_handler)(int))
{ {
int flags = 0; int flags = 0;
...@@ -47,6 +50,13 @@ void init_new_thread(void *sig_stack, void (*usr1_handler)(int)) ...@@ -47,6 +50,13 @@ void init_new_thread(void *sig_stack, void (*usr1_handler)(int))
set_sigstack(sig_stack, 2 * page_size()); set_sigstack(sig_stack, 2 * page_size());
flags = SA_ONSTACK; flags = SA_ONSTACK;
} }
if(usr1_handler) set_handler(SIGUSR1, usr1_handler, flags, -1);
}
void init_new_thread_signals(int altstack)
{
int flags = altstack ? SA_ONSTACK : 0;
set_handler(SIGSEGV, (__sighandler_t) sig_handler, flags, set_handler(SIGSEGV, (__sighandler_t) sig_handler, flags,
SIGUSR1, SIGIO, SIGWINCH, SIGALRM, SIGVTALRM, -1); SIGUSR1, SIGIO, SIGWINCH, SIGALRM, SIGVTALRM, -1);
set_handler(SIGTRAP, (__sighandler_t) sig_handler, flags, set_handler(SIGTRAP, (__sighandler_t) sig_handler, flags,
...@@ -61,11 +71,10 @@ void init_new_thread(void *sig_stack, void (*usr1_handler)(int)) ...@@ -61,11 +71,10 @@ void init_new_thread(void *sig_stack, void (*usr1_handler)(int))
SIGUSR1, SIGIO, SIGWINCH, SIGALRM, SIGVTALRM, -1); SIGUSR1, SIGIO, SIGWINCH, SIGALRM, SIGVTALRM, -1);
set_handler(SIGUSR2, (__sighandler_t) sig_handler, set_handler(SIGUSR2, (__sighandler_t) sig_handler,
SA_NOMASK | flags, -1); SA_NOMASK | flags, -1);
if(usr1_handler) set_handler(SIGUSR1, usr1_handler, flags, -1); (void) CHOOSE_MODE(signal(SIGCHLD, SIG_IGN), (void *) 0);
signal(SIGCHLD, SIG_IGN);
signal(SIGHUP, SIG_IGN); signal(SIGHUP, SIG_IGN);
init_irq_signals(sig_stack != NULL); init_irq_signals(altstack);
} }
struct tramp { struct tramp {
...@@ -122,32 +131,6 @@ int start_fork_tramp(void *thread_arg, unsigned long temp_stack, ...@@ -122,32 +131,6 @@ int start_fork_tramp(void *thread_arg, unsigned long temp_stack,
return(arg.pid); return(arg.pid);
} }
void trace_myself(void)
{
if(ptrace(PTRACE_TRACEME, 0, 0, 0) < 0)
panic("ptrace failed in trace_myself");
}
void attach_process(int pid)
{
if((ptrace(PTRACE_ATTACH, pid, 0, 0) < 0) ||
(ptrace(PTRACE_CONT, pid, 0, 0) < 0))
tracer_panic("OP_FORK failed to attach pid");
wait_for_stop(pid, SIGSTOP, PTRACE_CONT, NULL);
if(ptrace(PTRACE_CONT, pid, 0, 0) < 0)
tracer_panic("OP_FORK failed to continue process");
}
void tracer_panic(char *format, ...)
{
va_list ap;
va_start(ap, format);
vprintf(format, ap);
printf("\n");
while(1) sleep(10);
}
void suspend_new_thread(int fd) void suspend_new_thread(int fd)
{ {
char c; char c;
...@@ -164,19 +147,18 @@ static int ptrace_child(void *arg) ...@@ -164,19 +147,18 @@ static int ptrace_child(void *arg)
if(ptrace(PTRACE_TRACEME, 0, 0, 0) < 0){ if(ptrace(PTRACE_TRACEME, 0, 0, 0) < 0){
perror("ptrace"); perror("ptrace");
_exit(1); os_kill_process(pid, 0);
} }
os_stop_process(pid); os_stop_process(pid);
_exit(os_getpid() == pid); _exit(os_getpid() == pid);
} }
void __init check_ptrace(void) static int start_ptraced_child(void **stack_out)
{ {
void *stack; void *stack;
unsigned long sp; unsigned long sp;
int status, pid, n, syscall; int pid, n, status;
printk("Checking that ptrace can change system call numbers...");
stack = mmap(NULL, PAGE_SIZE, PROT_READ | PROT_WRITE | PROT_EXEC, stack = mmap(NULL, PAGE_SIZE, PROT_READ | PROT_WRITE | PROT_EXEC,
MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
if(stack == MAP_FAILED) if(stack == MAP_FAILED)
...@@ -191,6 +173,33 @@ void __init check_ptrace(void) ...@@ -191,6 +173,33 @@ void __init check_ptrace(void)
if(!WIFSTOPPED(status) || (WSTOPSIG(status) != SIGSTOP)) if(!WIFSTOPPED(status) || (WSTOPSIG(status) != SIGSTOP))
panic("check_ptrace : expected SIGSTOP, got status = %d", panic("check_ptrace : expected SIGSTOP, got status = %d",
status); status);
*stack_out = stack;
return(pid);
}
static void stop_ptraced_child(int pid, void *stack, int exitcode)
{
int status, n;
if(ptrace(PTRACE_CONT, pid, 0, 0) < 0)
panic("check_ptrace : ptrace failed, errno = %d", errno);
n = waitpid(pid, &status, 0);
if(!WIFEXITED(status) || (WEXITSTATUS(status) != exitcode))
panic("check_ptrace : child exited with status 0x%x", status);
if(munmap(stack, PAGE_SIZE) < 0)
panic("check_ptrace : munmap failed, errno = %d", errno);
}
void __init check_ptrace(void)
{
void *stack;
int pid, syscall, n, status;
printk("Checking that ptrace can change system call numbers...");
pid = start_ptraced_child(&stack);
while(1){ while(1){
if(ptrace(PTRACE_SYSCALL, pid, 0, 0) < 0) if(ptrace(PTRACE_SYSCALL, pid, 0, 0) < 0)
panic("check_ptrace : ptrace failed, errno = %d", panic("check_ptrace : ptrace failed, errno = %d",
...@@ -213,23 +222,19 @@ void __init check_ptrace(void) ...@@ -213,23 +222,19 @@ void __init check_ptrace(void)
break; break;
} }
} }
if(ptrace(PTRACE_CONT, pid, 0, 0) < 0) stop_ptraced_child(pid, stack, 0);
panic("check_ptrace : ptrace failed, errno = %d", errno);
n = waitpid(pid, &status, 0);
if(!WIFEXITED(status) || (WEXITSTATUS(status) != 0))
panic("check_ptrace : child exited with status 0x%x", status);
if(munmap(stack, PAGE_SIZE) < 0)
panic("check_ptrace : munmap failed, errno = %d", errno);
printk("OK\n"); printk("OK\n");
} }
int run_kernel_thread(int (*fn)(void *), void *arg, void **jmp_ptr) int run_kernel_thread(int (*fn)(void *), void *arg, void **jmp_ptr)
{ {
jmp_buf buf; jmp_buf buf;
int n;
*jmp_ptr = &buf; *jmp_ptr = &buf;
if(setjmp(buf)) return(1); n = setjmp(buf);
if(n != 0)
return(n);
(*fn)(arg); (*fn)(arg);
return(0); return(0);
} }
...@@ -244,6 +249,41 @@ void forward_pending_sigio(int target) ...@@ -244,6 +249,41 @@ void forward_pending_sigio(int target)
kill(target, SIGIO); kill(target, SIGIO);
} }
int can_do_skas(void)
{
#ifdef CONFIG_MODE_SKAS
struct ptrace_faultinfo fi;
void *stack;
int pid, n, ret = 1;
printk("Checking for the skas3 patch in the host...");
pid = start_ptraced_child(&stack);
n = ptrace(PTRACE_FAULTINFO, pid, 0, &fi);
if(n < 0){
if(errno == EIO)
printk("not found\n");
else printk("No (unexpected errno - %d)\n", errno);
ret = 0;
}
else printk("found\n");
init_registers(pid);
stop_ptraced_child(pid, stack, 1);
printk("Checking for /proc/mm...");
if(access("/proc/mm", W_OK)){
printk("not found\n");
ret = 0;
}
else printk("found\n");
return(ret);
#else
return(0);
#endif
}
/* /*
* Overrides for Emacs so that we follow Linus's tabbing style. * Overrides for Emacs so that we follow Linus's tabbing style.
* Emacs will notice this stuff at the end of the file and automatically * Emacs will notice this stuff at the end of the file and automatically
......
arch/um/kernel/process_kern.c
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/ptrace.c
View file @ 6cc944b6
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
#include "linux/smp_lock.h" #include "linux/smp_lock.h"
#include "linux/security.h" #include "linux/security.h"
#include "linux/ptrace.h" #include "linux/ptrace.h"
#include "linux/proc_mm.h"
#include "asm/ptrace.h" #include "asm/ptrace.h"
#include "asm/uaccess.h" #include "asm/uaccess.h"
#include "kern_util.h" #include "kern_util.h"
...@@ -21,6 +22,11 @@ void ptrace_disable(struct task_struct *child) ...@@ -21,6 +22,11 @@ void ptrace_disable(struct task_struct *child)
{ {
} }
extern long do_mmap2(struct task_struct *task, unsigned long addr,
unsigned long len, unsigned long prot,
unsigned long flags, unsigned long fd,
unsigned long pgoff);
int sys_ptrace(long request, long pid, long addr, long data) int sys_ptrace(long request, long pid, long addr, long data)
{ {
struct task_struct *child; struct task_struct *child;
...@@ -182,13 +188,13 @@ int sys_ptrace(long request, long pid, long addr, long data) ...@@ -182,13 +188,13 @@ int sys_ptrace(long request, long pid, long addr, long data)
#ifdef PTRACE_GETREGS #ifdef PTRACE_GETREGS
case PTRACE_GETREGS: { /* Get all gp regs from the child. */ case PTRACE_GETREGS: { /* Get all gp regs from the child. */
if (!access_ok(VERIFY_WRITE, (unsigned *)data, if (!access_ok(VERIFY_WRITE, (unsigned long *)data,
FRAME_SIZE_OFFSET)) { FRAME_SIZE_OFFSET)) {
ret = -EIO; ret = -EIO;
break; break;
} }
for ( i = 0; i < FRAME_SIZE_OFFSET; i += sizeof(long) ) { for ( i = 0; i < FRAME_SIZE_OFFSET; i += sizeof(long) ) {
__put_user(getreg(child, i),(unsigned long *) data); __put_user(getreg(child, i), (unsigned long *) data);
data += sizeof(long); data += sizeof(long);
} }
ret = 0; ret = 0;
...@@ -231,6 +237,57 @@ int sys_ptrace(long request, long pid, long addr, long data) ...@@ -231,6 +237,57 @@ int sys_ptrace(long request, long pid, long addr, long data)
case PTRACE_SETFPXREGS: /* Set the child FPU state. */ case PTRACE_SETFPXREGS: /* Set the child FPU state. */
ret = set_fpxregs(data, child); ret = set_fpxregs(data, child);
break; break;
#endif
case PTRACE_FAULTINFO: {
struct ptrace_faultinfo fault;
fault = ((struct ptrace_faultinfo)
{ .is_write = child->thread.err,
.addr = child->thread.cr2 });
ret = copy_to_user((unsigned long *) data, &fault,
sizeof(fault));
if(ret)
break;
break;
}
case PTRACE_SIGPENDING:
ret = copy_to_user((unsigned long *) data,
&child->pending.signal,
sizeof(child->pending.signal));
break;
case PTRACE_LDT: {
struct ptrace_ldt ldt;
if(copy_from_user(&ldt, (unsigned long *) data,
sizeof(ldt))){
ret = -EIO;
break;
}
/* This one is confusing, so just punt and return -EIO for
* now
*/
ret = -EIO;
break;
}
#ifdef CONFIG_PROC_MM
case PTRACE_SWITCH_MM: {
struct mm_struct *old = child->mm;
struct mm_struct *new = proc_mm_get_mm(data);
if(IS_ERR(new)){
ret = PTR_ERR(new);
break;
}
atomic_inc(&new->mm_users);
child->mm = new;
child->active_mm = new;
mmput(old);
ret = 0;
break;
}
#endif #endif
default: default:
ret = -EIO; ret = -EIO;
......
arch/um/kernel/reboot.c
View file @ 6cc944b6
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
#include "kern_util.h" #include "kern_util.h"
#include "kern.h" #include "kern.h"
#include "os.h" #include "os.h"
#include "mode.h"
#include "choose-mode.h"
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
static void kill_idlers(int me) static void kill_idlers(int me)
...@@ -17,26 +19,17 @@ static void kill_idlers(int me) ...@@ -17,26 +19,17 @@ static void kill_idlers(int me)
for(i = 0; i < sizeof(idle_threads)/sizeof(idle_threads[0]); i++){ for(i = 0; i < sizeof(idle_threads)/sizeof(idle_threads[0]); i++){
p = idle_threads[i]; p = idle_threads[i];
if((p != NULL) && (p->thread.extern_pid != me)) if((p != NULL) && (p->thread.mode.tt.extern_pid != me))
os_kill_process(p->thread.extern_pid); os_kill_process(p->thread.mode.tt.extern_pid, 0);
} }
} }
#endif #endif
static void kill_off_processes(void) static void kill_off_processes(void)
{ {
struct task_struct *p; CHOOSE_MODE(kill_off_processes_tt(), kill_off_processes_skas());
int me;
me = os_getpid();
for_each_process(p){
if(p->thread.extern_pid != me)
os_kill_process(p->thread.extern_pid);
}
if(init_task.thread.extern_pid != me)
os_kill_process(init_task.thread.extern_pid);
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
kill_idlers(me); kill_idlers(os_getpid());
#endif #endif
} }
...@@ -50,16 +43,14 @@ void machine_restart(char * __unused) ...@@ -50,16 +43,14 @@ void machine_restart(char * __unused)
{ {
do_uml_exitcalls(); do_uml_exitcalls();
kill_off_processes(); kill_off_processes();
tracing_reboot(); CHOOSE_MODE(reboot_tt(), reboot_skas());
os_kill_process(os_getpid());
} }
void machine_power_off(void) void machine_power_off(void)
{ {
do_uml_exitcalls(); do_uml_exitcalls();
kill_off_processes(); kill_off_processes();
tracing_halt(); CHOOSE_MODE(halt_tt(), halt_skas());
os_kill_process(os_getpid());
} }
void machine_halt(void) void machine_halt(void)
......
arch/um/kernel/sigio_user.c
View file @ 6cc944b6
...@@ -39,14 +39,13 @@ struct openpty_arg { ...@@ -39,14 +39,13 @@ struct openpty_arg {
int err; int err;
}; };
static int openpty_cb(void *arg) static void openpty_cb(void *arg)
{ {
struct openpty_arg *info = arg; struct openpty_arg *info = arg;
info->err = 0; info->err = 0;
if(openpty(&info->master, &info->slave, NULL, NULL, NULL)) if(openpty(&info->master, &info->slave, NULL, NULL, NULL))
info->err = errno; info->err = errno;
return(0);
} }
void __init check_one_sigio(void (*proc)(int, int)) void __init check_one_sigio(void (*proc)(int, int))
...@@ -54,13 +53,9 @@ void __init check_one_sigio(void (*proc)(int, int)) ...@@ -54,13 +53,9 @@ void __init check_one_sigio(void (*proc)(int, int))
struct sigaction old, new; struct sigaction old, new;
struct termios tt; struct termios tt;
struct openpty_arg pty = { master : -1, slave : -1 }; struct openpty_arg pty = { master : -1, slave : -1 };
int master, slave, flags, err; int master, slave, flags;
err = run_helper_thread(openpty_cb, &pty, CLONE_FILES, NULL, 2); initial_thread_cb(openpty_cb, &pty);
if(err < 0){
printk("run_helper_thread failed, errno = %d\n", -err);
return;
}
if(pty.err){ if(pty.err){
printk("openpty failed, errno = %d\n", pty.err); printk("openpty failed, errno = %d\n", pty.err);
return; return;
...@@ -387,7 +382,7 @@ void write_sigio_workaround(void) ...@@ -387,7 +382,7 @@ void write_sigio_workaround(void)
goto out_close2; goto out_close2;
write_sigio_pid = run_helper_thread(write_sigio_thread, NULL, write_sigio_pid = run_helper_thread(write_sigio_thread, NULL,
CLONE_FILES, &stack, 0); CLONE_FILES | CLONE_VM, &stack, 0);
if(write_sigio_pid < 0) goto out_close2; if(write_sigio_pid < 0) goto out_close2;
......
arch/um/kernel/signal_kern.c
View file @ 6cc944b6
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include "linux/binfmts.h" #include "linux/binfmts.h"
#include "asm/signal.h" #include "asm/signal.h"
#include "asm/uaccess.h" #include "asm/uaccess.h"
#include "asm/unistd.h"
#include "user_util.h" #include "user_util.h"
#include "kern_util.h" #include "kern_util.h"
#include "signal_kern.h" #include "signal_kern.h"
...@@ -23,6 +24,7 @@ ...@@ -23,6 +24,7 @@
#include "kern.h" #include "kern.h"
#include "frame_kern.h" #include "frame_kern.h"
#include "sigcontext.h" #include "sigcontext.h"
#include "mode.h"
EXPORT_SYMBOL(block_signals); EXPORT_SYMBOL(block_signals);
EXPORT_SYMBOL(unblock_signals); EXPORT_SYMBOL(unblock_signals);
...@@ -69,6 +71,9 @@ static int handle_signal(struct pt_regs *regs, unsigned long signr, ...@@ -69,6 +71,9 @@ static int handle_signal(struct pt_regs *regs, unsigned long signr,
ret = 0; ret = 0;
switch(error){ switch(error){
case -ERESTART_RESTARTBLOCK:
current_thread_info()->restart_block.fn =
do_no_restart_syscall;
case -ERESTARTNOHAND: case -ERESTARTNOHAND:
ret = -EINTR; ret = -EINTR;
break; break;
...@@ -160,6 +165,10 @@ static int kern_do_signal(struct pt_regs *regs, sigset_t *oldset, int error) ...@@ -160,6 +165,10 @@ static int kern_do_signal(struct pt_regs *regs, sigset_t *oldset, int error)
PT_REGS_ORIG_SYSCALL(regs) = PT_REGS_SYSCALL_NR(regs); PT_REGS_ORIG_SYSCALL(regs) = PT_REGS_SYSCALL_NR(regs);
PT_REGS_RESTART_SYSCALL(regs); PT_REGS_RESTART_SYSCALL(regs);
} }
else if(PT_REGS_SYSCALL_RET(regs) == -ERESTART_RESTARTBLOCK){
PT_REGS_SYSCALL_RET(regs) = __NR_restart_syscall;
PT_REGS_RESTART_SYSCALL(regs);
}
} }
/* This closes a way to execute a system call on the host. If /* This closes a way to execute a system call on the host. If
...@@ -171,7 +180,7 @@ static int kern_do_signal(struct pt_regs *regs, sigset_t *oldset, int error) ...@@ -171,7 +180,7 @@ static int kern_do_signal(struct pt_regs *regs, sigset_t *oldset, int error)
*/ */
if((current->ptrace & PT_DTRACE) && if((current->ptrace & PT_DTRACE) &&
is_syscall(PT_REGS_IP(&current->thread.regs))) is_syscall(PT_REGS_IP(&current->thread.regs)))
current->thread.singlestep_syscall = 1; (void) CHOOSE_MODE(current->thread.mode.tt.singlestep_syscall = 1, 0);
return(0); return(0);
} }
...@@ -228,6 +237,16 @@ int sys_rt_sigsuspend(sigset_t *unewset, size_t sigsetsize) ...@@ -228,6 +237,16 @@ int sys_rt_sigsuspend(sigset_t *unewset, size_t sigsetsize)
} }
} }
static int copy_sc_from_user(struct pt_regs *to, void *from)
{
int ret;
ret = CHOOSE_MODE(copy_sc_from_user_tt(to->regs.mode.tt, from,
&signal_frame_sc.arch),
copy_sc_from_user_skas(&to->regs, from));
return(ret);
}
int sys_sigreturn(struct pt_regs regs) int sys_sigreturn(struct pt_regs regs)
{ {
void *sc = sp_to_sc(PT_REGS_SP(&regs)); void *sc = sp_to_sc(PT_REGS_SP(&regs));
...@@ -241,8 +260,7 @@ int sys_sigreturn(struct pt_regs regs) ...@@ -241,8 +260,7 @@ int sys_sigreturn(struct pt_regs regs)
sigdelsetmask(&current->blocked, ~_BLOCKABLE); sigdelsetmask(&current->blocked, ~_BLOCKABLE);
recalc_sigpending(); recalc_sigpending();
spin_unlock_irq(&current->sig->siglock); spin_unlock_irq(&current->sig->siglock);
copy_sc_from_user(current->thread.regs.regs.sc, sc, copy_sc_from_user(&current->thread.regs, sc);
&signal_frame_sc.arch);
return(PT_REGS_SYSCALL_RET(&current->thread.regs)); return(PT_REGS_SYSCALL_RET(&current->thread.regs));
} }
...@@ -257,8 +275,7 @@ int sys_rt_sigreturn(struct pt_regs regs) ...@@ -257,8 +275,7 @@ int sys_rt_sigreturn(struct pt_regs regs)
sigdelsetmask(&current->blocked, ~_BLOCKABLE); sigdelsetmask(&current->blocked, ~_BLOCKABLE);
recalc_sigpending(); recalc_sigpending();
spin_unlock_irq(&current->sig->siglock); spin_unlock_irq(&current->sig->siglock);
copy_sc_from_user(current->thread.regs.regs.sc, sc, copy_sc_from_user(&current->thread.regs, sc);
&signal_frame_sc.arch);
return(PT_REGS_SYSCALL_RET(&current->thread.regs)); return(PT_REGS_SYSCALL_RET(&current->thread.regs));
} }
......
arch/um/kernel/signal_user.c
View file @ 6cc944b6
...@@ -21,13 +21,12 @@ ...@@ -21,13 +21,12 @@
void set_sigstack(void *sig_stack, int size) void set_sigstack(void *sig_stack, int size)
{ {
stack_t stack; stack_t stack = ((stack_t) { .ss_flags = 0,
.ss_sp = (__ptr_t) sig_stack,
.ss_size = size - sizeof(void *) });
stack.ss_sp = (__ptr_t) sig_stack;
stack.ss_flags = 0;
stack.ss_size = size - sizeof(void *);
if(sigaltstack(&stack, NULL) != 0) if(sigaltstack(&stack, NULL) != 0)
panic("sigaltstack failed"); panic("enabling signal stack failed, errno = %d\n", errno);
} }
void set_handler(int sig, void (*handler)(int), int flags, ...) void set_handler(int sig, void (*handler)(int), int flags, ...)
......
arch/um/kernel/skas/Makefile 0 → 100644
View file @ 6cc944b6
#
# Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
# Licensed under the GPL
#
obj-y = exec_kern.o exec_user.o mem.o mem_user.o mmu.o process.o \
process_kern.o syscall_kern.o syscall_user.o time.o tlb.o trap_user.o \
sys-$(SUBARCH)/
USER_OBJS = $(filter %_user.o,$(obj-y)) process.o time.o
USER_OBJS := $(foreach file,$(USER_OBJS),$(obj)/$(file))
include/skas_ptregs.h : util/mk_ptregs
util/mk_ptregs > $@
util/mk_ptregs :
$(MAKE) -C util
$(USER_OBJS) : %.o: %.c
$(CC) $(CFLAGS_$(notdir $@)) $(USER_CFLAGS) -c -o $@ $<
clean :
$(MAKE) -C util clean
$(RM) -f include/skas_ptregs.h
arch/um/kernel/skas/exec_kern.c 0 → 100644
View file @ 6cc944b6
/*
* Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
* Licensed under the GPL
*/
#include "linux/kernel.h"
#include "asm/current.h"
#include "asm/page.h"
#include "asm/signal.h"
#include "asm/ptrace.h"
#include "asm/uaccess.h"
#include "asm/mmu_context.h"
#include "tlb.h"
#include "skas.h"
#include "mmu.h"
#include "os.h"
void flush_thread_skas(void)
{
force_flush_all();
switch_mm_skas(current->mm->context.skas.mm_fd);
}
void start_thread_skas(struct pt_regs *regs, unsigned long eip,
unsigned long esp)
{
set_fs(USER_DS);
PT_REGS_IP(regs) = eip;
PT_REGS_SP(regs) = esp;
}
/*
* Overrides for Emacs so that we follow Linus's tabbing style.
* Emacs will notice this stuff at the end of the file and automatically
* adjust the settings for this buffer only. This must remain at the end
* of the file.
* ---------------------------------------------------------------------------
* Local variables:
* c-file-style: "linux"
* End:
*/
arch/um/kernel/skas/exec_user.c 0 → 100644
View file @ 6cc944b6
/*
* Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
* Licensed under the GPL
*/
#include <stdlib.h>
#include <errno.h>
#include <signal.h>
#include <sched.h>
#include <sys/wait.h>
#include <sys/ptrace.h>
#include "user.h"
#include "kern_util.h"
#include "os.h"
#include "time_user.h"
static int user_thread_tramp(void *arg)
{
if(ptrace(PTRACE_TRACEME, 0, 0, 0) < 0)
panic("user_thread_tramp - PTRACE_TRACEME failed, "
"errno = %d\n", errno);
enable_timer();
os_stop_process(os_getpid());
return(0);
}
int user_thread(unsigned long stack, int flags)
{
int pid, status;
pid = clone(user_thread_tramp, (void *) stack_sp(stack),
flags | CLONE_FILES | SIGCHLD, NULL);
if(pid < 0){
printk("user_thread - clone failed, errno = %d\n", errno);
return(pid);
}
if(waitpid(pid, &status, WUNTRACED) < 0){
printk("user_thread - waitpid failed, errno = %d\n", errno);
return(-errno);
}
if(!WIFSTOPPED(status) || (WSTOPSIG(status) != SIGSTOP)){
printk("user_thread - trampoline didn't stop, status = %d\n",
status);
return(-EINVAL);
}
return(pid);
}
/*
* Overrides for Emacs so that we follow Linus's tabbing style.
* Emacs will notice this stuff at the end of the file and automatically
* adjust the settings for this buffer only. This must remain at the end
* of the file.
* ---------------------------------------------------------------------------
* Local variables:
* c-file-style: "linux"
* End:
*/
arch/um/kernel/skas/include/mmu.h 0 → 100644
View file @ 6cc944b6
/*
* Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
* Licensed under the GPL
*/
#ifndef __SKAS_MMU_H
#define __SKAS_MMU_H
#include "linux/list.h"
#include "linux/spinlock.h"
struct mmu_context_skas {
int mm_fd;
};
#endif
/*
* Overrides for Emacs so that we follow Linus's tabbing style.
* Emacs will notice this stuff at the end of the file and automatically
* adjust the settings for this buffer only. This must remain at the end
* of the file.
* ---------------------------------------------------------------------------
* Local variables:
* c-file-style: "linux"
* End:
*/
arch/um/kernel/skas/include/mode.h 0 → 100644
View file @ 6cc944b6
/*
* Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
* Licensed under the GPL
*/
#ifndef __MODE_SKAS_H__
#define __MODE_SKAS_H__
extern unsigned long exec_regs[];
extern unsigned long exec_fp_regs[];
extern unsigned long exec_fpx_regs[];
extern int have_fpx_regs;
extern void user_time_init_skas(void);
extern int copy_sc_from_user_skas(struct uml_pt_regs *regs, void *from_ptr);
extern int copy_sc_to_user_skas(void *to_ptr, struct uml_pt_regs *regs,
unsigned long fault_addr, int fault_type);
extern void sig_handler_common_skas(int sig, struct sigcontext *sc);
extern void halt_skas(void);
extern void reboot_skas(void);
extern void kill_off_processes_skas(void);
#endif
/*
* Overrides for Emacs so that we follow Linus's tabbing style.
* Emacs will notice this stuff at the end of the file and automatically
* adjust the settings for this buffer only. This must remain at the end
* of the file.
* ---------------------------------------------------------------------------
* Local variables:
* c-file-style: "linux"
* End:
*/
arch/um/kernel/skas/include/mode_kern.h 0 → 100644
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/skas/include/proc_mm.h 0 → 100644
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/skas/include/ptrace-skas.h 0 → 100644
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/skas/include/skas.h 0 → 100644
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/skas/include/skas_ptrace.h 0 → 100644
View file @ 6cc944b6
/*
* Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
* Licensed under the GPL
*/
#ifndef __SKAS_PTRACE_H
#define __SKAS_PTRACE_H
struct ptrace_faultinfo {
int is_write;
unsigned long addr;
};
struct ptrace_ldt {
int func;
void *ptr;
unsigned long bytecount;
};
#define PTRACE_FAULTINFO 52
#define PTRACE_SIGPENDING 53
#define PTRACE_LDT 54
#define PTRACE_SWITCH_MM 55
#endif
/*
* Overrides for Emacs so that we follow Linus's tabbing style.
* Emacs will notice this stuff at the end of the file and automatically
* adjust the settings for this buffer only. This must remain at the end
* of the file.
* ---------------------------------------------------------------------------
* Local variables:
* c-file-style: "linux"
* End:
*/
arch/um/kernel/skas/include/uaccess.h 0 → 100644
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/skas/mem.c 0 → 100644
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/skas/mem_user.c 0 → 100644
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/skas/mmu.c 0 → 100644
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/skas/process.c 0 → 100644
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/skas/process_kern.c 0 → 100644
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/skas/sys-i386/Makefile 0 → 100644
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/skas/sys-i386/sigcontext.c 0 → 100644
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/skas/syscall_kern.c 0 → 100644
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/skas/syscall_user.c 0 → 100644
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/skas/time.c 0 → 100644
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/skas/tlb.c 0 → 100644
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/skas/trap_user.c 0 → 100644
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/skas/util/Makefile 0 → 100644
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/skas/util/mk_ptregs.c 0 → 100644
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/smp.c
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/sys_call_table.c
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/syscall_kern.c
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/syscall_user.c
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/sysrq.c
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/tempfile.c
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/time.c
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/time_kern.c
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/tlb.c
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/trap_kern.c
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/trap_user.c
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/tt/Makefile 0 → 100644
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/tt/exec_kern.c 0 → 100644
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/tt/gdb.c 0 → 100644
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/tt/gdb_kern.c 0 → 100644
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/tt/include/mode.h 0 → 100644
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/tt/include/mode_kern.h 0 → 100644
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/tt/include/ptrace-tt.h 0 → 100644
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/tt/include/tt.h 0 → 100644
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/tt/include/uaccess.h 0 → 100644
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/tt/ksyms.c 0 → 100644
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/tt/mem.c 0 → 100644
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/tt/process_kern.c 0 → 100644
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/tt/ptproxy/Makefile 0 → 100644
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/tt/sys-i386/Makefile 0 → 100644
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/tt/sys-i386/sigcontext.c 0 → 100644
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/tt/syscall_kern.c 0 → 100644
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/tt/syscall_user.c 0 → 100644
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/tt/time.c 0 → 100644
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/tt/tlb.c 0 → 100644
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/tt/tracer.c 0 → 100644
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/tt/trap_user.c 0 → 100644
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/tty_log.c
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/um_arch.c
View file @ 6cc944b6
This diff is collapsed.
arch/um/kernel/umid.c
View file @ 6cc944b6
This diff is collapsed.
arch/um/main.c
View file @ 6cc944b6
This diff is collapsed.
arch/um/os-Linux/Makefile
View file @ 6cc944b6
This diff is collapsed.
arch/um/os-Linux/drivers/Makefile
View file @ 6cc944b6
This diff is collapsed.
arch/um/os-Linux/file.c
View file @ 6cc944b6
This diff is collapsed.
arch/um/os-Linux/process.c
View file @ 6cc944b6
This diff is collapsed.
arch/um/os-Linux/tty.c
View file @ 6cc944b6
This diff is collapsed.
arch/um/ptproxy/Makefile deleted 100644 → 0
View file @ 31f3e9c0
This diff is collapsed.
arch/um/sys-i386/Makefile
View file @ 6cc944b6
This diff is collapsed.
arch/um/sys-i386/checksum.S 0 → 100644
View file @ 6cc944b6
This diff is collapsed.
arch/um/sys-i386/ksyms.c
View file @ 6cc944b6
This diff is collapsed.
arch/um/sys-i386/ldt.c
View file @ 6cc944b6
This diff is collapsed.
arch/um/sys-i386/ptrace.c
View file @ 6cc944b6
This diff is collapsed.
arch/um/sys-i386/ptrace_user.c
View file @ 6cc944b6
This diff is collapsed.
arch/um/sys-i386/sigcontext.c
View file @ 6cc944b6
This diff is collapsed.
arch/um/sys-i386/util/mk_thread_kern.c
View file @ 6cc944b6
This diff is collapsed.
arch/um/sys-i386/util/mk_thread_user.c
View file @ 6cc944b6
This diff is collapsed.
arch/um/uml.lds.S
View file @ 6cc944b6
This diff is collapsed.
arch/um/util/Makefile
View file @ 6cc944b6
This diff is collapsed.
arch/um/util/mk_constants_kern.c 0 → 100644
View file @ 6cc944b6
This diff is collapsed.
arch/um/util/mk_constants_user.c 0 → 100644
View file @ 6cc944b6
This diff is collapsed.
include/asm-um/a.out.h
View file @ 6cc944b6
This diff is collapsed.
include/asm-um/checksum.h
View file @ 6cc944b6
This diff is collapsed.
include/asm-um/mmu.h
View file @ 6cc944b6
This diff is collapsed.
include/asm-um/mmu_context.h
View file @ 6cc944b6
This diff is collapsed.
include/asm-um/page.h
View file @ 6cc944b6
This diff is collapsed.
include/asm-um/pgtable.h
View file @ 6cc944b6
This diff is collapsed.
include/asm-um/processor-generic.h
View file @ 6cc944b6
This diff is collapsed.
include/asm-um/ptrace-generic.h
View file @ 6cc944b6
This diff is collapsed.
include/asm-um/system-generic.h
View file @ 6cc944b6
This diff is collapsed.
include/asm-um/thread_info.h
View file @ 6cc944b6
This diff is collapsed.
include/asm-um/uaccess.h
View file @ 6cc944b6
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7