* [LTP] [PATCH v2 1/1] mremap06: Add mremap() reproducer for 7e7757876f25
@ 2023-07-17 9:43 Petr Vorel
2023-07-18 8:33 ` Vlastimil Babka
2023-07-18 15:02 ` Cyril Hrubis
0 siblings, 2 replies; 4+ messages in thread
From: Petr Vorel @ 2023-07-17 9:43 UTC (permalink / raw)
To: ltp; +Cc: Jiri Slaby, Vlastimil Babka, Fabian Vogt
Affected system reports:
mremap06.c:69: TINFO: all pages with compatible mapping
mremap06.c:90: TPASS: mmap/mremap work properly
mremap06.c:69: TINFO: third page's mapping incompatible
mremap06.c:90: TPASS: mmap/mremap work properly
mremap06.c:69: TINFO: first page's mapping incompatible
mremap06.c:56: TFAIL: page 1 wrong value 2 (0x32)
mremap06.c:56: TFAIL: page 2 wrong value 3 (0x33)
Link: https://bugzilla.suse.com/show_bug.cgi?id=1210903
Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
Changes v1->v2:
* Use getpagesize() to fix ppc64le (Cyril)
* Don't use ARRAY_SIZE(tcases) for mmap() size - define NUM_PAGES 3
instead (Vlastimil)
runtest/syscalls | 1 +
testcases/kernel/syscalls/mremap/.gitignore | 1 +
testcases/kernel/syscalls/mremap/mremap06.c | 133 ++++++++++++++++++++
3 files changed, 135 insertions(+)
create mode 100644 testcases/kernel/syscalls/mremap/mremap06.c
diff --git a/runtest/syscalls b/runtest/syscalls
index b29151186..008bca508 100644
--- a/runtest/syscalls
+++ b/runtest/syscalls
@@ -845,6 +845,7 @@ mremap02 mremap02
mremap03 mremap03
mremap04 mremap04
mremap05 mremap05
+mremap06 mremap06
msgctl01 msgctl01
msgctl02 msgctl02
diff --git a/testcases/kernel/syscalls/mremap/.gitignore b/testcases/kernel/syscalls/mremap/.gitignore
index 833e1b883..ec15a19cd 100644
--- a/testcases/kernel/syscalls/mremap/.gitignore
+++ b/testcases/kernel/syscalls/mremap/.gitignore
@@ -3,3 +3,4 @@
/mremap03
/mremap04
/mremap05
+/mremap06
diff --git a/testcases/kernel/syscalls/mremap/mremap06.c b/testcases/kernel/syscalls/mremap/mremap06.c
new file mode 100644
index 000000000..758df66f0
--- /dev/null
+++ b/testcases/kernel/syscalls/mremap/mremap06.c
@@ -0,0 +1,133 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright (c) 2023 SUSE LLC
+ * Author: Vlastimil Babka <vbabka@suse.cz>
+ * https://bugzilla.suse.com/attachment.cgi?id=867254
+ * LTP port: Petr Vorel <pvorel@suse.cz>
+ */
+
+/*\
+ * [Description]
+ *
+ * Bug reproducer for 7e7757876f25 ("mm/mremap: fix vm_pgoff in vma_merge() case 3")
+ */
+
+#define _GNU_SOURCE
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <sys/mman.h>
+
+#include "tst_test.h"
+#include "tst_safe_macros.h"
+
+#define NUM_PAGES 3
+
+static int fd;
+static char *buf, *buf2;
+static int page_size, mmap_size, mremap_size;
+
+static struct tcase {
+ size_t incompatible;
+ const char *desc;
+} tcases[] = {
+ {
+ .desc = "all pages with compatible mapping",
+ },
+ {
+ .incompatible = 3,
+ .desc = "third page's mapping incompatible",
+ },
+ {
+ .incompatible = 1,
+ .desc = "first page's mapping incompatible",
+ },
+};
+
+static int check_pages(void)
+{
+ int fail = 0, i;
+ char val;
+
+ for (i = 0; i < (int)ARRAY_SIZE(tcases); i++) {
+ val = buf[i * page_size];
+ if (val != 0x30 + i) {
+ tst_res(TFAIL, "page %d wrong value %d (0x%x)", i, val - 0x30, val);
+ fail = 1;
+ }
+ }
+
+ return fail;
+}
+
+static void do_test(unsigned int n)
+{
+ struct tcase *tc = &tcases[n];
+ int ret;
+
+ tst_res(TINFO, "%s", tc->desc);
+
+ buf = SAFE_MMAP(0, mmap_size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
+
+ buf2 = mremap(buf + page_size, page_size, page_size,
+ MREMAP_MAYMOVE|MREMAP_FIXED, buf + mremap_size);
+ if (buf2 == MAP_FAILED)
+ tst_brk(TBROK, "mremap() failed");
+
+ if (tc->incompatible) {
+ ret = mprotect(buf + (tc->incompatible-1)*page_size, page_size, PROT_READ);
+ if (ret == -1)
+ tst_brk(TBROK, "mprotect() failed");
+ }
+
+ buf2 = mremap(buf + mremap_size, page_size, page_size,
+ MREMAP_MAYMOVE|MREMAP_FIXED, buf + page_size);
+ if (buf2 == MAP_FAILED)
+ tst_brk(TBROK, "mremap() failed");
+
+ if (!check_pages())
+ tst_res(TPASS, "mmap/mremap work properly");
+
+ SAFE_MUNMAP(buf, mremap_size);
+}
+
+static void setup(void)
+{
+ int ret, i;
+
+ page_size = getpagesize();
+ mmap_size = (NUM_PAGES+1) * page_size;
+ mremap_size = NUM_PAGES * page_size;
+
+ fd = SAFE_OPEN("testfile", O_CREAT | O_RDWR | O_TRUNC, 0600);
+
+ ret = fallocate(fd, 0, 0, mmap_size);
+ if (ret == -1)
+ tst_brk(TBROK, "fallocate() failed");
+
+ buf = SAFE_MMAP(0, mmap_size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
+
+ for (i = 0; i < (int)ARRAY_SIZE(tcases)+1; i++)
+ buf[i*page_size] = 0x30 + i;
+
+ /* clear the page tables */
+ SAFE_MUNMAP(buf, mmap_size);
+}
+
+static void cleanup(void)
+{
+ if (fd > 0)
+ SAFE_CLOSE(fd);
+}
+
+static struct tst_test test = {
+ .setup = setup,
+ .cleanup = cleanup,
+ .test = do_test,
+ .tcnt = ARRAY_SIZE(tcases),
+ .tags = (struct tst_tag[]) {
+ {"linux-git", "7e7757876f25"},
+ {}
+ },
+};
--
2.40.1
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [LTP] [PATCH v2 1/1] mremap06: Add mremap() reproducer for 7e7757876f25
2023-07-17 9:43 [LTP] [PATCH v2 1/1] mremap06: Add mremap() reproducer for 7e7757876f25 Petr Vorel
@ 2023-07-18 8:33 ` Vlastimil Babka
2023-07-18 15:02 ` Cyril Hrubis
1 sibling, 0 replies; 4+ messages in thread
From: Vlastimil Babka @ 2023-07-18 8:33 UTC (permalink / raw)
To: Petr Vorel, ltp; +Cc: Fabian Vogt, Jiri Slaby
On 7/17/23 11:43, Petr Vorel wrote:
> Affected system reports:
>
> mremap06.c:69: TINFO: all pages with compatible mapping
> mremap06.c:90: TPASS: mmap/mremap work properly
> mremap06.c:69: TINFO: third page's mapping incompatible
> mremap06.c:90: TPASS: mmap/mremap work properly
> mremap06.c:69: TINFO: first page's mapping incompatible
> mremap06.c:56: TFAIL: page 1 wrong value 2 (0x32)
> mremap06.c:56: TFAIL: page 2 wrong value 3 (0x33)
>
> Link: https://bugzilla.suse.com/show_bug.cgi?id=1210903
> Signed-off-by: Petr Vorel <pvorel@suse.cz>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Thanks!
> ---
> Changes v1->v2:
> * Use getpagesize() to fix ppc64le (Cyril)
> * Don't use ARRAY_SIZE(tcases) for mmap() size - define NUM_PAGES 3
> instead (Vlastimil)
>
> runtest/syscalls | 1 +
> testcases/kernel/syscalls/mremap/.gitignore | 1 +
> testcases/kernel/syscalls/mremap/mremap06.c | 133 ++++++++++++++++++++
> 3 files changed, 135 insertions(+)
> create mode 100644 testcases/kernel/syscalls/mremap/mremap06.c
>
> diff --git a/runtest/syscalls b/runtest/syscalls
> index b29151186..008bca508 100644
> --- a/runtest/syscalls
> +++ b/runtest/syscalls
> @@ -845,6 +845,7 @@ mremap02 mremap02
> mremap03 mremap03
> mremap04 mremap04
> mremap05 mremap05
> +mremap06 mremap06
>
> msgctl01 msgctl01
> msgctl02 msgctl02
> diff --git a/testcases/kernel/syscalls/mremap/.gitignore b/testcases/kernel/syscalls/mremap/.gitignore
> index 833e1b883..ec15a19cd 100644
> --- a/testcases/kernel/syscalls/mremap/.gitignore
> +++ b/testcases/kernel/syscalls/mremap/.gitignore
> @@ -3,3 +3,4 @@
> /mremap03
> /mremap04
> /mremap05
> +/mremap06
> diff --git a/testcases/kernel/syscalls/mremap/mremap06.c b/testcases/kernel/syscalls/mremap/mremap06.c
> new file mode 100644
> index 000000000..758df66f0
> --- /dev/null
> +++ b/testcases/kernel/syscalls/mremap/mremap06.c
> @@ -0,0 +1,133 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
> +/*
> + * Copyright (c) 2023 SUSE LLC
> + * Author: Vlastimil Babka <vbabka@suse.cz>
> + * https://bugzilla.suse.com/attachment.cgi?id=867254
> + * LTP port: Petr Vorel <pvorel@suse.cz>
> + */
> +
> +/*\
> + * [Description]
> + *
> + * Bug reproducer for 7e7757876f25 ("mm/mremap: fix vm_pgoff in vma_merge() case 3")
> + */
> +
> +#define _GNU_SOURCE
> +#include <unistd.h>
> +#include <stdlib.h>
> +#include <stdio.h>
> +#include <fcntl.h>
> +#include <sys/mman.h>
> +
> +#include "tst_test.h"
> +#include "tst_safe_macros.h"
> +
> +#define NUM_PAGES 3
> +
> +static int fd;
> +static char *buf, *buf2;
> +static int page_size, mmap_size, mremap_size;
> +
> +static struct tcase {
> + size_t incompatible;
> + const char *desc;
> +} tcases[] = {
> + {
> + .desc = "all pages with compatible mapping",
> + },
> + {
> + .incompatible = 3,
> + .desc = "third page's mapping incompatible",
> + },
> + {
> + .incompatible = 1,
> + .desc = "first page's mapping incompatible",
> + },
> +};
> +
> +static int check_pages(void)
> +{
> + int fail = 0, i;
> + char val;
> +
> + for (i = 0; i < (int)ARRAY_SIZE(tcases); i++) {
> + val = buf[i * page_size];
> + if (val != 0x30 + i) {
> + tst_res(TFAIL, "page %d wrong value %d (0x%x)", i, val - 0x30, val);
> + fail = 1;
> + }
> + }
> +
> + return fail;
> +}
> +
> +static void do_test(unsigned int n)
> +{
> + struct tcase *tc = &tcases[n];
> + int ret;
> +
> + tst_res(TINFO, "%s", tc->desc);
> +
> + buf = SAFE_MMAP(0, mmap_size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
> +
> + buf2 = mremap(buf + page_size, page_size, page_size,
> + MREMAP_MAYMOVE|MREMAP_FIXED, buf + mremap_size);
> + if (buf2 == MAP_FAILED)
> + tst_brk(TBROK, "mremap() failed");
> +
> + if (tc->incompatible) {
> + ret = mprotect(buf + (tc->incompatible-1)*page_size, page_size, PROT_READ);
> + if (ret == -1)
> + tst_brk(TBROK, "mprotect() failed");
> + }
> +
> + buf2 = mremap(buf + mremap_size, page_size, page_size,
> + MREMAP_MAYMOVE|MREMAP_FIXED, buf + page_size);
> + if (buf2 == MAP_FAILED)
> + tst_brk(TBROK, "mremap() failed");
> +
> + if (!check_pages())
> + tst_res(TPASS, "mmap/mremap work properly");
> +
> + SAFE_MUNMAP(buf, mremap_size);
> +}
> +
> +static void setup(void)
> +{
> + int ret, i;
> +
> + page_size = getpagesize();
> + mmap_size = (NUM_PAGES+1) * page_size;
> + mremap_size = NUM_PAGES * page_size;
> +
> + fd = SAFE_OPEN("testfile", O_CREAT | O_RDWR | O_TRUNC, 0600);
> +
> + ret = fallocate(fd, 0, 0, mmap_size);
> + if (ret == -1)
> + tst_brk(TBROK, "fallocate() failed");
> +
> + buf = SAFE_MMAP(0, mmap_size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
> +
> + for (i = 0; i < (int)ARRAY_SIZE(tcases)+1; i++)
> + buf[i*page_size] = 0x30 + i;
> +
> + /* clear the page tables */
> + SAFE_MUNMAP(buf, mmap_size);
> +}
> +
> +static void cleanup(void)
> +{
> + if (fd > 0)
> + SAFE_CLOSE(fd);
> +}
> +
> +static struct tst_test test = {
> + .setup = setup,
> + .cleanup = cleanup,
> + .test = do_test,
> + .tcnt = ARRAY_SIZE(tcases),
> + .tags = (struct tst_tag[]) {
> + {"linux-git", "7e7757876f25"},
> + {}
> + },
> +};
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [LTP] [PATCH v2 1/1] mremap06: Add mremap() reproducer for 7e7757876f25
2023-07-17 9:43 [LTP] [PATCH v2 1/1] mremap06: Add mremap() reproducer for 7e7757876f25 Petr Vorel
2023-07-18 8:33 ` Vlastimil Babka
@ 2023-07-18 15:02 ` Cyril Hrubis
2023-07-19 9:54 ` Petr Vorel
1 sibling, 1 reply; 4+ messages in thread
From: Cyril Hrubis @ 2023-07-18 15:02 UTC (permalink / raw)
To: Petr Vorel; +Cc: Fabian Vogt, Jiri Slaby, Vlastimil Babka, ltp
Hi!
> + ret = fallocate(fd, 0, 0, mmap_size);
> + if (ret == -1)
> + tst_brk(TBROK, "fallocate() failed");
I'm slightly surprised that we do not have SAFE_FALLOCATE().
Anyways:
Reviewed-by: Cyril Hrubis <chrubis@suse.cz>
--
Cyril Hrubis
chrubis@suse.cz
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [LTP] [PATCH v2 1/1] mremap06: Add mremap() reproducer for 7e7757876f25
2023-07-18 15:02 ` Cyril Hrubis
@ 2023-07-19 9:54 ` Petr Vorel
0 siblings, 0 replies; 4+ messages in thread
From: Petr Vorel @ 2023-07-19 9:54 UTC (permalink / raw)
To: Cyril Hrubis; +Cc: Fabian Vogt, Jiri Slaby, Vlastimil Babka, ltp
Hi Cyril, Vlastimil,
thanks for your time, merged!
> Hi!
> > + ret = fallocate(fd, 0, 0, mmap_size);
> > + if (ret == -1)
> > + tst_brk(TBROK, "fallocate() failed");
> I'm slightly surprised that we do not have SAFE_FALLOCATE().
It's on my todo list.
Kind regards,
Petr
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-07-19 9:54 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-17 9:43 [LTP] [PATCH v2 1/1] mremap06: Add mremap() reproducer for 7e7757876f25 Petr Vorel
2023-07-18 8:33 ` Vlastimil Babka
2023-07-18 15:02 ` Cyril Hrubis
2023-07-19 9:54 ` Petr Vorel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox