Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Undo infamous "mad \"scientist\"" experiment. There is no need

Browse Source 
for complicated application frobbing to get a kernel module loaded
into rump -- it will be loaded from the host automatically now.
This commit is contained in:
pooka 2010-04-26 23:47:25 +00:00
parent 717accdd51
commit c4e2577190
2 changed files with 5 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tests/fs/kernfs/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1 2010/03/31 19:14:30 pooka Exp $ # $NetBSD: Makefile,v 1.2 2010/04/26 23:47:25 pooka Exp $
# #
TESTSDIR= ${TESTSBASE}/fs/kernfs TESTSDIR= ${TESTSBASE}/fs/kernfs
@ -6,12 +6,9 @@ WARNS= 4
TESTS_C= t_basic TESTS_C= t_basic
# use kernel module binary on i386 .include <bsd.own.mk>
.if ${MACHINE} == "i386"
OSRELEASE!= ${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh .ifndef RUMPKMOD
CPPFLAGS+= -DMODDIR=\"/stand/${MACHINE}/${OSRELEASE}/modules/kernfs/\"
CPPFLAGS+= -DMODBASE=\"kernfs.kmod\"
.else
LDADD+= -lrumpfs_kernfs # fs driver LDADD+= -lrumpfs_kernfs # fs driver
.endif .endif
LDADD+= -lrumpvfs -lrump -lrumpuser -lpthread # base LDADD+= -lrumpvfs -lrump -lrumpuser -lpthread # base

56
tests/fs/kernfs/t_basic.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: t_basic.c,v 1.1 2010/03/31 19:14:30 pooka Exp $ */ /* $NetBSD: t_basic.c,v 1.2 2010/04/26 23:47:25 pooka Exp $ */
#include <sys/types.h> #include <sys/types.h>
#include <sys/mount.h> #include <sys/mount.h>
@ -34,66 +34,12 @@ ATF_TC_HEAD(getdents, tc)
#define atf_tc_fail(...) errx(1, __VA_ARGS__) #define atf_tc_fail(...) errx(1, __VA_ARGS__)
#endif #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 static void
mountkernfs(void) mountkernfs(void)
{ {
rump_init(); 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) if (rump_sys_mkdir("/kern", 0777) == -1)
atf_tc_fail_errno("mkdir /kern"); atf_tc_fail_errno("mkdir /kern");
if (rump_sys_mount(MOUNT_KERNFS, "/kern", 0, NULL, 0) == -1) if (rump_sys_mount(MOUNT_KERNFS, "/kern", 0, NULL, 0) == -1)