Module Name: src
Committed By: matt
Date: Sat Sep 12 18:02:33 UTC 2009
Modified Files:
src/sys/compat/netbsd32 [matt-nb5-mips64]: netbsd32.h netbsd32_netbsd.c
Log Message:
Add support for netbsd32___mount50. There's got to be a better of doing this.
Maybe pushing it down to vfs. This only supports mfs/ufs/cd9660 and probably
tmpfs.
To generate a diff of this commit:
cvs rdiff -u -r1.77.4.1 -r1.77.4.1.4.1 src/sys/compat/netbsd32/netbsd32.h
cvs rdiff -u -r1.145.4.2 -r1.145.4.2.4.1 \
src/sys/compat/netbsd32/netbsd32_netbsd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/netbsd32/netbsd32.h
diff -u src/sys/compat/netbsd32/netbsd32.h:1.77.4.1 src/sys/compat/netbsd32/netbsd32.h:1.77.4.1.4.1
--- src/sys/compat/netbsd32/netbsd32.h:1.77.4.1 Tue Nov 25 17:31:26 2008
+++ src/sys/compat/netbsd32/netbsd32.h Sat Sep 12 18:02:32 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32.h,v 1.77.4.1 2008/11/25 17:31:26 snj Exp $ */
+/* $NetBSD: netbsd32.h,v 1.77.4.1.4.1 2009/09/12 18:02:32 matt Exp $ */
/*
* Copyright (c) 1998, 2001, 2008 Matthew R. Green
@@ -44,6 +44,7 @@
#include <sys/ipc.h>
#include <sys/shm.h>
#include <sys/ucontext.h>
+#include <sys/ucred.h>
#include <compat/sys/ucontext.h>
#include <compat/sys/mount.h>
@@ -225,6 +226,17 @@
char f_mntfromname[MNAMELEN]; /* mounted file system */
};
+struct netbsd32_export_args30 {
+ int ex_flags; /* export related flags */
+ uid_t ex_root; /* mapping for root uid */
+ struct uucred ex_anon; /* mapping for anonymous user */
+ netbsd32_pointer_t ex_addr; /* net address to which exported */
+ int ex_addrlen; /* and the net address length */
+ netbsd32_pointer_t ex_mask; /* mask of valid bits in saddr */
+ int ex_masklen; /* and the smask length */
+ netbsd32_charp ex_indexfile; /* index file for WebNFS URLs */
+};
+
/* from <sys/poll.h> */
typedef netbsd32_pointer_t netbsd32_pollfdp_t;
@@ -678,6 +690,25 @@
typedef netbsd32_pointer_t netbsd32_sched_paramp_t;
typedef netbsd32_pointer_t netbsd32_cpusetp_t;
+/* from <fs/cd9660/cd9660_mount.h> */
+struct netbsd32_iso_args {
+ netbsd32_charp fspec;
+ struct export_args30 _pad1;
+ int flags;
+};
+
+/* from <ufs/ufs/ufs_mount.h> */
+struct netbsd32_ufs_args {
+ netbsd32_charp fspec;
+};
+
+struct netbsd32_mfs_args {
+ netbsd32_charp fspec;
+ struct netbsd32_export_args30 _pad1;
+ netbsd32_voidp base;
+ netbsd32_u_long size;
+};
+
#if 0
int netbsd32_kevent(struct lwp *, void *, register_t *);
#endif
Index: src/sys/compat/netbsd32/netbsd32_netbsd.c
diff -u src/sys/compat/netbsd32/netbsd32_netbsd.c:1.145.4.2 src/sys/compat/netbsd32/netbsd32_netbsd.c:1.145.4.2.4.1
--- src/sys/compat/netbsd32/netbsd32_netbsd.c:1.145.4.2 Tue Nov 25 17:31:26 2008
+++ src/sys/compat/netbsd32/netbsd32_netbsd.c Sat Sep 12 18:02:32 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_netbsd.c,v 1.145.4.2 2008/11/25 17:31:26 snj Exp $ */
+/* $NetBSD: netbsd32_netbsd.c,v 1.145.4.2.4.1 2009/09/12 18:02:32 matt Exp $ */
/*
* Copyright (c) 1998, 2001, 2008 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.145.4.2 2008/11/25 17:31:26 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_netbsd.c,v 1.145.4.2.4.1 2009/09/12 18:02:32 matt Exp $");
#if defined(_KERNEL_OPT)
#include "opt_ddb.h"
@@ -87,6 +87,9 @@
#include <net/if.h>
+#include <fs/cd9660/cd9660_mount.h>
+#include <ufs/ufs/ufsmount.h>
+
#include <compat/netbsd32/netbsd32.h>
#include <compat/netbsd32/netbsd32_exec.h>
#include <compat/netbsd32/netbsd32_syscall.h>
@@ -94,8 +97,6 @@
#include <compat/netbsd32/netbsd32_conv.h>
#include <compat/netbsd32/netbsd32_sa.h>
-#include <machine/frame.h>
-
#if defined(DDB)
#include <ddb/ddbvar.h>
#endif
@@ -119,6 +120,7 @@
extern struct sysctlnode netbsd32_sysctl_root;
+#if defined(COMPAT_40) && defined(KERN_SA)
const struct sa_emul saemul_netbsd32 = {
sizeof(ucontext32_t),
sizeof(struct netbsd32_sa_t),
@@ -133,6 +135,7 @@
NULL
#endif
};
+#endif
const struct emul emul_netbsd32 = {
"netbsd32",
@@ -177,7 +180,7 @@
netbsd32_vm_default_addr,
NULL,
-#ifdef COMPAT_40
+#if defined(COMPAT_40) && defined(KERN_SA)
&saemul_netbsd32,
#else
NULL,
@@ -404,6 +407,135 @@
}
int
+netbsd32___mount50(struct lwp *l, const struct netbsd32___mount50_args *uap,
+ register_t *retval)
+{
+ /* {
+ syscallarg(netbsd32_charp) type;
+ syscallarg(netbsd32_charp) path;
+ syscallarg(int) flags;
+ syscallarg(netbsd32_voidp) data;
+ syscallarg(netbsd32_size_t) data_len;
+ } */
+ char mtype[MNAMELEN];
+ union {
+ struct netbsd32_ufs_args ufs_args;
+ struct netbsd32_mfs_args mfs_args;
+ struct netbsd32_iso_args iso_args;
+ } fs_args32;
+ union {
+ struct ufs_args ufs_args;
+ struct mfs_args mfs_args;
+ struct iso_args iso_args;
+ } fs_args;
+ const char *type = SCARG_P32(uap, type);
+ const char *path = SCARG_P32(uap, path);
+ int flags = SCARG(uap, flags);
+ void *data = SCARG_P32(uap, data);
+ size_t data_len = SCARG(uap, data_len);
+ enum uio_seg data_seg;
+ size_t len;
+ int error;
+
+ error = copyinstr(type, mtype, sizeof(mtype), &len);
+ if (error)
+ return error;
+ if (strcmp(mtype, MOUNT_MFS) == 0) {
+ if (data_len != sizeof(fs_args32.mfs_args))
+ return EINVAL;
+ if ((flags & MNT_GETARGS) == 0) {
+ error = copyin(data, &fs_args32.mfs_args,
+ sizeof(fs_args32.mfs_args));
+ if (error)
+ return error;
+ fs_args.mfs_args.fspec =
+ NETBSD32PTR64(fs_args32.mfs_args.fspec);
+ memset(&fs_args.mfs_args._pad1, 0,
+ sizeof(fs_args.mfs_args._pad1));
+ fs_args.mfs_args.base =
+ NETBSD32PTR64(fs_args32.mfs_args.base);
+ fs_args.mfs_args.size = fs_args32.mfs_args.size;
+ }
+ data_seg = UIO_SYSSPACE;
+ data = &fs_args.mfs_args;
+ data_len = sizeof(fs_args.mfs_args);
+ } else if (strcmp(mtype, MOUNT_UFS) == 0) {
+ if (data_len > sizeof(fs_args32.ufs_args))
+ return EINVAL;
+ if ((flags & MNT_GETARGS) == 0) {
+ error = copyin(data, &fs_args32.ufs_args,
+ sizeof(fs_args32.ufs_args));
+ if (error)
+ return error;
+ fs_args.ufs_args.fspec =
+ NETBSD32PTR64(fs_args32.ufs_args.fspec);
+ }
+ data_seg = UIO_SYSSPACE;
+ data = &fs_args.ufs_args;
+ data_len = sizeof(fs_args.ufs_args);
+ } else if (strcmp(mtype, MOUNT_CD9660) == 0) {
+ if (data_len != sizeof(fs_args32.iso_args))
+ return EINVAL;
+ if ((flags & MNT_GETARGS) == 0) {
+ error = copyin(data, &fs_args32.iso_args,
+ sizeof(fs_args32.iso_args));
+ if (error)
+ return error;
+ fs_args.iso_args.fspec =
+ NETBSD32PTR64(fs_args32.iso_args.fspec);
+ memset(&fs_args.iso_args._pad1, 0,
+ sizeof(fs_args.iso_args._pad1));
+ fs_args.iso_args.flags = fs_args32.iso_args.flags;
+ }
+ data_seg = UIO_SYSSPACE;
+ data = &fs_args.iso_args;
+ data_len = sizeof(fs_args.iso_args);
+ } else {
+ data_seg = UIO_USERSPACE;
+ }
+ error = do_sys_mount(l, NULL, type, path, flags, data, data_seg,
+ data_len, retval);
+ if (error) {
+ printf("do_sys_mount(%s): %p, %p, %#x, %p, %d, %zu, %p: failed: error %d\n", mtype, type, path, flags, data, data_seg, data_len, retval, error);
+ return error;
+ }
+ if (flags & MNT_GETARGS) {
+ data_len = *retval;
+ if (strcmp(mtype, MOUNT_MFS) == 0) {
+ if (data_len != sizeof(fs_args.mfs_args))
+ return EINVAL;
+ NETBSD32PTR32(fs_args32.mfs_args.fspec,
+ fs_args.mfs_args.fspec);
+ memset(&fs_args32.mfs_args._pad1, 0,
+ sizeof(fs_args32.mfs_args._pad1));
+ NETBSD32PTR32(fs_args32.mfs_args.base,
+ fs_args.mfs_args.base);
+ fs_args32.mfs_args.size = fs_args.mfs_args.size;
+ error = copyout(&fs_args32.mfs_args, data,
+ sizeof(fs_args32.mfs_args));
+ } else if (strcmp(mtype, MOUNT_UFS) == 0) {
+ if (data_len != sizeof(fs_args.ufs_args))
+ return EINVAL;
+ NETBSD32PTR32(fs_args32.ufs_args.fspec,
+ fs_args.ufs_args.fspec);
+ error = copyout(&fs_args32.ufs_args, data,
+ sizeof(fs_args32.ufs_args));
+ } else if (strcmp(mtype, MOUNT_CD9660) == 0) {
+ if (data_len != sizeof(fs_args.iso_args))
+ return EINVAL;
+ NETBSD32PTR32(fs_args32.iso_args.fspec,
+ fs_args.iso_args.fspec);
+ memset(&fs_args32.iso_args._pad1, 0,
+ sizeof(fs_args32.iso_args._pad1));
+ fs_args32.iso_args.flags = fs_args.iso_args.flags;
+ error = copyout(&fs_args32.iso_args, data,
+ sizeof(fs_args32.iso_args));
+ }
+ }
+ return error;
+}
+
+int
netbsd32_unmount(struct lwp *l, const struct netbsd32_unmount_args *uap, register_t *retval)
{
/* {
