Skip to content

Commit

Permalink
selftests/nolibc: fix up kernel parameters support
Browse files Browse the repository at this point in the history
[ Upstream commit c388c99 ]

kernel parameters allow pass two types of strings, one type is like
'noapic', another type is like 'panic=5', the first type is passed as
arguments of the init program, the second type is passed as environment
variables of the init program.

when users pass kernel parameters like this:

    noapic NOLIBC_TEST=syscall

our nolibc-test program will use the test setting from argv[1] and
ignore the one from NOLIBC_TEST environment variable, and at last, it
will print the following line and ignore the whole test setting.

    Ignoring unknown test name 'noapic'

reversing the parsing order does solve the above issue:

    test = getenv("NOLIBC_TEST");
    if (test)
        test = argv[1];

but it still doesn't work with such kernel parameters (without
NOLIBC_TEST environment variable):

    noapic FOO=bar

To support all of the potential kernel parameters, let's verify the test
setting from both of argv[1] and NOLIBC_TEST environment variable.

Reviewed-by: Thomas Weißschuh <linux@weissschuh.net>
Signed-off-by: Zhangjin Wu <falcon@tinylab.org>
Signed-off-by: Willy Tarreau <w@1wt.eu>
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
lzufalcon authored and gregkh committed Sep 23, 2023
1 parent 9e8bbde commit 21c634e
Showing 1 changed file with 31 additions and 2 deletions.
33 changes: 31 additions & 2 deletions tools/testing/selftests/nolibc/nolibc-test.c
Expand Up @@ -939,6 +939,35 @@ static const struct test test_names[] = {
{ 0 }
};

int is_setting_valid(char *test)
{
int idx, len, test_len, valid = 0;
char delimiter;

if (!test)
return valid;

test_len = strlen(test);

for (idx = 0; test_names[idx].name; idx++) {
len = strlen(test_names[idx].name);
if (test_len < len)
continue;

if (strncmp(test, test_names[idx].name, len) != 0)
continue;

delimiter = test[len];
if (delimiter != ':' && delimiter != ',' && delimiter != '\0')
continue;

valid = 1;
break;
}

return valid;
}

int main(int argc, char **argv, char **envp)
{
int min = 0;
Expand All @@ -964,10 +993,10 @@ int main(int argc, char **argv, char **envp)
* syscall:5-15[:.*],stdlib:8-10
*/
test = argv[1];
if (!test)
if (!is_setting_valid(test))
test = getenv("NOLIBC_TEST");

if (test) {
if (is_setting_valid(test)) {
char *comma, *colon, *dash, *value;

do {
Expand Down

0 comments on commit 21c634e

Please sign in to comment.