diff mbox series

[1/1] device-drivers/zram: Fix false-judgement on zram's presence

Message ID 20210114074603.GB32318@andestech.com
State Rejected
Headers show
Series [1/1] device-drivers/zram: Fix false-judgement on zram's presence | expand

Commit Message

Leo Liang Jan. 14, 2021, 7:46 a.m. UTC
Date: Thu, 14 Jan 2021 15:27:34 +0800
From: Leo Yu-Chi Liang <ycliang@andestech.com>
Subject: [LTP][PATCH 1/1] device-drivers/zram: Fix false-judgement on zram's presence

zram_lib.sh uses the return value of modinfo to check if zram module exists,
but the behavior of modinfo implemented by busybox is different.

The busybox-implemented modinfo would also return true (code: 0)
even if zram module is not present,
so grep the info that only shows when the module exists.

Signed-off-by: Leo Yu-Chi Liang <ycliang@andestech.com>
---
 testcases/kernel/device-drivers/zram/zram_lib.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Petr Vorel Jan. 14, 2021, 3:15 p.m. UTC | #1
Hi Leo,

> Date: Thu, 14 Jan 2021 15:27:34 +0800
> From: Leo Yu-Chi Liang <ycliang@andestech.com>
> Subject: [LTP][PATCH 1/1] device-drivers/zram: Fix false-judgement on zram's presence

> zram_lib.sh uses the return value of modinfo to check if zram module exists,
> but the behavior of modinfo implemented by busybox is different.

> The busybox-implemented modinfo would also return true (code: 0)
> even if zram module is not present,
> so grep the info that only shows when the module exists.

> -modinfo zram > /dev/null 2>&1 ||
> +modinfo zram | grep "filename" > /dev/null 2>&1 ||
nit: 
modinfo zram | grep -q "filename" ||

>  	tst_brk TCONF "zram not configured in kernel"

Thank you for a report. Actually, we have a helper for it:
TST_NEEDS_DRIVERS="zram"

But this helper is broken for BusyBox, which means it's broken for many tests.

The helper calls tst_check_driver() C function (lib/tst_kernel.c):

int tst_check_driver(const char *name)
{
#ifndef __ANDROID__
	const char * const argv[] = { "modprobe", "-n", name, NULL };
	int res = tst_cmd_(NULL, argv, "/dev/null", "/dev/null",
			       TST_CMD_PASS_RETVAL);

	/* 255 - it looks like modprobe not available */
	return (res == 255) ? 0 : res;
#else
	/* Android modprobe may not have '-n', or properly installed
	 * module.*.bin files to determine built-in drivers. Assume
	 * all drivers are available.
	 */
	return 0;
#endif
}

and the problem is that modprobe from busybox does not support -n.
It does support -D, which could be used, *but* unless is busybox binary
configured with CONFIG_MODPROBE_SMALL=y (IMHO the default) => not suitable
for us.

IMHO we have only 2 options:
* write something on our own which would look into /lib/modules and
/system/lib/modules (Android). That's what BusyBox implementation does
(also kmod implementation looks into /lib/modules). BusyBox has this path in
defined in build time configuration (CONFIG_DEFAULT_MODULES_DIR), but I'd be
surprised if any system had both directories.
pros: no external dependency
cons: more code

* use modinfo, but grep for output: for 'filename:' (turn Leo's suggestion into
C code in the API):
cons: module not checked, when modprobe missing (we check for 255 exit code).

BTW not sure whether bother about android support anyway. On Android phone I
have available (Android 8), there is empty /system/lib/modules directory and no
/proc/modules:, thus nor BusyBox neither even toybox modprobe/modinfo
implementations work.

Kind regards,
Petr
Leo Liang Jan. 15, 2021, 8:54 a.m. UTC | #2
Hi Petr,
On Thu, Jan 14, 2021 at 11:15:25PM +0800, Petr Vorel wrote:
> Hi Leo,
> 
> > zram_lib.sh uses the return value of modinfo to check if zram module exists,
> > but the behavior of modinfo implemented by busybox is different.
> 
> > The busybox-implemented modinfo would also return true (code: 0)
> > even if zram module is not present,
> > so grep the info that only shows when the module exists.
> 
> > -modinfo zram > /dev/null 2>&1 ||
> > +modinfo zram | grep "filename" > /dev/null 2>&1 ||
> nit: 
> modinfo zram | grep -q "filename" ||
> 
> >  	tst_brk TCONF "zram not configured in kernel"
> 
> Thank you for a report. Actually, we have a helper for it:
> TST_NEEDS_DRIVERS="zram"
> 
> But this helper is broken for BusyBox, which means it's broken for many tests.
> 
> The helper calls tst_check_driver() C function (lib/tst_kernel.c):
> 
> int tst_check_driver(const char *name)
> {
> #ifndef __ANDROID__
> 	const char * const argv[] = { "modprobe", "-n", name, NULL };
> 	int res = tst_cmd_(NULL, argv, "/dev/null", "/dev/null",
> 			       TST_CMD_PASS_RETVAL);
> 
> 	/* 255 - it looks like modprobe not available */
> 	return (res == 255) ? 0 : res;
> #else
> 	/* Android modprobe may not have '-n', or properly installed
> 	 * module.*.bin files to determine built-in drivers. Assume
> 	 * all drivers are available.
> 	 */
> 	return 0;
> #endif
> }
> 
> and the problem is that modprobe from busybox does not support -n.
> It does support -D, which could be used, *but* unless is busybox binary
> configured with CONFIG_MODPROBE_SMALL=y (IMHO the default) => not suitable
> for us.
> 
> IMHO we have only 2 options:
> * write something on our own which would look into /lib/modules and
> /system/lib/modules (Android). That's what BusyBox implementation does
> (also kmod implementation looks into /lib/modules). BusyBox has this path in
> defined in build time configuration (CONFIG_DEFAULT_MODULES_DIR), but I'd be
> surprised if any system had both directories.
> pros: no external dependency
> cons: more code
> 
> * use modinfo, but grep for output: for 'filename:' (turn Leo's suggestion into
> C code in the API):
> cons: module not checked, when modprobe missing (we check for 255 exit code).
> 

Thanks for breaking things down in such detail!

I personally prefer the first option that looking into those directories ourselves.
So let's drop this patch and stay as is for now!

> BTW not sure whether bother about android support anyway. On Android phone I
> have available (Android 8), there is empty /system/lib/modules directory and no
> /proc/modules:, thus nor BusyBox neither even toybox modprobe/modinfo
> implementations work.
 
BTW, I found that there's a ver_linux script that detects the version of util-linux.
But as I searched through commit log of LTP, there are a lot of workarounds
regarding the compatibility issue with Busybox (around 10 commits or so).

Is there a certain version of util-linux is expected to conduct a full run of LTP ?

Thanks again,
Leo

> Kind regards,
> Petr
Petr Vorel Jan. 15, 2021, 9:38 a.m. UTC | #3
Hi Leo,

...
> > IMHO we have only 2 options:
> > * write something on our own which would look into /lib/modules and
> > /system/lib/modules (Android). That's what BusyBox implementation does
> > (also kmod implementation looks into /lib/modules). BusyBox has this path in
> > defined in build time configuration (CONFIG_DEFAULT_MODULES_DIR), but I'd be
> > surprised if any system had both directories.
> > pros: no external dependency
> > cons: more code

> > * use modinfo, but grep for output: for 'filename:' (turn Leo's suggestion into
> > C code in the API):
> > cons: module not checked, when modprobe missing (we check for 255 exit code).


> Thanks for breaking things down in such detail!

> I personally prefer the first option that looking into those directories ourselves.
> So let's drop this patch and stay as is for now!

FYI: I'm going to implement 1) (own search, written in C API).
Hope to have it on Monday (before the release). If not, we should revert
305a78e4c ("tst_net.sh: Require veth for netns") which breaks *all* network
tests for BusyBox.

> > BTW not sure whether bother about android support anyway. On Android phone I
> > have available (Android 8), there is empty /system/lib/modules directory and no
> > /proc/modules:, thus nor BusyBox neither even toybox modprobe/modinfo
> > implementations work.

> BTW, I found that there's a ver_linux script that detects the version of util-linux.
Yes, but ver_linux it's just legacy info script (we don't have anything better
than this).

> But as I searched through commit log of LTP, there are a lot of workarounds
> regarding the compatibility issue with Busybox (around 10 commits or so).
Yes, these fixes are specific to particular tests. But detecting module in LTP
API affect many tests.

> Is there a certain version of util-linux is expected to conduct a full run of LTP ?
No. We just fix problems when reported (usually reported send a patch).

FYI: We haven't even set minimal supported kernel and (g)libc version.
https://github.com/linux-test-project/ltp/issues/657

> Thanks again,
> Leo


Kind regards,
Petr
diff mbox series

Patch

diff --git a/testcases/kernel/device-drivers/zram/zram_lib.sh b/testcases/kernel/device-drivers/zram/zram_lib.sh
index 3f4d1d55f..04d4a4da6 100755
--- a/testcases/kernel/device-drivers/zram/zram_lib.sh
+++ b/testcases/kernel/device-drivers/zram/zram_lib.sh
@@ -211,5 +211,5 @@  zram_mount()
 	tst_res TPASS "mount of zram device(s) succeeded"
 }
 
-modinfo zram > /dev/null 2>&1 ||
+modinfo zram | grep "filename" > /dev/null 2>&1 ||
 	tst_brk TCONF "zram not configured in kernel"