Mega-commit for Linux emulator update.. This has been stress tested under

netscape-2.0 for Linux running all the Java stuff.  The scrollbars are now
working, at least on my machine. (whew! :-)

I'm uncomfortable with the size of this commit, but it's too
inter-dependant to easily seperate out.

The main changes:

COMPAT_LINUX is *GONE*.  Most of the code has been moved out of the i386
machine dependent section into the linux emulator itself.  The int 0x80
syscall code was almost identical to the lcall 7,0 code and a minor tweak
allows them to both be used with the same C code.  All kernels can now
just modload the lkm and it'll DTRT without having to rebuild the kernel
first.  Like IBCS2, you can statically compile it in with "options LINUX".

A pile of new syscalls implemented, including getdents(), llseek(),
readv(), writev(), msync(), personality().  The Linux-ELF libraries want
to use some of these.

linux_select() now obeys Linux semantics, ie: returns the time remaining
of the timeout value rather than leaving it the original value.

Quite a few bugs removed, including incorrect arguments being used in
syscalls..  eg:  mixups between passing the sigset as an int, vs passing
it as a pointer and doing a copyin(), missing return values, unhandled
cases, SIOC* ioctls, etc.

The build for the code has changed.  i386/conf/files now knows how
to build linux_genassym and generate linux_assym.h on the fly.

Supporting changes elsewhere in the kernel:

The user-mode signal trampoline has moved from the U area to immediately
below the top of the stack (below PS_STRINGS).  This allows the different
binary emulations to have their own signal trampoline code (which gets rid
of the hardwired syscall 103 (sigreturn on BSD, syslog on Linux)) and so
that the emulator can provide the exact "struct sigcontext *" argument to
the program's signal handlers.

The sigstack's "ss_flags" now uses SS_DISABLE and SS_ONSTACK flags, which
have the same values as the re-used SA_DISABLE and SA_ONSTACK which are
intended for sigaction only.  This enables the support of a SA_RESETHAND
flag to sigaction to implement the gross SYSV and Linux SA_ONESHOT signal
semantics where the signal handler is reset when it's triggered.

makesyscalls.sh no longer appends the struct sysentvec on the end of the
generated init_sysent.c code.  It's a lot saner to have it in a seperate
file rather than trying to update the structure inside the awk script. :-)

At exec time, the dozen bytes or so of signal trampoline code are copied
to the top of the user's stack, rather than obtaining the trampoline code
the old way by getting a clone of the parent's user area.  This allows
Linux and native binaries to freely exec each other without getting
trampolines mixed up.

1 files changed, 94 insertions, 67 deletions

diff --git a/sys/compat/linux/linux_stats.c b/sys/compat/linux/linux_stats.c
index 327343b..8d562e0 100644
--- a/sys/compat/linux/linux_stats.c
+++ b/sys/compat/linux/linux_stats.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *  $Id: linux_stats.c,v 1.3 1995/11/22 07:43:51 bde Exp $
+ *  $Id: linux_stats.c,v 1.4 1996/01/30 12:23:17 peter Exp $
  */
 
 #include <sys/param.h>
@@ -42,7 +42,8 @@
 #include <sys/pipe.h>
 
 #include <i386/linux/linux.h>
-#include <i386/linux/sysproto.h>
+#include <i386/linux/linux_proto.h>
+#include <i386/linux/linux_util.h>
 
 struct linux_newstat {
     unsigned short stat_dev;
@@ -67,10 +68,6 @@ struct linux_newstat {
     unsigned long __unused5;
 };
 
-struct linux_newstat_args {
-    char *path;
-    struct linux_newstat *buf;
-};
 
 static int
 newstat_copyout(struct stat *buf, void *ubuf)
@@ -97,9 +94,12 @@ int
 linux_newstat(struct proc *p, struct linux_newstat_args *args, int *retval)
 {
     struct stat buf;
-    struct linux_newstat tbuf;
     struct nameidata nd;
     int error;
+    caddr_t sg;
+
+    sg = stackgap_init();
+    CHECKALTEXIST(p, &sg, args->path);
   
 #ifdef DEBUG
     printf("Linux-emul(%d): newstat(%s, *)\n", p->p_pid, args->path);
@@ -115,44 +115,78 @@ linux_newstat(struct proc *p, struct linux_newstat_args *args, int *retval)
     return error;
 }
 
+/*
+ * Get file status; this version does not follow links.
+ */
 int
-linux_newlstat(struct proc *p, struct linux_newstat_args *args, int *retval)
+linux_newlstat(p, uap, retval)
+	struct proc *p;
+	struct linux_newlstat_args *uap;
+	int *retval;
 {
-    struct stat buf;
-    struct linux_newstat tbuf;
-    struct nameidata nd;
-    int error;
+	int error;
+	struct vnode *vp, *dvp;
+	struct stat sb, sb1;
+	struct nameidata nd;
+	caddr_t sg;
+
+	sg = stackgap_init();
+	CHECKALTEXIST(p, &sg, uap->path);
   
 #ifdef DEBUG
-    printf("Linux-emul(%d): newlstat(%s, *)\n", p->p_pid, args->path);
+	printf("Linux-emul(%d): newlstat(%s, *)\n", p->p_pid, uap->path);
 #endif
-    NDINIT(&nd, LOOKUP, LOCKLEAF|FOLLOW, UIO_USERSPACE, args->path, p);
-    error = namei(&nd);
-    if (!error) {
-	error = vn_stat(nd.ni_vp, &buf, p);
-	vput(nd.ni_vp);
-    }
-    if (!error)
-	error = newstat_copyout(&buf, args->buf);
-    return error;
+	NDINIT(&nd, LOOKUP, NOFOLLOW | LOCKLEAF | LOCKPARENT, UIO_USERSPACE,
+	    uap->path, p);
+	error = namei(&nd);
+	if (error)
+		return (error);
+	/*
+	 * For symbolic links, always return the attributes of its
+	 * containing directory, except for mode, size, and links.
+	 */
+	vp = nd.ni_vp;
+	dvp = nd.ni_dvp;
+	if (vp->v_type != VLNK) {
+		if (dvp == vp)
+			vrele(dvp);
+		else
+			vput(dvp);
+		error = vn_stat(vp, &sb, p);
+		vput(vp);
+		if (error)
+			return (error);
+	} else {
+		error = vn_stat(dvp, &sb, p);
+		vput(dvp);
+		if (error) {
+			vput(vp);
+			return (error);
+		}
+		error = vn_stat(vp, &sb1, p);
+		vput(vp);
+		if (error)
+			return (error);
+		sb.st_mode &= ~S_IFDIR;
+		sb.st_mode |= S_IFLNK;
+		sb.st_nlink = sb1.st_nlink;
+		sb.st_size = sb1.st_size;
+		sb.st_blocks = sb1.st_blocks;
+	}
+	error = newstat_copyout(&sb, uap->buf);
+	return (error);
 }
 
-struct linux_newfstat_args {
-    int fd;
-    struct linux_newstat *buf;
-};
-
 int
 linux_newfstat(struct proc *p, struct linux_newfstat_args *args, int *retval)
 {
-    struct linux_newstat tbuf;
     struct filedesc *fdp = p->p_fd;
     struct file *fp;
     struct stat buf;
     int error;
   
 #ifdef DEBUG
-    printf("Linux-emul(%d): newlstat(%d, *)\n", p->p_pid, args->fd);
+    printf("Linux-emul(%d): newfstat(%d, *)\n", p->p_pid, args->fd);
 #endif
     if ((unsigned)args->fd >= fdp->fd_nfiles 
 	|| (fp = fdp->fd_ofiles[args->fd]) == NULL)
@@ -175,7 +209,7 @@ linux_newfstat(struct proc *p, struct linux_newfstat_args *args, int *retval)
     return error;
 }
 
-struct linux_statfs {
+struct linux_statfs_buf {
 	long ftype;
 	long fbsize;
 	long fblocks;
@@ -188,12 +222,6 @@ struct linux_statfs {
 	long fspare[6];
 };
 
-
-struct linux_statfs_args {
-	char *path;
-	struct statfs *buf;
-};
-
 int
 linux_statfs(struct proc *p, struct linux_statfs_args *args, int *retval)
 {
@@ -201,8 +229,12 @@ linux_statfs(struct proc *p, struct linux_statfs_args *args, int *retval)
 	struct nameidata *ndp;
 	struct statfs *bsd_statfs;
 	struct nameidata nd;
-	struct linux_statfs linux_statfs;
+	struct linux_statfs_buf linux_statfs_buf;
 	int error;
+	caddr_t sg;
+
+	sg = stackgap_init();
+	CHECKALTEXIST(p, &sg, args->path);
 
 #ifdef DEBUG
 	printf("Linux-emul(%d): statfs(%s, *)\n", p->p_pid, args->path);
@@ -217,32 +249,27 @@ linux_statfs(struct proc *p, struct linux_statfs_args *args, int *retval)
 	if (error = VFS_STATFS(mp, bsd_statfs, p))
 		return error;
 	bsd_statfs->f_flags = mp->mnt_flag & MNT_VISFLAGMASK;
-	linux_statfs.ftype = bsd_statfs->f_type;
-	linux_statfs.fbsize = bsd_statfs->f_bsize;
-	linux_statfs.fblocks = bsd_statfs->f_blocks;
-	linux_statfs.fbfree = bsd_statfs->f_bfree;
-	linux_statfs.fbavail = bsd_statfs->f_bavail;
-  	linux_statfs.fffree = bsd_statfs->f_ffree;
-	linux_statfs.ffiles = bsd_statfs->f_files;
-	linux_statfs.ffsid.val[0] = bsd_statfs->f_fsid.val[0];
-	linux_statfs.ffsid.val[1] = bsd_statfs->f_fsid.val[1];
-	linux_statfs.fnamelen = MAXNAMLEN;
-	return copyout((caddr_t)&linux_statfs, (caddr_t)args->buf,
-		       sizeof(struct linux_statfs));
+	linux_statfs_buf.ftype = bsd_statfs->f_type;
+	linux_statfs_buf.fbsize = bsd_statfs->f_bsize;
+	linux_statfs_buf.fblocks = bsd_statfs->f_blocks;
+	linux_statfs_buf.fbfree = bsd_statfs->f_bfree;
+	linux_statfs_buf.fbavail = bsd_statfs->f_bavail;
+  	linux_statfs_buf.fffree = bsd_statfs->f_ffree;
+	linux_statfs_buf.ffiles = bsd_statfs->f_files;
+	linux_statfs_buf.ffsid.val[0] = bsd_statfs->f_fsid.val[0];
+	linux_statfs_buf.ffsid.val[1] = bsd_statfs->f_fsid.val[1];
+	linux_statfs_buf.fnamelen = MAXNAMLEN;
+	return copyout((caddr_t)&linux_statfs_buf, (caddr_t)args->buf,
+		       sizeof(struct linux_statfs_buf));
 }
 
-struct linux_fstatfs_args {
-	int fd;
-	struct statfs *buf;
-};
-
 int
 linux_fstatfs(struct proc *p, struct linux_fstatfs_args *args, int *retval)
 {
 	struct file *fp;
 	struct mount *mp;
 	struct statfs *bsd_statfs;
-	struct linux_statfs linux_statfs;
+	struct linux_statfs_buf linux_statfs_buf;
 	int error;
 
 #ifdef DEBUG
@@ -255,16 +282,16 @@ linux_fstatfs(struct proc *p, struct linux_fstatfs_args *args, int *retval)
 	if (error = VFS_STATFS(mp, bsd_statfs, p))
 		return error;
 	bsd_statfs->f_flags = mp->mnt_flag & MNT_VISFLAGMASK;
-	linux_statfs.ftype = bsd_statfs->f_type;
-	linux_statfs.fbsize = bsd_statfs->f_bsize;
-	linux_statfs.fblocks = bsd_statfs->f_blocks;
-	linux_statfs.fbfree = bsd_statfs->f_bfree;
-	linux_statfs.fbavail = bsd_statfs->f_bavail;
-  	linux_statfs.fffree = bsd_statfs->f_ffree;
-	linux_statfs.ffiles = bsd_statfs->f_files;
-	linux_statfs.ffsid.val[0] = bsd_statfs->f_fsid.val[0];
-	linux_statfs.ffsid.val[1] = bsd_statfs->f_fsid.val[1];
-	linux_statfs.fnamelen = MAXNAMLEN;
-	return copyout((caddr_t)&linux_statfs, (caddr_t)args->buf,
-		       sizeof(struct linux_statfs));
+	linux_statfs_buf.ftype = bsd_statfs->f_type;
+	linux_statfs_buf.fbsize = bsd_statfs->f_bsize;
+	linux_statfs_buf.fblocks = bsd_statfs->f_blocks;
+	linux_statfs_buf.fbfree = bsd_statfs->f_bfree;
+	linux_statfs_buf.fbavail = bsd_statfs->f_bavail;
+  	linux_statfs_buf.fffree = bsd_statfs->f_ffree;
+	linux_statfs_buf.ffiles = bsd_statfs->f_files;
+	linux_statfs_buf.ffsid.val[0] = bsd_statfs->f_fsid.val[0];
+	linux_statfs_buf.ffsid.val[1] = bsd_statfs->f_fsid.val[1];
+	linux_statfs_buf.fnamelen = MAXNAMLEN;
+	return copyout((caddr_t)&linux_statfs_buf, (caddr_t)args->buf,
+		       sizeof(struct linux_statfs_buf));
 }