summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patch
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2019-07-19 13:13:18 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-07-19 16:19:14 +0100
commita921c2f9dbefde3592bfe65c80ff1ce973aac89b (patch)
tree26b492438631afde3c24b777ed7f960a750c26d7 /meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patch
parent161d036569c17d28a1ce625a1c2e258fb6cb18c3 (diff)
downloadpoky-a921c2f9dbefde3592bfe65c80ff1ce973aac89b.tar.gz
ltp: upgrade 20190115 -> 20190517
Drop the following patches since the issues have been fixed upstream: 0001-file01.sh-Fix-in-was-not-recognized.patch 0001-lapi-Define-TST_ABI-32-64-to-detect-target-type.patch 0001-syscalls-setrlimit03.c-read-proc-sys-fs-nr_open-for-.patch 0007-fix-__WORDSIZE-undeclared-when-building-with-musl.patch 0009-fix-redefinition-of-struct-msgbuf-error-building-wit.patch 0021-Define-_GNU_SOURCE-for-MREMAP_MAYMOVE-definition.patch 0023-ptrace-Use-int-instead-of-enum-__ptrace_request.patch 0024-rt_sigaction-rt_sigprocmark-Define-_GNU_SOURCE.patch 0026-crash01-Define-_GNU_SOURCE.patch 0028-rt_sigaction.h-Use-sighandler_t-instead-of-__sighand.patch 0034-periodic_output.patch 0039-commands-ar01-Fix-for-test-in-deterministic-mode.patch define-sigrtmin-and-sigrtmax-for-musl.patch setregid01-security-string-formatting.patch Refresh the following patches: 0004-build-Add-option-to-select-libc-implementation.patch 0005-kernel-controllers-Link-with-libfts-explicitly-on-mu.patch 0008-Check-if-__GLIBC_PREREQ-is-defined-before-using-it.patch 0018-guard-mallocopt-with-__GLIBC__.patch 0020-getdents-define-getdents-getdents64-only-for-glibc.patch 0035-fix-test_proc_kill-hang.patch 0036-testcases-network-nfsv4-acl-acl1.c-Security-fix-on-s.patch 0001-open_posix_testsuite-mmap24-2-Relax-condition-a-bit.patch 0001-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch 0001-diotest4-Let-kernel-pick-an-address-when-calling-mma.patch 0001-getrlimit03-adjust-a-bit-of-code-to-compatiable-with.patch Add patch: 0006-rt_tgsigqueueinfo-disable-test-on-musl.patch (From OE-Core rev: eb59546c83f4c217de6272a8d3b2fa65e3c84e7f) Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patch')
-rw-r--r--meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patch56
1 files changed, 56 insertions, 0 deletions
diff --git a/meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patch b/meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patch
new file mode 100644
index 0000000000..9cd188f656
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/0011-direct_io-diotest4-drop-MAP_FIXED.patch
@@ -0,0 +1,56 @@
1From f210d7e19b721041f31b7f258a169f89dc850303 Mon Sep 17 00:00:00 2001
2From: Jan Stancek <jstancek@redhat.com>
3Date: Thu, 4 Jul 2019 16:45:23 +0200
4Subject: [PATCH] direct_io/diotest4: drop MAP_FIXED
5
6Hongzhi reports that this test is failing on mips64 with 5.1+:
7 diotest4 10 TBROK : diotest4.c:368: can't mmap file: Invalid argument
8 diotest4 11 TBROK : diotest4.c:368: Remaining cases broken
9I could reproduce it on emulated 5kc-malta, running 5.2.0-rc7.
10
11Test is trying to map into area immediately following heap as MAP_SHARED,
12but it used wrong alignment (fixed by 'lapi/mmap.h: include config.h').
13
14Usage of MAP_FIXED seems unnecessary, so drop that too and let the kernel
15pick an address.
16
17Reported-by: Hongzhi.Song <hongzhi.song@windriver.com>
18Signed-off-by: Jan Stancek <jstancek@redhat.com>
19Acked-by: Cyril Hrubis <chrubis@suse.cz>
20
21Upstream-Status: Backport
22[https://github.com/linux-test-project/ltp/commit/f5444eeeabf252b8884b9465d277b6af853819e3]
23
24Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
25---
26 testcases/kernel/io/direct_io/diotest4.c | 8 ++------
27 1 file changed, 2 insertions(+), 6 deletions(-)
28
29diff --git a/testcases/kernel/io/direct_io/diotest4.c b/testcases/kernel/io/direct_io/diotest4.c
30index e4616e4..bf200cd 100644
31--- a/testcases/kernel/io/direct_io/diotest4.c
32+++ b/testcases/kernel/io/direct_io/diotest4.c
33@@ -352,18 +352,14 @@ int main(int argc, char *argv[])
34 total++;
35
36 /* Test-10: read, write to a mmaped file */
37- shm_base = (char *)(((long)sbrk(0) + (shmsz - 1)) & ~(shmsz - 1));
38- if (shm_base == NULL) {
39- tst_brkm(TBROK, cleanup, "sbrk failed: %s", strerror(errno));
40- }
41 offset = 4096;
42 count = bufsize;
43 if ((fd = open(filename, O_DIRECT | O_RDWR)) < 0) {
44 tst_brkm(TBROK, cleanup, "can't open %s: %s",
45 filename, strerror(errno));
46 }
47- shm_base = mmap(shm_base, 0x100000, PROT_READ | PROT_WRITE,
48- MAP_SHARED | MAP_FIXED, fd, 0);
49+ shm_base = mmap(0, 0x100000, PROT_READ | PROT_WRITE,
50+ MAP_SHARED, fd, 0);
51 if (shm_base == (caddr_t) - 1) {
52 tst_brkm(TBROK, cleanup, "can't mmap file: %s",
53 strerror(errno));
54--
552.7.4
56