Module Name: src
Committed By: jruoho
Date: Fri Apr 13 07:05:32 UTC 2012
Modified Files:
src/distrib/sets/lists/tests: module.mi
src/tests/modules: Makefile t_modload.sh
Added Files:
src/tests/modules/k_helper3: Makefile k_helper3.c
Log Message:
Add a helper program that loads a module and returns the errno from modctl(8).
XXX: As noted on tech-kern@, the syscall should be modified to fail
consistently with a given predefined errno on non-MODULAR kernels.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/tests/module.mi
cvs rdiff -u -r1.9 -r1.10 src/tests/modules/Makefile
cvs rdiff -u -r1.10 -r1.11 src/tests/modules/t_modload.sh
cvs rdiff -u -r0 -r1.1 src/tests/modules/k_helper3/Makefile \
src/tests/modules/k_helper3/k_helper3.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/tests/module.mi
diff -u src/distrib/sets/lists/tests/module.mi:1.6 src/distrib/sets/lists/tests/module.mi:1.7
--- src/distrib/sets/lists/tests/module.mi:1.6 Fri Feb 17 22:36:50 2012
+++ src/distrib/sets/lists/tests/module.mi Fri Apr 13 07:05:32 2012
@@ -1,4 +1,4 @@
-# $NetBSD: module.mi,v 1.6 2012/02/17 22:36:50 jmmv Exp $
+# $NetBSD: module.mi,v 1.7 2012/04/13 07:05:32 jruoho Exp $
#
# These are only made for ports doing modules.
#
@@ -7,6 +7,8 @@
./usr/tests/modules/k_helper/k_helper.kmod tests-sys-tests atf
./usr/tests/modules/k_helper2 tests-sys-tests atf
./usr/tests/modules/k_helper2/k_helper2.kmod tests-sys-tests atf
+./usr/tests/modules/k_helper3 tests-sys-tests atf
+./usr/tests/modules/k_helper3/k_helper3 tests-sys-tests atf
./usr/tests/modules/k_uvm tests-sys-tests atf
./usr/tests/modules/k_uvm/k_uvm.kmod tests-sys-tests atf
./usr/tests/modules/t_abi_uvm tests-sys-tests atf
Index: src/tests/modules/Makefile
diff -u src/tests/modules/Makefile:1.9 src/tests/modules/Makefile:1.10
--- src/tests/modules/Makefile:1.9 Fri Feb 17 22:36:50 2012
+++ src/tests/modules/Makefile Fri Apr 13 07:05:32 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2012/02/17 22:36:50 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2012/04/13 07:05:32 jruoho Exp $
.include <bsd.own.mk>
@@ -19,6 +19,7 @@ TESTS_SH+= t_modload
SUBDIR= k_helper
SUBDIR+= k_helper2
+SUBDIR+= k_helper3
SUBDIR+= k_uvm
.include <bsd.test.mk>
Index: src/tests/modules/t_modload.sh
diff -u src/tests/modules/t_modload.sh:1.10 src/tests/modules/t_modload.sh:1.11
--- src/tests/modules/t_modload.sh:1.10 Tue Mar 20 05:50:11 2012
+++ src/tests/modules/t_modload.sh Fri Apr 13 07:05:32 2012
@@ -1,4 +1,4 @@
-# $NetBSD: t_modload.sh,v 1.10 2012/03/20 05:50:11 jruoho Exp $
+# $NetBSD: t_modload.sh,v 1.11 2012/04/13 07:05:32 jruoho Exp $
#
# Copyright (c) 2008 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -37,11 +37,12 @@ plain_head() {
}
plain_body() {
- # XXX: There should be a reliable way to detect MODULAR.
+ # XXX: Adjust when modctl(8) fails consistently.
#
- sysctl machdep.xen > /dev/null 2>&1
+ $(atf_get_srcdir)/k_helper3/k_helper3 \
+ "%s/k_helper/k_helper.kmod" $(atf_get_srcdir)
- if [ $? -eq 0 ]; then
+ if [ $? -eq 78 ]; then
atf_skip "host does not support modules"
fi
@@ -109,11 +110,12 @@ iflag_head() {
}
iflag_body() {
- # XXX: There should be a reliable way to detect MODULAR.
+ # XXX: Adjust when modctl(8) fails consistently.
#
- sysctl machdep.xen > /dev/null 2>&1
+ $(atf_get_srcdir)/k_helper3/k_helper3 \
+ "%s/k_helper/k_helper.kmod" $(atf_get_srcdir)
- if [ $? -eq 0 ]; then
+ if [ $? -eq 78 ]; then
atf_skip "host does not support modules"
fi
@@ -162,11 +164,12 @@ sflag_head() {
}
sflag_body() {
- # XXX: There should be a reliable way to detect MODULAR.
+ # XXX: Adjust when modctl(8) fails consistently.
#
- sysctl machdep.xen > /dev/null 2>&1
+ $(atf_get_srcdir)/k_helper3/k_helper3 \
+ "%s/k_helper/k_helper.kmod" $(atf_get_srcdir)
- if [ $? -eq 0 ]; then
+ if [ $? -eq 78 ]; then
atf_skip "host does not support modules"
fi
Added files:
Index: src/tests/modules/k_helper3/Makefile
diff -u /dev/null src/tests/modules/k_helper3/Makefile:1.1
--- /dev/null Fri Apr 13 07:05:33 2012
+++ src/tests/modules/k_helper3/Makefile Fri Apr 13 07:05:32 2012
@@ -0,0 +1,13 @@
+# $NetBSD: Makefile,v 1.1 2012/04/13 07:05:32 jruoho Exp $
+
+.include <bsd.own.mk>
+
+PROG= k_helper3
+SRCS= k_helper3.c
+
+LDADD+= -lprop
+
+MAN= # defined
+ATFFILE= no
+
+.include <bsd.prog.mk>
Index: src/tests/modules/k_helper3/k_helper3.c
diff -u /dev/null src/tests/modules/k_helper3/k_helper3.c:1.1
--- /dev/null Fri Apr 13 07:05:33 2012
+++ src/tests/modules/k_helper3/k_helper3.c Fri Apr 13 07:05:32 2012
@@ -0,0 +1,93 @@
+/* $NetBSD: k_helper3.c,v 1.1 2012/04/13 07:05:32 jruoho Exp $ */
+
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jukka Ruohonen.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: k_helper3.c,v 1.1 2012/04/13 07:05:32 jruoho Exp $");
+
+#include <sys/module.h>
+
+#include <assert.h>
+#include <errno.h>
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <prop/proplib.h>
+
+static int load(const char *, ...);
+
+/*
+ * A program that loads a module and returns the errno(2) from modctl(8).
+ */
+int
+main(int argc, char *argv[])
+{
+ assert(argc == 3);
+
+ return load(argv[1], argv[2]);
+}
+
+static __printflike(1, 2) int
+load(const char *fmt, ...)
+{
+ char filename[MAXPATHLEN], *propsstr;
+ prop_dictionary_t props;
+ modctl_load_t ml;
+ int serrno, rv;
+ va_list ap;
+
+ props = prop_dictionary_create();
+ propsstr = prop_dictionary_externalize(props);
+ assert(propsstr != NULL);
+ prop_object_release(props);
+
+ va_start(ap, fmt);
+ (void)vsnprintf(filename, sizeof(filename), fmt, ap);
+ va_end(ap);
+
+ ml.ml_filename = filename;
+ ml.ml_flags = 0;
+ ml.ml_props = propsstr;
+ ml.ml_propslen = strlen(propsstr);
+
+ printf("Loading module %s\n", filename);
+ errno = serrno = 0;
+
+ rv = modctl(MODCTL_LOAD, &ml);
+ serrno = errno;
+
+ if (rv != -1)
+ (void)modctl(MODCTL_UNLOAD, filename);
+
+ free(propsstr);
+
+ return serrno;
+}
