mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-26 00:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

ltp: diotest4: Let kernel pick an address when calling mmap

Browse Source 
Error:
diotest4 10 TBROK : diotest4.c:368: can't mmap file: Invalid argument
diotest4 11 TBROK : diotest4.c:368: Remaining cases broken

This is because the manually specified addr from mmap is invalid.
We should let kernel itself pick an addrress.

(From OE-Core rev: c49e4fd1cc573170fd18c2f6313f8d77f5e68470)

Signed-off-by: Hongzhi.Song <hongzhi.song@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Hongzhi.Song
2019-07-01 02:47:46 -07:00
committed by Richard Purdie
parent 41e7ba16ab
commit 4cbe4cbdc0
2 changed files with 51 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
meta/recipes-extended/ltp/ltp/0001-diotest4-Let-kernel-pick-an-address-when-calling-mma.patch Normal file
View File

@@ -0,0 +1,49 @@
From 785809201ad7dea2872d493efbfd65bb215710d6 Mon Sep 17 00:00:00 2001
From: "Hongzhi.Song" <hongzhi.song@windriver.com>
Date: Sun, 30 Jun 2019 21:56:16 -0400
Subject: [PATCH] diotest4: Let kernel pick an address when calling mmap
Error:
diotest4 10 TBROK : diotest4.c:368: can't mmap file: Invalid argument
diotest4 11 TBROK : diotest4.c:368: Remaining cases broken
This is because the specified addr from mmap is invalid.
We should let kernel itself pick an addrress.
Signed-off-by: Jan Stancek <jstancek@redhat.com>
Upstream-Status: Submitted [https://lists.linux.it/pipermail/ltp/2019-June/012570.html]
Signed-off-by: Hongzhi.Song <hongzhi.song@windriver.com>
---
testcases/kernel/io/direct_io/diotest4.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/testcases/kernel/io/direct_io/diotest4.c b/testcases/kernel/io/direct_io/diotest4.c
index e4616e4..d88c431 100644
--- a/testcases/kernel/io/direct_io/diotest4.c
+++ b/testcases/kernel/io/direct_io/diotest4.c
@@ -352,18 +352,14 @@ int main(int argc, char *argv[])
total++;
/* Test-10: read, write to a mmaped file */
- shm_base = (char *)(((long)sbrk(0) + (shmsz - 1)) & ~(shmsz - 1));
- if (shm_base == NULL) {
- tst_brkm(TBROK, cleanup, "sbrk failed: %s", strerror(errno));
- }
offset = 4096;
count = bufsize;
if ((fd = open(filename, O_DIRECT | O_RDWR)) < 0) {
tst_brkm(TBROK, cleanup, "can't open %s: %s",
filename, strerror(errno));
}
- shm_base = mmap(shm_base, 0x100000, PROT_READ | PROT_WRITE,
- MAP_SHARED | MAP_FIXED, fd, 0);
+ shm_base = mmap(NULL, 0x100000, PROT_READ | PROT_WRITE,
+ MAP_SHARED, fd, 0);
if (shm_base == (caddr_t) - 1) {
tst_brkm(TBROK, cleanup, "can't mmap file: %s",
strerror(errno));
--
2.8.1

3
meta/recipes-extended/ltp/ltp_20190115.bb
View File

@@ -50,7 +50,8 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git \
file://define-sigrtmin-and-sigrtmax-for-musl.patch \
file://setregid01-security-string-formatting.patch \
file://0001-syscalls-setrlimit03.c-read-proc-sys-fs-nr_open-for-.patch \
file://0001-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch \
file://0001-shmctl01-don-t-use-hardcoded-index-0-for-SHM_STAT-te.patch \
file://0001-diotest4-Let-kernel-pick-an-address-when-calling-mma.patch\
"
S = "${WORKDIR}/git"