Module Name: src
Committed By: pooka
Date: Wed Mar 31 19:14:30 UTC 2010
Modified Files:
src/tests/fs: Makefile
Added Files:
src/tests/fs/kernfs: Atffile Makefile t_basic.c
Log Message:
Add some basic tests for kernfs (getdents & changing hostname).
Per a "mad \"scientist\"" experiment, on i386 load kernfs support
from the installed kernel module instead of linking the driver in.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/tests/fs/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/fs/kernfs/Atffile \
src/tests/fs/kernfs/Makefile src/tests/fs/kernfs/t_basic.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/fs/Makefile
diff -u src/tests/fs/Makefile:1.7 src/tests/fs/Makefile:1.8
--- src/tests/fs/Makefile:1.7 Tue Mar 30 01:05:28 2010
+++ src/tests/fs/Makefile Wed Mar 31 19:14:30 2010
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2010/03/30 01:05:28 pooka Exp $
+# $NetBSD: Makefile,v 1.8 2010/03/31 19:14:30 pooka Exp $
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/fs
-SUBDIR+= ffs nullfs puffs tmpfs umapfs union
+SUBDIR+= ffs kernfs nullfs puffs tmpfs umapfs union
FILES= h_funcs.subr
FILESDIR= ${TESTSDIR}
Added files:
Index: src/tests/fs/kernfs/Atffile
diff -u /dev/null src/tests/fs/kernfs/Atffile:1.1
--- /dev/null Wed Mar 31 19:14:30 2010
+++ src/tests/fs/kernfs/Atffile Wed Mar 31 19:14:30 2010
@@ -0,0 +1,6 @@
+Content-Type: application/X-atf-atffile; version="1"
+X-NetBSD-Id: "$NetBSD: Atffile,v 1.1 2010/03/31 19:14:30 pooka Exp $"
+
+prop: test-suite = "NetBSD"
+
+tp-glob: t_*
Index: src/tests/fs/kernfs/Makefile
diff -u /dev/null src/tests/fs/kernfs/Makefile:1.1
--- /dev/null Wed Mar 31 19:14:30 2010
+++ src/tests/fs/kernfs/Makefile Wed Mar 31 19:14:30 2010
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.1 2010/03/31 19:14:30 pooka Exp $
+#
+
+TESTSDIR= ${TESTSBASE}/fs/kernfs
+WARNS= 4
+
+TESTS_C= t_basic
+
+# use kernel module binary on i386
+.if ${MACHINE} == "i386"
+OSRELEASE!= ${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh
+CPPFLAGS+= -DMODDIR=\"/stand/${MACHINE}/${OSRELEASE}/modules/kernfs/\"
+CPPFLAGS+= -DMODBASE=\"kernfs.kmod\"
+.else
+LDADD+= -lrumpfs_kernfs # fs driver
+.endif
+LDADD+= -lrumpvfs -lrump -lrumpuser -lpthread # base
+
+.include <bsd.test.mk>
Index: src/tests/fs/kernfs/t_basic.c
diff -u /dev/null src/tests/fs/kernfs/t_basic.c:1.1
--- /dev/null Wed Mar 31 19:14:30 2010
+++ src/tests/fs/kernfs/t_basic.c Wed Mar 31 19:14:30 2010
@@ -0,0 +1,198 @@
+/* $NetBSD: t_basic.c,v 1.1 2010/03/31 19:14:30 pooka Exp $ */
+
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <sys/module.h>
+#include <sys/dirent.h>
+#include <sys/sysctl.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 <miscfs/kernfs/kernfs.h>
+
+#define USE_ATF
+#include "../../h_macros.h"
+
+#ifdef USE_ATF
+ATF_TC(getdents);
+ATF_TC_HEAD(getdents, tc)
+{
+
+ atf_tc_set_md_var(tc, "descr", "kernfs directory contains files");
+}
+#else
+#define atf_tc_fail(...) errx(1, __VA_ARGS__)
+#endif
+
+#ifdef MODDIR
+/*
+ * Try to load kernfs module (only on archs where ABIs match).
+ * This is slightly ... inconvenient currently. Let's try to improve
+ * it in the future.
+ *
+ * steps:
+ * 1) copy it into our working directory
+ * 2) rename symbols
+ * 3) lock & load
+ */
+static int
+loadmodule(void)
+{
+ modctl_load_t ml;
+ int error;
+
+ if (system("cp " MODDIR MODBASE " .") == -1) {
+ warn("failed to copy %s into pwd", MODDIR MODBASE);
+ return errno;
+ }
+ if (chmod(MODBASE, 0666) == -1) {
+ warn("chmod %s", MODBASE);
+ return errno;
+ }
+ if (system("make -f /usr/src/sys/rump/Makefile.rump RUMP_SYMREN="
+ MODBASE) == -1) {
+ warn("objcopy failed");
+ return errno;
+ }
+
+ if ((error = rump_pub_etfs_register(MODBASE, MODBASE, RUMP_ETFS_REG))) {
+ warn("rump etfs");
+ return error;
+ }
+
+ memset(&ml, 0, sizeof(ml));
+ ml.ml_filename = MODBASE;
+ if (rump_sys_modctl(MODCTL_LOAD, &ml) == -1) {
+ warn("module load");
+ return errno;
+ }
+
+ return 0;
+}
+#endif
+
+static void
+mountkernfs(void)
+{
+
+ rump_init();
+
+#ifdef MODDIR
+ if (loadmodule() != 0) {
+ /* failed? fallback to dlopen() .... some day */
+ atf_tc_fail("could not load kernfs");
+ }
+#endif
+
+ if (rump_sys_mkdir("/kern", 0777) == -1)
+ atf_tc_fail_errno("mkdir /kern");
+ if (rump_sys_mount(MOUNT_KERNFS, "/kern", 0, NULL, 0) == -1)
+ atf_tc_fail_errno("could not mount kernfs");
+}
+
+#ifdef USE_ATF
+ATF_TC_BODY(getdents, tc)
+#else
+int main(int argc, char *argv[])
+#endif
+{
+ struct dirent *dent;
+ char buf[8192];
+ int dfd;
+
+ mountkernfs();
+
+ if ((dfd = rump_sys_open("/kern", O_RDONLY)) == -1)
+ atf_tc_fail_errno("can't open directory");
+ if (rump_sys_getdents(dfd, buf, sizeof(buf)) == -1)
+ atf_tc_fail_errno("getdents");
+
+ /*
+ * Check that we get the first three values (., .., boottime).
+ * Make more complete by autogenerating list from kernfs_vnops.c?
+ */
+ dent = (void *)buf;
+ ATF_REQUIRE_STREQ(dent->d_name, ".");
+ dent = _DIRENT_NEXT(dent);
+ ATF_REQUIRE_STREQ(dent->d_name, "..");
+ dent = _DIRENT_NEXT(dent);
+ ATF_REQUIRE_STREQ(dent->d_name, "boottime");
+
+ /* done */
+}
+
+#ifdef USE_ATF
+ATF_TC(hostname);
+ATF_TC_HEAD(hostname, tc)
+{
+
+ atf_tc_set_md_var(tc, "descr", "/kern/hostname changes hostname");
+}
+
+static char *
+getthehost(void)
+{
+ static char buf[8192];
+ int mib[2];
+ size_t blen;
+
+ mib[0] = CTL_KERN;
+ mib[1] = KERN_HOSTNAME;
+ blen = sizeof(buf);
+ if (rump_sys___sysctl(mib, 2, buf, &blen, NULL, 0) == -1)
+ atf_tc_fail_errno("sysctl gethostname");
+
+ return buf;
+}
+
+#define NEWHOSTNAME "turboton roos-berg"
+ATF_TC_BODY(hostname, tc)
+{
+ char buf[8192];
+ char *shost, *p;
+ int fd;
+
+ mountkernfs();
+ if ((fd = rump_sys_open("/kern/hostname", O_RDWR)) == -1)
+ atf_tc_fail_errno("open hostname");
+
+ /* check initial match */
+ shost = getthehost();
+ buf[0] = '\0';
+ if (rump_sys_read(fd, buf, sizeof(buf)) == -1)
+ atf_tc_fail_errno("read hostname");
+ p = strchr(buf, '\n');
+ if (p)
+ *p = '\0';
+ ATF_REQUIRE_STREQ_MSG(buf, shost, "initial hostname mismatch");
+
+ /* check changing hostname works */
+ if (rump_sys_pwrite(fd, NEWHOSTNAME, strlen(NEWHOSTNAME), 0)
+ != strlen(NEWHOSTNAME)) {
+ atf_tc_fail_errno("write new hostname");
+ }
+
+ shost = getthehost();
+ ATF_REQUIRE_STREQ_MSG(NEWHOSTNAME, shost, "modified hostname mismatch");
+
+ /* done */
+}
+
+ATF_TP_ADD_TCS(tp)
+{
+ ATF_TP_ADD_TC(tp, hostname);
+ ATF_TP_ADD_TC(tp, getdents);
+
+ return atf_no_error();
+}
+#endif
