Re: [OE-core] [PATCH 2/2] ltp: Remove mips related open_posix_testsuite patch
Hi Khem, > > please don't deliver this patch to users, it's wrong. > Thanks Petr, is there an alternative approach we can take ? Cyril suggested at the time to skipping the test in the testrunner. Is that feasible? He also asked how do you run the test. i.e. not changing the code of the test, just don't run it. https://patchwork.ozlabs.org/comment/2012168/ Kind regards, Petr PS: better to ask on LTP ML, Cc Cyril and me. -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/2] ltp: Remove mips related open_posix_testsuite patch
On Thu, Feb 27, 2020 at 12:35 PM Petr Vorel wrote:
>
> Upstream just disagree on this patch
> https://patchwork.ozlabs.org/comment/2012045/
>
> Signed-off-by: Petr Vorel
> ---
> Hi,
>
> please don't deliver this patch to users, it's wrong.
>
Thanks Petr, is there an alternative approach we can take ?
> Kind regards,
> Petr
>
> ...suite-mmap24-2-Relax-condition-a-bit.patch | 68 ---
> meta/recipes-extended/ltp/ltp_20200120.bb | 1 -
> 2 files changed, 69 deletions(-)
> delete mode 100644
> meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch
>
> diff --git
> a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch
>
> b/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch
> deleted file mode 100644
> index d32ac1dd7c..00
> ---
> a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch
> +++ /dev/null
> @@ -1,68 +0,0 @@
> -From a8715a1446305ffd76406f63c7f160c13a5b2e72 Mon Sep 17 00:00:00 2001
> -From: "Hongzhi.Song"
> -Date: Wed, 10 Oct 2018 22:07:05 -0400
> -Subject: [PATCH] open_posix_testsuite/mmap24-2: Relax condition a bit
> -
> -Mips will return EINVAL instead of ENOMEM as expected
> -if the range [addr + len) exceeds TASK_SIZE.
> -
> -Linux kernel code: arch/mips/mm/mmap.c
> -if (flags & MAP_FIXED) {
> -/* Even MAP_FIXED mappings must reside within TASK_SIZE */
> -if (TASK_SIZE - len < addr)
> -return -EINVAL;
> -
> -Relax the condition and accept both ENOMEM and EINVAL
> -as expected outcome.
> -
> -Upstream-Status: Submitted
> [https://lists.linux.it/pipermail/ltp/2018-October/009624.html]
> -
> -Signed-off-by: Hongzhi.Song
>
> - .../open_posix_testsuite/conformance/interfaces/mmap/24-2.c| 10
> +-
> - 1 file changed, 5 insertions(+), 5 deletions(-)
> -
> -diff --git
> a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c
> b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c
> -index 9cf83d9..55090a6 100644
> a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c
> -+++ b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c
> -@@ -7,7 +7,7 @@
> - * source tree.
> - *
> - * The mmap() function shall fail if:
> -- * [ENOMEM] MAP_FIXED was specified,
> -+ * [ENOMEM or EINVAL] MAP_FIXED was specified,
> - * and the range [addr,addr+len) exceeds that allowed
> - * for the address space of a process; or, if MAP_FIXED was not specified
> and
> - * there is insufficient room in the address space to effect the mapping.
> -@@ -15,7 +15,7 @@
> - * Test Step:
> - * 1. Map a shared memory object, with size exceeding the value get from
> - *rlim_cur of resource RLIMIT_AS, setting MAP_FIXED;
> -- * 3. Should get ENOMEM.
> -+ * 3. Should get ENOMEM or EINVAL.
> - */
> -
> - #include
> -@@ -92,8 +92,8 @@ int main(void)
> - (unsigned long)len);
> - pa = mmap(addr, len, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED,
> fd,
> - 0);
> -- if (pa == MAP_FAILED && errno == ENOMEM) {
> -- printf("Got ENOMEM: %s\nTest PASSED\n", strerror(errno));
> -+ if (pa == MAP_FAILED && (errno == ENOMEM || errno == EINVAL)) {
> -+ printf("Got ENOMEM or EINVAL: %s\nTest PASSED\n",
> strerror(errno));
> - exit(PTS_PASS);
> - }
> -
> -@@ -102,6 +102,6 @@ int main(void)
> - else
> - munmap(pa, len);
> - close(fd);
> -- printf("Test Fail: Did not get ENOMEM as expected\n");
> -+ printf("Test Failed: Did not get ENOMEM or EINVAL as expected\n");
> - return PTS_FAIL;
> - }
> ---
> -2.7.4
> -
> diff --git a/meta/recipes-extended/ltp/ltp_20200120.bb
> b/meta/recipes-extended/ltp/ltp_20200120.bb
> index 38fd0f6f87..069d9c2e0b 100644
> --- a/meta/recipes-extended/ltp/ltp_20200120.bb
> +++ b/meta/recipes-extended/ltp/ltp_20200120.bb
> @@ -35,7 +35,6 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \
> file://0004-guard-mallocopt-with-__GLIBC__.patch \
> file://0007-Fix-test_proc_kill-hanging.patch \
>
> file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \
> -
> file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \
> file://0001-Add-more-musl-exclusions.patch \
>
> file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \
> "
> --
> 2.25.1
>
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] ltp: Remove mips related open_posix_testsuite patch
Upstream just disagree on this patch
https://patchwork.ozlabs.org/comment/2012045/
Signed-off-by: Petr Vorel
---
Hi,
please don't deliver this patch to users, it's wrong.
Kind regards,
Petr
...suite-mmap24-2-Relax-condition-a-bit.patch | 68 ---
meta/recipes-extended/ltp/ltp_20200120.bb | 1 -
2 files changed, 69 deletions(-)
delete mode 100644
meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch
diff --git
a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch
b/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch
deleted file mode 100644
index d32ac1dd7c..00
---
a/meta/recipes-extended/ltp/ltp/0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From a8715a1446305ffd76406f63c7f160c13a5b2e72 Mon Sep 17 00:00:00 2001
-From: "Hongzhi.Song"
-Date: Wed, 10 Oct 2018 22:07:05 -0400
-Subject: [PATCH] open_posix_testsuite/mmap24-2: Relax condition a bit
-
-Mips will return EINVAL instead of ENOMEM as expected
-if the range [addr + len) exceeds TASK_SIZE.
-
-Linux kernel code: arch/mips/mm/mmap.c
-if (flags & MAP_FIXED) {
-/* Even MAP_FIXED mappings must reside within TASK_SIZE */
-if (TASK_SIZE - len < addr)
-return -EINVAL;
-
-Relax the condition and accept both ENOMEM and EINVAL
-as expected outcome.
-
-Upstream-Status: Submitted
[https://lists.linux.it/pipermail/ltp/2018-October/009624.html]
-
-Signed-off-by: Hongzhi.Song
- .../open_posix_testsuite/conformance/interfaces/mmap/24-2.c| 10 +-
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c
b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c
-index 9cf83d9..55090a6 100644
a/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c
-+++ b/testcases/open_posix_testsuite/conformance/interfaces/mmap/24-2.c
-@@ -7,7 +7,7 @@
- * source tree.
- *
- * The mmap() function shall fail if:
-- * [ENOMEM] MAP_FIXED was specified,
-+ * [ENOMEM or EINVAL] MAP_FIXED was specified,
- * and the range [addr,addr+len) exceeds that allowed
- * for the address space of a process; or, if MAP_FIXED was not specified and
- * there is insufficient room in the address space to effect the mapping.
-@@ -15,7 +15,7 @@
- * Test Step:
- * 1. Map a shared memory object, with size exceeding the value get from
- *rlim_cur of resource RLIMIT_AS, setting MAP_FIXED;
-- * 3. Should get ENOMEM.
-+ * 3. Should get ENOMEM or EINVAL.
- */
-
- #include
-@@ -92,8 +92,8 @@ int main(void)
- (unsigned long)len);
- pa = mmap(addr, len, PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED, fd,
- 0);
-- if (pa == MAP_FAILED && errno == ENOMEM) {
-- printf("Got ENOMEM: %s\nTest PASSED\n", strerror(errno));
-+ if (pa == MAP_FAILED && (errno == ENOMEM || errno == EINVAL)) {
-+ printf("Got ENOMEM or EINVAL: %s\nTest PASSED\n",
strerror(errno));
- exit(PTS_PASS);
- }
-
-@@ -102,6 +102,6 @@ int main(void)
- else
- munmap(pa, len);
- close(fd);
-- printf("Test Fail: Did not get ENOMEM as expected\n");
-+ printf("Test Failed: Did not get ENOMEM or EINVAL as expected\n");
- return PTS_FAIL;
- }
---
-2.7.4
-
diff --git a/meta/recipes-extended/ltp/ltp_20200120.bb
b/meta/recipes-extended/ltp/ltp_20200120.bb
index 38fd0f6f87..069d9c2e0b 100644
--- a/meta/recipes-extended/ltp/ltp_20200120.bb
+++ b/meta/recipes-extended/ltp/ltp_20200120.bb
@@ -35,7 +35,6 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \
file://0004-guard-mallocopt-with-__GLIBC__.patch \
file://0007-Fix-test_proc_kill-hanging.patch \
file://0008-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch \
-
file://0009-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch \
file://0001-Add-more-musl-exclusions.patch \
file://0001-syscalls-Check-for-time64-unsafe-syscalls-before-usi.patch \
"
--
2.25.1
--
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
