diff options
Diffstat (limited to 'poky/meta/recipes-extended/ltp')
5 files changed, 165 insertions, 2 deletions
diff --git a/poky/meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch b/poky/meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch new file mode 100644 index 000000000..6b665030c --- /dev/null +++ b/poky/meta/recipes-extended/ltp/ltp/0001-Remove-OOM-tests-from-runtest-mm.patch @@ -0,0 +1,34 @@ +From 13ef88cdccfe3f58c53d57806866b91e310eb272 Mon Sep 17 00:00:00 2001 +From: "Mingde (Matthew) Zeng" <matthewzmd@gmail.com> +Date: Wed, 29 Jul 2020 08:47:09 -0400 +Subject: [PATCH] Remove OOM tests from runtest/mm + +Disable OOM tests, as they might cause oeqa ssh connection lost + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Mingde (Matthew) Zeng <matthew.zeng@windriver.com> + +--- + runtest/mm | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/runtest/mm b/runtest/mm +index a09f39c1e..76fa82754 100644 +--- a/runtest/mm ++++ b/runtest/mm +@@ -73,12 +73,6 @@ ksm06 ksm06 + ksm06_1 ksm06 -n 10 + ksm06_2 ksm06 -n 10000 + +-oom01 oom01 +-oom02 oom02 +-oom03 oom03 +-oom04 oom04 +-oom05 oom05 +- + swapping01 swapping01 -i 5 + + thp01 thp01 -I 120 +-- +2.27.0 + diff --git a/poky/meta/recipes-extended/ltp/ltp/0001-sigwaitinfo-Do-not-run-invalid-undefined-test-cases.patch b/poky/meta/recipes-extended/ltp/ltp/0001-sigwaitinfo-Do-not-run-invalid-undefined-test-cases.patch new file mode 100644 index 000000000..17d5af89e --- /dev/null +++ b/poky/meta/recipes-extended/ltp/ltp/0001-sigwaitinfo-Do-not-run-invalid-undefined-test-cases.patch @@ -0,0 +1,69 @@ +From e0a63deb1857eb90288e90d6368df70cdd0c0ec9 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 28 May 2020 13:04:33 -0700 +Subject: [PATCH] sigwaitinfo: Do not run invalid/undefined test cases + +These testcases run for eternity on musl + +test_bad_address* cases are passing invalid pointers to a function; that's always UB +empty_set and timeout rely on the implementation-defined "may fail" for EINTR in sigtimedwait [1] + +normally "may fail" is an "unspecified" but here the impl +is supposed to document it so it's "impl-defined" + +[1] https://pubs.opengroup.org/onlinepubs/9699919799/functions/sigtimedwait.html + +Upstream-Status: Submitted [https://patchwork.ozlabs.org/project/ltp/patch/20200528204556.2444156-1-raj.khem@gmail.com/] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Cc: Rich Felker <dalias@aerifal.cx> +--- + .../kernel/syscalls/sigwaitinfo/sigwaitinfo01.c | 12 ++---------- + 1 file changed, 2 insertions(+), 10 deletions(-) + +--- a/testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c ++++ b/testcases/kernel/syscalls/sigwaitinfo/sigwaitinfo01.c +@@ -422,15 +422,10 @@ struct test_desc { + } tests[] = { + #ifdef TEST_RT_SIGTIMEDWAIT + { +- test_empty_set, my_rt_sigtimedwait, SIGUSR1}, { + test_unmasked_matching, my_rt_sigtimedwait, SIGUSR1}, { + test_masked_matching, my_rt_sigtimedwait, SIGUSR1}, { + test_unmasked_matching_noinfo, my_rt_sigtimedwait, SIGUSR1}, { +- test_masked_matching_noinfo, my_rt_sigtimedwait, SIGUSR1}, { +- test_bad_address, my_rt_sigtimedwait, SIGUSR1}, { +- test_bad_address2, my_rt_sigtimedwait, SIGUSR1}, { +- test_bad_address3, my_rt_sigtimedwait, SIGUSR1}, { +- test_timeout, my_rt_sigtimedwait, 0}, ++ test_masked_matching_noinfo, my_rt_sigtimedwait, SIGUSR1}, + /* Special cases */ + /* 1: sigwaitinfo does respond to ignored signal */ + { +@@ -452,25 +447,17 @@ struct test_desc { + #endif + #if defined TEST_SIGWAITINFO + { +- test_empty_set, my_sigwaitinfo, SIGUSR1}, { + test_unmasked_matching, my_sigwaitinfo, SIGUSR1}, { + test_masked_matching, my_sigwaitinfo, SIGUSR1}, { + test_unmasked_matching_noinfo, my_sigwaitinfo, SIGUSR1}, { +- test_masked_matching_noinfo, my_sigwaitinfo, SIGUSR1}, { +- test_bad_address, my_sigwaitinfo, SIGUSR1}, { +- test_bad_address2, my_sigwaitinfo, SIGUSR1}, ++ test_masked_matching_noinfo, my_sigwaitinfo, SIGUSR1}, + #endif + #if defined TEST_SIGTIMEDWAIT + { +- test_empty_set, my_sigtimedwait, SIGUSR1}, { + test_unmasked_matching, my_sigtimedwait, SIGUSR1}, { + test_masked_matching, my_sigtimedwait, SIGUSR1}, { + test_unmasked_matching_noinfo, my_sigtimedwait, SIGUSR1}, { +- test_masked_matching_noinfo, my_sigtimedwait, SIGUSR1}, { +- test_bad_address, my_sigtimedwait, SIGUSR1}, { +- test_bad_address2, my_sigtimedwait, SIGUSR1}, { +- test_bad_address3, my_sigtimedwait, SIGUSR1}, { +- test_timeout, my_sigtimedwait, 0}, ++ test_masked_matching_noinfo, my_sigtimedwait, SIGUSR1}, + #endif + }; + diff --git a/poky/meta/recipes-extended/ltp/ltp/0001-syscalls-copy_file_range02-Expect-EFBIG-in-subcase-m.patch b/poky/meta/recipes-extended/ltp/ltp/0001-syscalls-copy_file_range02-Expect-EFBIG-in-subcase-m.patch new file mode 100644 index 000000000..09b6f5487 --- /dev/null +++ b/poky/meta/recipes-extended/ltp/ltp/0001-syscalls-copy_file_range02-Expect-EFBIG-in-subcase-m.patch @@ -0,0 +1,57 @@ +From 99687ab002f9f750f6f18fa1d70a91f0aa4f8ba2 Mon Sep 17 00:00:00 2001 +From: He Zhe <zhe.he@windriver.com> +Date: Thu, 18 Jun 2020 17:18:27 +0800 +Subject: [PATCH] syscalls/copy_file_range02: Expect EFBIG in subcase max + length on 32-bit architectures + +For syscall +ssize_t copy_file_range(int fd_in, loff_t *off_in, + int fd_out, loff_t *off_out, + size_t len, unsigned int flags); +off_out is loff_t* that is long long, 64 bits on 32-bit architectures, +while len is size_t that unsigned int, 32 bits on 32-bit architectures. + +In subcase "max length", simplified as below, + +dst = tst_max_lfs_filesize(); +TEST(sys_copy_file_range(fd_src, 0, *tc->copy_to_fd, &dst, tc->len, tc->flags)); + +where dst is 4K*4G and len is 4G, so (4K+1)*4G is always smaller than 4G*4G, +it can never match the following kernel condition on 32-bit architectures. + +if (pos_in + count < pos_in || pos_out + count < pos_out) + return -EOVERFLOW; + +And thus we would get error like +copy_file_range02.c:139: FAIL: copy_file_range failed unexpectedly; expected EOVERFLOW, but got: EFBIG (27) + +Also correct a typo. + +Upstream-Status: Backport [http://lists.linux.it/pipermail/ltp/2020-June/017716.html] + +Signed-off-by: He Zhe <zhe.he@windriver.com> +Acked-by: Li Wang <liwang@redhat.com> +--- + .../kernel/syscalls/copy_file_range/copy_file_range02.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/testcases/kernel/syscalls/copy_file_range/copy_file_range02.c b/testcases/kernel/syscalls/copy_file_range/copy_file_range02.c +index fa679c4d3..bc27fbe57 100644 +--- a/testcases/kernel/syscalls/copy_file_range/copy_file_range02.c ++++ b/testcases/kernel/syscalls/copy_file_range/copy_file_range02.c +@@ -78,7 +78,11 @@ static struct tcase { + {&fd_chrdev, 0, EINVAL, CONTSIZE, "char device", 0}, + {&fd_fifo, 0, EINVAL, CONTSIZE, "fifo", 0}, + {&fd_pipe[0], 0, EINVAL, CONTSIZE, "pipe", 0}, +- {&fd_copy, 0, EOVERFLOW, ULLONG_MAX, "max length lenght", 1}, ++#ifdef TST_ABI64 ++ {&fd_copy, 0, EOVERFLOW, ULLONG_MAX, "max length", 1}, ++#else ++ {&fd_copy, 0, EFBIG, ULLONG_MAX, "max length", 1}, ++#endif + {&fd_copy, 0, EFBIG, MIN_OFF, "max file size", 1}, + }; + +-- +2.17.1 + diff --git a/poky/meta/recipes-extended/ltp/ltp/0004-guard-mallocopt-with-__GLIBC__.patch b/poky/meta/recipes-extended/ltp/ltp/0004-guard-mallocopt-with-__GLIBC__.patch index e93886c9c..a187f61f0 100644 --- a/poky/meta/recipes-extended/ltp/ltp/0004-guard-mallocopt-with-__GLIBC__.patch +++ b/poky/meta/recipes-extended/ltp/ltp/0004-guard-mallocopt-with-__GLIBC__.patch @@ -7,7 +7,7 @@ mallocopt is not available on non glibc implementations Signed-off-by: Khem Raj <raj.khem@gmail.com> Reviewed-by: Petr Vorel <petr.vorel@gmail.com> -[ Upstream-Status: accepted in 967612c454aea66770b64f69287671037fe895b3 ] +Upstream-Status: Accepted [967612c454aea66770b64f69287671037fe895b3] --- utils/benchmark/ebizzy-0.3/ebizzy.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/poky/meta/recipes-extended/ltp/ltp_20200515.bb b/poky/meta/recipes-extended/ltp/ltp_20200515.bb index 67c759032..0c7044d04 100644 --- a/poky/meta/recipes-extended/ltp/ltp_20200515.bb +++ b/poky/meta/recipes-extended/ltp/ltp_20200515.bb @@ -35,6 +35,9 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \ file://0007-Fix-test_proc_kill-hanging.patch \ file://0001-Add-more-musl-exclusions.patch \ file://0001-ptrace01-Fix-missing-format-string.patch \ + file://0001-sigwaitinfo-Do-not-run-invalid-undefined-test-cases.patch \ + file://0001-syscalls-copy_file_range02-Expect-EFBIG-in-subcase-m.patch \ + file://0001-Remove-OOM-tests-from-runtest-mm.patch \ " S = "${WORKDIR}/git" @@ -48,7 +51,7 @@ export exec_prefix = "/opt/${PN}" PACKAGECONFIG[numa] = "--with-numa, --without-numa, numactl," EXTRA_AUTORECONF += "-I ${S}/testcases/realtime/m4" -EXTRA_OECONF = " --with-power-management-testsuite --with-realtime-testsuite --with-open-posix-testsuite " +EXTRA_OECONF = " --with-realtime-testsuite --with-open-posix-testsuite " # ltp network/rpc test cases ftbfs when libtirpc is found EXTRA_OECONF += " --without-tirpc " |