Menu
▾
▴
[Ltp-commits] [Git] ltp updated.
|
From: Cyril H. <su...@li...> - 2013-10-02 10:51:18
|
The branch, master, has been updated
via 858757dd873d4292406749e8affa46aa704888b6 (commit)
via 427cbb3a8e620a5ce631fd6e15e5c98ddf5e0c69 (commit)
via 4970a2f345c5954882f72d4aaba2172ce7c3f39c (commit)
via e0470392a7dba49eed2f66cda97c12d3cd703a15 (commit)
from 971bcd7e51e4e6f94a58374f9b3cd22e53e7e53e (commit)
- Log -----------------------------------------------------------------
commit 858757dd873d4292406749e8affa46aa704888b6
Author: Cyril Hrubis <ch...@su...>
Date: Wed Oct 2 12:36:28 2013 +0200
kernel/firmware: Make use of modules.mk
Signed-off-by: Cyril Hrubis <ch...@su...>
commit 427cbb3a8e620a5ce631fd6e15e5c98ddf5e0c69
Author: Alexey Kodanev <ale...@or...>
Date: Wed Sep 11 14:55:27 2013 +0400
device-drivers: block: enable build and run
Signed-off-by: Alexey Kodanev <ale...@or...>
Reviewed-by: Cyril Hrubis <ch...@su...>
commit 4970a2f345c5954882f72d4aaba2172ce7c3f39c
Author: Alexey Kodanev <ale...@or...>
Date: Wed Oct 2 13:23:50 2013 +0400
device-drivers: block: fixes
Fixed test-cases behavior: major number greater than 255 is valid,
empty device name is valid.
Added test-cases results and sysfs files.
Added user-space program which checks each test-case result.
Added command line parameter 'a': run all test-cases.
Signed-off-by: Alexey Kodanev <ale...@or...>
Reviewed-by: Cyril Hrubis <ch...@su...>
commit e0470392a7dba49eed2f66cda97c12d3cd703a15
Author: Alexey Kodanev <ale...@or...>
Date: Wed Sep 11 14:31:47 2013 +0400
device-drivers: block: rename test files and remove run.sh
Signed-off-by: Alexey Kodanev <ale...@or...>
Reviewed-by: Cyril Hrubis <ch...@su...>
-----------------------------------------------------------------------
Summary of changes:
runtest/kernel_misc | 1 +
testcases/kernel/device-drivers/Makefile | 3 +-
testcases/kernel/device-drivers/block/Makefile | 20 +
testcases/kernel/device-drivers/block/README | 23 +
.../block/block_dev_kernel/.gitignore | 7 +
.../device-drivers/block/block_dev_kernel/Makefile | 33 ++
.../block/block_dev_kernel/ltp_block_dev.c | 428 ++++++++++++++++++++
.../test_genhd.c | 0
.../device-drivers/block/block_dev_user/.gitignore | 1 +
.../device-drivers/block/block_dev_user/Makefile | 20 +
.../block/block_dev_user/block_dev.c | 110 +++++
.../device-drivers/block/kernel_space/Makefile | 24 --
.../device-drivers/block/kernel_space/README | 27 --
.../device-drivers/block/kernel_space/run.sh | 47 ---
.../device-drivers/block/kernel_space/test_block.c | 310 --------------
testcases/kernel/firmware/Makefile | 24 --
testcases/kernel/firmware/fw_load_kernel/Makefile | 13 +-
17 files changed, 648 insertions(+), 443 deletions(-)
create mode 100644 testcases/kernel/device-drivers/block/Makefile
create mode 100644 testcases/kernel/device-drivers/block/README
create mode 100644 testcases/kernel/device-drivers/block/block_dev_kernel/.gitignore
create mode 100644 testcases/kernel/device-drivers/block/block_dev_kernel/Makefile
create mode 100644 testcases/kernel/device-drivers/block/block_dev_kernel/ltp_block_dev.c
rename testcases/kernel/device-drivers/block/{kernel_space => block_dev_kernel}/test_genhd.c (100%)
create mode 100644 testcases/kernel/device-drivers/block/block_dev_user/.gitignore
create mode 100644 testcases/kernel/device-drivers/block/block_dev_user/Makefile
create mode 100644 testcases/kernel/device-drivers/block/block_dev_user/block_dev.c
delete mode 100644 testcases/kernel/device-drivers/block/kernel_space/Makefile
delete mode 100644 testcases/kernel/device-drivers/block/kernel_space/README
delete mode 100755 testcases/kernel/device-drivers/block/kernel_space/run.sh
delete mode 100644 testcases/kernel/device-drivers/block/kernel_space/test_block.c
diff --git a/runtest/kernel_misc b/runtest/kernel_misc
index 29071b3..654e217 100644
--- a/runtest/kernel_misc
+++ b/runtest/kernel_misc
@@ -1,3 +1,4 @@
kmsg01 kmsg01
fw_load fw_load
rtc01 rtc01
+block_dev block_dev
diff --git a/testcases/kernel/device-drivers/Makefile b/testcases/kernel/device-drivers/Makefile
index 62005c2..73755db 100644
--- a/testcases/kernel/device-drivers/Makefile
+++ b/testcases/kernel/device-drivers/Makefile
@@ -18,6 +18,7 @@ top_srcdir ?= ../../..
include $(top_srcdir)/include/mk/env_pre.mk
-SUBDIRS := rtc \
+SUBDIRS := block \
+ rtc \
include $(top_srcdir)/include/mk/generic_trunk_target.mk
diff --git a/testcases/kernel/device-drivers/block/Makefile b/testcases/kernel/device-drivers/block/Makefile
new file mode 100644
index 0000000..b3bb5aa
--- /dev/null
+++ b/testcases/kernel/device-drivers/block/Makefile
@@ -0,0 +1,20 @@
+# Copyright (c) 2013 Oracle and/or its affiliates. All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it would be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+top_srcdir ?= ../../../..
+
+include $(top_srcdir)/include/mk/env_pre.mk
+include $(top_srcdir)/include/mk/generic_trunk_target.mk
diff --git a/testcases/kernel/device-drivers/block/README b/testcases/kernel/device-drivers/block/README
new file mode 100644
index 0000000..812436b
--- /dev/null
+++ b/testcases/kernel/device-drivers/block/README
@@ -0,0 +1,23 @@
+
+Module under test: linux/block/genhd.c
+
+ Function | Declared in | Tested in
+ -----------------------------+---------------+---------------
+ register_blkdev() | linux/fs.h | ltp_block_dev.c
+ unregister_blkdev() | linux/fs.h | ltp_block_dev.c
+ blk_register_region() | linux/genhd.h |
+ blk_unregister_region() | linux/genhd.h |
+ add_disk() | linux/genhd.h |
+ del_gendisk() | linux/genhd.h | test_genhd.c
+ blk_lookup_devt() | linux/genhd.h |
+ alloc_disk() | linux/genhd.h | test_genhd.c
+ alloc_disk_node() | linux/genhd.h |
+ get_disk() | linux/genhd.h |
+ put_disk() | linux/genhd.h |
+ set_device_ro() | linux/genhd.h |
+ set_disk_ro() | linux/genhd.h |
+ bdev_read_only() | linux/fs.h |
+ invalidate_partition() | linux/fs.h |
+
+For possible test results please see "A POSIX conforming test framework" at
+http://www.gnu.org/software/dejagnu/manual/x47.html#posix
diff --git a/testcases/kernel/device-drivers/block/block_dev_kernel/.gitignore b/testcases/kernel/device-drivers/block/block_dev_kernel/.gitignore
new file mode 100644
index 0000000..3beebe1
--- /dev/null
+++ b/testcases/kernel/device-drivers/block/block_dev_kernel/.gitignore
@@ -0,0 +1,7 @@
+/ltp_block_dev.ko
+/*.mod.c
+/modules.order
+/.tmp_versions
+/.*.ko
+/.*.cmd
+/Module.symvers
diff --git a/testcases/kernel/device-drivers/block/block_dev_kernel/Makefile b/testcases/kernel/device-drivers/block/block_dev_kernel/Makefile
new file mode 100644
index 0000000..1013305
--- /dev/null
+++ b/testcases/kernel/device-drivers/block/block_dev_kernel/Makefile
@@ -0,0 +1,33 @@
+# Copyright (c) 2013 Oracle and/or its affiliates. All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it would be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+ifneq ($(KERNELRELEASE),)
+
+obj-m := ltp_block_dev.o
+
+else
+
+top_srcdir ?= ../../../../..
+include $(top_srcdir)/include/mk/env_pre.mk
+
+REQ_VERSION_MAJOR := 2
+REQ_VERSION_PATCH := 6
+MAKE_TARGETS := ltp_block_dev.ko
+
+include $(top_srcdir)/include/mk/module.mk
+include $(top_srcdir)/include/mk/generic_leaf_target.mk
+
+endif
diff --git a/testcases/kernel/device-drivers/block/block_dev_kernel/ltp_block_dev.c b/testcases/kernel/device-drivers/block/block_dev_kernel/ltp_block_dev.c
new file mode 100644
index 0000000..d573085
--- /dev/null
+++ b/testcases/kernel/device-drivers/block/block_dev_kernel/ltp_block_dev.c
@@ -0,0 +1,428 @@
+/*
+ * Copyright (c) 2013 Oracle and/or its affiliates. All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it would be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * Only those functions are tested here which are declared in <linux/fs.h>
+ *
+ * Changes:
+ * 16 Jan 2009 0.2 Added "tc" parameter to run test cases separately
+ * 11 Jan 2009 0.1 First release
+ */
+
+#include <linux/module.h>
+#include <linux/device.h>
+#include <linux/fs.h>
+
+MODULE_AUTHOR("Márton Németh <nm...@fr...>");
+MODULE_AUTHOR("Copyright (c) 2013 Oracle and/or its affiliates");
+MODULE_DESCRIPTION("Test block drivers");
+MODULE_LICENSE("GPL");
+
+#define BLK_DEV_NAME "ltp_block_dev"
+#define MAX_MAJOR 255
+
+#define prk_err(fmt, ...) \
+ pr_err(BLK_DEV_NAME ": " fmt, ##__VA_ARGS__)
+#define prk_info(fmt, ...) \
+ pr_info(BLK_DEV_NAME ": " fmt, ##__VA_ARGS__)
+#define prk_debug(fmt, ...) \
+ pr_debug(BLK_DEV_NAME ": " fmt, ##__VA_ARGS__)
+
+/*
+ * Analysis of "int register_blkdev(unsigned int major, const char *name)"
+ *
+ * Equivalence classes:
+ *
+ * Parameter | Values | Valid? | Covered in
+ * -----------+--------------------------+---------+-------------
+ * major | [0] | valid | tc01, tc02
+ * |--------------------------+---------+-------------
+ * | [1..255] | valid | tc03
+ * |--------------------------+---------+-------------
+ * | [256..UINT_MAX] | valid | tc04, tc05
+ * -----------+--------------------------+---------+-------------
+ * name | [valid pointer to a zero | |
+ * | terminated string] | valid | tc01, tc02
+ * |--------------------------+---------+-------------
+ * | [valid pointer to a zero | |
+ * | length zero terminated | valid | tc06
+ * | string] | |
+ * |--------------------------+---------+-------------
+ * | [NULL] | invalid | tc08, tc09
+ * -----------+--------------------------+---------+-------------
+ *
+ */
+
+#define result_str(pass) ((pass == 0) ? ("FAIL") : ("PASS"))
+
+/*
+ * bit mask for each test-case,
+ * if test is passed, bit will be set to 1
+ */
+static int test_result;
+
+static void device_release(struct device *dev)
+{
+ prk_info("device released\n");
+}
+
+static struct device tdev = {
+ .init_name = BLK_DEV_NAME,
+ .release = device_release,
+};
+
+static int tc01(void)
+{
+ int major1, major2;
+ int pass = 1;
+
+ prk_info("Test Case 1: register_blkdev() with auto allocating "
+ "major numbers (major=0)\n");
+
+ major1 = register_blkdev(0, BLK_DEV_NAME);
+ prk_debug("major1 = %i\n", major1);
+
+ major2 = register_blkdev(0, BLK_DEV_NAME);
+ prk_debug("major2 = %i\n", major2);
+
+ if (major1 >= 0) {
+ unregister_blkdev(major1, BLK_DEV_NAME);
+ } else {
+ pass = 0;
+ prk_debug("1st call to register_blkdev() failed, error %i\n",
+ major1);
+ }
+
+ if (major2 >= 0) {
+ unregister_blkdev(major2, BLK_DEV_NAME);
+ } else {
+ pass = 0;
+ prk_debug("2nd call to register_blkdev() failed, error %i\n",
+ major2);
+ }
+
+ prk_info("Test Case Result: %s\n", result_str(pass));
+ return pass;
+}
+
+static int tc02(void)
+{
+ int major[MAX_MAJOR + 1];
+ int i, pass = 2;
+
+ /* Try to allocate block devices until all major numbers are used.
+ * After this register_blkdev() should return -EBUSY
+ */
+
+ prk_info("Test Case 2: stress test of register_blkdev() "
+ "with auto allocating major numbers (major=0)\n");
+
+ memset(major, 0, sizeof(major));
+
+ for (i = 0; i < sizeof(major) / sizeof(*major); ++i) {
+ major[i] = register_blkdev(0, BLK_DEV_NAME);
+ prk_debug("major[%i] = %i\n", i, major[i]);
+
+ if (major[i] == -EBUSY) {
+ prk_info("device is busy, register_blkdev() ret %i\n",
+ major[i]);
+ } else if (major[i] < 0) {
+ prk_debug("register_blkdev() failed with error %i\n",
+ major[i]);
+ pass = 0;
+ }
+ }
+
+ for (i = 0; i < sizeof(major) / sizeof(*major); ++i) {
+ if (major[i] >= 0)
+ unregister_blkdev(major[i], BLK_DEV_NAME);
+ }
+
+ prk_info("Test Case Result: %s\n", result_str(pass));
+ return pass;
+}
+
+static int tc03(void)
+{
+ int major, major2, major3;
+ int pass = 4;
+
+ prk_info("Test Case 3: register_blkdev() with major != 0\n");
+
+ /* autosearch for a free major number */
+ major = register_blkdev(0, BLK_DEV_NAME);
+ prk_debug("major = %i\n", major);
+
+ if (major > 0) {
+ unregister_blkdev(major, BLK_DEV_NAME);
+
+ /* expected to return 0 */
+ major2 = register_blkdev(major, BLK_DEV_NAME);
+
+ /* this call has to fail with EBUSY return value */
+ major3 = register_blkdev(major, BLK_DEV_NAME);
+
+ if (major2 == 0) {
+ unregister_blkdev(major, BLK_DEV_NAME);
+ } else {
+ pass = 0;
+ prk_debug("1st call to register_blkdev() with major=%i "
+ "failed with error %i\n", major, major2);
+ }
+
+ if (major3 == 0) {
+ unregister_blkdev(major, BLK_DEV_NAME);
+ pass = 0;
+ } else {
+ if (major3 != -EBUSY)
+ pass = 0;
+ prk_debug("2nd call to register_blkdev() with major=%i "
+ "failed with error %i\n", major, major3);
+ }
+
+ } else {
+ pass = 0;
+ prk_debug("register_blkdev() failed with error %i\n", major);
+ }
+
+ prk_info("Test Case Result: %s\n", result_str(pass));
+ return pass;
+}
+
+static int tc04(void)
+{
+ int major, pass = 8;
+
+ prk_info("Test Case 4: register_blkdev() with major=256\n");
+
+ major = register_blkdev(256, BLK_DEV_NAME);
+ prk_debug("major = %i\n", major);
+
+ if (major == 0) {
+ unregister_blkdev(256, BLK_DEV_NAME);
+ } else {
+ pass = 0;
+ prk_debug("register_blkdev() failed with error %i\n", major);
+ }
+
+ prk_info("Test Case Result: %s\n", result_str(pass));
+ return pass;
+}
+
+static int tc05(void)
+{
+ int major, pass = 16;
+
+ prk_info("Test Case 5: register_blkdev() with major=%u\n", UINT_MAX);
+
+ major = register_blkdev(UINT_MAX, BLK_DEV_NAME);
+ prk_debug("major = %i\n", major);
+
+ if (major == 0) {
+ unregister_blkdev(UINT_MAX, BLK_DEV_NAME);
+ } else {
+ prk_debug("reg blkdev with major %d failed with error %i\n",
+ UINT_MAX, major);
+ pass = 0;
+ }
+
+ prk_info("Test Case Result: %s\n", result_str(pass));
+ return pass;
+}
+
+static int tc06(void)
+{
+ int major, pass = 32;
+
+ prk_info("Test Case 6: register_blkdev() with name=\"\"\n");
+
+ major = register_blkdev(0, "");
+ prk_debug("major = %i\n", major);
+
+ if (major >= 0) {
+ unregister_blkdev(major, "");
+ } else {
+ pass = 0;
+ prk_debug("register_blkdev() failed with error %i\n", major);
+ }
+
+ prk_info("Test Case Result: %s\n", result_str(pass));
+ return pass;
+}
+
+static int tc07(void)
+{
+ int major, pass = 64;
+
+ prk_info("Test Case 7: unregister_blkdev() with major=0\n");
+
+ major = register_blkdev(0, BLK_DEV_NAME);
+ prk_debug("major = %i\n", major);
+
+ if (major >= 0) {
+ prk_debug("calling unregister_blkdev() with major=0\n");
+ unregister_blkdev(0, BLK_DEV_NAME);
+ prk_debug("calling unregister_blkdev() with major=%i\n", major);
+ unregister_blkdev(major, BLK_DEV_NAME);
+ } else {
+ pass = 0;
+ prk_debug("register_blkdev() failed with error %i\n", major);
+ }
+
+ prk_info("Test Case Result: %s\n", result_str(pass));
+ return pass;
+}
+
+static int tc08(void)
+{
+ int major, pass = 128;
+
+ prk_info("Test Case 8: register_blkdev() with name=NULL\n");
+
+ /* should fail with -EINVAL */
+ major = register_blkdev(0, NULL);
+ prk_debug("major = %i\n", major);
+
+ if (major >= 0) {
+ unregister_blkdev(major, NULL);
+ pass = 0;
+ } else {
+ prk_debug("register_blkdev() failed with error %i\n", major);
+ }
+
+ prk_info("Test Case Result: %s\n", result_str(pass));
+ return pass;
+}
+
+static int tc09(void)
+{
+ int major, pass = 256;
+
+ prk_info("Test Case 9: unregister_blkdev() with name=NULL\n");
+
+ major = register_blkdev(0, BLK_DEV_NAME);
+ prk_debug("major = %i\n", major);
+
+ if (major >= 0) {
+ /* kernel should silently ignore this */
+ unregister_blkdev(major, NULL);
+ unregister_blkdev(major, BLK_DEV_NAME);
+ } else {
+ pass = 0;
+ prk_debug("register_blkdev() failed with error %i\n", major);
+ }
+
+ prk_info("Test Case Result: %s\n", result_str(pass));
+ return pass;
+}
+
+/* print test result to sysfs file */
+static ssize_t sys_result(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ return scnprintf(buf, PAGE_SIZE, "%d\n", test_result);
+}
+static DEVICE_ATTR(result, S_IRUSR, sys_result, NULL);
+
+/*
+ * get test-case number and run it
+ */
+static ssize_t sys_tcase(struct device *dev,
+ struct device_attribute *attr, const char *buf, size_t count)
+{
+ int tc = 0;
+ sscanf(buf, "%d", &tc);
+ if (tc < 0 || tc > 9) {
+ prk_err(": Unexpected test-case number '%d'", tc);
+ return count;
+ }
+
+ test_result = 0;
+
+ if (tc == 0 || tc == 1)
+ test_result |= tc01();
+
+ if (tc == 0 || tc == 2)
+ test_result |= tc02();
+
+ if (tc == 0 || tc == 3)
+ test_result |= tc03();
+
+ if (tc == 0 || tc == 4)
+ test_result |= tc04();
+
+ if (tc == 0 || tc == 5)
+ test_result |= tc05();
+
+ if (tc == 0 || tc == 6)
+ test_result |= tc06();
+
+ if (tc == 0 || tc == 7)
+ test_result |= tc07();
+
+ if (tc == 0 || tc == 8)
+ test_result |= tc08();
+
+ if (tc == 0 || tc == 9)
+ test_result |= tc09();
+
+ return count;
+}
+static DEVICE_ATTR(tcase, S_IWUSR, NULL, sys_tcase);
+
+static int test_init_module(void)
+{
+ int err = 0;
+ prk_info("Starting module\n");
+
+ err = device_register(&tdev);
+ if (err) {
+ prk_err("Unable to register device\n");
+ goto err0;
+ }
+ prk_info("device registered\n");
+
+ err = device_create_file(&tdev, &dev_attr_result);
+ if (err) {
+ prk_err("Can't create sysfs file 'result'\n");
+ goto err1;
+ }
+
+ err = device_create_file(&tdev, &dev_attr_tcase);
+ if (err) {
+ prk_err(": Can't create sysfs file 'tc'\n");
+ goto err2;
+ }
+
+ return 0;
+
+err2:
+ device_remove_file(&tdev, &dev_attr_result);
+err1:
+ device_unregister(&tdev);
+err0:
+ return err;
+}
+module_init(test_init_module);
+
+static void test_exit_module(void)
+{
+ prk_debug("Unloading module\n");
+ device_remove_file(&tdev, &dev_attr_result);
+ device_remove_file(&tdev, &dev_attr_tcase);
+ device_unregister(&tdev);
+}
+module_exit(test_exit_module);
diff --git a/testcases/kernel/device-drivers/block/kernel_space/test_genhd.c b/testcases/kernel/device-drivers/block/block_dev_kernel/test_genhd.c
similarity index 100%
rename from testcases/kernel/device-drivers/block/kernel_space/test_genhd.c
rename to testcases/kernel/device-drivers/block/block_dev_kernel/test_genhd.c
diff --git a/testcases/kernel/device-drivers/block/block_dev_user/.gitignore b/testcases/kernel/device-drivers/block/block_dev_user/.gitignore
new file mode 100644
index 0000000..4034ce5
--- /dev/null
+++ b/testcases/kernel/device-drivers/block/block_dev_user/.gitignore
@@ -0,0 +1 @@
+/block_dev
diff --git a/testcases/kernel/device-drivers/block/block_dev_user/Makefile b/testcases/kernel/device-drivers/block/block_dev_user/Makefile
new file mode 100644
index 0000000..6ba3465
--- /dev/null
+++ b/testcases/kernel/device-drivers/block/block_dev_user/Makefile
@@ -0,0 +1,20 @@
+# Copyright (c) 2013 Oracle and/or its affiliates. All Rights Reserved.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2 of
+# the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it would be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write the Free Software Foundation,
+# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+top_srcdir ?= ../../../../..
+
+include $(top_srcdir)/include/mk/testcases.mk
+include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/kernel/device-drivers/block/block_dev_user/block_dev.c b/testcases/kernel/device-drivers/block/block_dev_user/block_dev.c
new file mode 100644
index 0000000..8f26f3c
--- /dev/null
+++ b/testcases/kernel/device-drivers/block/block_dev_user/block_dev.c
@@ -0,0 +1,110 @@
+/*
+ * Copyright (c) 2013 Oracle and/or its affiliates. All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it would be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * Author: Alexey Kodanev <ale...@or...>
+ *
+ * Test checks block device kernel API.
+ */
+
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+
+#include "test.h"
+#include "usctest.h"
+#include "safe_macros.h"
+#include "tst_module.h"
+
+char *TCID = "block_dev";
+int TST_TOTAL = 9;
+
+static const char module_name[] = "ltp_block_dev.ko";
+static const char dev_result[] = "/sys/devices/ltp_block_dev/result";
+static const char dev_tcase[] = "/sys/devices/ltp_block_dev/tcase";
+static int module_loaded;
+
+static int run_all_testcases;
+static const option_t options[] = {
+ {"a", &run_all_testcases, NULL},
+ {NULL, NULL, NULL}
+};
+
+static void cleanup(void)
+{
+ if (module_loaded)
+ tst_module_unload(NULL, module_name);
+
+ TEST_CLEANUP;
+}
+
+static void help(void)
+{
+ printf(" -a Run all test-cases (can crash the kernel)\n");
+}
+
+void setup(int argc, char *argv[])
+{
+ char *msg;
+ msg = parse_opts(argc, argv, options, help);
+ if (msg != NULL)
+ tst_brkm(TBROK, NULL, "OPTION PARSING ERROR - %s", msg);
+
+ tst_require_root(NULL);
+
+ if (tst_kvercmp(2, 6, 0) < 0) {
+ tst_brkm(TCONF, NULL,
+ "Test must be run with kernel 2.6 or newer");
+ }
+
+ tst_sig(FORK, DEF_HANDLER, cleanup);
+}
+
+static void test_run(void)
+{
+ int off = 0;
+ /*
+ * test-cases #8 and #9 can crash the kernel.
+ * We have to wait for kernel fix where register_blkdev() &
+ * unregister_blkdev() checks the input device name parameter
+ * against NULL pointer.
+ */
+ if (!run_all_testcases)
+ off = 2;
+
+ tst_module_load(cleanup, module_name, NULL);
+ module_loaded = 1;
+
+ int i, pass = 0;
+ for (i = 0; i < TST_TOTAL - off; ++i) {
+ SAFE_FILE_PRINTF(cleanup, dev_tcase, "%d", i + 1);
+ SAFE_FILE_SCANF(cleanup, dev_result, "%d", &pass);
+ tst_resm((pass) ? TPASS : TFAIL, "Test-case '%d'", i + 1);
+ }
+}
+
+int main(int argc, char *argv[])
+{
+ setup(argc, argv);
+
+ test_run();
+
+ cleanup();
+
+ tst_exit();
+}
diff --git a/testcases/kernel/device-drivers/block/kernel_space/Makefile b/testcases/kernel/device-drivers/block/kernel_space/Makefile
deleted file mode 100644
index 10f33a7..0000000
--- a/testcases/kernel/device-drivers/block/kernel_space/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-
-EXTRA_CFLAGS += -Wall -W -Wno-unused-parameter
-
-ifneq ($(KERNELRELEASE),)
-
-obj-m := test_block.o test_genhd.o
-else
-KDIR := /lib/modules/$(shell uname -r)/build
-PWD := $(shell pwd)
-
-modules:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
-
-clean:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) clean
- rm -f modules.order
-
-help:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) help
-
-modules_install:
- $(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules_install
-
-endif
diff --git a/testcases/kernel/device-drivers/block/kernel_space/README b/testcases/kernel/device-drivers/block/kernel_space/README
deleted file mode 100644
index 6833efd..0000000
--- a/testcases/kernel/device-drivers/block/kernel_space/README
+++ /dev/null
@@ -1,27 +0,0 @@
-
-Module under test: linux/block/genhd.c
-
- Function | Declared in | Tested in
- -----------------------------+---------------+---------------
- register_blkdev() | linux/fs.h | test_blkdev.c
- unregister_blkdev() | linux/fs.h | test_blkdev.c
- blk_register_region() | linux/genhd.h |
- blk_unregister_region() | linux/genhd.h |
- add_disk() | linux/genhd.h |
- del_gendisk() | linux/genhd.h | test_genhd.c
- blk_lookup_devt() | linux/genhd.h |
- alloc_disk() | linux/genhd.h | test_genhd.c
- alloc_disk_node() | linux/genhd.h |
- get_disk() | linux/genhd.h |
- put_disk() | linux/genhd.h |
- set_device_ro() | linux/genhd.h |
- set_disk_ro() | linux/genhd.h |
- bdev_read_only() | linux/fs.h |
- invalidate_partition() | linux/fs.h |
-
-For possible test results please see "A POSIX conforming test framework" at
-http://www.gnu.org/software/dejagnu/manual/x47.html#posix
-
-TODO
-----
- - Automatically evaluate test results
diff --git a/testcases/kernel/device-drivers/block/kernel_space/run.sh b/testcases/kernel/device-drivers/block/kernel_space/run.sh
deleted file mode 100755
index 9044453..0000000
--- a/testcases/kernel/device-drivers/block/kernel_space/run.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh
-
-# Tell the system to flush write buffers in order to minimize data loss in
-# case of a crash.
-sync
-
-echo Running Test Cases of "block" testsuite one by one.
-echo The test results are printed to "dmesg".
-echo
-
-#
-# Valid test cases (should run stable)
-#
-echo Test Case 1
-insmod ./test_block.ko tc=1
-rmmod test_block
-
-echo Test Case 2
-insmod ./test_block.ko tc=2
-rmmod test_block
-
-echo Test Case 5
-insmod ./test_block.ko tc=5
-rmmod test_block
-
-#
-# Invalid testcases (more probable to crash the module under test)
-#
-echo Test Case 3
-insmod ./test_block.ko tc=3
-rmmod test_block
-
-echo Test Case 4
-insmod ./test_block.ko tc=4
-rmmod test_block
-
-echo Test Case 6
-insmod ./test_block.ko tc=6
-rmmod test_block
-
-echo Test Case 7
-insmod ./test_block.ko tc=7
-rmmod test_block
-
-echo Test Case 10
-insmod ./test_block.ko tc=10
-rmmod test_block
diff --git a/testcases/kernel/device-drivers/block/kernel_space/test_block.c b/testcases/kernel/device-drivers/block/kernel_space/test_block.c
deleted file mode 100644
index 3048e09..0000000
--- a/testcases/kernel/device-drivers/block/kernel_space/test_block.c
+++ /dev/null
@@ -1,310 +0,0 @@
-
-/*
- * Module under test: linux/block/genhd.c
- *
- * Only those functions are tested here which are declared in <linux/fs.h>
- *
- * Usage:
- * 1. make
- * 2. su
- * 3. insmod ./test_block.ko
- * 4. Check the test results in "dmesg"
- * 5. rmmod test_block
- *
- * Changes:
- * 16 Jan 2009 0.2 Added "tc" parameter to run test cases separately
- * 11 Jan 2009 0.1 First release
- */
-
-#include <linux/module.h>
-#include <linux/fs.h>
-
-static unsigned int __initdata tc;
-module_param_named(tc, tc, int, 0);
-MODULE_PARM_DESC(tc,
- "Test Case to run. Default is 0 which means that run all tests.");
-
-MODULE_AUTHOR("Márton Németh <nm...@fr...>");
-MODULE_DESCRIPTION("Test block drivers");
-MODULE_LICENSE("GPL");
-
-#define BLK_DEV_NAME "test_block"
-#define MAX_MAJOR 255
-
-/*
- * Analysis of "int register_blkdev(unsigned int major, const char *name)"
- *
- * Equivalence classes:
- *
- * Parameter | Values | Valid? | Covered in
- * -----------+--------------------------+---------+-------------
- * major | [0] | valid | tc01, tc02
- * |--------------------------+---------+-------------
- * | [1..255] | valid | tc05
- * |--------------------------+---------+-------------
- * | [256..UINT_MAX] | invalid | tc03, tc04
- * -----------+--------------------------+---------+-------------
- * name | [valid pointer to a zero | |
- * | terminated string] | valid | tc01, tc02
- * |--------------------------+---------+-------------
- * | [valid pointer to a zero | |
- * | length zero terminated | invalid | tc06
- * | string] | |
- * |--------------------------+---------+-------------
- * | [NULL] | invalid | tc07
- * -----------+--------------------------+---------+-------------
- *
- */
-
-static void tc01(void)
-{
- int major1;
- int major2;
-
- printk(KERN_INFO
- "Test Case 1: register_blkdev() with auto allocating major numbers (major=0)\n");
-
- major1 = register_blkdev(0, BLK_DEV_NAME);
- printk(KERN_DEBUG "major1 = %i\n", major1);
-
- major2 = register_blkdev(0, BLK_DEV_NAME);
- printk(KERN_DEBUG "major2 = %i\n", major2);
-
- if (0 < major1) {
- unregister_blkdev(major1, BLK_DEV_NAME);
- } else {
- printk(KERN_DEBUG
- "first call to register_blkdev() failed with error %i\n",
- major1);
- }
-
- if (0 < major2) {
- unregister_blkdev(major2, BLK_DEV_NAME);
- } else {
- printk(KERN_DEBUG
- "second call to register_blkdev() failed with error %i\n",
- major2);
- }
-
- printk(KERN_INFO "Test Case 1: UNRESLOVED\n");
-}
-
-static void tc02(void)
-{
- int major[MAX_MAJOR + 1];
- int i;
-
- /* Try to allocate block devices until all major number are used. After this
- * register_blkdev() should return -EBUSY
- */
-
- printk(KERN_INFO
- "Test Case 2: stress test of register_blkdev() with auto allocating major numbers (major=0)\n");
-
- memset(major, 0, sizeof(major));
-
- for (i = 0; i < sizeof(major) / sizeof(*major); i++) {
- major[i] = register_blkdev(0, BLK_DEV_NAME);
- printk(KERN_DEBUG "major[%i] = %i\n", i, major[i]);
- if (major[i] <= 0 && major[i] != -EBUSY) {
- printk(KERN_INFO
- "unexpected return value from register_blkdev(): %i\n",
- major[i]);
- }
- if (major[i] < 0) {
- printk(KERN_DEBUG
- "register_blkdev() failed with error %i\n",
- major[i]);
- }
- }
-
- for (i = 0; i < sizeof(major) / sizeof(*major); i++) {
- if (0 < major[i]) {
- unregister_blkdev(major[i], BLK_DEV_NAME);
- major[i] = 0;
- }
- }
-
- printk(KERN_INFO "Test Case 2: UNRESLOVED\n");
-}
-
-static void tc03(void)
-{
- int major;
-
- printk(KERN_INFO "Test Case 3: register_blkdev() with major=256\n");
-
- major = register_blkdev(256, BLK_DEV_NAME);
- printk(KERN_DEBUG "major = %i\n", major);
-
- if (0 < major) {
- unregister_blkdev(major, BLK_DEV_NAME);
- } else {
- printk(KERN_DEBUG "register_blkdev() failed with error %i\n",
- major);
- }
-
- printk(KERN_INFO "Test Case 3: UNRESLOVED\n");
-}
-
-static void tc04(void)
-{
- int major;
-
- printk(KERN_INFO "Test Case 4: register_blkdev() with major=%u\n",
- UINT_MAX);
-
- major = register_blkdev(UINT_MAX, BLK_DEV_NAME);
- printk(KERN_DEBUG "major = %i\n", major);
-
- if (0 < major) {
- unregister_blkdev(major, BLK_DEV_NAME);
- } else {
- printk(KERN_DEBUG "register_blkdev() failed with error %i\n",
- major);
- }
-
- printk(KERN_INFO "Test Case 4: UNRESLOVED\n");
-}
-
-static void tc05(void)
-{
- int major;
- int major2;
- int major3;
-
- printk(KERN_INFO "Test Case 5: register_blkdev() with major != 0\n");
-
- /* autosearch for a free major number */
- major = register_blkdev(0, BLK_DEV_NAME);
- printk(KERN_DEBUG "major = %i\n", major);
-
- if (0 < major) {
- unregister_blkdev(major, BLK_DEV_NAME);
-
- major2 = register_blkdev(major, BLK_DEV_NAME);
- major3 = register_blkdev(major, BLK_DEV_NAME);
-
- if (0 < major2) {
- unregister_blkdev(major2, BLK_DEV_NAME);
- } else {
- printk(KERN_DEBUG
- "first call to register_blkdev() with major=%i failed with error %i\n",
- major, major2);
- }
-
- if (0 < major3) {
- unregister_blkdev(major3, BLK_DEV_NAME);
- } else {
- printk(KERN_DEBUG
- "second call to register_blkdev() with major=%i failed with error %i\n",
- major, major3);
- }
-
- } else {
- printk(KERN_DEBUG "register_blkdev() failed with error %i\n",
- major);
- }
-
- printk(KERN_INFO "Test Case 5: UNRESLOVED\n");
-}
-
-static void tc06(void)
-{
- int major;
-
- printk(KERN_INFO "Test Case 6: register_blkdev() with name=\"\"\n");
-
- major = register_blkdev(0, "");
- printk(KERN_DEBUG "major = %i\n", major);
-
- if (0 < major) {
- unregister_blkdev(major, "");
- } else {
- printk(KERN_DEBUG "register_blkdev() failed with error %i\n",
- major);
- }
-
- printk(KERN_INFO "Test Case 6: UNRESLOVED\n");
-}
-
-static void tc07(void)
-{
- int major;
-
- printk(KERN_INFO "Test Case 7: register_blkdev() with name=NULL\n");
-
- major = register_blkdev(0, NULL);
- printk(KERN_DEBUG "major = %i\n", major);
-
- if (0 < major) {
- unregister_blkdev(major, NULL);
- } else {
- printk(KERN_DEBUG "register_blkdev() failed with error %i\n",
- major);
- }
-
- printk(KERN_INFO "Test Case 7: UNRESLOVED\n");
-}
-
-static void tc10(void)
-{
- int major;
-
- printk(KERN_INFO "Test Case 10: unregister_blkdev() with major=0\n");
-
- major = register_blkdev(0, BLK_DEV_NAME);
- printk(KERN_DEBUG "major = %i\n", major);
-
- if (0 < major) {
- printk(KERN_DEBUG "calling unregister_blkdev() with major=0\n");
- unregister_blkdev(0, BLK_DEV_NAME);
- printk(KERN_DEBUG "calling unregister_blkdev() with major=%i\n",
- major);
- unregister_blkdev(major, BLK_DEV_NAME);
- } else {
- printk(KERN_DEBUG "register_blkdev() failed with error %i\n",
- major);
- }
-
- printk(KERN_INFO "Test Case 10: UNRESLOVED\n");
-}
-
-static int test_init_module(void)
-{
- printk(KERN_INFO "Starting test_block module\n");
-
- if (tc == 0 || tc == 1)
- tc01();
-
- if (tc == 0 || tc == 2)
- tc02();
-
- if (tc == 0 || tc == 3)
- tc03();
-
- if (tc == 0 || tc == 4)
- tc04();
-
- if (tc == 0 || tc == 5)
- tc05();
-
- if (tc == 0 || tc == 6)
- tc06();
-
- if (tc == 0 || tc == 7)
- tc07();
-
- if (tc == 0 || tc == 10)
- tc10();
-
- return 0;
-}
-
-static void test_exit_module(void)
-{
- printk(KERN_DEBUG "Unloading test_block module\n");
-}
-
-module_init(test_init_module);
-module_exit(test_exit_module);
diff --git a/testcases/kernel/firmware/Makefile b/testcases/kernel/firmware/Makefile
index dd2c62d..57b598d 100644
--- a/testcases/kernel/firmware/Makefile
+++ b/testcases/kernel/firmware/Makefile
@@ -17,28 +17,4 @@
top_srcdir ?= ../../..
include $(top_srcdir)/include/mk/env_pre.mk
-
-SUBDIRS =
-REQ_VERSION_MAJOR = 3
-REQ_VERSION_PATCH = 7
-
-ifeq ($(MAKECMDGOALS),clean)
-SKIP = 0
-endif
-
-ifeq ($(WITH_MODULES),yes)
-SKIP ?= $(shell test $(LINUX_VERSION_MAJOR) -gt $(REQ_VERSION_MAJOR); echo $$?)
-ifeq ($(SKIP),1)
-SKIP = $(shell test $(LINUX_VERSION_MAJOR) -eq $(REQ_VERSION_MAJOR); echo $$?)
-ifeq ($(SKIP),0)
-SKIP = $(shell test $(LINUX_VERSION_PATCH) -ge $(REQ_VERSION_PATCH); echo $$?)
-endif
-endif
-endif
-
-ifeq ($(SKIP),0)
-SUBDIRS += fw_load_kernel
-endif
-SUBDIRS += fw_load_user
-
include $(top_srcdir)/include/mk/generic_trunk_target.mk
diff --git a/testcases/kernel/firmware/fw_load_kernel/Makefile b/testcases/kernel/firmware/fw_load_kernel/Makefile
index 076d4ed..7399699 100644
--- a/testcases/kernel/firmware/fw_load_kernel/Makefile
+++ b/testcases/kernel/firmware/fw_load_kernel/Makefile
@@ -25,18 +25,11 @@ else
top_srcdir ?= ../../../..
include $(top_srcdir)/include/mk/env_pre.mk
+REQ_VERSION_MAJOR := 3
+REQ_VERSION_PATCH := 7
MAKE_TARGETS := ltp_fw_load.ko
-# Ignoring the exit status of commands is done to be forward compatible with
-# kernel internal API changes. The user-space test will return TCONF, if it
-# doesn't find the module (i.e. it wasn't built either due to kernel-devel
-# missing or module build failure).
-ltp_fw_load.ko: ltp_fw_load.c
- -$(MAKE) -C $(LINUX_DIR) M=$(abs_srcdir)
- -mv ltp_fw_load.ko ltp_fw_load.ko~
- -$(MAKE) -C $(LINUX_DIR) M=$(abs_srcdir) clean
- -mv ltp_fw_load.ko~ ltp_fw_load.ko
-
+include $(top_srcdir)/include/mk/module.mk
include $(top_srcdir)/include/mk/generic_leaf_target.mk
endif
hooks/post-receive
--
ltp
|
