Skip to contentSkip to conversation

Kernel module detection (own implementation)

PATCH Superseded Petr Vorel 1 participant 5 messages Jan 22, 2021 – Jan 25, 2021 Library code

lore
Share & tools
lore

Petr Vorel

author
#0 lore raw

v5 cover Kernel module detection (own implementation)

Hi,

hopefully the latest version.

Changes v4->v5:
* return code is -1 instead of 1 (should be safe, thus I kept it in the same commit, but can move to separate commit)
* update doc in the header

NOTE: there is a bit of mess in return codes in the C API (-1 vs 1 returned on error), but that's for another effort.

Kind regards,
Petr

tst_kernel.h +5 -3
index 71ab9466b..9e17bb71e 100644
@@ -13,9 +13,11 @@ int tst_kernel_bits(void);
 /**
  * Checks support for the kernel driver.
  *
- * @param name The name of the driver.
- * @return Returns 0 if the kernel has the driver or modprobe is missing.
+ * @param driver The name of the driver.
+ * @return Returns 0 if the kernel has the driver,
+ * -1 when driver is missing or config file not available.
+ * On Android *always* 0 (always expect the driver is available).
  */
-int tst_check_driver(const char *name);
+int tst_check_driver(const char *driver);
 
 #endif	/* TST_KERNEL_H__ */
tst_kernel.c +2 -2
index b5caf7b20..c908bb04c 100644
@@ -139,7 +140,7 @@ static int tst_check_driver_(const char *driver)
 		!tst_search_driver(driver, "modules.builtin"))
 		return 0;
 
-	return 1;
+	return -1;
 }
 
 int tst_check_driver(const char *driver)
@@ -157,7 +158,7 @@ int tst_check_driver(const char *driver)
 	if (!tst_check_driver_(driver))
 		return 0;
 
-	int ret = 1;
+	int ret = -1;
 
 	if (strrchr(driver, '-') || strrchr(driver, '_')) {
 		char *driver2 = strdup(driver);

Petr Vorel (3):
tst_check_driver(): Fix kernel module detection on BusyBox
zram: Fix module detection on BusyBox tst_net.sh: Require veth for netns (again)

 include/tst_kernel.h                          |   8 +-
 lib/tst_kernel.c                              | 105 ++++++++++++++++--
 .../kernel/device-drivers/zram/zram_lib.sh    |   6 +-
 testcases/lib/tst_net.sh                      |   1 +
 4 files changed, 101 insertions(+), 19 deletions(-)
Signature · 1 line
2.30.0
author
#1 lore raw

PATCH v5 1/3 tst_check_driver(): Fix kernel module detection on BusyBox

BusyBox modprobe implementation does not support -n switch.

It does support -D, which could be used, *but* unless is busybox binary configured with CONFIG_MODPROBE_SMALL=y (IMHO the default).

We could use modinfo and grep output for 'filename:', but we agreed on ML that having our own implementation will be the best as it also does not require modinfo as external dependency.

Implementation searches for for module presence in /lib/modules/$(uname -r)/modules.{dep,builtin}.

Also treat '-' and '_' in module name as the same (follow kmod implementation).

Changed return code on error from 1 to -1 (no update needed on callers of the function). Document return code and params in the header.

On Android still assume all drivers are available because modules.* files might not be available. We could search for modules in /lib/modules or /vendor/lib/modules or /system/lib/modules (old aosp), but to to determine built-in drivers we need modules.builtin (it's required also by Busybox mod{info,probe} implementation).

This fixes many tests on BusyBox, e.g. *all* network tests (tests using tst_net.sh) after 305a78e4c ("tst_net.sh: Require veth for netns").

---
 include/tst_kernel.h |   8 ++--
 lib/tst_kernel.c     | 105 ++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 98 insertions(+), 15 deletions(-)
include/tst_kernel.h +5 -3
index 71ab9466b..9e17bb71e 100644
@@ -13,9 +13,11 @@ int tst_kernel_bits(void);
 /**
  * Checks support for the kernel driver.
  *
- * @param name The name of the driver.
- * @return Returns 0 if the kernel has the driver or modprobe is missing.
+ * @param driver The name of the driver.
+ * @return Returns 0 if the kernel has the driver,
+ * -1 when driver is missing or config file not available.
+ * On Android *always* 0 (always expect the driver is available).
  */
-int tst_check_driver(const char *name);
+int tst_check_driver(const char *driver);
 
 #endif	/* TST_KERNEL_H__ */
lib/tst_kernel.c +93 -12

126 lines not on this page · raw message

Signature · 1 line
2.30.0
author
#2 lore raw

PATCH v5 2/3 zram: Fix module detection on BusyBox

In reply to Petr Vorel

BusyBox modinfo implementation does not exit with 0 when module not found. Our own API implementation used for module detection in tst_check_driver() was fixed in previous commit thus use it.

---
 testcases/kernel/device-drivers/zram/zram_lib.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
testcases/kernel/device-drivers/zram/zram_lib.sh +2 -4
index 3f4d1d55f..bdbf2453a 100755
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Copyright (c) 2015 Oracle and/or its affiliates. All Rights Reserved.
-# Copyright (c) 2019 Petr Vorel <[email protected]>
+# Copyright (c) 2019-2021 Petr Vorel <[email protected]>
 # Author: Alexey Kodanev <[email protected]>
 
 dev_makeswap=-1
@@ -9,6 +9,7 @@ dev_mounted=-1
 TST_NEEDS_TMPDIR=1
 TST_SETUP="zram_load"
 TST_CLEANUP="zram_cleanup"
+TST_NEEDS_DRIVERS="zram"
 . tst_test.sh
 
 zram_cleanup()
@@ -210,6 +211,3 @@ zram_mount()
 
 	tst_res TPASS "mount of zram device(s) succeeded"
 }
-
-modinfo zram > /dev/null 2>&1 ||
-	tst_brk TCONF "zram not configured in kernel"
Signature · 1 line
2.30.0
author
#3 lore raw

PATCH v5 3/3 tst_net.sh: Require veth for netns (again)

In reply to Petr Vorel

new error message is more informative:
tcp_fastopen_run 1 TCONF: veth driver not available

then the old one:
Error: Unknown device type.
tcp_fastopen_run 1 TBROK: ip li add name ltp_ns_veth1 type veth peer name ltp_ns_veth2 failed

NOTE: originally added in 305a78e4c and temporarily reverted in 7fe2ad11d due problems which were fixed in commit "lib: Fix kernel module detection on BusyBox".

---
 testcases/lib/tst_net.sh | 1 +
 1 file changed, 1 insertion(+)
testcases/lib/tst_net.sh +1 -0
index ef9354903..1ddef2fea 100644
@@ -106,6 +106,7 @@ init_ltp_netspace()
 		tst_require_cmds ip
 		tst_require_root
 
+		tst_require_drivers veth
 		ROD ip li add name ltp_ns_veth1 type veth peer name ltp_ns_veth2
 		pid="$(ROD ns_create net,mnt)"
 		mkdir -p /var/run/netns
Signature · 1 line
2.30.0
author
#4 lore raw

v5 cover Kernel module detection (own implementation)

In reply to Petr Vorel

Hi,

patchset merged.
@Sandeep: feel free to contribute Android specific patch.

Kind regards,
Petr