Module Name: src
Committed By: pooka
Date: Fri Jun 11 23:52:38 UTC 2010
Added Files:
src/tests/fs/ptyfs: Atffile Makefile t_nullpts.c t_ptyfs.c
Log Message:
Add some ptyfs tests.
Note: I'm not adding these to the build yet, since they depend on
some other other cleanup I might get done only after the weekend.
Even so, t_nullpts serves a simple example of how to repeat the
crash described in PR kern/43456 (just remove "rump_sys_" from the
calls and it should compile and you should get a host kernel panic
instead of a coredump).
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/tests/fs/ptyfs/Atffile src/tests/fs/ptyfs/Makefile \
src/tests/fs/ptyfs/t_nullpts.c src/tests/fs/ptyfs/t_ptyfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/tests/fs/ptyfs/Atffile
diff -u /dev/null src/tests/fs/ptyfs/Atffile:1.1
--- /dev/null Fri Jun 11 23:52:38 2010
+++ src/tests/fs/ptyfs/Atffile Fri Jun 11 23:52:38 2010
@@ -0,0 +1,6 @@
+Content-Type: application/X-atf-atffile; version="1"
+X-NetBSD-Id: "$NetBSD: Atffile,v 1.1 2010/06/11 23:52:38 pooka Exp $"
+
+prop: test-suite = "NetBSD"
+
+tp-glob: t_*
Index: src/tests/fs/ptyfs/Makefile
diff -u /dev/null src/tests/fs/ptyfs/Makefile:1.1
--- /dev/null Fri Jun 11 23:52:38 2010
+++ src/tests/fs/ptyfs/Makefile Fri Jun 11 23:52:38 2010
@@ -0,0 +1,18 @@
+# $NetBSD: Makefile,v 1.1 2010/06/11 23:52:38 pooka Exp $
+#
+
+TESTSDIR= ${TESTSBASE}/fs/ptyfs
+WARNS= 4
+DBG=-g
+NOGCCERROR=1
+
+TESTS_C= t_ptyfs
+TESTS_C+= t_nullpts
+
+LDADD+= -lrumpfs_ptyfs # fs drivers
+LDADD+= -lrumpkern_tty # tty support
+LDADD+= -lrumpvfs -lrump -lrumpuser -lpthread # base
+
+LDADD.t_nullpts+= -lrumpfs_null -lrumpvfs_layerfs
+
+.include <bsd.test.mk>
Index: src/tests/fs/ptyfs/t_nullpts.c
diff -u /dev/null src/tests/fs/ptyfs/t_nullpts.c:1.1
--- /dev/null Fri Jun 11 23:52:38 2010
+++ src/tests/fs/ptyfs/t_nullpts.c Fri Jun 11 23:52:38 2010
@@ -0,0 +1,124 @@
+/* $NetBSD: t_nullpts.c,v 1.1 2010/06/11 23:52:38 pooka Exp $ */
+
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <sys/ioctl.h>
+
+#include <atf-c.h>
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include <fs/ptyfs/ptyfs.h>
+#include <miscfs/nullfs/null.h>
+
+#include "../../h_macros.h"
+
+static void
+mountptyfs(const char *mp, int flags)
+{
+ struct ptyfs_args args;
+
+ if (rump_sys_mkdir(mp, 0777) == -1) {
+ if (errno != EEXIST)
+ atf_tc_fail_errno("null create %s", mp);
+ }
+ memset(&args, 0, sizeof(args));
+ args.version = PTYFS_ARGSVERSION;
+ args.mode = 0777;
+ if (rump_sys_mount(MOUNT_PTYFS, mp, flags, &args, sizeof(args)) == -1)
+ atf_tc_fail_errno("could not mount ptyfs");
+}
+
+static void
+mountnull(const char *what, const char *mp, int flags)
+{
+ struct null_args nargs;
+
+ if (rump_sys_mkdir(what, 0777) == -1) {
+ if (errno != EEXIST)
+ atf_tc_fail_errno("null create %s", what);
+ }
+ if (rump_sys_mkdir(mp, 0777) == -1) {
+ if (errno != EEXIST)
+ atf_tc_fail_errno("null create %s", mp);
+ }
+ memset(&nargs, 0, sizeof(nargs));
+ nargs.nulla_target = __UNCONST(what);
+ if (rump_sys_mount(MOUNT_NULL, mp, flags, &nargs, sizeof(nargs)) == -1)
+ atf_tc_fail_errno("could not mount nullfs");
+}
+
+ATF_TC(nullrevoke);
+ATF_TC_HEAD(nullrevoke, tc)
+{
+ atf_tc_set_md_var(tc, "descr", "null mount ptyfs and revoke "
+ "(PR kern/43456)");
+}
+
+ATF_TC_BODY(nullrevoke, tc)
+{
+ char path[MAXPATHLEN];
+ struct ptmget ptg;
+ int ptm;
+
+ rump_init();
+
+ /*
+ * mount /dev/pts
+ */
+ mountptyfs("/dev/pts", 0);
+
+ /*
+ * null mount /dev to /null/dev
+ */
+ if (rump_sys_mkdir("/null", 0777) == -1) {
+ if (errno != EEXIST)
+ atf_tc_fail_errno("null create /null");
+ }
+ mountnull("/dev", "/null/dev", 0);
+
+ /*
+ * get slave/master pair.
+ */
+ ptm = rump_sys_open("/dev/ptm", O_RDWR);
+ if (rump_sys_ioctl(ptm, TIOCPTMGET, &ptg) == -1)
+ atf_tc_fail_errno("get pty");
+
+ /*
+ * Build nullfs path to slave.
+ */
+ strcpy(path, "/null/");
+ strcat(path, ptg.sn);
+
+ /*
+ * Open slave tty via nullfs.
+ */
+ if (rump_sys_open(path, O_RDWR) == -1)
+ atf_tc_fail_errno("slave null open");
+
+ /*
+ * Close slave opened with /dev/ptm. Need purely non-null refs to it.
+ */
+ rump_sys_close(ptg.sfd);
+
+ /* revoke slave tty. boom */
+ rump_sys_revoke(path);
+
+ /* done? */
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+ ATF_TP_ADD_TC(tp, nullrevoke);
+
+ return atf_no_error();
+}
Index: src/tests/fs/ptyfs/t_ptyfs.c
diff -u /dev/null src/tests/fs/ptyfs/t_ptyfs.c:1.1
--- /dev/null Fri Jun 11 23:52:38 2010
+++ src/tests/fs/ptyfs/t_ptyfs.c Fri Jun 11 23:52:38 2010
@@ -0,0 +1,62 @@
+/* $NetBSD: t_ptyfs.c,v 1.1 2010/06/11 23:52:38 pooka Exp $ */
+
+#include <sys/types.h>
+#include <sys/mount.h>
+
+#include <atf-c.h>
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include <rump/rump.h>
+#include <rump/rump_syscalls.h>
+
+#include <fs/ptyfs/ptyfs.h>
+
+#include "../../h_macros.h"
+
+static void
+mountptyfs(const char *mp, int flags)
+{
+ struct ptyfs_args args;
+
+ if (rump_sys_mkdir("/mp", 0777) == -1) {
+ if (errno != EEXIST)
+ atf_tc_fail_errno("mp1");
+ }
+ memset(&args, 0, sizeof(args));
+ args.version = PTYFS_ARGSVERSION;
+ args.mode = 0777;
+ if (rump_sys_mount(MOUNT_PTYFS, mp, flags, &args, sizeof(args)) == -1)
+ atf_tc_fail_errno("could not mount ptyfs");
+}
+
+ATF_TC(basic);
+ATF_TC_HEAD(basic, tc)
+{
+ atf_tc_set_md_var(tc, "descr", "mount ptyfs");
+}
+
+ATF_TC_BODY(basic, tc)
+{
+
+ rump_init();
+
+ mountptyfs("/mp", 0);
+ if (rump_sys_unmount("/mp", 0) == -1)
+ atf_tc_fail_errno("unmount failed");
+
+ /* done */
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+
+ ATF_TP_ADD_TC(tp, basic);
+
+ return atf_no_error();
+}
