- Linux-kselftest-mirror - lists.linaro.org

[PATCH bpf-next v2 6/9] selftests: bpf: don't listen() on UDP sockets

by Lorenz Bauer

Most tests for TCP sockmap can be adapted to UDP sockmap if the listen call is skipped. Rename listen_loopback, etc. to socket_loopback and skip listen() for SOCK_DGRAM. Signed-off-by: Lorenz Bauer <lmb(a)cloudflare.com> --- .../selftests/bpf/prog_tests/sockmap_listen.c | 47 ++++++++++--------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c b/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c index b1b2acea0638..4ba41dd26d6b 100644 --- a/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c +++ b/tools/testing/selftests/bpf/prog_tests/sockmap_listen.c @@ -230,7 +230,7 @@ static int enable_reuseport(int s, int progfd) return 0; } -static int listen_loopback_reuseport(int family, int sotype, int progfd) +static int socket_loopback_reuseport(int family, int sotype, int progfd) { struct sockaddr_storage addr; socklen_t len; @@ -249,6 +249,9 @@ static int listen_loopback_reuseport(int family, int sotype, int progfd) if (err) goto close; + if (sotype == SOCK_DGRAM) + return s; + err = xlisten(s, SOMAXCONN); if (err) goto close; @@ -259,9 +262,9 @@ static int listen_loopback_reuseport(int family, int sotype, int progfd) return -1; } -static int listen_loopback(int family, int sotype) +static int socket_loopback(int family, int sotype) { - return listen_loopback_reuseport(family, sotype, -1); + return socket_loopback_reuseport(family, sotype, -1); } static void test_insert_invalid(int family, int sotype, int mapfd) @@ -333,7 +336,7 @@ static void test_insert_listening(int family, int sotype, int mapfd) u32 key; int s; - s = listen_loopback(family, sotype); + s = socket_loopback(family, sotype); if (s < 0) return; @@ -349,7 +352,7 @@ static void test_delete_after_insert(int family, int sotype, int mapfd) u32 key; int s; - s = listen_loopback(family, sotype); + s = socket_loopback(family, sotype); if (s < 0) return; @@ -366,7 +369,7 @@ static void test_delete_after_close(int family, int sotype, int mapfd) u64 value; u32 key; - s = listen_loopback(family, sotype); + s = socket_loopback(family, sotype); if (s < 0) return; @@ -390,7 +393,7 @@ static void test_lookup_after_insert(int family, int sotype, int mapfd) u32 key; int s; - s = listen_loopback(family, sotype); + s = socket_loopback(family, sotype); if (s < 0) return; @@ -417,7 +420,7 @@ static void test_lookup_after_delete(int family, int sotype, int mapfd) u64 value; u32 key; - s = listen_loopback(family, sotype); + s = socket_loopback(family, sotype); if (s < 0) return; @@ -439,7 +442,7 @@ static void test_lookup_32_bit_value(int family, int sotype, int mapfd) u32 key, value32; int err, s; - s = listen_loopback(family, sotype); + s = socket_loopback(family, sotype); if (s < 0) return; @@ -470,11 +473,11 @@ static void test_update_listening(int family, int sotype, int mapfd) u64 value; u32 key; - s1 = listen_loopback(family, sotype); + s1 = socket_loopback(family, sotype); if (s1 < 0) return; - s2 = listen_loopback(family, sotype); + s2 = socket_loopback(family, sotype); if (s2 < 0) goto close_s1; @@ -500,7 +503,7 @@ static void test_destroy_orphan_child(int family, int sotype, int mapfd) u64 value; u32 key; - s = listen_loopback(family, sotype); + s = socket_loopback(family, sotype); if (s < 0) return; @@ -534,7 +537,7 @@ static void test_clone_after_delete(int family, int sotype, int mapfd) u64 value; u32 key; - s = listen_loopback(family, sotype); + s = socket_loopback(family, sotype); if (s < 0) return; @@ -570,7 +573,7 @@ static void test_accept_after_delete(int family, int sotype, int mapfd) socklen_t len; u64 value; - s = listen_loopback(family, sotype); + s = socket_loopback(family, sotype); if (s == -1) return; @@ -624,7 +627,7 @@ static void test_accept_before_delete(int family, int sotype, int mapfd) socklen_t len; u64 value; - s = listen_loopback(family, sotype); + s = socket_loopback(family, sotype); if (s == -1) return; @@ -735,7 +738,7 @@ static void test_syn_recv_insert_delete(int family, int sotype, int mapfd) int err, s; u64 value; - s = listen_loopback(family, sotype | SOCK_NONBLOCK); + s = socket_loopback(family, sotype | SOCK_NONBLOCK); if (s < 0) return; @@ -877,7 +880,7 @@ static void redir_to_connected(int family, int sotype, int sock_mapfd, zero_verdict_count(verd_mapfd); - s = listen_loopback(family, sotype | SOCK_NONBLOCK); + s = socket_loopback(family, sotype | SOCK_NONBLOCK); if (s < 0) return; @@ -1009,7 +1012,7 @@ static void redir_to_listening(int family, int sotype, int sock_mapfd, zero_verdict_count(verd_mapfd); - s = listen_loopback(family, sotype | SOCK_NONBLOCK); + s = socket_loopback(family, sotype | SOCK_NONBLOCK); if (s < 0) return; @@ -1120,7 +1123,7 @@ static void test_reuseport_select_listening(int family, int sotype, zero_verdict_count(verd_map); - s = listen_loopback_reuseport(family, sotype, reuseport_prog); + s = socket_loopback_reuseport(family, sotype, reuseport_prog); if (s < 0) return; @@ -1174,7 +1177,7 @@ static void test_reuseport_select_connected(int family, int sotype, zero_verdict_count(verd_map); - s = listen_loopback_reuseport(family, sotype, reuseport_prog); + s = socket_loopback_reuseport(family, sotype, reuseport_prog); if (s < 0) return; @@ -1249,11 +1252,11 @@ static void test_reuseport_mixed_groups(int family, int sotype, int sock_map, zero_verdict_count(verd_map); /* Create two listeners, each in its own reuseport group */ - s1 = listen_loopback_reuseport(family, sotype, reuseport_prog); + s1 = socket_loopback_reuseport(family, sotype, reuseport_prog); if (s1 < 0) return; - s2 = listen_loopback_reuseport(family, sotype, reuseport_prog); + s2 = socket_loopback_reuseport(family, sotype, reuseport_prog); if (s2 < 0) goto close_srv1; -- 2.20.1

5 years, 4 months

1
0
0 0

[PATCH 1/2] kunit: kunit_parser: making parser more robust

by Heidi Fahim

Previously, kunit_parser did not properly handle kunit TAP output that - had any prefixes (generated from different configs) - had unrelated kernel output mixed in the middle of it, which has shown up when testing with allyesconfig To remove prefixes, the parser looks for the first line that includes TAP output, "TAP version 14". It then determines the length of the string before this sequence, and strips that number of characters off the beginning of the following lines until the last KUnit output line is reached. These fixes have been tested with additional tests in the KUnitParseTest and their associated logs have also been added. Signed-off-by: Heidi Fahim <heidifahim(a)google.com> --- tools/testing/kunit/kunit_parser.py | 54 +++++++-------- tools/testing/kunit/kunit_tool_test.py | 69 +++++++++++++++++++ .../test_data/test_config_printk_time.log | 31 +++++++++ .../test_data/test_interrupted_tap_output.log | 37 ++++++++++ .../test_data/test_kernel_panic_interrupt.log | 25 +++++++ .../test_data/test_multiple_prefixes.log | 31 +++++++++ ..._output_with_prefix_isolated_correctly.log | 33 +++++++++ .../kunit/test_data/test_pound_no_prefix.log | 33 +++++++++ .../kunit/test_data/test_pound_sign.log | 33 +++++++++ 9 files changed, 319 insertions(+), 27 deletions(-) create mode 100644 tools/testing/kunit/test_data/test_config_printk_time.log create mode 100644 tools/testing/kunit/test_data/test_interrupted_tap_output.log create mode 100644 tools/testing/kunit/test_data/test_kernel_panic_interrupt.log create mode 100644 tools/testing/kunit/test_data/test_multiple_prefixes.log create mode 100644 tools/testing/kunit/test_data/test_output_with_prefix_isolated_correctly.log create mode 100644 tools/testing/kunit/test_data/test_pound_no_prefix.log create mode 100644 tools/testing/kunit/test_data/test_pound_sign.log diff --git a/tools/testing/kunit/kunit_parser.py b/tools/testing/kunit/kunit_parser.py index 4ffbae0f6732..077b21d42258 100644 --- a/tools/testing/kunit/kunit_parser.py +++ b/tools/testing/kunit/kunit_parser.py @@ -46,19 +46,21 @@ class TestStatus(Enum): TEST_CRASHED = auto() NO_TESTS = auto() -kunit_start_re = re.compile(r'^TAP version [0-9]+$') -kunit_end_re = re.compile('List of all partitions:') +kunit_start_re = re.compile(r'TAP version [0-9]+$') +kunit_end_re = re.compile('(List of all partitions:|' + 'Kernel panic - not syncing: VFS:|reboot: System halted)') def isolate_kunit_output(kernel_output): started = False for line in kernel_output: - if kunit_start_re.match(line): + if kunit_start_re.search(line): + prefix_len = len(line.split('TAP version')[0]) started = True - yield line - elif kunit_end_re.match(line): + yield line[prefix_len:] if prefix_len > 0 else line + elif kunit_end_re.search(line): break elif started: - yield line + yield line[prefix_len:] if prefix_len > 0 else line def raw_output(kernel_output): for line in kernel_output: @@ -91,35 +93,33 @@ def print_log(log): for m in log: print_with_timestamp(m) -TAP_ENTRIES = re.compile(r'^(TAP|\t?ok|\t?not ok|\t?[0-9]+\.\.[0-9]+|\t?#).*$') +TAP_ENTRIES = re.compile(r'(TAP|\t?ok|\t?not ok|\t?[0-9]+\.\.[0-9]+|\t# .*?:.*?).*$') def consume_non_diagnositic(lines: List[str]) -> None: - while lines and not TAP_ENTRIES.match(lines[0]): + while lines and not TAP_ENTRIES.search(lines[0]): lines.pop(0) def save_non_diagnositic(lines: List[str], test_case: TestCase) -> None: - while lines and not TAP_ENTRIES.match(lines[0]): + while lines and not TAP_ENTRIES.search(lines[0]): test_case.log.append(lines[0]) lines.pop(0) OkNotOkResult = namedtuple('OkNotOkResult', ['is_ok','description', 'text']) -OK_NOT_OK_SUBTEST = re.compile(r'^\t(ok|not ok) [0-9]+ - (.*)$') +OK_NOT_OK_SUBTEST = re.compile(r'\t(ok|not ok) [0-9]+ - (.*)$') -OK_NOT_OK_MODULE = re.compile(r'^(ok|not ok) [0-9]+ - (.*)$') +OK_NOT_OK_MODULE = re.compile(r'(ok|not ok) [0-9]+ - (.*)$') -def parse_ok_not_ok_test_case(lines: List[str], - test_case: TestCase, - expecting_test_case: bool) -> bool: +def parse_ok_not_ok_test_case(lines: List[str], test_case: TestCase) -> bool: save_non_diagnositic(lines, test_case) if not lines: - if expecting_test_case: - test_case.status = TestStatus.TEST_CRASHED - return True - else: - return False + test_case.status = TestStatus.TEST_CRASHED + return True line = lines[0] match = OK_NOT_OK_SUBTEST.match(line) + while not match and lines: + line = lines.pop(0) + match = OK_NOT_OK_SUBTEST.match(line) if match: test_case.log.append(lines.pop(0)) test_case.name = match.group(2) @@ -150,12 +150,12 @@ def parse_diagnostic(lines: List[str], test_case: TestCase) -> bool: else: return False -def parse_test_case(lines: List[str], expecting_test_case: bool) -> TestCase: +def parse_test_case(lines: List[str]) -> TestCase: test_case = TestCase() save_non_diagnositic(lines, test_case) while parse_diagnostic(lines, test_case): pass - if parse_ok_not_ok_test_case(lines, test_case, expecting_test_case): + if parse_ok_not_ok_test_case(lines, test_case): return test_case else: return None @@ -202,7 +202,7 @@ def parse_ok_not_ok_test_suite(lines: List[str], test_suite: TestSuite) -> bool: test_suite.status = TestStatus.TEST_CRASHED return False line = lines[0] - match = OK_NOT_OK_MODULE.match(line) + match = OK_NOT_OK_MODULE.search(line) if match: lines.pop(0) if match.group(1) == 'ok': @@ -234,11 +234,11 @@ def parse_test_suite(lines: List[str]) -> TestSuite: expected_test_case_num = parse_subtest_plan(lines) if not expected_test_case_num: return None - test_case = parse_test_case(lines, expected_test_case_num > 0) - expected_test_case_num -= 1 - while test_case: + while expected_test_case_num > 0: + test_case = parse_test_case(lines) + if not test_case: + break test_suite.cases.append(test_case) - test_case = parse_test_case(lines, expected_test_case_num > 0) expected_test_case_num -= 1 if parse_ok_not_ok_test_suite(lines, test_suite): test_suite.status = bubble_up_test_case_errors(test_suite) @@ -250,7 +250,7 @@ def parse_test_suite(lines: List[str]) -> TestSuite: print('failed to parse end of suite' + lines[0]) return None -TAP_HEADER = re.compile(r'^TAP version 14$') +TAP_HEADER = re.compile(r'TAP version 14$') def parse_tap_header(lines: List[str]) -> bool: consume_non_diagnositic(lines) diff --git a/tools/testing/kunit/kunit_tool_test.py b/tools/testing/kunit/kunit_tool_test.py index cba97756ac4a..0efae697f396 100755 --- a/tools/testing/kunit/kunit_tool_test.py +++ b/tools/testing/kunit/kunit_tool_test.py @@ -108,6 +108,36 @@ class KUnitParserTest(unittest.TestCase): self.assertContains('ok 1 - example', result) file.close() + def test_output_with_prefix_isolated_correctly(self): + log_path = get_absolute_path( + 'test_data/test_pound_sign.log') + with open(log_path) as file: + result = kunit_parser.isolate_kunit_output(file.readlines()) + self.assertContains('TAP version 14\n', result) + self.assertContains(' # Subtest: kunit-resource-test', result) + self.assertContains(' 1..5', result) + self.assertContains(' ok 1 - kunit_resource_test_init_resources', result) + self.assertContains(' ok 2 - kunit_resource_test_alloc_resource', result) + self.assertContains(' ok 3 - kunit_resource_test_destroy_resource', result) + self.assertContains(' foo bar #', result) + self.assertContains(' ok 4 - kunit_resource_test_cleanup_resources', result) + self.assertContains(' ok 5 - kunit_resource_test_proper_free_ordering', result) + self.assertContains('ok 1 - kunit-resource-test', result) + self.assertContains(' foo bar # non-kunit output', result) + self.assertContains(' # Subtest: kunit-try-catch-test', result) + self.assertContains(' 1..2', result) + self.assertContains(' ok 1 - kunit_test_try_catch_successful_try_no_catch', + result) + self.assertContains(' ok 2 - kunit_test_try_catch_unsuccessful_try_does_catch', + result) + self.assertContains('ok 2 - kunit-try-catch-test', result) + self.assertContains(' # Subtest: string-stream-test', result) + self.assertContains(' 1..3', result) + self.assertContains(' ok 1 - string_stream_test_empty_on_creation', result) + self.assertContains(' ok 2 - string_stream_test_not_empty_after_add', result) + self.assertContains(' ok 3 - string_stream_test_get_string', result) + self.assertContains('ok 3 - string-stream-test', result) + def test_parse_successful_test_log(self): all_passed_log = get_absolute_path( 'test_data/test_is_test_passed-all_passed.log') @@ -150,6 +180,45 @@ class KUnitParserTest(unittest.TestCase): result.status) file.close() + def test_ignores_prefix_printk_time(self): + prefix_log = get_absolute_path( + 'test_data/test_config_printk_time.log') + with open(prefix_log) as file: + result = kunit_parser.parse_run_tests(file.readlines()) + self.assertEqual('kunit-resource-test', result.suites[0].name) + + def test_ignores_multiple_prefixes(self): + prefix_log = get_absolute_path( + 'test_data/test_multiple_prefixes.log') + with open(prefix_log) as file: + result = kunit_parser.parse_run_tests(file.readlines()) + self.assertEqual('kunit-resource-test', result.suites[0].name) + + def test_prefix_mixed_kernel_output(self): + mixed_prefix_log = get_absolute_path( + 'test_data/test_interrupted_tap_output.log') + with open(mixed_prefix_log) as file: + result = kunit_parser.parse_run_tests(file.readlines()) + self.assertEqual('kunit-resource-test', result.suites[0].name) + + def test_prefix_poundsign(self): + pound_log = get_absolute_path('test_data/test_pound_sign.log') + with open(pound_log) as file: + result = kunit_parser.parse_run_tests(file.readlines()) + self.assertEqual('kunit-resource-test', result.suites[0].name) + + def test_kernel_panic_end(self): + panic_log = get_absolute_path('test_data/test_kernel_panic_interrupt.log') + with open(panic_log) as file: + result = kunit_parser.parse_run_tests(file.readlines()) + self.assertEqual('kunit-resource-test', result.suites[0].name) + + def test_pound_no_prefix(self): + pound_log = get_absolute_path('test_data/test_pound_no_prefix.log') + with open(pound_log) as file: + result = kunit_parser.parse_run_tests(file.readlines()) + self.assertEqual('kunit-resource-test', result.suites[0].name) + class StrContains(str): def __eq__(self, other): return self in other diff --git a/tools/testing/kunit/test_data/test_config_printk_time.log b/tools/testing/kunit/test_data/test_config_printk_time.log new file mode 100644 index 000000000000..c02ca773946d --- /dev/null +++ b/tools/testing/kunit/test_data/test_config_printk_time.log @@ -0,0 +1,31 @@ +[ 0.060000] printk: console [mc-1] enabled +[ 0.060000] random: get_random_bytes called from init_oops_id+0x35/0x40 with crng_init=0 +[ 0.060000] TAP version 14 +[ 0.060000] # Subtest: kunit-resource-test +[ 0.060000] 1..5 +[ 0.060000] ok 1 - kunit_resource_test_init_resources +[ 0.060000] ok 2 - kunit_resource_test_alloc_resource +[ 0.060000] ok 3 - kunit_resource_test_destroy_resource +[ 0.060000] ok 4 - kunit_resource_test_cleanup_resources +[ 0.060000] ok 5 - kunit_resource_test_proper_free_ordering +[ 0.060000] ok 1 - kunit-resource-test +[ 0.060000] # Subtest: kunit-try-catch-test +[ 0.060000] 1..2 +[ 0.060000] ok 1 - kunit_test_try_catch_successful_try_no_catch +[ 0.060000] ok 2 - kunit_test_try_catch_unsuccessful_try_does_catch +[ 0.060000] ok 2 - kunit-try-catch-test +[ 0.060000] # Subtest: string-stream-test +[ 0.060000] 1..3 +[ 0.060000] ok 1 - string_stream_test_empty_on_creation +[ 0.060000] ok 2 - string_stream_test_not_empty_after_add +[ 0.060000] ok 3 - string_stream_test_get_string +[ 0.060000] ok 3 - string-stream-test +[ 0.060000] List of all partitions: +[ 0.060000] No filesystem could mount root, tried: +[ 0.060000] +[ 0.060000] Kernel panic - not syncing: VFS: Unable to mount root fs on unknown-block(98,0) +[ 0.060000] CPU: 0 PID: 1 Comm: swapper Not tainted 5.4.0-rc1-gea2dd7c0875e-dirty #2 +[ 0.060000] Stack: +[ 0.060000] 602086f8 601bc260 705c0000 705c0000 +[ 0.060000] 602086f8 6005fcec 705c0000 6002c6ab +[ 0.060000] 6005fcec 601bc260 705c0000 3000000010 \ No newline at end of file diff --git a/tools/testing/kunit/test_data/test_interrupted_tap_output.log b/tools/testing/kunit/test_data/test_interrupted_tap_output.log new file mode 100644 index 000000000000..5c73fb3a1c6f --- /dev/null +++ b/tools/testing/kunit/test_data/test_interrupted_tap_output.log @@ -0,0 +1,37 @@ +[ 0.060000] printk: console [mc-1] enabled +[ 0.060000] random: get_random_bytes called from init_oops_id+0x35/0x40 with crng_init=0 +[ 0.060000] TAP version 14 +[ 0.060000] # Subtest: kunit-resource-test +[ 0.060000] 1..5 +[ 0.060000] ok 1 - kunit_resource_test_init_resources +[ 0.060000] ok 2 - kunit_resource_test_alloc_resource +[ 0.060000] ok 3 - kunit_resource_test_destroy_resource +[ 0.060000] kAFS: Red Hat AFS client v0.1 registering. +[ 0.060000] FS-Cache: Netfs 'afs' registered for caching +[ 0.060000] *** VALIDATE kAFS *** +[ 0.060000] Btrfs loaded, crc32c=crc32c-generic, debug=on, assert=on, integrity-checker=on, ref-verify=on +[ 0.060000] BTRFS: selftest: sectorsize: 4096 nodesize: 4096 +[ 0.060000] BTRFS: selftest: running btrfs free space cache tests +[ 0.060000] ok 4 - kunit_resource_test_cleanup_resources +[ 0.060000] ok 5 - kunit_resource_test_proper_free_ordering +[ 0.060000] ok 1 - kunit-resource-test +[ 0.060000] # Subtest: kunit-try-catch-test +[ 0.060000] 1..2 +[ 0.060000] ok 1 - kunit_test_try_catch_successful_try_no_catch +[ 0.060000] ok 2 - kunit_test_try_catch_unsuccessful_try_does_catch +[ 0.060000] ok 2 - kunit-try-catch-test +[ 0.060000] # Subtest: string-stream-test +[ 0.060000] 1..3 +[ 0.060000] ok 1 - string_stream_test_empty_on_creation +[ 0.060000] ok 2 - string_stream_test_not_empty_after_add +[ 0.060000] ok 3 - string_stream_test_get_string +[ 0.060000] ok 3 - string-stream-test +[ 0.060000] List of all partitions: +[ 0.060000] No filesystem could mount root, tried: +[ 0.060000] +[ 0.060000] Kernel panic - not syncing: VFS: Unable to mount root fs on unknown-block(98,0) +[ 0.060000] CPU: 0 PID: 1 Comm: swapper Not tainted 5.4.0-rc1-gea2dd7c0875e-dirty #2 +[ 0.060000] Stack: +[ 0.060000] 602086f8 601bc260 705c0000 705c0000 +[ 0.060000] 602086f8 6005fcec 705c0000 6002c6ab +[ 0.060000] 6005fcec 601bc260 705c0000 3000000010 \ No newline at end of file diff --git a/tools/testing/kunit/test_data/test_kernel_panic_interrupt.log b/tools/testing/kunit/test_data/test_kernel_panic_interrupt.log new file mode 100644 index 000000000000..c045eee75f27 --- /dev/null +++ b/tools/testing/kunit/test_data/test_kernel_panic_interrupt.log @@ -0,0 +1,25 @@ +[ 0.060000] printk: console [mc-1] enabled +[ 0.060000] random: get_random_bytes called from init_oops_id+0x35/0x40 with crng_init=0 +[ 0.060000] TAP version 14 +[ 0.060000] # Subtest: kunit-resource-test +[ 0.060000] 1..5 +[ 0.060000] ok 1 - kunit_resource_test_init_resources +[ 0.060000] ok 2 - kunit_resource_test_alloc_resource +[ 0.060000] ok 3 - kunit_resource_test_destroy_resource +[ 0.060000] ok 4 - kunit_resource_test_cleanup_resources +[ 0.060000] ok 5 - kunit_resource_test_proper_free_ordering +[ 0.060000] ok 1 - kunit-resource-test +[ 0.060000] # Subtest: kunit-try-catch-test +[ 0.060000] 1..2 +[ 0.060000] ok 1 - kunit_test_try_catch_successful_try_no_catch +[ 0.060000] ok 2 - kunit_test_try_catch_unsuccessful_try_does_catch +[ 0.060000] ok 2 - kunit-try-catch-test +[ 0.060000] # Subtest: string-stream-test +[ 0.060000] 1..3 +[ 0.060000] ok 1 - string_stream_test_empty_on_creation +[ 0.060000] Kernel panic - not syncing: VFS: Unable to mount root fs on unknown-block(98,0) +[ 0.060000] CPU: 0 PID: 1 Comm: swapper Not tainted 5.4.0-rc1-gea2dd7c0875e-dirty #2 +[ 0.060000] Stack: +[ 0.060000] 602086f8 601bc260 705c0000 705c0000 +[ 0.060000] 602086f8 6005fcec 705c0000 6002c6ab +[ 0.060000] 6005fcec 601bc260 705c0000 3000000010 \ No newline at end of file diff --git a/tools/testing/kunit/test_data/test_multiple_prefixes.log b/tools/testing/kunit/test_data/test_multiple_prefixes.log new file mode 100644 index 000000000000..bc48407dcc36 --- /dev/null +++ b/tools/testing/kunit/test_data/test_multiple_prefixes.log @@ -0,0 +1,31 @@ +[ 0.060000][ T1] printk: console [mc-1] enabled +[ 0.060000][ T1] random: get_random_bytes called from init_oops_id+0x35/0x40 with crng_init=0 +[ 0.060000][ T1] TAP version 14 +[ 0.060000][ T1] # Subtest: kunit-resource-test +[ 0.060000][ T1] 1..5 +[ 0.060000][ T1] ok 1 - kunit_resource_test_init_resources +[ 0.060000][ T1] ok 2 - kunit_resource_test_alloc_resource +[ 0.060000][ T1] ok 3 - kunit_resource_test_destroy_resource +[ 0.060000][ T1] ok 4 - kunit_resource_test_cleanup_resources +[ 0.060000][ T1] ok 5 - kunit_resource_test_proper_free_ordering +[ 0.060000][ T1] ok 1 - kunit-resource-test +[ 0.060000][ T1] # Subtest: kunit-try-catch-test +[ 0.060000][ T1] 1..2 +[ 0.060000][ T1] ok 1 - kunit_test_try_catch_successful_try_no_catch +[ 0.060000][ T1] ok 2 - kunit_test_try_catch_unsuccessful_try_does_catch +[ 0.060000][ T1] ok 2 - kunit-try-catch-test +[ 0.060000][ T1] # Subtest: string-stream-test +[ 0.060000][ T1] 1..3 +[ 0.060000][ T1] ok 1 - string_stream_test_empty_on_creation +[ 0.060000][ T1] ok 2 - string_stream_test_not_empty_after_add +[ 0.060000][ T1] ok 3 - string_stream_test_get_string +[ 0.060000][ T1] ok 3 - string-stream-test +[ 0.060000][ T1] List of all partitions: +[ 0.060000][ T1] No filesystem could mount root, tried: +[ 0.060000][ T1] +[ 0.060000][ T1] Kernel panic - not syncing: VFS: Unable to mount root fs on unknown-block(98,0) +[ 0.060000][ T1] CPU: 0 PID: 1 Comm: swapper Not tainted 5.4.0-rc1-gea2dd7c0875e-dirty #2 +[ 0.060000][ T1] Stack: +[ 0.060000][ T1] 602086f8 601bc260 705c0000 705c0000 +[ 0.060000][ T1] 602086f8 6005fcec 705c0000 6002c6ab +[ 0.060000][ T1] 6005fcec 601bc260 705c0000 3000000010 \ No newline at end of file diff --git a/tools/testing/kunit/test_data/test_output_with_prefix_isolated_correctly.log b/tools/testing/kunit/test_data/test_output_with_prefix_isolated_correctly.log new file mode 100644 index 000000000000..0f87cdabebb0 --- /dev/null +++ b/tools/testing/kunit/test_data/test_output_with_prefix_isolated_correctly.log @@ -0,0 +1,33 @@ +[ 0.060000] printk: console [mc-1] enabled +[ 0.060000] random: get_random_bytes called from init_oops_id+0x35/0x40 with crng_init=0 +[ 0.060000] TAP version 14 +[ 0.060000] # Subtest: kunit-resource-test +[ 0.060000] 1..5 +[ 0.060000] ok 1 - kunit_resource_test_init_resources +[ 0.060000] ok 2 - kunit_resource_test_alloc_resource +[ 0.060000] ok 3 - kunit_resource_test_destroy_resource +[ 0.060000] foo bar # +[ 0.060000] ok 4 - kunit_resource_test_cleanup_resources +[ 0.060000] ok 5 - kunit_resource_test_proper_free_ordering +[ 0.060000] ok 1 - kunit-resource-test +[ 0.060000] foo bar # non-kunit output +[ 0.060000] # Subtest: kunit-try-catch-test +[ 0.060000] 1..2 +[ 0.060000] ok 1 - kunit_test_try_catch_successful_try_no_catch +[ 0.060000] ok 2 - kunit_test_try_catch_unsuccessful_try_does_catch +[ 0.060000] ok 2 - kunit-try-catch-test +[ 0.060000] # Subtest: string-stream-test +[ 0.060000] 1..3 +[ 0.060000] ok 1 - string_stream_test_empty_on_creation +[ 0.060000] ok 2 - string_stream_test_not_empty_after_add +[ 0.060000] ok 3 - string_stream_test_get_string +[ 0.060000] ok 3 - string-stream-test +[ 0.060000] List of all partitions: +[ 0.060000] No filesystem could mount root, tried: +[ 0.060000] +[ 0.060000] Kernel panic - not syncing: VFS: Unable to mount root fs on unknown-block(98,0) +[ 0.060000] CPU: 0 PID: 1 Comm: swapper Not tainted 5.4.0-rc1-gea2dd7c0875e-dirty #2 +[ 0.060000] Stack: +[ 0.060000] 602086f8 601bc260 705c0000 705c0000 +[ 0.060000] 602086f8 6005fcec 705c0000 6002c6ab +[ 0.060000] 6005fcec 601bc260 705c0000 3000000010 \ No newline at end of file diff --git a/tools/testing/kunit/test_data/test_pound_no_prefix.log b/tools/testing/kunit/test_data/test_pound_no_prefix.log new file mode 100644 index 000000000000..2ceb360be7d5 --- /dev/null +++ b/tools/testing/kunit/test_data/test_pound_no_prefix.log @@ -0,0 +1,33 @@ + printk: console [mc-1] enabled + random: get_random_bytes called from init_oops_id+0x35/0x40 with crng_init=0 + TAP version 14 + # Subtest: kunit-resource-test + 1..5 + ok 1 - kunit_resource_test_init_resources + ok 2 - kunit_resource_test_alloc_resource + ok 3 - kunit_resource_test_destroy_resource + foo bar # + ok 4 - kunit_resource_test_cleanup_resources + ok 5 - kunit_resource_test_proper_free_ordering + ok 1 - kunit-resource-test + foo bar # non-kunit output + # Subtest: kunit-try-catch-test + 1..2 + ok 1 - kunit_test_try_catch_successful_try_no_catch + ok 2 - kunit_test_try_catch_unsuccessful_try_does_catch + ok 2 - kunit-try-catch-test + # Subtest: string-stream-test + 1..3 + ok 1 - string_stream_test_empty_on_creation + ok 2 - string_stream_test_not_empty_after_add + ok 3 - string_stream_test_get_string + ok 3 - string-stream-test + List of all partitions: + No filesystem could mount root, tried: + + Kernel panic - not syncing: VFS: Unable to mount root fs on unknown-block(98,0) + CPU: 0 PID: 1 Comm: swapper Not tainted 5.4.0-rc1-gea2dd7c0875e-dirty #2 + Stack: + 602086f8 601bc260 705c0000 705c0000 + 602086f8 6005fcec 705c0000 6002c6ab + 6005fcec 601bc260 705c0000 3000000010 \ No newline at end of file diff --git a/tools/testing/kunit/test_data/test_pound_sign.log b/tools/testing/kunit/test_data/test_pound_sign.log new file mode 100644 index 000000000000..0f87cdabebb0 --- /dev/null +++ b/tools/testing/kunit/test_data/test_pound_sign.log @@ -0,0 +1,33 @@ +[ 0.060000] printk: console [mc-1] enabled +[ 0.060000] random: get_random_bytes called from init_oops_id+0x35/0x40 with crng_init=0 +[ 0.060000] TAP version 14 +[ 0.060000] # Subtest: kunit-resource-test +[ 0.060000] 1..5 +[ 0.060000] ok 1 - kunit_resource_test_init_resources +[ 0.060000] ok 2 - kunit_resource_test_alloc_resource +[ 0.060000] ok 3 - kunit_resource_test_destroy_resource +[ 0.060000] foo bar # +[ 0.060000] ok 4 - kunit_resource_test_cleanup_resources +[ 0.060000] ok 5 - kunit_resource_test_proper_free_ordering +[ 0.060000] ok 1 - kunit-resource-test +[ 0.060000] foo bar # non-kunit output +[ 0.060000] # Subtest: kunit-try-catch-test +[ 0.060000] 1..2 +[ 0.060000] ok 1 - kunit_test_try_catch_successful_try_no_catch +[ 0.060000] ok 2 - kunit_test_try_catch_unsuccessful_try_does_catch +[ 0.060000] ok 2 - kunit-try-catch-test +[ 0.060000] # Subtest: string-stream-test +[ 0.060000] 1..3 +[ 0.060000] ok 1 - string_stream_test_empty_on_creation +[ 0.060000] ok 2 - string_stream_test_not_empty_after_add +[ 0.060000] ok 3 - string_stream_test_get_string +[ 0.060000] ok 3 - string-stream-test +[ 0.060000] List of all partitions: +[ 0.060000] No filesystem could mount root, tried: +[ 0.060000] +[ 0.060000] Kernel panic - not syncing: VFS: Unable to mount root fs on unknown-block(98,0) +[ 0.060000] CPU: 0 PID: 1 Comm: swapper Not tainted 5.4.0-rc1-gea2dd7c0875e-dirty #2 +[ 0.060000] Stack: +[ 0.060000] 602086f8 601bc260 705c0000 705c0000 +[ 0.060000] 602086f8 6005fcec 705c0000 6002c6ab +[ 0.060000] 6005fcec 601bc260 705c0000 3000000010 \ No newline at end of file -- 2.25.0.265.gbab2e86ba0-goog

5 years, 4 months

2
6
0 0

[PATCH v5 00/19] x86/cpu: Clean up handling of VMX features

by Sean Christopherson

Clean up a handful of interrelated warts in the kernel's handling of VMX: - Enable VMX in IA32_FEATURE_CONTROL during boot instead of on-demand during KVM load to avoid future contention over IA32_FEATURE_CONTROL. - Rework VMX feature reporting so that it is accurate and up-to-date, now and in the future. - Consolidate code across CPUs that support VMX. This series stems from two separate but related issues. The first issue, pointed out by Boris in the SGX enabling series[*], is that the kernel currently doesn't ensure the IA32_FEATURE_CONTROL MSR is configured during boot. The second issue is that the kernel's reporting of VMX features is stale, potentially inaccurate, and difficult to maintain. v5: - Rebase to tip/master, ec7b10f2d023 ("Merge branch 'x86/cleanups'") - Fix a missing IA32_FEAT_CTL change in the idle driver (which amusingly reads the MSR to deal with SGX). [kbuild test robot] - Tweak the displayed names for VMX flags. [Boris, Paolo, Liran] - Add a comment above the raw rdmsr() calls in the VMX feature flag parsing. [Boris] - Fix a few changelog typos. [Boris] - Use VMX_F() instead of F() for the VMX flag extraction macro. [Boris] - Drop 'PROC' from the PRIMARY_CTLS and SECONDARY_CTLS enums to keep line lengths sane. - Keep the pr_fmt at the top of feat_ctl.c when the flag populating code is introduced (previously got buried in the middle of the file). v4: - Rebase to tip/master, 8a1b070333f4 ("Merge branch 'WIP.x86/mm'") - Rename everything feature control related to IA32_FEAT_CTL. [Boris] - Minor coding style tweaks [Boris and Jarkko]. - Print VMX feature flags in "vmx flags" to avoid polluting "flags", but keep printing the current synthetic VMX in "flags" so as not to break the ABI. [Boris] - Don't bother printing an error message in the extremely unlikely event VMX is supported but IA32_FEAT_CTL doesn't exist. [Boris] - Beef up a few changelogs and comments. [Boris] - Add a comment in the LMCE code for the new WARN. [Jarkko] - Check CONFIG_KVM_INTEL instead of CONFIG_KVM when deciding whether or not to enable VMX. - Add a patch to introduce X86_FEATURE_MSR_IA32_FEAT_CTL. - Dropped Jim's Reviewed-by from a few KVM patches due to the above addition. v3: - Rebase to tip/master, ceceaf1f12ba ("Merge branch 'WIP.x86/cleanups'"). - Rename the feature control MSR bit defines [Boris]. - Rewrite the error message displayed when reading feature control MSR faults on a VMX capable CPU to explicitly state that it's likely a hardware or hypervisor issue [Boris]. - Collect a Reviewed-by for the LMCE change [Boris]. - Enable VMX in feature control (if it's unlocked) if and only if KVM is enabled [Paolo]. - Remove a big pile of redudant MSR defines from the KVM selftests that was discovered when renaming the feature control defines. - Fix a changelog typo [Boris]. v2: - Rebase to latest tip/x86/cpu (1edae1ae6258, "x86/Kconfig: Enforce...) - Collect Jim's reviews. - Fix a typo in setting of EPT capabilities [TonyWWang-oc]. - Remove defines for reserved VMX feature flags [Paolo]. - Print the VMX features under "flags" and maintain all existing names to be backward compatible with the ABI [Paolo]. - Create aggregate APIC features to report FLEXPRIORITY and APICV, so that the full feature *and* their associated individual features are printed, e.g. to aid in recognizing why an APIC feature isn't being used. - Fix a few copy paste errors in changelogs. v1 cover letter: == IA32_FEATURE_CONTROL == Lack of IA32_FEATURE_CONTROL configuration during boot isn't a functional issue in the current kernel as the majority of platforms set and lock IA32_FEATURE_CONTROL in firmware. And when the MSR is left unlocked, KVM is the only subsystem that writes IA32_FEATURE_CONTROL. That will change if/when SGX support is enabled, as SGX will also want to fully enable itself when IA32_FEATURE_CONTROL is unlocked. == VMX Feature Reporting == VMX features are not enumerated via CPUID, but instead are enumerated through VMX MSRs. As a result, new VMX features are not automatically reported via /proc/cpuinfo. An attempt was made long ago to report interesting and/or meaningful VMX features by synthesizing select features into a Linux-defined cpufeatures word. Synthetic feature flags worked for the initial purpose, but the existence of the synthetic flags was forgotten almost immediately, e.g. only one new flag (EPT A/D) has been added in the the decade since the synthetic VMX features were introduced, while VMX and KVM have gained support for many new features. Placing the synthetic flags in x86_capability also allows them to be queried via cpu_has() and company, which is misleading as the flags exist purely for reporting via /proc/cpuinfo. KVM, the only in-kernel user of VMX, ignores the flags. Last but not least, VMX features are reported in /proc/cpuinfo even when VMX is unusable due to lack of enabling in IA32_FEATURE_CONTROL. == Caveats == All of the testing of non-standard flows was done in a VM, as I don't have a system that leaves IA32_FEATURE_CONTROL unlocked, or locks it with VMX disabled. The Centaur and Zhaoxin changes are somewhat speculative, as I haven't confirmed they actually support IA32_FEATURE_CONTROL, or that they want to gain "official" KVM support. I assume they unofficially support KVM given that both CPUs went through the effort of enumerating VMX features. That in turn would require them to support IA32_FEATURE_CONTROL since KVM will fault and refuse to load if the MSR doesn't exist. [*] https://lkml.kernel.org/r/20190925085156.GA3891@zn.tnic Sean Christopherson (19): x86/msr-index: Clean up bit defines for IA32_FEATURE_CONTROL MSR selftests: kvm: Replace manual MSR defs with common msr-index.h tools arch x86: Sync msr-index.h from kernel sources x86/intel: Initialize IA32_FEAT_CTL MSR at boot x86/mce: WARN once if IA32_FEAT_CTL MSR is left unlocked x86/centaur: Use common IA32_FEAT_CTL MSR initialization x86/zhaoxin: Use common IA32_FEAT_CTL MSR initialization x86/cpu: Clear VMX feature flag if VMX is not fully enabled x86/vmx: Introduce VMX_FEATURES_* x86/cpu: Detect VMX features on Intel, Centaur and Zhaoxin CPUs x86/cpu: Print VMX flags in /proc/cpuinfo using VMX_FEATURES_* x86/cpu: Set synthetic VMX cpufeatures during init_ia32_feat_ctl() x86/cpufeatures: Add flag to track whether MSR IA32_FEAT_CTL is configured KVM: VMX: Drop initialization of IA32_FEAT_CTL MSR KVM: VMX: Use VMX feature flag to query BIOS enabling KVM: VMX: Check for full VMX support when verifying CPU compatibility KVM: VMX: Use VMX_FEATURE_* flags to define VMCS control bits perf/x86: Provide stubs of KVM helpers for non-Intel CPUs KVM: VMX: Allow KVM_INTEL when building for Centaur and/or Zhaoxin CPUs MAINTAINERS | 2 +- arch/x86/Kconfig.cpu | 8 + arch/x86/boot/mkcpustr.c | 1 + arch/x86/include/asm/cpufeatures.h | 1 + arch/x86/include/asm/msr-index.h | 14 +- arch/x86/include/asm/perf_event.h | 22 +- arch/x86/include/asm/processor.h | 4 + arch/x86/include/asm/vmx.h | 105 +-- arch/x86/include/asm/vmxfeatures.h | 86 +++ arch/x86/kernel/cpu/Makefile | 6 +- arch/x86/kernel/cpu/centaur.c | 35 +- arch/x86/kernel/cpu/common.c | 3 + arch/x86/kernel/cpu/cpu.h | 4 + arch/x86/kernel/cpu/feat_ctl.c | 144 ++++ arch/x86/kernel/cpu/intel.c | 49 +- arch/x86/kernel/cpu/mce/intel.c | 15 +- arch/x86/kernel/cpu/mkcapflags.sh | 15 +- arch/x86/kernel/cpu/proc.c | 15 + arch/x86/kernel/cpu/zhaoxin.c | 35 +- arch/x86/kvm/Kconfig | 10 +- arch/x86/kvm/vmx/nested.c | 4 +- arch/x86/kvm/vmx/vmx.c | 67 +- arch/x86/kvm/vmx/vmx.h | 2 +- arch/x86/kvm/x86.c | 2 +- drivers/idle/intel_idle.c | 2 +- tools/arch/x86/include/asm/msr-index.h | 14 +- tools/power/x86/turbostat/turbostat.c | 4 +- tools/testing/selftests/kvm/Makefile | 4 +- .../selftests/kvm/include/x86_64/processor.h | 726 +----------------- tools/testing/selftests/kvm/lib/x86_64/vmx.c | 8 +- 30 files changed, 420 insertions(+), 987 deletions(-) create mode 100644 arch/x86/include/asm/vmxfeatures.h create mode 100644 arch/x86/kernel/cpu/feat_ctl.c -- 2.24.1

5 years, 4 months

4
43
0 0

[PATCH] selftests/vm: Fix map_hugetlb length used for testing read and write

by Christophe Leroy

Commit fa7b9a805c79 ("tools/selftest/vm: allow choosing mem size and page size in map_hugetlb") added the possibility to change the size of memory mapped for the test, but left the read and write test using the default value. This is unnoticed when mapping a length greater than the default one, but segfaults otherwise. Fix read_bytes() and write_bytes() by giving them the real length. Also fix the call to munmap(). Fixes: fa7b9a805c79 ("tools/selftest/vm: allow choosing mem size and page size in map_hugetlb") Cc: stable(a)vger.kernel.org Signed-off-by: Christophe Leroy <christophe.leroy(a)c-s.fr> --- tools/testing/selftests/vm/map_hugetlb.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/testing/selftests/vm/map_hugetlb.c b/tools/testing/selftests/vm/map_hugetlb.c index 5a2d7b8efc40..6af951900aa3 100644 --- a/tools/testing/selftests/vm/map_hugetlb.c +++ b/tools/testing/selftests/vm/map_hugetlb.c @@ -45,20 +45,20 @@ static void check_bytes(char *addr) printf("First hex is %x\n", *((unsigned int *)addr)); } -static void write_bytes(char *addr) +static void write_bytes(char *addr, size_t length) { unsigned long i; - for (i = 0; i < LENGTH; i++) + for (i = 0; i < length; i++) *(addr + i) = (char)i; } -static int read_bytes(char *addr) +static int read_bytes(char *addr, size_t length) { unsigned long i; check_bytes(addr); - for (i = 0; i < LENGTH; i++) + for (i = 0; i < length; i++) if (*(addr + i) != (char)i) { printf("Mismatch at %lu\n", i); return 1; @@ -96,11 +96,11 @@ int main(int argc, char **argv) printf("Returned address is %p\n", addr); check_bytes(addr); - write_bytes(addr); - ret = read_bytes(addr); + write_bytes(addr, length); + ret = read_bytes(addr, length); /* munmap() length of MAP_HUGETLB memory must be hugepage aligned */ - if (munmap(addr, LENGTH)) { + if (munmap(addr, length)) { perror("munmap"); exit(1); } -- 2.25.0

5 years, 4 months

2
3
0 0

Re: [RFC PATCH v14 01/10] landlock: Add object and rule management

by Mickaël Salaün

On 27/02/2020 05:20, Hillf Danton wrote: > > On Mon, 24 Feb 2020 17:02:06 +0100 Mickaël Salaün >> A Landlock object enables to identify a kernel object (e.g. an inode). >> A Landlock rule is a set of access rights allowed on an object. Rules >> are grouped in rulesets that may be tied to a set of processes (i.e. >> subjects) to enforce a scoped access-control (i.e. a domain). >> >> Because Landlock's goal is to empower any process (especially >> unprivileged ones) to sandbox themselves, we can't rely on a system-wide >> object identification such as file extended attributes. Indeed, we need >> innocuous, composable and modular access-controls. >> >> The main challenge with this constraints is to identify kernel objects >> while this identification is useful (i.e. when a security policy makes >> use of this object). But this identification data should be freed once >> no policy is using it. This ephemeral tagging should not and may not be >> written in the filesystem. We then need to manage the lifetime of a >> rule according to the lifetime of its object. To avoid a global lock, >> this implementation make use of RCU and counters to safely reference >> objects. >> >> A following commit uses this generic object management for inodes. >> >> Signed-off-by: Mickaël Salaün <mic(a)digikod.net> >> Cc: Andy Lutomirski <luto(a)amacapital.net> >> Cc: James Morris <jmorris(a)namei.org> >> Cc: Kees Cook <keescook(a)chromium.org> >> Cc: Serge E. Hallyn <serge(a)hallyn.com> >> --- >> >> Changes since v13: >> * New dedicated implementation, removing the need for eBPF. >> >> Previous version: >> https://lore.kernel.org/lkml/20190721213116.23476-6-mic@digikod.net/ >> --- >> MAINTAINERS | 10 ++ >> security/Kconfig | 1 + >> security/Makefile | 2 + >> security/landlock/Kconfig | 15 ++ >> security/landlock/Makefile | 3 + >> security/landlock/object.c | 339 +++++++++++++++++++++++++++++++++++++ >> security/landlock/object.h | 134 +++++++++++++++ >> 7 files changed, 504 insertions(+) >> create mode 100644 security/landlock/Kconfig >> create mode 100644 security/landlock/Makefile >> create mode 100644 security/landlock/object.c >> create mode 100644 security/landlock/object.h >> >> diff --git a/MAINTAINERS b/MAINTAINERS >> index fcd79fc38928..206f85768cd9 100644 >> --- a/MAINTAINERS >> +++ b/MAINTAINERS >> @@ -9360,6 +9360,16 @@ F: net/core/skmsg.c >> F: net/core/sock_map.c >> F: net/ipv4/tcp_bpf.c >> >> +LANDLOCK SECURITY MODULE >> +M: Mickaël Salaün <mic(a)digikod.net> >> +L: linux-security-module(a)vger.kernel.org >> +W: https://landlock.io >> +T: git https://github.com/landlock-lsm/linux.git >> +S: Supported >> +F: security/landlock/ >> +K: landlock >> +K: LANDLOCK >> + >> LANTIQ / INTEL Ethernet drivers >> M: Hauke Mehrtens <hauke(a)hauke-m.de> >> L: netdev(a)vger.kernel.org >> diff --git a/security/Kconfig b/security/Kconfig >> index 2a1a2d396228..9d9981394fb0 100644 >> --- a/security/Kconfig >> +++ b/security/Kconfig >> @@ -238,6 +238,7 @@ source "security/loadpin/Kconfig" >> source "security/yama/Kconfig" >> source "security/safesetid/Kconfig" >> source "security/lockdown/Kconfig" >> +source "security/landlock/Kconfig" >> >> source "security/integrity/Kconfig" >> >> diff --git a/security/Makefile b/security/Makefile >> index 746438499029..2472ef96d40a 100644 >> --- a/security/Makefile >> +++ b/security/Makefile >> @@ -12,6 +12,7 @@ subdir-$(CONFIG_SECURITY_YAMA) += yama >> subdir-$(CONFIG_SECURITY_LOADPIN) += loadpin >> subdir-$(CONFIG_SECURITY_SAFESETID) += safesetid >> subdir-$(CONFIG_SECURITY_LOCKDOWN_LSM) += lockdown >> +subdir-$(CONFIG_SECURITY_LANDLOCK) += landlock >> >> # always enable default capabilities >> obj-y += commoncap.o >> @@ -29,6 +30,7 @@ obj-$(CONFIG_SECURITY_YAMA) += yama/ >> obj-$(CONFIG_SECURITY_LOADPIN) += loadpin/ >> obj-$(CONFIG_SECURITY_SAFESETID) += safesetid/ >> obj-$(CONFIG_SECURITY_LOCKDOWN_LSM) += lockdown/ >> +obj-$(CONFIG_SECURITY_LANDLOCK) += landlock/ >> obj-$(CONFIG_CGROUP_DEVICE) += device_cgroup.o >> >> # Object integrity file lists >> diff --git a/security/landlock/Kconfig b/security/landlock/Kconfig >> new file mode 100644 >> index 000000000000..4a321d5b3f67 >> --- /dev/null >> +++ b/security/landlock/Kconfig >> @@ -0,0 +1,15 @@ >> +# SPDX-License-Identifier: GPL-2.0-only >> + >> +config SECURITY_LANDLOCK >> + bool "Landlock support" >> + depends on SECURITY >> + default n >> + help >> + This selects Landlock, a safe sandboxing mechanism. It enables to >> + restrict processes on the fly (i.e. enforce an access control policy), >> + which can complement seccomp-bpf. The security policy is a set of access >> + rights tied to an object, which could be a file, a socket or a process. >> + >> + See Documentation/security/landlock/ for further information. >> + >> + If you are unsure how to answer this question, answer N. >> diff --git a/security/landlock/Makefile b/security/landlock/Makefile >> new file mode 100644 >> index 000000000000..cb6deefbf4c0 >> --- /dev/null >> +++ b/security/landlock/Makefile >> @@ -0,0 +1,3 @@ >> +obj-$(CONFIG_SECURITY_LANDLOCK) := landlock.o >> + >> +landlock-y := object.o >> diff --git a/security/landlock/object.c b/security/landlock/object.c >> new file mode 100644 >> index 000000000000..38fbbb108120 >> --- /dev/null >> +++ b/security/landlock/object.c >> @@ -0,0 +1,339 @@ >> +// SPDX-License-Identifier: GPL-2.0-only >> +/* >> + * Landlock LSM - Object and rule management >> + * >> + * Copyright © 2016-2020 Mickaël Salaün <mic(a)digikod.net> >> + * Copyright © 2018-2020 ANSSI >> + * >> + * Principles and constraints of the object and rule management: >> + * - Do not leak memory. >> + * - Try as much as possible to free a memory allocation as soon as it is >> + * unused. >> + * - Do not use global lock. >> + * - Do not charge processes other than the one requesting a Landlock >> + * operation. >> + */ >> + >> +#include <linux/bug.h> >> +#include <linux/compiler.h> >> +#include <linux/compiler_types.h> >> +#include <linux/err.h> >> +#include <linux/errno.h> >> +#include <linux/fs.h> >> +#include <linux/kernel.h> >> +#include <linux/list.h> >> +#include <linux/rbtree.h> >> +#include <linux/rcupdate.h> >> +#include <linux/refcount.h> >> +#include <linux/slab.h> >> +#include <linux/spinlock.h> >> +#include <linux/workqueue.h> >> + >> +#include "object.h" >> + >> +struct landlock_object *landlock_create_object( >> + const enum landlock_object_type type, void *underlying_object) >> +{ >> + struct landlock_object *object; >> + >> + if (WARN_ON_ONCE(!underlying_object)) >> + return NULL; >> + object = kzalloc(sizeof(*object), GFP_KERNEL); >> + if (!object) >> + return NULL; >> + refcount_set(&object->usage, 1); >> + refcount_set(&object->cleaners, 1); >> + spin_lock_init(&object->lock); >> + INIT_LIST_HEAD(&object->rules); >> + object->type = type; >> + WRITE_ONCE(object->underlying_object, underlying_object); >> + return object; >> +} >> + >> +struct landlock_object *landlock_get_object(struct landlock_object *object) >> + __acquires(object->usage) >> +{ >> + __acquire(object->usage); >> + /* >> + * If @object->usage equal 0, then it will be ignored by writers, and >> + * underlying_object->object may be replaced, but this is not an issue >> + * for release_object(). >> + */ >> + if (object && refcount_inc_not_zero(&object->usage)) { >> + /* >> + * It should not be possible to get a reference to an object if >> + * its underlying object is being terminated (e.g. with >> + * landlock_release_object()), because an object is only >> + * modifiable through such underlying object. This is not the >> + * case with landlock_get_object_cleaner(). >> + */ >> + WARN_ON_ONCE(!READ_ONCE(object->underlying_object)); >> + return object; >> + } >> + return NULL; >> +} >> + >> +static struct landlock_object *get_object_cleaner( >> + struct landlock_object *object) >> + __acquires(object->cleaners) >> +{ >> + __acquire(object->cleaners); >> + if (object && refcount_inc_not_zero(&object->cleaners)) >> + return object; >> + return NULL; >> +} >> + >> +/* >> + * There is two cases when an object should be free and the reference to the >> + * underlying object should be put: >> + * - when the last rule tied to this object is removed, which is handled by >> + * landlock_put_rule() and then release_object(); >> + * - when the object is being terminated (e.g. no more reference to an inode), >> + * which is handled by landlock_put_object(). >> + */ >> +static void put_object_free(struct landlock_object *object) >> + __releases(object->cleaners) >> +{ >> + __release(object->cleaners); >> + if (!refcount_dec_and_test(&object->cleaners)) >> + return; >> + WARN_ON_ONCE(refcount_read(&object->usage)); >> + /* >> + * Ensures a safe use of @object in the RCU block from >> + * landlock_put_rule(). >> + */ >> + kfree_rcu(object, rcu_free); >> +} >> + >> +/* >> + * Destroys a newly created and useless object. >> + */ >> +void landlock_drop_object(struct landlock_object *object) >> +{ >> + if (WARN_ON_ONCE(!refcount_dec_and_test(&object->usage))) >> + return; >> + __acquire(object->cleaners); >> + put_object_free(object); >> +} >> + >> +/* >> + * Puts the underlying object (e.g. inode) if it is the first request to >> + * release @object, without calling landlock_put_object(). >> + * >> + * Return true if this call effectively marks @object as released, false >> + * otherwise. >> + */ >> +static bool release_object(struct landlock_object *object) >> + __releases(&object->lock) >> +{ >> + void *underlying_object; >> + >> + lockdep_assert_held(&object->lock); >> + >> + underlying_object = xchg(&object->underlying_object, NULL); > > A one-line comment looks needed for xchg. Ok. This is to have a guarantee that the underlying_object (e.g. the inode pointer) is only used once. I'll add a comment. > >> + spin_unlock(&object->lock); >> + might_sleep(); > > Have trouble working out what might_sleep is put for. Patch 5 adds a call to landlock_release_inode(underlying_object, object) (LANDLOCK_OBJECT_INODE case), which can sleep e.g., with a call to iput(). > >> + if (!underlying_object) >> + return false; >> + >> + switch (object->type) { >> + case LANDLOCK_OBJECT_INODE: >> + break; >> + default: >> + WARN_ON_ONCE(1); >> + } >> + return true; >> +} >> + >> +static void put_object_cleaner(struct landlock_object *object) >> + __releases(object->cleaners) >> +{ >> + /* Let's try an early lockless check. */ >> + if (list_empty(&object->rules) && >> + READ_ONCE(object->underlying_object)) { >> + /* >> + * Puts @object if there is no rule tied to it and the >> + * remaining user is the underlying object. This check is >> + * atomic because @object->rules and @object->underlying_object >> + * are protected by @object->lock. >> + */ >> + spin_lock(&object->lock); >> + if (list_empty(&object->rules) && >> + READ_ONCE(object->underlying_object) && >> + refcount_dec_if_one(&object->usage)) { >> + /* >> + * Releases @object, in place of >> + * landlock_release_object(). >> + * >> + * @object is already empty, implying that all its >> + * previous rules are already disabled. >> + * >> + * Unbalance the @object->cleaners counter to reflect >> + * the underlying object release. >> + */ >> + if (!WARN_ON_ONCE(!release_object(object))) { > > Two ! hurt more than help. Well, it may not look nice but don't you think it is better than a WARN_ON_ONCE(1) in the if block? >> + __acquire(object->cleaners); >> + put_object_free(object); > > Why put object more than once? I just replied to Jann about this subject. This is to "unbalance" the counter to potentially free it (if there is no more user). I explain it here: https://lore.kernel.org/lkml/67465638-e22c-5d1a-df37-862b31d999a1@digikod.n… > >> + } >> + } else { >> + spin_unlock(&object->lock); >> + } >> + } >> + put_object_free(object); >> +} >> + >

5 years, 4 months

1
0
0 0

[PATCH] selftest/lkdtm: Use local .gitignore

by Christophe Leroy

Commit 68ca0fd272da ("selftest/lkdtm: Don't pollute 'git status'") introduced patterns for git to ignore files generated in tools/testing/selftests/lkdtm/ Use local .gitignore file instead of using the root one. Fixes: 68ca0fd272da ("selftest/lkdtm: Don't pollute 'git status'") Signed-off-by: Christophe Leroy <christophe.leroy(a)c-s.fr> --- .gitignore | 4 ---- tools/testing/selftests/lkdtm/.gitignore | 2 ++ 2 files changed, 2 insertions(+), 4 deletions(-) create mode 100644 tools/testing/selftests/lkdtm/.gitignore diff --git a/.gitignore b/.gitignore index bb05dce58f8e..b849a72d69d5 100644 --- a/.gitignore +++ b/.gitignore @@ -100,10 +100,6 @@ modules.order /include/ksym/ /arch/*/include/generated/ -# Generated lkdtm tests -/tools/testing/selftests/lkdtm/*.sh -!/tools/testing/selftests/lkdtm/run.sh - # stgit generated dirs patches-* diff --git a/tools/testing/selftests/lkdtm/.gitignore b/tools/testing/selftests/lkdtm/.gitignore new file mode 100644 index 000000000000..f26212605b6b --- /dev/null +++ b/tools/testing/selftests/lkdtm/.gitignore @@ -0,0 +1,2 @@ +*.sh +!run.sh -- 2.25.0

5 years, 4 months

3
3
0 0

selftests: Linux Kernel Dump Test Module output

by Naresh Kamboju

The selftest lkdtm test failed on x86_64 and arm64. am I missing any pre-requisite? Boot log: [ 3.297812] lkdtm: No crash points registered, enable through debugfs Test output log, -------------------- # selftests lkdtm PANIC.sh lkdtm: PANIC.sh_ # # Skipping PANIC crashes entire system PANIC: crashes_entire # [SKIP] 1 selftests lkdtm PANIC.sh # SKIP selftests: lkdtm_PANIC.sh [SKIP] # selftests lkdtm BUG.sh lkdtm: BUG.sh_ # # BUG missing 'kernel BUG at' [FAIL] missing: 'kernel_BUG # [FAIL] 2 selftests lkdtm BUG.sh # exit=1 selftests: lkdtm_BUG.sh [FAIL] # selftests lkdtm WARNING.sh lkdtm: WARNING.sh_ # # WARNING missing 'WARNING' [FAIL] missing: 'WARNING'_[FAIL] # [FAIL] 3 selftests lkdtm WARNING.sh # exit=1 selftests: lkdtm_WARNING.sh [FAIL] # selftests lkdtm WARNING_MESSAGE.sh lkdtm: WARNING_MESSAGE.sh_ # # WARNING_MESSAGE missing 'message trigger' [FAIL] missing: 'message_trigger' # [FAIL] 4 selftests lkdtm WARNING_MESSAGE.sh # exit=1 selftests: lkdtm_WARNING_MESSAGE.sh [FAIL] # selftests lkdtm EXCEPTION.sh lkdtm: EXCEPTION.sh_ # # EXCEPTION missing 'call trace' [FAIL] missing: 'call_trace' # [FAIL] 5 selftests lkdtm EXCEPTION.sh # exit=1 selftests: lkdtm_EXCEPTION.sh [FAIL] # selftests lkdtm LOOP.sh lkdtm: LOOP.sh_ # # Skipping LOOP Hangs the system LOOP: Hangs_the # [SKIP] 6 selftests lkdtm LOOP.sh # SKIP selftests: lkdtm_LOOP.sh [SKIP] # selftests lkdtm EXHAUST_STACK.sh lkdtm: EXHAUST_STACK.sh_ # # Skipping EXHAUST_STACK Corrupts memory on failure EXHAUST_STACK: Corrupts_memory # [SKIP] 7 selftests lkdtm EXHAUST_STACK.sh # SKIP selftests: lkdtm_EXHAUST_STACK.sh [SKIP] # selftests lkdtm CORRUPT_STACK.sh lkdtm: CORRUPT_STACK.sh_ # # Skipping CORRUPT_STACK Crashes entire system on success CORRUPT_STACK: Crashes_entire # [SKIP] 8 selftests lkdtm CORRUPT_STACK.sh # SKIP selftests: lkdtm_CORRUPT_STACK.sh [SKIP] # selftests lkdtm CORRUPT_STACK_STRONG.sh lkdtm: CORRUPT_STACK_STRONG.sh_ # # Skipping CORRUPT_STACK_STRONG Crashes entire system on success CORRUPT_STACK_STRONG: Crashes_entire # [SKIP] 9 selftests lkdtm CORRUPT_STACK_STRONG.sh # SKIP selftests: lkdtm_CORRUPT_STACK_STRONG.sh [SKIP] # selftests lkdtm CORRUPT_LIST_ADD.sh lkdtm: CORRUPT_LIST_ADD.sh_ # # CORRUPT_LIST_ADD missing 'list_add corruption' [FAIL] missing: 'list_add_corruption' # [FAIL] 10 selftests lkdtm CORRUPT_LIST_ADD.sh # exit=1 selftests: lkdtm_CORRUPT_LIST_ADD.sh [FAIL] # selftests lkdtm CORRUPT_LIST_DEL.sh lkdtm: CORRUPT_LIST_DEL.sh_ # # CORRUPT_LIST_DEL missing 'list_del corruption' [FAIL] missing: 'list_del_corruption' # [FAIL] 11 selftests lkdtm CORRUPT_LIST_DEL.sh # exit=1 selftests: lkdtm_CORRUPT_LIST_DEL.sh [FAIL] # selftests lkdtm CORRUPT_USER_DS.sh lkdtm: CORRUPT_USER_DS.sh_ # # CORRUPT_USER_DS missing 'Invalid address limit on user-mode return' [FAIL] missing: 'Invalid_address # [FAIL] 12 selftests lkdtm CORRUPT_USER_DS.sh # exit=1 selftests: lkdtm_CORRUPT_USER_DS.sh [FAIL] # selftests lkdtm STACK_GUARD_PAGE_LEADING.sh lkdtm: STACK_GUARD_PAGE_LEADING.sh_ # # STACK_GUARD_PAGE_LEADING missing 'call trace' [FAIL] missing: 'call_trace' # [FAIL] 13 selftests lkdtm STACK_GUARD_PAGE_LEADING.sh # exit=1 selftests: lkdtm_STACK_GUARD_PAGE_LEADING.sh [FAIL] # selftests lkdtm STACK_GUARD_PAGE_TRAILING.sh lkdtm: STACK_GUARD_PAGE_TRAILING.sh_ # # STACK_GUARD_PAGE_TRAILING missing 'call trace' [FAIL] missing: 'call_trace' # [FAIL] 14 selftests lkdtm STACK_GUARD_PAGE_TRAILING.sh # exit=1 selftests: lkdtm_STACK_GUARD_PAGE_TRAILING.sh [FAIL] # selftests lkdtm UNSET_SMEP.sh lkdtm: UNSET_SMEP.sh_ # # UNSET_SMEP missing 'CR4 bits went missing' [FAIL] missing: 'CR4_bits # [FAIL] 15 selftests lkdtm UNSET_SMEP.sh # exit=1 selftests: lkdtm_UNSET_SMEP.sh [FAIL] # selftests lkdtm DOUBLE_FAULT.sh lkdtm: DOUBLE_FAULT.sh_ # # Skipped test 'DOUBLE_FAULT' missing in /sys/kernel/debug/provoke-crash/DIRECT! test: 'DOUBLE_FAULT'_missing # [SKIP] 16 selftests lkdtm DOUBLE_FAULT.sh # SKIP selftests: lkdtm_DOUBLE_FAULT.sh [SKIP] # selftests lkdtm UNALIGNED_LOAD_STORE_WRITE.sh lkdtm: UNALIGNED_LOAD_STORE_WRITE.sh_ # # UNALIGNED_LOAD_STORE_WRITE missing 'call trace' [FAIL] missing: 'call_trace' # [FAIL] 17 selftests lkdtm UNALIGNED_LOAD_STORE_WRITE.sh # exit=1 selftests: lkdtm_UNALIGNED_LOAD_STORE_WRITE.sh [FAIL] # selftests lkdtm OVERWRITE_ALLOCATION.sh lkdtm: OVERWRITE_ALLOCATION.sh_ # # Skipping OVERWRITE_ALLOCATION Corrupts memory on failure OVERWRITE_ALLOCATION: Corrupts_memory # [SKIP] 18 selftests lkdtm OVERWRITE_ALLOCATION.sh # SKIP selftests: lkdtm_OVERWRITE_ALLOCATION.sh [SKIP] # selftests lkdtm WRITE_AFTER_FREE.sh lkdtm: WRITE_AFTER_FREE.sh_ # # Skipping WRITE_AFTER_FREE Corrupts memory on failure WRITE_AFTER_FREE: Corrupts_memory # [SKIP] 19 selftests lkdtm WRITE_AFTER_FREE.sh # SKIP selftests: lkdtm_WRITE_AFTER_FREE.sh [SKIP] # selftests lkdtm READ_AFTER_FREE.sh lkdtm: READ_AFTER_FREE.sh_ # # READ_AFTER_FREE missing 'call trace' [FAIL] missing: 'call_trace' # [FAIL] 20 selftests lkdtm READ_AFTER_FREE.sh # exit=1 selftests: lkdtm_READ_AFTER_FREE.sh [FAIL] # selftests lkdtm WRITE_BUDDY_AFTER_FREE.sh lkdtm: WRITE_BUDDY_AFTER_FREE.sh_ # # Skipping WRITE_BUDDY_AFTER_FREE Corrupts memory on failure WRITE_BUDDY_AFTER_FREE: Corrupts_memory # [SKIP] 21 selftests lkdtm WRITE_BUDDY_AFTER_FREE.sh # SKIP selftests: lkdtm_WRITE_BUDDY_AFTER_FREE.sh [SKIP] # selftests lkdtm READ_BUDDY_AFTER_FREE.sh lkdtm: READ_BUDDY_AFTER_FREE.sh_ # # READ_BUDDY_AFTER_FREE missing 'call trace' [FAIL] missing: 'call_trace' # [FAIL] 22 selftests lkdtm READ_BUDDY_AFTER_FREE.sh # exit=1 selftests: lkdtm_READ_BUDDY_AFTER_FREE.sh [FAIL] # selftests lkdtm SLAB_FREE_DOUBLE.sh lkdtm: SLAB_FREE_DOUBLE.sh_ # # SLAB_FREE_DOUBLE missing 'call trace' [FAIL] missing: 'call_trace' # [FAIL] 23 selftests lkdtm SLAB_FREE_DOUBLE.sh # exit=1 selftests: lkdtm_SLAB_FREE_DOUBLE.sh [FAIL] # selftests lkdtm SLAB_FREE_CROSS.sh lkdtm: SLAB_FREE_CROSS.sh_ # # SLAB_FREE_CROSS missing 'call trace' [FAIL] missing: 'call_trace' # [FAIL] 24 selftests lkdtm SLAB_FREE_CROSS.sh # exit=1 selftests: lkdtm_SLAB_FREE_CROSS.sh [FAIL] # selftests lkdtm SLAB_FREE_PAGE.sh lkdtm: SLAB_FREE_PAGE.sh_ # # SLAB_FREE_PAGE missing 'call trace' [FAIL] missing: 'call_trace' # [FAIL] 25 selftests lkdtm SLAB_FREE_PAGE.sh # exit=1 selftests: lkdtm_SLAB_FREE_PAGE.sh [FAIL] # selftests lkdtm SOFTLOCKUP.sh lkdtm: SOFTLOCKUP.sh_ # # Skipping SOFTLOCKUP Hangs the system SOFTLOCKUP: Hangs_the # [SKIP] 26 selftests lkdtm SOFTLOCKUP.sh # SKIP selftests: lkdtm_SOFTLOCKUP.sh [SKIP] # selftests lkdtm HARDLOCKUP.sh lkdtm: HARDLOCKUP.sh_ # # Skipping HARDLOCKUP Hangs the system HARDLOCKUP: Hangs_the # [SKIP] 27 selftests lkdtm HARDLOCKUP.sh # SKIP selftests: lkdtm_HARDLOCKUP.sh [SKIP] # selftests lkdtm SPINLOCKUP.sh lkdtm: SPINLOCKUP.sh_ # # Skipping SPINLOCKUP Hangs the system SPINLOCKUP: Hangs_the # [SKIP] 28 selftests lkdtm SPINLOCKUP.sh # SKIP selftests: lkdtm_SPINLOCKUP.sh [SKIP] # selftests lkdtm HUNG_TASK.sh lkdtm: HUNG_TASK.sh_ # # Skipping HUNG_TASK Hangs the system HUNG_TASK: Hangs_the # [SKIP] 29 selftests lkdtm HUNG_TASK.sh # SKIP selftests: lkdtm_HUNG_TASK.sh [SKIP] # selftests lkdtm EXEC_DATA.sh lkdtm: EXEC_DATA.sh_ # # EXEC_DATA missing 'call trace' [FAIL] missing: 'call_trace' # [FAIL] 30 selftests lkdtm EXEC_DATA.sh # exit=1 selftests: lkdtm_EXEC_DATA.sh [FAIL] # selftests lkdtm EXEC_STACK.sh lkdtm: EXEC_STACK.sh_ # # EXEC_STACK missing 'call trace' [FAIL] missing: 'call_trace' # [FAIL] 31 selftests lkdtm EXEC_STACK.sh # exit=1 selftests: lkdtm_EXEC_STACK.sh [FAIL] # selftests lkdtm EXEC_KMALLOC.sh lkdtm: EXEC_KMALLOC.sh_ # # EXEC_KMALLOC missing 'call trace' [FAIL] missing: 'call_trace' # [FAIL] 32 selftests lkdtm EXEC_KMALLOC.sh # exit=1 selftests: lkdtm_EXEC_KMALLOC.sh [FAIL] # selftests lkdtm EXEC_VMALLOC.sh lkdtm: EXEC_VMALLOC.sh_ # # EXEC_VMALLOC missing 'call trace' [FAIL] missing: 'call_trace' # [FAIL] 33 selftests lkdtm EXEC_VMALLOC.sh # exit=1 selftests: lkdtm_EXEC_VMALLOC.sh [FAIL] # selftests lkdtm EXEC_RODATA.sh lkdtm: EXEC_RODATA.sh_ # # EXEC_RODATA missing 'call trace' [FAIL] missing: 'call_trace' # [FAIL] 34 selftests lkdtm EXEC_RODATA.sh # exit=1 selftests: lkdtm_EXEC_RODATA.sh [FAIL] # selftests lkdtm EXEC_USERSPACE.sh lkdtm: EXEC_USERSPACE.sh_ # # EXEC_USERSPACE missing 'call trace' [FAIL] missing: 'call_trace' # [FAIL] 35 selftests lkdtm EXEC_USERSPACE.sh # exit=1 selftests: lkdtm_EXEC_USERSPACE.sh [FAIL] # selftests lkdtm EXEC_NULL.sh lkdtm: EXEC_NULL.sh_ # # EXEC_NULL missing 'call trace' [FAIL] missing: 'call_trace' # [FAIL] 36 selftests lkdtm EXEC_NULL.sh # exit=1 selftests: lkdtm_EXEC_NULL.sh [FAIL] # selftests lkdtm ACCESS_USERSPACE.sh lkdtm: ACCESS_USERSPACE.sh_ # # ACCESS_USERSPACE missing 'call trace' [FAIL] missing: 'call_trace' # [FAIL] 37 selftests lkdtm ACCESS_USERSPACE.sh # exit=1 selftests: lkdtm_ACCESS_USERSPACE.sh [FAIL] # selftests lkdtm ACCESS_NULL.sh lkdtm: ACCESS_NULL.sh_ # # ACCESS_NULL missing 'call trace' [FAIL] missing: 'call_trace' # [FAIL] 38 selftests lkdtm ACCESS_NULL.sh # exit=1 selftests: lkdtm_ACCESS_NULL.sh [FAIL] # selftests lkdtm WRITE_RO.sh lkdtm: WRITE_RO.sh_ # # WRITE_RO missing 'call trace' [FAIL] missing: 'call_trace' # [FAIL] 39 selftests lkdtm WRITE_RO.sh # exit=1 selftests: lkdtm_WRITE_RO.sh [FAIL] # selftests lkdtm WRITE_RO_AFTER_INIT.sh lkdtm: WRITE_RO_AFTER_INIT.sh_ # # WRITE_RO_AFTER_INIT missing 'call trace' [FAIL] missing: 'call_trace' # [FAIL] 40 selftests lkdtm WRITE_RO_AFTER_INIT.sh # exit=1 selftests: lkdtm_WRITE_RO_AFTER_INIT.sh [FAIL] # selftests lkdtm WRITE_KERN.sh lkdtm: WRITE_KERN.sh_ # # WRITE_KERN missing 'call trace' [FAIL] missing: 'call_trace' # [FAIL] 41 selftests lkdtm WRITE_KERN.sh # exit=1 selftests: lkdtm_WRITE_KERN.sh [FAIL] # selftests lkdtm REFCOUNT_INC_OVERFLOW.sh lkdtm: REFCOUNT_INC_OVERFLOW.sh_ # # REFCOUNT_INC_OVERFLOW missing 'call trace' [FAIL] missing: 'call_trace' # [FAIL] 42 selftests lkdtm REFCOUNT_INC_OVERFLOW.sh # exit=1 selftests: lkdtm_REFCOUNT_INC_OVERFLOW.sh [FAIL] # selftests lkdtm REFCOUNT_ADD_OVERFLOW.sh lkdtm: REFCOUNT_ADD_OVERFLOW.sh_ # # REFCOUNT_ADD_OVERFLOW missing 'call trace' [FAIL] missing: 'call_trace' # [FAIL] 43 selftests lkdtm REFCOUNT_ADD_OVERFLOW.sh # exit=1 selftests: lkdtm_REFCOUNT_ADD_OVERFLOW.sh [FAIL] # selftests lkdtm REFCOUNT_INC_NOT_ZERO_OVERFLOW.sh lkdtm: REFCOUNT_INC_NOT_ZERO_OVERFLOW.sh_ # # REFCOUNT_INC_NOT_ZERO_OVERFLOW missing 'call trace' [FAIL] missing: 'call_trace' # [FAIL] 44 selftests lkdtm REFCOUNT_INC_NOT_ZERO_OVERFLOW.sh # exit=1 selftests: lkdtm_REFCOUNT_INC_NOT_ZERO_OVERFLOW.sh [FAIL] # selftests lkdtm REFCOUNT_ADD_NOT_ZERO_OVERFLOW.sh lkdtm: REFCOUNT_ADD_NOT_ZERO_OVERFLOW.sh_ # # REFCOUNT_ADD_NOT_ZERO_OVERFLOW missing 'call trace' [FAIL] missing: 'call_trace' # [FAIL] 45 selftests lkdtm REFCOUNT_ADD_NOT_ZERO_OVERFLOW.sh # exit=1 selftests: lkdtm_REFCOUNT_ADD_NOT_ZERO_OVERFLOW.sh [FAIL] # selftests lkdtm REFCOUNT_DEC_ZERO.sh lkdtm: REFCOUNT_DEC_ZERO.sh_ # # REFCOUNT_DEC_ZERO missing 'call trace' [FAIL] missing: 'call_trace' # [FAIL] 46 selftests lkdtm REFCOUNT_DEC_ZERO.sh # exit=1 selftests: lkdtm_REFCOUNT_DEC_ZERO.sh [FAIL] # selftests lkdtm REFCOUNT_DEC_NEGATIVE.sh lkdtm: REFCOUNT_DEC_NEGATIVE.sh_ # # REFCOUNT_DEC_NEGATIVE missing 'Negative detected saturated' [FAIL] missing: 'Negative_detected # [FAIL] 47 selftests lkdtm REFCOUNT_DEC_NEGATIVE.sh # exit=1 selftests: lkdtm_REFCOUNT_DEC_NEGATIVE.sh [FAIL] # selftests lkdtm REFCOUNT_DEC_AND_TEST_NEGATIVE.sh lkdtm: REFCOUNT_DEC_AND_TEST_NEGATIVE.sh_ # # REFCOUNT_DEC_AND_TEST_NEGATIVE missing 'Negative detected saturated' [FAIL] missing: 'Negative_detected # [ 360.222897] kselftest: Running tests in membarrier [FAIL] 48 selftests lkdtm REFCOUNT_DEC_AND_TEST_NEGATIVE.sh # exit=1 selftests: lkdtm_REFCOUNT_DEC_AND_TEST_NEGATIVE.sh [FAIL] # selftests lkdtm REFCOUNT_SUB_AND_TEST_NEGATIVE.sh lkdtm: REFCOUNT_SUB_AND_TEST_NEGATIVE.sh_ [ 360.455095] kselftest: Running tests in memfd # # REFCOUNT_SUB_AND_TEST_NEGATIVE missing 'Negative detected saturated' [FAIL] missing: 'Negative_detected # [FAIL] 49 selftests lkdtm REFCOUNT_SUB_AND_TEST_NEGATIVE.sh # exit=1 selftests: lkdtm_REFCOUNT_SUB_AND_TEST_NEGATIVE.sh [FAIL] # selftests lkdtm REFCOUNT_INC_ZERO.sh lkdtm: REFCOUNT_INC_ZERO.sh_ # # REFCOUNT_INC_ZERO missing 'call trace' [FAIL] missing: 'call_trace' # [FAIL] 50 selftests lkdtm REFCOUNT_INC_ZERO.sh # exit=1 selftests: lkdtm_REFCOUNT_INC_ZERO.sh [FAIL] # selftests lkdtm REFCOUNT_ADD_ZERO.sh lkdtm: REFCOUNT_ADD_ZERO.sh_ # # REFCOUNT_ADD_ZERO missing 'call trace' [FAIL] missing: 'call_trace' # [FAIL] 51 selftests lkdtm REFCOUNT_ADD_ZERO.sh # exit=1 selftests: lkdtm_REFCOUNT_ADD_ZERO.sh [FAIL] # selftests lkdtm REFCOUNT_INC_SATURATED.sh lkdtm: REFCOUNT_INC_SATURATED.sh_ # # REFCOUNT_INC_SATURATED missing 'Saturation detected still saturated' [FAIL] missing: 'Saturation_detected # [FAIL] 52 selftests lkdtm REFCOUNT_INC_SATURATED.sh # exit=1 selftests: lkdtm_REFCOUNT_INC_SATURATED.sh [FAIL] # selftests lkdtm REFCOUNT_DEC_SATURATED.sh lkdtm: REFCOUNT_DEC_SATURATED.sh_ # # REFCOUNT_DEC_SATURATED missing 'Saturation detected still saturated' [FAIL] missing: 'Saturation_detected # [FAIL] 53 selftests lkdtm REFCOUNT_DEC_SATURATED.sh # exit=1 selftests: lkdtm_REFCOUNT_DEC_SATURATED.sh [FAIL] # selftests lkdtm REFCOUNT_ADD_SATURATED.sh lkdtm: REFCOUNT_ADD_SATURATED.sh_ # # REFCOUNT_ADD_SATURATED missing 'Saturation detected still saturated' [FAIL] missing: 'Saturation_detected # [FAIL] 54 selftests lkdtm REFCOUNT_ADD_SATURATED.sh # exit=1 selftests: lkdtm_REFCOUNT_ADD_SATURATED.sh [FAIL] # selftests lkdtm REFCOUNT_INC_NOT_ZERO_SATURATED.sh lkdtm: REFCOUNT_INC_NOT_ZERO_SATURATED.sh_ # # REFCOUNT_INC_NOT_ZERO_SATURATED missing 'call trace' [FAIL] missing: 'call_trace' # [FAIL] 55 selftests lkdtm REFCOUNT_INC_NOT_ZERO_SATURATED.sh # exit=1 selftests: lkdtm_REFCOUNT_INC_NOT_ZERO_SATURATED.sh [FAIL] # selftests lkdtm REFCOUNT_ADD_NOT_ZERO_SATURATED.sh lkdtm: REFCOUNT_ADD_NOT_ZERO_SATURATED.sh_ # # REFCOUNT_ADD_NOT_ZERO_SATURATED missing 'call trace' [FAIL] missing: 'call_trace' # [FAIL] 56 selftests lkdtm REFCOUNT_ADD_NOT_ZERO_SATURATED.sh # exit=1 selftests: lkdtm_REFCOUNT_ADD_NOT_ZERO_SATURATED.sh [FAIL] # selftests lkdtm REFCOUNT_DEC_AND_TEST_SATURATED.sh lkdtm: REFCOUNT_DEC_AND_TEST_SATURATED.sh_ # # REFCOUNT_DEC_AND_TEST_SATURATED missing 'Saturation detected still saturated' [FAIL] missing: 'Saturation_detected # [FAIL] 57 selftests lkdtm REFCOUNT_DEC_AND_TEST_SATURATED.sh # exit=1 selftests: lkdtm_REFCOUNT_DEC_AND_TEST_SATURATED.sh [FAIL] # selftests lkdtm REFCOUNT_SUB_AND_TEST_SATURATED.sh lkdtm: REFCOUNT_SUB_AND_TEST_SATURATED.sh_ # # REFCOUNT_SUB_AND_TEST_SATURATED missing 'Saturation detected still saturated' [FAIL] missing: 'Saturation_detected # [FAIL] 58 selftests lkdtm REFCOUNT_SUB_AND_TEST_SATURATED.sh # exit=1 selftests: lkdtm_REFCOUNT_SUB_AND_TEST_SATURATED.sh [FAIL] # selftests lkdtm REFCOUNT_TIMING.sh lkdtm: REFCOUNT_TIMING.sh_ # # Skipping REFCOUNT_TIMING timing only REFCOUNT_TIMING: timing_only # [SKIP] 59 selftests lkdtm REFCOUNT_TIMING.sh # SKIP selftests: lkdtm_REFCOUNT_TIMING.sh [SKIP] # selftests lkdtm ATOMIC_TIMING.sh lkdtm: ATOMIC_TIMING.sh_ # # Skipping ATOMIC_TIMING timing only ATOMIC_TIMING: timing_only # [SKIP] 60 selftests lkdtm ATOMIC_TIMING.sh # SKIP selftests: lkdtm_ATOMIC_TIMING.sh [SKIP] # selftests lkdtm USERCOPY_HEAP_SIZE_TO.sh lkdtm: USERCOPY_HEAP_SIZE_TO.sh_ # # USERCOPY_HEAP_SIZE_TO missing 'call trace' [FAIL] missing: 'call_trace' # [FAIL] 61 selftests lkdtm USERCOPY_HEAP_SIZE_TO.sh # exit=1 selftests: lkdtm_USERCOPY_HEAP_SIZE_TO.sh [FAIL] # selftests lkdtm USERCOPY_HEAP_SIZE_FROM.sh lkdtm: USERCOPY_HEAP_SIZE_FROM.sh_ # # USERCOPY_HEAP_SIZE_FROM missing 'call trace' [FAIL] missing: 'call_trace' # [FAIL] 62 selftests lkdtm USERCOPY_HEAP_SIZE_FROM.sh # exit=1 selftests: lkdtm_USERCOPY_HEAP_SIZE_FROM.sh [FAIL] # selftests lkdtm USERCOPY_HEAP_WHITELIST_TO.sh lkdtm: USERCOPY_HEAP_WHITELIST_TO.sh_ # # USERCOPY_HEAP_WHITELIST_TO missing 'call trace' [FAIL] missing: 'call_trace' # [FAIL] 63 selftests lkdtm USERCOPY_HEAP_WHITELIST_TO.sh # exit=1 selftests: lkdtm_USERCOPY_HEAP_WHITELIST_TO.sh [FAIL] # selftests lkdtm USERCOPY_HEAP_WHITELIST_FROM.sh lkdtm: USERCOPY_HEAP_WHITELIST_FROM.sh_ # # USERCOPY_HEAP_WHITELIST_FROM missing 'call trace' [FAIL] missing: 'call_trace' # [FAIL] 64 selftests lkdtm USERCOPY_HEAP_WHITELIST_FROM.sh # exit=1 selftests: lkdtm_USERCOPY_HEAP_WHITELIST_FROM.sh [FAIL] # selftests lkdtm USERCOPY_STACK_FRAME_TO.sh lkdtm: USERCOPY_STACK_FRAME_TO.sh_ # # USERCOPY_STACK_FRAME_TO missing 'call trace' [FAIL] missing: 'call_trace' # [FAIL] 65 selftests lkdtm USERCOPY_STACK_FRAME_TO.sh # exit=1 selftests: lkdtm_USERCOPY_STACK_FRAME_TO.sh [FAIL] # selftests lkdtm USERCOPY_STACK_FRAME_FROM.sh lkdtm: USERCOPY_STACK_FRAME_FROM.sh_ # # USERCOPY_STACK_FRAME_FROM missing 'call trace' [FAIL] missing: 'call_trace' # [FAIL] 66 selftests lkdtm USERCOPY_STACK_FRAME_FROM.sh # exit=1 selftests: lkdtm_USERCOPY_STACK_FRAME_FROM.sh [FAIL] # selftests lkdtm USERCOPY_STACK_BEYOND.sh lkdtm: USERCOPY_STACK_BEYOND.sh_ # # USERCOPY_STACK_BEYOND missing 'call trace' [FAIL] missing: 'call_trace' # [FAIL] 67 selftests lkdtm USERCOPY_STACK_BEYOND.sh # exit=1 selftests: lkdtm_USERCOPY_STACK_BEYOND.sh [FAIL] # selftests lkdtm USERCOPY_KERNEL.sh lkdtm: USERCOPY_KERNEL.sh_ # # USERCOPY_KERNEL missing 'call trace' [FAIL] missing: 'call_trace' # [FAIL] 68 selftests lkdtm USERCOPY_KERNEL.sh # exit=1 selftests: lkdtm_USERCOPY_KERNEL.sh [FAIL] # selftests lkdtm USERCOPY_KERNEL_DS.sh lkdtm: USERCOPY_KERNEL_DS.sh_ # # USERCOPY_KERNEL_DS missing 'call trace' [FAIL] missing: 'call_trace' # [FAIL] 69 selftests lkdtm USERCOPY_KERNEL_DS.sh # exit=1 selftests: lkdtm_USERCOPY_KERNEL_DS.sh [FAIL] # selftests lkdtm STACKLEAK_ERASING.sh lkdtm: STACKLEAK_ERASING.sh_ # # STACKLEAK_ERASING missing 'OK the rest of the thread stack is properly erased' [FAIL] missing: 'OK_the # [FAIL] 70 selftests lkdtm STACKLEAK_ERASING.sh # exit=1 selftests: lkdtm_STACKLEAK_ERASING.sh [FAIL] # selftests lkdtm CFI_FORWARD_PROTO.sh lkdtm: CFI_FORWARD_PROTO.sh_ # # CFI_FORWARD_PROTO missing 'call trace' [FAIL] missing: 'call_trace' # [FAIL] 71 selftests lkdtm CFI_FORWARD_PROTO.sh # exit=1 selftests: lkdtm_CFI_FORWARD_PROTO.sh [FAIL] ref: https://qa-reports.linaro.org/lkft/linux-mainline-oe/build/v5.6-rc1-19-g359… https://qa-reports.linaro.org/lkft/linux-mainline-oe/build/v5.5-11440-gd1ea… -- Linaro LKFT https://lkft.linaro.org

5 years, 4 months

4
9
0 0

[GIT PULL] Kselftest kunit update for Linux 5.6-rc4

by Shuah Khan

Hi Linus, Please pull the following Kselftest kunit update for Linux 5.6-rc4. This Kselftest kunit update consists of fixes to documentation and run-time tool from Brendan Higgins and Heidi Fahim. diff is attached. thanks, -- Shuah ---------------------------------------------------------------- The following changes since commit bb6d3fb354c5ee8d6bde2d576eb7220ea09862b9: Linux 5.6-rc1 (2020-02-09 16:08:48 -0800) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest tags/linux-kselftest-kunit-5.6-rc4 for you to fetch changes up to be886ba90cce2fb2f5a4dbcda8f3be3fd1b2f484: kunit: run kunit_tool from any directory (2020-02-19 15:58:07 -0700) ---------------------------------------------------------------- linux-kselftest-kunit-5.6-rc4 This Kselftest kunit update consists of fixes to documentation and run-time tool from Brendan Higgins and Heidi Fahim. ---------------------------------------------------------------- Brendan Higgins (1): Documentation: kunit: fixed sphinx error in code block Heidi Fahim (2): kunit: test: Improve error messages for kunit_tool when kunitconfig is invalid kunit: run kunit_tool from any directory Documentation/dev-tools/kunit/usage.rst | 1 + tools/testing/kunit/kunit.py | 12 ++++++++++++ tools/testing/kunit/kunit_kernel.py | 28 ++++++++++++++++------------ 3 files changed, 29 insertions(+), 12 deletions(-) ----------------------------------------------------------------

5 years, 4 months

2
1
0 0

[GIT PULL] Kselftest update for Linux 5.6-rc4

by Shuah Khan

Hi Linus, Please pull the following Kselftest fixes update for Linux 5.6-rc4. This Kselftest update for Linux 5.6-rc4 consists of: - fixes to TIMEOUT failures and out-of-tree compilation compilation errors from Michael Ellerman. - Declutter git status fix from Christophe Leroy diff is attached. thanks, -- Shuah ---------------------------------------------------------------- The following changes since commit 9a0584f05687947d5a0b87f046bcd2592a55e67c: selftests: openat2: fix build error on newer glibc (2020-02-13 13:15:45 -0700) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest tags/linux-kselftest-5.6-rc4 for you to fetch changes up to ef89d0545132d685f73da6f58b7e7fe002536f91: selftests/rseq: Fix out-of-tree compilation (2020-02-20 08:57:12 -0700) ---------------------------------------------------------------- linux-kselftest-5.6-rc4 This Kselftest update for Linux 5.6-rc4 consists of: - fixes to TIMEOUT failures and out-of-tree compilation compilation errors from Michael Ellerman. - Declutter git status fix from Christophe Leroy ---------------------------------------------------------------- Christophe Leroy (1): selftest/lkdtm: Don't pollute 'git status' Michael Ellerman (2): selftests: Install settings files to fix TIMEOUT failures selftests/rseq: Fix out-of-tree compilation .gitignore | 4 ++++ tools/testing/selftests/ftrace/Makefile | 2 +- tools/testing/selftests/livepatch/Makefile | 2 ++ tools/testing/selftests/net/mptcp/Makefile | 2 ++ tools/testing/selftests/rseq/Makefile | 4 +++- tools/testing/selftests/rtc/Makefile | 2 ++ 6 files changed, 14 insertions(+), 2 deletions(-) ----------------------------------------------------------------

5 years, 4 months

3
3
0 0

[PATCH bpf-next v4 0/5] Make probes which emit dmesg warnings optional

by Michal Rostecki

Feature probes in bpftool related to bpf_probe_write_user and bpf_trace_printk helpers emit dmesg warnings which might be confusing for people running bpftool on production environments. This patch series addresses that by filtering them out by default and introducing the new positional argument "full" which enables all available probes. The main motivation behind those changes is ability the fact that some probes (for example those related to "trace" or "write_user" helpers) emit dmesg messages which might be confusing for people who are running on production environments. For details see the Cilium issue[0]. v1 -> v2: - Do not expose regex filters to users, keep filtering logic internal, expose only the "full" option for including probes which emit dmesg warnings. v2 -> v3: - Do not use regex for filtering out probes, use function IDs directly. - Fix bash completion - in v2 only "prefix" was proposed after "macros", "dev" and "kernel" were not. - Rephrase the man page paragraph, highlight helper function names. - Remove tests which parse the plain output of bpftool (except the header/macros test), focus on testing JSON output instead. - Add test which compares the output with and without "full" option. v3 -> v4: - Use enum to check for helper functions. - Make selftests compatible with older versions of Python 3.x than 3.7. [0] https://github.com/cilium/cilium/issues/10048 Michal Rostecki (5): bpftool: Move out sections to separate functions bpftool: Make probes which emit dmesg warnings optional bpftool: Update documentation of "bpftool feature" command bpftool: Update bash completion for "bpftool feature" command selftests/bpf: Add test for "bpftool feature" command .../bpftool/Documentation/bpftool-feature.rst | 19 +- tools/bpf/bpftool/bash-completion/bpftool | 3 +- tools/bpf/bpftool/feature.c | 283 +++++++++++------- tools/testing/selftests/.gitignore | 5 +- tools/testing/selftests/bpf/Makefile | 3 +- tools/testing/selftests/bpf/test_bpftool.py | 178 +++++++++++ tools/testing/selftests/bpf/test_bpftool.sh | 5 + 7 files changed, 373 insertions(+), 123 deletions(-) create mode 100644 tools/testing/selftests/bpf/test_bpftool.py create mode 100755 tools/testing/selftests/bpf/test_bpftool.sh -- 2.25.1

5 years, 4 months

3
7
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-kselftest-mirror